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 1QjtzJ-0008FQ-Ri for garchives@archives.gentoo.org; Thu, 21 Jul 2011 14:12:32 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CCD4921C495; Thu, 21 Jul 2011 14:12:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A159721C495 for ; Thu, 21 Jul 2011 14:12: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 1D2EB1B400D for ; Thu, 21 Jul 2011 14:12:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4456B8003D for ; Thu, 21 Jul 2011 14:12: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: <83b06ea9b703000b66949e06d83f8fca8448d3bf.wiktor@gentoo> Subject: [gentoo-commits] proj/anaconda:master commit in: /, iw/ X-VCS-Repository: proj/anaconda X-VCS-Files: 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: 83b06ea9b703000b66949e06d83f8fca8448d3bf Date: Thu, 21 Jul 2011 14:12: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: b02bb81e00d680fb86a8d2951b1ab317 commit: 83b06ea9b703000b66949e06d83f8fca8448d3bf Author: wiktor w brodlo brodlo net> AuthorDate: Thu Jul 21 14:11:13 2011 +0000 Commit: Wiktor W Brodlo brodlo net> CommitDate: Thu Jul 21 14:11:13 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/anaconda.git;= a=3Dcommit;h=3D83b06ea9 iw/welcome_gui.py: Fix getting the widgets --- gui.py | 2 +- installclass.py | 2 +- iw/welcome_gui.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gui.py b/gui.py index b2a8b44..b588065 100755 --- a/gui.py +++ b/gui.py @@ -61,7 +61,7 @@ mainWindow =3D None =20 stepToClass =3D { # Welcome - "welcome" : ("welcome_gui", "WelcomeWindow"), + "welcomescreen" : ("welcome_gui", "WelcomeWindow"), "language" : ("language_gui", "LanguageWindow"), "keyboard" : ("kbd_gui", "KeyboardWindow"), =20 diff --git a/installclass.py b/installclass.py index b3a6991..ec09bb5 100644 --- a/installclass.py +++ b/installclass.py @@ -81,7 +81,7 @@ class BaseInstallClass(object): dispatch =3D anaconda.dispatch dispatch.setStepList( # Welcome=20 - "welcome", + "welcomescreen", "language", "keyboard", "betanag", diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py index 62cf012..92f111d 100644 --- a/iw/welcome_gui.py +++ b/iw/welcome_gui.py @@ -29,7 +29,7 @@ _ =3D lambda x: gettext.ldgettext("anaconda", x) class WelcomeWindow (InstallWindow): =20 windows =3D {=20 - "welcome" : ( + "welcomescreen" : ( _("Welcome to the Gentoo installer!"), _("This wizard will take you through installing Gentoo \ on your computer. We will follow the official Gentoo \ @@ -105,8 +105,8 @@ class WelcomeWindow (InstallWindow): =20 def setWindow(self, title, text, chapter, linktext): (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_ =3D xml.get_widget("title") + text_ =3D xml.get_widget("text") title_.set_markup("%s") title_.set_attribute("label", _("Chapter %i: %s") % (chapter, ti= tle)) text_.set_attribute("text", text)