Mostly-mostly working timezone config. good enough for now.

1 files changed, 100 insertions, 69 deletions

diff --git a/iw/timezone.py b/iw/timezone.py
index 35b287dee..053a7c784 100644
--- a/iw/timezone.py
+++ b/iw/timezone.py
@@ -1,5 +1,6 @@
 from gtk import *
 from iw import *
+import string
 from gnome.ui import GnomeCanvas
 from gui import _
 
@@ -29,54 +30,68 @@ class TimezoneWindow (InstallWindow):
         ics.setTitle (_("Time Zone Selection"))
         ics.setNextEnabled (1)
         ics.readHTML ("timezone")
-
-	self.timeZones = ("-12:00",
-                          "-11:00",
-                          "-10:00",
-                          "-09:30",
-                          "-09:00",
-                          "-08:30",
-                          "-08:00",
-                          "-07:00",
-                          "-06:00",
-                          "-05:00",
-                          "-04:00",
-                          "-03:30",
-                          "-03:00",
-                          "-02:00",
-                          "-01:00",
-                          "",
-                          "+01:00",
-                          "+02:00",
-                          "+03:00",
-                          "+03:30",
-                          "+04:00",
-                          "+04:30",
-                          "+05:00",
-                          "+05:30",
-                          "+06:00",
-                          "+06:30",
-                          "+07:00",
-                          "+08:00",
-                          "+09:00",
-                          "+09:30",
-                          "+10:00",
-                          "+10:30",
-                          "+11:00",
-                          "+11:30",
-                          "+12:00",
-                          "+13:00",
-                          "+14:00")
+        self.old_page = 0
+        self.old_ulist_row = 15 # default to UTC row
+        self.old_use_dst = 0
+
+	self.timeZones = ((("-12:00", ""), ("UTC-12:00", "UTC-12:00")),
+                          (("-11:00", ""), ("UTC-11:00", "UTC-11:00")),
+                          (("-10:00", ""), ("UTC-10:00", "UTC-10:00")),
+                          (("-09:30", ""), ("UTC-09:30", "UTC-09:30")),
+                          (("-09:00", ""), ("UTC-09:00", "UTC-09:00")),
+                          (("-08:30", ""), ("UTC-08:30", "UTC-08:30")),
+                          (("-08:00", "US Pacific"),  ("UTC-08:00", "America/Los_Angeles")),
+                          (("-07:00", "US Mountain"), ("UTC-07:00", "America/Denver")),
+                          (("-06:00", "US Central"),  ("UTC-06:00", "America/Chicago")),
+                          (("-05:00", "US Eastern"),  ("UTC-05:00", "America/New_York")),
+                          (("-04:00", ""), ("UTC-04:00", "UTC-04:00")),
+                          (("-03:30", ""), ("UTC-03:30", "UTC-03:30")),
+                          (("-03:00", ""), ("UTC-03:00", "UTC-03:00")),
+                          (("-02:00", ""), ("UTC-02:00", "UTC-02:00")),
+                          (("-01:00", ""), ("UTC-01:00", "UTC-01:00")),
+                          (("",       ""), ("UTC", "UTC")),
+                          (("+01:00", ""), ("UTC+01:00", "UTC+01:00")),
+                          (("+02:00", ""), ("UTC+02:00", "UTC+02:00")),
+                          (("+03:00", ""), ("UTC+03:00", "UTC+03:00")),
+                          (("+03:30", ""), ("UTC+03:30", "UTC+03:30")),
+                          (("+04:00", ""), ("UTC+04:00", "UTC+04:00")),
+                          (("+04:30", ""), ("UTC+04:30", "UTC+04:30")),
+                          (("+05:00", ""), ("UTC+05:00", "UTC+05:00")),
+                          (("+05:30", ""), ("UTC+05:30", "UTC+05:30")),
+                          (("+06:00", ""), ("UTC+06:00", "UTC+06:00")),
+                          (("+06:30", ""), ("UTC+06:30", "UTC+06:30")),
+                          (("+07:00", ""), ("UTC+07:00", "UTC+07:00")),
+                          (("+08:00", ""), ("UTC+08:00", "UTC+08:00")),
+                          (("+09:00", ""), ("UTC+09:00", "UTC+09:00")),
+                          (("+09:30", ""), ("UTC+09:30", "UTC+09:30")),
+                          (("+10:00", ""), ("UTC+10:00", "UTC+10:00")),
+                          (("+10:30", ""), ("UTC+10:30", "UTC+10:30")),
+                          (("+11:00", ""), ("UTC+11:00", "UTC+11:00")),
+                          (("+11:30", ""), ("UTC+11:30", "UTC+11:30")),
+                          (("+12:00", ""), ("UTC+12:00", "UTC+12:00")),
+                          (("+13:00", ""), ("UTC+13:00", "UTC+13:00")),
+                          (("+14:00", ""), ("UTC+14:00", "UTC+14:00")))
                     
 
     def getNext (self):
-	if self.__dict__.has_key('list'):
-	    self.todo.setTimezoneInfo (self.list.get_text (self.list.selection[0], 0),
-				       self.systemUTC.get_active ())
-        return None
+	if not self.__dict__.has_key('list'): return None
 
