2005-04-27 Jeremy Katz <katzj@redhat.com>

	* 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.

5 files changed, 25 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index f6d7b4e97..19d8f64cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2005-04-27  Jeremy Katz  <katzj@redhat.com>
 
+	* 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.
+
 	* scripts/mk-images.i386: Bump size of diskboot.img
 	* scripts/mk-images.x86_64: Likewise.
 
diff --git a/image.py b/image.py
index 0117f51b6..fc9f45cb5 100644
--- a/image.py
+++ b/image.py
@@ -44,7 +44,7 @@ else:
 def presentRequiredMediaMessage(intf, grpset):
     reqcds = []
     for hdr in grpset.hdrlist.values():
-	if not hdr.isSelected():
+        if not hdr.isSelected():
 	    continue
 	elif hdr[1000002] not in reqcds:
 	    reqcds.append(hdr[1000002])
@@ -93,7 +93,7 @@ def presentRequiredMediaMessage(intf, grpset):
 				      "the installation and reboot please "
 				      "select \"Reboot\".") % (reqcdstr,),
 				    type="custom", custom_icon="warning",
-				    custom_buttons=[_("_Reboot"), _("_Continue")])
+				    custom_buttons=[_("_Reboot"), _("_Back"), _("_Continue")])
 
 
 
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
diff --git a/text.py b/text.py
index 58149e0d6..a452156cb 100644
--- a/text.py
+++ b/text.py
@@ -259,7 +259,7 @@ class InstallInterface:
 	    idx = 0
 	    for b in tmpbut:
 		if string.lower(b) == rc:
-		    return idx != 0
+		    return idx
 		idx = idx + 1
 	    return 0
 	else:
diff --git a/textw/confirm_text.py b/textw/confirm_text.py
index 4701b1588..20378b789 100644
--- a/textw/confirm_text.py
+++ b/textw/confirm_text.py
@@ -40,6 +40,8 @@ class BeginInstallWindow:
 		    sys.exit(0)
 		else:
 		    return INSTALL_BACK
+            elif rc == 1: # they asked to go back
+                return INSTALL_BACK
 	
         return INSTALL_OK
 
@@ -66,5 +68,7 @@ class BeginUpgradeWindow:
 		    sys.exit(0)
 		else:
 		    return INSTALL_BACK
+            elif rc == 1: # they asked to go back
+                return INSTALL_BACK
 
         return INSTALL_OK