* [gentoo-commits] proj/anaconda:master commit in: /, ui/, iw/
@ 2011-07-03 23:37 Wiktor W Brodlo
0 siblings, 0 replies; 6+ messages in thread
From: Wiktor W Brodlo @ 2011-07-03 23:37 UTC (permalink / raw
To: gentoo-commits
commit: c17fa85feb9b5da645969a0fd96c3873e4e7c80b
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul 3 23:37:10 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul 3 23:37:10 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=c17fa85f
profile selection
---
dispatch.py | 2 +-
gui.py | 1 +
installclass.py | 1 +
iw/profile_gui.py | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++
ui/profile.glade | 17 ++++++++++---
5 files changed, 80 insertions(+), 5 deletions(-)
diff --git a/dispatch.py b/dispatch.py
index 4ade775..55064ea 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -98,7 +98,7 @@ installSteps = [
# Installing the Gentoo Base System
("mirrorselect", ),
("mirrorselect-sync", ),
- # profile
+ ("profile", ),
# use
# Configuring the Kernel
diff --git a/gui.py b/gui.py
index 41f127c..8c9bf17 100755
--- a/gui.py
+++ b/gui.py
@@ -82,6 +82,7 @@ stepToClass = {
# Installing the Gentoo Base System
"mirrorselect": ("mirrorselect_gui", "MirrorselectWindow"),
"mirrorselect-sync": ("mirrorselect-sync_gui", "MirrorselectSyncWindow"),
+ "profile": ("profile_gui", "ProfileWindow"),
# Configuring the Kernel
"timezone" : ("timezone_gui", "TimezoneWindow"),
diff --git a/installclass.py b/installclass.py
index 28104d8..a6413a6 100644
--- a/installclass.py
+++ b/installclass.py
@@ -105,6 +105,7 @@ class BaseInstallClass(object):
# Installing the Gentoo Base System
"mirrorselect",
"mirrorselect-sync",
+ "profile"
# Configuring the Kernel
"timezone",
diff --git a/iw/profile_gui.py b/iw/profile_gui.py
new file mode 100644
index 0000000..79ed4a3
--- /dev/null
+++ b/iw/profile_gui.py
@@ -0,0 +1,64 @@
+#
+# profile_gui.py: gui profile selection.
+#
+# 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
+import gui
+import subprocess
+
+from iw_gui import *
+
+from constants import *
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
+
+class ProfileWindow(InstallWindow):
+ def getNext(self):
+ return None
+
+ def getScreen(self, anaconda):
+ self.anaconda = anaconda
+ self.intf = anaconda.intf
+
+ (self.xml, self.align) = gui.getGladeWidget("profile.glade", "profile_align")
+
+ out = subprocess.check_output(["eselect", "profile", "list"])
+ lines = out.split("\n")
+ del lines[0]
+
+ profiles = []
+ for line in lines:
+ s = line.split()
+ if s != []:
+ profiles.append(s[1])
+
+ box = self.xml.get_widget("profiles_box")
+
+ for profile in profiles:
+ cb = gtk.CheckButton(label=profile)
+ box.pack_start(cb)
+
+ return self.align
+
diff --git a/ui/profile.glade b/ui/profile.glade
index af75dce..c3125dc 100644
--- a/ui/profile.glade
+++ b/ui/profile.glade
@@ -19,11 +19,14 @@
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
<property name="label" translatable="yes">A profile is a building block for any Gentoo system. Not only does it specify default values for USE, CFLAGS and other important variables, it also locks the system to a certain range of package versions. This is all maintained by the Gentoo developers.
Note: The developer subprofile is specifically for Gentoo Linux development tasks. It is not meant to help set up general development environments.</property>
<property name="justify">center</property>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -34,12 +37,18 @@ Note: The developer subprofile is specifically for Gentoo Linux development task
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<child>
- <widget class="GtkVBox" id="profiles_box">
+ <widget class="GtkViewport" id="viewport1">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="homogeneous">True</property>
+ <property name="resize_mode">queue</property>
<child>
- <placeholder/>
+ <widget class="GtkVBox" id="profiles_box">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
</child>
</widget>
</child>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: /, ui/, iw/
@ 2011-07-04 12:34 Wiktor W Brodlo
0 siblings, 0 replies; 6+ messages in thread
From: Wiktor W Brodlo @ 2011-07-04 12:34 UTC (permalink / raw
To: gentoo-commits
commit: 5945d5ebc8f4977d94c5e848e15984de29013c84
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 4 12:33:50 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 4 12:33:50 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=5945d5eb
First version of USE flag selection screen
---
dispatch.py | 2 +-
gui.py | 1 +
installclass.py | 1 +
iw/use_gui.py | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
ui/use.glade | 51 +++++++++++++++++++++++++++-----------
5 files changed, 112 insertions(+), 16 deletions(-)
diff --git a/dispatch.py b/dispatch.py
index 55064ea..ff469d9 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -99,7 +99,7 @@ installSteps = [
("mirrorselect", ),
("mirrorselect-sync", ),
("profile", ),
- # use
+ ("use", ),
# Configuring the Kernel
("timezone", ),
diff --git a/gui.py b/gui.py
index 8c9bf17..0a5b161 100755
--- a/gui.py
+++ b/gui.py
@@ -83,6 +83,7 @@ stepToClass = {
"mirrorselect": ("mirrorselect_gui", "MirrorselectWindow"),
"mirrorselect-sync": ("mirrorselect-sync_gui", "MirrorselectSyncWindow"),
"profile": ("profile_gui", "ProfileWindow"),
+ "use": ("use_gui", "UseWindow"),
# Configuring the Kernel
"timezone" : ("timezone_gui", "TimezoneWindow"),
diff --git a/installclass.py b/installclass.py
index 5db02f2..fe39e3a 100644
--- a/installclass.py
+++ b/installclass.py
@@ -106,6 +106,7 @@ class BaseInstallClass(object):
"mirrorselect",
"mirrorselect-sync",
"profile",
+ "use",
# Configuring the Kernel
"timezone",
diff --git a/iw/use_gui.py b/iw/use_gui.py
new file mode 100644
index 0000000..1004686
--- /dev/null
+++ b/iw/use_gui.py
@@ -0,0 +1,73 @@
+#
+#use_gui.py: gui USE flags selection.
+#
+# 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
+import gui
+import subprocess
+
+from iw_gui import *
+
+from constants import *
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
+
+class UseWindow(InstallWindow):
+ def getNext(self):
+ return None
+
+ def getScreen(self, anaconda):
+ self.anaconda = anaconda
+ self.intf = anaconda.intf
+
+ (self.xml, self.align) = gui.getGladeWidget("use.glade", "use_align")
+
+ usef = open("/usr/portage/profiles/use.desc")
+ lines = usef.read().split("\n")
+
+ use = {}
+ use_list = [] # Keep them sorted
+ for line in lines:
+ comment = re.search("#", line)
+ if comment:
+ # Truncate the line where the comment starts
+ line = line[:comment.start()]
+ s = line.split(" - ")
+ if s[0] and s[1]:
+ use[s[0]] = s[1]
+ use.append(s[0])
+
+ table = self.xml.get_widget("use_table")
+
+ for flag in use_list:
+ cols = table.get_property("n-columns")
+ rows = table.get_property("n-rows")
+ table.resize(rows+1, cols)
+
+ table.attach(gtk.CheckButton(label=flag), 0, 1, rows, rows+1, gtk.FILL)
+ table.attach(gtk.Label(use[flag]), 1, 2, rows, rows+1)
+
+ return self.align
+
diff --git a/ui/use.glade b/ui/use.glade
index d74d401..7ad672d 100644
--- a/ui/use.glade
+++ b/ui/use.glade
@@ -19,11 +19,20 @@
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes">USE is one of the most powerful variables Gentoo provides to its users. Several programs can be compiled with or without optional support for certain items. For instance, some programs can be compiled with gtk-support, or with qt-support. Others can be compiled with or without SSL support. Some programs can even be compiled with framebuffer support (svgalib) instead of X11 support (X-server).
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">USE is one of the most powerful variables Gentoo provides to its users.
+Several programs can be compiled with or without optional support for certain items.
+
+For instance, some programs can be compiled with gtk-support, or with qt-support.
+Others can be compiled with or without SSL support.
+Some programs can even be compiled with framebuffer support (svgalib) instead of X11 support (X-server).
+
Pick your flags by selecting them. Your profile already set some of the flags, but you can override them if you wish.</property>
<property name="justify">center</property>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -34,25 +43,37 @@ Pick your flags by selecting them. Your profile already set some of the flags, b
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<child>
- <widget class="GtkTable" id="table1">
+ <widget class="GtkViewport" id="viewport1">
<property name="visible">True</property>
- <property name="n_columns">2</property>
+ <property name="resize_mode">queue</property>
<child>
- <widget class="GtkLabel" id="label2">
+ <widget class="GtkTable" id="table1">
<property name="visible">True</property>
- <property name="label" translatable="yes">Flag</property>
+ <property name="n_columns">2</property>
+ <child>
+ <widget class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Flag</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Description</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
</widget>
</child>
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Description</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
</widget>
</child>
</widget>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: /, ui/, iw/
@ 2011-07-21 20:51 Wiktor W Brodlo
0 siblings, 0 replies; 6+ messages in thread
From: Wiktor W Brodlo @ 2011-07-21 20:51 UTC (permalink / raw
To: gentoo-commits
commit: 56ef89e347ffc9b700c1ae98826a8219570d5368
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 20:51:04 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 20:51:04 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=56ef89e3
Remove the progress bar
---
anaconda | 1 -
gui.py | 1 -
iw/welcome_gui.py | 7 -------
ui/anaconda.glade | 12 +-----------
4 files changed, 1 insertions(+), 20 deletions(-)
diff --git a/anaconda b/anaconda
index 3beb128..fc87336 100755
--- a/anaconda
+++ b/anaconda
@@ -486,7 +486,6 @@ class Anaconda(object):
self.makeconf_jobs = None
self.makeconf_load = None
self.makeconf_silent = None
- self.mainxml = None
self.mediaDevice = None
self.methodstr = None
self.mirrors = []
diff --git a/gui.py b/gui.py
index ee32f0f..e09d9b9 100755
--- a/gui.py
+++ b/gui.py
@@ -1477,7 +1477,6 @@ class InstallControlWindow:
def loadGlade(self):
self.mainxml = gtk.glade.XML(findGladeFile("anaconda.glade"),
domain="anaconda")
- self.anaconda.mainxml = self.mainxml
def setup_window (self, window_reload):
self.setLtR()
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index e558f25..6c8780c 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -112,13 +112,6 @@ environment installed on your new system. "),
text_ = xml.get_widget("text")
title_.set_markup("<span size=\"x-large\">%s</span>" % (_("Chapter %i: %s") % (chapter, title)))
text_.set_text(text)
- ip = anaconda.mainxml.get_widget("install_progress")
- current_progress = ip.get_fraction()
- step = 1/len(self.windows)
- new_progress = current_progress + step
- if chapter == 0:
- new_progress = 0
- ip.set_fraction(new_progress)
return align
diff --git a/ui/anaconda.glade b/ui/anaconda.glade
index 486d632..824edd5 100644
--- a/ui/anaconda.glade
+++ b/ui/anaconda.glade
@@ -167,17 +167,7 @@
</packing>
</child>
<child>
- <widget class="GtkProgressBar" id="install_progress">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="show_text">True</property>
- <property name="text" translatable="yes">Installation progress</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
+ <placeholder/>
</child>
<child>
<widget class="GtkHButtonBox" id="hbuttonbox2">
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: /, ui/, iw/
@ 2011-08-09 10:56 Wiktor W Brodlo
0 siblings, 0 replies; 6+ messages in thread
From: Wiktor W Brodlo @ 2011-08-09 10:56 UTC (permalink / raw
To: gentoo-commits
commit: f769ab0b254a64c9813425a6132fd4644eec989a
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Aug 9 10:56:38 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Aug 9 10:56:38 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=f769ab0b
kernel selection
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: /, ui/, iw/
@ 2011-08-11 12:58 Wiktor W Brodlo
0 siblings, 0 replies; 6+ messages in thread
From: Wiktor W Brodlo @ 2011-08-11 12:58 UTC (permalink / raw
To: gentoo-commits
commit: b5f9f85b6e9ab02674aa20a1c470176f58845e4f
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Aug 11 12:57:38 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Aug 11 12:57:38 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=b5f9f85b
Custom kernel
---
anaconda | 2 +
iw/custom_kernel_gui.py | 73 +++++++++++++++++++++++++++++++++++++++++++++++
iw/kernel_gui.py | 2 +
ui/custom_kernel.glade | 24 +++++----------
ui/kernel.glade | 8 ++--
5 files changed, 89 insertions(+), 20 deletions(-)
diff --git a/anaconda b/anaconda
index fc87336..e99e25a 100755
--- a/anaconda
+++ b/anaconda
@@ -472,12 +472,14 @@ class Anaconda(object):
self.displayMode = None
self.extraModules = []
self.firewall = firewall.Firewall()
+ self.genkernel = False
self.id = None
self._instClass = None
self._instLanguage = None
self._intf = None
self.isHeadless = False
self.fullScreen = False
+ self.kernel = None
self.keyboard = keyboard.Keyboard()
self.ksdata = None
self.makeconf_march = None
diff --git a/iw/custom_kernel_gui.py b/iw/custom_kernel_gui.py
new file mode 100644
index 0000000..9e9c46b
--- /dev/null
+++ b/iw/custom_kernel_gui.py
@@ -0,0 +1,73 @@
+#
+# custom_kernel_gui.py: gui kernel configuration.
+#
+# 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
+import gui
+import re
+import subprocess
+
+from iw_gui import *
+
+from constants import *
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
+
+class KernelWindow(InstallWindow):
+ def getNext(self):
+ box = self.xml.get_widget("kernel_viewport")
+ terminal = VirtualTerminal()
+ box.add(terminal)
+
+ out = subprocess.check_output(["emerge", "-p", "gentoo-sources"])
+ kernel_line = out.split("\n")[4].split()
+ for x in kernel_line:
+ m = re.search("sys-kernel/gentoo-sources-.*", kernel_line)
+ if m != None:
+ kernel = m.group(0)
+
+ version = kernel.partition("gentoo-sources-")[2]
+ (version_kernel, version_r, version_rn) = version.partition("-r")
+ version_r = version_r+version_rn
+
+ # Ensure the same version is emerged.
+ terminal.run_command("emerge =gentoo-sources-"+version)
+ terminal.run_command("cd /usr/src/linux-"+version_kernel+"-gentoo"+version_r)
+ terminal.run_command("make nconfig")
+ self.anaconda.kernel = version_kernel+"-gentoo"+version_r
+ return None
+
+ def getScreen(self, anaconda):
+ self.anaconda = anaconda
+ self.intf = anaconda.intf
+
+ # Skip if we're doing a genkernel
+ if self.anaconda.genkernel:
+ return None
+
+ (self.xml, self.align) = gui.getGladeWidget("custom_kernel.glade", "custom_kernel_align")
+
+ return self.align
+
diff --git a/iw/kernel_gui.py b/iw/kernel_gui.py
index e09bc3b..ba4e934 100644
--- a/iw/kernel_gui.py
+++ b/iw/kernel_gui.py
@@ -35,6 +35,8 @@ _ = lambda x: gettext.ldgettext("anaconda", x)
class KernelWindow(InstallWindow):
def getNext(self):
+ if self.xml.get_widget("genkernel").get_property("active"):
+ self.anaconda.genkernel = True
return None
def getScreen(self, anaconda):
diff --git a/ui/custom_kernel.glade b/ui/custom_kernel.glade
index ac316ae..ce61418 100644
--- a/ui/custom_kernel.glade
+++ b/ui/custom_kernel.glade
@@ -2,18 +2,18 @@
<glade-interface>
<!-- interface-requires gtk+ 2.6 -->
<!-- interface-naming-policy toplevel-contextual -->
- <widget class="GtkWindow" id="profile_window">
+ <widget class="GtkWindow" id="kernel_window">
<property name="can_focus">False</property>
<property name="border_width">18</property>
<child>
- <widget class="GtkAlignment" id="profile_align">
+ <widget class="GtkAlignment" id="custom_kernel_align">
<property name="width_request">400</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<child>
- <widget class="GtkVBox" id="profile_box">
+ <widget class="GtkVBox" id="kernel_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -25,7 +25,7 @@
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">You have selected a custom kernel. Use the menu below (nconfig) to create your configuration.
-The basic settings have been selected for you, but no drivers are enabled.</property>
+Press "Next" to download the kernel and configure it. This may take a while, as the kernel image is fairly large (roughly 75 MB).</property>
<property name="justify">center</property>
</widget>
<packing>
@@ -35,20 +35,12 @@ The basic settings have been selected for you, but no drivers are enabled.</prop
</packing>
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <widget class="GtkViewport" id="kernel_viewport">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
+ <property name="can_focus">False</property>
+ <property name="resize_mode">queue</property>
<child>
- <widget class="GtkViewport" id="kernel_viewport">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="resize_mode">queue</property>
- <child>
- <placeholder/>
- </child>
- </widget>
+ <placeholder/>
</child>
</widget>
<packing>
diff --git a/ui/kernel.glade b/ui/kernel.glade
index 01b4ebd..24eb9d4 100644
--- a/ui/kernel.glade
+++ b/ui/kernel.glade
@@ -2,18 +2,18 @@
<glade-interface>
<!-- interface-requires gtk+ 2.6 -->
<!-- interface-naming-policy toplevel-contextual -->
- <widget class="GtkWindow" id="profile_window">
+ <widget class="GtkWindow" id="kernel_window">
<property name="can_focus">False</property>
<property name="border_width">18</property>
<child>
- <widget class="GtkAlignment" id="profile_align">
+ <widget class="GtkAlignment" id="kernel_align">
<property name="width_request">400</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<child>
- <widget class="GtkVBox" id="profile_box">
+ <widget class="GtkVBox" id="kerne_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -48,7 +48,7 @@ However, a custom kernel can be smaller, faster and tailored to your system.</pr
<property name="can_focus">False</property>
<property name="resize_mode">queue</property>
<child>
- <widget class="GtkVBox" id="kernel_box">
+ <widget class="GtkVBox" id="pick_kernel_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="homogeneous">True</property>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: /, ui/, iw/
@ 2011-08-22 4:28 Wiktor W Brodlo
0 siblings, 0 replies; 6+ messages in thread
From: Wiktor W Brodlo @ 2011-08-22 4:28 UTC (permalink / raw
To: gentoo-commits
commit: d5776dc4b0ab883eaac9441d69c75287de6c8773
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Aug 22 04:20:10 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Aug 22 04:20:10 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=d5776dc4
Add -fomit-frame-pointer to list of CFLAGS
---
anaconda | 1 +
iw/makeconf_gui.py | 2 +
ui/makeconf.glade | 78 ++++++++++++++++++++++++++++++++++++++++++---------
3 files changed, 67 insertions(+), 14 deletions(-)
diff --git a/anaconda b/anaconda
index 15a149a..323cf59 100755
--- a/anaconda
+++ b/anaconda
@@ -472,6 +472,7 @@ class Anaconda(object):
self.displayMode = None
self.extraModules = []
self.firewall = firewall.Firewall()
+ self.fomit = False
self.genkernel = True
self.id = None
self._instClass = None
diff --git a/iw/makeconf_gui.py b/iw/makeconf_gui.py
index 87041e9..ec8eaf6 100644
--- a/iw/makeconf_gui.py
+++ b/iw/makeconf_gui.py
@@ -49,6 +49,7 @@ class MakeconfWindow(InstallWindow):
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_property("active")
+ self.anaconda.makeconf_fomit = self.fomit.get_property("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_property("active")
@@ -84,6 +85,7 @@ class MakeconfWindow(InstallWindow):
self.march = self.xml.get_widget("march")
self.opt = self.xml.get_widget("opt")
self.pipe = self.xml.get_widget("pipe")
+ self.fomit = self.xml.get_widget("fomit")
self.jobs = self.xml.get_widget("jobs")
self.load = self.xml.get_widget("load")
self.silent = self.xml.get_widget("silent")
diff --git a/ui/makeconf.glade b/ui/makeconf.glade
index b432f3c..a4bf718 100644
--- a/ui/makeconf.glade
+++ b/ui/makeconf.glade
@@ -45,7 +45,7 @@
<widget class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">4</property>
<property name="n_columns">2</property>
<child>
<widget class="GtkHPaned" id="hpaned1">
@@ -257,6 +257,20 @@ s</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<child>
+ <widget class="GtkCheckButton" id="pipe">
+ <property name="label" translatable="yes">-pipe</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ <child>
<placeholder/>
</child>
<child>
@@ -265,9 +279,21 @@ s</property>
<child>
<placeholder/>
</child>
+ </widget>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkTable" id="table9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
<child>
- <widget class="GtkCheckButton" id="pipe">
- <property name="label" translatable="yes">-pipe</property>
+ <widget class="GtkCheckButton" id="fomit">
+ <property name="label" translatable="yes">-fomit-frame-pointer</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -279,10 +305,34 @@ s</property>
<property name="right_attach">2</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label17">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">Omits frame pointers, resulting in a slight speedup but can have serious repercussions on debugging.</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
</packing>
</child>
</widget>
@@ -551,15 +601,6 @@ Do not set both -j and -l to zero.</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkCheckButton" id="silent">
<property name="label" translatable="yes">-s</property>
<property name="visible">True</property>
@@ -573,6 +614,15 @@ Do not set both -j and -l to zero.</property>
<property name="right_attach">2</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="top_attach">2</property>
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-08-22 4:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-21 20:51 [gentoo-commits] proj/anaconda:master commit in: /, ui/, iw/ Wiktor W Brodlo
-- strict thread matches above, loose matches on Subject: below --
2011-08-22 4:28 Wiktor W Brodlo
2011-08-11 12:58 Wiktor W Brodlo
2011-08-09 10:56 Wiktor W Brodlo
2011-07-04 12:34 Wiktor W Brodlo
2011-07-03 23:37 Wiktor W Brodlo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox