mirror/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2024-09-15 00:45:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve spacing inconsistencies in style.qrc/qss files

Browse Source
This commit is contained in:
Morph 2020-08-31 00:27:19 -04:00
parent b65456b958
commit 5043036688
6 changed files with 109 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dist/icons/controller/controller.qrc vendored
View File

@ -21,34 +21,34 @@
<file alias="single_joycon_right_vertical">single_joycon_right_vertical.png</file>
<file alias="single_joycon_right_vertical_dark">single_joycon_right_vertical_dark.png</file>
<file alias="single_joycon_right_vertical_midnight">single_joycon_right_vertical_midnight.png</file>
<file alias="applet_dual_joycon">applet_dual_joycon.png</file>
<file alias="applet_dual_joycon">applet_dual_joycon.png</file>
<file alias="applet_dual_joycon_dark">applet_dual_joycon_dark.png</file>
<file alias="applet_dual_joycon_midnight">applet_dual_joycon_midnight.png</file>
<file alias="applet_handheld">applet_handheld.png</file>
<file alias="applet_handheld">applet_handheld.png</file>
<file alias="applet_handheld_dark">applet_handheld_dark.png</file>
<file alias="applet_handheld_midnight">applet_handheld_midnight.png</file>
<file alias="applet_pro_controller">applet_pro_controller.png</file>
<file alias="applet_pro_controller_dark">applet_pro_controller_dark.png</file>
<file alias="applet_pro_controller_midnight">applet_pro_controller_midnight.png</file>
<file alias="applet_pro_controller_dark">applet_pro_controller_dark.png</file>
<file alias="applet_pro_controller_midnight">applet_pro_controller_midnight.png</file>
<file alias="applet_joycon_left">applet_single_joycon_left.png</file>
<file alias="applet_joycon_left_dark">applet_single_joycon_left_dark.png</file>
<file alias="applet_joycon_left_midnight">applet_single_joycon_left_midnight.png</file>
<file alias="applet_joycon_left_dark">applet_single_joycon_left_dark.png</file>
<file alias="applet_joycon_left_midnight">applet_single_joycon_left_midnight.png</file>
<file alias="applet_joycon_right">applet_single_joycon_right.png</file>
<file alias="applet_joycon_right_dark">applet_single_joycon_right_dark.png</file>
<file alias="applet_joycon_right_midnight">applet_single_joycon_right_midnight.png</file>
<file alias="applet_dual_joycon_disabled">applet_dual_joycon_disabled.png</file>
<file alias="applet_dual_joycon_dark_disabled">applet_dual_joycon_dark_disabled.png</file>
<file alias="applet_dual_joycon_midnight_disabled">applet_dual_joycon_midnight_disabled.png</file>
<file alias="applet_handheld_disabled">applet_handheld_disabled.png</file>
<file alias="applet_handheld_disabled">applet_handheld_disabled.png</file>
<file alias="applet_handheld_dark_disabled">applet_handheld_dark_disabled.png</file>
<file alias="applet_handheld_midnight_disabled">applet_handheld_midnight_disabled.png</file>
<file alias="applet_pro_controller_disabled">applet_pro_controller_disabled.png</file>
<file alias="applet_pro_controller_disabled">applet_pro_controller_disabled.png</file>
<file alias="applet_pro_controller_dark_disabled">applet_pro_controller_dark_disabled.png</file>
<file alias="applet_pro_controller_midnight_disabled">applet_pro_controller_midnight_disabled.png</file>
<file alias="applet_joycon_left_disabled">applet_single_joycon_left_disabled.png</file>
<file alias="applet_joycon_left_disabled">applet_single_joycon_left_disabled.png</file>
<file alias="applet_joycon_left_dark_disabled">applet_single_joycon_left_dark_disabled.png</file>
<file alias="applet_joycon_left_midnight_disabled">applet_single_joycon_left_midnight_disabled.png</file>
<file alias="applet_joycon_right_disabled">applet_single_joycon_right_disabled.png</file>
<file alias="applet_joycon_right_disabled">applet_single_joycon_right_disabled.png</file>
<file alias="applet_joycon_right_dark_disabled">applet_single_joycon_right_dark_disabled.png</file>
<file alias="applet_joycon_right_midnight_disabled">applet_single_joycon_right_midnight_disabled.png</file>
</qresource>

84
dist/qt_themes/default/style.qss vendored
View File

@ -52,30 +52,30 @@ QGroupBox#groupPlayer5Connected:checked,
QGroupBox#groupPlayer6Connected:checked,
QGroupBox#groupPlayer7Connected:checked,
QGroupBox#groupPlayer8Connected:checked {
background-color: #f5f5f5;
background-color: #f5f5f5;
}
QWidget#topControllerApplet {
border-bottom: 1px solid #828790
border-bottom: 1px solid #828790
}
QWidget#bottomPerGameInput,
QWidget#bottomControllerApplet {
border-top: 1px solid #828790
border-top: 1px solid #828790
}
QWidget#topPerGameInput,
QWidget#middleControllerApplet {
background-color: #fff;
background-color: #fff;
}
QWidget#topPerGameInput QComboBox,
QWidget#middleControllerApplet QComboBox {
width: 123px;
width: 123px;
}
QWidget#connectedControllers {
background: transparent;
background: transparent;
}
QWidget#playersSupported,
@ -86,8 +86,8 @@ QWidget#controllerSupported3,
QWidget#controllerSupported4,
QWidget#controllerSupported5,
QWidget#controllerSupported6 {
border: none;
background: transparent;
border: none;
background: transparent;
}
QGroupBox#groupPlayer1Connected,
@ -98,11 +98,11 @@ QGroupBox#groupPlayer5Connected,
QGroupBox#groupPlayer6Connected,
QGroupBox#groupPlayer7Connected,
QGroupBox#groupPlayer8Connected {
border: 1px solid #828790;
border-radius: 3px;
padding: 0px;
min-height: 98px;
max-height: 98px;
border: 1px solid #828790;
border-radius: 3px;
padding: 0px;
min-height: 98px;
max-height: 98px;
}
QGroupBox#groupPlayer1Connected:unchecked,
@ -113,7 +113,7 @@ QGroupBox#groupPlayer5Connected:unchecked,
QGroupBox#groupPlayer6Connected:unchecked,
QGroupBox#groupPlayer7Connected:unchecked,
QGroupBox#groupPlayer8Connected:unchecked {
border: 1px solid #d9d9d9;
border: 1px solid #d9d9d9;
}
QGroupBox#groupPlayer1Connected::title,
@ -124,14 +124,14 @@ QGroupBox#groupPlayer5Connected::title,
QGroupBox#groupPlayer6Connected::title,
QGroupBox#groupPlayer7Connected::title,
QGroupBox#groupPlayer8Connected::title {
subcontrol-origin: margin;
subcontrol-position: top left;
padding-left: 0px;
padding-right: 0px;
padding-top: 1px;
margin-left: 0px;
margin-right: -4px;
margin-bottom: 4px;
subcontrol-origin: margin;
subcontrol-position: top left;
padding-left: 0px;
padding-right: 0px;
padding-top: 1px;
margin-left: 0px;
margin-right: -4px;
margin-bottom: 4px;
}
QCheckBox#checkboxPlayer1Connected,
@ -142,7 +142,7 @@ QCheckBox#checkboxPlayer5Connected,
QCheckBox#checkboxPlayer6Connected,
QCheckBox#checkboxPlayer7Connected,
QCheckBox#checkboxPlayer8Connected {
spacing: 0px;
spacing: 0px;
}
QWidget#Player1LEDs QCheckBox,
@ -153,7 +153,7 @@ QWidget#Player5LEDs QCheckBox,
QWidget#Player6LEDs QCheckBox,
QWidget#Player7LEDs QCheckBox,
QWidget#Player8LEDs QCheckBox {
spacing: 0px;
spacing: 0px;
}
QWidget#Player1LEDs QCheckBox::indicator,
@ -164,9 +164,9 @@ QWidget#Player5LEDs QCheckBox::indicator,
QWidget#Player6LEDs QCheckBox::indicator,
QWidget#Player7LEDs QCheckBox::indicator,
QWidget#Player8LEDs QCheckBox::indicator {
width: 6px;
height: 6px;
margin-left: 0px;
width: 6px;
height: 6px;
margin-left: 0px;
}
QWidget#bottomPerGameInput QCheckBox#checkboxPlayer1Connected::indicator,
@ -177,8 +177,8 @@ QWidget#bottomPerGameInput QCheckBox#checkboxPlayer5Connected::indicator,
QWidget#bottomPerGameInput QCheckBox#checkboxPlayer6Connected::indicator,
QWidget#bottomPerGameInput QCheckBox#checkboxPlayer7Connected::indicator,
QWidget#bottomPerGameInput QCheckBox#checkboxPlayer8Connected::indicator {
width: 12px;
height: 12px;
width: 12px;
height: 12px;
}
QCheckBox#checkboxPlayer1Connected::indicator,
@ -189,8 +189,8 @@ QCheckBox#checkboxPlayer5Connected::indicator,
QCheckBox#checkboxPlayer6Connected::indicator,
QCheckBox#checkboxPlayer7Connected::indicator,
QCheckBox#checkboxPlayer8Connected::indicator {
width: 14px;
height: 14px;
width: 14px;
height: 14px;
}
QGroupBox#groupPlayer1Connected::indicator,
@ -201,8 +201,8 @@ QGroupBox#groupPlayer5Connected::indicator,
QGroupBox#groupPlayer6Connected::indicator,
QGroupBox#groupPlayer7Connected::indicator,
QGroupBox#groupPlayer8Connected::indicator {
width: 16px;
height: 16px;
width: 16px;
height: 16px;
}
QWidget#Player1LEDs QCheckBox::indicator:checked,
@ -230,10 +230,10 @@ QCheckBox#checkboxPlayer6Connected::indicator:checked,
QCheckBox#checkboxPlayer7Connected::indicator:checked,
QCheckBox#checkboxPlayer8Connected::indicator:checked,
QGroupBox#groupConnectedController::indicator:checked {
border-radius: 2px;
border: 1px solid #929192;
background: #39ff14;
image: none;
border-radius: 2px;
border: 1px solid #929192;
background: #39ff14;
image: none;
}
QWidget#Player1LEDs QCheckBox::indicator:unchecked,
@ -261,10 +261,10 @@ QCheckBox#checkboxPlayer6Connected::indicator:unchecked,
QCheckBox#checkboxPlayer7Connected::indicator:unchecked,
QCheckBox#checkboxPlayer8Connected::indicator:unchecked,
QGroupBox#groupConnectedController::indicator:unchecked {
border-radius: 2px;
border: 1px solid #929192;
background: transparent;
image: none;
border-radius: 2px;
border: 1px solid #929192;
background: transparent;
image: none;
}
QWidget#controllerPlayer1,
@ -275,5 +275,5 @@ QWidget#controllerPlayer5,
QWidget#controllerPlayer6,
QWidget#controllerPlayer7,
QWidget#controllerPlayer8 {
background: transparent;
background: transparent;
}

