diff --git a/CMakeLists.txt b/CMakeLists.txt index e15b280a..76724acb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,7 @@ if (UNIX AND NOT APPLE) else () set(xdg_datadir_default "/usr/local/share") endif () - set(MUSRFIT_XDG_DATADIR "${xdg_datadir_default}" CACHE PATH + set(MUSRFIT_XDG_DATA_DIR "${xdg_datadir_default}" CACHE PATH "where the .desktop files and icons are installed (must be in the XDG search path)") endif (UNIX AND NOT APPLE) diff --git a/ChangeLog b/ChangeLog index 68e88c05..4229b26f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,7 +18,7 @@ Changes since V1.12.1 (not yet released) New features / improvements: musrview, musrFT, musrt0: show their own window/dock icon instead of the generic ROOT one (on macOS set via Cocoa). The .desktop files and icons (incl. musredit) -are now installed to MUSRFIT_XDG_DATADIR, which defaults to the prefix share for +are now installed to MUSRFIT_XDG_DATA_DIR, which defaults to the prefix share for /usr and /usr/local, ~/.local/share for prefixes under $HOME, and /usr/local/share otherwise. msr2data: the number of threads to be used can be passed on to musrfit from the @@ -49,8 +49,8 @@ Tests: Add an LSCO ZF asymmetry example (ROOT-NPP, LEM) to the ctests. musrFT, musrt0 and mupp_plot show their own window/dock icon instead of the -generic ROOT one. On Linux, matching .desktop files and icons are installed to -MUSRFIT_XDG_DATA_DIR. +generic ROOT one (on macOS set via Cocoa). On Linux, matching .desktop files and +icons are installed to MUSRFIT_XDG_DATA_DIR. Release of V1.12.1, 2026/08/25 ============================== diff --git a/cmake/mupp.desktop.in b/cmake/mupp.desktop.in new file mode 100644 index 00000000..00981278 --- /dev/null +++ b/cmake/mupp.desktop.in @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=mupp +Comment=muSR parameter plotter +GenericName=musrfit parameter plotter +Exec=@CMAKE_INSTALL_FULL_BINDIR@/mupp +Icon=mupp +Terminal=false +Type=Application +StartupWMClass=mupp +Categories=Science;Physics;DataVisualization; +Keywords=muSR;fitting;musrfit;physics;muon; diff --git a/cmake/musrStep.desktop.in b/cmake/musrStep.desktop.in new file mode 100644 index 00000000..7953ac48 --- /dev/null +++ b/cmake/musrStep.desktop.in @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=musrStep +Comment=set the initial step sizes of an msr-file +GenericName=musrfit step size tool +Exec=@CMAKE_INSTALL_FULL_BINDIR@/musrStep %f +Icon=musrStep +Terminal=false +Type=Application +StartupWMClass=musrStep +Categories=Science;Physics; +Keywords=muSR;fitting;musrfit;physics;muon; diff --git a/cmake/musrWiz.desktop.in b/cmake/musrWiz.desktop.in new file mode 100644 index 00000000..ead2cc78 --- /dev/null +++ b/cmake/musrWiz.desktop.in @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=musrWiz +Comment=wizard to create msr-files for musrfit +GenericName=musrfit msr-file wizard +Exec=@CMAKE_INSTALL_FULL_BINDIR@/musrWiz +Icon=musrWiz +Terminal=false +Type=Application +StartupWMClass=musrWiz +Categories=Science;Physics; +Keywords=muSR;fitting;musrfit;physics;muon; diff --git a/cmake/musrfit-root6.spec.in b/cmake/musrfit-root6.spec.in index 50f2e6fd..5f787307 100644 --- a/cmake/musrfit-root6.spec.in +++ b/cmake/musrfit-root6.spec.in @@ -102,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/48x48/apps/musrt0.png %{_datadir}/applications/mupp_plot.desktop %{_datadir}/icons/hicolor/48x48/apps/mupp_plot.png +%{_datadir}/icons/hicolor/512x512/apps/mupp_plot.png %_prefix/share/musrfit diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f3578b00..d8c43635 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -189,19 +189,19 @@ if (UNIX AND NOT APPLE) ${CMAKE_SOURCE_DIR}/cmake/musrFT.desktop ${CMAKE_SOURCE_DIR}/cmake/musrt0.desktop DESTINATION - ${MUSRFIT_XDG_DATADIR}/applications + ${MUSRFIT_XDG_DATA_DIR}/applications ) install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/classes/icons/musrview.svg DESTINATION - ${MUSRFIT_XDG_DATADIR}/icons/hicolor/scalable/apps + ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/scalable/apps ) install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/classes/icons/musrview-512.png DESTINATION - ${MUSRFIT_XDG_DATADIR}/icons/hicolor/512x512/apps + ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/512x512/apps RENAME musrview.png ) @@ -210,11 +210,11 @@ if (UNIX AND NOT APPLE) ${CMAKE_CURRENT_SOURCE_DIR}/classes/icons/musrFT.png ${CMAKE_CURRENT_SOURCE_DIR}/classes/icons/musrt0.png DESTINATION - ${MUSRFIT_XDG_DATADIR}/icons/hicolor/48x48/apps + ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/48x48/apps ) #--- a stale icon cache would hide the new icons, hence refresh an existing one install(CODE " - set(icon_dir \"\$ENV{DESTDIR}${MUSRFIT_XDG_DATADIR}/icons/hicolor\") + set(icon_dir \"\$ENV{DESTDIR}${MUSRFIT_XDG_DATA_DIR}/icons/hicolor\") find_program(GTK_UPDATE_ICON_CACHE gtk-update-icon-cache) if (GTK_UPDATE_ICON_CACHE AND EXISTS \"\${icon_dir}/icon-theme.cache\") execute_process(COMMAND \${GTK_UPDATE_ICON_CACHE} -q -t -f \"\${icon_dir}\") diff --git a/src/musredit_qt5/mupp/CMakeLists.txt b/src/musredit_qt5/mupp/CMakeLists.txt index 5d5d8475..40a1de3a 100644 --- a/src/musredit_qt5/mupp/CMakeLists.txt +++ b/src/musredit_qt5/mupp/CMakeLists.txt @@ -126,3 +126,22 @@ if (APPLE) else (APPLE) install(TARGETS mupp DESTINATION ${CMAKE_INSTALL_BINDIR}) endif (APPLE) + +#--- Linux: the .desktop file (named after the executable, i.e. the Wayland +#--- app-id) and the icon let the desktop show the musrfit icon for mupp. --- +if (UNIX AND NOT APPLE) + configure_file( + ${CMAKE_SOURCE_DIR}/cmake/mupp.desktop.in + ${CMAKE_CURRENT_BINARY_DIR}/mupp.desktop + @ONLY + ) + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/mupp.desktop + DESTINATION ${MUSRFIT_XDG_DATA_DIR}/applications + ) + install( + FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/mupp-plain.svg + DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/scalable/apps + RENAME mupp.svg + ) +endif () diff --git a/src/musredit_qt5/mupp/plotter/CMakeLists.txt b/src/musredit_qt5/mupp/plotter/CMakeLists.txt index fd3dc84f..7883a7d0 100644 --- a/src/musredit_qt5/mupp/plotter/CMakeLists.txt +++ b/src/musredit_qt5/mupp/plotter/CMakeLists.txt @@ -63,7 +63,12 @@ set(DICT ) #--- define executable -------------------------------------------------------- -add_executable(mupp_plot ${SOURCE} ${DICT}) +#--- on macOS the Dock icon cannot be set through ROOT, hence the Cocoa helper +#--- shared with musrview/musrFT/musrt0 is compiled in as well ---------------- +add_executable(mupp_plot + ${SOURCE} ${DICT} + $<$:${CMAKE_SOURCE_DIR}/src/classes/PMacDockIcon.mm> +) #--- add all needed include directories --------------------------------------- target_include_directories(mupp_plot @@ -73,10 +78,14 @@ target_include_directories(mupp_plot ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. + $<$:${CMAKE_SOURCE_DIR}/src/include> ) #--- define all to be linked libs --------------------------------------------- target_link_libraries(mupp_plot ${ROOT_LIBRARIES}) +if (APPLE) + target_link_libraries(mupp_plot "-framework Cocoa") +endif (APPLE) #--- install ------------------------------------------------------------------ if (APPLE) @@ -102,6 +111,11 @@ if (UNIX AND NOT APPLE) FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/mupp_plot.png DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/48x48/apps ) + install( + FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/mupp_plot-512.png + DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/512x512/apps + RENAME mupp_plot.png + ) #--- a stale icon cache would hide the new icon, hence refresh an existing one install(CODE " set(icon_dir \"\$ENV{DESTDIR}${MUSRFIT_XDG_DATA_DIR}/icons/hicolor\") diff --git a/src/musredit_qt5/mupp/plotter/PMuppCanvas.cpp b/src/musredit_qt5/mupp/plotter/PMuppCanvas.cpp index ef7d9a38..52fd07f6 100644 --- a/src/musredit_qt5/mupp/plotter/PMuppCanvas.cpp +++ b/src/musredit_qt5/mupp/plotter/PMuppCanvas.cpp @@ -45,6 +45,10 @@ #include "PMuppCanvas.h" #include "icons/mupp_plot_icon.xpm" +#ifdef __APPLE__ +#include "PMacDockIcon.h" +#include "icons/mupp_plot_icon_png.h" +#endif static const char *gFiletypes[] = { "Data files", "*.dat", "All files", "*", @@ -247,6 +251,11 @@ void PMuppCanvas::InitMuppCanvas(const Char_t *title, Int_t wtopx, Int_t wtopy, // replace the generic ROOT window icon; the class hint lets the desktop match mupp_plot.desktop fImp->SetIconPixmap(const_cast(mupp_plot_icon_xpm)); fImp->SetClassHints("mupp_plot", "mupp_plot"); +#ifdef __APPLE__ + // on macOS, TGCocoa::SetIconPixmap()/SetClassHints() above are no-ops: the Dock icon + // is process-wide and must be set via NSApplication instead + SetMacDockIcon(mupp_plot_icon_png, mupp_plot_icon_png_len); +#endif fImp->Connect("CloseWindow()", "PMuppCanvas", this, "WindowClosed()"); fBar = fImp->GetMenuBar(); fPopupMain = fBar->AddPopup("&Mupp"); diff --git a/src/musredit_qt5/mupp/plotter/icons/mupp_plot-512.png b/src/musredit_qt5/mupp/plotter/icons/mupp_plot-512.png new file mode 100644 index 00000000..adcfd757 Binary files /dev/null and b/src/musredit_qt5/mupp/plotter/icons/mupp_plot-512.png differ diff --git a/src/musredit_qt5/mupp/plotter/icons/mupp_plot.png b/src/musredit_qt5/mupp/plotter/icons/mupp_plot.png index 25854e0b..c1e9e8b7 100644 Binary files a/src/musredit_qt5/mupp/plotter/icons/mupp_plot.png and b/src/musredit_qt5/mupp/plotter/icons/mupp_plot.png differ diff --git a/src/musredit_qt5/mupp/plotter/icons/mupp_plot_icon.xpm b/src/musredit_qt5/mupp/plotter/icons/mupp_plot_icon.xpm index 998b41af..cf8893c1 100644 --- a/src/musredit_qt5/mupp/plotter/icons/mupp_plot_icon.xpm +++ b/src/musredit_qt5/mupp/plotter/icons/mupp_plot_icon.xpm @@ -1,89 +1,115 @@ /* XPM */ static const char *mupp_plot_icon_xpm[] = { /* columns rows colors chars-per-pixel */ -"64 64 19 1 ", -" c black", -". c #D94352", -"X c #D94353", -"o c #DA4352", -"O c #DB4352", -"+ c #DA4353", -"@ c #D94453", -"# c #D94553", -"$ c #DA4452", -"% c #DB4452", -"& c #DA4552", -"* c #DB4552", -"= c #DA4453", -"- c #DB4453", -"; c #DA4553", -": c #DB4354", -"> c #DA4454", -", c #DA4554", -"< c None", +"64 64 45 1 ", +" c #010101", +". c #161616", +"X c #222222", +"o c #383838", +"O c #575757", +"+ c #464646", +"@ c #6A6A6A", +"# c #787878", +"$ c #9A9A9A", +"% c #9A9A9A", +"& c #9A9A9A", +"* c #DA4554", +"= c #DC515F", +"- c #DE5A67", +"; c #DF616E", +": c #E16874", +"> c #E2727D", +", c #E05F6C", +"< c #E47883", +"1 c #828282", +"2 c #9A9A9A", +"3 c #9A9A9A", +"4 c #A5A5A5", +"5 c #BABABA", +"6 c #9A9A9A", +"7 c #E68792", +"8 c #E88B94", +"9 c #EB9DA5", +"0 c #EDA6AD", +"q c #EEADB4", +"w c #F0B6BB", +"e c #F2BCC1", +"r c #CDCDCD", +"t c #DADADA", +"y c #F3C5C9", +"u c #F7D5D9", +"i c #F5CDD1", +"p c #E8E8E8", +"a c #FAE7E9", +"s c #FFFFFF", +"d c #F8DFE1", +"f c #9A9A9A", +"g c #9A9A9A", +"h c None", +"j c #9A9A9A", /* pixels */ -"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<", -"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<", -"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<", -"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<===<<<<", -"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<===<<<<", -"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<===<<<<", -"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<===<<<<", -"<<< <<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<====<<<", -"<<< <<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<*****8ssssss=*ysssssy>7ssssssssss3 .5sssssssssssssss22", +"22sssssssssss0*:sssssa**0sssssq*-sssssssssstX @ssssssssssssss22", +"22sssssssssss0*:ssssu-***0ssssq*-ssssssssssspO +pssssssssssss22", +"22sssssssssss9*-ssss,*****usss0*-sssssssssssss4 .5sssssssssss22", +"22ssssssssss0***>asa******9ss0***>asssssssssssstX @ssssssssss22", +"22sssssssssy*****7sa******0si**********ds8******sssssssssssssss2 .5sssssss22", +"22sssssssss7******ssa:***ess8******sssssssssssssss@ otsssssss22", +"22ssssssssse*****usssssq*-ssssssssssspo Osssssssssssss22", +"22sssssssssss0*:ssssssssssssssq*-ssssssssss4. .4ssssssssssssss22", +"22sssssssssssw- + + + + + + dYYYY/tdc/root/deltat_tdc_flame_YYYY_NNNN + PIM3 + MUSR-ROOT + + 8 + 30 + 100000 + 100 1300 + + + + + + + + + 8 + 30 + 100000 + 100 1300 + + + + 8 + 30 + 100000 + 100 1300 + + + + + + + + + + dYYYY/tdc/root/deltat_tdc_vms_YYYY_NNNN + PIE1 + MUSR-ROOT + + 8 + 30 + 100000 + 100 1300 + + + + + + 8 + 30 + 100000 + 100 1300 + + + + + + + + + 8 + 30 + 100000 + 100 1300 + + + + 8 + 30 + 100000 + 100 1300 + + + + + + + + + dYYYY/tdc/deltat_tdc_gpd_NNNN + MUE1 + PSI-BIN + + 2 + 5 + 7990 + 60 150 + + + + + + 2 + 5 + 7990 + 60 150 + + + + 2 + 5 + 7990 + 60 150 + + + diff --git a/src/musredit_qt5/musredit/CMakeLists.txt b/src/musredit_qt5/musredit/CMakeLists.txt index b8cbb961..e71d6420 100644 --- a/src/musredit_qt5/musredit/CMakeLists.txt +++ b/src/musredit_qt5/musredit/CMakeLists.txt @@ -141,13 +141,13 @@ if (UNIX AND NOT APPLE) FILES ${CMAKE_SOURCE_DIR}/cmake/musredit.desktop DESTINATION - ${MUSRFIT_XDG_DATADIR}/applications + ${MUSRFIT_XDG_DATA_DIR}/applications ) install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/musredit.png DESTINATION - ${MUSRFIT_XDG_DATADIR}/icons/hicolor/48x48/apps + ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/48x48/apps ) endif (UNIX AND NOT APPLE) diff --git a/src/musredit_qt6/mupp/CMakeLists.txt b/src/musredit_qt6/mupp/CMakeLists.txt index 05f9b55a..25181d8d 100644 --- a/src/musredit_qt6/mupp/CMakeLists.txt +++ b/src/musredit_qt6/mupp/CMakeLists.txt @@ -138,3 +138,22 @@ if (APPLE) else (APPLE) install(TARGETS mupp DESTINATION ${CMAKE_INSTALL_BINDIR}) endif (APPLE) + +#--- Linux: the .desktop file (named after the executable, i.e. the Wayland +#--- app-id) and the icon let the desktop show the musrfit icon for mupp. --- +if (UNIX AND NOT APPLE) + configure_file( + ${CMAKE_SOURCE_DIR}/cmake/mupp.desktop.in + ${CMAKE_CURRENT_BINARY_DIR}/mupp.desktop + @ONLY + ) + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/mupp.desktop + DESTINATION ${MUSRFIT_XDG_DATA_DIR}/applications + ) + install( + FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/mupp-plain.svg + DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/scalable/apps + RENAME mupp.svg + ) +endif () diff --git a/src/musredit_qt6/mupp/plotter/CMakeLists.txt b/src/musredit_qt6/mupp/plotter/CMakeLists.txt index ad0efb11..a42652ec 100644 --- a/src/musredit_qt6/mupp/plotter/CMakeLists.txt +++ b/src/musredit_qt6/mupp/plotter/CMakeLists.txt @@ -63,7 +63,12 @@ set(DICT ) #--- define executable -------------------------------------------------------- -add_executable(mupp_plot ${SOURCE} ${DICT}) +#--- on macOS the Dock icon cannot be set through ROOT, hence the Cocoa helper +#--- shared with musrview/musrFT/musrt0 is compiled in as well ---------------- +add_executable(mupp_plot + ${SOURCE} ${DICT} + $<$:${CMAKE_SOURCE_DIR}/src/classes/PMacDockIcon.mm> +) #--- add all needed include directories --------------------------------------- target_include_directories(mupp_plot @@ -73,10 +78,14 @@ target_include_directories(mupp_plot ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. + $<$:${CMAKE_SOURCE_DIR}/src/include> ) #--- define all to be linked libs --------------------------------------------- target_link_libraries(mupp_plot ${ROOT_LIBRARIES}) +if (APPLE) + target_link_libraries(mupp_plot "-framework Cocoa") +endif (APPLE) #--- install ------------------------------------------------------------------ if (APPLE) @@ -102,6 +111,11 @@ if (UNIX AND NOT APPLE) FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/mupp_plot.png DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/48x48/apps ) + install( + FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/mupp_plot-512.png + DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/512x512/apps + RENAME mupp_plot.png + ) #--- a stale icon cache would hide the new icon, hence refresh an existing one install(CODE " set(icon_dir \"\$ENV{DESTDIR}${MUSRFIT_XDG_DATA_DIR}/icons/hicolor\") diff --git a/src/musredit_qt6/mupp/plotter/PMuppCanvas.cpp b/src/musredit_qt6/mupp/plotter/PMuppCanvas.cpp index f98c16a7..7f9035cc 100644 --- a/src/musredit_qt6/mupp/plotter/PMuppCanvas.cpp +++ b/src/musredit_qt6/mupp/plotter/PMuppCanvas.cpp @@ -68,6 +68,10 @@ #include "PMuppCanvas.h" #include "icons/mupp_plot_icon.xpm" +#ifdef __APPLE__ +#include "PMacDockIcon.h" +#include "icons/mupp_plot_icon_png.h" +#endif static const char *gFiletypes[] = { "Data files", "*.dat", "All files", "*", @@ -278,6 +282,11 @@ void PMuppCanvas::InitMuppCanvas(const Char_t *title, Int_t wtopx, Int_t wtopy, // replace the generic ROOT window icon; the class hint lets the desktop match mupp_plot.desktop fImp->SetIconPixmap(const_cast(mupp_plot_icon_xpm)); fImp->SetClassHints("mupp_plot", "mupp_plot"); +#ifdef __APPLE__ + // on macOS, TGCocoa::SetIconPixmap()/SetClassHints() above are no-ops: the Dock icon + // is process-wide and must be set via NSApplication instead + SetMacDockIcon(mupp_plot_icon_png, mupp_plot_icon_png_len); +#endif fImp->Connect("CloseWindow()", "PMuppCanvas", this, "WindowClosed()"); fBar = fImp->GetMenuBar(); fPopupMain = fBar->AddPopup("&Mupp"); diff --git a/src/musredit_qt6/mupp/plotter/icons/mupp_plot-512.png b/src/musredit_qt6/mupp/plotter/icons/mupp_plot-512.png new file mode 100644 index 00000000..adcfd757 Binary files /dev/null and b/src/musredit_qt6/mupp/plotter/icons/mupp_plot-512.png differ diff --git a/src/musredit_qt6/mupp/plotter/icons/mupp_plot.png b/src/musredit_qt6/mupp/plotter/icons/mupp_plot.png index 25854e0b..c1e9e8b7 100644 Binary files a/src/musredit_qt6/mupp/plotter/icons/mupp_plot.png and b/src/musredit_qt6/mupp/plotter/icons/mupp_plot.png differ diff --git a/src/musredit_qt6/mupp/plotter/icons/mupp_plot_icon.xpm b/src/musredit_qt6/mupp/plotter/icons/mupp_plot_icon.xpm index 998b41af..cf8893c1 100644 --- a/src/musredit_qt6/mupp/plotter/icons/mupp_plot_icon.xpm +++ b/src/musredit_qt6/mupp/plotter/icons/mupp_plot_icon.xpm @@ -1,89 +1,115 @@ /* XPM */ static const char *mupp_plot_icon_xpm[] = { /* columns rows colors chars-per-pixel */ -"64 64 19 1 ", -" c black", -". c #D94352", -"X c #D94353", -"o c #DA4352", -"O c #DB4352", -"+ c #DA4353", -"@ c #D94453", -"# c #D94553", -"$ c #DA4452", -"% c #DB4452", -"& c #DA4552", -"* c #DB4552", -"= c #DA4453", -"- c #DB4453", -"; c #DA4553", -": c #DB4354", -"> c #DA4454", -", c #DA4554", -"< c None", +"64 64 45 1 ", +" c #010101", +". c #161616", +"X c #222222", +"o c #383838", +"O c #575757", +"+ c #464646", +"@ c #6A6A6A", +"# c #787878", +"$ c #9A9A9A", +"% c #9A9A9A", +"& c #9A9A9A", +"* c #DA4554", +"= c #DC515F", +"- c #DE5A67", +"; c #DF616E", +": c #E16874", +"> c #E2727D", +", c #E05F6C", +"< c #E47883", +"1 c #828282", +"2 c #9A9A9A", +"3 c #9A9A9A", +"4 c #A5A5A5", +"5 c #BABABA", +"6 c #9A9A9A", +"7 c #E68792", +"8 c #E88B94", +"9 c #EB9DA5", +"0 c #EDA6AD", +"q c #EEADB4", +"w c #F0B6BB", +"e c #F2BCC1", +"r c #CDCDCD", +"t c #DADADA", +"y c #F3C5C9", +"u c #F7D5D9", +"i c #F5CDD1", +"p c #E8E8E8", +"a c #FAE7E9", +"s c #FFFFFF", +"d c #F8DFE1", +"f c #9A9A9A", +"g c #9A9A9A", +"h c None", +"j c #9A9A9A", /* pixels */ -"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<", -"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<", -"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<", -"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<===<<<<", -"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<===<<<<", -"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<===<<<<", -"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<===<<<<", -"<<< <<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<====<<<", -"<<< <<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<*****8ssssss=*ysssssy>7ssssssssss3 .5sssssssssssssss22", +"22sssssssssss0*:sssssa**0sssssq*-sssssssssstX @ssssssssssssss22", +"22sssssssssss0*:ssssu-***0ssssq*-ssssssssssspO +pssssssssssss22", +"22sssssssssss9*-ssss,*****usss0*-sssssssssssss4 .5sssssssssss22", +"22ssssssssss0***>asa******9ss0***>asssssssssssstX @ssssssssss22", +"22sssssssssy*****7sa******0si**********ds8******sssssssssssssss2 .5sssssss22", +"22sssssssss7******ssa:***ess8******sssssssssssssss@ otsssssss22", +"22ssssssssse*****usssssq*-ssssssssssspo Osssssssssssss22", +"22sssssssssss0*:ssssssssssssssq*-ssssssssss4. .4ssssssssssssss22", +"22sssssssssssw- + + + + + + dYYYY/tdc/root/deltat_tdc_flame_YYYY_NNNN + PIM3 + MUSR-ROOT + + 8 + 30 + 100000 + 100 1300 + + + + + + + + + 8 + 30 + 100000 + 100 1300 + + + + 8 + 30 + 100000 + 100 1300 + + + + + + + + + + dYYYY/tdc/root/deltat_tdc_vms_YYYY_NNNN + PIE1 + MUSR-ROOT + + 8 + 30 + 100000 + 100 1300 + + + + + + 8 + 30 + 100000 + 100 1300 + + + + + + + + + 8 + 30 + 100000 + 100 1300 + + + + 8 + 30 + 100000 + 100 1300 + + + + + + + + + dYYYY/tdc/deltat_tdc_gpd_NNNN + MUE1 + PSI-BIN + + 2 + 5 + 7990 + 60 150 + + + + + + 2 + 5 + 7990 + 60 150 + + + + 2 + 5 + 7990 + 60 150 + + + diff --git a/src/musredit_qt6/musredit/CMakeLists.txt b/src/musredit_qt6/musredit/CMakeLists.txt index c9a2a9c1..6f7bfa59 100644 --- a/src/musredit_qt6/musredit/CMakeLists.txt +++ b/src/musredit_qt6/musredit/CMakeLists.txt @@ -142,13 +142,13 @@ if (UNIX AND NOT APPLE) FILES ${CMAKE_SOURCE_DIR}/cmake/musredit.desktop DESTINATION - ${MUSRFIT_XDG_DATADIR}/applications + ${MUSRFIT_XDG_DATA_DIR}/applications ) install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/musredit.png DESTINATION - ${MUSRFIT_XDG_DATADIR}/icons/hicolor/48x48/apps + ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/48x48/apps ) endif (UNIX AND NOT APPLE)