-    def fixUp (self):
-	pass
+        self.old_page = self.nb.get_current_page ()
+        self.old_ulist_row = self.ulist.selection[0]
+        self.old_use_dst = self.daylightCB.get_active ()
+        
+        if (self.old_page == 0):
+            self.todo.setTimezoneInfo (self.list.get_text (self.list.selection[0], 0),
+                                       self.systemUTC.get_active ())
+        else:
+            timezone = self.timeZones[self.ulist.selection[0]][1]
+            if self.daylightCB.get_active ():
+                timezone = timezone[1]
+            else:
+                timezone = timezone[0]
+            self.todo.setTimezoneInfo (timezone, self.systemUTC.get_active ())
+
+        return None
 
     def copy_toggled (self, cb1, cb2):
         if cb1.get_data ("toggling"): return
@@ -84,16 +99,12 @@ class TimezoneWindow (InstallWindow):
         cb2.set_data ("toggling", 1)
         cb2.set_active (cb1.get_active ())
         cb2.set_data ("toggling", 0)
-        
-    def switchPage (self, nb, page, page_num, *args):
-        if page_num == 1:
-            self.systemUTC.reparent (self.p2_align)
-#            self.p1_align.remove (self.systemUTC)
-#            self.p2_align.add (self.systemUTC)
-        elif self.systemUTC["parent"] == self.p2_align:
-            self.systemUTC.reparent (self.p1_align)
-#            self.p2_align.remove (self.systemUTC)
-#            self.p1_align.add (self.systemUTC)
+
+    def view_change (self, widget, *args):
+        if not self.list.selection:
+            self.ics.setNextEnabled (FALSE)
+        else:
+            self.ics.setNextEnabled (TRUE)
 
     def getScreen (self):
         try:
@@ -105,6 +116,7 @@ class TimezoneWindow (InstallWindow):
             path = "/usr/share/anaconda/map480.png"
         
 	nb = GtkNotebook ()
+        self.nb = nb
 
         mainBox = GtkVBox (FALSE, 5)
 
@@ -121,12 +133,22 @@ class TimezoneWindow (InstallWindow):
 	    self.default = "America/New_York"
 	    asUTC = 0
 
-	self.list.connect ("draw", lambda widget, area, self=self: 
-	                             self.tz.setcurrent (self.default))
+        if (string.find (self.default, "UTC") != -1):
+            self.default = "America/New_York"
+
+        self.list.connect ("draw", lambda widget, area, self=self: 
+                           self.tz.setcurrent (self.default))
+        self.nb.connect ("realize", lambda widget, self=self:
+                         self.nb.set_page (self.old_page))
 
         status = Status (tz.statusbar)
         views = Option (tz.views)
 
+
+        for menu_item in views.get_menu ().children ():
+            menu_item.connect ("activate", self.view_change)
+            
+
         label = GtkLabel (_("View:"))
         hbox = GtkHBox (FALSE, 5)
         hbox.pack_start (label, FALSE)
@@ -136,10 +158,7 @@ class TimezoneWindow (InstallWindow):
         self.p1_align = align
 
         systemUTCCopy = GtkCheckButton (_("System clock uses UTC"))
-        systemUTCCopy.toggling = 0
-
         self.systemUTC = GtkCheckButton (_("System clock uses UTC"))
-        self.systemUTC.toggling = 0
 
         systemUTCCopy.connect ("toggled", self.copy_toggled, self.systemUTC)
         self.systemUTC.connect ("toggled", self.copy_toggled, systemUTCCopy)
@@ -173,20 +192,23 @@ class TimezoneWindow (InstallWindow):
 	tzBox = GtkVBox (FALSE)
         sw = GtkScrolledWindow ()
         sw.set_policy (POLICY_AUTOMATIC, POLICY_AUTOMATIC)
-	list = GtkCList (1)
-        list.set_selection_mode (SELECTION_BROWSE)
-        list.freeze ()
+	self.ulist = GtkCList (2)
+        self.ulist.connect ("draw", lambda widget, area, self=self:
+                            self.ulist.moveto (self.old_ulist_row))
+        self.ulist.set_selection_mode (SELECTION_BROWSE)
+        self.ulist.freeze ()
         for zone in self.timeZones:
-            list.append (("UTC %s" % (zone,),))
-        list.columns_autosize ()
-        list.thaw ()
-        list.select_row (15, 0)
-        sw.add (list)
+            self.ulist.append (("UTC%s" % (zone[0][0],), zone[0][1]))
+        self.ulist.columns_autosize ()
+        self.ulist.thaw ()
+        self.ulist.select_row (self.old_ulist_row, 0)
+        sw.add (self.ulist)
         tzBox.pack_start (sw)
         box = GtkHBox (FALSE)
         align = GtkAlignment (0.5, 0.5)
-        daylightCB = GtkCheckButton (_("Use Daylight Saving Time"))
-        align.add (daylightCB)
+        self.daylightCB = GtkCheckButton (_("Use Daylight Saving Time (US only)"))
+        self.daylightCB.set_active (self.old_use_dst)
+        align.add (self.daylightCB)
         box.pack_start (align, FALSE)
 
         align = GtkAlignment (1.0, 0.5)
@@ -201,6 +223,15 @@ class TimezoneWindow (InstallWindow):
 	nb.append_page (mainBox, GtkLabel (_("Location")))
         nb.append_page (tzBox, GtkLabel (_("UTC Offset")))
 
+        def switch_page (widget, page, page_num, self=self):
+            if page_num == 1:
+                self.ics.setNextEnabled (TRUE)
+            else:
+                self.view_change (None)
+                
+        nb.connect ("switch_page", switch_page)
+        self.list.connect ("select_row", self.view_change)
+        
         box = GtkVBox (FALSE, 5)
         box.pack_start (nb)
 #        self.systemUTC = GtkCheckButton (_("System clock uses UTC"))