Move the welcome windows hooks from packages.py to dispatch.py

1 files changed, 11 insertions, 9 deletions

diff --git a/dispatch.py b/dispatch.py
index fedd25b..666a744 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -48,6 +48,8 @@ from backend import writeConfiguration
 
 from packages import doReIPL
 
+from iw.welcome_gui import WelcomeWindow
+
 import logging
 log = logging.getLogger("anaconda")
 
@@ -67,13 +69,13 @@ log = logging.getLogger("anaconda")
 # gets passed in when we call the function.
 installSteps = [
     # Welcome
-    ("welcome", welcome, ),
+    ("welcome", WelcomeWindow().welcome, ),
     ("language", ),
     ("keyboard", ),
     ("betanag", betaNagScreen, ),
 
     # Preparing the Disks
-    ("preparedisks", preparedisks, ),
+    ("preparedisks", WelcomeWindow().preparedisks, ),
     ("filtertype", ),
     ("filter", ),
     ("storageinit", storageInitialize, ),
@@ -94,38 +96,38 @@ installSteps = [
     ("enablefilesystems", turnOnFilesystems, ),
 
     # Installing the Gentoo Installation Files
-    ("installationfiles", installationfiles, ),
+    ("installationfiles", WelcomeWindow().installationfiles, ),
     ("makeconf", ),
 
     # Installing the Gentoo Base System
-    ("basesystem", basesystem, ),
+    ("basesystem", WelcomeWindow().basesystem, ),
     ("mirrorselect", ),
     ("mirrorselect-sync", ),
     ("profile", ),
     ("use", ),
 
     # Configuring the Kernel
-    ("configurekernel", configurekernel, ),
+    ("configurekernel", WelcomeWindow().configurekernel, ),
     ("timezone", ),
     ("setuptime", setupTimezone, ),
 
     # Configuring your System
-    ("configuresystem", configuresystem, ),
+    ("configuresystem", WelcomeWindow().configuresystem, ),
     ("network", ),
     ("accounts", ),
 
     # Installing Necessary System Tools
-    ("systoolswelcome", systools, ),
+    ("systoolswelcome", WelcomeWindow().systools, ),
     ("systools", ),
 
     # Configuring the Bootloader
-    ("bootloaderwelcome", bootloader, ),
+    ("bootloaderwelcome", WelcomeWindow().bootloader, ),
     ("upgbootloader", ),
     ("bootloadersetup", bootloaderSetupChoices, ),
     ("bootloader", ),
 
     # Finalizing your Gentoo Installation
-    ("finalizing", finalizing, ),
+    ("finalizing", WelcomeWindow().finalizing, ),
     ("useraccounts", ),
     ("xorg", ),