From 05cf7fe70a4fd0952d09c3a05d3b417fe8a258b2 Mon Sep 17 00:00:00 2001 From: BreadFish64 Date: Tue, 27 Mar 2018 06:11:04 -0500 Subject: [PATCH] QT: Implement themed icons (#3554) * implement themed icons * fix theme search paths --- dist/icons/citra.png | Bin 21077 -> 0 bytes dist/icons/icons.qrc | 7 ------- dist/qt_themes/default/default.qrc | 11 +++++++++++ .../default/icons/16x16}/checked.png | Bin .../default/icons/16x16}/failed.png | Bin dist/qt_themes/default/icons/256x256/citra.png | Bin 0 -> 26290 bytes dist/qt_themes/default/icons/index.theme | 10 ++++++++++ dist/qt_themes/qdarkstyle/icons/index.theme | 11 +++++++++++ dist/qt_themes/qdarkstyle/style.qrc | 3 +++ src/citra_qt/aboutdialog.cpp | 2 ++ src/citra_qt/configuration/configure_web.cpp | 17 +++++++++-------- src/citra_qt/main.cpp | 10 +++++++++- src/citra_qt/main.h | 3 +++ 13 files changed, 58 insertions(+), 16 deletions(-) delete mode 100644 dist/icons/citra.png delete mode 100644 dist/icons/icons.qrc create mode 100644 dist/qt_themes/default/default.qrc rename dist/{icons => qt_themes/default/icons/16x16}/checked.png (100%) rename dist/{icons => qt_themes/default/icons/16x16}/failed.png (100%) create mode 100644 dist/qt_themes/default/icons/256x256/citra.png create mode 100644 dist/qt_themes/default/icons/index.theme create mode 100644 dist/qt_themes/qdarkstyle/icons/index.theme diff --git a/dist/icons/citra.png b/dist/icons/citra.png deleted file mode 100644 index 83fa499dd35c238dd5e302e1cfe05b59b65f28c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21077 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 L>gTe~DWM4f3-Z7_ diff --git a/dist/icons/icons.qrc b/dist/icons/icons.qrc deleted file mode 100644 index a25804907..000000000 --- a/dist/icons/icons.qrc +++ /dev/null @@ -1,7 +0,0 @@ - - - checked.png - failed.png - citra.png - - diff --git a/dist/qt_themes/default/default.qrc b/dist/qt_themes/default/default.qrc new file mode 100644 index 000000000..a3e21645a --- /dev/null +++ b/dist/qt_themes/default/default.qrc @@ -0,0 +1,11 @@ + + + icons/index.theme + + icons/16x16/checked.png + + icons/16x16/failed.png + + icons/256x256/citra.png + + diff --git a/dist/icons/checked.png b/dist/qt_themes/default/icons/16x16/checked.png similarity index 100% rename from dist/icons/checked.png rename to dist/qt_themes/default/icons/16x16/checked.png diff --git a/dist/icons/failed.png b/dist/qt_themes/default/icons/16x16/failed.png similarity index 100% rename from dist/icons/failed.png rename to dist/qt_themes/default/icons/16x16/failed.png diff --git a/dist/qt_themes/default/icons/256x256/citra.png b/dist/qt_themes/default/icons/256x256/citra.png new file mode 100644 index 0000000000000000000000000000000000000000..dbbfa747336837dde5a5581bb8ce166839e577f1 GIT binary patch literal 26290 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 + + icons/index.theme + rc/up_arrow_disabled.png rc/Hmovetoolbar.png diff --git a/src/citra_qt/aboutdialog.cpp b/src/citra_qt/aboutdialog.cpp index 9c11168ba..06587341a 100644 --- a/src/citra_qt/aboutdialog.cpp +++ b/src/citra_qt/aboutdialog.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include "aboutdialog.h" #include "common/scm_rev.h" #include "ui_aboutdialog.h" @@ -10,6 +11,7 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent, Qt::WindowTitleHint | Qt::WindowCloseButtonHint | Qt::WindowSystemMenuHint), ui(new Ui::AboutDialog) { ui->setupUi(this); + ui->labelLogo->setPixmap(QIcon::fromTheme("citra").pixmap(200)); ui->labelBuildInfo->setText(ui->labelBuildInfo->text().arg( Common::g_build_name, Common::g_scm_branch, Common::g_scm_desc)); } diff --git a/src/citra_qt/configuration/configure_web.cpp b/src/citra_qt/configuration/configure_web.cpp index 42f2c9991..22d01e9f8 100644 --- a/src/citra_qt/configuration/configure_web.cpp +++ b/src/citra_qt/configuration/configure_web.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include #include "citra_qt/configuration/configure_web.h" #include "core/settings.h" @@ -67,12 +68,12 @@ void ConfigureWeb::RefreshTelemetryID() { void ConfigureWeb::OnLoginChanged() { if (ui->edit_username->text().isEmpty() && ui->edit_token->text().isEmpty()) { user_verified = true; - ui->label_username_verified->setPixmap(QPixmap(":/icons/checked.png")); - ui->label_token_verified->setPixmap(QPixmap(":/icons/checked.png")); + ui->label_username_verified->setPixmap(QIcon::fromTheme("checked").pixmap(16)); + ui->label_token_verified->setPixmap(QIcon::fromTheme("checked").pixmap(16)); } else { user_verified = false; - ui->label_username_verified->setPixmap(QPixmap(":/icons/failed.png")); - ui->label_token_verified->setPixmap(QPixmap(":/icons/failed.png")); + ui->label_username_verified->setPixmap(QIcon::fromTheme("failed").pixmap(16)); + ui->label_token_verified->setPixmap(QIcon::fromTheme("failed").pixmap(16)); } } @@ -89,11 +90,11 @@ void ConfigureWeb::OnLoginVerified() { ui->button_verify_login->setText(tr("Verify")); if (verified.get()) { user_verified = true; - ui->label_username_verified->setPixmap(QPixmap(":/icons/checked.png")); - ui->label_token_verified->setPixmap(QPixmap(":/icons/checked.png")); + ui->label_username_verified->setPixmap(QIcon::fromTheme("checked").pixmap(16)); + ui->label_token_verified->setPixmap(QIcon::fromTheme("checked").pixmap(16)); } else { - ui->label_username_verified->setPixmap(QPixmap(":/icons/failed.png")); - ui->label_token_verified->setPixmap(QPixmap(":/icons/failed.png")); + ui->label_username_verified->setPixmap(QIcon::fromTheme("failed").pixmap(16)); + ui->label_token_verified->setPixmap(QIcon::fromTheme("failed").pixmap(16)); QMessageBox::critical( this, tr("Verification failed"), tr("Verification failed. Check that you have entered your username and token " diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 9a2cb8368..9eac0f40d 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -130,6 +130,7 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) { game_list->PopulateAsync(UISettings::values.gamedir, UISettings::values.gamedir_deepscan); + default_theme_paths = QIcon::themeSearchPaths(); UpdateUITheme(); // Show one-time "callout" messages to the user @@ -1226,7 +1227,9 @@ void GMainWindow::filterBarSetChecked(bool state) { } void GMainWindow::UpdateUITheme() { - if (UISettings::values.theme != UISettings::themes[0].second) { + QStringList theme_paths(default_theme_paths); + if (UISettings::values.theme != UISettings::themes[0].second && + !UISettings::values.theme.isEmpty()) { QString theme_uri(":" + UISettings::values.theme + "/style.qss"); QFile f(theme_uri); if (!f.exists()) { @@ -1237,10 +1240,15 @@ void GMainWindow::UpdateUITheme() { qApp->setStyleSheet(ts.readAll()); GMainWindow::setStyleSheet(ts.readAll()); } + theme_paths.append(QStringList{":/icons/default", ":/icons/" + UISettings::values.theme}); + QIcon::setThemeName(":/icons/" + UISettings::values.theme); } else { qApp->setStyleSheet(""); GMainWindow::setStyleSheet(""); + theme_paths.append(QStringList{":/icons/default"}); + QIcon::setThemeName(":/icons/default"); } + QIcon::setThemeSearchPaths(theme_paths); } void GMainWindow::LoadTranslation() { diff --git a/src/citra_qt/main.h b/src/citra_qt/main.h index 85fbc7d02..04fe742ea 100644 --- a/src/citra_qt/main.h +++ b/src/citra_qt/main.h @@ -206,6 +206,9 @@ private: QTranslator translator; + // stores default icon theme search paths for the platform + QStringList default_theme_paths; + protected: void dropEvent(QDropEvent* event) override; void dragEnterEvent(QDragEnterEvent* event) override;