diff --git a/.ci/debian_build.sh b/.ci/debian_build.sh index bb02af1..d4ae8a6 100755 --- a/.ci/debian_build.sh +++ b/.ci/debian_build.sh @@ -5,7 +5,7 @@ cd ${PROJECT_DIR} && \ echo "gta5view build version is ${APPLICATION_VERSION}" && \ mkdir -p build && \ mkdir -p assets && \ -chmod -x res/gta5sync_*.qm res/*.desktop res/gta5view*.png && \ +chmod -x res/gta5sync_*.qm res/*.desktop res/*gta5view*.png && \ cd build && \ mkdir -p qt4 && \ cd qt4 && \ diff --git a/CMakeLists.txt b/CMakeLists.txt index 8bf10ce..36975fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -200,16 +200,16 @@ target_link_libraries(gta5view PRIVATE Qt5::Network Qt5::Svg Qt5::Widgets) install(TARGETS gta5view DESTINATION bin) install(FILES res/de.syping.gta5view.desktop DESTINATION share/applications) -install(FILES res/gta5view-16.png DESTINATION share/icons/hicolor/16x16/apps RENAME gta5view.png) -install(FILES res/gta5view-24.png DESTINATION share/icons/hicolor/24x24/apps RENAME gta5view.png) -install(FILES res/gta5view-32.png DESTINATION share/icons/hicolor/32x32/apps RENAME gta5view.png) -install(FILES res/gta5view-48.png DESTINATION share/icons/hicolor/48x48/apps RENAME gta5view.png) -install(FILES res/gta5view-64.png DESTINATION share/icons/hicolor/64x64/apps RENAME gta5view.png) -install(FILES res/gta5view-96.png DESTINATION share/icons/hicolor/96x96/apps RENAME gta5view.png) -install(FILES res/gta5view-128.png DESTINATION share/icons/hicolor/128x128/apps RENAME gta5view.png) -install(FILES res/gta5view-256.png DESTINATION share/icons/hicolor/256x256/apps RENAME gta5view.png) -install(FILES res/gta5view-512.png DESTINATION share/icons/hicolor/512x512/apps RENAME gta5view.png) -install(FILES res/gta5view.png DESTINATION share/pixmaps) +install(FILES res/gta5view-16.png DESTINATION share/icons/hicolor/16x16/apps RENAME de.syping.gta5view.png) +install(FILES res/gta5view-24.png DESTINATION share/icons/hicolor/24x24/apps RENAME de.syping.gta5view.png) +install(FILES res/gta5view-32.png DESTINATION share/icons/hicolor/32x32/apps RENAME de.syping.gta5view.png) +install(FILES res/gta5view-48.png DESTINATION share/icons/hicolor/48x48/apps RENAME de.syping.gta5view.png) +install(FILES res/gta5view-64.png DESTINATION share/icons/hicolor/64x64/apps RENAME de.syping.gta5view.png) +install(FILES res/gta5view-96.png DESTINATION share/icons/hicolor/96x96/apps RENAME de.syping.gta5view.png) +install(FILES res/gta5view-128.png DESTINATION share/icons/hicolor/128x128/apps RENAME de.syping.gta5view.png) +install(FILES res/gta5view-256.png DESTINATION share/icons/hicolor/256x256/apps RENAME de.syping.gta5view.png) +install(FILES res/gta5view-512.png DESTINATION share/icons/hicolor/512x512/apps RENAME de.syping.gta5view.png) +install(FILES res/de.syping.gta5view.png DESTINATION share/pixmaps) if(QCONF_BUILD) install(FILES ${GTA5VIEW_TRANSLATIONS} DESTINATION share/gta5view/translations) diff --git a/gta5view.pro b/gta5view.pro index c470653..9a9b3fc 100644 --- a/gta5view.pro +++ b/gta5view.pro @@ -155,6 +155,7 @@ DISTFILES += \ res/gta5view-512.png \ res/app.rc \ res/de.syping.gta5view.desktop \ + res/de.syping.gta5view.png \ res/gta5sync_de.ts \ res/gta5sync_en_US.ts \ res/gta5sync_fr.ts \ @@ -227,7 +228,7 @@ isEmpty(GTA5SYNC_PREFIX): GTA5SYNC_PREFIX = /usr/local appfiles.path = $$GTA5SYNC_PREFIX/share/applications appfiles.files = $$PWD/res/de.syping.gta5view.desktop pixmaps.path = $$GTA5SYNC_PREFIX/share/pixmaps -pixmaps.files = $$PWD/res/gta5view.png +pixmaps.files = $$PWD/res/de.syping.gta5view.png target.path = $$GTA5SYNC_PREFIX/bin INSTALLS += target pixmaps appfiles diff --git a/res/de.syping.gta5view.desktop b/res/de.syping.gta5view.desktop index 270a03e..127a5e7 100644 --- a/res/de.syping.gta5view.desktop +++ b/res/de.syping.gta5view.desktop @@ -3,8 +3,8 @@ Type=Application Name=gta5view Comment=Open and edit GTA V profiles Comment[de]=GTA V Profile öffnen und bearbeiten -Categories=Qt;Utility +Categories=Qt;Utility; Exec=gta5view -Icon=gta5view +Icon=de.syping.gta5view Terminal=false StartupNotify=false diff --git a/res/gta5view.png b/res/de.syping.gta5view.png similarity index 100% rename from res/gta5view.png rename to res/de.syping.gta5view.png