Merge branch 'appcenter'

CMakeLists.txt

@@ -7,11 +7,12 @@ include (GNUInstallDirs)
 list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
 set (EXEC_NAME ${CMAKE_PROJECT_NAME})
-set (DATADIR "${CMAKE_INSALL_PREFIX}/share")
+set (DATADIR ${CMAKE_INSTALL_FULL_DATAROOTDIR})
 set (PKGDATADIR "${DATADIR}/${PROJECT_NAME}")
+set (PREFIX ${CMAKE_INSTALL_PREFIX})
 set (GETTEXT_PACKAGE ${CMAKE_PROJECT_NAME})
 set (RELEASE_NAME "Monitor")
-set (VERSION "0.2.6")
+set (VERSION "0.2.7")
 set (VERSION_INFO "Alpha")
 set (DOLLAR "$")
 
@@ -47,7 +48,11 @@ add_subdirectory (src)
 add_subdirectory (po)
 add_subdirectory (data)
 
-# install our .desktop file so the Applications menu will see it
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/com.github.stsdc.monitor.desktop DESTINATION /usr/share/applications/)
-# install our .appdata.xml file so AppCenter will see it
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/com.github.stsdc.monitor.appdata.xml DESTINATION /usr/share/metainfo/)
+# uninstall target
+configure_file (
+    "${CMAKE_SOURCE_DIR}/cmake/Uninstall.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/Uninstall.cmake"
+    IMMEDIATE @ONLY)
+
+add_custom_target (uninstall
+COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/Uninstall.cmake)

data/CMakeLists.txt

@@ -0,0 +1,13 @@
+# install our .desktop file so the Applications menu will see it
+install (FILES com.github.stsdc.monitor.desktop DESTINATION share/applications/)
+# install our .appdata.xml file so AppCenter will see it
+install (FILES com.github.stsdc.monitor.appdata.xml DESTINATION share/metainfo/)
+
+install (FILES icons/16/com.github.stsdc.monitor.svg DESTINATION share/icons/hicolor/16x16/apps)
+install (FILES icons/24/com.github.stsdc.monitor.svg DESTINATION share/icons/hicolor/24x24/apps)
+install (FILES icons/32/com.github.stsdc.monitor.svg DESTINATION share/icons/hicolor/32x32/apps)
+install (FILES icons/48/com.github.stsdc.monitor.svg DESTINATION share/icons/hicolor/48x48/apps)
+install (FILES icons/64/com.github.stsdc.monitor.svg DESTINATION share/icons/hicolor/64x64/apps)
+install (FILES icons/128/com.github.stsdc.monitor.svg DESTINATION share/icons/hicolor/128x128/apps)
+
+install (FILES icons/64/com.github.stsdc.monitor.svg DESTINATION share/icons/hicolor/scalable/apps)

data/com.github.stsdc.monitor.appdata.xml

@@ -13,4 +13,13 @@
      <value key="x-appcenter-color-primary-text">rgb(255, 255, 255)</value>
      <value key="x-appcenter-suggested-price">0</value>
   </custom>
+    <screenshots>
+    <screenshot type="default">
+      <image>https://github.com/stsdc/monitor/raw/master/data/com.github.stsdc.monitor.screenshot.png</image>
+    </screenshot>
+  </screenshots>
+  <developer_name>Stanisław Dac</developer_name>
+  <url type="homepage">https://github.com/stsdc/monitor</url>
+  <url type="bugtracker">https://github.com/stsdc/monitor/issues</url>
+<url type="help">https://github.com/stsdc/monitor/issues</url>
 </component>

data/com.github.stsdc.monitor.desktop

@@ -4,9 +4,9 @@ GenericName=System Monitor
 Comment=Manage processes and monitor resource usage of the system
 Categories=System;Utility;
 Exec=com.github.stsdc.monitor %U
-Icon=utilities-system-monitor
+Icon=com.github.stsdc.monitor
 Terminal=false
 Type=Application
 X-GNOME-Gettext-Domain=monitor
 Keywords=System monitor;System usage;Task manager;
-X-GNOME-UsesNotifications=true
+X-GNOME-UsesNotifications=false