summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorKyle Kienapfel <Docteh@users.noreply.github.com>2022-09-12 17:56:24 +0200
committerKyle Kienapfel <Docteh@users.noreply.github.com>2022-09-16 08:00:49 +0200
commit9554c67809a674cad2de1482634da2f79de90474 (patch)
tree895b1c4366085713de06dcd627423b236a4d0b34 /dist
parentMerge pull request #8878 from Kelebek1/remove_pause (diff)
downloadyuzu-9554c67809a674cad2de1482634da2f79de90474.tar
yuzu-9554c67809a674cad2de1482634da2f79de90474.tar.gz
yuzu-9554c67809a674cad2de1482634da2f79de90474.tar.bz2
yuzu-9554c67809a674cad2de1482634da2f79de90474.tar.lz
yuzu-9554c67809a674cad2de1482634da2f79de90474.tar.xz
yuzu-9554c67809a674cad2de1482634da2f79de90474.tar.zst
yuzu-9554c67809a674cad2de1482634da2f79de90474.zip
Diffstat (limited to 'dist')
-rw-r--r--dist/qt_themes/colorful/icons/16x16/checked.png (renamed from dist/qt_themes/default/icons/16x16/checked.png)bin414 -> 414 bytes
-rw-r--r--dist/qt_themes/colorful/icons/16x16/failed.png (renamed from dist/qt_themes/default/icons/16x16/failed.png)bin431 -> 431 bytes
-rw-r--r--dist/qt_themes/colorful/icons/16x16/info.pngbin0 -> 428 bytes
-rw-r--r--dist/qt_themes/colorful/icons/16x16/sync.pngbin0 -> 548 bytes
-rw-r--r--dist/qt_themes/colorful/icons/16x16/view-refresh.png (renamed from dist/qt_themes/default/icons/16x16/view-refresh.png)bin349 -> 349 bytes
-rw-r--r--dist/qt_themes/colorful/icons/48x48/no_avatar.png (renamed from dist/qt_themes/default/icons/48x48/no_avatar.png)bin678 -> 678 bytes
-rw-r--r--dist/qt_themes/colorful/icons/index.theme1
-rw-r--r--dist/qt_themes/colorful/style.qrc6
-rw-r--r--dist/qt_themes/colorful_dark/style.qrc10
-rw-r--r--dist/qt_themes/default/default.qrc11
-rw-r--r--dist/qt_themes/default/icons/index.theme3
-rw-r--r--dist/qt_themes/qdarkstyle/icons/index.theme4
-rw-r--r--dist/qt_themes/qdarkstyle_midnight_blue/icons/index.theme2
13 files changed, 15 insertions, 22 deletions
diff --git a/dist/qt_themes/default/icons/16x16/checked.png b/dist/qt_themes/colorful/icons/16x16/checked.png
index b9e64e9e0..b9e64e9e0 100644
--- a/dist/qt_themes/default/icons/16x16/checked.png
+++ b/dist/qt_themes/colorful/icons/16x16/checked.png
Binary files differ
diff --git a/dist/qt_themes/default/icons/16x16/failed.png b/dist/qt_themes/colorful/icons/16x16/failed.png
index a1872835d..a1872835d 100644
--- a/dist/qt_themes/default/icons/16x16/failed.png
+++ b/dist/qt_themes/colorful/icons/16x16/failed.png
Binary files differ
diff --git a/dist/qt_themes/colorful/icons/16x16/info.png b/dist/qt_themes/colorful/icons/16x16/info.png
new file mode 100644
index 000000000..8b9330f4c
--- /dev/null
+++ b/dist/qt_themes/colorful/icons/16x16/info.png
Binary files differ
diff --git a/dist/qt_themes/colorful/icons/16x16/sync.png b/dist/qt_themes/colorful/icons/16x16/sync.png
new file mode 100644
index 000000000..0d57789c3
--- /dev/null
+++ b/dist/qt_themes/colorful/icons/16x16/sync.png
Binary files differ
diff --git a/dist/qt_themes/default/icons/16x16/view-refresh.png b/dist/qt_themes/colorful/icons/16x16/view-refresh.png
index 69f9474ac..69f9474ac 100644
--- a/dist/qt_themes/default/icons/16x16/view-refresh.png
+++ b/dist/qt_themes/colorful/icons/16x16/view-refresh.png
Binary files differ
diff --git a/dist/qt_themes/default/icons/48x48/no_avatar.png b/dist/qt_themes/colorful/icons/48x48/no_avatar.png
index 76f812349..76f812349 100644
--- a/dist/qt_themes/default/icons/48x48/no_avatar.png
+++ b/dist/qt_themes/colorful/icons/48x48/no_avatar.png
Binary files differ
diff --git a/dist/qt_themes/colorful/icons/index.theme b/dist/qt_themes/colorful/icons/index.theme
index b452aca16..6eb3c6949 100644
--- a/dist/qt_themes/colorful/icons/index.theme
+++ b/dist/qt_themes/colorful/icons/index.theme
@@ -1,7 +1,6 @@
[Icon Theme]
Name=colorful
Comment=Colorful theme
-Inherits=default
Directories=16x16,48x48,256x256
[16x16]
diff --git a/dist/qt_themes/colorful/style.qrc b/dist/qt_themes/colorful/style.qrc
index 507e0e58b..82cd367be 100644
--- a/dist/qt_themes/colorful/style.qrc
+++ b/dist/qt_themes/colorful/style.qrc
@@ -6,14 +6,20 @@ SPDX-License-Identifier: GPL-2.0-or-later
<RCC>
<qresource prefix="icons/colorful">
<file alias="index.theme">icons/index.theme</file>
+ <file alias="16x16/checked.png">icons/16x16/checked.png</file>
<file alias="16x16/connected.png">icons/16x16/connected.png</file>
<file alias="16x16/connected_notification.png">icons/16x16/connected_notification.png</file>
<file alias="16x16/disconnected.png">icons/16x16/disconnected.png</file>
+ <file alias="16x16/failed.png">icons/16x16/failed.png</file>
+ <file alias="16x16/info.png">icons/16x16/info.png</file>
<file alias="16x16/lock.png">icons/16x16/lock.png</file>
+ <file alias="16x16/sync.png">icons/16x16/sync.png</file>
+ <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
<file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file>
<file alias="48x48/chip.png">icons/48x48/chip.png</file>
<file alias="48x48/folder.png">icons/48x48/folder.png</file>
<file alias="48x48/list-add.png">icons/48x48/list-add.png</file>
+ <file alias="48x48/no_avatar.png">icons/48x48/no_avatar.png</file>
<file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file>
<file alias="48x48/star.png">icons/48x48/star.png</file>
<file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
diff --git a/dist/qt_themes/colorful_dark/style.qrc b/dist/qt_themes/colorful_dark/style.qrc
index 9853fd438..72451ef02 100644
--- a/dist/qt_themes/colorful_dark/style.qrc
+++ b/dist/qt_themes/colorful_dark/style.qrc
@@ -5,19 +5,9 @@ SPDX-License-Identifier: GPL-2.0-or-later
<RCC>
<qresource prefix="icons/colorful_dark">
- <file alias="16x16/connected.png">../colorful/icons/16x16/connected.png</file>
- <file alias="16x16/connected_notification.png">../colorful/icons/16x16/connected_notification.png</file>
- <file alias="16x16/disconnected.png">../colorful/icons/16x16/disconnected.png</file>
<file alias="index.theme">icons/index.theme</file>
<file alias="16x16/lock.png">icons/16x16/lock.png</file>
<file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
- <file alias="48x48/bad_folder.png">../colorful/icons/48x48/bad_folder.png</file>
- <file alias="48x48/chip.png">../colorful/icons/48x48/chip.png</file>
- <file alias="48x48/folder.png">../colorful/icons/48x48/folder.png</file>
- <file alias="48x48/no_avatar.png">../qdarkstyle/icons/48x48/no_avatar.png</file>
- <file alias="48x48/list-add.png">../colorful/icons/48x48/list-add.png</file>
- <file alias="48x48/sd_card.png">../colorful/icons/48x48/sd_card.png</file>
- <file alias="256x256/plus_folder.png">../colorful/icons/256x256/plus_folder.png</file>
</qresource>
<qresource prefix="qss_icons">
diff --git a/dist/qt_themes/default/default.qrc b/dist/qt_themes/default/default.qrc
index a07f2a9c1..2e01a3434 100644
--- a/dist/qt_themes/default/default.qrc
+++ b/dist/qt_themes/default/default.qrc
@@ -5,23 +5,20 @@ SPDX-License-Identifier: GPL-2.0-or-later
<RCC>
<qresource prefix="icons/default">
+ <!-- "colorful" is now the default theme, add new icons there -->
<file alias="index.theme">icons/index.theme</file>
- <file alias="16x16/checked.png">icons/16x16/checked.png</file>
- <file alias="16x16/failed.png">icons/16x16/failed.png</file>
- <file alias="16x16/lock.png">icons/16x16/lock.png</file>
<file alias="16x16/connected.png">icons/16x16/connected.png</file>
- <file alias="16x16/disconnected.png">icons/16x16/disconnected.png</file>
<file alias="16x16/connected_notification.png">icons/16x16/connected_notification.png</file>
- <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
+ <file alias="16x16/disconnected.png">icons/16x16/disconnected.png</file>
+ <file alias="16x16/lock.png">icons/16x16/lock.png</file>
<file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file>
<file alias="48x48/chip.png">icons/48x48/chip.png</file>
<file alias="48x48/folder.png">icons/48x48/folder.png</file>
- <file alias="48x48/no_avatar.png">icons/48x48/no_avatar.png</file>
<file alias="48x48/list-add.png">icons/48x48/list-add.png</file>
<file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file>
<file alias="48x48/star.png">icons/48x48/star.png</file>
- <file alias="256x256/yuzu.png">icons/256x256/yuzu.png</file>
<file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
+ <file alias="256x256/yuzu.png">icons/256x256/yuzu.png</file>
</qresource>
<qresource prefix="default">
<file>style.qss</file>
diff --git a/dist/qt_themes/default/icons/index.theme b/dist/qt_themes/default/icons/index.theme
index 1edbe6408..21b35e3e3 100644
--- a/dist/qt_themes/default/icons/index.theme
+++ b/dist/qt_themes/default/icons/index.theme
@@ -1,6 +1,7 @@
[Icon Theme]
Name=default
Comment=default theme
+Inherits=colorful
Directories=16x16,48x48,256x256
[16x16]
@@ -10,4 +11,4 @@ Size=16
Size=48
[256x256]
-Size=256 \ No newline at end of file
+Size=256
diff --git a/dist/qt_themes/qdarkstyle/icons/index.theme b/dist/qt_themes/qdarkstyle/icons/index.theme
index d1e12f3ef..502717617 100644
--- a/dist/qt_themes/qdarkstyle/icons/index.theme
+++ b/dist/qt_themes/qdarkstyle/icons/index.theme
@@ -1,7 +1,7 @@
[Icon Theme]
Name=qdarkstyle
Comment=dark theme
-Inherits=default
+Inherits=colorful
Directories=16x16,48x48,256x256
[16x16]
@@ -11,4 +11,4 @@ Size=16
Size=48
[256x256]
-Size=256 \ No newline at end of file
+Size=256
diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/index.theme b/dist/qt_themes/qdarkstyle_midnight_blue/icons/index.theme
index 447a6c8be..20f9f6d63 100644
--- a/dist/qt_themes/qdarkstyle_midnight_blue/icons/index.theme
+++ b/dist/qt_themes/qdarkstyle_midnight_blue/icons/index.theme
@@ -1,7 +1,7 @@
[Icon Theme]
Name=qdarkstyle_midnight_blue
Comment=dark theme
-Inherits=default
+Inherits=colorful
Directories=16x16,48x48,256x256
[16x16]