summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/about_dialog.cpp6
-rw-r--r--src/yuzu/aboutdialog.ui16
2 files changed, 19 insertions, 3 deletions
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)
19 const auto yuzu_build_version = override_build.empty() ? yuzu_build : override_build; 19 const auto yuzu_build_version = override_build.empty() ? yuzu_build : override_build;
20 20
21 ui->setupUi(this); 21 ui->setupUi(this);
22 ui->labelLogo->setPixmap(QIcon::fromTheme(QStringLiteral("yuzu")).pixmap(200)); 22 // Try and request the icon from Qt theme (Linux?)
23 const QIcon yuzu_logo = QIcon::fromTheme(QStringLiteral("org.yuzu_emu.yuzu"));
24 if (!yuzu_logo.isNull()) {
25 ui->labelLogo->setPixmap(yuzu_logo.pixmap(200));
26 }
23 ui->labelBuildInfo->setText( 27 ui->labelBuildInfo->setText(
24 ui->labelBuildInfo->text().arg(QString::fromStdString(yuzu_build_version), 28 ui->labelBuildInfo->text().arg(QString::fromStdString(yuzu_build_version),
25 QString::fromUtf8(Common::g_build_date).left(10))); 29 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 @@
26 <verstretch>0</verstretch> 26 <verstretch>0</verstretch>
27 </sizepolicy> 27 </sizepolicy>
28 </property> 28 </property>
29 <property name="maximumSize">
30 <size>
31 <width>200</width>
32 <height>200</height>
33 </size>
34 </property>
29 <property name="text"> 35 <property name="text">
30 <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> 36 <string/>
37 </property>
38 <property name="pixmap">
39 <pixmap resource="../../dist/qt_themes/default/default.qrc">:/icons/default/256x256/yuzu.png</pixmap>
40 </property>
41 <property name="scaledContents">
42 <bool>true</bool>
31 </property> 43 </property>
32 </widget> 44 </widget>
33 </item> 45 </item>
@@ -152,7 +164,7 @@ p, li { white-space: pre-wrap; }
152 </layout> 164 </layout>
153 </widget> 165 </widget>
154 <resources> 166 <resources>
155 <include location="../../dist/icons/icons.qrc"/> 167 <include location="../../dist/qt_themes_default/default/default.qrc"/>
156 </resources> 168 </resources>
157 <connections> 169 <connections>
158 <connection> 170 <connection>