diff options
| author | 2020-07-22 10:39:53 -0400 | |
|---|---|---|
| committer | 2020-08-26 02:32:32 -0400 | |
| commit | f0fac0c7fb6f7dd9fe81747b3369767c8c9e7d01 (patch) | |
| tree | 4438688a9b9b4bc015985f2df1a731de57fe50db /dist | |
| parent | Merge pull request #4582 from lioncash/xbyak (diff) | |
| download | yuzu-f0fac0c7fb6f7dd9fe81747b3369767c8c9e7d01.tar.gz yuzu-f0fac0c7fb6f7dd9fe81747b3369767c8c9e7d01.tar.xz yuzu-f0fac0c7fb6f7dd9fe81747b3369767c8c9e7d01.zip | |
Project Mjölnir: Part 1
Co-authored-by: James Rowe <jroweboy@gmail.com>
Co-authored-by: Its-Rei <kupfel@gmail.com>
Diffstat (limited to 'dist')
41 files changed, 323 insertions, 17 deletions
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 @@ | |||
| 1 | <RCC> | ||
| 2 | <qresource prefix="controller"> | ||
| 3 | <file alias="dual_joycon">dual_joycon.png</file> | ||
| 4 | <file alias="dual_joycon_dark">dual_joycon_dark.png</file> | ||
| 5 | <file alias="dual_joycon_midnight">dual_joycon_midnight.png</file> | ||
| 6 | <file alias="handheld">handheld.png</file> | ||
| 7 | <file alias="handheld_dark">handheld_dark.png</file> | ||
| 8 | <file alias="handheld_midnight">handheld_midnight.png</file> | ||
| 9 | <file alias="pro_controller">pro_controller.png</file> | ||
| 10 | <file alias="pro_controller_dark">pro_controller_dark.png</file> | ||
| 11 | <file alias="pro_controller_midnight">pro_controller_midnight.png</file> | ||
| 12 | <file alias="single_joycon_left">single_joycon_left.png</file> | ||
| 13 | <file alias="single_joycon_left_dark">single_joycon_left_dark.png</file> | ||
| 14 | <file alias="single_joycon_left_midnight">single_joycon_left_midnight.png</file> | ||
| 15 | <file alias="single_joycon_right">single_joycon_right.png</file> | ||
| 16 | <file alias="single_joycon_right_dark">single_joycon_right_dark.png</file> | ||
| 17 | <file alias="single_joycon_right_midnight">single_joycon_right_midnight.png</file> | ||
| 18 | <file alias="single_joycon_left_vertical">single_joycon_left_vertical.png</file> | ||
| 19 | <file alias="single_joycon_left_vertical_dark">single_joycon_left_vertical_dark.png</file> | ||
| 20 | <file alias="single_joycon_left_vertical_midnight">single_joycon_left_vertical_midnight.png</file> | ||
| 21 | <file alias="single_joycon_right_vertical">single_joycon_right_vertical.png</file> | ||
| 22 | <file alias="single_joycon_right_vertical_dark">single_joycon_right_vertical_dark.png</file> | ||
| 23 | <file alias="single_joycon_right_vertical_midnight">single_joycon_right_vertical_midnight.png</file> | ||
| 24 | </qresource> | ||
| 25 | </RCC> | ||
diff --git a/dist/icons/controller/dual_joycon.png b/dist/icons/controller/dual_joycon.png new file mode 100644 index 000000000..4230f5f7b --- /dev/null +++ b/dist/icons/controller/dual_joycon.png | |||
| Binary files 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 --- /dev/null +++ b/dist/icons/controller/dual_joycon_dark.png | |||
| Binary files 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 --- /dev/null +++ b/dist/icons/controller/dual_joycon_midnight.png | |||
| Binary files differ | |||
diff --git a/dist/icons/controller/handheld.png b/dist/icons/controller/handheld.png new file mode 100644 index 000000000..d009b4a47 --- /dev/null +++ b/dist/icons/controller/handheld.png | |||
| Binary files differ | |||
diff --git a/dist/icons/controller/handheld_dark.png b/dist/icons/controller/handheld_dark.png new file mode 100644 index 000000000..c80ca9259 --- /dev/null +++ b/dist/icons/controller/handheld_dark.png | |||
| Binary files differ | |||
diff --git a/dist/icons/controller/handheld_midnight.png b/dist/icons/controller/handheld_midnight.png new file mode 100644 index 000000000..19de4629b --- /dev/null +++ b/dist/icons/controller/handheld_midnight.png | |||
| Binary files differ | |||
diff --git a/dist/icons/controller/pro_controller.png b/dist/icons/controller/pro_controller.png new file mode 100644 index 000000000..07d65e94a --- /dev/null +++ b/dist/icons/controller/pro_controller.png | |||
| Binary files 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 --- /dev/null +++ b/dist/icons/controller/pro_controller_dark.png | |||
| Binary files 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 --- /dev/null +++ b/dist/icons/controller/pro_controller_midnight.png | |||
| Binary files 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 --- /dev/null +++ b/dist/icons/controller/single_joycon_left.png | |||
| Binary files 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 --- /dev/null +++ b/dist/icons/controller/single_joycon_left_dark.png | |||
| Binary files 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 --- /dev/null +++ b/dist/icons/controller/single_joycon_left_midnight.png | |||
| Binary files 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 --- /dev/null +++ b/dist/icons/controller/single_joycon_left_vertical.png | |||
| Binary files 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 --- /dev/null +++ b/dist/icons/controller/single_joycon_left_vertical_dark.png | |||
| Binary files 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 --- /dev/null +++ b/dist/icons/controller/single_joycon_left_vertical_midnight.png | |||
| Binary files 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 --- /dev/null +++ b/dist/icons/controller/single_joycon_right.png | |||
| Binary files 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 --- /dev/null +++ b/dist/icons/controller/single_joycon_right_dark.png | |||
| Binary files 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 --- /dev/null +++ b/dist/icons/controller/single_joycon_right_midnight.png | |||
| Binary files 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 --- /dev/null +++ b/dist/icons/controller/single_joycon_right_vertical.png | |||
| Binary files 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 --- /dev/null +++ b/dist/icons/controller/single_joycon_right_vertical_dark.png | |||
| Binary files 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 --- /dev/null +++ b/dist/icons/controller/single_joycon_right_vertical_midnight.png | |||
| Binary files 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 | |||
| 5 | qt_themes/default/icons/16x16/checked.png | CC BY-ND 3.0 | https://icons8.com | 5 | qt_themes/default/icons/16x16/checked.png | CC BY-ND 3.0 | https://icons8.com |
| 6 | qt_themes/default/icons/16x16/failed.png | CC BY-ND 3.0 | https://icons8.com | 6 | qt_themes/default/icons/16x16/failed.png | CC BY-ND 3.0 | https://icons8.com |
| 7 | qt_themes/default/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com | 7 | qt_themes/default/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com |
| 8 | qt_themes/default/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io | ||
| 8 | qt_themes/default/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com | 9 | qt_themes/default/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com |
| 9 | qt_themes/default/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com | 10 | qt_themes/default/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com |
| 10 | qt_themes/default/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com | 11 | 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 | |||
| 12 | qt_themes/default/icons/48x48/plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team | 13 | qt_themes/default/icons/48x48/plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team |
| 13 | qt_themes/default/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com | 14 | qt_themes/default/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com |
| 14 | qt_themes/qdarkstyle/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com | 15 | qt_themes/qdarkstyle/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com |
| 16 | qt_themes/qdarkstyle/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io | ||
| 15 | qt_themes/qdarkstyle/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com | 17 | qt_themes/qdarkstyle/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com |
| 16 | qt_themes/qdarkstyle/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com | 18 | qt_themes/qdarkstyle/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com |
| 17 | qt_themes/qdarkstyle/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com | 19 | 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 | |||
| 19 | qt_themes/qdarkstyle/icons/48x48/plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team | 21 | qt_themes/qdarkstyle/icons/48x48/plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team |
| 20 | qt_themes/qdarkstyle/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com | 22 | qt_themes/qdarkstyle/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com |
| 21 | qt_themes/colorful/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com | 23 | qt_themes/colorful/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com |
| 24 | qt_themes/colorful/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io | ||
| 22 | qt_themes/colorful/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com | 25 | qt_themes/colorful/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com |
| 23 | qt_themes/colorful/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com | 26 | qt_themes/colorful/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com |
| 24 | qt_themes/colorful/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com | 27 | 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 --- /dev/null +++ b/dist/qt_themes/colorful_dark/icons/16x16/refresh.png | |||
| Binary files 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 --- /dev/null +++ b/dist/qt_themes/colorful_dark/icons/16x16/view-refresh.png | |||
| Binary files 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 @@ | |||
| 2 | <qresource prefix="icons/colorful_dark"> | 2 | <qresource prefix="icons/colorful_dark"> |
| 3 | <file alias="index.theme">icons/index.theme</file> | 3 | <file alias="index.theme">icons/index.theme</file> |
| 4 | <file alias="16x16/lock.png">icons/16x16/lock.png</file> | 4 | <file alias="16x16/lock.png">icons/16x16/lock.png</file> |
| 5 | <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file> | ||
| 5 | <file alias="48x48/bad_folder.png">../colorful/icons/48x48/bad_folder.png</file> | 6 | <file alias="48x48/bad_folder.png">../colorful/icons/48x48/bad_folder.png</file> |
| 6 | <file alias="48x48/chip.png">../colorful/icons/48x48/chip.png</file> | 7 | <file alias="48x48/chip.png">../colorful/icons/48x48/chip.png</file> |
| 7 | <file alias="48x48/folder.png">../colorful/icons/48x48/folder.png</file> | 8 | <file alias="48x48/folder.png">../colorful/icons/48x48/folder.png</file> |
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 --- /dev/null +++ b/dist/qt_themes/colorful_midnight_blue/icons/16x16/refresh.png | |||
| Binary files 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 --- /dev/null +++ b/dist/qt_themes/colorful_midnight_blue/icons/16x16/view-refresh.png | |||
| Binary files 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 @@ | |||
| 2 | <qresource prefix="icons/colorful_midnight_blue"> | 2 | <qresource prefix="icons/colorful_midnight_blue"> |
| 3 | <file alias="index.theme">icons/index.theme</file> | 3 | <file alias="index.theme">icons/index.theme</file> |
| 4 | <file alias="16x16/lock.png">icons/16x16/lock.png</file> | 4 | <file alias="16x16/lock.png">icons/16x16/lock.png</file> |
| 5 | <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file> | ||
| 5 | <file alias="48x48/bad_folder.png">../colorful/icons/48x48/bad_folder.png</file> | 6 | <file alias="48x48/bad_folder.png">../colorful/icons/48x48/bad_folder.png</file> |
| 6 | <file alias="48x48/chip.png">../colorful/icons/48x48/chip.png</file> | 7 | <file alias="48x48/chip.png">../colorful/icons/48x48/chip.png</file> |
| 7 | <file alias="48x48/folder.png">../colorful/icons/48x48/folder.png</file> | 8 | <file alias="48x48/folder.png">../colorful/icons/48x48/folder.png</file> |
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 @@ | |||
| 4 | <file alias="16x16/checked.png">icons/16x16/checked.png</file> | 4 | <file alias="16x16/checked.png">icons/16x16/checked.png</file> |
| 5 | <file alias="16x16/failed.png">icons/16x16/failed.png</file> | 5 | <file alias="16x16/failed.png">icons/16x16/failed.png</file> |
| 6 | <file alias="16x16/lock.png">icons/16x16/lock.png</file> | 6 | <file alias="16x16/lock.png">icons/16x16/lock.png</file> |
| 7 | <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file> | ||
| 7 | <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file> | 8 | <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file> |
| 8 | <file alias="48x48/chip.png">icons/48x48/chip.png</file> | 9 | <file alias="48x48/chip.png">icons/48x48/chip.png</file> |
| 9 | <file alias="48x48/folder.png">icons/48x48/folder.png</file> | 10 | <file alias="48x48/folder.png">icons/48x48/folder.png</file> |
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 --- /dev/null +++ b/dist/qt_themes/default/icons/16x16/refresh.png | |||
| Binary files 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 --- /dev/null +++ b/dist/qt_themes/default/icons/16x16/view-refresh.png | |||
| Binary files 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 { | |||
| 30 | color: #e85c00; | 30 | color: #e85c00; |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | QPushButton#RendererStatusBarButton:!checked{ | 33 | QPushButton#RendererStatusBarButton:!checked { |
| 34 | color: #0066ff; | 34 | color: #0066ff; |
| 35 | } | 35 | } |
| 36 | |||
| 37 | QPushButton#buttonRefreshDevices { | ||
| 38 | min-width: 20px; | ||
| 39 | min-height: 20px; | ||
| 40 | max-width: 20px; | ||
| 41 | max-height: 20px; | ||
| 42 | } | ||
| 43 | |||
| 44 | QCheckBox#checkboxPlayer1Connected, | ||
| 45 | QCheckBox#checkboxPlayer2Connected, | ||
| 46 | QCheckBox#checkboxPlayer3Connected, | ||
| 47 | QCheckBox#checkboxPlayer4Connected, | ||
| 48 | QCheckBox#checkboxPlayer5Connected, | ||
| 49 | QCheckBox#checkboxPlayer6Connected, | ||
| 50 | QCheckBox#checkboxPlayer7Connected, | ||
| 51 | QCheckBox#checkboxPlayer8Connected { | ||
| 52 | spacing: 0px; | ||
| 53 | } | ||
| 54 | |||
| 55 | QCheckBox#checkboxPlayer1Connected::indicator, | ||
| 56 | QCheckBox#checkboxPlayer2Connected::indicator, | ||
| 57 | QCheckBox#checkboxPlayer3Connected::indicator, | ||
| 58 | QCheckBox#checkboxPlayer4Connected::indicator, | ||
| 59 | QCheckBox#checkboxPlayer5Connected::indicator, | ||
| 60 | QCheckBox#checkboxPlayer6Connected::indicator, | ||
| 61 | QCheckBox#checkboxPlayer7Connected::indicator, | ||
| 62 | QCheckBox#checkboxPlayer8Connected::indicator { | ||
| 63 | width: 14px; | ||
| 64 | height: 14px; | ||
| 65 | } | ||
| 66 | |||
| 67 | QCheckBox#checkboxPlayer1Connected::indicator:checked, | ||
| 68 | QCheckBox#checkboxPlayer2Connected::indicator:checked, | ||
| 69 | QCheckBox#checkboxPlayer3Connected::indicator:checked, | ||
| 70 | QCheckBox#checkboxPlayer4Connected::indicator:checked, | ||
| 71 | QCheckBox#checkboxPlayer5Connected::indicator:checked, | ||
| 72 | QCheckBox#checkboxPlayer6Connected::indicator:checked, | ||
| 73 | QCheckBox#checkboxPlayer7Connected::indicator:checked, | ||
| 74 | QCheckBox#checkboxPlayer8Connected::indicator:checked, | ||
| 75 | QGroupBox#groupConnectedController::indicator:checked { | ||
| 76 | border-radius: 2px; | ||
| 77 | border: 1px solid black; | ||
| 78 | background: #39ff14; | ||
| 79 | image: none; | ||
| 80 | } | ||
| 81 | |||
| 82 | QCheckBox#checkboxPlayer1Connected::indicator:unchecked, | ||
| 83 | QCheckBox#checkboxPlayer2Connected::indicator:unchecked, | ||
| 84 | QCheckBox#checkboxPlayer3Connected::indicator:unchecked, | ||
| 85 | QCheckBox#checkboxPlayer4Connected::indicator:unchecked, | ||
| 86 | QCheckBox#checkboxPlayer5Connected::indicator:unchecked, | ||
| 87 | QCheckBox#checkboxPlayer6Connected::indicator:unchecked, | ||
| 88 | QCheckBox#checkboxPlayer7Connected::indicator:unchecked, | ||
| 89 | QCheckBox#checkboxPlayer8Connected::indicator:unchecked, | ||
| 90 | QGroupBox#groupConnectedController::indicator:unchecked { | ||
| 91 | border-radius: 2px; | ||
| 92 | border: 1px solid black; | ||
| 93 | background: transparent; | ||
| 94 | image: none; | ||
| 95 | } | ||
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 --- /dev/null +++ b/dist/qt_themes/qdarkstyle/icons/16x16/refresh.png | |||
| Binary files 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 --- /dev/null +++ b/dist/qt_themes/qdarkstyle/icons/16x16/view-refresh.png | |||
| Binary files 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 @@ | |||
| 2 | <qresource prefix="icons/qdarkstyle"> | 2 | <qresource prefix="icons/qdarkstyle"> |
| 3 | <file alias="index.theme">icons/index.theme</file> | 3 | <file alias="index.theme">icons/index.theme</file> |
| 4 | <file alias="16x16/lock.png">icons/16x16/lock.png</file> | 4 | <file alias="16x16/lock.png">icons/16x16/lock.png</file> |
| 5 | <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file> | ||
| 5 | <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file> | 6 | <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file> |
| 6 | <file alias="48x48/chip.png">icons/48x48/chip.png</file> | 7 | <file alias="48x48/chip.png">icons/48x48/chip.png</file> |
| 7 | <file alias="48x48/folder.png">icons/48x48/folder.png</file> | 8 | <file alias="48x48/folder.png">icons/48x48/folder.png</file> |
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 { | |||
| 40 | 40 | ||
| 41 | QCheckBox::indicator, | 41 | QCheckBox::indicator, |
| 42 | QGroupBox::indicator { | 42 | QGroupBox::indicator { |
| 43 | width: 18px; | 43 | width: 16px; |
| 44 | height: 18px; | 44 | height: 16px; |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | QGroupBox::indicator { | 47 | QGroupBox::indicator { |
| @@ -1237,6 +1237,7 @@ QPlainTextEdit:disabled { | |||
| 1237 | background-color: #2b2e31; | 1237 | background-color: #2b2e31; |
| 1238 | } | 1238 | } |
| 1239 | 1239 | ||
| 1240 | |||
| 1240 | QPushButton#TogglableStatusBarButton { | 1241 | QPushButton#TogglableStatusBarButton { |
| 1241 | min-width: 0px; | 1242 | min-width: 0px; |
| 1242 | color: #656565; | 1243 | color: #656565; |
| @@ -1271,6 +1272,102 @@ QPushButton#RendererStatusBarButton:checked { | |||
| 1271 | color: #e85c00; | 1272 | color: #e85c00; |
| 1272 | } | 1273 | } |
| 1273 | 1274 | ||
| 1274 | QPushButton#RendererStatusBarButton:!checked{ | 1275 | QPushButton#RendererStatusBarButton:!checked { |
| 1275 | color: #00ccdd; | 1276 | color: #00ccdd; |
| 1277 | } | ||
| 1278 | |||
| 1279 | QPushButton#buttonRefreshDevices { | ||
| 1280 | min-width: 24px; | ||
| 1281 | min-height: 24px; | ||
| 1282 | max-width: 24px; | ||
| 1283 | max-height: 24px; | ||
| 1284 | padding: 0px 0px; | ||
| 1285 | } | ||
| 1286 | |||
| 1287 | QCheckBox#checkboxPlayer1Connected, | ||
| 1288 | QCheckBox#checkboxPlayer2Connected, | ||
| 1289 | QCheckBox#checkboxPlayer3Connected, | ||
| 1290 | QCheckBox#checkboxPlayer4Connected, | ||
| 1291 | QCheckBox#checkboxPlayer5Connected, | ||
| 1292 | QCheckBox#checkboxPlayer6Connected, | ||
| 1293 | QCheckBox#checkboxPlayer7Connected, | ||
| 1294 | QCheckBox#checkboxPlayer8Connected { | ||
| 1295 | spacing: 0px; | ||
| 1296 | } | ||
| 1297 | |||
| 1298 | QCheckBox#checkboxPlayer1Connected::indicator, | ||
| 1299 | QCheckBox#checkboxPlayer2Connected::indicator, | ||
| 1300 | QCheckBox#checkboxPlayer3Connected::indicator, | ||
| 1301 | QCheckBox#checkboxPlayer4Connected::indicator, | ||
| 1302 | QCheckBox#checkboxPlayer5Connected::indicator, | ||
| 1303 | QCheckBox#checkboxPlayer6Connected::indicator, | ||
| 1304 | QCheckBox#checkboxPlayer7Connected::indicator, | ||
| 1305 | QCheckBox#checkboxPlayer8Connected::indicator { | ||
| 1306 | width: 14px; | ||
| 1307 | height: 14px; | ||
| 1308 | } | ||
| 1309 | |||
| 1310 | QCheckBox#checkboxPlayer1Connected::indicator:checked, | ||
| 1311 | QCheckBox#checkboxPlayer2Connected::indicator:checked, | ||
| 1312 | QCheckBox#checkboxPlayer3Connected::indicator:checked, | ||
| 1313 | QCheckBox#checkboxPlayer4Connected::indicator:checked, | ||
| 1314 | QCheckBox#checkboxPlayer5Connected::indicator:checked, | ||
| 1315 | QCheckBox#checkboxPlayer6Connected::indicator:checked, | ||
| 1316 | QCheckBox#checkboxPlayer7Connected::indicator:checked, | ||
| 1317 | QCheckBox#checkboxPlayer8Connected::indicator:checked, | ||
| 1318 | QGroupBox#groupConnectedController::indicator:checked { | ||
| 1319 | border-radius: 2px; | ||
| 1320 | border: 1px solid #929192; | ||
| 1321 | background: #39ff14; | ||
| 1322 | image: none; | ||
| 1323 | } | ||
| 1324 | |||
| 1325 | QCheckBox#checkboxPlayer1Connected::indicator:unchecked, | ||
| 1326 | QCheckBox#checkboxPlayer2Connected::indicator:unchecked, | ||
| 1327 | QCheckBox#checkboxPlayer3Connected::indicator:unchecked, | ||
| 1328 | QCheckBox#checkboxPlayer4Connected::indicator:unchecked, | ||
| 1329 | QCheckBox#checkboxPlayer5Connected::indicator:unchecked, | ||
| 1330 | QCheckBox#checkboxPlayer6Connected::indicator:unchecked, | ||
| 1331 | QCheckBox#checkboxPlayer7Connected::indicator:unchecked, | ||
| 1332 | QCheckBox#checkboxPlayer8Connected::indicator:unchecked, | ||
| 1333 | QGroupBox#groupConnectedController::indicator:unchecked { | ||
| 1334 | border-radius: 2px; | ||
| 1335 | border: 1px solid #929192; | ||
| 1336 | background: transparent; | ||
| 1337 | image: none; | ||
| 1338 | } | ||
| 1339 | |||
| 1340 | QSpinBox#spinboxLStickRange, | ||
| 1341 | QSpinBox#spinboxRStickRange { | ||
| 1342 | padding: 4px 0px 5px 0px; | ||
| 1343 | min-width: 63px; | ||
| 1344 | } | ||
| 1345 | |||
| 1346 | QSpinBox#vibrationSpin { | ||
| 1347 | padding: 4px 0px 5px 0px; | ||
| 1348 | min-width: 63px; | ||
| 1349 | } | ||
| 1350 | |||
| 1351 | QSpinBox#spinboxLStickRange:up-button, | ||
| 1352 | QSpinBox#spinboxRStickRange:up-button, | ||
| 1353 | QSpinBox#vibrationSpin:up-button { | ||
| 1354 | left: -2px; | ||
| 1355 | } | ||
| 1356 | |||
| 1357 | QSpinBox#spinboxLStickRange:down-button, | ||
| 1358 | QSpinBox#spinboxRStickRange:down-button, | ||
| 1359 | QSpinBox#vibrationSpin:down-button { | ||
| 1360 | right: -1px; | ||
| 1361 | } | ||
| 1362 | |||
| 1363 | QGroupBox#motionGroup::indicator, | ||
| 1364 | QGroupBox#vibrationGroup::indicator { | ||
| 1365 | margin-left: 0px; | ||
| 1366 | } | ||
| 1367 | |||
| 1368 | QGroupBox#motionGroup::title, | ||
| 1369 | QGroupBox#vibrationGroup::title { | ||
| 1370 | spacing: 2px; | ||
| 1371 | padding-left: 1px; | ||
| 1372 | padding-right: 1px; | ||
| 1276 | } | 1373 | } |
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 --- /dev/null +++ b/dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/refresh.png | |||
| Binary files 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 --- /dev/null +++ b/dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/view-refresh.png | |||
| Binary files 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 @@ | |||
| 2 | <qresource prefix="icons/qdarkstyle_midnight_blue"> | 2 | <qresource prefix="icons/qdarkstyle_midnight_blue"> |
| 3 | <file alias="index.theme">icons/index.theme</file> | 3 | <file alias="index.theme">icons/index.theme</file> |
| 4 | <file alias="16x16/lock.png">icons/16x16/lock.png</file> | 4 | <file alias="16x16/lock.png">icons/16x16/lock.png</file> |
| 5 | <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file> | ||
| 5 | <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file> | 6 | <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file> |
| 6 | <file alias="48x48/chip.png">icons/48x48/chip.png</file> | 7 | <file alias="48x48/chip.png">icons/48x48/chip.png</file> |
| 7 | <file alias="48x48/folder.png">icons/48x48/folder.png</file> | 8 | <file alias="48x48/folder.png">icons/48x48/folder.png</file> |
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 | |||
| 236 | 236 | ||
| 237 | --------------------------------------------------------------------------- */ | 237 | --------------------------------------------------------------------------- */ |
| 238 | QGroupBox { | 238 | QGroupBox { |
| 239 | font-weight: bold; | 239 | font-weight: bold; |
| 240 | border: 1px solid #32414B; | 240 | border: 1px solid #32414B; |
| 241 | border-radius: 4px; | 241 | border-radius: 4px; |
| 242 | padding: 4px; | 242 | margin-top: 12px; |
| 243 | margin-top: 16px; | 243 | padding: 4px; |
| 244 | } | 244 | } |
| 245 | 245 | ||
| 246 | QGroupBox::title { | 246 | QGroupBox::title { |
| 247 | subcontrol-origin: margin; | 247 | subcontrol-origin: margin; |
| 248 | subcontrol-position: top left; | 248 | subcontrol-position: top left; |
| 249 | left: 3px; | 249 | padding-left: 3px; |
| 250 | padding-left: 3px; | 250 | padding-right: 5px; |
| 251 | padding-right: 5px; | 251 | padding-top: 4px; |
| 252 | padding-top: 8px; | ||
| 253 | padding-bottom: 16px; | ||
| 254 | } | 252 | } |
| 255 | 253 | ||
| 256 | QGroupBox::indicator { | 254 | QGroupBox::indicator { |
| @@ -2172,3 +2170,121 @@ PlotWidget { | |||
| 2172 | /* Fix cut labels in plots #134 */ | 2170 | /* Fix cut labels in plots #134 */ |
| 2173 | padding: 0px; | 2171 | padding: 0px; |
| 2174 | } | 2172 | } |
| 2173 | |||
| 2174 | |||
| 2175 | QPushButton#TogglableStatusBarButton { | ||
| 2176 | min-width: 0px; | ||
| 2177 | color: #656565; | ||
| 2178 | border: 1px solid transparent; | ||
| 2179 | background-color: transparent; | ||
| 2180 | padding: 0px 3px 0px 3px; | ||
| 2181 | text-align: center; | ||
| 2182 | } | ||
| 2183 | |||
| 2184 | QPushButton#TogglableStatusBarButton:checked { | ||
| 2185 | color: #ffffff; | ||
| 2186 | } | ||
| 2187 | |||
| 2188 | QPushButton#TogglableStatusBarButton:hover { | ||
| 2189 | border: 1px solid #76797C; | ||
| 2190 | } | ||
| 2191 | |||
| 2192 | QPushButton#RendererStatusBarButton { | ||
| 2193 | min-width: 0px; | ||
| 2194 | color: #656565; | ||
| 2195 | border: 1px solid transparent; | ||
| 2196 | background-color: transparent; | ||
| 2197 | padding: 0px 3px 0px 3px; | ||
| 2198 | text-align: center; | ||
| 2199 | } | ||
| 2200 | |||
| 2201 | QPushButton#RendererStatusBarButton:hover { | ||
| 2202 | border: 1px solid #76797C; | ||
| 2203 | } | ||
| 2204 | |||
| 2205 | QPushButton#RendererStatusBarButton:checked { | ||
| 2206 | color: #e85c00; | ||
| 2207 | } | ||
| 2208 | |||
| 2209 | QPushButton#RendererStatusBarButton:!checked { | ||
| 2210 | color: #00ccdd; | ||
| 2211 | } | ||
| 2212 | |||
| 2213 | QPushButton#buttonRefreshDevices { | ||
| 2214 | min-width: 20px; | ||
| 2215 | min-height: 20px; | ||
| 2216 | max-width: 20px; | ||
| 2217 | max-height: 20px; | ||
| 2218 | padding: 0px 0px; | ||
| 2219 | } | ||
| 2220 | |||
| 2221 | |||
| 2222 | QCheckBox#checkboxPlayer1Connected, | ||
| 2223 | QCheckBox#checkboxPlayer2Connected, | ||
| 2224 | QCheckBox#checkboxPlayer3Connected, | ||
| 2225 | QCheckBox#checkboxPlayer4Connected, | ||
| 2226 | QCheckBox#checkboxPlayer5Connected, | ||
| 2227 | QCheckBox#checkboxPlayer6Connected, | ||
| 2228 | QCheckBox#checkboxPlayer7Connected, | ||
| 2229 | QCheckBox#checkboxPlayer8Connected { | ||
| 2230 | spacing: 0px; | ||
| 2231 | } | ||
| 2232 | |||
| 2233 | QCheckBox#checkboxPlayer1Connected::indicator, | ||
| 2234 | QCheckBox#checkboxPlayer2Connected::indicator, | ||
| 2235 | QCheckBox#checkboxPlayer3Connected::indicator, | ||
| 2236 | QCheckBox#checkboxPlayer4Connected::indicator, | ||
| 2237 | QCheckBox#checkboxPlayer5Connected::indicator, | ||
| 2238 | QCheckBox#checkboxPlayer6Connected::indicator, | ||
| 2239 | QCheckBox#checkboxPlayer7Connected::indicator, | ||
| 2240 | QCheckBox#checkboxPlayer8Connected::indicator { | ||
| 2241 | width: 14px; | ||
| 2242 | height: 14px; | ||
| 2243 | } | ||
| 2244 | |||
| 2245 | QCheckBox#checkboxPlayer1Connected::indicator:checked, | ||
| 2246 | QCheckBox#checkboxPlayer2Connected::indicator:checked, | ||
| 2247 | QCheckBox#checkboxPlayer3Connected::indicator:checked, | ||
| 2248 | QCheckBox#checkboxPlayer4Connected::indicator:checked, | ||
| 2249 | QCheckBox#checkboxPlayer5Connected::indicator:checked, | ||
| 2250 | QCheckBox#checkboxPlayer6Connected::indicator:checked, | ||
| 2251 | QCheckBox#checkboxPlayer7Connected::indicator:checked, | ||
| 2252 | QCheckBox#checkboxPlayer8Connected::indicator:checked, | ||
| 2253 | QGroupBox#groupConnectedController::indicator:checked { | ||
| 2254 | border-radius: 2px; | ||
| 2255 | border: 1px solid #929192; | ||
| 2256 | background: #39ff14; | ||
| 2257 | image: none; | ||
| 2258 | } | ||
| 2259 | |||
| 2260 | QCheckBox#checkboxPlayer1Connected::indicator:unchecked, | ||
| 2261 | QCheckBox#checkboxPlayer2Connected::indicator:unchecked, | ||
| 2262 | QCheckBox#checkboxPlayer3Connected::indicator:unchecked, | ||
| 2263 | QCheckBox#checkboxPlayer4Connected::indicator:unchecked, | ||
| 2264 | QCheckBox#checkboxPlayer5Connected::indicator:unchecked, | ||
| 2265 | QCheckBox#checkboxPlayer6Connected::indicator:unchecked, | ||
| 2266 | QCheckBox#checkboxPlayer7Connected::indicator:unchecked, | ||
| 2267 | QCheckBox#checkboxPlayer8Connected::indicator:unchecked, | ||
| 2268 | QGroupBox#groupConnectedController::indicator:unchecked { | ||
| 2269 | border-radius: 2px; | ||
| 2270 | border: 1px solid #929192; | ||
| 2271 | background: transparent; | ||
| 2272 | image: none; | ||
| 2273 | } | ||
| 2274 | |||
| 2275 | QSpinBox#spinboxLStickRange, | ||
| 2276 | QSpinBox#spinboxRStickRange { | ||
| 2277 | min-width: 53px; | ||
| 2278 | } | ||
| 2279 | |||
| 2280 | QGroupBox#motionGroup::indicator, | ||
| 2281 | QGroupBox#vibrationGroup::indicator { | ||
| 2282 | margin-left: 0px; | ||
| 2283 | } | ||
| 2284 | |||
| 2285 | QGroupBox#motionGroup::title, | ||
| 2286 | QGroupBox#vibrationGroup::title { | ||
| 2287 | spacing: 2px; | ||
| 2288 | padding-left: 1px; | ||
| 2289 | padding-right: 1px; | ||
| 2290 | } | ||