Remove help-related methods, classes, and variables since that stuff has

been disabled for months and it's never coming back.  Also remove this
stuff from the glade file as well.

24 files changed, 13 insertions, 368 deletions

diff --git a/ChangeLog b/ChangeLog
index 6608733f0..0fe77aa36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-05-16  Chris Lumens  <clumens@redhat.com>
+
+	* gui.py:  Removed help-related methods and variables, since help will
+	not be coming back.  Removed TextViewBrowser class since it's only
+	being used by help.
+	* iw/*.py:  Removed htmlTag variable, readHTML method calls, and
+	querying help button status.
+	* ui/anaconda.glade:  Remove help-related bits.
+
 2006-05-16  David Cantrell  <dcantrell@redhat.com>
 
 	* gui.py:  Remove PYGTK_DISABLE_THREADS environment variable.  Call
diff --git a/gui.py b/gui.py
index 92a30cad8..fe5e34970 100755
--- a/gui.py
+++ b/gui.py
@@ -848,48 +848,6 @@ class InstallInterface:
         self.icw = InstallControlWindow (self, self.dispatch, id)
         self.icw.run (self.runres)
 
-class TextViewBrowser(gtk.TextView):
-    def __init__(self):
-        self.hadj = None
-        self.vadj = None
-
-        gtk.TextView.__init__(self)
-        self.set_property('editable', False)
-        self.set_property('cursor_visible', False)
-        self.set_left_margin(10)
-        self.set_wrap_mode(gtk.WRAP_WORD)
-        self.connect('set-scroll-adjustments', self.cacheAdjustments)
-
-    def swallowFocus(self, *args):
-        self.emit_stop_by_name('focus-in-event')        
-        
-    def cacheAdjustments(self, view, hadj, vadj):
-        self.hadj = hadj
-        self.vadj = vadj
-
-    def moveCursor(self, view, step, count, extend_selection):
-        if step == gtk.MOVEMENT_DISPLAY_LINES:
-            if count == -1 and self.vadj != None:
-                self.vadj.value = max(self.vadj.value - self.vadj.step_increment,
-                                      self.vadj.lower)
-                self.vadj.value_changed()
-            elif count == 1 and self.vadj != None:
-                self.vadj.value = min(self.vadj.value + self.vadj.step_increment - 1,
-                                      self.vadj.upper - self.vadj.page_increment - 1)
-                self.vadj.value_changed()
-        elif step == gtk.MOVEMENT_PAGES:
-            if count == -1 and self.vadj != None:
-                self.vadj.value = max(self.vadj.value - self.vadj.page_increment,
-                                      self.vadj.lower)
-                self.vadj.value_changed()
-            elif count == 1 and self.vadj != None:
-                self.vadj.value = min(self.vadj.value + self.vadj.page_increment - 1,
-                                      self.vadj.upper - self.vadj.page_increment - 1)
-                self.vadj.value_changed()
-
-        self.emit_stop_by_name ('move-cursor')
-
-    
 class InstallControlWindow:
     def setLanguage (self):
 	if not self.__dict__.has_key('window'): return
@@ -952,10 +910,6 @@ class InstallControlWindow:
         #self.mainxml.get_widget("buttonBar").set_sensitive(False)
 	setCursorToNormal()
 
-    def helpClicked (self, *args):
-        self.displayHelp = not self.displayHelp
-        self.refreshHelp()
-
     def debugClicked (self, *args):
         try:
             # switch to VC1 so we can debug
@@ -972,44 +926,6 @@ class InstallControlWindow:
             isys.vtActivate (7)
         except SystemError:
             pass
-        
-    def refreshHelp(self):
-        # make sure we're refreshing the help for an actual screen
-        if self.currentWindow is None:
-            return
-
-        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:
-            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()
-        buffer.feed(ics.getHTML(self.id.instLanguage.getCurrentLangSearchList()))
-        textbuffer = buffer.get_buffer()
-        self.help.set_buffer(textbuffer)
-        # scroll to the top.  Do this with a mark so it's done in the idle loop
-        iter = textbuffer.get_iter_at_offset(0)
-        mark = textbuffer.create_mark("top", iter, False)
-        self.help.scroll_to_mark(mark, 0.0, False, 0.0, 0.0)
 
     def handleRenderCallback(self):
         self.currentWindow.renderCallback()
@@ -1087,9 +1003,6 @@ class InstallControlWindow:
             self.window.reset_rc_styles()
             self.reloadRcQueued = 0
 
-        if self.displayHelp:
-            self.refreshHelp()
-            
     def destroyCurrentWindow(self):
         children = self.installFrame.get_children ()
         if children:
@@ -1101,13 +1014,7 @@ 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.getHelpButtonEnabled())
-        self.mainxml.get_widget("showHelpButton").set_sensitive(ics.getHelpButtonEnabled())
 
-        if ics.getHelpEnabled() == False and self.displayHelp:
-            self.refreshHelp()
-        elif ics.getHelpEnabled() == True and not self.displayHelp:
-            self.refreshHelp()
         if ics.getGrabNext():
             self.mainxml.get_widget("nextButton").grab_focus()
 
@@ -1118,7 +1025,6 @@ class InstallControlWindow:
         self.id = id
         self.dispatch = dispatch
         self.handle = None
-        self.displayHelp = False
 
     def keyRelease (self, window, event):
         if ((event.keyval == gtk.keysyms.KP_Delete
@@ -1147,18 +1053,12 @@ class InstallControlWindow:
             self.mainxml.get_widget("debugButton").show_now()
         self.installFrame = self.mainxml.get_widget("installFrame")
 
-        self.help = TextViewBrowser()
-        self.mainxml.get_widget("helpView").add(self.help)
-        self.help.show_all()
-
     def connectSignals(self):
         def noop (window, event):
             return True
         sigs = { "on_nextButton_clicked": self.nextClicked,
                  "on_rebootButton_clicked": self.nextClicked,                 
                  "on_backButton_clicked": self.prevClicked,
-                 "on_hideHelpButton_clicked": self.helpClicked,
-                 "on_showHelpButton_clicked": self.helpClicked,
                  "on_relnotesButton_clicked": self.releaseNotesButtonClicked,
                  "on_debugButton_clicked": self.debugClicked,
                  
@@ -1197,16 +1097,10 @@ class InstallControlWindow:
             
 class InstallControlState:
     def __init__ (self, cw):
-        self.searchPath = ("/mnt/source/RHupdates", "/tmp/updates",
-                           "./", "/usr/share/anaconda/")
         self.cw = cw
         self.prevEnabled = True
         self.nextEnabled = True
         self.title = _("Install Window")
-        self.html = ""
-        self.htmlFile = None
-        self.helpEnabled = True
-        self.helpButtonEnabled = True
         self.grabNext = True
 
     def setTitle (self, title):
@@ -1232,13 +1126,6 @@ class InstallControlState:
     def getNextEnabled (self):
         return self.nextEnabled
 
-    def setHelpButtonEnabled (self, value):
-        self.helpButtonEnabled = value
-        self.cw.update (self)
-
-    def getHelpButtonEnabled (self):
-        return self.helpButtonEnabled
-
     def findPixmap(self, file):
         warnings.warn("ics.findPixmap is deprecated, use gui.findPixmap instead", DeprecationWarning, stacklevel=2)
         return findPixmap(file)
@@ -1252,58 +1139,14 @@ class InstallControlState:
         return readImageFromFile(file, height, width, dither = 1)
 
     def readHTML (self, file):
-        self.htmlFile = file
-
-    def setHTML (self, text):
-        self.html = text
-        self.cw.update (self)
+        pass
 
-    def getHTML (self, langPath):
-        text = None
-        if self.htmlFile:
-            file = self.htmlFile
-
-            arch = "-%s" % (rhpl.getArch(),)
-            tags = [ "%s" % (arch,), "" ]
-
-            found = 0
-            for path in self.searchPath:
-                if found:
-                    break
-                for lang in langPath + ['C']:
-                    if found:
-                        break
-                    for tag in tags:
-                        try:
-                            text = open("%s/help/%s/s1-help-screens-%s%s.html"
-                                        % (path, lang, file, tag)).read ()
-                            found = 1
-                            break
-                        except IOError:
-                            continue
-                if text:
-                    break
-
-            if text:
-                text = text.replace("@RHL@", productName)
-                text = text.replace("@RHLVER@", productVersion)
-                return text
-
-        return self.html
-    
     def setScreenPrev (self):
         self.cw.prevClicked ()
 
     def setScreenNext (self):
         self.cw.nextClicked ()
 
-    def setHelpEnabled (self, value):
-        self.helpEnabled = value
-        self.cw.update (self)
-
-    def getHelpEnabled (self):
-        return self.helpEnabled
-
     def setGrabNext (self, value):
         self.grabNext = value
         self.cw.update (self)
diff --git a/iw/account_gui.py b/iw/account_gui.py
index 152b5236a..a7f46b7a4 100644
--- a/iw/account_gui.py
+++ b/iw/account_gui.py
@@ -23,7 +23,6 @@ from flags import flags
 class AccountWindow (InstallWindow):
 
     windowTitle = N_("Set Root Password")
-    htmlTag = ("accts")
 
     def getNext (self):
         def passwordError():
diff --git a/iw/autopart_type.py b/iw/autopart_type.py
index 52b0d6110..b1d90c4e1 100644
--- a/iw/autopart_type.py
+++ b/iw/autopart_type.py
@@ -31,7 +31,6 @@ class PartitionTypeWindow(InstallWindow):
         InstallWindow.__init__(self, ics)
         ics.setTitle("Automatic Partitioning")
         ics.setNextEnabled(True)
-        ics.readHTML("autopart")
 
     def getNext(self):
         active = self.combo.get_active_iter()
diff --git a/iw/bootloader_advanced_gui.py b/iw/bootloader_advanced_gui.py
index 2b81b1396..1ad5362dd 100644
--- a/iw/bootloader_advanced_gui.py
+++ b/iw/bootloader_advanced_gui.py
@@ -25,7 +25,6 @@ from bootlocwidget import BootloaderLocationWidget
 
 class AdvancedBootloaderWindow(InstallWindow):
     windowTitle = N_("Advanced Boot Loader Configuration")
-    htmlTag = "advbootloader"
 
     def __init__(self, ics):
         InstallWindow.__init__(self, ics)
diff --git a/iw/bootloader_main_gui.py b/iw/bootloader_main_gui.py
index c6b37b73d..862dfd25f 100644
--- a/iw/bootloader_main_gui.py
+++ b/iw/bootloader_main_gui.py
@@ -28,7 +28,6 @@ from blpasswidget import BootloaderPasswordWidget
 
 class MainBootloaderWindow(InstallWindow):
     windowTitle = N_("Boot Loader Configuration")
-    htmlTag = "bootloader"
 
     def __init__(self, ics):
         InstallWindow.__init__(self, ics)
diff --git a/iw/confirm_gui.py b/iw/confirm_gui.py
index db1d0d29d..74c6a29e9 100644
--- a/iw/confirm_gui.py
+++ b/iw/confirm_gui.py
@@ -72,7 +72,6 @@ class ConfirmWindow (InstallWindow):
         
 class InstallConfirmWindow (ConfirmWindow):
     windowTitle = N_("About to Install")
-    htmlTag = "aboutinstall"
 
     def getScreen(self, anaconda):
         self.anaconda = anaconda
@@ -87,7 +86,6 @@ class InstallConfirmWindow (ConfirmWindow):
 
 class UpgradeConfirmWindow (ConfirmWindow):
     windowTitle = N_("About to Upgrade")
-    htmlTag = "aboutupgrade"
 
     def getScreen(self, anaconda):
         self.anaconda = anaconda
diff --git a/iw/congrats_gui.py b/iw/congrats_gui.py
index 70265f085..3cf9ffbbc 100644
--- a/iw/congrats_gui.py
+++ b/iw/congrats_gui.py
@@ -27,8 +27,6 @@ class CongratulationWindow (InstallWindow):
 	InstallWindow.__init__(self, ics)
 
         ics.setPrevEnabled(False)
-        ics.setHelpButtonEnabled(False)
-        ics.setHelpEnabled(False)
 
         # force buttonbar on in case release notes viewer is running
         ics.cw.mainxml.get_widget("buttonBar").set_sensitive(True)
@@ -45,8 +43,6 @@ class CongratulationWindow (InstallWindow):
 
     # CongratulationWindow tag=NA
     def getScreen (self, anaconda):
-        self.ics.setHelpEnabled (False)
-
         hbox = gtk.HBox (False, 5)
         
         pix = gui.readImageFromFile ("done.png")
diff --git a/iw/examine_gui.py b/iw/examine_gui.py
index 82df5add6..d17644d6c 100644
--- a/iw/examine_gui.py
+++ b/iw/examine_gui.py
@@ -29,7 +29,6 @@ REINSTALL_STR = "reinstall"
 class UpgradeExamineWindow (InstallWindow):		
 
     windowTitle = N_("Upgrade Examine")
-    htmlTag = "upgradeexamine"
 
     def getNext (self):
 	if self.doupgrade:
diff --git a/iw/iw_gui.py b/iw/iw_gui.py
index b4dc4e280..41d3eb9e8 100644
--- a/iw/iw_gui.py
+++ b/iw/iw_gui.py
@@ -15,15 +15,11 @@ from rhpl.translate import _
 
 class InstallWindow:
 
-    htmlTag = None
     windowTitle = None
 
     def __init__ (self,ics):
         self.ics = ics
 
-	if self.htmlTag:
-	    ics.readHTML (self.htmlTag)
-
 	if self.windowTitle:
 	    ics.setTitle (_(self.windowTitle))
 
diff --git a/iw/language_gui.py b/iw/language_gui.py
index 33f541a10..34a6c4a9e 100644
--- a/iw/language_gui.py
+++ b/iw/language_gui.py
@@ -22,7 +22,6 @@ from gui import setupTreeViewFixupIdleHandler
 class LanguageWindow (InstallWindow):
 
     windowTitle = N_("Language Selection")
-    htmlTag = "lang"
 
     def __init__ (self, ics):
 	InstallWindow.__init__ (self, ics)
diff --git a/iw/mouse_gui.py b/iw/mouse_gui.py
index 608c154c4..5fb768cf2 100644
--- a/iw/mouse_gui.py
+++ b/iw/mouse_gui.py
@@ -22,7 +22,6 @@ from flags import flags
 
 class MouseWindow(InstallWindow):
     windowTitle = N_("Mouse Configuration")
-    htmlTag = "mouse"
 
     def getNext(self):
         self.mouse.setMouse(self.currentMouse,self.emulate3.get_active())
diff --git a/iw/network_gui.py b/iw/network_gui.py
index e2ae6711e..25b731197 100644
--- a/iw/network_gui.py
+++ b/iw/network_gui.py
@@ -33,7 +33,6 @@ global_option_labels = [_("_Gateway"), _("_Primary DNS"),
 class NetworkWindow(InstallWindow):		
 
     windowTitle = N_("Network Configuration")
-    htmlTag = "netconf"
 
     def __init__(self, ics):
 	InstallWindow.__init__(self, ics)
diff --git a/iw/partition_gui.py b/iw/partition_gui.py
index 24f54cc66..ff9cd500f 100644
--- a/iw/partition_gui.py
+++ b/iw/partition_gui.py
@@ -541,7 +541,6 @@ class PartitionWindow(InstallWindow):
 	InstallWindow.__init__(self, ics)
         ics.setTitle(_("Partitioning"))
         ics.setNextEnabled(True)
-        ics.readHTML("partition")
         self.parent = ics.getICW().window
 
     def quit(self):
diff --git a/iw/partmethod_gui.py b/iw/partmethod_gui.py
index d7805a1fa..e23f7ff74 100644
--- a/iw/partmethod_gui.py
+++ b/iw/partmethod_gui.py
@@ -34,9 +34,6 @@ class PartitionMethodWindow(InstallWindow):
 	return None
 
     def getScreen (self, partitions, instclass):
-
-        self.ics.readHTML("howpartition")
-
         self.partitions = partitions
         
         box = gtk.VBox (False)
diff --git a/iw/progress_gui.py b/iw/progress_gui.py
index 30ae897e4..7828ab56c 100644
--- a/iw/progress_gui.py
+++ b/iw/progress_gui.py
@@ -53,7 +53,6 @@ def size_string (size):
 class InstallProgressWindow (InstallWindow):
 
     windowTitle = N_("Installing Packages")
-    htmlTag = "installing"
 
     def __init__ (self, ics):
 	InstallWindow.__init__ (self, ics)
@@ -61,8 +60,6 @@ class InstallProgressWindow (InstallWindow):
         ics.setPrevEnabled (False)
         ics.setNextEnabled (False)
         
-        ics.setHelpButtonEnabled (False)
-
 	self.numComplete = 0
 	self.sizeComplete = 0
 	self.filesComplete = 0
diff --git a/iw/timezone_gui.py b/iw/timezone_gui.py
index 75528be49..5deea8c75 100644
--- a/iw/timezone_gui.py
+++ b/iw/timezone_gui.py
@@ -59,7 +59,6 @@ class TimezoneWindow(InstallWindow):
 
         ics.setTitle(_("Time Zone Selection"))
         ics.setNextEnabled(1)
-        ics.readHTML("timezone")
 
     def custom_widget_handler(self, xml, function_name, widget_name, str1, str2,
                               int1, int2):
diff --git a/iw/upgrade_bootloader_gui.py b/iw/upgrade_bootloader_gui.py
index 328905330..ae0ff569a 100644
--- a/iw/upgrade_bootloader_gui.py
+++ b/iw/upgrade_bootloader_gui.py
@@ -25,7 +25,6 @@ import checkbootloader
 
 class UpgradeBootloaderWindow (InstallWindow):
     windowTitle = N_("Upgrade Boot Loader Configuration")
-    htmlTag = "bl-upgrade"
 
     def getPrev(self):
         pass
diff --git a/iw/upgrade_migratefs_gui.py b/iw/upgrade_migratefs_gui.py
index d39fd1173..00c31d698 100644
--- a/iw/upgrade_migratefs_gui.py
+++ b/iw/upgrade_migratefs_gui.py
@@ -26,7 +26,6 @@ import gtk
 
 class UpgradeMigrateFSWindow (InstallWindow):		
     windowTitle = N_("Migrate File Systems")
-    htmlTag = "upmigfs"
 
     def getNext (self):
         for entry in self.migent:
diff --git a/iw/upgrade_swap_gui.py b/iw/upgrade_swap_gui.py
index 6ae86e04e..ca53464f6 100644
--- a/iw/upgrade_swap_gui.py
+++ b/iw/upgrade_swap_gui.py
@@ -27,7 +27,6 @@ from rhpl.translate import _, N_
 
 class UpgradeSwapWindow (InstallWindow):		
     windowTitle = N_("Upgrade Swap Partition")
-    htmlTag = "upswapfile"
 
     def getNext (self):
         #-If the user doesn't need to add swap, we don't do anything
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index 019c7744b..261617773 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -19,7 +19,6 @@ from rhpl.translate import _, N_
 class WelcomeWindow (InstallWindow):		
 
     windowTitle = "" #N_("Welcome")
-    htmlTag = "wel"
 
     def __init__ (self, ics):
 	InstallWindow.__init__ (self, ics)
diff --git a/iw/zfcp_gui.py b/iw/zfcp_gui.py
index 15d81c499..756ea8678 100644
--- a/iw/zfcp_gui.py
+++ b/iw/zfcp_gui.py
@@ -22,7 +22,6 @@ import copy
 class ZFCPWindow(InstallWindow):
 
     windowTitle = N_("ZFCP Configuration")
-    htmlTag = "fcpdevices"
 
     def __init__(self, ics):
         InstallWindow.__init__(self, ics)
diff --git a/iw/zipl_gui.py b/iw/zipl_gui.py
index 90f46baef..aa2c70b85 100644
--- a/iw/zipl_gui.py
+++ b/iw/zipl_gui.py
@@ -25,7 +25,6 @@ class ZiplWindow (InstallWindow):
     def __init__ (self, ics):
         InstallWindow.__init__ (self, ics)
         self.ics.setTitle ("z/IPL")
-        self.ics.readHTML ("zipl-s390")
         self.ics.windowTitle = N_("z/IPL Boot Loader Configuration")
 
     def getPrev (self):
diff --git a/ui/anaconda.glade b/ui/anaconda.glade
index 9dbd62a5a..c8d82f6b2 100644
--- a/ui/anaconda.glade
+++ b/ui/anaconda.glade
@@ -51,8 +51,8 @@
 	  <property name="border_width">12</property>
 	  <property name="visible">True</property>
 	  <property name="n_rows">1</property>
-	  <property name="n_columns">3</property>
-	  <property name="homogeneous">True</property>
+	  <property name="n_columns">1</property>
+	  <property name="homogeneous">False</property>
 	  <property name="row_spacing">0</property>
 	  <property name="column_spacing">0</property>
 
@@ -83,39 +83,12 @@
 	    </widget>
 	    <packing>
 	      <property name="left_attach">1</property>
-	      <property name="right_attach">3</property>
+	      <property name="right_attach">2</property>
 	      <property name="top_attach">0</property>
 	      <property name="bottom_attach">1</property>
 	    </packing>
 	  </child>
 
-	  <child>
-	    <widget class="GtkScrolledWindow" id="help">
-	      <property name="can_focus">True</property>
-	      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	      <property name="shadow_type">GTK_SHADOW_NONE</property>
-	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-	      <child>
-		<widget class="GtkViewport" id="helpView">
-		  <property name="visible">True</property>
-		  <property name="shadow_type">GTK_SHADOW_IN</property>
-
-		  <child>
-		    <placeholder/>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	    </packing>
-	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
@@ -138,154 +111,6 @@
 	      <property name="spacing">18</property>
 
 	      <child>
-		<widget class="GtkButton" id="hideHelpButton">
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="on_hideHelpButton_clicked" last_modification_time="Wed, 12 Jan 2005 20:02:13 GMT"/>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment1">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">0</property>
-		      <property name="yscale">0</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">0</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox2">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">2</property>
-
-			  <child>
-			    <widget class="GtkImage" id="image2">
-			      <property name="visible">True</property>
-			      <property name="stock">gtk-help</property>
-			      <property name="icon_size">4</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Hide _Help</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <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>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="showHelpButton">
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="on_showHelpButton_clicked" last_modification_time="Wed, 12 Jan 2005 20:01:59 GMT"/>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment6">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">0</property>
-		      <property name="yscale">0</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">0</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox6">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">2</property>
-
-			  <child>
-			    <widget class="GtkImage" id="image6">
-			      <property name="visible">True</property>
-			      <property name="stock">gtk-help</property>
-			      <property name="icon_size">4</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label5">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Show _Help</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <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>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-
-	      <child>
 		<widget class="GtkButton" id="relnotesButton">
 		  <property name="visible">True</property>
 		  <property name="can_default">True</property>