VERY experimental Nintendo Switch 2 emulator
C++
UI: move icons from default into colorful theme.
Kyle Kienapfel4b86f6d066aa
diff --git a/.reuse/dep5 b/.reuse/dep5index 5ba0174948..9a90f9eb69 100644--- a/.reuse/dep5+++ b/.reuse/dep5@@ -52,6 +52,8 @@ Files: dist/qt_themes/colorful/icons/16x16/lock.pngdist/qt_themes/colorful/icons/48x48/chip.pngdist/qt_themes/colorful/icons/48x48/folder.pngdist/qt_themes/colorful_dark/icons/16x16/lock.png+ dist/qt_themes/colorful/icons/16x16/info.png+ dist/qt_themes/colorful/icons/16x16/sync.pngCopyright: Icons8License: MITComment: https://github.com/icons8/flat-color-icons@@ -68,8 +70,8 @@ Copyright: Ionic (http://ionic.io/)License: MITFiles: 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.pngCopyright: SVG RepoLicense: CC0-1.0diff --git a/dist/qt_themes/default/icons/16x16/checked.png b/dist/qt_themes/colorful/icons/16x16/checked.pngsimilarity index 100%rename from dist/qt_themes/default/icons/16x16/checked.pngrename to dist/qt_themes/colorful/icons/16x16/checked.pngdiff --git a/dist/qt_themes/default/icons/16x16/failed.png b/dist/qt_themes/colorful/icons/16x16/failed.pngsimilarity index 100%rename from dist/qt_themes/default/icons/16x16/failed.pngrename to dist/qt_themes/colorful/icons/16x16/failed.pngdiff --git a/dist/qt_themes/colorful/icons/16x16/info.png b/dist/qt_themes/colorful/icons/16x16/info.pngnew file mode 100644index 0000000000..8b9330f4c8Binary files /dev/null and b/dist/qt_themes/colorful/icons/16x16/info.png differdiff --git a/dist/qt_themes/colorful/icons/16x16/sync.png b/dist/qt_themes/colorful/icons/16x16/sync.pngnew file mode 100644index 0000000000..0d57789c3aBinary files /dev/null and b/dist/qt_themes/colorful/icons/16x16/sync.png differdiff --git a/dist/qt_themes/default/icons/16x16/view-refresh.png b/dist/qt_themes/colorful/icons/16x16/view-refresh.pngsimilarity index 100%rename from dist/qt_themes/default/icons/16x16/view-refresh.pngrename to dist/qt_themes/colorful/icons/16x16/view-refresh.pngdiff --git a/dist/qt_themes/default/icons/48x48/no_avatar.png b/dist/qt_themes/colorful/icons/48x48/no_avatar.pngsimilarity index 100%rename from dist/qt_themes/default/icons/48x48/no_avatar.pngrename to dist/qt_themes/colorful/icons/48x48/no_avatar.pngdiff --git a/dist/qt_themes/colorful/icons/index.theme b/dist/qt_themes/colorful/icons/index.themeindex b452aca16b..6eb3c69495 100644--- a/dist/qt_themes/colorful/icons/index.theme+++ b/dist/qt_themes/colorful/icons/index.theme@@ -1,7 +1,6 @@[Icon Theme]Name=colorfulComment=Colorful theme-Inherits=defaultDirectories=16x16,48x48,256x256[16x16]diff --git a/dist/qt_themes/colorful/style.qrc b/dist/qt_themes/colorful/style.qrcindex 507e0e58b4..82cd367be9 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.qrcindex 9853fd438f..72451ef023 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.qrcindex a07f2a9c15..2e01a34342 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.themeindex 1edbe64084..21b35e3e3c 100644--- a/dist/qt_themes/default/icons/index.theme+++ b/dist/qt_themes/default/icons/index.theme@@ -1,6 +1,7 @@[Icon Theme]Name=defaultComment=default theme+Inherits=colorfulDirectories=16x16,48x48,256x256[16x16]@@ -10,4 +11,4 @@ Size=16Size=48[256x256]-Size=256\ No newline at end of file+Size=256diff --git a/dist/qt_themes/qdarkstyle/icons/index.theme b/dist/qt_themes/qdarkstyle/icons/index.themeindex d1e12f3ef0..502717617c 100644--- a/dist/qt_themes/qdarkstyle/icons/index.theme+++ b/dist/qt_themes/qdarkstyle/icons/index.theme@@ -1,7 +1,7 @@[Icon Theme]Name=qdarkstyleComment=dark theme-Inherits=default+Inherits=colorfulDirectories=16x16,48x48,256x256[16x16]@@ -11,4 +11,4 @@ Size=16Size=48[256x256]-Size=256\ No newline at end of file+Size=256diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/index.theme b/dist/qt_themes/qdarkstyle_midnight_blue/icons/index.themeindex 447a6c8be9..20f9f6d633 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_blueComment=dark theme-Inherits=default+Inherits=colorfulDirectories=16x16,48x48,256x256[16x16]diff --git a/src/yuzu/configuration/configure_web.cpp b/src/yuzu/configuration/configure_web.cppindex d668c992b2..ab526e4ca5 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 "