From c8c528bcb96bebf9da6397f1a442cf72b564b29a Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Sat, 17 Sep 2022 05:51:29 +0200 Subject: [PATCH] early-access version 2959 --- README.md | 2 +- .../colorful/icons/16x16/checked.png | Bin 0 -> 414 bytes .../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 .../colorful/icons/16x16/view-refresh.png | Bin 0 -> 349 bytes .../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/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, 29 insertions(+), 31 deletions(-) create mode 100755 dist/qt_themes/colorful/icons/16x16/checked.png create mode 100755 dist/qt_themes/colorful/icons/16x16/failed.png create mode 100755 dist/qt_themes/colorful/icons/16x16/info.png create mode 100755 dist/qt_themes/colorful/icons/16x16/sync.png create mode 100755 dist/qt_themes/colorful/icons/16x16/view-refresh.png create mode 100755 dist/qt_themes/colorful/icons/48x48/no_avatar.png diff --git a/README.md b/README.md index 8cab7e7a6..f08cfcb0f 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 2958. +This is the source code for early-access 2959. ## Legal Notice diff --git a/dist/qt_themes/colorful/icons/16x16/checked.png b/dist/qt_themes/colorful/icons/16x16/checked.png new file mode 100755 index 0000000000000000000000000000000000000000..b9e64e9e083479d3ee98f767e7db0afa918733a4 GIT binary patch literal 414 zcmV;P0b%}$P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0W(QNK~y+TrIVpf z13?r;rwD=qLqJlEKo|qzU|U% z7YH{wot?LH-*n!*?W6{63=b9=HldpXDUIOavAB2}Pbd180OK;l8EnJ6v6?>M298Md znj@%6fO(za9@cVTww|F+k|!rQLAmn~elmwlQut5i#`AOvzcG7+KCFVC)M57}#uu1A z^RzVYg2lZ9H(&9m2Y)p$fS#TS;;P_-ib!R82QIw{8{xmHiE zK`MLO2B{~RrD)~+Jyf?qz}_z48lon38S|YjoWBG0&(ArfFTBE5^|a!r5C8xG07*qo IM6N<$fPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TNZ6DwG(7XLBVgY-Of0gl9N`1$71F4gIoC7Ns%KV{!E#(sSHPb4 z(H0iazHiYX76&M(7WhJwJ#j1fRUNEz*v1bmuz(K)PiU_upW--rVBGUHbS7~Yq~j3d z0pB9-^E7(E%6y`SY(9%py1{n*nW{zpBTL5Tn1REwzu2}x6v+nVAx4qQEUL#B6v-*2 Z^b7poNv{?|^27iD002ovPDHLkV1i32vs(ZF literal 0 HcmV?d00001 diff --git a/dist/qt_themes/colorful/icons/16x16/info.png b/dist/qt_themes/colorful/icons/16x16/info.png new file mode 100755 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 100755 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)^a2?p z3xP1>)&}zuprB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt;DaT^vI! zdXHXO?dResz;fZRvg2D(hZAudG7gC+giq$}KOcG4zro@DnrG}2G&q=8CN#Jv2-qAk zIjJ+#`oXqIX2G$hS8WgP*%
    P@0_exQBEhkNRG4vEbF(e=wge3`J!mrnDK5~jx# zUU8hS;5{7IoY@i1eaCa!ii`_xR|*?vr#zBue!3=;y?e(G)x3h?UwC-!Cn58K{>@QcV*C}8#I7dD9^Y}8_gWU)lKmGvA3u?Q86s88 o#x1&7v25w|org}xo1bUDudAldyso>n5$H<>Pgg&ebxsLQ00=gQyZ`_I literal 0 HcmV?d00001 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 100755 index 0000000000000000000000000000000000000000..76f812349b462cd8b05465d12a7e1a4df6788ea9 GIT binary patch literal 678 zcmV;X0$KfuP)tQW30PJ^1R99 zJ4_fbpiykVY23ssd}-$;rf>@DYqRUZ8N9)-E}6s0njCX!;hOH^VXk6L4Zf?mth{_D z7i;kSi(^<8-@p$eu^PqC;Hsb{ai)1WTBIQRkkx&~FeH*1T5dEp;urIbS zrGbqJwIQ2g3sV{xN~jHK#TKSCFqcpp@;bIKrGe)Owf($SVRlNJ#5!5Vu8Q6NaKC_H zx7@2*dL4bVu41!n^HNs+1x9M{&1Do%6_dGVzM9NEnLx?<#V?z z%jS{jU0TRm+^Il3%(NcdQZ3x7LB5kIiO)|j)F|J{`B?dJEHXz^1 zVc7;I8z3F#Xqg7;7D8!g-t-jCz@deo<%wGPXGGIW5-{H89iO|Al 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 "