Merge pull request 'Update names in icons and add more' (#23) from JPikachu/eden:master into master

Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/23

16 files changed, 16 insertions, 16 deletions

diff --git a/.ci/package-appimage.sh b/.ci/package-appimage.sh
index 1a4f0bf775..d876d2f5b0 100755
--- a/.ci/package-appimage.sh
+++ b/.ci/package-appimage.sh
@@ -63,8 +63,8 @@ EOL
   
   cp "${app_dir}/org.yuzu_emu.${binary_name}.desktop" "${app_dir}/usr/share/applications/"
   
-  cp "dist/yuzu.svg" "${app_dir}/org.yuzu_emu.${binary_name}.svg"
-  cp "dist/yuzu.svg" "${app_dir}/usr/share/icons/hicolor/scalable/apps/org.yuzu_emu.${binary_name}.svg"
+  cp "dist/eden.svg" "${app_dir}/org.yuzu_emu.${binary_name}.svg"
+  cp "dist/eden.svg" "${app_dir}/usr/share/icons/hicolor/scalable/apps/org.yuzu_emu.${binary_name}.svg"
   
   cd build
   wget -nc https://raw.githubusercontent.com/eden-emulator/ext-linux-bin/main/appimage/deploy-linux.sh || echo "Failed to download deploy script"
diff --git a/.reuse/dep5 b/.reuse/dep5
index b9ae96d0b1..79ea95781d 100644
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -12,11 +12,11 @@ Files: dist/english_plurals/*
 Copyright: yuzu Emulator Project
 License: GPL-2.0-or-later
 
-Files: dist/qt_themes/default/icons/256x256/yuzu.png
+Files: dist/qt_themes/default/icons/256x256/eden.png
        dist/yuzu.bmp
        dist/yuzu.icns
-       dist/yuzu.ico
-       dist/yuzu.svg
+       dist/eden.ico
+       dist/eden.svg
 Copyright: yuzu Emulator Project
 License: GPL-2.0-or-later
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04e315ad99..68ad8d7772 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -643,9 +643,9 @@ endif()
 if(ENABLE_QT AND UNIX AND NOT APPLE)
     install(FILES "dist/org.yuzu_emu.yuzu.desktop"
             DESTINATION "share/applications")
-    install(FILES "dist/yuzu.svg"
+    install(FILES "dist/eden.svg"
             DESTINATION "share/icons/hicolor/scalable/apps"
-            RENAME "org.yuzu_emu.yuzu.svg")
+            RENAME "org.yuzu_emu.eden.svg")
     install(FILES "dist/org.yuzu_emu.yuzu.xml"
             DESTINATION "share/mime/packages")
     install(FILES "dist/org.yuzu_emu.yuzu.metainfo.xml"
diff --git a/dist/yuzu.ico b/dist/eden.ico
index 4ebfbc5f95..4ebfbc5f95 100644
--- a/dist/yuzu.ico
+++ b/dist/eden.ico
diff --git a/dist/yuzu.svg b/dist/eden.svg
index 98a0a4d46a..98a0a4d46a 100644
--- a/dist/yuzu.svg
+++ b/dist/eden.svg
diff --git a/dist/eden_named.ico b/dist/eden_named.ico
new file mode 100644
index 0000000000..2ac236b508
--- /dev/null
+++ b/dist/eden_named.ico
diff --git a/dist/languages/fi.ts b/dist/languages/fi.ts
index 41de824a3f..4a01faca6b 100644
--- a/dist/languages/fi.ts
+++ b/dist/languages/fi.ts
@@ -8,8 +8,8 @@
     </message>
     <message>
         <location filename="../../src/yuzu/aboutdialog.ui" line="30"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/yuzu.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/yuzu.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/eden.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/eden.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../../src/yuzu/aboutdialog.ui" line="60"/>
diff --git a/dist/qt_themes/default/default.qrc b/dist/qt_themes/default/default.qrc
index 2e01a34342..0d8af20fc1 100644
--- a/dist/qt_themes/default/default.qrc
+++ b/dist/qt_themes/default/default.qrc
@@ -18,7 +18,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
         <file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file>
         <file alias="48x48/star.png">icons/48x48/star.png</file>
         <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
-        <file alias="256x256/yuzu.png">icons/256x256/yuzu.png</file>
+        <file alias="256x256/eden.png">icons/256x256/eden.png</file>
     </qresource>
     <qresource prefix="default">
         <file>style.qss</file>
diff --git a/dist/qt_themes/default/icons/256x256/yuzu.png b/dist/qt_themes/default/icons/256x256/eden.png
index 32a2eebe8b..32a2eebe8b 100644
--- a/dist/qt_themes/default/icons/256x256/yuzu.png
+++ b/dist/qt_themes/default/icons/256x256/eden.png
diff --git a/dist/qt_themes/default/icons/256x256/eden_named.png b/dist/qt_themes/default/icons/256x256/eden_named.png
new file mode 100644
index 0000000000..c77d32c380
--- /dev/null
+++ b/dist/qt_themes/default/icons/256x256/eden_named.png
diff --git a/src/dedicated_room/yuzu_room.rc b/src/dedicated_room/yuzu_room.rc
index a08957684c..0ed520cd9a 100644
--- a/src/dedicated_room/yuzu_room.rc
+++ b/src/dedicated_room/yuzu_room.rc
@@ -9,7 +9,7 @@
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-YUZU_ICON              ICON                    "../../dist/yuzu.ico"
+YUZU_ICON              ICON                    "../../dist/eden.ico"
 
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/src/yuzu/aboutdialog.ui b/src/yuzu/aboutdialog.ui
index 55f191e2ba..05469f8496 100644
--- a/src/yuzu/aboutdialog.ui
+++ b/src/yuzu/aboutdialog.ui
@@ -36,7 +36,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="../../dist/qt_themes/default/default.qrc">:/icons/default/256x256/yuzu.png</pixmap>
+          <pixmap resource="../../dist/qt_themes/default/default.qrc">:/icons/default/256x256/eden.png</pixmap>
          </property>
          <property name="scaledContents">
           <bool>true</bool>
diff --git a/src/yuzu/main.ui b/src/yuzu/main.ui
index f61af0ccbb..03078c0126 100644
--- a/src/yuzu/main.ui
+++ b/src/yuzu/main.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="yuzu.qrc">
-    <normaloff>:/img/yuzu.ico</normaloff>:/img/yuzu.ico</iconset>
+    <normaloff>:/img/eden.ico</normaloff>:/img/eden.ico</iconset>
   </property>
   <property name="tabShape">
    <enum>QTabWidget::TabShape::Rounded</enum>
diff --git a/src/yuzu/yuzu.qrc b/src/yuzu/yuzu.qrc
index 855df05fd1..cf62023459 100644
--- a/src/yuzu/yuzu.qrc
+++ b/src/yuzu/yuzu.qrc
@@ -5,6 +5,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
 
 <RCC>
     <qresource prefix="/img">
-        <file alias="yuzu.ico">../../dist/yuzu.ico</file>
+        <file alias="eden.ico">../../dist/eden.ico</file>
     </qresource>
 </RCC>
diff --git a/src/yuzu/yuzu.rc b/src/yuzu/yuzu.rc
index 1fc74d0659..a3dc62109f 100644
--- a/src/yuzu/yuzu.rc
+++ b/src/yuzu/yuzu.rc
@@ -11,7 +11,7 @@
 // remains consistent on all systems.
 // QT requires that the default application icon is named IDI_ICON1
 
-IDI_ICON1               ICON                    "../../dist/yuzu.ico"
+IDI_ICON1               ICON                    "../../dist/eden.ico"
 
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/src/yuzu_cmd/yuzu.rc b/src/yuzu_cmd/yuzu.rc
index e230cf6809..bec09076e8 100644
--- a/src/yuzu_cmd/yuzu.rc
+++ b/src/yuzu_cmd/yuzu.rc
@@ -9,7 +9,7 @@
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-YUZU_ICON               ICON                    "../../dist/yuzu.ico"
+YUZU_ICON               ICON                    "../../dist/eden.ico"
 
 
 /////////////////////////////////////////////////////////////////////////////