From 8c6b451564a7b15ea5b5d7ba7ed6411fbb7160c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Poizl?= Date: Sat, 17 Aug 2024 16:46:04 +0200 Subject: [PATCH] Suggestion by Der_Pit --- CMakeLists.txt | 4 ++-- README | 13 ++++++++----- about/tenmon | 2 +- install.cmake | 6 +++--- main.cpp | 2 +- resources/resources.qrc | 8 ++++---- ...uspiro.tenmon.png => space.nouspiro-tenmon.png} | Bin ...enmon_128.png => space.nouspiro-tenmon_128.png} | Bin ...tenmon.desktop => space.nouspiro-tenmon.desktop | 2 +- space.nouspiro.tenmon.metainfo.xml | 2 +- 10 files changed, 21 insertions(+), 18 deletions(-) rename resources/{space.nouspiro.tenmon.png => space.nouspiro-tenmon.png} (100%) rename resources/{space.nouspiro.tenmon_128.png => space.nouspiro-tenmon_128.png} (100%) rename space.nouspiro.tenmon.desktop => space.nouspiro-tenmon.desktop (88%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c727415..eed48fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -105,8 +105,8 @@ if(UNIX AND NOT APPLE) install(SCRIPT install.cmake) else() install(FILES space.nouspiro.tenmon.desktop DESTINATION "${CMAKE_INSTALL_DATADIR}/applications") - install(FILES resources/space.nouspiro.tenmon.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps") - install(FILES resources/space.nouspiro.tenmon_128.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps" RENAME space.nouspiro.tenmon.png) + install(FILES resources/space.nouspiro-tenmon.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps") + install(FILES resources/space.nouspiro-tenmon_128.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps" RENAME space.nouspiro-tenmon.png) endif() install(FILES space.nouspiro.tenmon.metainfo.xml DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo") endif(UNIX AND NOT APPLE) diff --git a/README b/README index e8895bf..d88013c 100644 --- a/README +++ b/README @@ -2,22 +2,25 @@ FITS/XISF image viewer with multithreaded image loading To get all dependencies install these packages - sudo apt install qt6-base-dev qt6-declarative-dev libqt6opengl6-dev libraw-dev libexif-dev libcfitsio-dev libgsl-dev wcslib-dev cmake + sudo apt install qt6-base-dev qt6-declarative-dev libqt6opengl6-dev libraw-dev libexif-dev libcfitsio-dev libgsl-dev wcslib-dev cmake libzstd-dev on OpenSUSE - sudo zypper install gsl-devel exif-devel libraw-devel wcslib-devel libqt6-qtbase-devel + sudo zypper install gsl-devel libexif-devel libraw-devel wcslib-devel qt6-base-devel qt6-qml-devel libzstd-devel MacOS X -To compile on MacOS install XCode first. Then install homebrew in x86_64 mode -with "arch -i x86_64". Building on native ARM is not supported. +To compile on MacOS install XCode first. Then install homebrew. homebrew install qt6 libraw cfitsio libexif libgsl wcslib You may need to set CMAKE_PREFIX_PATH for Qt6 so CMake can find them. -Then to build run standard cmake +First run this command to get libXISF updated + + git submodule update --init --recursive + +Then to build run standard cmake sequence cmake -B build -S . cmake --build build diff --git a/about/tenmon b/about/tenmon index 84e6f91..cbfa644 100644 --- a/about/tenmon +++ b/about/tenmon @@ -1,5 +1,5 @@ - +

Tenmon

Tenmon is FITS/XISF image viewer and converter. It also index FITS keywords.
v@GITVERSION@ Copyright © 2022 Dušan Poizl

diff --git a/install.cmake b/install.cmake index fb78fc9..3aecfc6 100644 --- a/install.cmake +++ b/install.cmake @@ -1,5 +1,5 @@ find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu) find_program(XDG-ICON-RESOURCE_EXECUTABLE xdg-icon-resource) -execute_process(COMMAND ${XDG-DESKTOP-MENU_EXECUTABLE} install --novendor space.nouspiro.tenmon.desktop WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) -execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 64 resources/space.nouspiro.tenmon.png space.nouspiro.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) -execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 128 resources/space.nouspiro.tenmon_128.png space.nouspiro.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) +execute_process(COMMAND ${XDG-DESKTOP-MENU_EXECUTABLE} install space.nouspiro-tenmon.desktop WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) +execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --size 64 resources/space.nouspiro-tenmon.png space.nouspiro-tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) +execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --size 128 resources/space.nouspiro-tenmon_128.png space.nouspiro-tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) diff --git a/main.cpp b/main.cpp index 381feb0..36fdc0e 100644 --- a/main.cpp +++ b/main.cpp @@ -21,7 +21,7 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); a.setOrganizationName("nou"); a.setApplicationName("Tenmon"); - a.setWindowIcon(QIcon(":/space.nouspiro.tenmon.png")); + a.setWindowIcon(QIcon(":/space.nouspiro-tenmon.png")); QTranslator translator; QTranslator translator2; diff --git a/resources/resources.qrc b/resources/resources.qrc index 5737b4a..ead97ca 100644 --- a/resources/resources.qrc +++ b/resources/resources.qrc @@ -3,7 +3,6 @@ invert.png nuke.png bayer.png - space.nouspiro.tenmon.png nuke_a.png ../about/tenmon ../translations/tenmon_en.qm @@ -16,14 +15,15 @@ bggr.png grbg.png gbrg.png + space.nouspiro-tenmon.png - + ../about/help_en - + ../about/help_sk - + ../about/help_fr diff --git a/resources/space.nouspiro.tenmon.png b/resources/space.nouspiro-tenmon.png similarity index 100% rename from resources/space.nouspiro.tenmon.png rename to resources/space.nouspiro-tenmon.png diff --git a/resources/space.nouspiro.tenmon_128.png b/resources/space.nouspiro-tenmon_128.png similarity index 100% rename from resources/space.nouspiro.tenmon_128.png rename to resources/space.nouspiro-tenmon_128.png diff --git a/space.nouspiro.tenmon.desktop b/space.nouspiro-tenmon.desktop similarity index 88% rename from space.nouspiro.tenmon.desktop rename to space.nouspiro-tenmon.desktop index 0249660..4f9c153 100644 --- a/space.nouspiro.tenmon.desktop +++ b/space.nouspiro-tenmon.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Exec=tenmon %U -Icon=space.nouspiro.tenmon +Icon=space.nouspiro-tenmon Comment=FITS Image viewer Name=Tenmon Categories=Graphics;2DGraphics;RasterGraphics;Viewer;Science;Astronomy diff --git a/space.nouspiro.tenmon.metainfo.xml b/space.nouspiro.tenmon.metainfo.xml index fc40cc9..4e614ec 100644 --- a/space.nouspiro.tenmon.metainfo.xml +++ b/space.nouspiro.tenmon.metainfo.xml @@ -1,7 +1,7 @@ space.nouspiro.tenmon - space.nouspiro.tenmon.desktop + space.nouspiro-tenmon.desktop Tenmon FITS/XISF image viewer, converter, index and search