From 8fe9282bd9d64a00e26a62d707e4a88b3d6dc96f Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sun, 25 Jun 2023 21:41:13 +1000 Subject: [PATCH] Qt: De-duplicate AppIcon --- .../workflows/scripts/linux/appimage-qt.sh | 2 +- pcsx2-qt/MainWindow.cpp | 1 - pcsx2-qt/MainWindow.ui | 21 +++++++++++------- pcsx2-qt/SetupWizardDialog.cpp | 4 ++-- pcsx2-qt/SetupWizardDialog.ui | 16 +++++++++---- pcsx2-qt/resources/icons/AppIcon.png | Bin 6055 -> 0 bytes .../resources/icons}/AppIcon64.png | Bin pcsx2-qt/resources/resources.qrc | 2 +- pcsx2/Resources/AppIcon16.png | Bin 2686 -> 0 bytes pcsx2/Resources/AppIcon32.png | Bin 5308 -> 0 bytes 10 files changed, 29 insertions(+), 17 deletions(-) delete mode 100644 pcsx2-qt/resources/icons/AppIcon.png rename {pcsx2/Resources => pcsx2-qt/resources/icons}/AppIcon64.png (100%) delete mode 100644 pcsx2/Resources/AppIcon16.png delete mode 100644 pcsx2/Resources/AppIcon32.png diff --git a/.github/workflows/scripts/linux/appimage-qt.sh b/.github/workflows/scripts/linux/appimage-qt.sh index 253449b373..f7862358bc 100755 --- a/.github/workflows/scripts/linux/appimage-qt.sh +++ b/.github/workflows/scripts/linux/appimage-qt.sh @@ -287,7 +287,7 @@ Plugins = ../lib/plugins EOF echo "Copy desktop/icon..." -cp "$PCSX2DIR/pcsx2/Resources/AppIcon64.png" "$OUTDIR/PCSX2.png" +cp "$PCSX2DIR/bin/resources/icons/AppIconLarge.png" "$OUTDIR/PCSX2.png" cp "$SCRIPTDIR/pcsx2-qt.desktop" "$OUTDIR/PCSX2.desktop" cp "$SCRIPTDIR/AppRun-qt" "$OUTDIR/AppRun" diff --git a/pcsx2-qt/MainWindow.cpp b/pcsx2-qt/MainWindow.cpp index 9f46afa729..bdc6a1726c 100644 --- a/pcsx2-qt/MainWindow.cpp +++ b/pcsx2-qt/MainWindow.cpp @@ -183,7 +183,6 @@ void MainWindow::setupAdditionalUi() { const bool show_advanced_settings = QtHost::ShouldShowAdvancedSettings(); - setWindowIcon(QIcon(QStringLiteral("%1/icons/AppIconLarge.png").arg(QtHost::GetResourcesBasePath()))); makeIconsMasks(menuBar()); m_ui.menuDebug->menuAction()->setVisible(show_advanced_settings); diff --git a/pcsx2-qt/MainWindow.ui b/pcsx2-qt/MainWindow.ui index df97b7f7db..9373877a40 100644 --- a/pcsx2-qt/MainWindow.ui +++ b/pcsx2-qt/MainWindow.ui @@ -16,6 +16,11 @@ PCSX2 + + + :/icons/AppIcon64.png + + @@ -126,10 +131,10 @@ Switch Renderer - - - .. - + + + .. + @@ -484,12 +489,12 @@ - - &About PCSX2... - - :/icons/AppIcon.png:/icons/AppIcon.png + :/icons/AppIcon64.png:/icons/AppIcon64.png + + + &About PCSX2... diff --git a/pcsx2-qt/SetupWizardDialog.cpp b/pcsx2-qt/SetupWizardDialog.cpp index 366c45c812..d60586a575 100644 --- a/pcsx2-qt/SetupWizardDialog.cpp +++ b/pcsx2-qt/SetupWizardDialog.cpp @@ -169,10 +169,10 @@ void SetupWizardDialog::confirmCancel() void SetupWizardDialog::setupUi() { - setWindowIcon(QIcon(QStringLiteral("%1/icons/AppIconLarge.png").arg(QtHost::GetResourcesBasePath()))); - m_ui.setupUi(this); + m_ui.logo->setPixmap(QPixmap(QStringLiteral("%1/icons/AppIconLarge.png").arg(QtHost::GetResourcesBasePath()))); + m_ui.pages->setCurrentIndex(0); m_page_labels[Page_Language] = m_ui.labelLanguage; diff --git a/pcsx2-qt/SetupWizardDialog.ui b/pcsx2-qt/SetupWizardDialog.ui index 8ae43f7b2a..773a25f939 100644 --- a/pcsx2-qt/SetupWizardDialog.ui +++ b/pcsx2-qt/SetupWizardDialog.ui @@ -13,6 +13,11 @@ PCSX2 Setup Wizard + + + :/icons/AppIcon64.png + + 10 @@ -20,7 +25,7 @@ - + 0 @@ -33,12 +38,15 @@ 128 + + + 128 + 128 + + - - :/icons/AppIcon.png - true diff --git a/pcsx2-qt/resources/icons/AppIcon.png b/pcsx2-qt/resources/icons/AppIcon.png deleted file mode 100644 index 3d04cd3722a0df0b726f87123de3e9fe33bf6113..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6055 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 - icons/AppIcon.png + icons/AppIcon64.png icons/applications-system-24.png icons/black/index.theme icons/black/svg/arrow-left-right-line.svg diff --git a/pcsx2/Resources/AppIcon16.png b/pcsx2/Resources/AppIcon16.png deleted file mode 100644 index 35109d90b0bfd67b6f2d3df69132ede31fccf89b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2686 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 diff --git a/pcsx2/Resources/AppIcon32.png b/pcsx2/Resources/AppIcon32.png deleted file mode 100644 index 72ab9858034cabf83ec77c0c3f4803c877a79467..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5308 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 O0000