From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QjfDp-0005ur-K9 for garchives@archives.gentoo.org; Wed, 20 Jul 2011 22:26:29 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2CB321C2EE; Wed, 20 Jul 2011 22:26:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B53F021C2EE for ; Wed, 20 Jul 2011 22:26:21 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2D98F2AC0F5 for ; Wed, 20 Jul 2011 22:26:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 514338003D for ; Wed, 20 Jul 2011 22:26:20 +0000 (UTC) From: "Wiktor W Brodlo" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Wiktor W Brodlo" Message-ID: <14a6323d1a1847d7526e9c0a5de147ecf613bcbc.wiktor@gentoo> Subject: [gentoo-commits] proj/anaconda:master commit in: /, iw/ X-VCS-Repository: proj/anaconda X-VCS-Files: dispatch.py gui.py installclass.py iw/welcome_gui.py X-VCS-Directories: / iw/ X-VCS-Committer: wiktor X-VCS-Committer-Name: Wiktor W Brodlo X-VCS-Revision: 14a6323d1a1847d7526e9c0a5de147ecf613bcbc Date: Wed, 20 Jul 2011 22:26:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: efe4607a3b0c64d2f3c334ab78efd639 commit: 14a6323d1a1847d7526e9c0a5de147ecf613bcbc Author: wiktor w brodlo brodlo net> AuthorDate: Wed Jul 20 22:26:04 2011 +0000 Commit: Wiktor W Brodlo brodlo net> CommitDate: Wed Jul 20 22:26:04 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/anaconda.git;= a=3Dcommit;h=3D14a6323d 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 =3D logging.getLogger("anaconda") # gets passed in when we call the function. installSteps =3D [ # Welcome - ("welcome", ), + ("welcome", welcome, ), ("language", ), ("keyboard", ), ("betanag", betaNagScreen, ), =20 # 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 =3D { "keyboard" : ("kbd_gui", "KeyboardWindow"), =20 # Preparing the Disks + "preparedisks" : ("welcome_gui", "WelcomeWindow"), "filtertype" : ("filter_type", "FilterTypeWindow"), "filter" : ("filter_gui", "FilterWindow"),=20 "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", =20 # 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 @@ _ =3D lambda x: gettext.ldgettext("anaconda", x) =20 class WelcomeWindow (InstallWindow): =20 - def setWindow(self, title, text, linktext, linkurl): + def setWindow(self, title, text, chapter, linktext=3DNone): (xml, align) =3D gui.getGladeWidget("welcome.glade", "welcome_al= ign") title_ =3D self.xml.get_widget("title") text_ =3D self.xml.get_widget("text") title_.set_markup("%s") - title_.set_attribute("label", title) + title_.set_attribute("label", _("Chapter %i: %s") % (chapter, ti= tle)) text_.set_attribute("text", text) =20 - def welcomeScreen(self, anaconda): + def welcome(self, anaconda): self.setWindow(_("Welcome to the Gentoo installer!"), _("This wizard will take you through installing G= entoo \ 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 an= d \ keyboard layout you'd like the installer and y= our \ - future system to use."), - "Gentoo Handbook", - "http://www.gentoo.org/doc/en/handbook/") + future system to use. We will then skip straig= ht to \ + Chapter 4 and continue with the installation."= ), + 0, "Gentoo Handbook") + =20 + def preparedisks(self, anaconda): + self.setWindow(_("Preparing the Disks"), + _("To be able to install Gentoo, you must create = the \ + necessary partitions. The following screens wi= ll \ + help you choose the right disk configuration f= or \ + your system."), 4) =20 def getNext(self): return None