diff options
author | 2011-08-03 09:46:45 +0000 | |
---|---|---|
committer | 2011-08-03 09:46:45 +0000 | |
commit | 274cb9cc3b54cb3f5a8410d75376d2d7f76fe8eb (patch) | |
tree | 6a4a8aae26bff94fe78b8846a88f7fb4fb8eebaf | |
parent | iw/timezone_gui.py: enhance custom_widget_handler (diff) | |
download | anaconda-274cb9cc3b54cb3f5a8410d75376d2d7f76fe8eb.tar.gz anaconda-274cb9cc3b54cb3f5a8410d75376d2d7f76fe8eb.tar.bz2 anaconda-274cb9cc3b54cb3f5a8410d75376d2d7f76fe8eb.zip |
iw/timezone_gui.py: revert to stock
-rw-r--r-- | iw/timezone_gui.py | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/iw/timezone_gui.py b/iw/timezone_gui.py index e61dba3..bfe8029 100644 --- a/iw/timezone_gui.py +++ b/iw/timezone_gui.py @@ -26,7 +26,6 @@ import gobject from scdate.core import zonetab import pango import sys -import gui from timezone_map_gui import TimezoneMap, Enum from iw_gui import * @@ -56,22 +55,21 @@ class TimezoneWindow(InstallWindow): self.zonetab = zonetab.ZoneTab() # Pull in a bunch of widgets. - (self.xml, self.vbox) = gui.getGladeWidget("timezone.glade", "tz_vbox") + self.xml = gtk.glade.XML("/usr/share/system-config-date/system-config-date.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) def custom_widget_handler(self, xml, function_name, widget_name, str1, str2, int1, int2): - try: - if hasattr(self, function_name): - handler = getattr(self, function_name) - return handler(str1, str2, int1, int2) - else: - # Lame. - return gtk.Label() - except: + if hasattr(self, function_name): + handler = getattr(self, function_name) + return handler(str1, str2, int1, int2) + else: + # Lame. return gtk.Label() def timezone_widget_create (self, str1, str2, int1, int2): @@ -107,7 +105,7 @@ class TimezoneWindow(InstallWindow): # TimezoneWindow tag="timezone" def getScreen(self, anaconda): - self.intf = anaconda.intf + self.intf = anaconda.intf self.timezone = anaconda.timezone (self.default, asUTC) = self.timezone.getTimezoneInfo() @@ -176,7 +174,6 @@ 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) |