From da61c2a69e259b029c39a6deb0f65217d90e73e4 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 17 May 2012 15:46:42 -0500
Subject: Add the "Time in auto-detected location" setting described in
 https://wiki.ubuntu.com/TimeAndDate

---
 data/com.canonical.indicator.datetime.gschema.xml |  7 +++++++
 data/datetime-dialog.ui                           | 19 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

(limited to 'data')

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..3b777fc 100644
--- a/data/datetime-dialog.ui
+++ b/data/datetime-dialog.ui
@@ -678,6 +678,23 @@
                             <property name="position">3</property>
                           </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>
@@ -719,7 +736,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>
-- 
cgit v1.2.3