aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.in39
-rw-r--r--data/com.canonical.indicator.datetime.gschema.xml7
-rw-r--r--data/datetime-dialog.ui58
3 files changed, 99 insertions, 5 deletions
diff --git a/data/Makefile.in b/data/Makefile.in
index d0f6e04..1cc50a7 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,6 +18,23 @@
#SUBDIRS = icons
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -62,6 +79,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -317,8 +339,11 @@ clean-libtool:
-rm -rf .libs _libs
install-dbus_servicesDATA: $(dbus_services_DATA)
@$(NORMAL_INSTALL)
- test -z "$(dbus_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(dbus_servicesdir)"
@list='$(dbus_services_DATA)'; test -n "$(dbus_servicesdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(dbus_servicesdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(dbus_servicesdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -335,8 +360,11 @@ uninstall-dbus_servicesDATA:
dir='$(DESTDIR)$(dbus_servicesdir)'; $(am__uninstall_files_from_dir)
install-desktopDATA: $(desktop_DATA)
@$(NORMAL_INSTALL)
- test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -353,8 +381,11 @@ uninstall-desktopDATA:
dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
diff --git a/data/com.canonical.indicator.datetime.gschema.xml b/data/com.canonical.indicator.datetime.gschema.xml
index 8ce75e6..4f831d5 100644
--- a/data/com.canonical.indicator.datetime.gschema.xml
+++ b/data/com.canonical.indicator.datetime.gschema.xml
@@ -85,6 +85,13 @@
Shows events from Evolution in indicator-datetime's menu.
</description>
</key>
+ <key name="show-auto-detected-location" type="b">
+ <default>false</default>
+ <summary>Show the auto-detected location in the indicator</summary>
+ <description>
+ Shows your current location (determined from geoclue and /etc/timezone) in indicator-datetime's menu.
+ </description>
+ </key>
<key name="show-locations" type="b">
<default>false</default>
<summary>Show locations in the indicator</summary>
diff --git a/data/datetime-dialog.ui b/data/datetime-dialog.ui
index f3110ec..2b4cf67 100644
--- a/data/datetime-dialog.ui
+++ b/data/datetime-dialog.ui
@@ -28,6 +28,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="model">locationsStore</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
<property name="reorderable">True</property>
<property name="search_column">0</property>
</object>
@@ -54,6 +56,7 @@
<object class="GtkHBox" id="hbox10">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">4</property>
<child>
<object class="GtkButton" id="addButton">
<property name="visible">True</property>
@@ -104,10 +107,46 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkButton" id="sortByNameButton">
+ <property name="label" translatable="yes">Sort by _Name</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <accelerator key="n" signal="clicked" modifiers="GDK_MOD1_MASK"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">6</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="sortByTimeButton">
+ <property name="label" translatable="yes">Sort by _Time</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <accelerator key="t" signal="clicked" modifiers="GDK_MOD1_MASK"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">4</property>
<property name="position">2</property>
</packing>
</child>
@@ -679,6 +718,23 @@
</packing>
</child>
<child>
+ <object class="GtkCheckButton" id="showDetectedCheck">
+ <property name="label" translatable="yes">Time in _auto-detected location</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkCheckButton" id="showLocationsCheck">
<property name="label" translatable="yes">Time in _other locations</property>
<property name="visible">True</property>
@@ -719,7 +775,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">6</property>
</packing>
</child>
</object>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 08:06:13 +0000