* [gentoo-commits] proj/anaconda:master commit in: iw/, gentoo/
@ 2011-08-09 10:56 Wiktor W Brodlo
0 siblings, 0 replies; 2+ messages in thread
From: Wiktor W Brodlo @ 2011-08-09 10:56 UTC (permalink / raw
To: gentoo-commits
commit: 969666e951e941038b29a56717c8db8cd7e0c09c
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Aug 9 10:55:48 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Aug 9 10:55:48 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=969666e9
:GUI fixes
---
gentoo/utils.py | 9 ---------
iw/mirrorselect_gui.py | 25 +++++++++----------------
2 files changed, 9 insertions(+), 25 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 7548d51..45a3888 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -915,16 +915,7 @@ class GentooInstall:
keywordsf = open(self._root+"/etc/portage/package.keywords", "w")
keywordsf.write("dev-python/rhpl ~amd64 ~x86\nsys-boot/grub **\nsys-boot/os-prober ~amd64 ~x86")
keywordsf.close()
- self.install_package("-1 system-config-date")
self._progress.set_fraction(0.3)
- self.install_package("-1 system-config-keyboard")
- self._progress.set_fraction(0.4)
- self.install_package("-1 system-config-users")
- self._progress.set_fraction(0.5)
- self.install_package("-1 keyboard-configuration-helpers")
- self._progress.set_fraction(0.6)
- self.install_package("-1 language-configuration-helpers")
- self._progress.set_fraction(0.7)
self.install_package("-1 =grub-1.99")
self._progress.set_fraction(0.8)
del os.environ["USE"]
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index 64d536f..b5f2764 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -76,13 +76,13 @@ class MirrorselectWindow(InstallWindow):
def addMirrors(self, mirror_list, mirror_data, xml):
(regions, countries, mirrors) = mirror_list
- self.treestore = gtk.TreeStore(gtk.Widget, str, str, str)
+ self.treestore = gtk.TreeStore(bool, str, str, str, str)
for region in regions:
- region_ts = self.treestore.append(None, [gtk.Label(region), "", "", ""])
+ region_ts = self.treestore.append(False, [region, "", "", ""])
for country in countries[region]:
- country_ts = self.treestore.append(region_ts, [gtk.Label(country), "", "", ""])
+ country_ts = self.treestore.append(region_ts, [country, "", "", ""])
for mirror in mirrors[country]:
- cb = self.addMirrorRow(self.treestore, country_ts, region, country, mirror, mirror_data[region][country][mirror], )
+ self.addMirrorRow(self.treestore, country_ts, region, country, mirror, mirror_data[region][country][mirror])
treeview = gtk.TreeView(self.treestore)
url_column = gtk.TreeViewColumn(_("Mirror URL"))
treeview.append_column(url_column)
@@ -98,24 +98,19 @@ class MirrorselectWindow(InstallWindow):
name_column.pack_start(text_cell, True)
ipv4_column.pack_start(text_cell, True)
ipv6_column.pack_start(text_cell, True)
- url_column.add_attribute(url_cell, "activatable", 0)
+ url_column.add_attribute(url_cell, "active", 0)
name_column.add_attribute(text_cell, "text", 1)
ipv4_column.add_attribute(text_cell, "text", 2)
ipv6_column.add_attribute(text_cell, "text", 3)
treeview.set_search_column(1)
- url_cell.connect("toggled", self.toggleCB, cb)
+ url_cell.connect("toggled", self.toggleCB, self.treestore)
xml.get_widget("mirrors_viewport").add(treeview)
- def toggleCB(self, cb):
- if cb.get_active() == True:
- cb.set_active(False)
- else:
- cb.set_active(True)
+ def toggleCB(self, widget, path, model):
+ model[path][0] = not model[path][0]
def addMirrorRow(self, ts, country_ts, region, country, mirror, data):
- cb = gtk.CheckButton(label=data["url"], use_underline=False)
-
ipv4 = ""
ipv6 = ""
if data["ipv4"] == "y":
@@ -123,9 +118,7 @@ class MirrorselectWindow(InstallWindow):
if data["ipv6"] == "y":
ipv6 = " ipv6"
- ts.append(country_ts, [cb, mirror, ipv4, ipv6])
- return cb
-
+ ts.append(country_ts, [False, mirror, ipv4, ipv6])
def downloadMirrorlist(self):
try:
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/, gentoo/
@ 2011-08-20 1:40 Wiktor W Brodlo
0 siblings, 0 replies; 2+ messages in thread
From: Wiktor W Brodlo @ 2011-08-20 1:40 UTC (permalink / raw
To: gentoo-commits
commit: bb88d6e6784f616ecf2d353cf360086249fff04f
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sat Aug 20 01:40:01 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sat Aug 20 01:40:01 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=bb88d6e6
Fixed some syntax errors
---
gentoo/NOTES | 4 ----
gentoo/utils.py | 4 ++--
iw/mirrorselect_gui.py | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/gentoo/NOTES b/gentoo/NOTES
deleted file mode 100644
index 530425d..0000000
--- a/gentoo/NOTES
+++ /dev/null
@@ -1,4 +0,0 @@
-Welcome to the Gentoo Linux Anaconda porting project.
-
-TODO:
- - [FUTURE] iscsi/dasd stuff untested
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 507ac82..276d536 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -776,7 +776,7 @@ class GentooInstall:
stageurl = "http://distfiles.gentoo.org/releases/%s/autobuilds/%s" % (arch, stage)
- os.system("wget -nc -O "+productPath+" %s " % stageurl)
+ anaconda._intf.instProgress.terminal.run_command("wget -nc -O "+productPath+" %s " % stageurl)
action = _("Unpacking stage3")
anaconda._intf.instProgress.terminal.run_command("tar xvjpf "+productPath+" -C "+self._root)
@@ -895,7 +895,7 @@ class GentooInstall:
anaconda._intf.instProgress.terminal.run_command("chroot "+self._root+" eselect kernel set 1")
anaconda._intf.instProgress.terminal.run_command("cd "+self._root+"/usr/src/linux")
anaconda._intf.instProgress.terminal.run_command("make && make modules && make modules_install")
- shutil.copy2(self+.root+"/usr/src/linux/arch/x86/boot/bzImage", self._root+"/boot/kernel-gentoo")
+ shutil.copy2(self._root+"/usr/src/linux/arch/x86/boot/bzImage", self._root+"/boot/kernel-gentoo")
self._progress.set_fraction(1.0)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index b5f2764..1e0291e 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -108,7 +108,7 @@ class MirrorselectWindow(InstallWindow):
xml.get_widget("mirrors_viewport").add(treeview)
def toggleCB(self, widget, path, model):
- model[path][0] = not model[path][0]
+ model[path][0] = not model[path][0]
def addMirrorRow(self, ts, country_ts, region, country, mirror, data):
ipv4 = ""
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-08-20 1:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-20 1:40 [gentoo-commits] proj/anaconda:master commit in: iw/, gentoo/ Wiktor W Brodlo
-- strict thread matches above, loose matches on Subject: below --
2011-08-09 10:56 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