diff --git a/cmake/musrfit-root6.spec.in b/cmake/musrfit-root6.spec.in
index 5f787307..94dde83f 100644
--- a/cmake/musrfit-root6.spec.in
+++ b/cmake/musrfit-root6.spec.in
@@ -92,7 +92,13 @@ rm -rf $RPM_BUILD_ROOT
%license COPYING
%doc %_prefix/share/doc/musrfit
%{_datadir}/applications/musredit.desktop
-%{_datadir}/icons/hicolor/48x48/apps/musredit.png
+%{_datadir}/icons/hicolor/scalable/apps/musredit.svg
+%{_datadir}/applications/musrWiz.desktop
+%{_datadir}/icons/hicolor/scalable/apps/musrWiz.svg
+%{_datadir}/applications/musrStep.desktop
+%{_datadir}/icons/hicolor/scalable/apps/musrStep.svg
+%{_datadir}/applications/mupp.desktop
+%{_datadir}/icons/hicolor/scalable/apps/mupp.svg
%{_datadir}/applications/musrview.desktop
%{_datadir}/icons/hicolor/scalable/apps/musrview.svg
%{_datadir}/icons/hicolor/512x512/apps/musrview.png
diff --git a/src/musredit_qt5/mupp/CMakeLists.txt b/src/musredit_qt5/mupp/CMakeLists.txt
index 40a1de3a..0e1c6d5b 100644
--- a/src/musredit_qt5/mupp/CMakeLists.txt
+++ b/src/musredit_qt5/mupp/CMakeLists.txt
@@ -140,7 +140,7 @@ if (UNIX AND NOT APPLE)
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/applications
)
install(
- FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/mupp-plain.svg
+ FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/mupp-app.svg
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/scalable/apps
RENAME mupp.svg
)
diff --git a/src/musredit_qt5/mupp/icons/mupp-app.svg b/src/musredit_qt5/mupp/icons/mupp-app.svg
new file mode 100644
index 00000000..56b7a2a5
--- /dev/null
+++ b/src/musredit_qt5/mupp/icons/mupp-app.svg
@@ -0,0 +1,35 @@
+
+
+
diff --git a/src/musredit_qt5/musrStep/CMakeLists.txt b/src/musredit_qt5/musrStep/CMakeLists.txt
index 182a794c..3cae3901 100644
--- a/src/musredit_qt5/musrStep/CMakeLists.txt
+++ b/src/musredit_qt5/musrStep/CMakeLists.txt
@@ -95,7 +95,7 @@ if (UNIX AND NOT APPLE)
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/applications
)
install(
- FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/musrStep-32x32.svg
+ FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/musrStep-app.svg
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/scalable/apps
RENAME musrStep.svg
)
diff --git a/src/musredit_qt5/musrStep/icons/musrStep-app.svg b/src/musredit_qt5/musrStep/icons/musrStep-app.svg
new file mode 100644
index 00000000..198deb4d
--- /dev/null
+++ b/src/musredit_qt5/musrStep/icons/musrStep-app.svg
@@ -0,0 +1,16 @@
+
+
+
diff --git a/src/musredit_qt5/musrWiz/CMakeLists.txt b/src/musredit_qt5/musrWiz/CMakeLists.txt
index 160c1496..79591746 100644
--- a/src/musredit_qt5/musrWiz/CMakeLists.txt
+++ b/src/musredit_qt5/musrWiz/CMakeLists.txt
@@ -98,7 +98,7 @@ if (UNIX AND NOT APPLE)
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/applications
)
install(
- FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/musrWiz-32x32.svg
+ FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/musrWiz-app.svg
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/scalable/apps
RENAME musrWiz.svg
)
diff --git a/src/musredit_qt5/musrWiz/icons/musrWiz-app.svg b/src/musredit_qt5/musrWiz/icons/musrWiz-app.svg
new file mode 100644
index 00000000..b77a1c15
--- /dev/null
+++ b/src/musredit_qt5/musrWiz/icons/musrWiz-app.svg
@@ -0,0 +1,12 @@
+
+
+
diff --git a/src/musredit_qt5/musredit/CMakeLists.txt b/src/musredit_qt5/musredit/CMakeLists.txt
index e71d6420..537b9519 100644
--- a/src/musredit_qt5/musredit/CMakeLists.txt
+++ b/src/musredit_qt5/musredit/CMakeLists.txt
@@ -143,12 +143,14 @@ if (UNIX AND NOT APPLE)
DESTINATION
${MUSRFIT_XDG_DATA_DIR}/applications
)
+ #--- the launcher icon sits on a light tile, so it reads on light and dark themes
install(
- FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/icons/musredit.png
- DESTINATION
- ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/48x48/apps
+ FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/musredit-app.svg
+ DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/scalable/apps
+ RENAME musredit.svg
)
+ #--- older versions installed a 48x48 png, which would win over the svg at that size
+ install(CODE "file(REMOVE \"\$ENV{DESTDIR}${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/48x48/apps/musredit.png\")")
endif (UNIX AND NOT APPLE)
#--- documentation installation info ------------------------------------------
diff --git a/src/musredit_qt5/musredit/icons/musredit-app.svg b/src/musredit_qt5/musredit/icons/musredit-app.svg
new file mode 100644
index 00000000..891c55ad
--- /dev/null
+++ b/src/musredit_qt5/musredit/icons/musredit-app.svg
@@ -0,0 +1,37 @@
+
+
+
diff --git a/src/musredit_qt6/mupp/CMakeLists.txt b/src/musredit_qt6/mupp/CMakeLists.txt
index 25181d8d..0113e30b 100644
--- a/src/musredit_qt6/mupp/CMakeLists.txt
+++ b/src/musredit_qt6/mupp/CMakeLists.txt
@@ -152,7 +152,7 @@ if (UNIX AND NOT APPLE)
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/applications
)
install(
- FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/mupp-plain.svg
+ FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/mupp-app.svg
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/scalable/apps
RENAME mupp.svg
)
diff --git a/src/musredit_qt6/mupp/icons/mupp-app.svg b/src/musredit_qt6/mupp/icons/mupp-app.svg
new file mode 100644
index 00000000..56b7a2a5
--- /dev/null
+++ b/src/musredit_qt6/mupp/icons/mupp-app.svg
@@ -0,0 +1,35 @@
+
+
+
diff --git a/src/musredit_qt6/musrStep/CMakeLists.txt b/src/musredit_qt6/musrStep/CMakeLists.txt
index adcdbac0..cba823ae 100644
--- a/src/musredit_qt6/musrStep/CMakeLists.txt
+++ b/src/musredit_qt6/musrStep/CMakeLists.txt
@@ -95,7 +95,7 @@ if (UNIX AND NOT APPLE)
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/applications
)
install(
- FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/musrStep-32x32.svg
+ FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/musrStep-app.svg
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/scalable/apps
RENAME musrStep.svg
)
diff --git a/src/musredit_qt6/musrStep/icons/musrStep-app.svg b/src/musredit_qt6/musrStep/icons/musrStep-app.svg
new file mode 100644
index 00000000..198deb4d
--- /dev/null
+++ b/src/musredit_qt6/musrStep/icons/musrStep-app.svg
@@ -0,0 +1,16 @@
+
+
+
diff --git a/src/musredit_qt6/musrWiz/CMakeLists.txt b/src/musredit_qt6/musrWiz/CMakeLists.txt
index 50e750f6..5dd919b8 100644
--- a/src/musredit_qt6/musrWiz/CMakeLists.txt
+++ b/src/musredit_qt6/musrWiz/CMakeLists.txt
@@ -99,7 +99,7 @@ if (UNIX AND NOT APPLE)
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/applications
)
install(
- FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/musrWiz-32x32.svg
+ FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/musrWiz-app.svg
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/scalable/apps
RENAME musrWiz.svg
)
diff --git a/src/musredit_qt6/musrWiz/icons/musrWiz-app.svg b/src/musredit_qt6/musrWiz/icons/musrWiz-app.svg
new file mode 100644
index 00000000..b77a1c15
--- /dev/null
+++ b/src/musredit_qt6/musrWiz/icons/musrWiz-app.svg
@@ -0,0 +1,12 @@
+
+
+
diff --git a/src/musredit_qt6/musredit/CMakeLists.txt b/src/musredit_qt6/musredit/CMakeLists.txt
index 6f7bfa59..9e8da314 100644
--- a/src/musredit_qt6/musredit/CMakeLists.txt
+++ b/src/musredit_qt6/musredit/CMakeLists.txt
@@ -144,12 +144,14 @@ if (UNIX AND NOT APPLE)
DESTINATION
${MUSRFIT_XDG_DATA_DIR}/applications
)
+ #--- the launcher icon sits on a light tile, so it reads on light and dark themes
install(
- FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/icons/musredit.png
- DESTINATION
- ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/48x48/apps
+ FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/musredit-app.svg
+ DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/scalable/apps
+ RENAME musredit.svg
)
+ #--- older versions installed a 48x48 png, which would win over the svg at that size
+ install(CODE "file(REMOVE \"\$ENV{DESTDIR}${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/48x48/apps/musredit.png\")")
endif (UNIX AND NOT APPLE)
#--- documentation installation info ------------------------------------------
diff --git a/src/musredit_qt6/musredit/icons/musredit-app.svg b/src/musredit_qt6/musredit/icons/musredit-app.svg
new file mode 100644
index 00000000..891c55ad
--- /dev/null
+++ b/src/musredit_qt6/musredit/icons/musredit-app.svg
@@ -0,0 +1,37 @@
+
+
+