diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43363bf53..b7ddcaab6 100644
--- a/CMakeLists.txt
+++ b/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()
diff --git a/CMakeModules/BundleTarget.cmake b/CMakeModules/BundleTarget.cmake
index d3c395237..fb993e65c 100644
--- a/CMakeModules/BundleTarget.cmake
+++ b/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/")
diff --git a/dist/apple/citra.icns b/dist/apple/azahar.icns
similarity index 100%
rename from dist/apple/citra.icns
rename to dist/apple/azahar.icns
diff --git a/dist/azahar-room.desktop b/dist/azahar-room.desktop
index ba064a277..a4c8ca255 100644
--- a/dist/azahar-room.desktop
+++ b/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;
diff --git a/dist/azahar.desktop b/dist/azahar.desktop
index ba1d76f69..31ccea05a 100644
--- a/dist/azahar.desktop
+++ b/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;
diff --git a/dist/citra.ico b/dist/azahar.ico
similarity index 100%
rename from dist/citra.ico
rename to dist/azahar.ico
diff --git a/dist/citra.manifest b/dist/azahar.manifest
similarity index 100%
rename from dist/citra.manifest
rename to dist/azahar.manifest
diff --git a/dist/citra.svg b/dist/azahar.svg
similarity index 100%
rename from dist/citra.svg
rename to dist/azahar.svg
diff --git a/dist/citra.xml b/dist/azahar.xml
similarity index 95%
rename from dist/citra.xml
rename to dist/azahar.xml
index aad26254a..6f884c9ea 100644
--- a/dist/citra.xml
+++ b/dist/azahar.xml
@@ -4,7 +4,7 @@
Nintendo 3DS homebrew executable
Exécutable non-officiel pour Nintendo 3DS
3DSX
-
+
@@ -14,7 +14,7 @@
Image de cartouche Nintendo 3DS
CCI
CTR Cart Image
-
+
@@ -24,7 +24,7 @@
Exécutable Nintendo 3DS
CXI
CTR eXecutable Image
-
+
@@ -34,7 +34,7 @@
Archive installable Nintendo 3DS
CIA
CTR Importable Archive
-
+
diff --git a/dist/qt_themes/default/icons/256x256/citra.png b/dist/qt_themes/default/icons/256x256/azahar.png
similarity index 100%
rename from dist/qt_themes/default/icons/256x256/citra.png
rename to dist/qt_themes/default/icons/256x256/azahar.png
diff --git a/dist/qt_themes/default/icons_light/256x256/citra.png b/dist/qt_themes/default/icons_light/256x256/azahar.png
similarity index 100%
rename from dist/qt_themes/default/icons_light/256x256/citra.png
rename to dist/qt_themes/default/icons_light/256x256/azahar.png
diff --git a/dist/qt_themes/default/theme_default.qrc b/dist/qt_themes/default/theme_default.qrc
index 4fa70ee8e..c8339f86d 100644
--- a/dist/qt_themes/default/theme_default.qrc
+++ b/dist/qt_themes/default/theme_default.qrc
@@ -13,7 +13,7 @@
icons/48x48/no_avatar.png
icons/48x48/plus.png
icons/48x48/sd_card.png
- icons/256x256/citra.png
+ icons/256x256/azahar.png
icons/48x48/star.png
icons/256x256/plus_folder.png
@@ -31,7 +31,7 @@
icons_light/48x48/no_avatar.png
icons_light/48x48/plus.png
icons_light/48x48/sd_card.png
- icons_light/256x256/citra.png
+ icons_light/256x256/azahar.png
icons_light/48x48/star.png
icons_light/256x256/plus_folder.png
diff --git a/src/citra_meta/CMakeLists.txt b/src/citra_meta/CMakeLists.txt
index 522f1c1c9..8fe6459a9 100644
--- a/src/citra_meta/CMakeLists.txt
+++ b/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}"
)
diff --git a/src/citra_meta/citra.rc b/src/citra_meta/citra.rc
index 7b10f5409..04be4ca1a 100644
--- a/src/citra_meta/citra.rc
+++ b/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"
diff --git a/src/citra_qt/aboutdialog.cpp b/src/citra_qt/aboutdialog.cpp
index 51143c87f..e5821bcaf 100644
--- a/src/citra_qt/aboutdialog.cpp
+++ b/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->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)));
diff --git a/src/citra_qt/aboutdialog.ui b/src/citra_qt/aboutdialog.ui
index 0d70636c8..039e3e2d9 100644
--- a/src/citra_qt/aboutdialog.ui
+++ b/src/citra_qt/aboutdialog.ui
@@ -27,7 +27,7 @@
- <html><head/><body><p><img src=":/icons/citra.png"/></p></body></html>
+ <html><head/><body><p><img src=":/icons/azahar.png"/></p></body></html>
diff --git a/src/citra_qt/main.ui b/src/citra_qt/main.ui
index c50017803..7cd7fdc4e 100644
--- a/src/citra_qt/main.ui
+++ b/src/citra_qt/main.ui
@@ -15,7 +15,7 @@
- dist/citra.pngdist/citra.png
+ dist/azahar.pngdist/azahar.png
QTabWidget::Rounded
diff --git a/src/citra_room/citra_room.rc b/src/citra_room/citra_room.rc
index 2c6bcd589..e4f9281d1 100644
--- a/src/citra_room/citra_room.rc
+++ b/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"
diff --git a/src/installer/citra.nsi b/src/installer/citra.nsi
index 4dd8cf62c..38be13b62 100644
--- a/src/installer/citra.nsi
+++ b/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