diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-05-21 15:29:19 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-05-21 15:29:19 -0500 |
| commit | a93b2144e216afa7b6a61129929bc201ce58d6b1 (patch) | |
| tree | 5feadcf211b12bc34bf8a5359f0e4606ef3b8d82 /data | |
| parent | 12a756e980c71b80940a5a611e24645cf398d67e (diff) | |
| parent | b51315028eb616e966ca761e50c6b1114680c364 (diff) | |
| download | ayatana-indicator-datetime-a93b2144e216afa7b6a61129929bc201ce58d6b1.tar.gz ayatana-indicator-datetime-a93b2144e216afa7b6a61129929bc201ce58d6b1.tar.bz2 ayatana-indicator-datetime-a93b2144e216afa7b6a61129929bc201ce58d6b1.zip | |
merge lp:~charlesk/indicator-datetime/lp-833325 to have locations follow the sort order specified in https://wiki.ubuntu.com/TimeAndDate
Diffstat (limited to 'data')
| -rw-r--r-- | data/com.canonical.indicator.datetime.gschema.xml | 7 | ||||
| -rw-r--r-- | data/datetime-dialog.ui | 58 |
2 files changed, 64 insertions, 1 deletions
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> |