Move installed icons

2025-12-23 23:29:25 -05:00 · 2022-01-26 14:30:49 +01:00
parent bcf26df23d
commit 9f7bf24c25
11 changed files with 9 additions and 17 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -569,15 +569,15 @@ if(UNIX)
    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_DIR})
    include(ECMInstallIcons)

-    ecm_install_icons(ICONS src/images/application/16x16/apps/16-apps-io.github.antimicrox.antimicrox.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)
-    ecm_install_icons(ICONS src/images/application/24x24/apps/24-apps-io.github.antimicrox.antimicrox.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)
-    ecm_install_icons(ICONS src/images/application/32x32/apps/32-apps-io.github.antimicrox.antimicrox.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)
-    ecm_install_icons(ICONS src/images/application/48x48/apps/48-apps-io.github.antimicrox.antimicrox.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)
-    ecm_install_icons(ICONS src/images/application/64x64/apps/64-apps-io.github.antimicrox.antimicrox.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)
-    ecm_install_icons(ICONS src/images/application/128x128/apps/128-apps-io.github.antimicrox.antimicrox.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)
-    ecm_install_icons(ICONS src/images/application/scalable/apps/sc-apps-io.github.antimicrox.antimicrox.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)
+    ecm_install_icons(ICONS share/icons/application/16x16/apps/16-apps-io.github.antimicrox.antimicrox.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)
+    ecm_install_icons(ICONS share/icons/application/24x24/apps/24-apps-io.github.antimicrox.antimicrox.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)
+    ecm_install_icons(ICONS share/icons/application/32x32/apps/32-apps-io.github.antimicrox.antimicrox.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)
+    ecm_install_icons(ICONS share/icons/application/48x48/apps/48-apps-io.github.antimicrox.antimicrox.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)
+    ecm_install_icons(ICONS share/icons/application/64x64/apps/64-apps-io.github.antimicrox.antimicrox.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)
+    ecm_install_icons(ICONS share/icons/application/128x128/apps/128-apps-io.github.antimicrox.antimicrox.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)
+    ecm_install_icons(ICONS share/icons/application/scalable/apps/sc-apps-io.github.antimicrox.antimicrox.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)

-    ecm_install_icons(ICONS src/images/breeze_themed/48-apps-antimicrox_trayicon.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons THEME breeze)
+    ecm_install_icons(ICONS share/icons/breeze_themed/48-apps-antimicrox_trayicon.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons THEME breeze)
    ecm_install_icons(ICONS src/images/48-apps-antimicrox_trayicon.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)

    install(FILES CHANGELOG.md DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/doc/antimicrox")
--- a/other/Doxyfile_config.in
+++ b/other/Doxyfile_config.in
@@ -6,7 +6,7 @@ RECURSIVE              = YES

 QT_AUTOBRIEF           = YES
 OPTIMIZE_OUTPUT_FOR_C  = YES
-PROJECT_LOGO           = @CMAKE_CURRENT_SOURCE_DIR@/src/images/application/48x48/apps/48-apps-io.github.antimicrox.antimicrox.png
+PROJECT_LOGO           = @CMAKE_CURRENT_SOURCE_DIR@/share/icons/application/48x48/apps/48-apps-io.github.antimicrox.antimicrox.png

 HAVE_DOT               = YES
 DOT_IMAGE_FORMAT       = svg
--- a/share/icons/application/128x128/apps/128-apps-io.github.antimicrox.antimicrox.png
+++ b/share/icons/application/128x128/apps/128-apps-io.github.antimicrox.antimicrox.png
--- a/share/icons/application/16x16/apps/16-apps-io.github.antimicrox.antimicrox.png
+++ b/share/icons/application/16x16/apps/16-apps-io.github.antimicrox.antimicrox.png
--- a/share/icons/application/24x24/apps/24-apps-io.github.antimicrox.antimicrox.png
+++ b/share/icons/application/24x24/apps/24-apps-io.github.antimicrox.antimicrox.png
--- a/share/icons/application/32x32/apps/32-apps-io.github.antimicrox.antimicrox.png
+++ b/share/icons/application/32x32/apps/32-apps-io.github.antimicrox.antimicrox.png
--- a/share/icons/application/48x48/apps/48-apps-io.github.antimicrox.antimicrox.png
+++ b/share/icons/application/48x48/apps/48-apps-io.github.antimicrox.antimicrox.png
--- a/share/icons/application/64x64/apps/64-apps-io.github.antimicrox.antimicrox.png
+++ b/share/icons/application/64x64/apps/64-apps-io.github.antimicrox.antimicrox.png
--- a/share/icons/application/scalable/apps/sc-apps-io.github.antimicrox.antimicrox.svg
+++ b/share/icons/application/scalable/apps/sc-apps-io.github.antimicrox.antimicrox.svg
--- a/share/icons/breeze_themed/48-apps-antimicrox_trayicon.png
+++ b/share/icons/breeze_themed/48-apps-antimicrox_trayicon.png
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -43,14 +43,6 @@
        <file>images/actions/view_refresh.png</file>
        <file>images/actions/view_restore.png</file>

-        <file>images/application/16x16/apps/16-apps-io.github.antimicrox.antimicrox.png</file>
-        <file>images/application/24x24/apps/24-apps-io.github.antimicrox.antimicrox.png</file>
-        <file>images/application/32x32/apps/32-apps-io.github.antimicrox.antimicrox.png</file>
-        <file>images/application/48x48/apps/48-apps-io.github.antimicrox.antimicrox.png</file>
-        <file>images/application/64x64/apps/64-apps-io.github.antimicrox.antimicrox.png</file>
-        <file>images/application/128x128/apps/128-apps-io.github.antimicrox.antimicrox.png</file>
-        <file>images/application/scalable/apps/sc-apps-io.github.antimicrox.antimicrox.svg</file>
-
        <file>images/battery-low-level.png</file>
        <file>images/actions/join_slots.png</file>
        <file>images/actions/split_slot.png</file>