summaryrefslogtreecommitdiff
path: root/dist
diff options
context:
space:
mode:
authorGravatar CJBok2020-01-28 23:59:30 +0100
committerGravatar CJBok2020-01-28 23:59:30 +0100
commit4bc4fdf5ff69e8a8eeb7e62635c50ea4c84eb952 (patch)
tree1fe70c7485464f8e31af3a04a624af035c671fb7 /dist
parentMerge pull request #3359 from ReinUsesLisp/assert-point-size (diff)
downloadyuzu-4bc4fdf5ff69e8a8eeb7e62635c50ea4c84eb952.tar.gz
yuzu-4bc4fdf5ff69e8a8eeb7e62635c50ea4c84eb952.tar.xz
yuzu-4bc4fdf5ff69e8a8eeb7e62635c50ea4c84eb952.zip
GUI: Togglable graphics settings buttons in status bar
Diffstat (limited to 'dist')
-rw-r--r--dist/qt_themes/colorful/style.qrc2
-rw-r--r--dist/qt_themes/colorful/style.qss4
-rw-r--r--dist/qt_themes/default/default.qrc13
-rw-r--r--dist/qt_themes/default/style.qss35
-rw-r--r--dist/qt_themes/qdarkstyle/style.qss38
5 files changed, 77 insertions, 15 deletions
diff --git a/dist/qt_themes/colorful/style.qrc b/dist/qt_themes/colorful/style.qrc
index af2f3fd56..36735519a 100644
--- a/dist/qt_themes/colorful/style.qrc
+++ b/dist/qt_themes/colorful/style.qrc
@@ -10,6 +10,6 @@
10 <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file> 10 <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
11 </qresource> 11 </qresource>
12 <qresource prefix="colorful"> 12 <qresource prefix="colorful">
13 <file>style.qss</file> 13 <file alias="style.qss">../default/style.qss</file>
14 </qresource> 14 </qresource>
15</RCC> 15</RCC>
diff --git a/dist/qt_themes/colorful/style.qss b/dist/qt_themes/colorful/style.qss
deleted file mode 100644
index 413fc81da..000000000
--- a/dist/qt_themes/colorful/style.qss
+++ /dev/null
@@ -1,4 +0,0 @@
1/*
2 This file is intentionally left blank.
3 We do not want to apply any stylesheet for colorful, only icons.
4*/
diff --git a/dist/qt_themes/default/default.qrc b/dist/qt_themes/default/default.qrc
index d1a0ee1be..c51fdb26c 100644
--- a/dist/qt_themes/default/default.qrc
+++ b/dist/qt_themes/default/default.qrc
@@ -1,25 +1,18 @@
1<RCC> 1<RCC>
2 <qresource prefix="icons/default"> 2 <qresource prefix="icons/default">
3 <file alias="index.theme">icons/index.theme</file> 3 <file alias="index.theme">icons/index.theme</file>
4
5 <file alias="16x16/checked.png">icons/16x16/checked.png</file> 4 <file alias="16x16/checked.png">icons/16x16/checked.png</file>
6
7 <file alias="16x16/failed.png">icons/16x16/failed.png</file> 5 <file alias="16x16/failed.png">icons/16x16/failed.png</file>
8
9 <file alias="16x16/lock.png">icons/16x16/lock.png</file> 6 <file alias="16x16/lock.png">icons/16x16/lock.png</file>
10
11 <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file> 7 <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file>
12
13 <file alias="48x48/chip.png">icons/48x48/chip.png</file> 8 <file alias="48x48/chip.png">icons/48x48/chip.png</file>
14
15 <file alias="48x48/folder.png">icons/48x48/folder.png</file> 9 <file alias="48x48/folder.png">icons/48x48/folder.png</file>
16
17 <file alias="48x48/plus.png">icons/48x48/plus.png</file> 10 <file alias="48x48/plus.png">icons/48x48/plus.png</file>
18
19 <file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file> 11 <file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file>
20
21 <file alias="256x256/yuzu.png">icons/256x256/yuzu.png</file> 12 <file alias="256x256/yuzu.png">icons/256x256/yuzu.png</file>
22
23 <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file> 13 <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
24 </qresource> 14 </qresource>
15 <qresource prefix="default">
16 <file>style.qss</file>
17 </qresource>
25</RCC> 18</RCC>
diff --git a/dist/qt_themes/default/style.qss b/dist/qt_themes/default/style.qss
new file mode 100644
index 000000000..6b5953e38
--- /dev/null
+++ b/dist/qt_themes/default/style.qss
@@ -0,0 +1,35 @@
1QPushButton#TogglableStatusBarButton {
2 color: #959595;
3 border: 1px solid transparent;
4 background-color: transparent;
5 padding: 0px 3px 0px 3px;
6 text-align: center;
7}
8
9QPushButton#TogglableStatusBarButton:checked {
10 color: #000000;
11}
12
13QPushButton#TogglableStatusBarButton:hover {
14 border: 1px solid #76797C;
15}
16
17QPushButton#RendererStatusBarButton {
18 color: #656565;
19 border: 1px solid transparent;
20 background-color: transparent;
21 padding: 0px 3px 0px 3px;
22 text-align: center;
23}
24
25QPushButton#RendererStatusBarButton:hover {
26 border: 1px solid #76797C;
27}
28
29QPushButton#RendererStatusBarButton:checked {
30 color: #e85c00;
31}
32
33QPushButton#RendererStatusBarButton:!checked{
34 color: #0066ff;
35}
diff --git a/dist/qt_themes/qdarkstyle/style.qss b/dist/qt_themes/qdarkstyle/style.qss
index 9814b06dd..7d088a719 100644
--- a/dist/qt_themes/qdarkstyle/style.qss
+++ b/dist/qt_themes/qdarkstyle/style.qss
@@ -1236,3 +1236,41 @@ QToolButton:disabled,
1236QPlainTextEdit:disabled { 1236QPlainTextEdit:disabled {
1237 background-color: #2b2e31; 1237 background-color: #2b2e31;
1238} 1238}
1239
1240QPushButton#TogglableStatusBarButton {
1241 min-width: 0px;
1242 color: #656565;
1243 border: 1px solid transparent;
1244 background-color: transparent;
1245 padding: 0px 3px 0px 3px;
1246 text-align: center;
1247}
1248
1249QPushButton#TogglableStatusBarButton:checked {
1250 color: #ffffff;
1251}
1252
1253QPushButton#TogglableStatusBarButton:hover {
1254 border: 1px solid #76797C;
1255}
1256
1257QPushButton#RendererStatusBarButton {
1258 min-width: 0px;
1259 color: #656565;
1260 border: 1px solid transparent;
1261 background-color: transparent;
1262 padding: 0px 3px 0px 3px;
1263 text-align: center;
1264}
1265
1266QPushButton#RendererStatusBarButton:hover {
1267 border: 1px solid #76797C;
1268}
1269
1270QPushButton#RendererStatusBarButton:checked {
1271 color: #e85c00;
1272}
1273
1274QPushButton#RendererStatusBarButton:!checked{
1275 color: #00ccdd;
1276} \ No newline at end of file