diff options
| -rwxr-xr-x | gui.py | 19 | ||||
| -rw-r--r-- | iw/congrats_gui.py | 7 | ||||
| -rw-r--r-- | iw/progress_gui.py | 3 | ||||
| -rw-r--r-- | todo.py | 5 |
4 files changed, 23 insertions, 11 deletions
@@ -463,6 +463,8 @@ class InstallControlWindow (Thread): buttons["prev"].set_sensitive (ics.getPrevEnabled ()) buttons["next"].set_sensitive (ics.getNextEnabled ()) + self.hideHelpButton.set_sensitive (ics.getHelpButtonEnabled ()) + self.showHelpButton.set_sensitive (ics.getHelpButtonEnabled ()) if ics.getHelpEnabled () == FALSE: if self.displayHelp: @@ -622,6 +624,7 @@ class InstallControlState: self.todo = todo self.prevEnabled = prevEnabled self.nextEnabled = nextEnabled + self.helpButtonEnabled = TRUE self.title = title self.html = html self.htmlFile = None @@ -648,9 +651,7 @@ class InstallControlState: self.cw.update (self) def getPrevEnabled (self): - if (self.prevEnabled != 0): - return TRUE - return FALSE + return self.prevEnabled def setNextEnabled (self, value): if value == self.nextEnabled: return @@ -658,9 +659,15 @@ class InstallControlState: self.cw.update (self) def getNextEnabled (self): - if (self.nextEnabled != 0): - return TRUE - return FALSE + return self.nextEnabled + + def setHelpButtonEnabled (self, value): + if value == self.helpButtonEnabled: return + self.helpButtonEnabled = value + self.cw.update (self) + + def getHelpButtonEnabled (self): + return self.helpButtonEnabled def readPixmap (self, file): try: diff --git a/iw/congrats_gui.py b/iw/congrats_gui.py index dacdb9cc0..ca31a4af2 100644 --- a/iw/congrats_gui.py +++ b/iw/congrats_gui.py @@ -9,13 +9,14 @@ class CongratulationWindow (InstallWindow): InstallWindow.__init__ (self, ics) ics.setTitle (_("Congratulations")) - ics.setPrevEnabled (0) + ics.setPrevEnabled (FALSE) ics.setNextButton (STOCK_PIXMAP_QUIT, _("Exit")) - ics.setNextEnabled (1) + ics.setNextEnabled (TRUE) + ics.setHelpButtonEnabled (FALSE) ics.setGrabNext (1) def getScreen (self): - self.ics.setHelpEnabled (0) + self.ics.setHelpEnabled (FALSE) hbox = GtkHBox (TRUE, 5) diff --git a/iw/progress_gui.py b/iw/progress_gui.py index c0ed7269c..259b579ed 100644 --- a/iw/progress_gui.py +++ b/iw/progress_gui.py @@ -28,7 +28,8 @@ class InstallProgressWindow (InstallWindow): ics.setTitle (_("Installing Packages")) ics.readHTML ("installing") - ics.setPrevEnabled (0) + ics.setPrevEnabled (FALSE) + ics.setHelpButtonEnabled (FALSE) self.todo = ics.getToDo () self.numComplete = 0 @@ -1100,7 +1100,10 @@ class ToDo: if self.x.server and not self.x.server == "XFree86": # trim off the XF86_ - self.selectPackage ('XFree86-' + self.x.server[5:]) + try: + self.selectPackage ('XFree86-' + self.x.server[5:]) + except ValueError, message: + log ("Error selecting XFree86 server package: %s", message) # make sure that all comps that include other comps are # selected (i.e. - recurse down the selected comps and turn |