diff options
| author | Feng Chen <VonChenPlus@gmail.com> | 2022-09-20 05:56:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-20 05:56:43 +0200 |
| commit | c864cb57726e76e9dc4558036f3212168bec825d (patch) | |
| tree | ca79c4397f40990488a7b5691e15c0fcfec507b6 /dist | |
| parent | video_core: Generate mipmap texture by drawing (diff) | |
| parent | Merge pull request #8849 from Morph1984/parallel-astc (diff) | |
| download | yuzu-c864cb57726e76e9dc4558036f3212168bec825d.tar yuzu-c864cb57726e76e9dc4558036f3212168bec825d.tar.gz yuzu-c864cb57726e76e9dc4558036f3212168bec825d.tar.bz2 yuzu-c864cb57726e76e9dc4558036f3212168bec825d.tar.lz yuzu-c864cb57726e76e9dc4558036f3212168bec825d.tar.xz yuzu-c864cb57726e76e9dc4558036f3212168bec825d.tar.zst yuzu-c864cb57726e76e9dc4558036f3212168bec825d.zip | |
Diffstat (limited to '')
16 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 Binary files differindex b9e64e9e0..b9e64e9e0 100644 --- a/dist/qt_themes/default/icons/16x16/checked.png +++ b/dist/qt_themes/colorful/icons/16x16/checked.png diff --git a/dist/qt_themes/default/icons/16x16/failed.png b/dist/qt_themes/colorful/icons/16x16/failed.png Binary files differindex a1872835d..a1872835d 100644 --- a/dist/qt_themes/default/icons/16x16/failed.png +++ b/dist/qt_themes/colorful/icons/16x16/failed.png diff --git a/dist/qt_themes/colorful/icons/16x16/info.png b/dist/qt_themes/colorful/icons/16x16/info.png Binary files differnew file mode 100644 index 000000000..8b9330f4c --- /dev/null +++ b/dist/qt_themes/colorful/icons/16x16/info.png diff --git a/dist/qt_themes/colorful/icons/16x16/sync.png b/dist/qt_themes/colorful/icons/16x16/sync.png Binary files differnew file mode 100644 index 000000000..0d57789c3 --- /dev/null +++ b/dist/qt_themes/colorful/icons/16x16/sync.png diff --git a/dist/qt_themes/default/icons/16x16/view-refresh.png b/dist/qt_themes/colorful/icons/16x16/view-refresh.png Binary files differindex 69f9474ac..69f9474ac 100644 --- a/dist/qt_themes/default/icons/16x16/view-refresh.png +++ b/dist/qt_themes/colorful/icons/16x16/view-refresh.png diff --git a/dist/qt_themes/default/icons/48x48/no_avatar.png b/dist/qt_themes/colorful/icons/48x48/no_avatar.png Binary files differindex 76f812349..76f812349 100644 --- a/dist/qt_themes/default/icons/48x48/no_avatar.png +++ b/dist/qt_themes/colorful/icons/48x48/no_avatar.png diff --git a/dist/qt_themes/colorful/icons/48x48/sd_card.png b/dist/qt_themes/colorful/icons/48x48/sd_card.png Binary files differindex 47e491d32..652d61bc3 100644 --- a/dist/qt_themes/colorful/icons/48x48/sd_card.png +++ b/dist/qt_themes/colorful/icons/48x48/sd_card.png 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/48x48/sd_card.png b/dist/qt_themes/default/icons/48x48/sd_card.png Binary files differindex 60dfba269..6bcb7f6b1 100644 --- a/dist/qt_themes/default/icons/48x48/sd_card.png +++ b/dist/qt_themes/default/icons/48x48/sd_card.png 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/48x48/sd_card.png b/dist/qt_themes/qdarkstyle/icons/48x48/sd_card.png Binary files differindex 87ae5186d..15e5e4024 100644 --- a/dist/qt_themes/qdarkstyle/icons/48x48/sd_card.png +++ b/dist/qt_themes/qdarkstyle/icons/48x48/sd_card.png 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] |
