diff options
author | wiktor w brodlo <wiktor@brodlo.net> | 2011-07-21 12:56:05 +0000 |
---|---|---|
committer | wiktor w brodlo <wiktor@brodlo.net> | 2011-07-21 12:56:05 +0000 |
commit | 578a1a00355b38958971a11dd4a933baad6105a2 (patch) | |
tree | f7446acd6b0a6e2d660f2a09e227445fa1e80f7e | |
parent | iw/__init__.py: entry point for iw modules (diff) | |
download | anaconda-578a1a00355b38958971a11dd4a933baad6105a2.tar.gz anaconda-578a1a00355b38958971a11dd4a933baad6105a2.tar.bz2 anaconda-578a1a00355b38958971a11dd4a933baad6105a2.zip |
Move the welcome windows hooks from packages.py to dispatch.py
-rw-r--r-- | dispatch.py | 20 | ||||
-rw-r--r-- | packages.py | 27 |
2 files changed, 11 insertions, 36 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", ), diff --git a/packages.py b/packages.py index c4b8191..c3440f8 100644 --- a/packages.py +++ b/packages.py @@ -359,30 +359,3 @@ def doReIPL(anaconda): return DISPATCH_FORWARD -#### Welcome screens #### - def welcome(anaconda): - WelcomeWindow().welcome(anaconda) - - def preparedisks(anaconda): - WelcomeWindow().preparedisks(anaconda) - - def installationfiles(anaconda): - WelcomeWindow().installationfiles(anaconda) - - def basesystem(anaconda): - WelcomeWindow().basesystem(anaconda) - - def configurekernel(anaconda): - WelcomeWindow().configurekernel(anaconda) - - def configuresystem(anaconda): - WelcomeWindow().configuresystem(anaconda) - - def systools(anaconda): - WelcomeWindow().systools(anaconda) - - def bootloader(anaconda): - WelcomeWindow().bootloader(anaconda) - - def finalizing(anaconda): - WelcomeWindow().finalizing(anaconda) |