rename icon files for all platforms

blueprint-freespeech · Jul 17, 2019 · 6af5035 · 6af5035
1 parent 3306da3
commit 6af5035
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/icons/icons.qrc b/icons/icons.qrc
@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/icons">
-        <file>ricochet.svg</file>
+        <file>ricochet_refresh.svg</file>
         <file>ricochet_icons.ttf</file>
     </qresource>
 </RCC>
diff --git a/packaging/installer/installer.iss b/packaging/installer/installer.iss
@@ -18,7 +18,7 @@ VersionInfoDescription=Ricochet
 VersionInfoProductName=Ricochet
 WizardImageFile=SetupModern11.bmp
 ShowLanguageDialog=no
-SetupIconFile=ricochet.ico
+SetupIconFile=ricochet_refresh.ico
 [Files]
 Source: ricochet.exe; DestDir: {app}; DestName: ricochet.exe; Flags: replacesameversion
 Source: LICENSE; DestDir: {app}

diff --git a/packaging/installer/prepare.bat b/packaging/installer/prepare.bat
@@ -1,7 +1,7 @@
 if exist "Qt\" rd /q /s Qt
 windeployqt --qmldir ..\..\src\ui\qml --dir Qt ricochet.exe
 if exist "Qt\qmltooling" rd /q /s Qt\qmltooling
-copy /Y ..\..\icons\ricochet.ico ricochet.ico
+copy /Y ..\..\icons\ricochet_refresh.ico ricochet_refresh.ico
 copy /Y ..\..\LICENSE LICENSE
 if not exist "translation\" mkdir translation
 copy /Y ..\..\translation\installer_*.isl translation\

diff --git a/packaging/rpm/ricochet.spec b/packaging/rpm/ricochet.spec
@@ -52,8 +52,8 @@ install -m 0644 -D -p README.md %{buildroot}/%{_docdir}/%{name}/README.md
 %files
 /usr/bin/ricochet
 /usr/share/applications/ricochet.desktop
-/usr/share/icons/hicolor/48x48/apps/ricochet.png
-/usr/share/icons/hicolor/scalable/apps/ricochet.svg
+/usr/share/icons/hicolor/48x48/apps/ricochet_refresh.png
+/usr/share/icons/hicolor/scalable/apps/ricochet_refresh.svg
 %docdir %{_docdir}/%{name}
 %doc %{_docdir}/%{name}/LICENSE
 %doc %{_docdir}/%{name}/AUTHORS.md

diff --git a/ricochet.pro b/ricochet.pro
@@ -56,9 +56,9 @@ contains(DEFINES, RICOCHET_NO_PORTABLE) {
         shortcut.path = /usr/share/applications
         shortcut.files = src/ricochet.desktop
         icon.path = /usr/share/icons/hicolor/48x48/apps/
-        icon.files = icons/ricochet.png
+        icon.files = icons/ricochet_refresh.png
         scalable_icon.path = /usr/share/icons/hicolor/scalable/apps/
-        scalable_icon.files = icons/ricochet.svg
+        scalable_icon.files = icons/ricochet_refresh.svg
         INSTALLS += target shortcut icon scalable_icon
         QMAKE_CLEAN += contrib/usr.bin.ricochet
         contains(DEFINES, APPARMOR) {
@@ -251,7 +251,7 @@ RESOURCES += src/ui/qml/qml.qrc \
     icons/icons.qrc \
     sounds/sounds.qrc
 
-win32:RC_ICONS = icons/RicochetRefresh.ico
+win32:RC_ICONS = icons/ricochet_refresh.ico
 OTHER_FILES += src/ui/qml/*
 lupdate_only {
     SOURCES += src/ui/qml/*.qml

diff --git a/src/main.cpp b/src/main.cpp
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
     a.setOrganizationName(QStringLiteral("Ricochet"));
 
 #if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
-    a.setWindowIcon(QIcon(QStringLiteral(":/icons/ricochet.svg")));
+    a.setWindowIcon(QIcon(QStringLiteral(":/icons/ricochet_refresh.svg")));
 #endif
 
     QScopedPointer<SettingsFile> settings(new SettingsFile);

diff --git a/src/ricochet.desktop b/src/ricochet.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Application
-Name=Ricochet IM
+Name=Ricochet Refresh
 Categories=Network;InstantMessaging;Chat;FileTransfer;Qt
 Comment=Anonymous instant messaging
-Icon=ricochet
+Icon=ricochet_refresh
 Exec=ricochet