| 1 |
commit: 274cb9cc3b54cb3f5a8410d75376d2d7f76fe8eb |
| 2 |
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net> |
| 3 |
AuthorDate: Wed Aug 3 09:46:45 2011 +0000 |
| 4 |
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net> |
| 5 |
CommitDate: Wed Aug 3 09:46:45 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=274cb9cc |
| 7 |
|
| 8 |
iw/timezone_gui.py: revert to stock |
| 9 |
|
| 10 |
--- |
| 11 |
iw/timezone_gui.py | 21 +++++++++------------ |
| 12 |
1 files changed, 9 insertions(+), 12 deletions(-) |
| 13 |
|
| 14 |
diff --git a/iw/timezone_gui.py b/iw/timezone_gui.py |
| 15 |
index e61dba3..bfe8029 100644 |
| 16 |
--- a/iw/timezone_gui.py |
| 17 |
+++ b/iw/timezone_gui.py |
| 18 |
@@ -26,7 +26,6 @@ import gobject |
| 19 |
from scdate.core import zonetab |
| 20 |
import pango |
| 21 |
import sys |
| 22 |
-import gui |
| 23 |
|
| 24 |
from timezone_map_gui import TimezoneMap, Enum |
| 25 |
from iw_gui import * |
| 26 |
@@ -56,22 +55,21 @@ class TimezoneWindow(InstallWindow): |
| 27 |
self.zonetab = zonetab.ZoneTab() |
| 28 |
|
| 29 |
# Pull in a bunch of widgets. |
| 30 |
- (self.xml, self.vbox) = gui.getGladeWidget("timezone.glade", "tz_vbox") |
| 31 |
+ self.xml = gtk.glade.XML("/usr/share/system-config-date/system-config-date.glade", domain="system-config-date") |
| 32 |
+ self.vbox = self.xml.get_widget("tz_vbox") |
| 33 |
self.utcCheckbox = self.xml.get_widget("utc_check") |
| 34 |
+ self.notebook = self.xml.get_widget("notebook") |
| 35 |
|
| 36 |
ics.setTitle(_("Time Zone Selection")) |
| 37 |
ics.setNextEnabled(1) |
| 38 |
|
| 39 |
def custom_widget_handler(self, xml, function_name, widget_name, str1, str2, |
| 40 |
int1, int2): |
| 41 |
- try: |
| 42 |
- if hasattr(self, function_name): |
| 43 |
- handler = getattr(self, function_name) |
| 44 |
- return handler(str1, str2, int1, int2) |
| 45 |
- else: |
| 46 |
- # Lame. |
| 47 |
- return gtk.Label() |
| 48 |
- except: |
| 49 |
+ if hasattr(self, function_name): |
| 50 |
+ handler = getattr(self, function_name) |
| 51 |
+ return handler(str1, str2, int1, int2) |
| 52 |
+ else: |
| 53 |
+ # Lame. |
| 54 |
return gtk.Label() |
| 55 |
|
| 56 |
def timezone_widget_create (self, str1, str2, int1, int2): |
| 57 |
@@ -107,7 +105,7 @@ class TimezoneWindow(InstallWindow): |
| 58 |
|
| 59 |
# TimezoneWindow tag="timezone" |
| 60 |
def getScreen(self, anaconda): |
| 61 |
- self.intf = anaconda.intf |
| 62 |
+ self.intf = anaconda.intf |
| 63 |
self.timezone = anaconda.timezone |
| 64 |
(self.default, asUTC) = self.timezone.getTimezoneInfo() |
| 65 |
|
| 66 |
@@ -176,7 +174,6 @@ class AnacondaTZMap(TimezoneMap): |
| 67 |
self.tzCombo.add_attribute(cell, 'text', 0) |
| 68 |
self.tzCombo.connect("changed", self.selectionChanged) |
| 69 |
self.hbox.pack_start(self.tzCombo, False, False) |
| 70 |
- self.hbox.pack_start(self.utcCheckbox, False, False) |
| 71 |
|
| 72 |
self.pack_start(self.hbox, False, False) |
Archives