Fixed UI problems: kill the big empty box on the congrats screen (which I

caused when I did the help button enable/disable dance) and let the
buttons on the button bar grow for lengthy translations.

4 files changed, 55 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index e7258d4d1..3e98a9e14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-03-16  Chris Lumens  <clumens@redhat.com>
+
+	* iw/congrats_gui.py:  Kill the big empty box on the congrats screen
+	to fix word wrap (#149526).
+	* ui/anaconda.glade:  Don't constrain the button bar so much so the
+	buttons can grow a bit for wordy translations (#151208).
+
 2005-03-16  Jeremy Katz  <katzj@redhat.com>
 
 	* packages.py (betaNagScreen): Fix beta nag translation.
diff --git a/gui.py b/gui.py
index 3e1839a8b..d0f06d122 100755
--- a/gui.py
+++ b/gui.py
@@ -1099,23 +1099,31 @@ class InstallControlWindow:
         if self.currentWindow is None:
             return
 
-        if self.displayHelp:
-            self.mainxml.get_widget("showHelpButton").hide()
-            self.mainxml.get_widget("hideHelpButton").show()
-            self.mainxml.get_widget("hideHelpButton").grab_focus()            
+        ics = self.currentWindow.getICS()
+
+        # This became more complicated than I'd like.  The problem is that
+        # displaying the help box and enabling the help buttons are
+        # independent of each other.  The congrats screen has no help box
+        # or button, while the progress screen has help but no buttons.
+        # So it takes a couple variables to sort all this out.
+        if ics.getHelpEnabled() and self.displayHelp:
+            if ics.getHelpButtonEnabled():
+                self.mainxml.get_widget("showHelpButton").hide()
+                self.mainxml.get_widget("hideHelpButton").show()
+                self.mainxml.get_widget("hideHelpButton").grab_focus()
 
             self.mainxml.get_widget("help").show_all()
             self.mainxml.get_widget("mainTable").set_homogeneous(True)
         else:
-            self.mainxml.get_widget("hideHelpButton").hide()
-            self.mainxml.get_widget("showHelpButton").show()
-            self.mainxml.get_widget("showHelpButton").grab_focus()
+            if ics.getHelpButtonEnabled():
+                self.mainxml.get_widget("showHelpButton").show()
+                self.mainxml.get_widget("hideHelpButton").hide()
+                self.mainxml.get_widget("showHelpButton").grab_focus()
 
             self.mainxml.get_widget("help").hide_all()
             self.mainxml.get_widget("mainTable").set_homogeneous(False)
         
         buffer = htmlbuffer.HTMLBuffer()
-        ics = self.currentWindow.getICS()
         buffer.feed(ics.getHTML(self.langSearchPath))
         textbuffer = buffer.get_buffer()
         self.help.set_buffer(textbuffer)
@@ -1215,8 +1223,8 @@ class InstallControlWindow:
     def update (self, ics):
         self.mainxml.get_widget("backButton").set_sensitive(ics.getPrevEnabled())
         self.mainxml.get_widget("nextButton").set_sensitive(ics.getNextEnabled())
-        self.mainxml.get_widget("hideHelpButton").set_sensitive(ics.getHelpEnabled())
-        self.mainxml.get_widget("showHelpButton").set_sensitive(ics.getHelpEnabled())
+        self.mainxml.get_widget("hideHelpButton").set_sensitive(ics.getHelpButtonEnabled())
+        self.mainxml.get_widget("showHelpButton").set_sensitive(ics.getHelpButtonEnabled())
 
         if ics.getHelpEnabled() == False and self.displayHelp:
             self.refreshHelp()
@@ -1328,6 +1336,7 @@ class InstallControlState:
         self.html = ""
         self.htmlFile = None
         self.helpEnabled = True
+	self.helpButtonEnabled = True
         self.grabNext = False
 
     def setTitle (self, title):
@@ -1354,12 +1363,11 @@ class InstallControlState:
         return self.nextEnabled
 
     def setHelpButtonEnabled (self, value):
-        if value == self.helpEnabled: return
-        self.helpEnabled = value
+        self.helpButtonEnabled = value
         self.cw.update (self)
 
     def getHelpButtonEnabled (self):
-        return self.helpEnabled
+        return self.helpButtonEnabled
 
     def findPixmap(self, file):
         warnings.warn("ics.findPixmap is deprecated, use gui.findPixmap instead", DeprecationWarning, stacklevel=2)
diff --git a/iw/congrats_gui.py b/iw/congrats_gui.py
index c5973bb6c..458a27696 100644
--- a/iw/congrats_gui.py
+++ b/iw/congrats_gui.py
@@ -56,7 +56,7 @@ class CongratulationWindow (InstallWindow):
         if iutil.getArch() == "s390":
             floppystr = ""
         else:
-            floppystr = _("Remove any installation media  "
+            floppystr = _("Remove any installation media "
                           "used during the installation process "
                           "and press the \"Reboot\" button to reboot your "
                           "system."
diff --git a/ui/anaconda.glade b/ui/anaconda.glade
index 293905ca7..fe15fca0a 100644
--- a/ui/anaconda.glade
+++ b/ui/anaconda.glade
@@ -21,6 +21,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
   <property name="gravity">GDK_GRAVITY_CENTER</property>
+  <property name="focus_on_map">True</property>
   <signal name="key_release_event" handler="on_mainWindow_key_release_event" last_modification_time="Wed, 12 Jan 2005 20:53:20 GMT"/>
   <signal name="delete_event" handler="on_mainWindow_delete_event" last_modification_time="Wed, 12 Jan 2005 21:03:14 GMT"/>
 
@@ -126,7 +127,7 @@
       <child>
 	<widget class="GtkHBox" id="buttonBar">
 	  <property name="visible">True</property>
-	  <property name="homogeneous">True</property>
+	  <property name="homogeneous">False</property>
 	  <property name="spacing">6</property>
 
 	  <child>
@@ -192,6 +193,10 @@
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -262,6 +267,10 @@
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -333,6 +342,10 @@
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -409,6 +422,10 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -504,6 +521,10 @@
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -574,6 +595,10 @@
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>