add beta nag screen

4 files changed, 37 insertions, 2 deletions

diff --git a/dispatch.py b/dispatch.py
index a07a3c1d9..bf7ef9bd3 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -24,6 +24,7 @@ from packages import queryUpgradeContinue
 from packages import doPreInstall, doPostInstall, doPostAction
 from autopart import doAutoPartition
 from packages import firstbootConfiguration
+from packages import betaNagScreen
 from partitioning import partitionMethodSetup, partitionObjectsInitialize
 from partitioning import partitioningComplete
 from floppy import makeBootdisk
@@ -48,6 +49,7 @@ from network import networkDeviceCheck
 
 installSteps = [
     ("welcome", ("id.configFileData",)),
+    ("betanag", betaNagScreen, ("intf", "dir")),
     ("language", ("intf", "id.instLanguage")),
     ("keyboard", ("id.instLanguage.getDefaultKeyboard()", "id.keyboard", "id.xconfig")),
     ("mouse", ("id.mouse",)),
diff --git a/installclass.py b/installclass.py
index 02356c833..a06963d20 100644
--- a/installclass.py
+++ b/installclass.py
@@ -81,6 +81,7 @@ class BaseInstallClass:
 		 "keyboard",
 		 "mouse",
 		 "welcome",
+		 "betanag",
 		 "installtype",
                  "partitionmethod",
                  "partitionobjinit",
diff --git a/packages.py b/packages.py
index b28e41233..b0ed728d1 100644
--- a/packages.py
+++ b/packages.py
@@ -935,3 +935,34 @@ def depmodModules(comps, instPath):
                                   "-F", "/boot/System.map-" + version ],
 				root = instPath, stderr = '/dev/null')
 
+
+def betaNagScreen(intf, dir):
+    if dir == DISPATCH_BACK:
+	return DISPATCH_NOOP
+    
+    while 1:
+	rc = intf.messageWindow( _("Warning! This is a beta!"),
+				 _("Thank you for downloading this "
+				   "Red Hat Beta release.\n\n"
+				   "As you know, this is not a final "
+				   "release and is not intended for use "
+				   "on production systems.  The purpose of "
+				   "this release is to collect feedback "
+				   "from testers, and it is not suitable "
+				   "for day to day usage."
+				   "\n\n"
+				   "If you do not want to install unstable "
+				   "software on this system, "
+				   "please choose 'Exit' now."),
+				 type="custom", custom_icon="warning",
+				 custom_buttons=[_("_Exit"), _("_Install BETA")])
+
+	if not rc:
+	    rc = intf.messageWindow( _("Rebooting System"),
+				 _("Your system will now be rebooted..."),
+				 type="custom", custom_icon="warning",
+				 custom_buttons=[_("_Back"), _("_Reboot")])
+	    if rc:
+		sys.exit(0)
+	else:
+	    break
diff --git a/text.py b/text.py
index 23d2e33e0..31b4cf9a1 100644
--- a/text.py
+++ b/text.py
@@ -243,7 +243,7 @@ class InstallInterface:
         return ProgressWindow(self.screen, title, text, total)
 
     def messageWindow(self, title, text, type="ok", default = None,
-		      custom_buttons=[]):
+		      custom_icon=None, custom_buttons=[]):
 	if type == "ok":
 	    ButtonChoiceWindow(self.screen, title, text,
 			       buttons=[TEXT_OK_BUTTON])
@@ -263,7 +263,8 @@ class InstallInterface:
 	    for but in custom_buttons:
 		tmpbut.append(string.replace(but,"_",""))
 
-	    rc = ButtonChoiceWindow(self.screen, title, text, buttons=tmpbut)
+	    rc = ButtonChoiceWindow(self.screen, title, text, width=60,
+				    buttons=tmpbut)
 
 	    idx = 0
 	    for b in tmpbut: