From f0fac0c7fb6f7dd9fe81747b3369767c8c9e7d01 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Wed, 22 Jul 2020 10:39:53 -0400 Subject: =?UTF-8?q?Project=20Mj=C3=B6lnir:=20Part=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: James Rowe Co-authored-by: Its-Rei --- dist/icons/controller/controller.qrc | 25 ++++ dist/icons/controller/dual_joycon.png | Bin 0 -> 36466 bytes dist/icons/controller/dual_joycon_dark.png | Bin 0 -> 36261 bytes dist/icons/controller/dual_joycon_midnight.png | Bin 0 -> 34667 bytes dist/icons/controller/handheld.png | Bin 0 -> 14108 bytes dist/icons/controller/handheld_dark.png | Bin 0 -> 13731 bytes dist/icons/controller/handheld_midnight.png | Bin 0 -> 13366 bytes dist/icons/controller/pro_controller.png | Bin 0 -> 36710 bytes dist/icons/controller/pro_controller_dark.png | Bin 0 -> 34897 bytes dist/icons/controller/pro_controller_midnight.png | Bin 0 -> 35893 bytes dist/icons/controller/single_joycon_left.png | Bin 0 -> 25565 bytes dist/icons/controller/single_joycon_left_dark.png | Bin 0 -> 25682 bytes .../controller/single_joycon_left_midnight.png | Bin 0 -> 24405 bytes .../controller/single_joycon_left_vertical.png | Bin 0 -> 24764 bytes .../single_joycon_left_vertical_dark.png | Bin 0 -> 24938 bytes .../single_joycon_left_vertical_midnight.png | Bin 0 -> 23681 bytes dist/icons/controller/single_joycon_right.png | Bin 0 -> 28320 bytes dist/icons/controller/single_joycon_right_dark.png | Bin 0 -> 28157 bytes .../controller/single_joycon_right_midnight.png | Bin 0 -> 27006 bytes .../controller/single_joycon_right_vertical.png | Bin 0 -> 27655 bytes .../single_joycon_right_vertical_dark.png | Bin 0 -> 27729 bytes .../single_joycon_right_vertical_midnight.png | Bin 0 -> 26354 bytes dist/license.md | 3 + .../colorful_dark/icons/16x16/refresh.png | Bin 0 -> 362 bytes .../colorful_dark/icons/16x16/view-refresh.png | Bin 0 -> 362 bytes dist/qt_themes/colorful_dark/style.qrc | 1 + .../colorful_midnight_blue/icons/16x16/refresh.png | Bin 0 -> 362 bytes .../icons/16x16/view-refresh.png | Bin 0 -> 362 bytes dist/qt_themes/colorful_midnight_blue/style.qrc | 1 + dist/qt_themes/default/default.qrc | 1 + dist/qt_themes/default/icons/16x16/refresh.png | Bin 0 -> 349 bytes .../qt_themes/default/icons/16x16/view-refresh.png | Bin 0 -> 349 bytes dist/qt_themes/default/style.qss | 62 ++++++++- dist/qt_themes/qdarkstyle/icons/16x16/refresh.png | Bin 0 -> 362 bytes .../qdarkstyle/icons/16x16/view-refresh.png | Bin 0 -> 362 bytes dist/qt_themes/qdarkstyle/style.qrc | 1 + dist/qt_themes/qdarkstyle/style.qss | 105 +++++++++++++++- .../icons/16x16/refresh.png | Bin 0 -> 362 bytes .../icons/16x16/view-refresh.png | Bin 0 -> 362 bytes dist/qt_themes/qdarkstyle_midnight_blue/style.qrc | 1 + dist/qt_themes/qdarkstyle_midnight_blue/style.qss | 140 +++++++++++++++++++-- 41 files changed, 323 insertions(+), 17 deletions(-) create mode 100644 dist/icons/controller/controller.qrc create mode 100644 dist/icons/controller/dual_joycon.png create mode 100644 dist/icons/controller/dual_joycon_dark.png create mode 100644 dist/icons/controller/dual_joycon_midnight.png create mode 100644 dist/icons/controller/handheld.png create mode 100644 dist/icons/controller/handheld_dark.png create mode 100644 dist/icons/controller/handheld_midnight.png create mode 100644 dist/icons/controller/pro_controller.png create mode 100644 dist/icons/controller/pro_controller_dark.png create mode 100644 dist/icons/controller/pro_controller_midnight.png create mode 100644 dist/icons/controller/single_joycon_left.png create mode 100644 dist/icons/controller/single_joycon_left_dark.png create mode 100644 dist/icons/controller/single_joycon_left_midnight.png create mode 100644 dist/icons/controller/single_joycon_left_vertical.png create mode 100644 dist/icons/controller/single_joycon_left_vertical_dark.png create mode 100644 dist/icons/controller/single_joycon_left_vertical_midnight.png create mode 100644 dist/icons/controller/single_joycon_right.png create mode 100644 dist/icons/controller/single_joycon_right_dark.png create mode 100644 dist/icons/controller/single_joycon_right_midnight.png create mode 100644 dist/icons/controller/single_joycon_right_vertical.png create mode 100644 dist/icons/controller/single_joycon_right_vertical_dark.png create mode 100644 dist/icons/controller/single_joycon_right_vertical_midnight.png create mode 100644 dist/qt_themes/colorful_dark/icons/16x16/refresh.png create mode 100644 dist/qt_themes/colorful_dark/icons/16x16/view-refresh.png create mode 100644 dist/qt_themes/colorful_midnight_blue/icons/16x16/refresh.png create mode 100644 dist/qt_themes/colorful_midnight_blue/icons/16x16/view-refresh.png create mode 100644 dist/qt_themes/default/icons/16x16/refresh.png create mode 100644 dist/qt_themes/default/icons/16x16/view-refresh.png create mode 100644 dist/qt_themes/qdarkstyle/icons/16x16/refresh.png create mode 100644 dist/qt_themes/qdarkstyle/icons/16x16/view-refresh.png create mode 100644 dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/refresh.png create mode 100644 dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/view-refresh.png (limited to 'dist') diff --git a/dist/icons/controller/controller.qrc b/dist/icons/controller/controller.qrc new file mode 100644 index 000000000..f44725d8f --- /dev/null +++ b/dist/icons/controller/controller.qrc @@ -0,0 +1,25 @@ + + + dual_joycon.png + dual_joycon_dark.png + dual_joycon_midnight.png + handheld.png + handheld_dark.png + handheld_midnight.png + pro_controller.png + pro_controller_dark.png + pro_controller_midnight.png + single_joycon_left.png + single_joycon_left_dark.png + single_joycon_left_midnight.png + single_joycon_right.png + single_joycon_right_dark.png + single_joycon_right_midnight.png + single_joycon_left_vertical.png + single_joycon_left_vertical_dark.png + single_joycon_left_vertical_midnight.png + single_joycon_right_vertical.png + single_joycon_right_vertical_dark.png + single_joycon_right_vertical_midnight.png + + diff --git a/dist/icons/controller/dual_joycon.png b/dist/icons/controller/dual_joycon.png new file mode 100644 index 000000000..4230f5f7b Binary files /dev/null and b/dist/icons/controller/dual_joycon.png differ diff --git a/dist/icons/controller/dual_joycon_dark.png b/dist/icons/controller/dual_joycon_dark.png new file mode 100644 index 000000000..4445db489 Binary files /dev/null and b/dist/icons/controller/dual_joycon_dark.png differ diff --git a/dist/icons/controller/dual_joycon_midnight.png b/dist/icons/controller/dual_joycon_midnight.png new file mode 100644 index 000000000..aac8e5321 Binary files /dev/null and b/dist/icons/controller/dual_joycon_midnight.png differ diff --git a/dist/icons/controller/handheld.png b/dist/icons/controller/handheld.png new file mode 100644 index 000000000..d009b4a47 Binary files /dev/null and b/dist/icons/controller/handheld.png differ diff --git a/dist/icons/controller/handheld_dark.png b/dist/icons/controller/handheld_dark.png new file mode 100644 index 000000000..c80ca9259 Binary files /dev/null and b/dist/icons/controller/handheld_dark.png differ diff --git a/dist/icons/controller/handheld_midnight.png b/dist/icons/controller/handheld_midnight.png new file mode 100644 index 000000000..19de4629b Binary files /dev/null and b/dist/icons/controller/handheld_midnight.png differ diff --git a/dist/icons/controller/pro_controller.png b/dist/icons/controller/pro_controller.png new file mode 100644 index 000000000..07d65e94a Binary files /dev/null and b/dist/icons/controller/pro_controller.png differ diff --git a/dist/icons/controller/pro_controller_dark.png b/dist/icons/controller/pro_controller_dark.png new file mode 100644 index 000000000..73efe18f4 Binary files /dev/null and b/dist/icons/controller/pro_controller_dark.png differ diff --git a/dist/icons/controller/pro_controller_midnight.png b/dist/icons/controller/pro_controller_midnight.png new file mode 100644 index 000000000..8d7e63f0d Binary files /dev/null and b/dist/icons/controller/pro_controller_midnight.png differ diff --git a/dist/icons/controller/single_joycon_left.png b/dist/icons/controller/single_joycon_left.png new file mode 100644 index 000000000..547153034 Binary files /dev/null and b/dist/icons/controller/single_joycon_left.png differ diff --git a/dist/icons/controller/single_joycon_left_dark.png b/dist/icons/controller/single_joycon_left_dark.png new file mode 100644 index 000000000..b6ee073cb Binary files /dev/null and b/dist/icons/controller/single_joycon_left_dark.png differ diff --git a/dist/icons/controller/single_joycon_left_midnight.png b/dist/icons/controller/single_joycon_left_midnight.png new file mode 100644 index 000000000..34a485c81 Binary files /dev/null and b/dist/icons/controller/single_joycon_left_midnight.png differ diff --git a/dist/icons/controller/single_joycon_left_vertical.png b/dist/icons/controller/single_joycon_left_vertical.png new file mode 100644 index 000000000..1e6282ad8 Binary files /dev/null and b/dist/icons/controller/single_joycon_left_vertical.png differ diff --git a/dist/icons/controller/single_joycon_left_vertical_dark.png b/dist/icons/controller/single_joycon_left_vertical_dark.png new file mode 100644 index 000000000..a615d995d Binary files /dev/null and b/dist/icons/controller/single_joycon_left_vertical_dark.png differ diff --git a/dist/icons/controller/single_joycon_left_vertical_midnight.png b/dist/icons/controller/single_joycon_left_vertical_midnight.png new file mode 100644 index 000000000..4cc578216 Binary files /dev/null and b/dist/icons/controller/single_joycon_left_vertical_midnight.png differ diff --git a/dist/icons/controller/single_joycon_right.png b/dist/icons/controller/single_joycon_right.png new file mode 100644 index 000000000..8d29173f6 Binary files /dev/null and b/dist/icons/controller/single_joycon_right.png differ diff --git a/dist/icons/controller/single_joycon_right_dark.png b/dist/icons/controller/single_joycon_right_dark.png new file mode 100644 index 000000000..ead2c44e0 Binary files /dev/null and b/dist/icons/controller/single_joycon_right_dark.png differ diff --git a/dist/icons/controller/single_joycon_right_midnight.png b/dist/icons/controller/single_joycon_right_midnight.png new file mode 100644 index 000000000..89afe022d Binary files /dev/null and b/dist/icons/controller/single_joycon_right_midnight.png differ diff --git a/dist/icons/controller/single_joycon_right_vertical.png b/dist/icons/controller/single_joycon_right_vertical.png new file mode 100644 index 000000000..4d7d06547 Binary files /dev/null and b/dist/icons/controller/single_joycon_right_vertical.png differ diff --git a/dist/icons/controller/single_joycon_right_vertical_dark.png b/dist/icons/controller/single_joycon_right_vertical_dark.png new file mode 100644 index 000000000..9a6eb3013 Binary files /dev/null and b/dist/icons/controller/single_joycon_right_vertical_dark.png differ diff --git a/dist/icons/controller/single_joycon_right_vertical_midnight.png b/dist/icons/controller/single_joycon_right_vertical_midnight.png new file mode 100644 index 000000000..685249b68 Binary files /dev/null and b/dist/icons/controller/single_joycon_right_vertical_midnight.png differ diff --git a/dist/license.md b/dist/license.md index f1ff35c95..e9bc87656 100644 --- a/dist/license.md +++ b/dist/license.md @@ -5,6 +5,7 @@ Icon Name | License | Origin/Author qt_themes/default/icons/16x16/checked.png | CC BY-ND 3.0 | https://icons8.com qt_themes/default/icons/16x16/failed.png | CC BY-ND 3.0 | https://icons8.com qt_themes/default/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com +qt_themes/default/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io qt_themes/default/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com qt_themes/default/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com qt_themes/default/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com @@ -12,6 +13,7 @@ qt_themes/default/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com qt_themes/default/icons/48x48/plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team qt_themes/default/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com qt_themes/qdarkstyle/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com +qt_themes/qdarkstyle/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io qt_themes/qdarkstyle/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com qt_themes/qdarkstyle/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com qt_themes/qdarkstyle/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com @@ -19,6 +21,7 @@ qt_themes/qdarkstyle/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com qt_themes/qdarkstyle/icons/48x48/plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team qt_themes/qdarkstyle/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com qt_themes/colorful/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com +qt_themes/colorful/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io qt_themes/colorful/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com qt_themes/colorful/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com qt_themes/colorful/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com diff --git a/dist/qt_themes/colorful_dark/icons/16x16/refresh.png b/dist/qt_themes/colorful_dark/icons/16x16/refresh.png new file mode 100644 index 000000000..d4afd76f9 Binary files /dev/null and b/dist/qt_themes/colorful_dark/icons/16x16/refresh.png differ diff --git a/dist/qt_themes/colorful_dark/icons/16x16/view-refresh.png b/dist/qt_themes/colorful_dark/icons/16x16/view-refresh.png new file mode 100644 index 000000000..d4afd76f9 Binary files /dev/null and b/dist/qt_themes/colorful_dark/icons/16x16/view-refresh.png differ diff --git a/dist/qt_themes/colorful_dark/style.qrc b/dist/qt_themes/colorful_dark/style.qrc index 27a6cc87d..0abcb4e83 100644 --- a/dist/qt_themes/colorful_dark/style.qrc +++ b/dist/qt_themes/colorful_dark/style.qrc @@ -2,6 +2,7 @@ icons/index.theme icons/16x16/lock.png + icons/16x16/view-refresh.png ../colorful/icons/48x48/bad_folder.png ../colorful/icons/48x48/chip.png ../colorful/icons/48x48/folder.png diff --git a/dist/qt_themes/colorful_midnight_blue/icons/16x16/refresh.png b/dist/qt_themes/colorful_midnight_blue/icons/16x16/refresh.png new file mode 100644 index 000000000..d4afd76f9 Binary files /dev/null and b/dist/qt_themes/colorful_midnight_blue/icons/16x16/refresh.png differ diff --git a/dist/qt_themes/colorful_midnight_blue/icons/16x16/view-refresh.png b/dist/qt_themes/colorful_midnight_blue/icons/16x16/view-refresh.png new file mode 100644 index 000000000..d4afd76f9 Binary files /dev/null and b/dist/qt_themes/colorful_midnight_blue/icons/16x16/view-refresh.png differ diff --git a/dist/qt_themes/colorful_midnight_blue/style.qrc b/dist/qt_themes/colorful_midnight_blue/style.qrc index fd33bc850..bf367099a 100644 --- a/dist/qt_themes/colorful_midnight_blue/style.qrc +++ b/dist/qt_themes/colorful_midnight_blue/style.qrc @@ -2,6 +2,7 @@ icons/index.theme icons/16x16/lock.png + icons/16x16/view-refresh.png ../colorful/icons/48x48/bad_folder.png ../colorful/icons/48x48/chip.png ../colorful/icons/48x48/folder.png diff --git a/dist/qt_themes/default/default.qrc b/dist/qt_themes/default/default.qrc index c51fdb26c..2182f33f3 100644 --- a/dist/qt_themes/default/default.qrc +++ b/dist/qt_themes/default/default.qrc @@ -4,6 +4,7 @@ icons/16x16/checked.png icons/16x16/failed.png icons/16x16/lock.png + icons/16x16/view-refresh.png icons/48x48/bad_folder.png icons/48x48/chip.png icons/48x48/folder.png diff --git a/dist/qt_themes/default/icons/16x16/refresh.png b/dist/qt_themes/default/icons/16x16/refresh.png new file mode 100644 index 000000000..69f9474ac Binary files /dev/null and b/dist/qt_themes/default/icons/16x16/refresh.png differ diff --git a/dist/qt_themes/default/icons/16x16/view-refresh.png b/dist/qt_themes/default/icons/16x16/view-refresh.png new file mode 100644 index 000000000..69f9474ac Binary files /dev/null and b/dist/qt_themes/default/icons/16x16/view-refresh.png differ diff --git a/dist/qt_themes/default/style.qss b/dist/qt_themes/default/style.qss index 6b5953e38..5da56520b 100644 --- a/dist/qt_themes/default/style.qss +++ b/dist/qt_themes/default/style.qss @@ -30,6 +30,66 @@ QPushButton#RendererStatusBarButton:checked { color: #e85c00; } -QPushButton#RendererStatusBarButton:!checked{ +QPushButton#RendererStatusBarButton:!checked { color: #0066ff; } + +QPushButton#buttonRefreshDevices { + min-width: 20px; + min-height: 20px; + max-width: 20px; + max-height: 20px; +} + +QCheckBox#checkboxPlayer1Connected, +QCheckBox#checkboxPlayer2Connected, +QCheckBox#checkboxPlayer3Connected, +QCheckBox#checkboxPlayer4Connected, +QCheckBox#checkboxPlayer5Connected, +QCheckBox#checkboxPlayer6Connected, +QCheckBox#checkboxPlayer7Connected, +QCheckBox#checkboxPlayer8Connected { + spacing: 0px; +} + +QCheckBox#checkboxPlayer1Connected::indicator, +QCheckBox#checkboxPlayer2Connected::indicator, +QCheckBox#checkboxPlayer3Connected::indicator, +QCheckBox#checkboxPlayer4Connected::indicator, +QCheckBox#checkboxPlayer5Connected::indicator, +QCheckBox#checkboxPlayer6Connected::indicator, +QCheckBox#checkboxPlayer7Connected::indicator, +QCheckBox#checkboxPlayer8Connected::indicator { + width: 14px; + height: 14px; +} + +QCheckBox#checkboxPlayer1Connected::indicator:checked, +QCheckBox#checkboxPlayer2Connected::indicator:checked, +QCheckBox#checkboxPlayer3Connected::indicator:checked, +QCheckBox#checkboxPlayer4Connected::indicator:checked, +QCheckBox#checkboxPlayer5Connected::indicator:checked, +QCheckBox#checkboxPlayer6Connected::indicator:checked, +QCheckBox#checkboxPlayer7Connected::indicator:checked, +QCheckBox#checkboxPlayer8Connected::indicator:checked, +QGroupBox#groupConnectedController::indicator:checked { + border-radius: 2px; + border: 1px solid black; + background: #39ff14; + image: none; +} + +QCheckBox#checkboxPlayer1Connected::indicator:unchecked, +QCheckBox#checkboxPlayer2Connected::indicator:unchecked, +QCheckBox#checkboxPlayer3Connected::indicator:unchecked, +QCheckBox#checkboxPlayer4Connected::indicator:unchecked, +QCheckBox#checkboxPlayer5Connected::indicator:unchecked, +QCheckBox#checkboxPlayer6Connected::indicator:unchecked, +QCheckBox#checkboxPlayer7Connected::indicator:unchecked, +QCheckBox#checkboxPlayer8Connected::indicator:unchecked, +QGroupBox#groupConnectedController::indicator:unchecked { + border-radius: 2px; + border: 1px solid black; + background: transparent; + image: none; +} diff --git a/dist/qt_themes/qdarkstyle/icons/16x16/refresh.png b/dist/qt_themes/qdarkstyle/icons/16x16/refresh.png new file mode 100644 index 000000000..d4afd76f9 Binary files /dev/null and b/dist/qt_themes/qdarkstyle/icons/16x16/refresh.png differ diff --git a/dist/qt_themes/qdarkstyle/icons/16x16/view-refresh.png b/dist/qt_themes/qdarkstyle/icons/16x16/view-refresh.png new file mode 100644 index 000000000..d4afd76f9 Binary files /dev/null and b/dist/qt_themes/qdarkstyle/icons/16x16/view-refresh.png differ diff --git a/dist/qt_themes/qdarkstyle/style.qrc b/dist/qt_themes/qdarkstyle/style.qrc index c2c14c28a..ec07ba160 100644 --- a/dist/qt_themes/qdarkstyle/style.qrc +++ b/dist/qt_themes/qdarkstyle/style.qrc @@ -2,6 +2,7 @@ icons/index.theme icons/16x16/lock.png + icons/16x16/view-refresh.png icons/48x48/bad_folder.png icons/48x48/chip.png icons/48x48/folder.png diff --git a/dist/qt_themes/qdarkstyle/style.qss b/dist/qt_themes/qdarkstyle/style.qss index 2926a05fa..7755426f8 100644 --- a/dist/qt_themes/qdarkstyle/style.qss +++ b/dist/qt_themes/qdarkstyle/style.qss @@ -40,8 +40,8 @@ QCheckBox:disabled { QCheckBox::indicator, QGroupBox::indicator { - width: 18px; - height: 18px; + width: 16px; + height: 16px; } QGroupBox::indicator { @@ -1237,6 +1237,7 @@ QPlainTextEdit:disabled { background-color: #2b2e31; } + QPushButton#TogglableStatusBarButton { min-width: 0px; color: #656565; @@ -1271,6 +1272,102 @@ QPushButton#RendererStatusBarButton:checked { color: #e85c00; } -QPushButton#RendererStatusBarButton:!checked{ - color: #00ccdd; +QPushButton#RendererStatusBarButton:!checked { + color: #00ccdd; +} + +QPushButton#buttonRefreshDevices { + min-width: 24px; + min-height: 24px; + max-width: 24px; + max-height: 24px; + padding: 0px 0px; +} + +QCheckBox#checkboxPlayer1Connected, +QCheckBox#checkboxPlayer2Connected, +QCheckBox#checkboxPlayer3Connected, +QCheckBox#checkboxPlayer4Connected, +QCheckBox#checkboxPlayer5Connected, +QCheckBox#checkboxPlayer6Connected, +QCheckBox#checkboxPlayer7Connected, +QCheckBox#checkboxPlayer8Connected { + spacing: 0px; +} + +QCheckBox#checkboxPlayer1Connected::indicator, +QCheckBox#checkboxPlayer2Connected::indicator, +QCheckBox#checkboxPlayer3Connected::indicator, +QCheckBox#checkboxPlayer4Connected::indicator, +QCheckBox#checkboxPlayer5Connected::indicator, +QCheckBox#checkboxPlayer6Connected::indicator, +QCheckBox#checkboxPlayer7Connected::indicator, +QCheckBox#checkboxPlayer8Connected::indicator { + width: 14px; + height: 14px; +} + +QCheckBox#checkboxPlayer1Connected::indicator:checked, +QCheckBox#checkboxPlayer2Connected::indicator:checked, +QCheckBox#checkboxPlayer3Connected::indicator:checked, +QCheckBox#checkboxPlayer4Connected::indicator:checked, +QCheckBox#checkboxPlayer5Connected::indicator:checked, +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; +} + +QCheckBox#checkboxPlayer1Connected::indicator:unchecked, +QCheckBox#checkboxPlayer2Connected::indicator:unchecked, +QCheckBox#checkboxPlayer3Connected::indicator:unchecked, +QCheckBox#checkboxPlayer4Connected::indicator:unchecked, +QCheckBox#checkboxPlayer5Connected::indicator:unchecked, +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; +} + +QSpinBox#spinboxLStickRange, +QSpinBox#spinboxRStickRange { + padding: 4px 0px 5px 0px; + min-width: 63px; +} + +QSpinBox#vibrationSpin { + padding: 4px 0px 5px 0px; + min-width: 63px; +} + +QSpinBox#spinboxLStickRange:up-button, +QSpinBox#spinboxRStickRange:up-button, +QSpinBox#vibrationSpin:up-button { + left: -2px; +} + +QSpinBox#spinboxLStickRange:down-button, +QSpinBox#spinboxRStickRange:down-button, +QSpinBox#vibrationSpin:down-button { + right: -1px; +} + +QGroupBox#motionGroup::indicator, +QGroupBox#vibrationGroup::indicator { + margin-left: 0px; +} + +QGroupBox#motionGroup::title, +QGroupBox#vibrationGroup::title { + spacing: 2px; + padding-left: 1px; + padding-right: 1px; } diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/refresh.png b/dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/refresh.png new file mode 100644 index 000000000..d4afd76f9 Binary files /dev/null and b/dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/refresh.png differ diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/view-refresh.png b/dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/view-refresh.png new file mode 100644 index 000000000..d4afd76f9 Binary files /dev/null and b/dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/view-refresh.png differ diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/style.qrc b/dist/qt_themes/qdarkstyle_midnight_blue/style.qrc index 1b7686f15..616aace73 100644 --- a/dist/qt_themes/qdarkstyle_midnight_blue/style.qrc +++ b/dist/qt_themes/qdarkstyle_midnight_blue/style.qrc @@ -2,6 +2,7 @@ icons/index.theme icons/16x16/lock.png + icons/16x16/view-refresh.png icons/48x48/bad_folder.png icons/48x48/chip.png icons/48x48/folder.png diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/style.qss b/dist/qt_themes/qdarkstyle_midnight_blue/style.qss index 9c24b0d07..0ecdf271e 100644 --- a/dist/qt_themes/qdarkstyle_midnight_blue/style.qss +++ b/dist/qt_themes/qdarkstyle_midnight_blue/style.qss @@ -236,21 +236,19 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qgroupbox --------------------------------------------------------------------------- */ QGroupBox { - font-weight: bold; - border: 1px solid #32414B; - border-radius: 4px; - padding: 4px; - margin-top: 16px; + font-weight: bold; + border: 1px solid #32414B; + border-radius: 4px; + margin-top: 12px; + padding: 4px; } QGroupBox::title { - subcontrol-origin: margin; - subcontrol-position: top left; - left: 3px; - padding-left: 3px; - padding-right: 5px; - padding-top: 8px; - padding-bottom: 16px; + subcontrol-origin: margin; + subcontrol-position: top left; + padding-left: 3px; + padding-right: 5px; + padding-top: 4px; } QGroupBox::indicator { @@ -2172,3 +2170,121 @@ PlotWidget { /* Fix cut labels in plots #134 */ padding: 0px; } + + +QPushButton#TogglableStatusBarButton { + min-width: 0px; + color: #656565; + border: 1px solid transparent; + background-color: transparent; + padding: 0px 3px 0px 3px; + text-align: center; +} + +QPushButton#TogglableStatusBarButton:checked { + color: #ffffff; +} + +QPushButton#TogglableStatusBarButton:hover { + border: 1px solid #76797C; +} + +QPushButton#RendererStatusBarButton { + min-width: 0px; + color: #656565; + border: 1px solid transparent; + background-color: transparent; + padding: 0px 3px 0px 3px; + text-align: center; +} + +QPushButton#RendererStatusBarButton:hover { + border: 1px solid #76797C; +} + +QPushButton#RendererStatusBarButton:checked { + color: #e85c00; +} + +QPushButton#RendererStatusBarButton:!checked { + color: #00ccdd; +} + +QPushButton#buttonRefreshDevices { + min-width: 20px; + min-height: 20px; + max-width: 20px; + max-height: 20px; + padding: 0px 0px; +} + + +QCheckBox#checkboxPlayer1Connected, +QCheckBox#checkboxPlayer2Connected, +QCheckBox#checkboxPlayer3Connected, +QCheckBox#checkboxPlayer4Connected, +QCheckBox#checkboxPlayer5Connected, +QCheckBox#checkboxPlayer6Connected, +QCheckBox#checkboxPlayer7Connected, +QCheckBox#checkboxPlayer8Connected { + spacing: 0px; +} + +QCheckBox#checkboxPlayer1Connected::indicator, +QCheckBox#checkboxPlayer2Connected::indicator, +QCheckBox#checkboxPlayer3Connected::indicator, +QCheckBox#checkboxPlayer4Connected::indicator, +QCheckBox#checkboxPlayer5Connected::indicator, +QCheckBox#checkboxPlayer6Connected::indicator, +QCheckBox#checkboxPlayer7Connected::indicator, +QCheckBox#checkboxPlayer8Connected::indicator { + width: 14px; + height: 14px; +} + +QCheckBox#checkboxPlayer1Connected::indicator:checked, +QCheckBox#checkboxPlayer2Connected::indicator:checked, +QCheckBox#checkboxPlayer3Connected::indicator:checked, +QCheckBox#checkboxPlayer4Connected::indicator:checked, +QCheckBox#checkboxPlayer5Connected::indicator:checked, +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; +} + +QCheckBox#checkboxPlayer1Connected::indicator:unchecked, +QCheckBox#checkboxPlayer2Connected::indicator:unchecked, +QCheckBox#checkboxPlayer3Connected::indicator:unchecked, +QCheckBox#checkboxPlayer4Connected::indicator:unchecked, +QCheckBox#checkboxPlayer5Connected::indicator:unchecked, +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; +} + +QSpinBox#spinboxLStickRange, +QSpinBox#spinboxRStickRange { + min-width: 53px; +} + +QGroupBox#motionGroup::indicator, +QGroupBox#vibrationGroup::indicator { + margin-left: 0px; +} + +QGroupBox#motionGroup::title, +QGroupBox#vibrationGroup::title { +spacing: 2px; + padding-left: 1px; + padding-right: 1px; +} -- cgit v1.2.3