summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle K <190571+Docteh@users.noreply.github.com>2022-05-15 06:14:13 +0200
committerKyle K <190571+Docteh@users.noreply.github.com>2022-05-16 14:42:38 +0200
commit8f3098fc1eca0ba58200b2cac743106d8feca0e8 (patch)
tree0433f1069f76100d9514f8e1abc19100c7cacbea
parentMerge pull request #8308 from german77/disablesix (diff)
downloadyuzu-8f3098fc1eca0ba58200b2cac743106d8feca0e8.tar
yuzu-8f3098fc1eca0ba58200b2cac743106d8feca0e8.tar.gz
yuzu-8f3098fc1eca0ba58200b2cac743106d8feca0e8.tar.bz2
yuzu-8f3098fc1eca0ba58200b2cac743106d8feca0e8.tar.lz
yuzu-8f3098fc1eca0ba58200b2cac743106d8feca0e8.tar.xz
yuzu-8f3098fc1eca0ba58200b2cac743106d8feca0e8.tar.zst
yuzu-8f3098fc1eca0ba58200b2cac743106d8feca0e8.zip
-rw-r--r--dist/qt_themes/default/icons/256x256/yuzu.pngbin10381 -> 6751 bytes
-rw-r--r--src/yuzu/about_dialog.cpp6
-rw-r--r--src/yuzu/aboutdialog.ui16
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
index 1e501d8a6..bd5cf533f 100644
--- a/dist/qt_themes/default/icons/256x256/yuzu.png
+++ b/dist/qt_themes/default/icons/256x256/yuzu.png
Binary files differ
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>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/yuzu.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</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>