| 1 |
commit: 5ec42e3b8e6de8e7935891fb9de800d7ec2c4b1b |
| 2 |
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net> |
| 3 |
AuthorDate: Thu Jun 30 22:12:36 2011 +0000 |
| 4 |
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net> |
| 5 |
CommitDate: Thu Jun 30 22:12:36 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=5ec42e3b |
| 7 |
|
| 8 |
Enable make.conf configuration screen (no config written yet) |
| 9 |
|
| 10 |
--- |
| 11 |
dispatch.py | 2 +- |
| 12 |
iw/makeconf_gui.py | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| 13 |
2 files changed, 62 insertions(+), 1 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dispatch.py b/dispatch.py |
| 16 |
index 9688c18..6726ea8 100644 |
| 17 |
--- a/dispatch.py |
| 18 |
+++ b/dispatch.py |
| 19 |
@@ -93,7 +93,7 @@ installSteps = [ |
| 20 |
("enablefilesystems", turnOnFilesystems, ), |
| 21 |
|
| 22 |
# Installing the Gentoo Installation Files |
| 23 |
- # make.conf |
| 24 |
+ ("makeconf"), |
| 25 |
|
| 26 |
# Installing the Gentoo Base System |
| 27 |
# mirrorselect |
| 28 |
|
| 29 |
diff --git a/iw/makeconf_gui.py b/iw/makeconf_gui.py |
| 30 |
new file mode 100644 |
| 31 |
index 0000000..6c1d3fd |
| 32 |
--- /dev/null |
| 33 |
+++ b/iw/makeconf_gui.py |
| 34 |
@@ -0,0 +1,61 @@ |
| 35 |
+# |
| 36 |
+# makeconf_gui.py: gui make.conf settings. |
| 37 |
+# |
| 38 |
+# Copyright (C) 2011 wiktor w brodlo |
| 39 |
+# Copyright (C) 2011 Gentoo Foundation |
| 40 |
+# |
| 41 |
+# This program is free software; you can redistribute it and/or modify |
| 42 |
+# it under the terms of the GNU General Public License as published by |
| 43 |
+# the Free Software Foundation; either version 2 of the License, or |
| 44 |
+# (at your option) any later version. |
| 45 |
+# |
| 46 |
+# This program is distributed in the hope that it will be useful, |
| 47 |
+# but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 48 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 49 |
+# GNU General Public License for more details. |
| 50 |
+# |
| 51 |
+# You should have received a copy of the GNU General Public License |
| 52 |
+# along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 53 |
+# |
| 54 |
+ |
| 55 |
+import string |
| 56 |
+import gtk |
| 57 |
+import gtk.glade |
| 58 |
+import gtk.gdk |
| 59 |
+import gobject |
| 60 |
+import pango |
| 61 |
+import sys |
| 62 |
+ |
| 63 |
+from iw_gui import * |
| 64 |
+ |
| 65 |
+from constants import * |
| 66 |
+import gettext |
| 67 |
+_ = lambda x: gettext.ldgettext("anaconda", x) |
| 68 |
+ |
| 69 |
+class MakeconfWindow(InstallWindow): |
| 70 |
+ def getNext(self): |
| 71 |
+ self.anaconda.makeconf.march = self.march.get_active_text() |
| 72 |
+ self.anaconda.makeconf.opt = self.opt.get_active_text() |
| 73 |
+ self.anaconda.makeconf.pipe = self.pipe.get_active() |
| 74 |
+ self.anaconda.makeconf.jobs = self.jobs.get_value_as_int() |
| 75 |
+ self.anaconda.makeconf.load = self.load.get_value_as_int() |
| 76 |
+ self.anaconda.makeconf.silent = self.silent.get_active() |
| 77 |
+ return None |
| 78 |
+ |
| 79 |
+ def getScreen(self, anaconda): |
| 80 |
+ self.anaconda = anaconda |
| 81 |
+ self.intf = anaconda.intf |
| 82 |
+ |
| 83 |
+ (self.xml, self.align) = gui.getGladeWidget("makeconf.glade", "makeconf_align") |
| 84 |
+ |
| 85 |
+ self.march = self.xml.get_widget("march") |
| 86 |
+ self.opt = self.xml.get_widget("opt") |
| 87 |
+ self.pipe = self.xml.get_widget("pipe") |
| 88 |
+ self.jobs = self.xml.get_widget("jobs") |
| 89 |
+ self.load = self.xml.get_widget("load") |
| 90 |
+ self.silent = self.xml.get_widget("silent") |
| 91 |
+ |
| 92 |
+ # TODO: Get a list of arches available for this installation. |
| 93 |
+ |
| 94 |
+ return self.align |
| 95 |
+ |
Archives