From 6b848780c91fe00ddb83ced734d0b021eaa4e360 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Wed, 27 Apr 2005 22:42:25 +0000 Subject: 2005-04-27 Jeremy Katz * text.py (InstallInterface.messageWindow): Properly return the idx of the return on a custom messageWindow * image.py (presentRequiredMediaMessage): Add back button for required media message (#114770) * textw/confirm_text.py (BeginUpgradeWindow.__call__): Likewise. (BeginInstallWindow.__call__): Likewise. * iw/confirm_gui.py (UpgradeConfirmWindow.getNext) (InstallConfirmWindow.getNext): Likewise. --- iw/confirm_gui.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'iw') diff --git a/iw/confirm_gui.py b/iw/confirm_gui.py index 6880e8945..eda4cb99b 100644 --- a/iw/confirm_gui.py +++ b/iw/confirm_gui.py @@ -60,7 +60,6 @@ class InstallConfirmWindow (ConfirmWindow): def getNext(self): if self.id.methodstr.startswith("cdrom://") and (self.id.instClass.name and self.id.instClass.name != "kickstart"): rc = presentRequiredMediaMessage(self.intf, self.id.grpset) - if rc == 0: rc2 = self.intf.messageWindow(_("Reboot?"), _("The system will be rebooted now."), @@ -70,6 +69,10 @@ class InstallConfirmWindow (ConfirmWindow): sys.exit(0) else: raise gui.StayOnScreen + elif rc == 1: # they asked to go back + self.intf.icw.prevClicked() + raise gui.StayOnScreen + return DISPATCH_BACK def getScreen(self, intf, id): self.intf = intf @@ -100,6 +103,10 @@ class UpgradeConfirmWindow (ConfirmWindow): sys.exit(0) else: raise gui.StayOnScreen + elif rc == 1: # they asked to go back + self.intf.icw.prevClicked() + raise gui.StayOnScreen + return DISPATCH_BACK def getScreen(self, intf, id): self.intf = intf -- cgit