Fix the WrappingLabel class so it actually wraps text. Cleaned up UI

elements on the bootloader configuration screen so elements no longer
disappear off the bottom of the screen in certain languages (#153071,
#154786).

6 files changed, 19 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 9e8bbd719..71024a7aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-04-14  Chris Lumens  <clumens@redhat.com>
+
+	* gui.py (growToParent):  Make WrappingLabel wrap (#153071, #154786).
+	* iw/examine_gui.py (UpgradeExamineWindow.getScreen):  Don't indent
+	the upgrade selection box so much.
+	* iw/blpasswidget.py (BootloaderPasswordWidget.__init__):  Don't set
+	alignment internally in case this gets wrapped in another alignment.
+	* iw/bootloader_main_gui.py (MainBootloaderWindow.getScreen):  Fix
+	left alignment on all widgets.
+	* iw/osbootwidget.py (OSBootWidget.__init__):  Don't set alignment
+	internally in case this gets wrapped in another alignment.
+
 2005-04-14  Jeremy Katz  <katzj@redhat.com>
 
 	* hdrlist.py (EverythingExclude): Add kernel-xen?-devel too (#154819)
diff --git a/gui.py b/gui.py
index ac945c5a4..2611c08f7 100755
--- a/gui.py
+++ b/gui.py
@@ -254,7 +254,6 @@ def widgetExpander(widget, growTo=None):
     widget.connect("size-allocate", growToParent, growTo)
 
 def growToParent(widget, rect, growTo=None):
-    return
     if not widget.parent:
         return
     ignore = widget.__dict__.get("ignoreEvents")
diff --git a/iw/blpasswidget.py b/iw/blpasswidget.py
index 985cf6cbf..a1b823982 100644
--- a/iw/blpasswidget.py
+++ b/iw/blpasswidget.py
@@ -52,14 +52,11 @@ class BootloaderPasswordWidget:
         self.setPassLabel()
             
         box = gtk.HBox(False, 5)
-        box.pack_start(self.usePassCb)
-        box.pack_start(self.passButton)
+        box.pack_start(self.usePassCb, False)
+        box.pack_start(self.passButton, False)
         vbox.pack_start(box, False)
 
-        alignment = gtk.Alignment()
-        alignment.set(0.1, 0, 0, 0)
-        alignment.add(vbox)
-        self.widget = alignment
+        self.widget = vbox
 
     def getWidget(self):
         return self.widget
diff --git a/iw/bootloader_main_gui.py b/iw/bootloader_main_gui.py
index 5d411ac8d..5a4c76252 100644
--- a/iw/bootloader_main_gui.py
+++ b/iw/bootloader_main_gui.py
@@ -171,7 +171,8 @@ class MainBootloaderWindow(InstallWindow):
             self.usePass = 0
             self.password = None
 
-        thebox = gtk.VBox (False, 10)
+        thebox = gtk.VBox (False, 5)
+        thebox.set_border_width(10)
         spacer = gtk.Label("")
         spacer.set_size_request(10, 1)
         thebox.pack_start(spacer, False)
@@ -205,11 +206,7 @@ class MainBootloaderWindow(InstallWindow):
         hbox.pack_start(button, False)
         button.connect("clicked", self.changeBootloaderCallback)
 
-        alignment = gtk.Alignment()
-        alignment.set(0.1, 0, 0, 0)
-        alignment.add(hbox)
-        
-        thebox.pack_start(alignment, False)
+        thebox.pack_start(hbox, False)
 
         spacer = gtk.Label("")
         spacer.set_size_request(10, 1)
@@ -242,5 +239,3 @@ class MainBootloaderWindow(InstallWindow):
         self.updateBootLoaderLabel()
 
         return thebox
-        
-
diff --git a/iw/examine_gui.py b/iw/examine_gui.py
index 286c3bdae..7a7505306 100644
--- a/iw/examine_gui.py
+++ b/iw/examine_gui.py
@@ -161,10 +161,6 @@ class UpgradeExamineWindow (InstallWindow):
 	# hack indent it
 	upbox = gtk.HBox(False)
 
-	crackhbox = gtk.HBox(False)
-	crackhbox.set_size_request(70, -1)
-
-	upbox.pack_start(crackhbox, False, False)
 #	upbox.pack_start(upboxtmp, True, True)
 	upbox.pack_start(upboxtmp, False, False)
 
diff --git a/iw/osbootwidget.py b/iw/osbootwidget.py
index af8bc8e65..2a0b0108d 100644
--- a/iw/osbootwidget.py
+++ b/iw/osbootwidget.py
@@ -108,10 +108,7 @@ class OSBootWidget:
 
         self.vbox.pack_start(box, False)
 
-        alignment = gtk.Alignment()
-        alignment.set(0.1, 0, 0, 0)
-        alignment.add(self.vbox)
-        self.widget = alignment
+        self.widget = self.vbox
 
     def setIllegalChars(self):
         # illegal characters for boot loader labels