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>

CMakeLists.txt

@@ -493,8 +493,8 @@ endif()
 if(ENABLE_QT AND UNIX AND NOT APPLE)
     install(FILES "${PROJECT_SOURCE_DIR}/dist/azahar.desktop"
             DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
-    install(FILES "${PROJECT_SOURCE_DIR}/dist/citra.svg"
+    install(FILES "${PROJECT_SOURCE_DIR}/dist/azahar.svg"
             DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps")
-    install(FILES "${PROJECT_SOURCE_DIR}/dist/citra.xml"
+    install(FILES "${PROJECT_SOURCE_DIR}/dist/azahar.xml"
             DESTINATION "${CMAKE_INSTALL_PREFIX}/share/mime/packages")
 endif()

CMakeModules/BundleTarget.cmake

@@ -124,7 +124,7 @@ if (BUNDLE_TARGET_EXECUTE)
             ${extra_linuxdeploy_args}
             --plugin checkrt
             --executable "${executable_path}"
-            --icon-file "${source_path}/dist/citra.svg"
+            --icon-file "${source_path}/dist/azahar.svg"
             --desktop-file "${source_path}/dist/${executable_name}.desktop"
             --appdir "${appdir_path}"
             RESULT_VARIABLE linuxdeploy_appdir_result)
@@ -282,7 +282,7 @@ else()
             COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bundle/dist/")
         add_custom_command(
             TARGET bundle
-            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/dist/icon.png" "${CMAKE_BINARY_DIR}/bundle/dist/citra.png")
+            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/dist/icon.png" "${CMAKE_BINARY_DIR}/bundle/dist/azahar.png")
         add_custom_command(
             TARGET bundle
             COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/license.txt" "${CMAKE_BINARY_DIR}/bundle/")

dist/azahar-room.desktop

@@ -3,7 +3,7 @@ Version=1.0
 Type=Application
 Name=Azahar Room
 Comment=Multiplayer room host for Azahar
-Icon=citra
+Icon=azahar
 TryExec=azahar-room
 Exec=azahar-room %f
 Categories=Game;Emulator;

dist/azahar.desktop

@@ -6,7 +6,7 @@ GenericName=3DS Emulator
 GenericName[fr]=Émulateur 3DS
 Comment=Nintendo 3DS video game console emulator
 Comment[fr]=Émulateur de console de jeu Nintendo 3DS
-Icon=citra
+Icon=azahar
 TryExec=azahar
 Exec=azahar %f
 Categories=Game;Emulator;

dist/azahar.xml

@@ -4,7 +4,7 @@
         <comment>Nintendo 3DS homebrew executable</comment>
         <comment xml:lang="fr">Exécutable non-officiel pour Nintendo 3DS </comment>
         <acronym>3DSX</acronym>
-        <icon name="citra"/>
+        <icon name="azahar"/>
         <glob pattern="*.3dsx"/>
         <magic><match value="3DSX" type="string" offset="0"/></magic>
     </mime-type>
@@ -14,7 +14,7 @@
         <comment xml:lang="fr">Image de cartouche Nintendo 3DS</comment>
         <acronym>CCI</acronym>
         <expanded-acronym>CTR Cart Image</expanded-acronym>
-        <icon name="citra"/>
+        <icon name="azahar"/>
         <glob pattern="*.cci"/>
         <magic><match value="NCSD" type="string" offset="256"/></magic>
     </mime-type>
@@ -24,7 +24,7 @@
         <comment xml:lang="fr">Exécutable Nintendo 3DS</comment>
         <acronym>CXI</acronym>
         <expanded-acronym>CTR eXecutable Image</expanded-acronym>
-        <icon name="citra"/>
+        <icon name="azahar"/>
         <glob pattern="*.cxi"/>
         <magic><match value="NCCH" type="string" offset="256"/></magic>
     </mime-type>
@@ -34,7 +34,7 @@
         <comment xml:lang="fr">Archive installable Nintendo 3DS</comment>
         <acronym>CIA</acronym>
         <expanded-acronym>CTR Importable Archive</expanded-acronym>
-        <icon name="citra"/>
+        <icon name="azahar"/>
         <glob pattern="*.cia"/>
     </mime-type>
 

dist/qt_themes/default/theme_default.qrc

@@ -13,7 +13,7 @@
         <file alias="48x48/no_avatar.png">icons/48x48/no_avatar.png</file>
         <file alias="48x48/plus.png">icons/48x48/plus.png</file>
         <file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file>
-        <file alias="256x256/citra.png">icons/256x256/citra.png</file>
+        <file alias="256x256/azahar.png">icons/256x256/azahar.png</file>
         <file alias="48x48/star.png">icons/48x48/star.png</file>
         <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
     </qresource>
@@ -31,7 +31,7 @@
         <file alias="48x48/no_avatar.png">icons_light/48x48/no_avatar.png</file>
         <file alias="48x48/plus.png">icons_light/48x48/plus.png</file>
         <file alias="48x48/sd_card.png">icons_light/48x48/sd_card.png</file>
-        <file alias="256x256/citra.png">icons_light/256x256/citra.png</file>
+        <file alias="256x256/azahar.png">icons_light/256x256/azahar.png</file>
         <file alias="48x48/star.png">icons_light/48x48/star.png</file>
         <file alias="256x256/plus_folder.png">icons_light/256x256/plus_folder.png</file>
     </qresource>

src/citra_meta/CMakeLists.txt

@@ -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}"
     )
 

src/citra_meta/citra.rc

@@ -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"

src/citra_qt/aboutdialog.cpp

@@ -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)));

src/citra_qt/aboutdialog.ui

@@ -27,7 +27,7 @@
           </sizepolicy>
          </property>
          <property name="text">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/citra.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/azahar.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
         </widget>
        </item>

src/citra_qt/main.ui

@@ -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>

src/citra_room/citra_room.rc

@@ -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"

src/installer/citra.nsi

@@ -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