early-access version 2959
This commit is contained in:
parent
ef83c2b8ab
commit
c8c528bcb9
15 changed files with 29 additions and 31 deletions
|
@ -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
|
||||
|
||||
|
|
BIN
dist/qt_themes/colorful/icons/16x16/checked.png
vendored
Executable file
BIN
dist/qt_themes/colorful/icons/16x16/checked.png
vendored
Executable file
Binary file not shown.
After Width: | Height: | Size: 414 B |
BIN
dist/qt_themes/colorful/icons/16x16/failed.png
vendored
Executable file
BIN
dist/qt_themes/colorful/icons/16x16/failed.png
vendored
Executable file
Binary file not shown.
After Width: | Height: | Size: 431 B |
BIN
dist/qt_themes/colorful/icons/16x16/info.png
vendored
Executable file
BIN
dist/qt_themes/colorful/icons/16x16/info.png
vendored
Executable file
Binary file not shown.
After Width: | Height: | Size: 428 B |
BIN
dist/qt_themes/colorful/icons/16x16/sync.png
vendored
Executable file
BIN
dist/qt_themes/colorful/icons/16x16/sync.png
vendored
Executable file
Binary file not shown.
After Width: | Height: | Size: 548 B |
BIN
dist/qt_themes/colorful/icons/16x16/view-refresh.png
vendored
Executable file
BIN
dist/qt_themes/colorful/icons/16x16/view-refresh.png
vendored
Executable file
Binary file not shown.
After Width: | Height: | Size: 349 B |
BIN
dist/qt_themes/colorful/icons/48x48/no_avatar.png
vendored
Executable file
BIN
dist/qt_themes/colorful/icons/48x48/no_avatar.png
vendored
Executable file
Binary file not shown.
After Width: | Height: | Size: 678 B |
1
dist/qt_themes/colorful/icons/index.theme
vendored
1
dist/qt_themes/colorful/icons/index.theme
vendored
|
@ -1,7 +1,6 @@
|
|||
[Icon Theme]
|
||||
Name=colorful
|
||||
Comment=Colorful theme
|
||||
Inherits=default
|
||||
Directories=16x16,48x48,256x256
|
||||
|
||||
[16x16]
|
||||
|
|
6
dist/qt_themes/colorful/style.qrc
vendored
6
dist/qt_themes/colorful/style.qrc
vendored
|
@ -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>
|
||||
|
|
10
dist/qt_themes/colorful_dark/style.qrc
vendored
10
dist/qt_themes/colorful_dark/style.qrc
vendored
|
@ -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">
|
||||
|
|
11
dist/qt_themes/default/default.qrc
vendored
11
dist/qt_themes/default/default.qrc
vendored
|
@ -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>
|
||||
|
|
1
dist/qt_themes/default/icons/index.theme
vendored
1
dist/qt_themes/default/icons/index.theme
vendored
|
@ -1,6 +1,7 @@
|
|||
[Icon Theme]
|
||||
Name=default
|
||||
Comment=default theme
|
||||
Inherits=colorful
|
||||
Directories=16x16,48x48,256x256
|
||||
|
||||
[16x16]
|
||||
|
|
2
dist/qt_themes/qdarkstyle/icons/index.theme
vendored
2
dist/qt_themes/qdarkstyle/icons/index.theme
vendored
|
@ -1,7 +1,7 @@
|
|||
[Icon Theme]
|
||||
Name=qdarkstyle
|
||||
Comment=dark theme
|
||||
Inherits=default
|
||||
Inherits=colorful
|
||||
Directories=16x16,48x48,256x256
|
||||
|
||||
[16x16]
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
[Icon Theme]
|
||||
Name=qdarkstyle_midnight_blue
|
||||
Comment=dark theme
|
||||
Inherits=default
|
||||
Inherits=colorful
|
||||
Directories=16x16,48x48,256x256
|
||||
|
||||
[16x16]
|
||||
|
|
|
@ -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 "
|
||||
|
|
Loading…
Reference in a new issue