Tweak the timezone window

2 files changed, 65 insertions, 3 deletions

diff --git a/iw/timezone_gui.py b/iw/timezone_gui.py
index 0e96069..cf91ce6 100644
--- a/iw/timezone_gui.py
+++ b/iw/timezone_gui.py
@@ -55,10 +55,9 @@ class TimezoneWindow(InstallWindow):
         self.zonetab = zonetab.ZoneTab()
 
         # Pull in a bunch of widgets.
-        self.xml = gtk.glade.XML("/usr/share/system-config-date/system-config-date.glade", domain="system-config-date")
+        self.xml = gtk.glade.XML("timezone.glade", domain="system-config-date")
         self.vbox = self.xml.get_widget("tz_vbox")
         self.utcCheckbox = self.xml.get_widget("utc_check")
-        self.notebook = self.xml.get_widget("notebook")
 
         ics.setTitle(_("Time Zone Selection"))
         ics.setNextEnabled(1)
@@ -80,7 +79,7 @@ class TimezoneWindow(InstallWindow):
         ratio = float(p_w)/p_h
         screen_x, screen_y = self.ics.cw.window.get_size()
         screen_x -= 80
-        screen_y -= 300
+        screen_y -= 200
         p_w -= 80
 
         if screen_x < p_w:
@@ -174,6 +173,7 @@ class AnacondaTZMap(TimezoneMap):
         self.tzCombo.add_attribute(cell, 'text', 0)
         self.tzCombo.connect("changed", self.selectionChanged)
         self.hbox.pack_start(self.tzCombo, False, False)
+        self.hbox.pack_start(self.utcCheckbox, False, False)
 
         self.pack_start(self.hbox, False, False)
 
diff --git a/ui/timezone.glade b/ui/timezone.glade
new file mode 100644
index 0000000..fc03a36
--- /dev/null
+++ b/ui/timezone.glade
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glade-interface>
+  <!-- interface-requires gtk+ 2.6 -->
+  <!-- interface-naming-policy toplevel-contextual -->
+  <widget class="GtkWindow" id="window">
+    <property name="can_focus">False</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Date/Time Properties</property>
+    <property name="default_width">400</property>
+    <property name="default_height">550</property>
+    <child>
+      <widget class="GtkVBox" id="tz_vbox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">6</property>
+        <property name="spacing">5</property>
+        <child>
+          <widget class="GtkLabel" id="tzActionLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Please select the nearest city in your time zone:</property>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Custom" id="tz">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+          </widget>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkCheckButton" id="utc_check">
+            <property name="label" translatable="yes">_System clock uses UTC</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="has_tooltip">True</property>
+            <property name="tooltip" translatable="yes" comments="The times are called &quot;winter time&quot; and &quot;summer time&quot; in some localities.">Use this if you want to automatically switch between normal and daylight savings time. Don't use this if you have other operating systems on this computer which adjust the hardware clock to achieve this, e.g. Microsoft Windows(tm).</property>
+            <property name="use_action_appearance">False</property>
+            <property name="use_underline">True</property>
+            <property name="draw_indicator">True</property>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+</glade-interface>