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

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

commit:     5ec42e3b8e6de8e7935891fb9de800d7ec2c4b1b
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jun 30 22:12:36 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jun 30 22:12:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=5ec42e3b

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 = [
     ("enablefilesystems", turnOnFilesystems, ),
 
     # Installing the Gentoo Installation Files
-    # make.conf
+    ("makeconf"),
 
     # 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 <http://www.gnu.org/licenses/>.
+#
+
+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
+_ = lambda x: gettext.ldgettext("anaconda", x)
+
+class MakeconfWindow(InstallWindow):
+    def getNext(self):
+	self.anaconda.makeconf.march  = self.march.get_active_text()
+	self.anaconda.makeconf.opt    = self.opt.get_active_text()
+	self.anaconda.makeconf.pipe   = self.pipe.get_active()
+	self.anaconda.makeconf.jobs   = self.jobs.get_value_as_int()
+	self.anaconda.makeconf.load   = self.load.get_value_as_int()
+	self.anaconda.makeconf.silent = self.silent.get_active()
+	return None
+
+    def getScreen(self, anaconda):
+	self.anaconda = anaconda
+	self.intf = anaconda.intf        
+
+	(self.xml, self.align) = gui.getGladeWidget("makeconf.glade", "makeconf_align")
+
+	self.march =  self.xml.get_widget("march")
+	self.opt =    self.xml.get_widget("opt")
+	self.pipe =   self.xml.get_widget("pipe")
+	self.jobs =   self.xml.get_widget("jobs")
+	self.load =   self.xml.get_widget("load")
+	self.silent = self.xml.get_widget("silent")
+
+	# TODO: Get a list of arches available for this installation.
+
+        return self.align
+