forked from moonpower/azahar-UWP
Updated all files under dist to refer to Azahar instead of Citra
This resolves some icon theming issues on Linux Co-authored-by: HurricanePootis <53066639+HurricanePootis@users.noreply.github.com>
This commit is contained in:
@@ -9,7 +9,7 @@ set_target_properties(citra_meta PROPERTIES OUTPUT_NAME "azahar")
|
||||
if (APPLE)
|
||||
set(DIST_DIR "../../dist/apple")
|
||||
set(APPLE_RESOURCES
|
||||
"${DIST_DIR}/citra.icns"
|
||||
"${DIST_DIR}/azahar.icns"
|
||||
"${DIST_DIR}/LaunchScreen.storyboard"
|
||||
"${DIST_DIR}/launch_logo.png"
|
||||
)
|
||||
@@ -25,7 +25,7 @@ if (APPLE)
|
||||
MACOSX_BUNDLE_BUNDLE_VERSION "${BUILD_VERSION}"
|
||||
MACOSX_BUNDLE_SHORT_VERSION_STRING "${BUILD_FULLNAME}"
|
||||
MACOSX_BUNDLE_LONG_VERSION_STRING "${BUILD_FULLNAME}"
|
||||
MACOSX_BUNDLE_ICON_FILE "citra.icns"
|
||||
MACOSX_BUNDLE_ICON_FILE "azahar.icns"
|
||||
RESOURCE "${APPLE_RESOURCES}"
|
||||
)
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
// remains consistent on all systems.
|
||||
// QT requires that the default application icon is named IDI_ICON1
|
||||
|
||||
IDI_ICON1 ICON "../../dist/citra.ico"
|
||||
IDI_ICON1 ICON "../../dist/azahar.ico"
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@@ -16,4 +16,4 @@ IDI_ICON1 ICON "../../dist/citra.ico"
|
||||
// RT_MANIFEST
|
||||
//
|
||||
|
||||
0 RT_MANIFEST "../../dist/citra.manifest"
|
||||
0 RT_MANIFEST "../../dist/azahar.manifest"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright 2017 Citra Emulator Project
|
||||
// Copyright Citra Emulator Project / Azahar Emulator Project
|
||||
// Licensed under GPLv2 or any later version
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
@@ -11,7 +11,7 @@ AboutDialog::AboutDialog(QWidget* parent)
|
||||
: QDialog(parent, Qt::WindowTitleHint | Qt::WindowCloseButtonHint | Qt::WindowSystemMenuHint),
|
||||
ui(std::make_unique<Ui::AboutDialog>()) {
|
||||
ui->setupUi(this);
|
||||
ui->labelLogo->setPixmap(QIcon::fromTheme(QStringLiteral("citra")).pixmap(200));
|
||||
ui->labelLogo->setPixmap(QIcon::fromTheme(QStringLiteral("azahar")).pixmap(200));
|
||||
ui->labelBuildInfo->setText(ui->labelBuildInfo->text().arg(
|
||||
QString::fromUtf8(Common::g_build_fullname), QString::fromUtf8(Common::g_scm_branch),
|
||||
QString::fromUtf8(Common::g_scm_desc), QString::fromUtf8(Common::g_build_date).left(10)));
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><html><head/><body><p><img src=":/icons/citra.png"/></p></body></html></string>
|
||||
<string><html><head/><body><p><img src=":/icons/azahar.png"/></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
</property>
|
||||
<property name="windowIcon">
|
||||
<iconset>
|
||||
<normaloff>dist/citra.png</normaloff>dist/citra.png</iconset>
|
||||
<normaloff>dist/azahar.png</normaloff>dist/azahar.png</iconset>
|
||||
</property>
|
||||
<property name="tabShape">
|
||||
<enum>QTabWidget::Rounded</enum>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
// Icon with lowest ID value placed first to ensure application icon
|
||||
// remains consistent on all systems.
|
||||
CITRA_ICON ICON "../../dist/citra.ico"
|
||||
CITRA_ICON ICON "../../dist/azahar.ico"
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@@ -14,4 +14,4 @@ CITRA_ICON ICON "../../dist/citra.ico"
|
||||
// RT_MANIFEST
|
||||
//
|
||||
|
||||
0 RT_MANIFEST "../../dist/citra.manifest"
|
||||
0 RT_MANIFEST "../../dist/azahar.manifest"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
; Copyright Dolphin Emulator Project / Lime3DS Emulator Project
|
||||
; Copyright Dolphin Emulator Project / Azahar Emulator Project
|
||||
; Licensed under GPLv2 or any later version
|
||||
; Refer to the license.txt file included.
|
||||
|
||||
@@ -46,7 +46,7 @@ ShowUnInstDetails show
|
||||
!include "nsDialogs.nsh"
|
||||
|
||||
; MUI Settings
|
||||
!define MUI_ICON "../../dist/citra.ico"
|
||||
!define MUI_ICON "../../dist/azahar.ico"
|
||||
!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
|
||||
|
||||
; License page
|
||||
|
||||
Reference in New Issue
Block a user