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 1Qjsnt-0005nh-CZ for garchives@archives.gentoo.org; Thu, 21 Jul 2011 12:56:37 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C24F21C062; Thu, 21 Jul 2011 12:56:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 192F821C062 for ; Thu, 21 Jul 2011 12:56:27 +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 782701B400C for ; Thu, 21 Jul 2011 12:56:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id CAEBF8003D for ; Thu, 21 Jul 2011 12:56:26 +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: <578a1a00355b38958971a11dd4a933baad6105a2.wiktor@gentoo> Subject: [gentoo-commits] proj/anaconda:master commit in: / X-VCS-Repository: proj/anaconda X-VCS-Files: dispatch.py packages.py X-VCS-Directories: / X-VCS-Committer: wiktor X-VCS-Committer-Name: Wiktor W Brodlo X-VCS-Revision: 578a1a00355b38958971a11dd4a933baad6105a2 Date: Thu, 21 Jul 2011 12:56:26 +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: 7554ac82f28d4d09dce988f954bb74a2 commit: 578a1a00355b38958971a11dd4a933baad6105a2 Author: wiktor w brodlo brodlo net> AuthorDate: Thu Jul 21 12:56:05 2011 +0000 Commit: Wiktor W Brodlo brodlo net> CommitDate: Thu Jul 21 12:56:05 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/anaconda.git;= a=3Dcommit;h=3D578a1a00 Move the welcome windows hooks from packages.py to dispatch.py --- dispatch.py | 20 +++++++++++--------- 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 =20 from packages import doReIPL =20 +from iw.welcome_gui import WelcomeWindow + import logging log =3D logging.getLogger("anaconda") =20 @@ -67,13 +69,13 @@ log =3D logging.getLogger("anaconda") # gets passed in when we call the function. installSteps =3D [ # Welcome - ("welcome", welcome, ), + ("welcome", WelcomeWindow().welcome, ), ("language", ), ("keyboard", ), ("betanag", betaNagScreen, ), =20 # Preparing the Disks - ("preparedisks", preparedisks, ), + ("preparedisks", WelcomeWindow().preparedisks, ), ("filtertype", ), ("filter", ), ("storageinit", storageInitialize, ), @@ -94,38 +96,38 @@ installSteps =3D [ ("enablefilesystems", turnOnFilesystems, ), =20 # Installing the Gentoo Installation Files - ("installationfiles", installationfiles, ), + ("installationfiles", WelcomeWindow().installationfiles, ), ("makeconf", ), =20 # Installing the Gentoo Base System - ("basesystem", basesystem, ), + ("basesystem", WelcomeWindow().basesystem, ), ("mirrorselect", ), ("mirrorselect-sync", ), ("profile", ), ("use", ), =20 # Configuring the Kernel - ("configurekernel", configurekernel, ), + ("configurekernel", WelcomeWindow().configurekernel, ), ("timezone", ), ("setuptime", setupTimezone, ), =20 # Configuring your System - ("configuresystem", configuresystem, ), + ("configuresystem", WelcomeWindow().configuresystem, ), ("network", ), ("accounts", ), =20 # Installing Necessary System Tools - ("systoolswelcome", systools, ), + ("systoolswelcome", WelcomeWindow().systools, ), ("systools", ), =20 # Configuring the Bootloader - ("bootloaderwelcome", bootloader, ), + ("bootloaderwelcome", WelcomeWindow().bootloader, ), ("upgbootloader", ), ("bootloadersetup", bootloaderSetupChoices, ), ("bootloader", ), =20 # Finalizing your Gentoo Installation - ("finalizing", finalizing, ), + ("finalizing", WelcomeWindow().finalizing, ), ("useraccounts", ), ("xorg", ), =20 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): =20 return DISPATCH_FORWARD =20 -#### Welcome screens #### - def welcome(anaconda): - WelcomeWindow().welcome(anaconda) - =20 - def preparedisks(anaconda): - WelcomeWindow().preparedisks(anaconda) - =20 - def installationfiles(anaconda): - WelcomeWindow().installationfiles(anaconda) - =20 - def basesystem(anaconda): - WelcomeWindow().basesystem(anaconda) - =20 - def configurekernel(anaconda): - WelcomeWindow().configurekernel(anaconda) - =20 - def configuresystem(anaconda): - WelcomeWindow().configuresystem(anaconda) - =20 - def systools(anaconda): - WelcomeWindow().systools(anaconda) - =20 - def bootloader(anaconda): - WelcomeWindow().bootloader(anaconda) - =20 - def finalizing(anaconda): - WelcomeWindow().finalizing(anaconda)