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

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

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

Preparing the Disks welcome screen

---
 dispatch.py       |    3 ++-
 gui.py            |    1 +
 installclass.py   |    1 +
 iw/welcome_gui.py |   19 +++++++++++++------
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/dispatch.py b/dispatch.py
index 6ccc6ac..6cd9744 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -67,12 +67,13 @@ log = logging.getLogger("anaconda")
 # gets passed in when we call the function.
 installSteps = [
     # Welcome
-    ("welcome", ),
+    ("welcome", welcome, ),
     ("language", ),
     ("keyboard", ),
     ("betanag", betaNagScreen, ),
 
     # Preparing the Disks
+    ("preparedisks", preparedisks, )
     ("filtertype", ),
     ("filter", ),
     ("storageinit", storageInitialize, ),

diff --git a/gui.py b/gui.py
index 6436e4e..be3980a 100755
--- a/gui.py
+++ b/gui.py
@@ -66,6 +66,7 @@ stepToClass = {
     "keyboard" : ("kbd_gui", "KeyboardWindow"),
 
     # Preparing the Disks
+    "preparedisks" : ("welcome_gui", "WelcomeWindow"),
     "filtertype" : ("filter_type", "FilterTypeWindow"),
     "filter" : ("filter_gui", "FilterWindow"), 
     "zfcpconfig" : ("zfcp_gui", "ZFCPWindow"),

diff --git a/installclass.py b/installclass.py
index c1744e0..eb8802e 100644
--- a/installclass.py
+++ b/installclass.py
@@ -87,6 +87,7 @@ class BaseInstallClass(object):
          "betanag",
 
          # Preparing the Disks
+	 "preparedisks",
          "filtertype",
          "filter",
          "storageinit",

diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index c0b519f..2bf674a 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -28,15 +28,15 @@ _ = lambda x: gettext.ldgettext("anaconda", x)
 
 class WelcomeWindow (InstallWindow):
     
-    def setWindow(self, title, text, linktext, linkurl):
+    def setWindow(self, title, text, chapter, linktext=None):
         (xml, align) = gui.getGladeWidget("welcome.glade", "welcome_align")
         title_ = self.xml.get_widget("title")
         text_ = self.xml.get_widget("text")
         title_.set_markup("<span style=\"font-size: 200%\">%s</span>")
-        title_.set_attribute("label", title)
+        title_.set_attribute("label", _("Chapter %i: %s") % (chapter, title))
         text_.set_attribute("text", text)
 
-    def welcomeScreen(self, anaconda):
+    def welcome(self, anaconda):
         self.setWindow(_("Welcome to the Gentoo installer!"),
                        _("This wizard will take you through installing Gentoo \
                           on your computer. We will follow the official Gentoo \
@@ -45,9 +45,16 @@ class WelcomeWindow (InstallWindow):
                           link in the top-right corner of the window.\n\n\
                           We'll start off asking you for the language and \
                           keyboard layout you'd like the installer and your \
-                          future system to use."),
-                       "Gentoo Handbook",
-                       "http://www.gentoo.org/doc/en/handbook/")
+                          future system to use. We will then skip straight to \
+                          Chapter 4 and continue with the installation."),
+                       0, "Gentoo Handbook")
+                       
+    def preparedisks(self, anaconda):
+        self.setWindow(_("Preparing the Disks"),
+                       _("To be able to install Gentoo, you must create the \
+                          necessary partitions. The following screens will \
+                          help you choose the right disk configuration for \
+                          your system."), 4)
 
     def getNext(self):
        return None