aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-01-27 11:02:40 -0600
committerCharles Kerr <charles.kerr@canonical.com>2014-01-27 11:02:40 -0600
commitef84548e3025184c4f631a23fceefb008dd6968b (patch)
tree84d25ec1d82475d7b10a7ab0fe4531cfdca3709e /data
parentf320760f20b282e9b2695477ab602d4041a3ada8 (diff)
parentad76159088202f6e4390843cfed6dd712b8e2544 (diff)
downloadayatana-indicator-datetime-ef84548e3025184c4f631a23fceefb008dd6968b.tar.gz
ayatana-indicator-datetime-ef84548e3025184c4f631a23fceefb008dd6968b.tar.bz2
ayatana-indicator-datetime-ef84548e3025184c4f631a23fceefb008dd6968b.zip
merge lp:~robert-ancell/indicator-datetime/unity-control-center2 into lp:indicator-datetime
Diffstat (limited to 'data')
-rw-r--r--data/CMakeLists.txt23
-rw-r--r--data/unity-datetime-panel.desktop.in13
2 files changed, 35 insertions, 1 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index ab393a7..a3360cb 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -72,7 +72,7 @@ if (BUILD_PANEL)
# the .ui file
install (FILES "datetime-dialog.ui"
- DESTINATION "${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}")
+ DESTINATION "${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/gnome-control-center")
# the .desktop file
set (DESKTOP_NAME "gnome-indicator-datetime-panel.desktop")
@@ -84,3 +84,24 @@ if (BUILD_PANEL)
DESTINATION "${CMAKE_INSTALL_DATADIR}/applications")
endif ()
+
+##
+## unity-control-center panel: .ui and .desktop files
+##
+
+if (BUILD_UNITY_PANEL)
+
+ # the .ui file
+ install (FILES "datetime-dialog.ui"
+ DESTINATION "${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/unity-control-center")
+
+ # the .desktop file
+ set (DESKTOP_NAME "unity-datetime-panel.desktop")
+ set (DESKTOP_FILE "${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_NAME}")
+ set (DESKTOP_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${DESKTOP_NAME}.in")
+ set (ENV{LC_ALL} "C")
+ execute_process (COMMAND intltool-merge -quiet --desktop-style --utf8 "${CMAKE_SOURCE_DIR}/po" "${DESKTOP_FILE_IN}" "${DESKTOP_FILE}")
+ install (FILES ${DESKTOP_FILE}
+ DESTINATION "${CMAKE_INSTALL_DATADIR}/applications")
+
+endif ()
diff --git a/data/unity-datetime-panel.desktop.in b/data/unity-datetime-panel.desktop.in
new file mode 100644
index 0000000..6e7b252
--- /dev/null
+++ b/data/unity-datetime-panel.desktop.in
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+_Name=Time & Date
+_Comment=Change your clock and date settings
+Icon=preferences-system-time
+TryExec=unity-control-center
+Exec=unity-control-center indicator-datetime
+StartupNotify=true
+Type=Application
+Categories=GNOME;GTK;Utility;DesktopSettings;Settings;X-GNOME-SystemSettings;X-Unity-Settings-Panel;
+X-Unity-Settings-Panel=indicator-datetime
+OnlyShowIn=Unity;
+X-Ubuntu-Gettext-Domain=indicator-datetime