diff --git a/CMakeLists.txt b/CMakeLists.txt index b203365..cdab8fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,5 +66,13 @@ endif() install(TARGETS tenmon) if(UNIX) - install(SCRIPT install.cmake) + find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu) + find_program(XDG-ICON-RESOURCE_EXECUTABLE xdg-icon-resource) + if(XDG-DESKTOP-MENU_EXECUTABLE) + execute_process(COMMAND ${XDG-DESKTOP-MENU_EXECUTABLE} install --novendor org.nou.tenmon.desktop WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) + execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 32 icon.png org.nou.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) + else() + install(FILES org.nou.tenmon.desktop DESTINATION "$ENV{FLATPAK_DEST}/usr/share/applications") + install(FILES org.nou.tenmon.png DESTINATION "$ENV{FLATPAK_DEST}/usr/share/icons/hicolor/32x32/apps") + endif() endif(UNIX) diff --git a/install.cmake b/install.cmake deleted file mode 100644 index 48ce9da..0000000 --- a/install.cmake +++ /dev/null @@ -1,4 +0,0 @@ -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 org.nou.tenmon.desktop WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) -execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 32 icon.png org.nou.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) diff --git a/main.cpp b/main.cpp index 2f08282..63bf42f 100644 --- a/main.cpp +++ b/main.cpp @@ -14,7 +14,7 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); a.setOrganizationName("nou"); a.setApplicationName("Tenmon"); - a.setWindowIcon(QIcon(":/icon.png")); + a.setWindowIcon(QIcon(":/org.nou.tenmon.png")); MainWindow w; w.show(); diff --git a/icon.png b/org.nou.tenmon.png similarity index 100% rename from icon.png rename to org.nou.tenmon.png diff --git a/resources.qrc b/resources.qrc index bd89ab2..07ebf27 100644 --- a/resources.qrc +++ b/resources.qrc @@ -6,9 +6,9 @@ thumb.vert - icon.png invert.png nuke.png bayer.png + org.nou.tenmon.png