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 3d04cd3722..0000000000 Binary files a/pcsx2-qt/resources/icons/AppIcon.png and /dev/null differ diff --git a/pcsx2/Resources/AppIcon64.png b/pcsx2-qt/resources/icons/AppIcon64.png similarity index 100% rename from pcsx2/Resources/AppIcon64.png rename to pcsx2-qt/resources/icons/AppIcon64.png diff --git a/pcsx2-qt/resources/resources.qrc b/pcsx2-qt/resources/resources.qrc index c02307a0dc..eea7134764 100644 --- a/pcsx2-qt/resources/resources.qrc +++ b/pcsx2-qt/resources/resources.qrc @@ -1,6 +1,6 @@ - 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 35109d90b0..0000000000 Binary files a/pcsx2/Resources/AppIcon16.png and /dev/null differ diff --git a/pcsx2/Resources/AppIcon32.png b/pcsx2/Resources/AppIcon32.png deleted file mode 100644 index 72ab985803..0000000000 Binary files a/pcsx2/Resources/AppIcon32.png and /dev/null differ