diff options
| author | bunnei <bunneidev@gmail.com> | 2022-05-29 11:32:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-29 11:32:40 +0200 |
| commit | cc289a8ed08e931e8d117df287093ab473e00ca8 (patch) | |
| tree | 12cb6c11681e6946dd16ec1312957c0f2e37c7a8 | |
| parent | Merge pull request #8385 from lat9nq/just-subsys-win (diff) | |
| parent | about dialog: Fix the logo in a multiplatform way (diff) | |
| download | yuzu-cc289a8ed08e931e8d117df287093ab473e00ca8.tar yuzu-cc289a8ed08e931e8d117df287093ab473e00ca8.tar.gz yuzu-cc289a8ed08e931e8d117df287093ab473e00ca8.tar.bz2 yuzu-cc289a8ed08e931e8d117df287093ab473e00ca8.tar.lz yuzu-cc289a8ed08e931e8d117df287093ab473e00ca8.tar.xz yuzu-cc289a8ed08e931e8d117df287093ab473e00ca8.tar.zst yuzu-cc289a8ed08e931e8d117df287093ab473e00ca8.zip | |
| -rw-r--r-- | dist/qt_themes/default/icons/256x256/yuzu.png | bin | 10381 -> 6751 bytes | |||
| -rw-r--r-- | src/yuzu/about_dialog.cpp | 6 | ||||
| -rw-r--r-- | src/yuzu/aboutdialog.ui | 16 |
3 files changed, 19 insertions, 3 deletions
diff --git a/dist/qt_themes/default/icons/256x256/yuzu.png b/dist/qt_themes/default/icons/256x256/yuzu.png Binary files differindex 1e501d8a6..bd5cf533f 100644 --- a/dist/qt_themes/default/icons/256x256/yuzu.png +++ b/dist/qt_themes/default/icons/256x256/yuzu.png diff --git a/src/yuzu/about_dialog.cpp b/src/yuzu/about_dialog.cpp index cbcef7b45..eeff54359 100644 --- a/src/yuzu/about_dialog.cpp +++ b/src/yuzu/about_dialog.cpp @@ -19,7 +19,11 @@ AboutDialog::AboutDialog(QWidget* parent) const auto yuzu_build_version = override_build.empty() ? yuzu_build : override_build; ui->setupUi(this); - ui->labelLogo->setPixmap(QIcon::fromTheme(QStringLiteral("yuzu")).pixmap(200)); + // Try and request the icon from Qt theme (Linux?) + const QIcon yuzu_logo = QIcon::fromTheme(QStringLiteral("org.yuzu_emu.yuzu")); + if (!yuzu_logo.isNull()) { + ui->labelLogo->setPixmap(yuzu_logo.pixmap(200)); + } ui->labelBuildInfo->setText( ui->labelBuildInfo->text().arg(QString::fromStdString(yuzu_build_version), QString::fromUtf8(Common::g_build_date).left(10))); diff --git a/src/yuzu/aboutdialog.ui b/src/yuzu/aboutdialog.ui index 2f7ddc7f3..1dd7b74bf 100644 --- a/src/yuzu/aboutdialog.ui +++ b/src/yuzu/aboutdialog.ui @@ -26,8 +26,20 @@ <verstretch>0</verstretch> </sizepolicy> </property> + <property name="maximumSize"> + <size> + <width>200</width> + <height>200</height> + </size> + </property> <property name="text"> - <string><html><head/><body><p><img src=":/icons/yuzu.png"/></p></body></html></string> + <string/> + </property> + <property name="pixmap"> + <pixmap resource="../../dist/qt_themes/default/default.qrc">:/icons/default/256x256/yuzu.png</pixmap> + </property> + <property name="scaledContents"> + <bool>true</bool> </property> </widget> </item> @@ -152,7 +164,7 @@ p, li { white-space: pre-wrap; } </layout> </widget> <resources> - <include location="../../dist/icons/icons.qrc"/> + <include location="../../dist/qt_themes_default/default/default.qrc"/> </resources> <connections> <connection> |
