Merge lp:~elementary-pantheon/switchboard-plug-display/add-desktop into lp:~elementary-apps/switchboard-plug-display/trunk

[Danielle Foré]

add .desktop file

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-07-30 00:58:06 +0000
+++ CMakeLists.txt	2015-05-21 17:33:20 +0000
@@ -31,6 +31,11 @@
 add_definitions (-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
 add_definitions (-DGNOME_DESKTOP_USE_UNSTABLE_API)
 
+# Files
+file (GLOB resources "${CMAKE_CURRENT_SOURCE_DIR}/data/*")
+
+install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-plug-display.desktop" DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
+
 # Add 'make dist' command for creating release tarball
 set (CPACK_PACKAGE_VERSION ${VERSION})
 set (CPACK_SOURCE_GENERATOR "TGZ")
@@ -42,4 +47,4 @@
 # Traslation stuff
 add_subdirectory (po)
 
-add_subdirectory(src)
\ No newline at end of file
+add_subdirectory(src)

=== added directory 'data'
=== added file 'data/pantheon-plug-display.desktop'
--- data/pantheon-plug-display.desktop	1970-01-01 00:00:00 +0000
+++ data/pantheon-plug-display.desktop	2015-05-21 17:33:20 +0000
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Displays
+Comment=Change resolution and position of monitors and projectors
+Exec=switchboard -o hardware-pantheon-display
+Icon=preferences-desktop-display
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=X-PANTHEON-Switchboard-Plugs;
+OnlyShowIn=Pantheon;
+Keywords=displays;monitor;projector;resolution;rotation;
+X-GNOME-Gettext-Domain=switchboard