you now just call intf.run () - it calls todo.doInstall (), etc

3 files changed, 28 insertions, 2 deletions

diff --git a/iw/congrats.py b/iw/congrats.py
index 59e92a71d..a15dab23e 100644
--- a/iw/congrats.py
+++ b/iw/congrats.py
@@ -11,7 +11,16 @@ class CongratulationWindow (InstallWindow):
         ics.setNextEnabled (1)
 
     def getScreen (self):
-        label = GtkLabel("install done")
+        label = GtkLabel("Congratulations, installation is complete.\n\n"
+                         "Remove the boot media and "
+                         "press return to reboot. For information on fixes which are "
+                         "available for this release of Red Hat Linux, consult the "
+                         "Errata available from http://www.redhat.com.\n\n"
+                         "Information on configuring your system is available in the post "
+                         "install chapter of the Official Red Hat Linux User's Guide.")
+        label.set_line_wrap (TRUE)
+        label.set_line_wrap (TRUE)
+        label.set_alignment (0.0, 0.5)
 
         box = GtkVBox (FALSE, 10)
         box.pack_start (label, TRUE, TRUE, 0)
diff --git a/iw/progress.py b/iw/progress.py
index d27e4fcaf..6e3a22010 100644
--- a/iw/progress.py
+++ b/iw/progress.py
@@ -3,7 +3,20 @@ from iw import *
 import string
 import rpm
 import time
+from threading import *
 
+class DoInstall (Thread):
+    def __init__ (self, icw, todo):
+        self.todo = todo
+        self.icw = icw
+        Thread.__init__ (self)
+
+    def run (self):
+        self.todo.doInstall ()
+        threads_enter ()
+        self.icw.nextClicked ()
+        threads_leave ()
+                
 class InstallProgressWindow (InstallWindow):
 
     def __init__ (self, ics):
@@ -12,6 +25,7 @@ class InstallProgressWindow (InstallWindow):
         ics.setTitle ("Installing Packages")
         ics.setPrevEnabled (0)
 
+        self.todo = ics.getToDo ()
 	self.numComplete = 0
 	self.sizeComplete = 0
         
@@ -143,5 +157,9 @@ class InstallProgressWindow (InstallWindow):
         vbox.pack_start (clist, TRUE)
 
 	self.ics.getInstallInterface ().setPackageProgressWindow (self)
+        ii = self.ics.getInstallInterface ()
+        icw = ii.icw
+        worker = DoInstall (icw, self.todo)
+        worker.start ()
 	return vbox
 
diff --git a/iw/welcome.py b/iw/welcome.py
index f8a1120e0..ba9c87754 100644
--- a/iw/welcome.py
+++ b/iw/welcome.py
@@ -21,7 +21,6 @@ class WelcomeWindow (InstallWindow):
 
     def getScreen (self):
         label = GtkLabel("(insert neat logo graphic here)")
-        label.set_line_wrap (TRUE)
 
         box = GtkVBox (FALSE, 10)
         box.pack_start (label, TRUE, TRUE, 0)