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 1QcPTz-00027K-9O for garchives@archives.gentoo.org; Thu, 30 Jun 2011 22:13:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89C921C121; Thu, 30 Jun 2011 22:12:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2BC571C121 for ; Thu, 30 Jun 2011 22:12:59 +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 A03281B405D for ; Thu, 30 Jun 2011 22:12:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5F24680048 for ; Thu, 30 Jun 2011 22:12:57 +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: <5ec42e3b8e6de8e7935891fb9de800d7ec2c4b1b.wiktor@gentoo> Subject: [gentoo-commits] proj/anaconda:master commit in: /, iw/ X-VCS-Repository: proj/anaconda X-VCS-Files: dispatch.py iw/makeconf_gui.py X-VCS-Directories: / iw/ X-VCS-Committer: wiktor X-VCS-Committer-Name: Wiktor W Brodlo X-VCS-Revision: 5ec42e3b8e6de8e7935891fb9de800d7ec2c4b1b Date: Thu, 30 Jun 2011 22:12:57 +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: 265c57fb4df31afe39675758d78916b1 commit: 5ec42e3b8e6de8e7935891fb9de800d7ec2c4b1b Author: wiktor w brodlo brodlo net> AuthorDate: Thu Jun 30 22:12:36 2011 +0000 Commit: Wiktor W Brodlo brodlo net> CommitDate: Thu Jun 30 22:12:36 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/anaconda.git;= a=3Dcommit;h=3D5ec42e3b Enable make.conf configuration screen (no config written yet) --- dispatch.py | 2 +- iw/makeconf_gui.py | 61 ++++++++++++++++++++++++++++++++++++++++++++++= ++++++ 2 files changed, 62 insertions(+), 1 deletions(-) diff --git a/dispatch.py b/dispatch.py index 9688c18..6726ea8 100644 --- a/dispatch.py +++ b/dispatch.py @@ -93,7 +93,7 @@ installSteps =3D [ ("enablefilesystems", turnOnFilesystems, ), =20 # Installing the Gentoo Installation Files - # make.conf + ("makeconf"), =20 # Installing the Gentoo Base System # mirrorselect diff --git a/iw/makeconf_gui.py b/iw/makeconf_gui.py new file mode 100644 index 0000000..6c1d3fd --- /dev/null +++ b/iw/makeconf_gui.py @@ -0,0 +1,61 @@ +# +# makeconf_gui.py: gui make.conf settings. +# +# Copyright (C) 2011 wiktor w brodlo +# Copyright (C) 2011 Gentoo Foundation +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +import string +import gtk +import gtk.glade +import gtk.gdk +import gobject +import pango +import sys + +from iw_gui import * + +from constants import * +import gettext +_ =3D lambda x: gettext.ldgettext("anaconda", x) + +class MakeconfWindow(InstallWindow): + def getNext(self): + self.anaconda.makeconf.march =3D self.march.get_active_text() + self.anaconda.makeconf.opt =3D self.opt.get_active_text() + self.anaconda.makeconf.pipe =3D self.pipe.get_active() + self.anaconda.makeconf.jobs =3D self.jobs.get_value_as_int() + self.anaconda.makeconf.load =3D self.load.get_value_as_int() + self.anaconda.makeconf.silent =3D self.silent.get_active() + return None + + def getScreen(self, anaconda): + self.anaconda =3D anaconda + self.intf =3D anaconda.intf =20 + + (self.xml, self.align) =3D gui.getGladeWidget("makeconf.glade", "makeco= nf_align") + + self.march =3D self.xml.get_widget("march") + self.opt =3D self.xml.get_widget("opt") + self.pipe =3D self.xml.get_widget("pipe") + self.jobs =3D self.xml.get_widget("jobs") + self.load =3D self.xml.get_widget("load") + self.silent =3D self.xml.get_widget("silent") + + # TODO: Get a list of arches available for this installation. + + return self.align +