Merge branch 'master' of git+ssh://git.fedoraproject.org/git/hosted/anaconda

6 files changed, 21 insertions, 9 deletions

diff --git a/iw/account_gui.py b/iw/account_gui.py
index 942f34900..a3860bb09 100644
--- a/iw/account_gui.py
+++ b/iw/account_gui.py
@@ -121,7 +121,7 @@ class AccountWindow (InstallWindow):
                                           _("Weak password provided: %s"
                                             "\n\n"
                                             "Would you like to continue with "
-                                            "this password?" % (msg, )),
+                                            "this password?") % (msg, ),
                                           type = "yesno")
             if ret == 0:
                 self.passwordError()
diff --git a/iw/bootloader_main_gui.py b/iw/bootloader_main_gui.py
index 6696769e7..8ab9c5e14 100644
--- a/iw/bootloader_main_gui.py
+++ b/iw/bootloader_main_gui.py
@@ -107,6 +107,7 @@ class MainBootloaderWindow(InstallWindow):
         (dxml, dialog) = gui.getGladeWidget("blwhere.glade",
                                             "blwhereDialog")
         gui.addFrame(dialog)
+        dialog.set_transient_for(self.parent)
         dialog.show()
 
         choices = anaconda.id.fsset.bootloaderChoices(anaconda.id.diskset,
diff --git a/iw/network_gui.py b/iw/network_gui.py
index bdd5a34d5..ba72d2e77 100644
--- a/iw/network_gui.py
+++ b/iw/network_gui.py
@@ -558,7 +558,8 @@ class NetworkWindow(InstallWindow):
 class NetworkDeviceEditWindow:
     def __init__(self, netwin):
         self.netwin = netwin
-        self.xml = gtk.glade.XML(gui.findGladeFile('netpostconfig.glade'))
+        self.xml = gtk.glade.XML(gui.findGladeFile('netpostconfig.glade'),
+                                 domain='anaconda')
 
         # Pull in a ton of widgets.
         self.toplevel = self.xml.get_widget("net_post_config_win")
diff --git a/iw/partition_gui.py b/iw/partition_gui.py
index 0b84eac8c..7014a17ae 100644
--- a/iw/partition_gui.py
+++ b/iw/partition_gui.py
@@ -365,7 +365,7 @@ class DiskTreeModel(gtk.TreeStore):
     
     # format: column header, type, x alignment, hide?, visibleKey
     titles = ((N_("Device"), gobject.TYPE_STRING, 0.0, 0, 0),
-              (N_("Label"), gobject.TYPE_STRING, 0.0, 0, 0),
+              (N_("Label"), gobject.TYPE_STRING, 0.0, 1, 0),
               (N_("Mount Point"), gobject.TYPE_STRING, 0.0, 0, isLeaf),
               (N_("Type"), gobject.TYPE_STRING, 0.0, 0, 0),
 #              (N_("Format"), gobject.TYPE_BOOLEAN, 0.5, 0, isFormattable),
diff --git a/iw/progress_gui.py b/iw/progress_gui.py
index 6395cb645..b0f15fa35 100644
--- a/iw/progress_gui.py
+++ b/iw/progress_gui.py
@@ -135,7 +135,7 @@ class InstallProgressWindow (InstallWindow):
             box.add(self.adpix)
             self.adbox = box
             frame.add(box)
-            vbox.pack_start(frame);
+            vbox.pack_start(frame, False)
 
 
 	self.progress = gtk.ProgressBar()
diff --git a/iw/timezone_gui.py b/iw/timezone_gui.py
index 2efc8b3fa..e1135304a 100644
--- a/iw/timezone_gui.py
+++ b/iw/timezone_gui.py
@@ -27,7 +27,7 @@ import zonetab
 import pango
 import sys
 
-from timezone_map_gui import TimezoneMap
+from timezone_map_gui import TimezoneMap, Enum
 from rhpl.translate import _, textdomain
 from iw_gui import *
 from bootloaderInfo import dosFilesystems
@@ -110,6 +110,10 @@ class TimezoneWindow(InstallWindow):
         return self.vbox
 
 class AnacondaTZMap(TimezoneMap):
+    def __init__(self, zonetab, default, map="", viewportWidth=480):
+        TimezoneMap.__init__(self, zonetab, default, map=map, viewportWidth=viewportWidth)
+        self.columns = Enum("TRANSLATED", "TZ", "ENTRY")
+
     def status_bar_init(self):
         self.status = None
 
@@ -130,11 +134,12 @@ class AnacondaTZMap(TimezoneMap):
                     # York as the default.
                     self.fallbackEntry = entry
 
-            iter = self.tzStore.insert_after(iter, [_(entry.tz), entry.tz])
+            iter = self.tzStore.insert_after(iter, [_(entry.tz), entry.tz, entry])
 
     def timezone_list_init (self, default):
         self.hbox = gtk.HBox()
-        self.tzStore = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
+        self.tzStore = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING,
+                                     gobject.TYPE_PYOBJECT)
 
         root = self.canvas.root()
 
@@ -155,8 +160,13 @@ class AnacondaTZMap(TimezoneMap):
 
     def selectionChanged(self, widget, *args):
         iter = widget.get_active_iter()
-        entry = self.zonetab.findEntryByTZ(widget.get_model().get_value(iter, 1))
-        self.setCurrent(entry)
+        if iter is None:
+            return
+        entry = widget.get_model().get_value(iter, self.columns.ENTRY)
+        if entry:
+            self.setCurrent (entry, skipList=1)
+            if entry.long != None and entry.lat != None:
+                self.move_to (entry.long, entry.lat)
 
     def updateTimezoneList(self):
         # Find the currently selected item in the combo box and update both