Browse Source
Merge pull request #8339 from Docteh/about_icon
about dialog: Fix yuzu icon
pull/15/merge
bunnei
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
19 additions and
3 deletions
-
BIN
dist/qt_themes/default/icons/256x256/yuzu.png
-
src/yuzu/about_dialog.cpp
-
src/yuzu/aboutdialog.ui
Width: 256
|
Height: 256
|
Size: 10 KiB
Width: 256
|
Height: 256
|
Size: 6.6 KiB
|
|
|
|
@ -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))); |
|
|
|
|
|
|
|
@ -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> |
|
|
|
|