summaryrefslogtreecommitdiff
path: root/src/yuzu/aboutdialog.ui
diff options
context:
space:
mode:
authorKyle K <190571+Docteh@users.noreply.github.com>2022-05-14 21:14:13 -0700
committerKyle K <190571+Docteh@users.noreply.github.com>2022-05-16 05:42:38 -0700
commit8f3098fc1eca0ba58200b2cac743106d8feca0e8 (patch)
tree0433f1069f76100d9514f8e1abc19100c7cacbea /src/yuzu/aboutdialog.ui
parent0b9ef3c0b844fbda14390c94bb6ddd37e3b36c90 (diff)
about dialog: Fix the logo in a multiplatform way
The Icon was renamed in #8283 for Linux builds, and the fix proposed in #8312 would in turn break the icon for Windows users. I've decided to fix the aboutdialog.ui file via qtcreator. I'm not sure its important to have the yuzu icon inside the About dialog grabbed from the local Qt theme, but I've reword how the code works for that, and we can just delete those lines. I've also thrown the yuzu.png through pngcrush to remove this warning libpng warning: iCCP: known incorrect sRGB profile Credit to abouvier for bringing bug up.
Diffstat (limited to 'src/yuzu/aboutdialog.ui')
-rw-r--r--src/yuzu/aboutdialog.ui16
1 files changed, 14 insertions, 2 deletions
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>