From 50f1783714c3f2427d8c68c79f2103bb06377abb Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Tue, 11 Feb 2014 11:59:02 +1300 Subject: Move date/time panel into unity-control-center --- data/CMakeLists.txt | 43 -- data/datetime-dialog.ui | 864 ------------------------- data/gnome-indicator-datetime-panel.desktop.in | 13 - data/unity-datetime-panel.desktop.in | 13 - 4 files changed, 933 deletions(-) delete mode 100644 data/datetime-dialog.ui delete mode 100644 data/gnome-indicator-datetime-panel.desktop.in delete mode 100644 data/unity-datetime-panel.desktop.in (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index a3360cb..c45e1f9 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -62,46 +62,3 @@ set (UNITY_INDICATOR_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${UNITY_INDICATOR_NAME}") install (FILES "${UNITY_INDICATOR_FILE}" DESTINATION "${UNITY_INDICATOR_DIR}") - - -## -## gnome-control-center panel: .ui and .desktop files -## - -if (BUILD_PANEL) - - # the .ui file - install (FILES "datetime-dialog.ui" - DESTINATION "${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/gnome-control-center") - - # the .desktop file - set (DESKTOP_NAME "gnome-indicator-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 () - -## -## 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/datetime-dialog.ui b/data/datetime-dialog.ui deleted file mode 100644 index 6f74cd0..0000000 --- a/data/datetime-dialog.ui +++ /dev/null @@ -1,864 +0,0 @@ - - - - - - 1.8446744073709552e+19 - 86400 - 864000 - - - False - Locations - 300 - 200 - True - - - True - False - - - True - True - automatic - automatic - - - True - True - locationsStore - False - False - True - 0 - - - - - True - True - 0 - - - - - True - False - - - False - True - 1 - - - - - True - False - 4 - - - True - True - True - False - - - Add a Location… - - - - - True - False - gtk-add - - - - - False - True - 0 - - - - - True - True - True - False - - - Remove This Location - - - - - True - False - gtk-remove - - - - - False - True - 1 - - - - - Sort by _Name - False - True - True - True - False - True - - - - False - False - 6 - 2 - - - - - Sort by _Time - False - True - True - True - False - True - - - - False - False - 3 - - - - - False - True - 4 - 2 - - - - - - - - - - - - - - - - - - - - - 1.8446744073709552e+19 - 60 - 3600 - - - False - 5 - - - True - True - - - True - False - 12 - 6 - - - True - False - 12 - - - True - False - 6 - - - 265 - True - False - 0 - none - - - - - - True - True - 0 - - - - - True - False - 6 - - - True - False - 1 - _Location: - True - timezoneEntry - - - False - True - 0 - - - - - True - True - • - True - - - True - True - 1 - - - - - False - True - 1 - - - - - True - True - 0 - - - - - True - False - 2 - 2 - 6 - 6 - - - True - False - 6 - - - _Manually - True - True - False - False - True - 0 - True - True - - - False - True - 0 - - - - - _Automatically from the Internet - True - True - True - False - False - True - 0 - True - manualTimeRadio - - - False - True - 1 - - - - - 1 - 2 - - - - - True - False - 1 - Set the time: - - - GTK_FILL - GTK_FILL - - - - - True - False - 12 - - - True - False - 6 - - - True - True - • - 11 - 1 - True - timeAdjustment - - - False - True - 0 - - - - - False - True - 0 - - - - - True - False - 6 - - - True - False - 0 - _Date: - True - dateSpinner - - - False - True - 0 - - - - - True - True - • - 11 - 1 - True - dateAdjustment - - - False - True - 1 - - - - - False - True - 1 - - - - - 1 - 2 - 1 - 2 - - - - - True - False - 1 - Tim_e: - True - timeSpinner - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - False - True - 1 - - - - - True - True - end - 0 - - - - - - - - - - True - False - 1 - _Time & Date - True - - - False - - - - - True - False - 0 - 0 - - - True - False - 12 - 12 - - - _Show a clock in the menu bar - True - True - False - False - True - 0 - True - - - True - True - 0 - - - - - True - False - True - - - True - False - 6 - - - True - False - 0 - In the clock, show: - - - False - True - 0 - - - - - _Weekday - True - True - False - False - True - 0 - True - - - False - True - 1 - - - - - _Date and month - True - True - False - False - True - 0 - True - - - False - True - 2 - - - - - True - False - 0 - 0 - 0 - 24 - - - True - False - 6 - - - _Year - True - True - False - False - True - 0 - True - - - True - True - 0 - - - - - - - False - True - 3 - - - - - True - False - - - _12-hour time - True - True - False - False - True - 0 - True - True - - - False - True - 0 - - - - - _24-hour time - True - True - False - False - True - 0 - True - show12HourRadio - - - False - True - 1 - - - - - False - True - 4 - - - - - Seco_nds - True - True - False - False - True - 0 - True - - - False - True - 5 - - - - - True - True - 0 - - - - - True - False - 6 - - - True - False - 0 - In the clock’s menu, show: - - - True - True - 0 - - - - - _Monthly calendar - True - True - False - False - True - 0 - True - - - False - True - 1 - - - - - True - False - 0 - 0 - 0 - 24 - - - True - False - 6 - - - Include week num_bers - True - True - False - False - True - 0 - True - - - True - True - 0 - - - - - - - False - True - 2 - - - - - True - True - False - False - True - 0 - True - - - True - False - 0 - Coming _events from Evolution Calendar - True - True - showEventsCheck - - - - - False - True - 3 - - - - - Time in _auto-detected location - True - True - False - False - True - 0 - True - - - False - True - 4 - - - - - Time in _other locations - True - True - False - False - True - 0 - True - - - False - True - 5 - - - - - True - False - 0 - 0 - 0 - 0 - 24 - - - Choose _Locations… - True - True - True - False - True - 0 - - - - - True - True - 6 - - - - - True - True - 1 - - - - - True - True - 1 - - - - - - - 1 - False - - - - - True - False - _Clock - True - - - 1 - False - - - - - - - - - - - - - diff --git a/data/gnome-indicator-datetime-panel.desktop.in b/data/gnome-indicator-datetime-panel.desktop.in deleted file mode 100644 index b7202b4..0000000 --- a/data/gnome-indicator-datetime-panel.desktop.in +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Version=1.0 -_Name=Time & Date -_Comment=Change your clock and date settings -Icon=preferences-system-time -TryExec=gnome-control-center -Exec=gnome-control-center indicator-datetime -StartupNotify=true -Type=Application -Categories=GNOME;GTK;Utility;DesktopSettings;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel; -X-GNOME-Settings-Panel=indicator-datetime -OnlyShowIn=Unity; -X-Ubuntu-Gettext-Domain=indicator-datetime diff --git a/data/unity-datetime-panel.desktop.in b/data/unity-datetime-panel.desktop.in deleted file mode 100644 index f3f7c22..0000000 --- a/data/unity-datetime-panel.desktop.in +++ /dev/null @@ -1,13 +0,0 @@ -[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 datetime -StartupNotify=true -Type=Application -Categories=GNOME;GTK;Utility;DesktopSettings;Settings;X-GNOME-SystemSettings;X-Unity-Settings-Panel; -X-Unity-Settings-Panel=datetime -OnlyShowIn=Unity; -X-Ubuntu-Gettext-Domain=indicator-datetime -- cgit v1.2.3