[gentoo-commits] proj/anaconda:master commit in: /, iw/

["Wiktor W Brodlo" <wiktor@brodlo.net>]

commit:     5b1fb60b2e846e68d1f8f3c753c85539f9dc2a08
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Jul 20 22:58:14 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Jul 20 22:58:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=5b1fb60b

Configuring the Bootloader welcome screen

---
 dispatch.py       |    1 +
 gui.py            |    1 +
 installclass.py   |    1 +
 iw/welcome_gui.py |    8 +++++++-
 4 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/dispatch.py b/dispatch.py
index 3463346..eb1f1c3 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -119,6 +119,7 @@ installSteps = [
     ("systools", ),
 
     # Configuring the Bootloader
+    ("bootloaderwelcome", bootloader, ),
     ("upgbootloader", ),
     ("bootloadersetup", bootloaderSetupChoices, ),
     ("bootloader", ),

diff --git a/gui.py b/gui.py
index e9d0286..c5171db 100755
--- a/gui.py
+++ b/gui.py
@@ -102,6 +102,7 @@ stepToClass = {
     "systools" : ("systools_gui", "SystoolsWindow"),
 
     # Configuring the Bootloader
+    "bootloaderwelcome": ("welcome_gui", "WelcomeWindow"), 
     "bootloader": ("bootloader_main_gui", "MainBootloaderWindow"),
     "upgbootloader": ("upgrade_bootloader_gui", "UpgradeBootloaderWindow"),
 

diff --git a/installclass.py b/installclass.py
index a3e93f1..e779276 100644
--- a/installclass.py
+++ b/installclass.py
@@ -126,6 +126,7 @@ class BaseInstallClass(object):
          "systools",
 
          # Configuring the Bootloader
+	 "bootloaderwelcome",
          "bootloadersetup",                 
          "bootloader",
 

diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index 2adb51e..b0cb77c 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -85,7 +85,13 @@ class WelcomeWindow (InstallWindow):
                        
     def systools(self, anaconda):
         self.setWindow(_("Installing Necessary System Tools"),
-                       _("In this chapter we help you choose and install some important tools. "),
+                       _("In this chapter we help you choose and install some important tools."),
                        9)
+                       
+    def bootloader(self, anaconda):
+        self.setWindow(_("Configuring the Bootloader"),
+                       _("In this chapter you'll be able configure the GRUB \
+                          bootloader."),
+                       10)
     def getNext(self):
        return None