Jelajahi Sumber

Merge pull request #8339 from Docteh/about_icon

about dialog: Fix yuzu icon
bunnei 4 tahun lalu
induk
melakukan
cc289a8ed0
3 mengubah file dengan 19 tambahan dan 3 penghapusan
  1. TEMPAT SAMPAH
      dist/qt_themes/default/icons/256x256/yuzu.png
  2. 5 1
      src/yuzu/about_dialog.cpp
  3. 14 2
      src/yuzu/aboutdialog.ui

TEMPAT SAMPAH
dist/qt_themes/default/icons/256x256/yuzu.png


+ 5 - 1
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;
     const auto yuzu_build_version = override_build.empty() ? yuzu_build : override_build;
 
 
     ui->setupUi(this);
     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->setText(
         ui->labelBuildInfo->text().arg(QString::fromStdString(yuzu_build_version),
         ui->labelBuildInfo->text().arg(QString::fromStdString(yuzu_build_version),
                                        QString::fromUtf8(Common::g_build_date).left(10)));
                                        QString::fromUtf8(Common::g_build_date).left(10)));

+ 14 - 2
src/yuzu/aboutdialog.ui

@@ -26,8 +26,20 @@
            <verstretch>0</verstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
           </sizepolicy>
          </property>
          </property>
+         <property name="maximumSize">
+          <size>
+           <width>200</width>
+           <height>200</height>
+          </size>
+         </property>
          <property name="text">
          <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>
          </property>
         </widget>
         </widget>
        </item>
        </item>
@@ -152,7 +164,7 @@ p, li { white-space: pre-wrap; }
   </layout>
   </layout>
  </widget>
  </widget>
  <resources>
  <resources>
-  <include location="../../dist/icons/icons.qrc"/>
+  <include location="../../dist/qt_themes_default/default/default.qrc"/>
  </resources>
  </resources>
  <connections>
  <connections>
   <connection>
   <connection>