From b51db125676fb1257e3bacbd19df3ae686ae69df Mon Sep 17 00:00:00 2001 From: Kyle K <190571+Docteh@users.noreply.github.com> Date: Thu, 28 Jul 2022 07:50:20 -0700 Subject: [PATCH 1/3] Linux: handle dark system themes nicely yuzu's default theme doesn't specify everything, which is fine for windows, but in linux anything unspecified is set to the users theme. Symptoms of this are that a linux user with a dark theme won't think to change the theme to a dark theme when first using yuzu Idea here is to try and support arbitrary themes on linux. preliminary work on a "default_dark" theme, used only as overlay for any themes that are measured to be dark mode. Other work done: FreeDesktop standard icon names: plus -> list-add delete refresh, we use view-refresh remove duplicated icons for qdarkstyle_midnight_blue referencing icon aliases in the qrc files is the way to go Note: Dynamic style changing doesn't appear to work with AppImage --- .reuse/dep5 | 10 +- .../icons/48x48/{plus.png => list-add.png} | Bin dist/qt_themes/colorful/style.qrc | 2 +- .../colorful_dark/icons/16x16/refresh.png | Bin 362 -> 0 bytes .../qt_themes/colorful_dark/icons/index.theme | 2 +- dist/qt_themes/colorful_dark/style.qrc | 2 +- .../icons/16x16/refresh.png | Bin 362 -> 0 bytes .../colorful_midnight_blue/style.qrc | 2 +- dist/qt_themes/default/default.qrc | 2 +- .../qt_themes/default/icons/16x16/refresh.png | Bin 349 -> 0 bytes .../icons/48x48/{plus.png => list-add.png} | Bin dist/qt_themes/default_dark/icons/index.theme | 8 + dist/qt_themes/default_dark/style.qrc | 25 + dist/qt_themes/default_dark/style.qss | 689 ++++++++++++++++++ .../qdarkstyle/icons/16x16/refresh.png | Bin 362 -> 0 bytes .../icons/48x48/{plus.png => list-add.png} | Bin dist/qt_themes/qdarkstyle/style.qrc | 2 +- .../icons/16x16/lock.png | Bin 304 -> 0 bytes .../icons/16x16/refresh.png | Bin 362 -> 0 bytes .../icons/16x16/view-refresh.png | Bin 362 -> 0 bytes .../icons/256x256/plus_folder.png | Bin 3438 -> 0 bytes .../icons/48x48/bad_folder.png | Bin 1098 -> 0 bytes .../icons/48x48/chip.png | Bin 15120 -> 0 bytes .../icons/48x48/folder.png | Bin 542 -> 0 bytes .../icons/48x48/plus.png | Bin 339 -> 0 bytes .../icons/48x48/sd_card.png | Bin 676 -> 0 bytes .../icons/48x48/star.png | Bin 725 -> 0 bytes .../qdarkstyle_midnight_blue/style.qrc | 19 +- src/yuzu/game_list.cpp | 2 +- src/yuzu/game_list_p.h | 2 +- src/yuzu/main.cpp | 82 ++- src/yuzu/main.h | 5 + 32 files changed, 819 insertions(+), 35 deletions(-) rename dist/qt_themes/colorful/icons/48x48/{plus.png => list-add.png} (100%) delete mode 100644 dist/qt_themes/colorful_dark/icons/16x16/refresh.png delete mode 100644 dist/qt_themes/colorful_midnight_blue/icons/16x16/refresh.png delete mode 100644 dist/qt_themes/default/icons/16x16/refresh.png rename dist/qt_themes/default/icons/48x48/{plus.png => list-add.png} (100%) create mode 100644 dist/qt_themes/default_dark/icons/index.theme create mode 100644 dist/qt_themes/default_dark/style.qrc create mode 100644 dist/qt_themes/default_dark/style.qss delete mode 100644 dist/qt_themes/qdarkstyle/icons/16x16/refresh.png rename dist/qt_themes/qdarkstyle/icons/48x48/{plus.png => list-add.png} (100%) delete mode 100644 dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/lock.png delete mode 100644 dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/refresh.png delete mode 100644 dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/view-refresh.png delete mode 100644 dist/qt_themes/qdarkstyle_midnight_blue/icons/256x256/plus_folder.png delete mode 100644 dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/bad_folder.png delete mode 100644 dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/chip.png delete mode 100644 dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/folder.png delete mode 100644 dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/plus.png delete mode 100644 dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/sd_card.png delete mode 100644 dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/star.png diff --git a/.reuse/dep5 b/.reuse/dep5 index e2ee4f456d..5251870fb0 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -41,20 +41,18 @@ Files: dist/qt_themes/*/icons/16x16/connected.png dist/qt_themes/*/icons/48x48/sd_card.png dist/qt_themes/*/icons/48x48/star.png dist/qt_themes/*/icons/256x256/plus_folder.png - dist/qt_themes/colorful/icons/48x48/plus.png + dist/qt_themes/colorful/icons/48x48/list-add.png dist/qt_themes/default/icons/16x16/checked.png dist/qt_themes/default/icons/16x16/failed.png Copyright: https://icons8.com License: CC-BY-ND-3.0 -Files: dist/qt_themes/*/icons/16x16/refresh.png - dist/qt_themes/*/icons/16x16/view-refresh.png +Files: dist/qt_themes/*/icons/16x16/view-refresh.png Copyright: Google, Inc. License: Apache-2.0 -Files: dist/qt_themes/default/icons/48x48/plus.png - dist/qt_themes/qdarkstyle/icons/48x48/plus.png - dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/plus.png +Files: dist/qt_themes/default/icons/48x48/list-add.png + dist/qt_themes/qdarkstyle/icons/48x48/list-add.png Copyright: BreadFish64 License: CC0-1.0 diff --git a/dist/qt_themes/colorful/icons/48x48/plus.png b/dist/qt_themes/colorful/icons/48x48/list-add.png similarity index 100% rename from dist/qt_themes/colorful/icons/48x48/plus.png rename to dist/qt_themes/colorful/icons/48x48/list-add.png diff --git a/dist/qt_themes/colorful/style.qrc b/dist/qt_themes/colorful/style.qrc index 4b3f28d895..507e0e58b4 100644 --- a/dist/qt_themes/colorful/style.qrc +++ b/dist/qt_themes/colorful/style.qrc @@ -13,7 +13,7 @@ SPDX-License-Identifier: GPL-2.0-or-later icons/48x48/bad_folder.png icons/48x48/chip.png icons/48x48/folder.png - icons/48x48/plus.png + icons/48x48/list-add.png icons/48x48/sd_card.png icons/48x48/star.png icons/256x256/plus_folder.png diff --git a/dist/qt_themes/colorful_dark/icons/16x16/refresh.png b/dist/qt_themes/colorful_dark/icons/16x16/refresh.png deleted file mode 100644 index d4afd76f949ff5c65e039b69ff999325bff5d7b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 362 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7Sc;uILpV4%IBGajIv5xj zI14-?iy0Vr6+oC#(CO%61_lPn64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xh zq!<_&o_o4DhFJ6-y=3Tj*g=5xLS&1}RFQ@NnRg8jL{ncym>W)bDYRYgRWn%01lSYkZB;=Q;E885kHC NJYD@<);T3K0RX!aj2r*} diff --git a/dist/qt_themes/colorful_dark/icons/index.theme b/dist/qt_themes/colorful_dark/icons/index.theme index 19dc0369a4..b37a06df78 100644 --- a/dist/qt_themes/colorful_dark/icons/index.theme +++ b/dist/qt_themes/colorful_dark/icons/index.theme @@ -3,6 +3,6 @@ Name=colorful_dark Comment=Colorful theme (Dark style) Inherits=colorful Directories=16x16 - + [16x16] Size=16 diff --git a/dist/qt_themes/colorful_dark/style.qrc b/dist/qt_themes/colorful_dark/style.qrc index 50e78c37bf..9853fd438f 100644 --- a/dist/qt_themes/colorful_dark/style.qrc +++ b/dist/qt_themes/colorful_dark/style.qrc @@ -15,7 +15,7 @@ SPDX-License-Identifier: GPL-2.0-or-later ../colorful/icons/48x48/chip.png ../colorful/icons/48x48/folder.png ../qdarkstyle/icons/48x48/no_avatar.png - ../colorful/icons/48x48/plus.png + ../colorful/icons/48x48/list-add.png ../colorful/icons/48x48/sd_card.png ../colorful/icons/256x256/plus_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 deleted file mode 100644 index d4afd76f949ff5c65e039b69ff999325bff5d7b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 362 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7Sc;uILpV4%IBGajIv5xj zI14-?iy0Vr6+oC#(CO%61_lPn64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xh zq!<_&o_o4DhFJ6-y=3Tj*g=5xLS&1}RFQ@NnRg8jL{ncym>W)bDYRYgRWn%01lSYkZB;=Q;E885kHC NJYD@<);T3K0RX!aj2r*} diff --git a/dist/qt_themes/colorful_midnight_blue/style.qrc b/dist/qt_themes/colorful_midnight_blue/style.qrc index ac8cb0d499..1081d281d8 100644 --- a/dist/qt_themes/colorful_midnight_blue/style.qrc +++ b/dist/qt_themes/colorful_midnight_blue/style.qrc @@ -11,7 +11,7 @@ SPDX-License-Identifier: GPL-2.0-or-later ../colorful/icons/48x48/bad_folder.png ../colorful/icons/48x48/chip.png ../colorful/icons/48x48/folder.png - ../colorful/icons/48x48/plus.png + ../colorful/icons/48x48/list-add.png ../colorful/icons/48x48/sd_card.png ../colorful/icons/256x256/plus_folder.png diff --git a/dist/qt_themes/default/default.qrc b/dist/qt_themes/default/default.qrc index ef080c2217..a07f2a9c15 100644 --- a/dist/qt_themes/default/default.qrc +++ b/dist/qt_themes/default/default.qrc @@ -17,7 +17,7 @@ SPDX-License-Identifier: GPL-2.0-or-later icons/48x48/chip.png icons/48x48/folder.png icons/48x48/no_avatar.png - icons/48x48/plus.png + icons/48x48/list-add.png icons/48x48/sd_card.png icons/48x48/star.png icons/256x256/yuzu.png diff --git a/dist/qt_themes/default/icons/16x16/refresh.png b/dist/qt_themes/default/icons/16x16/refresh.png deleted file mode 100644 index 69f9474acabad4c5bbb4b8dd3f73b34b5d49d3f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 349 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7Sc;uILpV4%IBGajIv5xj zI14-?iy0Vrg+Q2bYlC?S0|SF(iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$ zQVa|Xw>(`OLo9laURv$v;wZp!;jpsfTTzD-aT_uYi6?|l=IuWpdDg$d;r^Ou>=QIN zm{=w>xF!hL95FemGt>IPwn=8ev8GpT5AWF+@-XU6qI7UR!_%>U8#%RzjZ zu*{cE^N$jy#}r<1oUhB;#}C!Kg5JY# z-fWtZAo8wR=%+l-Qo(Q9w#svom#$xUc&Jn>GYk4PRE;{XTPtjrq8^tyR?ykfq}u()z4*}Q$iB}2sVbi diff --git a/dist/qt_themes/default/icons/48x48/plus.png b/dist/qt_themes/default/icons/48x48/list-add.png similarity index 100% rename from dist/qt_themes/default/icons/48x48/plus.png rename to dist/qt_themes/default/icons/48x48/list-add.png diff --git a/dist/qt_themes/default_dark/icons/index.theme b/dist/qt_themes/default_dark/icons/index.theme new file mode 100644 index 0000000000..60a072d1d6 --- /dev/null +++ b/dist/qt_themes/default_dark/icons/index.theme @@ -0,0 +1,8 @@ +[Icon Theme] +Name=default_dark +Comment=Colorful theme (Dark style) +Inherits=colorful +Directories=16x16 + +[16x16] +Size=16 diff --git a/dist/qt_themes/default_dark/style.qrc b/dist/qt_themes/default_dark/style.qrc new file mode 100644 index 0000000000..7de4737c2c --- /dev/null +++ b/dist/qt_themes/default_dark/style.qrc @@ -0,0 +1,25 @@ + + + + ../colorful/icons/16x16/connected.png + ../colorful/icons/16x16/connected_notification.png + ../colorful/icons/16x16/disconnected.png + icons/index.theme + ../colorful_dark/icons/16x16/lock.png + ../colorful_dark/icons/16x16/view-refresh.png + ../colorful/icons/48x48/bad_folder.png + ../colorful/icons/48x48/chip.png + ../colorful/icons/48x48/folder.png + ../qdarkstyle/icons/48x48/no_avatar.png + ../colorful/icons/48x48/list-add.png + ../colorful/icons/48x48/sd_card.png + ../colorful/icons/256x256/plus_folder.png + + + + style.qss + + diff --git a/dist/qt_themes/default_dark/style.qss b/dist/qt_themes/default_dark/style.qss new file mode 100644 index 0000000000..356996357c --- /dev/null +++ b/dist/qt_themes/default_dark/style.qss @@ -0,0 +1,689 @@ +/* +* SPDX-FileCopyrightText: 2018 yuzu Emulator Project +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +QAbstractSpinBox { + min-height: 19px; +} + +QPushButton#TogglableStatusBarButton { + color: #959595; + border: 1px solid transparent; + background-color: transparent; + padding: 0px 3px 0px 3px; + text-align: center; +} + +/* +QPushButton#TogglableStatusBarButton:checked { + color: #000000; +} +*/ + +QPushButton#TogglableStatusBarButton:hover { + border: 1px solid #76797C; +} + +QPushButton#RendererStatusBarButton { + 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: #0066ff; +} + +QPushButton#GPUStatusBarButton { + color: #656565; + border: 1px solid transparent; + background-color: transparent; + padding: 0px 3px 0px 3px; + text-align: center; +} + +QPushButton#GPUStatusBarButton:hover { + border: 1px solid #76797C; +} + +QPushButton#GPUStatusBarButton:checked { + color: #b06020; +} + +QPushButton#GPUStatusBarButton:!checked { + color: #109010; +} + +QPushButton#DockingStatusBarButton { + min-width: 0px; + /*color: #000000;*/ + border: 1px solid transparent; + background-color: transparent; + padding: 0px 3px 0px 3px; + text-align: center; +} + +QPushButton#DockingStatusBarButton:hover { + border: 1px solid #76797C; +} + +QPushButton#buttonRefreshDevices { + min-width: 21px; + min-height: 21px; + max-width: 21px; + max-height: 21px; +} + +QWidget#bottomPerGameInput, +QWidget#topControllerApplet, +QWidget#bottomControllerApplet, +QGroupBox#groupPlayer1Connected:checked, +QGroupBox#groupPlayer2Connected:checked, +QGroupBox#groupPlayer3Connected:checked, +QGroupBox#groupPlayer4Connected:checked, +QGroupBox#groupPlayer5Connected:checked, +QGroupBox#groupPlayer6Connected:checked, +QGroupBox#groupPlayer7Connected:checked, +QGroupBox#groupPlayer8Connected:checked { + background-color: #f5f5f5; +} + +QWidget#topControllerApplet { + border-bottom: 1px solid #828790 +} + +QWidget#bottomPerGameInput, +QWidget#bottomControllerApplet { + border-top: 1px solid #828790 +} + +QWidget#topPerGameInput, +QWidget#middleControllerApplet { + background-color: #fff; +} + +QWidget#topPerGameInput QComboBox, +QWidget#middleControllerApplet QComboBox { + width: 120px; +} + +QWidget#connectedControllers { + background: transparent; +} + +QWidget#playersSupported, +QWidget#controllersSupported, +QWidget#controllerSupported1, +QWidget#controllerSupported2, +QWidget#controllerSupported3, +QWidget#controllerSupported4, +QWidget#controllerSupported5, +QWidget#controllerSupported6 { + border: none; + background: transparent; +} + +QGroupBox#groupPlayer1Connected, +QGroupBox#groupPlayer2Connected, +QGroupBox#groupPlayer3Connected, +QGroupBox#groupPlayer4Connected, +QGroupBox#groupPlayer5Connected, +QGroupBox#groupPlayer6Connected, +QGroupBox#groupPlayer7Connected, +QGroupBox#groupPlayer8Connected { + border: 1px solid #828790; + border-radius: 3px; + padding: 0px; + min-height: 98px; + max-height: 98px; +} + +QGroupBox#groupPlayer1Connected:unchecked, +QGroupBox#groupPlayer2Connected:unchecked, +QGroupBox#groupPlayer3Connected:unchecked, +QGroupBox#groupPlayer4Connected:unchecked, +QGroupBox#groupPlayer5Connected:unchecked, +QGroupBox#groupPlayer6Connected:unchecked, +QGroupBox#groupPlayer7Connected:unchecked, +QGroupBox#groupPlayer8Connected:unchecked { + border: 1px solid #d9d9d9; +} + +QGroupBox#groupPlayer1Connected::title, +QGroupBox#groupPlayer2Connected::title, +QGroupBox#groupPlayer3Connected::title, +QGroupBox#groupPlayer4Connected::title, +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; +} + +QCheckBox#checkboxPlayer1Connected, +QCheckBox#checkboxPlayer2Connected, +QCheckBox#checkboxPlayer3Connected, +QCheckBox#checkboxPlayer4Connected, +QCheckBox#checkboxPlayer5Connected, +QCheckBox#checkboxPlayer6Connected, +QCheckBox#checkboxPlayer7Connected, +QCheckBox#checkboxPlayer8Connected { + spacing: 0px; +} + +QWidget#Player1LEDs QCheckBox, +QWidget#Player2LEDs QCheckBox, +QWidget#Player3LEDs QCheckBox, +QWidget#Player4LEDs QCheckBox, +QWidget#Player5LEDs QCheckBox, +QWidget#Player6LEDs QCheckBox, +QWidget#Player7LEDs QCheckBox, +QWidget#Player8LEDs QCheckBox { + spacing: 0px; +} + +QWidget#Player1LEDs QCheckBox::indicator, +QWidget#Player2LEDs QCheckBox::indicator, +QWidget#Player3LEDs QCheckBox::indicator, +QWidget#Player4LEDs QCheckBox::indicator, +QWidget#Player5LEDs QCheckBox::indicator, +QWidget#Player6LEDs QCheckBox::indicator, +QWidget#Player7LEDs QCheckBox::indicator, +QWidget#Player8LEDs QCheckBox::indicator { + width: 6px; + height: 6px; + margin-left: 0px; +} + +QWidget#bottomPerGameInput QCheckBox#checkboxPlayer1Connected::indicator, +QWidget#bottomPerGameInput QCheckBox#checkboxPlayer2Connected::indicator, +QWidget#bottomPerGameInput QCheckBox#checkboxPlayer3Connected::indicator, +QWidget#bottomPerGameInput QCheckBox#checkboxPlayer4Connected::indicator, +QWidget#bottomPerGameInput QCheckBox#checkboxPlayer5Connected::indicator, +QWidget#bottomPerGameInput QCheckBox#checkboxPlayer6Connected::indicator, +QWidget#bottomPerGameInput QCheckBox#checkboxPlayer7Connected::indicator, +QWidget#bottomPerGameInput QCheckBox#checkboxPlayer8Connected::indicator { + width: 12px; + height: 12px; +} + +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; +} + +QGroupBox#groupPlayer1Connected::indicator, +QGroupBox#groupPlayer2Connected::indicator, +QGroupBox#groupPlayer3Connected::indicator, +QGroupBox#groupPlayer4Connected::indicator, +QGroupBox#groupPlayer5Connected::indicator, +QGroupBox#groupPlayer6Connected::indicator, +QGroupBox#groupPlayer7Connected::indicator, +QGroupBox#groupPlayer8Connected::indicator { + width: 16px; + height: 16px; +} + +QWidget#Player1LEDs QCheckBox::indicator:checked, +QWidget#Player2LEDs QCheckBox::indicator:checked, +QWidget#Player3LEDs QCheckBox::indicator:checked, +QWidget#Player4LEDs QCheckBox::indicator:checked, +QWidget#Player5LEDs QCheckBox::indicator:checked, +QWidget#Player6LEDs QCheckBox::indicator:checked, +QWidget#Player7LEDs QCheckBox::indicator:checked, +QWidget#Player8LEDs QCheckBox::indicator:checked, +QGroupBox#groupPlayer1Connected::indicator:checked, +QGroupBox#groupPlayer2Connected::indicator:checked, +QGroupBox#groupPlayer3Connected::indicator:checked, +QGroupBox#groupPlayer4Connected::indicator:checked, +QGroupBox#groupPlayer5Connected::indicator:checked, +QGroupBox#groupPlayer6Connected::indicator:checked, +QGroupBox#groupPlayer7Connected::indicator:checked, +QGroupBox#groupPlayer8Connected::indicator:checked, +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; +} + +QWidget#Player1LEDs QCheckBox::indicator:unchecked, +QWidget#Player2LEDs QCheckBox::indicator:unchecked, +QWidget#Player3LEDs QCheckBox::indicator:unchecked, +QWidget#Player4LEDs QCheckBox::indicator:unchecked, +QWidget#Player5LEDs QCheckBox::indicator:unchecked, +QWidget#Player6LEDs QCheckBox::indicator:unchecked, +QWidget#Player7LEDs QCheckBox::indicator:unchecked, +QWidget#Player8LEDs QCheckBox::indicator:unchecked, +QGroupBox#groupPlayer1Connected::indicator:unchecked, +QGroupBox#groupPlayer2Connected::indicator:unchecked, +QGroupBox#groupPlayer3Connected::indicator:unchecked, +QGroupBox#groupPlayer4Connected::indicator:unchecked, +QGroupBox#groupPlayer5Connected::indicator:unchecked, +QGroupBox#groupPlayer6Connected::indicator:unchecked, +QGroupBox#groupPlayer7Connected::indicator:unchecked, +QGroupBox#groupPlayer8Connected::indicator:unchecked, +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; +} + +QWidget#controllerPlayer1, +QWidget#controllerPlayer2, +QWidget#controllerPlayer3, +QWidget#controllerPlayer4, +QWidget#controllerPlayer5, +QWidget#controllerPlayer6, +QWidget#controllerPlayer7, +QWidget#controllerPlayer8 { + background: transparent; +} + +QDialog#QtSoftwareKeyboardDialog, +QStackedWidget#topOSK { + background: rgba(51, 51, 51, .9); +} + + +QDialog#OverlayDialog, +QStackedWidget#stackedDialog { + background: rgba(51, 51, 51, .7); +} + +QWidget#boxOSK, +QWidget#lineOSK, +QWidget#richDialog, +QWidget#lineDialog { + background: transparent; +} + +QStackedWidget#bottomOSK, +QWidget#contentDialog, +QWidget#contentRichDialog { + background: rgba(240, 240, 240, 1); +} + +QWidget#contentDialog, +QWidget#contentRichDialog { + margin: 5px; + border-radius: 6px; +} + +QWidget#buttonsDialog, +QWidget#buttonsRichDialog { + margin: 5px; + border-top: 2px solid rgba(44, 44, 44, 1); +} + +QWidget#legendOSKnum { + border-top: 1px solid rgba(44, 44, 44, 1); +} + +QStackedWidget#stackedDialog QTextBrowser QScrollBar::vertical { + background: #cdcdcd; + width: 15px; + margin: 15px 3px 15px 3px; + border: 1px transparent; + border-radius: 4px; +} + +QStackedWidget#stackedDialog QTextBrowser QScrollBar::horizoncal { + background: #cdcdcd; + height: 15px; + margin: 3px 15px 3px 15px; + border: 1px transparent; + border-radius: 4px; +} + +QStackedWidget#stackedDialog QTextBrowser QScrollBar::handle { + background: #fff; + border-radius: 4px; + min-height: 5px; + min-width: 5px; +} + +QStackedWidget#stackedDialog QTextBrowser QScrollBar::add-line, +QStackedWidget#stackedDialog QTextBrowser QScrollBar::sub-line, +QStackedWidget#stackedDialog QTextBrowser QScrollBar::add-page, +QStackedWidget#stackedDialog QTextBrowser QScrollBar::sub-page { + background: none; +} + +QWidget#inputOSK { + border-bottom: 3px solid rgba(255, 255, 255, .9); +} + +QWidget#inputOSK QLineEdit { + background: transparent; + border: none; + color: #ccc; +} + +QWidget#inputBoxOSK { + border: 2px solid rgba(255, 255, 255, .9); +} + +QWidget#inputBoxOSK QTextEdit { + background: transparent; + border: none; + color: #ccc; +} + +QWidget#richDialog QTextBrowser { + background: transparent; + border: none; + padding: 35px 65px; +} + + +QWidget#lineOSK QLabel#label_header { + color: #f0f0f0; +} + +QWidget#lineOSK QLabel#label_sub, +QWidget#lineOSK QLabel#label_characters, +QWidget#boxOSK QLabel#label_characters_box { + color: #ccc; +} + +QWidget#contentDialog QLabel#label_title, +QWidget#contentRichDialog QLabel#label_title_rich { + color: #888; +} + +QWidget#contentDialog QLabel#label_dialog { + padding: 20px 65px; +} + +QWidget#contentDialog QLabel#label_title, +QWidget#contentRichDialog QLabel#label_title_rich { + padding: 0px 65px; +} + +QDialog#OverlayDialog QPushButton { + color: rgba(49, 79, 239, 1); + background: transparent; + border: none; + padding: 0px; + min-width: 0px; +} + +QDialog#OverlayDialog QPushButton:focus, +QDialog#OverlayDialog QPushButton:hover { + color: rgba(49, 79, 239, 1); + background: rgba(255, 255, 255, 1); + border: 5px solid rgba(148, 250, 202, 1); + border-radius: 6px; + outline: none; +} + +QDialog#OverlayDialog QPushButton:pressed { + color: rgba(240, 240, 240, 1); + background: rgba(150, 150, 150, 1); + border: 5px solid rgba(148, 250, 202, 1); + border-radius: 6px; + outline: none; +} + +QDialog#QtSoftwareKeyboardDialog QPushButton { + background: rgba(232, 232, 232, 1); + border: 2px solid rgba(240, 240, 240, 1); +} + +QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_return, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_space, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift { + background: rgba(218, 218, 218, 1); + border: 2px solid rgba(240, 240, 240, 1); +} + +QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num { + color: rgba(240, 240, 240, 1); + background: rgba(44, 44, 44, 1); + border: 2px solid rgba(240, 240, 240, 1); +} + +QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num { + color: rgba(240, 240, 240, 1); + background: rgba(49, 79, 239, 1); + border: 2px solid rgba(240, 240, 240, 1); +} + +QDialog#QtSoftwareKeyboardDialog QPushButton:focus, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:focus, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:focus, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:focus, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:focus, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:focus, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:focus, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:focus, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:focus, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:focus, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:focus, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:focus, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:focus, + +QDialog#QtSoftwareKeyboardDialog QPushButton:hover, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:hover, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:hover, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:hover, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:hover, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:hover, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:hover, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:hover, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:hover, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:hover, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:hover, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:hover, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:hover { + color: rgba(0, 0, 0, 1); + background: rgba(255, 255, 255, 1); + border: 5px solid rgba(148, 250, 202, 1); + border-radius: 6px; + outline: none; +} + +QDialog#QtSoftwareKeyboardDialog QPushButton:pressed, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:pressed, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:pressed, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:pressed, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:pressed, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:pressed, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:pressed, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:pressed, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:pressed, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:pressed, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:pressed, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:pressed, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:pressed { + color: rgba(240, 240, 240, 1); + background: rgba(150, 150, 150, 1); + border: 5px solid rgba(148, 250, 202, 1); + border-radius: 6px; +} + +QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num { + image: url(:/overlay/osk_button_B.png); + image-position: right; + qproperty-icon: url(:/overlay/osk_button_backspace.png); + qproperty-iconSize: 36px; +} + +QDialog#QtSoftwareKeyboardDialog QPushButton#button_space, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift { + image: url(:/overlay/osk_button_Y.png); + image-position: right; +} + +QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num { + image: url(:/overlay/osk_button_plus.png); + image-position: right; +} + +QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift { + image: url(:/overlay/osk_button_shift_lock_off.png); + image-position: left; + qproperty-icon: url(:/overlay/osk_button_shift.png); + qproperty-iconSize: 36px; +} + +QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift { + image: url(:/overlay/osk_button_shift_lock_off.png); + image-position: left; + qproperty-icon: url(:/overlay/osk_button_shift_on.png); + qproperty-iconSize: 36px; +} + +QDialog#QtSoftwareKeyboardDialog QPushButton#button_left_bracket, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_right_bracket, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_left_parenthesis, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_right_parenthesis { + padding-bottom: 7px; +} + +QDialog#QtSoftwareKeyboardDialog QWidget#titleOSK QLabel { + background: transparent; + color: #ccc; +} + +QDialog#QtSoftwareKeyboardDialog QWidget#button_L, +QDialog#QtSoftwareKeyboardDialog QWidget#button_L_shift, +QDialog#QtSoftwareKeyboardDialog QWidget#button_L_num { + image: url(:/overlay/button_L.png); +} + +QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left, +QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left_shift, +QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left_num { + image: url(:/overlay/arrow_left.png); +} + +QDialog#QtSoftwareKeyboardDialog QWidget#button_R, +QDialog#QtSoftwareKeyboardDialog QWidget#button_R_shift, +QDialog#QtSoftwareKeyboardDialog QWidget#button_R_num { + image: url(:/overlay/button_R.png); +} + +QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right, +QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right_shift, +QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right_num { + image: url(:/overlay/arrow_right.png); +} + +QDialog#QtSoftwareKeyboardDialog QWidget#button_press_stick, +QDialog#QtSoftwareKeyboardDialog QWidget#button_press_stick_shift { + image: url(:/overlay/button_press_stick.png); +} + +QDialog#QtSoftwareKeyboardDialog QWidget#button_X, +QDialog#QtSoftwareKeyboardDialog QWidget#button_X_shift, +QDialog#QtSoftwareKeyboardDialog QWidget#button_X_num { + image: url(:/overlay/button_X.png); +} + +QDialog#QtSoftwareKeyboardDialog QWidget#button_A, +QDialog#QtSoftwareKeyboardDialog QWidget#button_A_shift, +QDialog#QtSoftwareKeyboardDialog QWidget#button_A_num { + image: url(:/overlay/button_A.png); +} + +QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled { + color: rgba(164, 164, 164, 1); + background-color: rgba(218, 218, 218, 1); +} + +QDialog#QtSoftwareKeyboardDialog QPushButton#button_at:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_slash:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_percent:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_1:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_2:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_3:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_4:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_5:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_6:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_7:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_8:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_9:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_0:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled { + color: rgba(164, 164, 164, 1); +} + +QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled { + image: url(:/overlay/osk_button_plus_disabled.png); +} + +QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled { + image: url(:/overlay/osk_button_B_disabled.png); +} + +QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled, +QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled { + image: url(:/overlay/osk_button_Y_disabled.png); +} diff --git a/dist/qt_themes/qdarkstyle/icons/16x16/refresh.png b/dist/qt_themes/qdarkstyle/icons/16x16/refresh.png deleted file mode 100644 index d4afd76f949ff5c65e039b69ff999325bff5d7b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 362 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7Sc;uILpV4%IBGajIv5xj zI14-?iy0Vr6+oC#(CO%61_lPn64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xh zq!<_&o_o4DhFJ6-y=3Tj*g=5xLS&1}RFQ@NnRg8jL{ncym>W)bDYRYgRWn%01lSYkZB;=Q;E885kHC NJYD@<);T3K0RX!aj2r*} diff --git a/dist/qt_themes/qdarkstyle/icons/48x48/plus.png b/dist/qt_themes/qdarkstyle/icons/48x48/list-add.png similarity index 100% rename from dist/qt_themes/qdarkstyle/icons/48x48/plus.png rename to dist/qt_themes/qdarkstyle/icons/48x48/list-add.png diff --git a/dist/qt_themes/qdarkstyle/style.qrc b/dist/qt_themes/qdarkstyle/style.qrc index f770e09fdb..a89fb26c68 100644 --- a/dist/qt_themes/qdarkstyle/style.qrc +++ b/dist/qt_themes/qdarkstyle/style.qrc @@ -10,7 +10,7 @@ icons/48x48/chip.png icons/48x48/folder.png icons/48x48/no_avatar.png - icons/48x48/plus.png + icons/48x48/list-add.png icons/48x48/sd_card.png icons/48x48/star.png icons/256x256/plus_folder.png diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/lock.png b/dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/lock.png deleted file mode 100644 index c750a39e855800fe4cde217a1bf28f841030e501..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^Rm@;DWu&Co?cG za29w(7Bet#3xhBt!>lEak-aeD5gi-JuC z0xscgOhHVt9_&F(We)6pvKj1C9N4!xu-|GdQ3(6+hclT?$l~sNmF?5#o_)4Nl)<#% zdAD@H38n>{dVL4~ZPjG5xX%&5`t{oNUAm20S2=hXE?atMOsSJqx?`|&$`TvJ4--nJ zUUA=X?)uy%h2k44CYDU#eg5<5r28M{q(Ar~-F4=|muV$2H}3w}Cs2Dpe}c5ko4-%4 z8eaOuqQ27O>164{R;-7=PIuTV^g-#wH4A3t3pEU}NsMoQOW59GU|?YIboFyt=akR{ E0C@XzqyPW_ diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/refresh.png b/dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/refresh.png deleted file mode 100644 index d4afd76f949ff5c65e039b69ff999325bff5d7b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 362 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7Sc;uILpV4%IBGajIv5xj zI14-?iy0Vr6+oC#(CO%61_lPn64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xh zq!<_&o_o4DhFJ6-y=3Tj*g=5xLS&1}RFQ@NnRg8jL{ncym>W)bDYRYgRWn%01lSYkZB;=Q;E885kHC NJYD@<);T3K0RX!aj2r*} 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 deleted file mode 100644 index d4afd76f949ff5c65e039b69ff999325bff5d7b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 362 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7Sc;uILpV4%IBGajIv5xj zI14-?iy0Vr6+oC#(CO%61_lPn64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xh zq!<_&o_o4DhFJ6-y=3Tj*g=5xLS&1}RFQ@NnRg8jL{ncym>W)bDYRYgRWn%01lSYkZB;=Q;E885kHC NJYD@<);T3K0RX!aj2r*} diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/256x256/plus_folder.png b/dist/qt_themes/qdarkstyle_midnight_blue/icons/256x256/plus_folder.png deleted file mode 100644 index 303f9a321890fc4c2054e2cff498adf23f654b70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3438 zcmeAS@N?(olHy`uVBq!ia0y~yU}OMc4mJh`hM1xiX$%YuEX7WqAsieW95oy%9SjT% zoCO|{#S9F50wB!z^Fn|n0|SF(iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$ zQVa|{uRUEHLn`LHy<5NL?$_AkAD{mYSg`czcdeY}jhxx+Go4*U#J7rh%s8-Okug*9 ziMko7lN5y_e8fzp>hrvhiCvKR-h9Sa^^>vz+wGDCH*!uK+0YZ^6P>{0#%X{1l9)v8 z@8g!SdQbmZeE;^_c7E}``OlSiF5LP3%je3%eEapk|JI%V&h9Zu#S<6O(r`2MOnb*J z!!5%g!==MEttaW7*k6GgTsh2T4E%0Krfr(Iks1x{yf1ITPnpJ(&SkF zh<>nkSpU)G>kjT82`+22WnI3`3TI4trg@g zf1(xXE^l;XT}o$cWia~uz0to%qx)ALYu#Dl4ihe8F^9By%y$^x81J%>`Z2rXN5D&g zSNk%#6^!pQ-C@>|&Xw`~c(3C}%u9h++rmX1()5_FG1*)HvY3@5T@d8*C;p|vt938^ zp6rwn|8Eh&R-04FoIZ1B z{!4*Z%j88J()LO2*pVRS`@Z+UZ?EfhdEcwA=!JsA>UE4ovjXeKEt_-w&@Z*xA$rfQR_JHkQ8m2CF&d69V zy(d-MbWywck2xxh_WGtP*kwYjTAn?9aEbAXtZfZ@!lfUdgOZhuYpu?v++?r`w`!5v zp8VmX&Ig;n?kCr>?-LfBeQVYgrU}RHe{aZVh-b{p{Iu?(Sc6IAyrut3)~!~4WL<4N zgH^$I8A~4XKO3cMdL;tf4zp_Fm;GOG)BX8x@!DPMO@5wZ`=@Sv{mgg$D25<&9rnC4 zXZ+7T-&9!6xa8eVb_-*rd2?R3<}rHQEjIe_^^8r?I`Lhs3Z>WC9*8R?efH5W;C6Vm z?s0>(QSq_#+6acA?R#Z+lr009_5H6~TAa~caT_*;tBLF%gatPizEZ!-G~v|-mLIom z?K2rYzFOECpP%=Ovz&3st~HDIYj5Db!!#kQnCWjeI|H}Fs*6i^{|`tKPY~ZQ^IxE+ zXRUXGvcy^ar?Ce%3Vyt>NYIC^K>qJ!!8|s(z7F}mjJV7so_Uumc{Z@^;HZf94*uG} z-Dt0R`)f#A+?1K`vOGRdn7Q}N9t-37d6~I&(zouiM)2=3Rx;aSvhPae%$-a-SR*ce zxS-E``nFbsdtaPzWj`zR>Q+h$e&i@{M*QK5^D%C8rMkrcN_=%5UJRVE=1&x{_ZJ(#>@|Bvq?U*4zuUVA3S_|eX-;yMj{C;q)%lAm%)IG!t#D`x)8 zbg^>_6(bq$7FZTky%b>n%`pG`nPzYHi+6MyIL#w6!l#|v*#7iD>Qd*7Jh1~$ti>(X zlyqe7u{T~^!g2N-(~O$sQ~3;c7J|ku3PWu9(0+9lh4NDw)j+fjiI%99B)4+P-%y#DK%;^l?+{Y!;)A{VWPM%?JIM00D<;b*2k;f+PX81f| z=I``pTMtA%h>7_#IYIS<_<>_*VnVIX?AXZAHf82-rg+AC!B*X3PfQP7H~ReMlH;*X zR)amO8-l&tFT~yC|B;loPDeH+CW68F#F@#B{L{`YbdzDJ*;CR{n8?WUTu8yIJs|nq zsWYNWoqL$M6ZmG{WIm@g*SVMLKr&+l!(j_Pi#;VArthA6u}iRv9k|n{BkQoXBKIZ3 z;{!}HZZBNQyh5~nDxU$LPQ%Whwy)Ic*ZuIFunLr{NC+(~iE=Z;vu&G87`7(4Lv0cU z*)-c5;s`mGI6YaX-rE6I2P`%)JQEP~XD*+9ZsD=JVPJu_&qpsYURiOx!P=`GjnqGLjD5(mohVdiah?k zutNQTMp zKVD)?``CPm(ZrfN;nUqfs{=e`O!swUoi=Y~P`j_Yl=;j9X~B;*F9kqaA1XbHdvJPb z@f*cPdo5X~;>`@Z9(pB2zZ3|LkruqK2NtnXQ2HmngQH?&iP(ea1MObz7YcM5`Z_wK z8-g3%xm-OSyl=cJxN&g++u6yi7Ze3IibXK~kt@*u>w0rrdSgA4Usnge%aL<}XI8f9 zXvsR9mC`w|x?#1^XO0IF4;F|mtD5-l(SCa+o5%T1kqok8g0maXE-lWe!4sYv<<8F2 zO_ULE89tO}o%Su=mKJ-F1? z9(&)7QHOEeIiLH26Qm3xystBKOUqT+&a8CW_E>nPBrp54Rg-2;oH;)yvv=Jc+k?rv zz6G&q+X{`jR(>}6{NT)% z-UB;zeT%Ifc+_lUe^hx3zungTulAK(+MfC8<|ilp`~ICVLH6%%#@zl6@u-Qh7RH6Pe0c+oycUU2t| z`yx$x_|qx`|! z7#NH`Gd!sK#jd1MdRpzl+Ti(jzH}+~3T~9$k#l9GO7D^P?|$Cc7QXkYfS@_!^_Jb*k9R)$GrpD_?)bs~AnC!)i+P-H+Ve zyfKJg7Q8>_b*po1fq-B+)AEb^;~XyixWzKZ?#!e1%9uhC z!S77@%>ODI52|c^E#D~2e*Ar#(Ryz__T>We*lQa8rL`^jG>_pPcZ`7G=Ur$2H|5`) zID`ZHwXjD~7jU%AdXO@qgRja;9?AtuK~Kz0BQhTx?jNA=YRzSN4Fh@!W0NDBX(7 bzv^eszIo=ppPexS0|SGntDnm{r-UW|wLkz{ diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/bad_folder.png b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/bad_folder.png deleted file mode 100644 index 4a9709623476fcf4070c4e3da2bb17375222082e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1098 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 diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/plus.png b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/plus.png deleted file mode 100644 index 16cc8b4f44d52009d4a3f4c9d46f5bb0e20babcf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 339 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F|1*Xx zz6A)vjMIQmSyCcx-VxVnUA4RJ-|$|RqVdSm_HF3zd+(pr@|6e{#@X9+R(rktwCh8C zxq?!j{rg3Cs`7IRI<+JA9GTa7RmR~g;}ryv#VWydeP5XNfvp9(^DTbmhizuAWO#f+ WQ)xlqB7X)31_n=8KbLh*2~7ap#e&TM diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/sd_card.png b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/sd_card.png deleted file mode 100644 index 0291c6542d05a40a350bb5bdbd99a15c01467161..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 676 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?FcxAsLNtXYJ1xag=DAe_m$JJg21Oh0~g5ga~qLOMjG-_DxUBF0I`lyk<+t ze`e{8o~mMuj%$N5E^#$gv^x4OJjng8W1raehiaR5?<_1W7n;e=S9bsQ?b>^DcgF6p zUD2>)-IC{%%tGX6PrB!|OZ{bp=y|1&)0RX}s=KNYcVyO*&Gp*%r){~gVaMrJOFZwN zW_oIUfayZ%qx1v6b1Io;FxxS9pEEN)V6uVb%iJ2iA8a;7n}iSOY~a~b_Nm)JJ$jz` z=G%(rZa-1A)wNI--;=BIa_RS*(vfvXPqR<@6?g6Qwzrj)_bs0#-_O4<@zdYAOJH`0g4s%koS?=V zOPDr#vL;RDI-(}p;R~1ecbh5eiqf1p;gOB~rrjZ`-wT$mIWT#a>#9kgwSMP*QQ2_l z!^=~7iJ}&%Y43vPJ`yz89DX45K{j)e;u^;3wLdp{%$imbf63bPKmSx;&wQ1;6HB(7 b`Dm{Gecr!S9Ho*B3=9mOu6{1-oD!M<82&8j diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/star.png b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/star.png deleted file mode 100644 index 90d423a1d4c1e05ccec0a01fa34abca9fe99676d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 725 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F*yi}}0p)tauU5tllaBo)Q>MX1|2Fs}G8UF*X1?d#4kh)10I zxu-Oht>X5f1JwtftX->o;H20i={YB&jE_!G6Pxqy#|=flX;IuD>Yt z%zS;vW0%y9G>Hb?12Lywn6F@58c^zd?trLgC>WzJ@ zrk=r*v?ke|Hk$rtp3$+IENR{zOP%IDJ2JEL>N@N_qBtxT8P4$8%RPs&?uqRg-5{&DZ>&f9`V?jK*A{>|1; z-1hOM8Ro|xNIl7Zup&K1%Dtv(&T<|NuUS*CJPtN!jh}Q)I{8^lQ%%}}H6I?St_;7V zcwIrBIWAaMyZpLC!XqgLDcv-&Rg?6*cBy1qC7;oAl2^=W*eq$bWc~r!gt?;OEN(03 zzqT&4TGr@i`&l@l-0RQ1C-#{=$4ovf^1WF2V2bm+#|Ms^?VNW^D1Sw{yP5F;(*u?9 z3{{hF+!V7sT<`9&Z2v)<0`Ba&`pWs76%0BNKii!$^7OU{Rygn7cvD#Mf8wjT_gM_@ hyTtDLlm3TM;M?I@r(Pae&%nUI;OXk;vd$@?2>^orLy!Of diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/style.qrc b/dist/qt_themes/qdarkstyle_midnight_blue/style.qrc index 142dd3288d..dc3d7fecbd 100644 --- a/dist/qt_themes/qdarkstyle_midnight_blue/style.qrc +++ b/dist/qt_themes/qdarkstyle_midnight_blue/style.qrc @@ -1,15 +1,16 @@ 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 - icons/48x48/plus.png - icons/48x48/sd_card.png - icons/48x48/star.png - icons/256x256/plus_folder.png + ../qdarkstyle/icons/16x16/lock.png + ../qdarkstyle/icons/16x16/view-refresh.png + ../qdarkstyle/icons/48x48/bad_folder.png + ../qdarkstyle/icons/48x48/chip.png + ../qdarkstyle/icons/48x48/folder.png + ../qdarkstyle/icons/48x48/no_avatar.png + ../qdarkstyle/icons/48x48/list-add.png + ../qdarkstyle/icons/48x48/sd_card.png + ../qdarkstyle/icons/48x48/star.png + ../qdarkstyle/icons/256x256/plus_folder.png rc/arrow_down.png diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp index 041e6ac116..c4b1f65bdf 100644 --- a/src/yuzu/game_list.cpp +++ b/src/yuzu/game_list.cpp @@ -286,7 +286,7 @@ void GameList::OnUpdateThemedIcons() { } case GameListItemType::AddDir: child->setData( - QIcon::fromTheme(QStringLiteral("plus")) + QIcon::fromTheme(QStringLiteral("list-add")) .pixmap(icon_size) .scaled(icon_size, icon_size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation), Qt::DecorationRole); diff --git a/src/yuzu/game_list_p.h b/src/yuzu/game_list_p.h index e7667cf602..0e19be22d0 100644 --- a/src/yuzu/game_list_p.h +++ b/src/yuzu/game_list_p.h @@ -294,7 +294,7 @@ public: const int icon_size = UISettings::values.folder_icon_size.GetValue(); - setData(QIcon::fromTheme(QStringLiteral("plus")) + setData(QIcon::fromTheme(QStringLiteral("list-add")) .pixmap(icon_size) .scaled(icon_size, icon_size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation), Qt::DecorationRole); diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index f8c2340828..e473ac6da9 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -257,6 +257,18 @@ static QString PrettyProductName() { return QSysInfo::prettyProductName(); } +bool GMainWindow::check_dark_mode() { +#ifdef __linux__ + const QPalette test_palette(qApp->palette()); + const QColor text_color = test_palette.color(QPalette::Active, QPalette::Text); + const QColor window_color = test_palette.color(QPalette::Active, QPalette::Window); + return (text_color.value() > window_color.value()); +#else + // TODO: Windows + return false; +#endif // __linux__ +} + GMainWindow::GMainWindow(bool has_broken_vulkan) : ui{std::make_unique()}, system{std::make_unique()}, input_subsystem{std::make_shared()}, @@ -274,6 +286,13 @@ GMainWindow::GMainWindow(bool has_broken_vulkan) ui->setupUi(this); statusBar()->hide(); + // Check dark mode before a theme is loaded + os_dark_mode = check_dark_mode(); + startup_icon_theme = QIcon::themeName(); + // fallback can only be set once, colorful theme icons are okay on both light/dark + QIcon::setFallbackThemeName(QStringLiteral("colorful")); + QIcon::setFallbackSearchPaths(QStringList(QStringLiteral(":/icons"))); + default_theme_paths = QIcon::themeSearchPaths(); UpdateUITheme(); @@ -3930,8 +3949,21 @@ void GMainWindow::filterBarSetChecked(bool state) { emit(OnToggleFilterBar()); } +static void AdjustLinkColor() { + QPalette new_pal(qApp->palette()); + if (UISettings::IsDarkTheme()) { + new_pal.setColor(QPalette::Link, QColor(0, 190, 255, 255)); + } else { + new_pal.setColor(QPalette::Link, QColor(0, 140, 200, 255)); + } + if (qApp->palette().color(QPalette::Link) != new_pal.color(QPalette::Link)) { + qApp->setPalette(new_pal); + } +} + void GMainWindow::UpdateUITheme() { - const QString default_theme = QStringLiteral("default"); + const QString default_theme = + QString::fromUtf8(UISettings::themes[static_cast(Config::default_theme)].second); QString current_theme = UISettings::values.theme; QStringList theme_paths(default_theme_paths); @@ -3939,6 +3971,23 @@ void GMainWindow::UpdateUITheme() { current_theme = default_theme; } +#ifdef _WIN32 + QIcon::setThemeName(current_theme); + AdjustLinkColor(); +#else + if (current_theme == QStringLiteral("default") || current_theme == QStringLiteral("colorful")) { + QIcon::setThemeName(current_theme == QStringLiteral("colorful") ? current_theme + : startup_icon_theme); + QIcon::setThemeSearchPaths(theme_paths); + if (check_dark_mode()) { + current_theme = QStringLiteral("default_dark"); + } + } else { + QIcon::setThemeName(current_theme); + QIcon::setThemeSearchPaths(QStringList(QStringLiteral(":/icons"))); + AdjustLinkColor(); + } +#endif if (current_theme != default_theme) { QString theme_uri{QStringLiteral(":%1/style.qss").arg(current_theme)}; QFile f(theme_uri); @@ -3961,17 +4010,6 @@ void GMainWindow::UpdateUITheme() { qApp->setStyleSheet({}); setStyleSheet({}); } - - QPalette new_pal(qApp->palette()); - if (UISettings::IsDarkTheme()) { - new_pal.setColor(QPalette::Link, QColor(0, 190, 255, 255)); - } else { - new_pal.setColor(QPalette::Link, QColor(0, 140, 200, 255)); - } - qApp->setPalette(new_pal); - - QIcon::setThemeName(current_theme); - QIcon::setThemeSearchPaths(theme_paths); } void GMainWindow::LoadTranslation() { @@ -4022,6 +4060,26 @@ void GMainWindow::SetDiscordEnabled([[maybe_unused]] bool state) { discord_rpc->Update(); } +void GMainWindow::changeEvent(QEvent* event) { +#ifdef __linux__ + // PaletteChange event appears to only reach so far into the GUI, explicitly asking to + // UpdateUITheme is a decent work around + if (event->type() == QEvent::PaletteChange) { + const QPalette test_palette(qApp->palette()); + const QString current_theme = UISettings::values.theme; + // Keeping eye on QPalette::Window to avoid looping. QPalette::Text might be useful too + static QColor last_window_color; + const QColor window_color = test_palette.color(QPalette::Active, QPalette::Window); + if (last_window_color != window_color && (current_theme == QStringLiteral("default") || + current_theme == QStringLiteral("colorful"))) { + UpdateUITheme(); + } + last_window_color = window_color; + } +#endif // __linux__ + QWidget::changeEvent(event); +} + #ifdef main #undef main #endif diff --git a/src/yuzu/main.h b/src/yuzu/main.h index 23b67a14ed..2d1c8857b4 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -251,6 +251,7 @@ private: bool ConfirmForceLockedExit(); void RequestGameExit(); void RequestGameResume(); + void changeEvent(QEvent* event) override; void closeEvent(QCloseEvent* event) override; #ifdef __linux__ @@ -392,6 +393,10 @@ private: QTimer mouse_hide_timer; QTimer mouse_center_timer; + QString startup_icon_theme; + bool os_dark_mode = false; + bool check_dark_mode(); + // FS std::shared_ptr vfs; std::unique_ptr provider; From cfbd70d03bebb34b09fef6508e4dc09f2edba38f Mon Sep 17 00:00:00 2001 From: Kyle K <190571+Docteh@users.noreply.github.com> Date: Fri, 5 Aug 2022 06:57:15 -0700 Subject: [PATCH 2/3] assign colors to default_dark theme separate commit might be useful later on --- dist/qt_themes/default_dark/style.qss | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dist/qt_themes/default_dark/style.qss b/dist/qt_themes/default_dark/style.qss index 356996357c..ca6daa2d52 100644 --- a/dist/qt_themes/default_dark/style.qss +++ b/dist/qt_themes/default_dark/style.qss @@ -14,11 +14,9 @@ QPushButton#TogglableStatusBarButton { text-align: center; } -/* QPushButton#TogglableStatusBarButton:checked { - color: #000000; + color: palette(text); } -*/ QPushButton#TogglableStatusBarButton:hover { border: 1px solid #76797C; @@ -41,7 +39,7 @@ QPushButton#RendererStatusBarButton:checked { } QPushButton#RendererStatusBarButton:!checked { - color: #0066ff; + color: #00ccdd; } QPushButton#GPUStatusBarButton { @@ -57,16 +55,16 @@ QPushButton#GPUStatusBarButton:hover { } QPushButton#GPUStatusBarButton:checked { - color: #b06020; + color: #ff8040; } QPushButton#GPUStatusBarButton:!checked { - color: #109010; + color: #40dd40; } QPushButton#DockingStatusBarButton { min-width: 0px; - /*color: #000000;*/ + color: palette(text); border: 1px solid transparent; background-color: transparent; padding: 0px 3px 0px 3px; From d4b1095173cf32dbd9a890b066d991ca795abd80 Mon Sep 17 00:00:00 2001 From: Kyle Kienapfel Date: Fri, 12 Aug 2022 06:10:18 -0700 Subject: [PATCH 3/3] review pass on CheckDarkMode function --- src/yuzu/main.cpp | 6 +++--- src/yuzu/main.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index e473ac6da9..5111b0ebaa 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -257,7 +257,7 @@ static QString PrettyProductName() { return QSysInfo::prettyProductName(); } -bool GMainWindow::check_dark_mode() { +bool GMainWindow::CheckDarkMode() { #ifdef __linux__ const QPalette test_palette(qApp->palette()); const QColor text_color = test_palette.color(QPalette::Active, QPalette::Text); @@ -287,7 +287,7 @@ GMainWindow::GMainWindow(bool has_broken_vulkan) statusBar()->hide(); // Check dark mode before a theme is loaded - os_dark_mode = check_dark_mode(); + os_dark_mode = CheckDarkMode(); startup_icon_theme = QIcon::themeName(); // fallback can only be set once, colorful theme icons are okay on both light/dark QIcon::setFallbackThemeName(QStringLiteral("colorful")); @@ -3979,7 +3979,7 @@ void GMainWindow::UpdateUITheme() { QIcon::setThemeName(current_theme == QStringLiteral("colorful") ? current_theme : startup_icon_theme); QIcon::setThemeSearchPaths(theme_paths); - if (check_dark_mode()) { + if (CheckDarkMode()) { current_theme = QStringLiteral("default_dark"); } } else { diff --git a/src/yuzu/main.h b/src/yuzu/main.h index 2d1c8857b4..0b25ebe6cc 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -348,6 +348,7 @@ private: void OpenURL(const QUrl& url); void LoadTranslation(); void OpenPerGameConfiguration(u64 title_id, const std::string& file_name); + bool CheckDarkMode(); QString GetTasStateDescription() const; @@ -395,7 +396,6 @@ private: QString startup_icon_theme; bool os_dark_mode = false; - bool check_dark_mode(); // FS std::shared_ptr vfs;