2
dist/qt_themes/qdarkstyle/style.qrc vendored
View File

@ -52,6 +52,6 @@
<file>rc/radio_unchecked.png</file>
</qresource>
<qresource prefix="qdarkstyle">
<file>style.qss</file>
<file>style.qss</file>
</qresource>
</RCC>

90
dist/qt_themes/qdarkstyle/style.qss vendored
View File

@ -1314,9 +1314,9 @@ QGroupBox#vibrationGroup::indicator {
QGroupBox#motionGroup::title,
QGroupBox#vibrationGroup::title {
spacing: 2px;
padding-left: 1px;
padding-right: 1px;
spacing: 2px;
padding-left: 1px;
padding-right: 1px;
}
QWidget#bottomPerGameInput,
@ -1330,30 +1330,30 @@ QGroupBox#groupPlayer5Connected:checked,
QGroupBox#groupPlayer6Connected:checked,
QGroupBox#groupPlayer7Connected:checked,
QGroupBox#groupPlayer8Connected:checked {
background-color: #232629;
background-color: #232629;
}
QWidget#topPerGameInput,
QWidget#middleControllerApplet {
background-color: #31363b;
background-color: #31363b;
}
QWidget#topPerGameInput QComboBox,
QWidget#middleControllerApplet QComboBox {
width: 119px;
width: 119px;
}
QRadioButton#radioDocked {
margin-left: -3px;
margin-left: -3px;
}
QRadioButton#radioUndocked {
margin-right: 5px;
margin-right: 5px;
}
QWidget#connectedControllers {
background: transparent;
background: transparent;
}
QWidget#playersSupported,
@ -1364,8 +1364,8 @@ QWidget#controllerSupported3,
QWidget#controllerSupported4,
QWidget#controllerSupported5,
QWidget#controllerSupported6 {
border: none;
background: transparent;
border: none;
background: transparent;
}
QGroupBox#groupPlayer1Connected,
@ -1376,12 +1376,12 @@ QGroupBox#groupPlayer5Connected,
QGroupBox#groupPlayer6Connected,
QGroupBox#groupPlayer7Connected,
QGroupBox#groupPlayer8Connected {
border: 1px solid #76797c;
border-radius: 3px;
padding: 0px;
min-height: 98px;
max-height: 98px;
margin-top: 0px;
border: 1px solid #76797c;
border-radius: 3px;
padding: 0px;
min-height: 98px;
max-height: 98px;
margin-top: 0px;
}
QGroupBox#groupPlayer1Connected:unchecked,
@ -1392,7 +1392,7 @@ QGroupBox#groupPlayer5Connected:unchecked,
QGroupBox#groupPlayer6Connected:unchecked,
QGroupBox#groupPlayer7Connected:unchecked,
QGroupBox#groupPlayer8Connected:unchecked {
border: 1px solid #54575b;
border: 1px solid #54575b;
}
QGroupBox#groupPlayer1Connected::title,
@ -1403,14 +1403,14 @@ QGroupBox#groupPlayer5Connected::title,
QGroupBox#groupPlayer6Connected::title,
QGroupBox#groupPlayer7Connected::title,
QGroupBox#groupPlayer8Connected::title {
subcontrol-origin: margin;
subcontrol-position: top left;
padding-left: 0px;
padding-right: 0px;
padding-top: 1px;
margin-left: -2px;
margin-right: -4px;
margin-bottom: 6px;
subcontrol-origin: margin;
subcontrol-position: top left;
padding-left: 0px;
padding-right: 0px;
padding-top: 1px;
margin-left: -2px;
margin-right: -4px;
margin-bottom: 6px;
}
QCheckBox#checkboxPlayer1Connected,
@ -1421,7 +1421,7 @@ QCheckBox#checkboxPlayer5Connected,
QCheckBox#checkboxPlayer6Connected,
QCheckBox#checkboxPlayer7Connected,
QCheckBox#checkboxPlayer8Connected {
spacing: 0px;
spacing: 0px;
}
QWidget#Player1LEDs,
@ -1432,7 +1432,7 @@ QWidget#Player5LEDs,
QWidget#Player6LEDs,
QWidget#Player7LEDs,
QWidget#Player8LEDs {
background: transparent;
background: transparent;
}
QWidget#Player1LEDs QCheckBox,
@ -1443,9 +1443,9 @@ QWidget#Player5LEDs QCheckBox,
QWidget#Player6LEDs QCheckBox,
QWidget#Player7LEDs QCheckBox,
QWidget#Player8LEDs QCheckBox {
spacing: 0px;
margin-bottom: 0px;
margin-right: 0px;
spacing: 0px;
margin-bottom: 0px;
margin-right: 0px;
}
QWidget#Player1LEDs QCheckBox::indicator,
@ -1456,9 +1456,9 @@ QWidget#Player5LEDs QCheckBox::indicator,
QWidget#Player6LEDs QCheckBox::indicator,
QWidget#Player7LEDs QCheckBox::indicator,
QWidget#Player8LEDs QCheckBox::indicator {
width: 6px;
height: 6px;
margin-left: 0px;
width: 6px;
height: 6px;
margin-left: 0px;
}
QWidget#bottomPerGameInput QCheckBox#checkboxPlayer1Connected::indicator,
@ -1469,8 +1469,8 @@ QWidget#bottomPerGameInput QCheckBox#checkboxPlayer5Connected::indicator,
QWidget#bottomPerGameInput QCheckBox#checkboxPlayer6Connected::indicator,
QWidget#bottomPerGameInput QCheckBox#checkboxPlayer7Connected::indicator,
QWidget#bottomPerGameInput QCheckBox#checkboxPlayer8Connected::indicator {
width: 12px;
height: 12px;
width: 12px;
height: 12px;
}
QCheckBox#checkboxPlayer1Connected::indicator,
@ -1522,10 +1522,10 @@ QCheckBox#checkboxPlayer6Connected::indicator:checked,
QCheckBox#checkboxPlayer7Connected::indicator:checked,
QCheckBox#checkboxPlayer8Connected::indicator:checked,
QGroupBox#groupConnectedController::indicator:checked {
border-radius: 2px;
border: 1px solid #929192;
background: #39ff14;
image: none;
border-radius: 2px;
border: 1px solid #929192;
background: #39ff14;
image: none;
}
QWidget#Player1LEDs QCheckBox::indicator:unchecked,
@ -1553,10 +1553,10 @@ QCheckBox#checkboxPlayer6Connected::indicator:unchecked,
QCheckBox#checkboxPlayer7Connected::indicator:unchecked,
QCheckBox#checkboxPlayer8Connected::indicator:unchecked,
QGroupBox#groupConnectedController::indicator:unchecked {
border-radius: 2px;
border: 1px solid #929192;
background: transparent;
image: none;
border-radius: 2px;
border: 1px solid #929192;
background: transparent;
image: none;
}
QWidget#controllerPlayer1,
@ -1567,7 +1567,7 @@ QWidget#controllerPlayer5,
QWidget#controllerPlayer6,
QWidget#controllerPlayer7,
QWidget#controllerPlayer8 {
background: transparent;
background: transparent;
}
/* touchscreen mapping widget */

2
dist/qt_themes/qdarkstyle_midnight_blue/style.qrc vendored
View File

@ -221,6 +221,6 @@
<file>rc/window_undock_pressed@2x.png</file>
</qresource>
<qresource prefix="qdarkstyle_midnight_blue">
<file>style.qss</file>
<file>style.qss</file>
</qresource>
</RCC>

20
dist/qt_themes/qdarkstyle_midnight_blue/style.qss vendored
View File

@ -235,19 +235,19 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qgroupbox
--------------------------------------------------------------------------- */
QGroupBox {
font-weight: bold;
border: 1px solid #32414B;
border-radius: 4px;
margin-top: 12px;
padding: 4px;
font-weight: bold;
border: 1px solid #32414B;
border-radius: 4px;
margin-top: 12px;
padding: 4px;
}
QGroupBox::title {
subcontrol-origin: margin;
subcontrol-position: top left;
padding-left: 3px;
padding-right: 5px;
padding-top: 4px;
subcontrol-origin: margin;
subcontrol-position: top left;
padding-left: 3px;
padding-right: 5px;
padding-top: 4px;
}
QGroupBox::indicator {