diff options
| author | 2022-09-12 08:56:24 -0700 | |
|---|---|---|
| committer | 2022-09-15 23:00:49 -0700 | |
| commit | 9554c67809a674cad2de1482634da2f79de90474 (patch) | |
| tree | 895b1c4366085713de06dcd627423b236a4d0b34 /dist | |
| parent | Merge pull request #8878 from Kelebek1/remove_pause (diff) | |
| download | yuzu-9554c67809a674cad2de1482634da2f79de90474.tar.gz yuzu-9554c67809a674cad2de1482634da2f79de90474.tar.xz yuzu-9554c67809a674cad2de1482634da2f79de90474.zip | |
UI: move icons from default into colorful theme.
colorful theme has been default theme for awhile. having colorful theme
try and grab icons from other theme doesn't work on Linux.
Also adding two additional icons, info is to hint to the user that they
should hit verify after pasting in a token, sync is to show that the
verification is occurring.
Diffstat (limited to 'dist')
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 @@ | |||
| 1 | [Icon Theme] | 1 | [Icon Theme] |
| 2 | Name=colorful | 2 | Name=colorful |
| 3 | Comment=Colorful theme | 3 | Comment=Colorful theme |
| 4 | Inherits=default | ||
| 5 | Directories=16x16,48x48,256x256 | 4 | Directories=16x16,48x48,256x256 |
| 6 | 5 | ||
| 7 | [16x16] | 6 | [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 | |||
| 6 | <RCC> | 6 | <RCC> |
| 7 | <qresource prefix="icons/colorful"> | 7 | <qresource prefix="icons/colorful"> |
| 8 | <file alias="index.theme">icons/index.theme</file> | 8 | <file alias="index.theme">icons/index.theme</file> |
| 9 | <file alias="16x16/checked.png">icons/16x16/checked.png</file> | ||
| 9 | <file alias="16x16/connected.png">icons/16x16/connected.png</file> | 10 | <file alias="16x16/connected.png">icons/16x16/connected.png</file> |
| 10 | <file alias="16x16/connected_notification.png">icons/16x16/connected_notification.png</file> | 11 | <file alias="16x16/connected_notification.png">icons/16x16/connected_notification.png</file> |
| 11 | <file alias="16x16/disconnected.png">icons/16x16/disconnected.png</file> | 12 | <file alias="16x16/disconnected.png">icons/16x16/disconnected.png</file> |
| 13 | <file alias="16x16/failed.png">icons/16x16/failed.png</file> | ||
| 14 | <file alias="16x16/info.png">icons/16x16/info.png</file> | ||
| 12 | <file alias="16x16/lock.png">icons/16x16/lock.png</file> | 15 | <file alias="16x16/lock.png">icons/16x16/lock.png</file> |
| 16 | <file alias="16x16/sync.png">icons/16x16/sync.png</file> | ||
| 17 | <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file> | ||
| 13 | <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file> | 18 | <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file> |
| 14 | <file alias="48x48/chip.png">icons/48x48/chip.png</file> | 19 | <file alias="48x48/chip.png">icons/48x48/chip.png</file> |
| 15 | <file alias="48x48/folder.png">icons/48x48/folder.png</file> | 20 | <file alias="48x48/folder.png">icons/48x48/folder.png</file> |
| 16 | <file alias="48x48/list-add.png">icons/48x48/list-add.png</file> | 21 | <file alias="48x48/list-add.png">icons/48x48/list-add.png</file> |
| 22 | <file alias="48x48/no_avatar.png">icons/48x48/no_avatar.png</file> | ||
| 17 | <file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file> | 23 | <file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file> |
| 18 | <file alias="48x48/star.png">icons/48x48/star.png</file> | 24 | <file alias="48x48/star.png">icons/48x48/star.png</file> |
| 19 | <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file> | 25 | <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 | |||
| 5 | 5 | ||
| 6 | <RCC> | 6 | <RCC> |
| 7 | <qresource prefix="icons/colorful_dark"> | 7 | <qresource prefix="icons/colorful_dark"> |
| 8 | <file alias="16x16/connected.png">../colorful/icons/16x16/connected.png</file> | ||
| 9 | <file alias="16x16/connected_notification.png">../colorful/icons/16x16/connected_notification.png</file> | ||
| 10 | <file alias="16x16/disconnected.png">../colorful/icons/16x16/disconnected.png</file> | ||
| 11 | <file alias="index.theme">icons/index.theme</file> | 8 | <file alias="index.theme">icons/index.theme</file> |
| 12 | <file alias="16x16/lock.png">icons/16x16/lock.png</file> | 9 | <file alias="16x16/lock.png">icons/16x16/lock.png</file> |
| 13 | <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file> | 10 | <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file> |
| 14 | <file alias="48x48/bad_folder.png">../colorful/icons/48x48/bad_folder.png</file> | ||
| 15 | <file alias="48x48/chip.png">../colorful/icons/48x48/chip.png</file> | ||
| 16 | <file alias="48x48/folder.png">../colorful/icons/48x48/folder.png</file> | ||
| 17 | <file alias="48x48/no_avatar.png">../qdarkstyle/icons/48x48/no_avatar.png</file> | ||
| 18 | <file alias="48x48/list-add.png">../colorful/icons/48x48/list-add.png</file> | ||
| 19 | <file alias="48x48/sd_card.png">../colorful/icons/48x48/sd_card.png</file> | ||
| 20 | <file alias="256x256/plus_folder.png">../colorful/icons/256x256/plus_folder.png</file> | ||
| 21 | </qresource> | 11 | </qresource> |
| 22 | 12 | ||
| 23 | <qresource prefix="qss_icons"> | 13 | <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 | |||
| 5 | 5 | ||
| 6 | <RCC> | 6 | <RCC> |
| 7 | <qresource prefix="icons/default"> | 7 | <qresource prefix="icons/default"> |
| 8 | <!-- "colorful" is now the default theme, add new icons there --> | ||
| 8 | <file alias="index.theme">icons/index.theme</file> | 9 | <file alias="index.theme">icons/index.theme</file> |
| 9 | <file alias="16x16/checked.png">icons/16x16/checked.png</file> | ||
| 10 | <file alias="16x16/failed.png">icons/16x16/failed.png</file> | ||
| 11 | <file alias="16x16/lock.png">icons/16x16/lock.png</file> | ||
| 12 | <file alias="16x16/connected.png">icons/16x16/connected.png</file> | 10 | <file alias="16x16/connected.png">icons/16x16/connected.png</file> |
| 13 | <file alias="16x16/disconnected.png">icons/16x16/disconnected.png</file> | ||
| 14 | <file alias="16x16/connected_notification.png">icons/16x16/connected_notification.png</file> | 11 | <file alias="16x16/connected_notification.png">icons/16x16/connected_notification.png</file> |
| 15 | <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file> | 12 | <file alias="16x16/disconnected.png">icons/16x16/disconnected.png</file> |
| 13 | <file alias="16x16/lock.png">icons/16x16/lock.png</file> | ||
| 16 | <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file> | 14 | <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file> |
| 17 | <file alias="48x48/chip.png">icons/48x48/chip.png</file> | 15 | <file alias="48x48/chip.png">icons/48x48/chip.png</file> |
| 18 | <file alias="48x48/folder.png">icons/48x48/folder.png</file> | 16 | <file alias="48x48/folder.png">icons/48x48/folder.png</file> |
| 19 | <file alias="48x48/no_avatar.png">icons/48x48/no_avatar.png</file> | ||
| 20 | <file alias="48x48/list-add.png">icons/48x48/list-add.png</file> | 17 | <file alias="48x48/list-add.png">icons/48x48/list-add.png</file> |
| 21 | <file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file> | 18 | <file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file> |
| 22 | <file alias="48x48/star.png">icons/48x48/star.png</file> | 19 | <file alias="48x48/star.png">icons/48x48/star.png</file> |
| 23 | <file alias="256x256/yuzu.png">icons/256x256/yuzu.png</file> | ||
| 24 | <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file> | 20 | <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file> |
| 21 | <file alias="256x256/yuzu.png">icons/256x256/yuzu.png</file> | ||
| 25 | </qresource> | 22 | </qresource> |
| 26 | <qresource prefix="default"> | 23 | <qresource prefix="default"> |
| 27 | <file>style.qss</file> | 24 | <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 @@ | |||
| 1 | [Icon Theme] | 1 | [Icon Theme] |
| 2 | Name=default | 2 | Name=default |
| 3 | Comment=default theme | 3 | Comment=default theme |
| 4 | Inherits=colorful | ||
| 4 | Directories=16x16,48x48,256x256 | 5 | Directories=16x16,48x48,256x256 |
| 5 | 6 | ||
| 6 | [16x16] | 7 | [16x16] |
| @@ -10,4 +11,4 @@ Size=16 | |||
| 10 | Size=48 | 11 | Size=48 |
| 11 | 12 | ||
| 12 | [256x256] | 13 | [256x256] |
| 13 | Size=256 \ No newline at end of file | 14 | 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 @@ | |||
| 1 | [Icon Theme] | 1 | [Icon Theme] |
| 2 | Name=qdarkstyle | 2 | Name=qdarkstyle |
| 3 | Comment=dark theme | 3 | Comment=dark theme |
| 4 | Inherits=default | 4 | Inherits=colorful |
| 5 | Directories=16x16,48x48,256x256 | 5 | Directories=16x16,48x48,256x256 |
| 6 | 6 | ||
| 7 | [16x16] | 7 | [16x16] |
| @@ -11,4 +11,4 @@ Size=16 | |||
| 11 | Size=48 | 11 | Size=48 |
| 12 | 12 | ||
| 13 | [256x256] | 13 | [256x256] |
| 14 | Size=256 \ No newline at end of file | 14 | 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 @@ | |||
| 1 | [Icon Theme] | 1 | [Icon Theme] |
| 2 | Name=qdarkstyle_midnight_blue | 2 | Name=qdarkstyle_midnight_blue |
| 3 | Comment=dark theme | 3 | Comment=dark theme |
| 4 | Inherits=default | 4 | Inherits=colorful |
| 5 | Directories=16x16,48x48,256x256 | 5 | Directories=16x16,48x48,256x256 |
| 6 | 6 | ||
| 7 | [16x16] | 7 | [16x16] |