From 9554c67809a674cad2de1482634da2f79de90474 Mon Sep 17 00:00:00 2001 From: Kyle Kienapfel Date: Mon, 12 Sep 2022 08:56:24 -0700 Subject: [PATCH] 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. --- .reuse/dep5 | 6 +++-- .../icons/16x16/checked.png | Bin .../icons/16x16/failed.png | Bin dist/qt_themes/colorful/icons/16x16/info.png | Bin 0 -> 428 bytes dist/qt_themes/colorful/icons/16x16/sync.png | Bin 0 -> 548 bytes .../icons/16x16/view-refresh.png | Bin .../icons/48x48/no_avatar.png | Bin 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/index.theme | 3 ++- dist/qt_themes/qdarkstyle/icons/index.theme | 4 ++-- .../icons/index.theme | 2 +- src/yuzu/configuration/configure_web.cpp | 21 +++++++++++------- 15 files changed, 32 insertions(+), 32 deletions(-) rename dist/qt_themes/{default => colorful}/icons/16x16/checked.png (100%) rename dist/qt_themes/{default => colorful}/icons/16x16/failed.png (100%) create mode 100644 dist/qt_themes/colorful/icons/16x16/info.png create mode 100644 dist/qt_themes/colorful/icons/16x16/sync.png rename dist/qt_themes/{default => colorful}/icons/16x16/view-refresh.png (100%) rename dist/qt_themes/{default => colorful}/icons/48x48/no_avatar.png (100%) diff --git a/.reuse/dep5 b/.reuse/dep5 index 5ba017494..9a90f9eb6 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -52,6 +52,8 @@ Files: dist/qt_themes/colorful/icons/16x16/lock.png dist/qt_themes/colorful/icons/48x48/chip.png dist/qt_themes/colorful/icons/48x48/folder.png dist/qt_themes/colorful_dark/icons/16x16/lock.png + dist/qt_themes/colorful/icons/16x16/info.png + dist/qt_themes/colorful/icons/16x16/sync.png Copyright: Icons8 License: MIT Comment: https://github.com/icons8/flat-color-icons @@ -68,8 +70,8 @@ Copyright: Ionic (http://ionic.io/) License: MIT Files: dist/qt_themes/colorful/icons/48x48/star.png - dist/qt_themes/default/icons/16x16/checked.png - dist/qt_themes/default/icons/16x16/failed.png + dist/qt_themes/colorful/icons/16x16/checked.png + dist/qt_themes/colorful/icons/16x16/failed.png Copyright: SVG Repo License: CC0-1.0 diff --git a/dist/qt_themes/default/icons/16x16/checked.png b/dist/qt_themes/colorful/icons/16x16/checked.png similarity index 100% rename from dist/qt_themes/default/icons/16x16/checked.png rename to 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 similarity index 100% rename from dist/qt_themes/default/icons/16x16/failed.png rename to 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 new file mode 100644 index 0000000000000000000000000000000000000000..8b9330f4c85c308cdded20086095eca71bff2490 GIT binary patch literal 428 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2>u z-+(Y~}U&3=E8#o-U3d z7QJgH8u~FginQ&&c`)E?nOCaf8o37U40pz*MGd(eiffGQZwJP{p>8~GY@h%q`&&~OAOXGFsRnxV*wkg^)@F=9p zo}INUax;?(f5)51wOyYYPUbHcy|aAzUup9frQY4*-|nWhs!F1a9oR>wN)QsJCwC+ERJ$5_$Y=Gq!R||%KE`h|Li$FVdQ&MBb@058+682|tP literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0d57789c3a5167710d1746423610dd994777a5a6 GIT binary patch literal 548 zcmV+<0^9wGP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGZhyVZuhylMZe;xn;0l7&;K~y+Tl~YS7 zgi#d!?wuizg}1V0EjtUcRK$YC?CfOYH8Tx1EXYbE&m<+;%0|S}%49*2orsN;x2$`-P~4WeGn;lS!7 zd>1gHgBYe9BOmB(!oeA>!aG*s^VdN;E6luP>IJ`Wf;ng5r$7)RG~+y2CBteS&+dr} z6G8=yzHuGAu~@U3!M-ivwSCNkHMZJmlTyG0^({>i;P{za%iJSvPu!Uw3K4yMPB+)i$Z z@7{vJB-<)PLT|Ib1{+HOyKq02DD&t{NbKtxbNEPNR5DwceKbknXytsVvi$(dg!u-} zC9Z7Me%;GY&Sk3TR>IL;$W25ML$@RmGIJ}LMTXQYmL(`idjtFz)^a 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/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] diff --git a/src/yuzu/configuration/configure_web.cpp b/src/yuzu/configuration/configure_web.cpp index d668c992b..ab526e4ca 100644 --- a/src/yuzu/configuration/configure_web.cpp +++ b/src/yuzu/configuration/configure_web.cpp @@ -128,20 +128,25 @@ void ConfigureWeb::RefreshTelemetryID() { void ConfigureWeb::OnLoginChanged() { if (ui->edit_token->text().isEmpty()) { user_verified = true; - - const QPixmap pixmap = QIcon::fromTheme(QStringLiteral("checked")).pixmap(16); - ui->label_token_verified->setPixmap(pixmap); + // Empty = no icon + ui->label_token_verified->setPixmap(QPixmap()); + ui->label_token_verified->setToolTip(QString()); } else { user_verified = false; - const QPixmap pixmap = QIcon::fromTheme(QStringLiteral("failed")).pixmap(16); + // Show an info icon if it's been changed, clearer than showing failure + const QPixmap pixmap = QIcon::fromTheme(QStringLiteral("info")).pixmap(16); ui->label_token_verified->setPixmap(pixmap); + ui->label_token_verified->setToolTip( + tr("Unverified, please click Verify before saving configuration", "Tooltip")); } } void ConfigureWeb::VerifyLogin() { ui->button_verify_login->setDisabled(true); ui->button_verify_login->setText(tr("Verifying...")); + ui->label_token_verified->setPixmap(QIcon::fromTheme(QStringLiteral("sync")).pixmap(16)); + ui->label_token_verified->setToolTip(tr("Verifying...")); verify_watcher.setFuture(QtConcurrent::run( [username = UsernameFromDisplayToken(ui->edit_token->text().toStdString()), token = TokenFromDisplayToken(ui->edit_token->text().toStdString())] { @@ -155,13 +160,13 @@ void ConfigureWeb::OnLoginVerified() { if (verify_watcher.result()) { user_verified = true; - const QPixmap pixmap = QIcon::fromTheme(QStringLiteral("checked")).pixmap(16); - ui->label_token_verified->setPixmap(pixmap); + ui->label_token_verified->setPixmap(QIcon::fromTheme(QStringLiteral("checked")).pixmap(16)); + ui->label_token_verified->setToolTip(tr("Verified", "Tooltip")); ui->username->setText( QString::fromStdString(UsernameFromDisplayToken(ui->edit_token->text().toStdString()))); } else { - const QPixmap pixmap = QIcon::fromTheme(QStringLiteral("failed")).pixmap(16); - ui->label_token_verified->setPixmap(pixmap); + ui->label_token_verified->setPixmap(QIcon::fromTheme(QStringLiteral("failed")).pixmap(16)); + ui->label_token_verified->setToolTip(tr("Verification failed", "Tooltip")); ui->username->setText(tr("Unspecified")); QMessageBox::critical(this, tr("Verification failed"), tr("Verification failed. Check that you have entered your token "