From 9554c67809a674cad2de1482634da2f79de90474 Mon Sep 17 00:00:00 2001 From: Kyle Kienapfel Date: Mon, 12 Sep 2022 08:56:24 -0700 Subject: 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. --- dist/qt_themes/colorful/icons/16x16/checked.png | Bin 0 -> 414 bytes dist/qt_themes/colorful/icons/16x16/failed.png | Bin 0 -> 431 bytes dist/qt_themes/colorful/icons/16x16/info.png | Bin 0 -> 428 bytes dist/qt_themes/colorful/icons/16x16/sync.png | Bin 0 -> 548 bytes dist/qt_themes/colorful/icons/16x16/view-refresh.png | Bin 0 -> 349 bytes dist/qt_themes/colorful/icons/48x48/no_avatar.png | Bin 0 -> 678 bytes dist/qt_themes/colorful/icons/index.theme | 1 - dist/qt_themes/colorful/style.qrc | 6 ++++++ dist/qt_themes/colorful_dark/style.qrc | 10 ---------- dist/qt_themes/default/default.qrc | 11 ++++------- dist/qt_themes/default/icons/16x16/checked.png | Bin 414 -> 0 bytes dist/qt_themes/default/icons/16x16/failed.png | Bin 431 -> 0 bytes dist/qt_themes/default/icons/16x16/view-refresh.png | Bin 349 -> 0 bytes dist/qt_themes/default/icons/48x48/no_avatar.png | Bin 678 -> 0 bytes dist/qt_themes/default/icons/index.theme | 3 ++- dist/qt_themes/qdarkstyle/icons/index.theme | 4 ++-- dist/qt_themes/qdarkstyle_midnight_blue/icons/index.theme | 2 +- 17 files changed, 15 insertions(+), 22 deletions(-) create mode 100644 dist/qt_themes/colorful/icons/16x16/checked.png create mode 100644 dist/qt_themes/colorful/icons/16x16/failed.png create mode 100644 dist/qt_themes/colorful/icons/16x16/info.png create mode 100644 dist/qt_themes/colorful/icons/16x16/sync.png create mode 100644 dist/qt_themes/colorful/icons/16x16/view-refresh.png create mode 100644 dist/qt_themes/colorful/icons/48x48/no_avatar.png delete mode 100644 dist/qt_themes/default/icons/16x16/checked.png delete mode 100644 dist/qt_themes/default/icons/16x16/failed.png delete mode 100644 dist/qt_themes/default/icons/16x16/view-refresh.png delete mode 100644 dist/qt_themes/default/icons/48x48/no_avatar.png (limited to 'dist') diff --git a/dist/qt_themes/colorful/icons/16x16/checked.png b/dist/qt_themes/colorful/icons/16x16/checked.png new file mode 100644 index 000000000..b9e64e9e0 Binary files /dev/null and b/dist/qt_themes/colorful/icons/16x16/checked.png differ diff --git a/dist/qt_themes/colorful/icons/16x16/failed.png b/dist/qt_themes/colorful/icons/16x16/failed.png new file mode 100644 index 000000000..a1872835d Binary files /dev/null and b/dist/qt_themes/colorful/icons/16x16/failed.png 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 Binary files /dev/null and b/dist/qt_themes/colorful/icons/16x16/info.png 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 Binary files /dev/null and b/dist/qt_themes/colorful/icons/16x16/sync.png differ diff --git a/dist/qt_themes/colorful/icons/16x16/view-refresh.png b/dist/qt_themes/colorful/icons/16x16/view-refresh.png new file mode 100644 index 000000000..69f9474ac Binary files /dev/null and b/dist/qt_themes/colorful/icons/16x16/view-refresh.png differ diff --git a/dist/qt_themes/colorful/icons/48x48/no_avatar.png b/dist/qt_themes/colorful/icons/48x48/no_avatar.png new file mode 100644 index 000000000..76f812349 Binary files /dev/null and b/dist/qt_themes/colorful/icons/48x48/no_avatar.png 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 icons/index.theme + icons/16x16/checked.png icons/16x16/connected.png icons/16x16/connected_notification.png icons/16x16/disconnected.png + icons/16x16/failed.png + icons/16x16/info.png icons/16x16/lock.png + icons/16x16/sync.png + icons/16x16/view-refresh.png icons/48x48/bad_folder.png icons/48x48/chip.png icons/48x48/folder.png icons/48x48/list-add.png + icons/48x48/no_avatar.png icons/48x48/sd_card.png icons/48x48/star.png icons/256x256/plus_folder.png 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 - ../colorful/icons/16x16/connected.png - ../colorful/icons/16x16/connected_notification.png - ../colorful/icons/16x16/disconnected.png icons/index.theme icons/16x16/lock.png 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 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 + icons/index.theme - icons/16x16/checked.png - icons/16x16/failed.png - icons/16x16/lock.png icons/16x16/connected.png - icons/16x16/disconnected.png icons/16x16/connected_notification.png - icons/16x16/view-refresh.png + icons/16x16/disconnected.png + icons/16x16/lock.png icons/48x48/bad_folder.png icons/48x48/chip.png icons/48x48/folder.png - icons/48x48/no_avatar.png icons/48x48/list-add.png icons/48x48/sd_card.png icons/48x48/star.png - icons/256x256/yuzu.png icons/256x256/plus_folder.png + icons/256x256/yuzu.png style.qss diff --git a/dist/qt_themes/default/icons/16x16/checked.png b/dist/qt_themes/default/icons/16x16/checked.png deleted file mode 100644 index b9e64e9e0..000000000 Binary files a/dist/qt_themes/default/icons/16x16/checked.png and /dev/null differ diff --git a/dist/qt_themes/default/icons/16x16/failed.png b/dist/qt_themes/default/icons/16x16/failed.png deleted file mode 100644 index a1872835d..000000000 Binary files a/dist/qt_themes/default/icons/16x16/failed.png and /dev/null differ diff --git a/dist/qt_themes/default/icons/16x16/view-refresh.png b/dist/qt_themes/default/icons/16x16/view-refresh.png deleted file mode 100644 index 69f9474ac..000000000 Binary files a/dist/qt_themes/default/icons/16x16/view-refresh.png and /dev/null differ diff --git a/dist/qt_themes/default/icons/48x48/no_avatar.png b/dist/qt_themes/default/icons/48x48/no_avatar.png deleted file mode 100644 index 76f812349..000000000 Binary files a/dist/qt_themes/default/icons/48x48/no_avatar.png and /dev/null differ 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] -- cgit v1.2.3