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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 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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 FV1l+P(`f(z literal 0 HcmV?d00001 diff --git a/dist/qt_themes/default/icons/index.theme b/dist/qt_themes/default/icons/index.theme new file mode 100644 index 000000000..ac67cb236 --- /dev/null +++ b/dist/qt_themes/default/icons/index.theme @@ -0,0 +1,10 @@ +[Icon Theme] +Name=default +Comment=default theme +Directories=16x16,256x256 + +[16x16] +Size=16 + +[256x256] +Size=256 \ No newline at end of file diff --git a/dist/qt_themes/qdarkstyle/icons/index.theme b/dist/qt_themes/qdarkstyle/icons/index.theme new file mode 100644 index 000000000..558ece40b --- /dev/null +++ b/dist/qt_themes/qdarkstyle/icons/index.theme @@ -0,0 +1,11 @@ +[Icon Theme] +Name=qdarkstyle +Comment=dark theme +Inherits=default +Directories=16x16,256x256 + +[16x16] +Size=16 + +[256x256] +Size=256 \ No newline at end of file diff --git a/dist/qt_themes/qdarkstyle/style.qrc b/dist/qt_themes/qdarkstyle/style.qrc index ac14bc501..efbd0b9dc 100644 --- a/dist/qt_themes/qdarkstyle/style.qrc +++ b/dist/qt_themes/qdarkstyle/style.qrc @@ -1,4 +1,7 @@ + + 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;