* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-06-20 19:07 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-06-20 19:07 UTC (permalink / raw
To: gentoo-commits
commit: 84fcd066151d778340eac1666d4e718e7863d458
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jun 20 19:07:00 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jun 20 19:07:00 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=84fcd066
Try disabling FCOE, it's broken on Gentoo
---
iw/filter_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/filter_gui.py b/iw/filter_gui.py
index 782edd7..56072c5 100644
--- a/iw/filter_gui.py
+++ b/iw/filter_gui.py
@@ -545,7 +545,7 @@ class FilterWindow(InstallWindow):
udev_trigger(subsystem="block", action="change")
# So that drives onlined by these show up in the filter UI
storage.iscsi.iscsi().startup(anaconda.intf)
- storage.fcoe.fcoe().startup(anaconda.intf)
+ #storage.fcoe.fcoe().startup(anaconda.intf)
storage.zfcp.ZFCP().startup()
# Note we do NOT call dasd.startup() here, that does not online drives,
# but only checks if they need formatting.
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-06-20 19:28 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-06-20 19:28 UTC (permalink / raw
To: gentoo-commits
commit: 2f7d74f0871873f513a3336bb1f3c8349ef6709e
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jun 20 19:27:50 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jun 20 19:27:50 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=2f7d74f0
Yeah I'm naive...
---
iw/filter_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/filter_gui.py b/iw/filter_gui.py
index 56072c5..782edd7 100644
--- a/iw/filter_gui.py
+++ b/iw/filter_gui.py
@@ -545,7 +545,7 @@ class FilterWindow(InstallWindow):
udev_trigger(subsystem="block", action="change")
# So that drives onlined by these show up in the filter UI
storage.iscsi.iscsi().startup(anaconda.intf)
- #storage.fcoe.fcoe().startup(anaconda.intf)
+ storage.fcoe.fcoe().startup(anaconda.intf)
storage.zfcp.ZFCP().startup()
# Note we do NOT call dasd.startup() here, that does not online drives,
# but only checks if they need formatting.
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-06-21 12:15 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-06-21 12:15 UTC (permalink / raw
To: gentoo-commits
commit: 2d5b7f2a1a865850301fb8d4a6c8cda217c80633
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jun 21 12:14:55 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jun 21 12:14:55 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=2d5b7f2a
Changed the adbox (screenshots) to a vte terminal.
---
iw/VirtualTerminal.py | 182 +++++++++++++++++++++++++++++++++++++++++++++++++
iw/progress_gui.py | 32 ++++++---
2 files changed, 202 insertions(+), 12 deletions(-)
diff --git a/iw/VirtualTerminal.py b/iw/VirtualTerminal.py
new file mode 100644
index 0000000..cec8888
--- /dev/null
+++ b/iw/VirtualTerminal.py
@@ -0,0 +1,182 @@
+#!/usr/bin/env python
+#
+# VirtualTerminal.py
+#
+# Copyright 2007 Edward Andrew Robinson <earobinson@gmail>
+#
+# 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, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+
+# Imports
+import os
+import vte
+import gtk
+import time
+
+class VirtualTerminal(vte.Terminal):
+ def __init__(self, log_file = None, history_length = 5, prompt_watch = {}, prompt_auto_reply = True, icon = None):
+ # Set up terminal
+ vte.Terminal.__init__(self)
+
+ self.history = []
+ self.history_length = history_length
+ self.icon = icon
+ self.last_row_logged = 0
+ self.log_file = log_file
+ self.prompt_auto_reply = prompt_auto_reply
+ self.prompt_watch = prompt_watch
+
+ self.connect('eof', self.run_command_done_callback)
+ self.connect('child-exited', self.run_command_done_callback)
+ self.connect('cursor-moved', self.contents_changed_callback)
+
+ if False:
+ self.connect('char-size-changed', self.activate_action, 'char-size-changed')
+ #self.connect('child-exited', self.activate_action, 'child-exited')
+ self.connect('commit', self.activate_action, 'commit')
+ self.connect('contents-changed', self.activate_action, 'contents-changed')
+ #self.connect('cursor-moved', self.activate_action, 'cursor-moved')
+ self.connect('decrease-font-size', self.activate_action, 'decrease-font-size')
+ self.connect('deiconify-window', self.activate_action, 'deiconify-window')
+ self.connect('emulation-changed', self.activate_action, 'emulation-changed')
+ self.connect('encoding-changed', self.activate_action, 'encoding-changed')
+ #self.connect('eof', self.activate_action, 'eof')
+ self.connect('icon-title-changed', self.activate_action, 'icon-title-changed')
+ self.connect('iconify-window', self.activate_action, 'iconify-window')
+ self.connect('increase-font-size', self.activate_action, 'increase-font-size')
+ self.connect('lower-window', self.activate_action, 'lower-window')
+ self.connect('maximize-window', self.activate_action, 'maximize-window')
+ self.connect('move-window', self.activate_action, 'move-window')
+ self.connect('raise-window', self.activate_action, 'raise-window')
+ self.connect('refresh-window', self.activate_action, 'refresh-window')
+ self.connect('resize-window', self.activate_action, 'resize-window')
+ self.connect('restore-window', self.activate_action, 'restore-window')
+ self.connect('selection-changed', self.activate_action, 'selection-changed')
+ self.connect('status-line-changed', self.activate_action, 'status-line-changed')
+ self.connect('text-deleted', self.activate_action, 'text-deleted')
+ self.connect('text-inserted', self.activate_action, 'text-inserted')
+ self.connect('text-modified', self.activate_action, 'text-modified')
+ self.connect('text-scrolled', self.activate_action, 'text-scrolled')
+ self.connect('window-title-changed', self.activate_action, 'window-title-changed')
+
+ def activate_action(self, action, string):
+ print 'Action ' + action.get_name() + ' activated ' + str(string)
+
+ def capture_text(self,text,text2,text3,text4):
+ return True
+
+ def contents_changed_callback(self, terminal):
+ '''Gets the last line printed to the terminal, it will log
+ this line using self.log() (if the logger is on, and it will
+ also prompt this line using self.prompt() if the line needs
+ prompting'''
+ column,row = self.get_cursor_position()
+ if self.last_row_logged != row:
+ off = row-self.last_row_logged
+ text = self.get_text_range(row-off,0,row-1,-1,self.capture_text)
+ self.last_row_logged=row
+ text = text.strip()
+
+ # Log
+ self.log(text)
+
+ # Prompter
+ self.prompter()
+
+ def get_last_line(self):
+ terminal_text = self.get_text(self.capture_text)
+ terminal_text = terminal_text.split('\\\\n')
+ ii = len(terminal_text) - 1
+ while terminal_text[ii] == '':
+ ii = ii - 1
+ terminal_text = terminal_text[ii]
+
+ return terminal_text
+
+ def log(self, text):
+ '''if self.log_file is not None the the line will be logged to
+ self.log_file. This function also stors the info in self.histoy
+ if self.history_lenght > 0'''
+ if self.log_file != None:
+ date_string = time.strftime('[%d %b %Y %H:%M:%S] ', time.localtime())
+ file = open(self.log_file, 'a')
+ file.write(date_string + text + '\\\\n')
+ file.close
+
+ # Append to internal history
+ if self.history_length != 0:
+ if len(self.history) >= self.history_length:
+ self.history.pop(0)
+ self.history.append(text)
+
+ def prompter(self):
+ last_line = self.get_last_line()
+ if last_line in self.prompt_watch:
+ if self.prompt_auto_reply == False:
+ message = ''
+ for ii in self.prompt_watch[last_line]:
+ message = message + self.history[self.history_length - 1 - ii]
+ if self.yes_no_question(message):
+ self.feed_child('Yes\\\\n')
+ # TODO not sure why this is needed twice
+ self.feed_child('Yes\\\\n')
+ else:
+ self.feed_child('No\\\\n')
+ else:
+ self.feed_child('Yes\\\\n')
+
+ def run_command(self, command_string):
+ '''run_command runs the command_string in the terminal. This
+ function will only return when self.thred_running is set to
+ True, this is done by run_command_done_callback'''
+ self.thread_running = True
+ spaces = ''
+ for ii in range(80 - len(command_string) - 2):
+ spaces = spaces + ' '
+ self.feed('$ ' + str(command_string) + spaces)
+ self.log('$ ' + str(command_string) + spaces)
+
+ command = command_string.split(' ')
+ pid = self.fork_command(command=command[0], argv=command, directory=os.getcwd())
+
+ while self.thread_running:
+ #time.sleep(.01)
+ gtk.main_iteration()
+
+ def run_command_done_callback(self, terminal):
+ '''When called this function sets the thread as done allowing
+ the run_command function to exit'''
+ #print 'child done'
+ self.thread_running = False
+
+ def yes_no_question(self, message):
+ message = message.replace('\\\\n\\\\n', '[NEWLINE][NEWLINE]').replace('\\\\n', '').replace('[NEWLINE]', '\\\\n')
+
+ if message.find('?') == -1:
+ message = message + '\\\\n\\\\nDo you want to continue?'
+
+ type=gtk.MESSAGE_QUESTION
+ if message.lower().find('warning') != -1:
+ type=gtk.MESSAGE_WARNING
+
+ dialog = gtk.MessageDialog(parent=None, flags=0, type=type, buttons=gtk.BUTTONS_YES_NO, message_format=message)
+ dialog.set_icon(self.icon)
+ dialog.show_all()
+ responce = dialog.run()
+ dialog.destroy()
+
+ # Responce == yes
+ return responce == -8
+
diff --git a/iw/progress_gui.py b/iw/progress_gui.py
index bfbd19e..75c8523 100644
--- a/iw/progress_gui.py
+++ b/iw/progress_gui.py
@@ -33,6 +33,8 @@ import language
import logging
log = logging.getLogger("anaconda")
+from VirtualTerminal import VirtualTerminal
+
class InstallProgressWindow (InstallWindow):
windowTitle = N_("Installing Packages")
@@ -122,25 +124,31 @@ class InstallProgressWindow (InstallWindow):
self.intf.icw.prevClicked()
return
- self.pixmaps = self._getRnotes()
+ #self.pixmaps = self._getRnotes()
# Create vbox to contain components of UI
vbox = gtk.VBox (False, 12)
# Create rnote area
- self.adpix = None
+ # Gentoo uses the rnote area for emerge progress.
+ #self.adpix = None
self.adbox = None
- pix = gui.readImageFromFile(self.pixmaps[0])
- if pix:
- frame = gtk.Frame()
- frame.set_shadow_type(gtk.SHADOW_NONE)
- box = gtk.EventBox()
- self.adpix = pix
- box.add(self.adpix)
- self.adbox = box
- frame.add(box)
- vbox.pack_start(frame, True, True)
+ self.terminal = VirtualTerminal()
+
+ #pix = gui.readImageFromFile(self.pixmaps[0])
+ #if pix:
+ frame = gtk.Frame()
+ frame.set_shadow_type(gtk.SHADOW_NONE)
+ box = gtk.EventBox()
+ # self.adpix = pix
+ box.add(self.terminal)
+ self.adbox = box
+ frame.add(box)
+ vbox.pack_start(frame, True, True)
+
+ # Just an example for now
+ self.terminal.run_command('/bin/bash')
self.progress = gtk.ProgressBar()
vbox.pack_start(self.progress, False, False)
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-06-21 12:40 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-06-21 12:40 UTC (permalink / raw
To: gentoo-commits
commit: f5ea92b95725945fb72f72908c7a216acfdfe343
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jun 21 12:40:12 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jun 21 12:40:12 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=f5ea92b9
Moved VirtualTerminal.py
---
iw/VirtualTerminal.py | 182 -------------------------------------------------
1 files changed, 0 insertions(+), 182 deletions(-)
diff --git a/iw/VirtualTerminal.py b/iw/VirtualTerminal.py
deleted file mode 100644
index cec8888..0000000
--- a/iw/VirtualTerminal.py
+++ /dev/null
@@ -1,182 +0,0 @@
-#!/usr/bin/env python
-#
-# VirtualTerminal.py
-#
-# Copyright 2007 Edward Andrew Robinson <earobinson@gmail>
-#
-# 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-
-# Imports
-import os
-import vte
-import gtk
-import time
-
-class VirtualTerminal(vte.Terminal):
- def __init__(self, log_file = None, history_length = 5, prompt_watch = {}, prompt_auto_reply = True, icon = None):
- # Set up terminal
- vte.Terminal.__init__(self)
-
- self.history = []
- self.history_length = history_length
- self.icon = icon
- self.last_row_logged = 0
- self.log_file = log_file
- self.prompt_auto_reply = prompt_auto_reply
- self.prompt_watch = prompt_watch
-
- self.connect('eof', self.run_command_done_callback)
- self.connect('child-exited', self.run_command_done_callback)
- self.connect('cursor-moved', self.contents_changed_callback)
-
- if False:
- self.connect('char-size-changed', self.activate_action, 'char-size-changed')
- #self.connect('child-exited', self.activate_action, 'child-exited')
- self.connect('commit', self.activate_action, 'commit')
- self.connect('contents-changed', self.activate_action, 'contents-changed')
- #self.connect('cursor-moved', self.activate_action, 'cursor-moved')
- self.connect('decrease-font-size', self.activate_action, 'decrease-font-size')
- self.connect('deiconify-window', self.activate_action, 'deiconify-window')
- self.connect('emulation-changed', self.activate_action, 'emulation-changed')
- self.connect('encoding-changed', self.activate_action, 'encoding-changed')
- #self.connect('eof', self.activate_action, 'eof')
- self.connect('icon-title-changed', self.activate_action, 'icon-title-changed')
- self.connect('iconify-window', self.activate_action, 'iconify-window')
- self.connect('increase-font-size', self.activate_action, 'increase-font-size')
- self.connect('lower-window', self.activate_action, 'lower-window')
- self.connect('maximize-window', self.activate_action, 'maximize-window')
- self.connect('move-window', self.activate_action, 'move-window')
- self.connect('raise-window', self.activate_action, 'raise-window')
- self.connect('refresh-window', self.activate_action, 'refresh-window')
- self.connect('resize-window', self.activate_action, 'resize-window')
- self.connect('restore-window', self.activate_action, 'restore-window')
- self.connect('selection-changed', self.activate_action, 'selection-changed')
- self.connect('status-line-changed', self.activate_action, 'status-line-changed')
- self.connect('text-deleted', self.activate_action, 'text-deleted')
- self.connect('text-inserted', self.activate_action, 'text-inserted')
- self.connect('text-modified', self.activate_action, 'text-modified')
- self.connect('text-scrolled', self.activate_action, 'text-scrolled')
- self.connect('window-title-changed', self.activate_action, 'window-title-changed')
-
- def activate_action(self, action, string):
- print 'Action ' + action.get_name() + ' activated ' + str(string)
-
- def capture_text(self,text,text2,text3,text4):
- return True
-
- def contents_changed_callback(self, terminal):
- '''Gets the last line printed to the terminal, it will log
- this line using self.log() (if the logger is on, and it will
- also prompt this line using self.prompt() if the line needs
- prompting'''
- column,row = self.get_cursor_position()
- if self.last_row_logged != row:
- off = row-self.last_row_logged
- text = self.get_text_range(row-off,0,row-1,-1,self.capture_text)
- self.last_row_logged=row
- text = text.strip()
-
- # Log
- self.log(text)
-
- # Prompter
- self.prompter()
-
- def get_last_line(self):
- terminal_text = self.get_text(self.capture_text)
- terminal_text = terminal_text.split('\\\\n')
- ii = len(terminal_text) - 1
- while terminal_text[ii] == '':
- ii = ii - 1
- terminal_text = terminal_text[ii]
-
- return terminal_text
-
- def log(self, text):
- '''if self.log_file is not None the the line will be logged to
- self.log_file. This function also stors the info in self.histoy
- if self.history_lenght > 0'''
- if self.log_file != None:
- date_string = time.strftime('[%d %b %Y %H:%M:%S] ', time.localtime())
- file = open(self.log_file, 'a')
- file.write(date_string + text + '\\\\n')
- file.close
-
- # Append to internal history
- if self.history_length != 0:
- if len(self.history) >= self.history_length:
- self.history.pop(0)
- self.history.append(text)
-
- def prompter(self):
- last_line = self.get_last_line()
- if last_line in self.prompt_watch:
- if self.prompt_auto_reply == False:
- message = ''
- for ii in self.prompt_watch[last_line]:
- message = message + self.history[self.history_length - 1 - ii]
- if self.yes_no_question(message):
- self.feed_child('Yes\\\\n')
- # TODO not sure why this is needed twice
- self.feed_child('Yes\\\\n')
- else:
- self.feed_child('No\\\\n')
- else:
- self.feed_child('Yes\\\\n')
-
- def run_command(self, command_string):
- '''run_command runs the command_string in the terminal. This
- function will only return when self.thred_running is set to
- True, this is done by run_command_done_callback'''
- self.thread_running = True
- spaces = ''
- for ii in range(80 - len(command_string) - 2):
- spaces = spaces + ' '
- self.feed('$ ' + str(command_string) + spaces)
- self.log('$ ' + str(command_string) + spaces)
-
- command = command_string.split(' ')
- pid = self.fork_command(command=command[0], argv=command, directory=os.getcwd())
-
- while self.thread_running:
- #time.sleep(.01)
- gtk.main_iteration()
-
- def run_command_done_callback(self, terminal):
- '''When called this function sets the thread as done allowing
- the run_command function to exit'''
- #print 'child done'
- self.thread_running = False
-
- def yes_no_question(self, message):
- message = message.replace('\\\\n\\\\n', '[NEWLINE][NEWLINE]').replace('\\\\n', '').replace('[NEWLINE]', '\\\\n')
-
- if message.find('?') == -1:
- message = message + '\\\\n\\\\nDo you want to continue?'
-
- type=gtk.MESSAGE_QUESTION
- if message.lower().find('warning') != -1:
- type=gtk.MESSAGE_WARNING
-
- dialog = gtk.MessageDialog(parent=None, flags=0, type=type, buttons=gtk.BUTTONS_YES_NO, message_format=message)
- dialog.set_icon(self.icon)
- dialog.show_all()
- responce = dialog.run()
- dialog.destroy()
-
- # Responce == yes
- return responce == -8
-
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-06-21 12:43 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-06-21 12:43 UTC (permalink / raw
To: gentoo-commits
commit: 2c35ce0e48426389da708ed9dc41e0da53477c69
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jun 21 12:43:04 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jun 21 12:43:04 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=2c35ce0e
Back to adpix
---
iw/progress_gui.py | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/iw/progress_gui.py b/iw/progress_gui.py
index 75c8523..9580966 100644
--- a/iw/progress_gui.py
+++ b/iw/progress_gui.py
@@ -131,21 +131,21 @@ class InstallProgressWindow (InstallWindow):
# Create rnote area
# Gentoo uses the rnote area for emerge progress.
- #self.adpix = None
+ self.adpix = None
self.adbox = None
self.terminal = VirtualTerminal()
- #pix = gui.readImageFromFile(self.pixmaps[0])
- #if pix:
- frame = gtk.Frame()
- frame.set_shadow_type(gtk.SHADOW_NONE)
- box = gtk.EventBox()
- # self.adpix = pix
- box.add(self.terminal)
- self.adbox = box
- frame.add(box)
- vbox.pack_start(frame, True, True)
+ pix = gui.readImageFromFile(self.pixmaps[0])
+ if pix:
+ frame = gtk.Frame()
+ frame.set_shadow_type(gtk.SHADOW_NONE)
+ box = gtk.EventBox()
+ self.adpix = pix
+ box.add(self.adpix)
+ self.adbox = box
+ frame.add(box)
+ vbox.pack_start(frame, True, True)
# Just an example for now
self.terminal.run_command('/bin/bash')
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-06-21 12:56 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-06-21 12:56 UTC (permalink / raw
To: gentoo-commits
commit: f5cce2a819b471f510a923f7a020aed0c05b3ecc
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jun 21 12:55:37 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jun 21 12:55:37 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=f5cce2a8
Forget to uncomment _getRnotes
---
iw/progress_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/progress_gui.py b/iw/progress_gui.py
index 9580966..11cb71c 100644
--- a/iw/progress_gui.py
+++ b/iw/progress_gui.py
@@ -124,7 +124,7 @@ class InstallProgressWindow (InstallWindow):
self.intf.icw.prevClicked()
return
- #self.pixmaps = self._getRnotes()
+ self.pixmaps = self._getRnotes()
# Create vbox to contain components of UI
vbox = gtk.VBox (False, 12)
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-06-21 13:04 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-06-21 13:04 UTC (permalink / raw
To: gentoo-commits
commit: 91f2ce7aa328a12ca276d8690433cf704485bba7
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jun 21 13:03:54 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jun 21 13:03:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=91f2ce7a
Appartently running /bin/bash is a bad idea
---
iw/progress_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/progress_gui.py b/iw/progress_gui.py
index 11cb71c..4940a48 100644
--- a/iw/progress_gui.py
+++ b/iw/progress_gui.py
@@ -148,7 +148,7 @@ class InstallProgressWindow (InstallWindow):
vbox.pack_start(frame, True, True)
# Just an example for now
- self.terminal.run_command('/bin/bash')
+ #self.terminal.run_command('/bin/bash')
self.progress = gtk.ProgressBar()
vbox.pack_start(self.progress, False, False)
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-06-21 13:12 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-06-21 13:12 UTC (permalink / raw
To: gentoo-commits
commit: 46df36f1f5552b1c448d6c43f2b5b9c3ddb76b92
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jun 21 13:11:58 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jun 21 13:11:58 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=46df36f1
Carefully enable vte
---
iw/progress_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/progress_gui.py b/iw/progress_gui.py
index 4940a48..07545ae 100644
--- a/iw/progress_gui.py
+++ b/iw/progress_gui.py
@@ -142,7 +142,7 @@ class InstallProgressWindow (InstallWindow):
frame.set_shadow_type(gtk.SHADOW_NONE)
box = gtk.EventBox()
self.adpix = pix
- box.add(self.adpix)
+ box.add(self.terminal)
self.adbox = box
frame.add(box)
vbox.pack_start(frame, True, True)
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-06-21 13:40 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-06-21 13:40 UTC (permalink / raw
To: gentoo-commits
commit: 33a5078d06fbf8be54677c89e3524d59c013c1fa
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jun 21 13:39:38 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jun 21 13:39:38 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=33a5078d
Removed adpix
---
iw/progress_gui.py | 59 ++++++++--------------------------------------------
1 files changed, 9 insertions(+), 50 deletions(-)
diff --git a/iw/progress_gui.py b/iw/progress_gui.py
index 07545ae..b1f1012 100644
--- a/iw/progress_gui.py
+++ b/iw/progress_gui.py
@@ -85,70 +85,29 @@ class InstallProgressWindow (InstallWindow):
raise ValueError, "Invalid value passed to setShowPercentage"
self._showPercentage = val
- def _getRnotes(self):
- langs = []
- pixmaps = []
- if (os.environ.has_key('LANG')):
- langs = language.expandLangs(os.environ['LANG'])
- langs.append('')
-
- pixmaps = []
- # OEM path overrides built in
- oem_pixmaps_path = "/etc/oem/anaconda/rnotes/%s/*.png"
- oem_pixmaps_dir = "/etc/oem/anaconda/rnotes"
- if os.path.isdir(oem_pixmaps_dir):
- paths = ("/tmp/product/pixmaps/rnotes/%s/*.png",
- oem_pixmaps_path)
- else:
- paths = ("/tmp/product/pixmaps/rnotes/%s/*.png",
- "/usr/share/anaconda/pixmaps/rnotes/%s/*.png")
- for p in paths:
- for lang in langs:
- path = p % lang
- pixmaps = glob.glob(path)
- if len(pixmaps) > 0:
- break
-
- if len(pixmaps) > 0:
- files = sorted([os.path.join("rnotes", os.path.basename(x)) for \
- x in pixmaps])
- else:
- files = ["progress_first.png"]
-
- return files
-
-
def getScreen (self, anaconda):
self.intf = anaconda.intf
if anaconda.dir == DISPATCH_BACK:
self.intf.icw.prevClicked()
return
- self.pixmaps = self._getRnotes()
-
# Create vbox to contain components of UI
vbox = gtk.VBox (False, 12)
# Create rnote area
# Gentoo uses the rnote area for emerge progress.
- self.adpix = None
self.adbox = None
-
self.terminal = VirtualTerminal()
- pix = gui.readImageFromFile(self.pixmaps[0])
- if pix:
- frame = gtk.Frame()
- frame.set_shadow_type(gtk.SHADOW_NONE)
- box = gtk.EventBox()
- self.adpix = pix
- box.add(self.terminal)
- self.adbox = box
- frame.add(box)
- vbox.pack_start(frame, True, True)
-
- # Just an example for now
- #self.terminal.run_command('/bin/bash')
+ frame = gtk.Frame()
+ frame.set_shadow_type(gtk.SHADOW_NONE)
+ box = gtk.EventBox()
+ box.add(self.terminal)
+ self.adbox = box
+ frame.add(box)
+ vbox.pack_start(frame, True, True)
+
+ self.terminal.run_command('echo Starting installation...');
self.progress = gtk.ProgressBar()
vbox.pack_start(self.progress, False, False)
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-01 2:03 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-01 2:03 UTC (permalink / raw
To: gentoo-commits
commit: 301adc55a30cd82949d6910d335454881bd5ece1
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul 1 02:03:00 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul 1 02:03:00 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=301adc55
iw/makeconf_gui.py: import gui
---
iw/makeconf_gui.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/iw/makeconf_gui.py b/iw/makeconf_gui.py
index 6c1d3fd..c8a77be 100644
--- a/iw/makeconf_gui.py
+++ b/iw/makeconf_gui.py
@@ -25,6 +25,7 @@ import gtk.gdk
import gobject
import pango
import sys
+import gui
from iw_gui import *
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-03 15:54 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-03 15:54 UTC (permalink / raw
To: gentoo-commits
commit: a53cceb5be3be401fb660060b7ca93b03ad986ef
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul 3 15:54:25 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul 3 15:54:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=a53cceb5
mirrorselect_gui.py: fixed indentation
---
iw/mirrorselect_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index 564c433..0f5ed3e 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -45,7 +45,7 @@ class MirrorselectWindow(InstallWindow):
self.anaconda.makeconf.silent = self.silent.get_active()
return None
- def getScreen(self, anaconda):
+ def getScreen(self, anaconda):
self.anaconda = anaconda
self.intf = anaconda.intf
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-03 16:00 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-03 16:00 UTC (permalink / raw
To: gentoo-commits
commit: 0667d78e27ad6aad78cd990c9c4229635568b62c
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul 3 16:00:19 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul 3 16:00:19 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=0667d78e
indent fix
---
iw/mirrorselect_gui.py | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index 0f5ed3e..24bbc7e 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -37,13 +37,7 @@ _ = lambda x: gettext.ldgettext("anaconda", x)
class MirrorselectWindow(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
+ return None
def getScreen(self, anaconda):
self.anaconda = anaconda
@@ -78,7 +72,6 @@ class MirrorselectWindow(InstallWindow):
def addMirrors(self, table, mirror_list, mirror_data):
(regions, countries, mirrors) = mirror_list
-
for region in regions:
for country in countries:
for mirror in mirrors:
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-03 16:41 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-03 16:41 UTC (permalink / raw
To: gentoo-commits
commit: 4fbdf328676f88770db30416d8cda068aaa794e3
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul 3 16:40:37 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul 3 16:40:37 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=4fbdf328
iw/mirrorselect_gui.py: filter mirrors to http+ftp
---
iw/mirrorselect_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index 24bbc7e..9e2699b 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -62,7 +62,7 @@ class MirrorselectWindow(InstallWindow):
self.xml.get_widget("downloading").destroy()
mirrors_parsed = self.parseMirrors(mirrorsf)
- self.mirrors = self.mirrorList(mirrors_parsed, proto)
+ self.mirrors = self.mirrorList(mirrors_parsed, "http+ftp")
self.table = self.xml.get_widget("mirrors_table")
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-03 16:49 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-03 16:49 UTC (permalink / raw
To: gentoo-commits
commit: 0a06b4b94817be49ac69a2cc4d1ae8a283c2765d
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul 3 16:49:23 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul 3 16:49:23 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=0a06b4b9
w/mirrorselect_gui.py: add "self"
---
iw/mirrorselect_gui.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index 9e2699b..faa99b2 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -66,7 +66,7 @@ class MirrorselectWindow(InstallWindow):
self.table = self.xml.get_widget("mirrors_table")
- addMirrors(self.table, self.mirrors, mirrors_parsed)
+ self.addMirrors(self.table, self.mirrors, mirrors_parsed)
return self.align
@@ -75,7 +75,7 @@ class MirrorselectWindow(InstallWindow):
for region in regions:
for country in countries:
for mirror in mirrors:
- addMirrorRow(table, region, country, mirror, mirror_data[region][country][mirror])
+ self.addMirrorRow(table, region, country, mirror, mirror_data[region][country][mirror])
def addMirrorRow(self, table, region, country, mirror, data):
cols = table.get_property("n-columns")
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-03 17:15 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-03 17:15 UTC (permalink / raw
To: gentoo-commits
commit: fa53ff0c49ce27ed5e3c243d15e18aaf9af3b6f0
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul 3 17:15:36 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul 3 17:15:36 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=fa53ff0c
iw/mirrorselect_gui.py: fixed mirror parsing logic
---
iw/mirrorselect_gui.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index faa99b2..9740164 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -73,8 +73,8 @@ class MirrorselectWindow(InstallWindow):
def addMirrors(self, table, mirror_list, mirror_data):
(regions, countries, mirrors) = mirror_list
for region in regions:
- for country in countries:
- for mirror in mirrors:
+ for country in countries[region]:
+ for mirror in mirrors[country]:
self.addMirrorRow(table, region, country, mirror, mirror_data[region][country][mirror])
def addMirrorRow(self, table, region, country, mirror, data):
@@ -83,7 +83,7 @@ class MirrorselectWindow(InstallWindow):
table.resize(rows+1, cols)
cb = gtk.CheckButton(label=data["url"], use_underline=False)
- name = gtk.Label("%s: %s\n%n" % (region, country, mirror))
+ name = gtk.Label("%s: %s\n%s" % (region, country, mirror))
flags_text = data["proto"]
if data["ipv4"] == "y":
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-03 17:52 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-03 17:52 UTC (permalink / raw
To: gentoo-commits
commit: 20f4eae83668407e8ad2832f8d3a99b26846efa0
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul 3 17:52:17 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul 3 17:52:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=20f4eae8
w/mirrorselect_gui.py: stop the checkboxes from taking up all the space
---
iw/mirrorselect_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index 43a7d1a..997f88d 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -92,7 +92,7 @@ class MirrorselectWindow(InstallWindow):
flags_text += " ipv6"
flags = gtk.Label(flags_text)
- table.attach(cb, 0, 1, rows, rows+1)
+ table.attach(cb, 0, 1, rows, rows+1, gtk.Fill)
table.attach(name, 1, 2, rows, rows+1)
table.attach(flags, 2, 3, rows, rows+1)
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-03 18:59 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-03 18:59 UTC (permalink / raw
To: gentoo-commits
commit: 3d0f89cad264be001003fa05c12bb06d79e20041
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul 3 18:58:46 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul 3 18:58:46 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=3d0f89ca
The "downloading mirror list" label no longer needed
---
iw/mirrorselect_gui.py | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index 0bfd275..1bc606c 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -59,8 +59,6 @@ class MirrorselectWindow(InstallWindow):
md.destroy()
InstallControlWindow._doExit([])
- self.xml.get_widget("downloading").destroy()
-
mirrors_parsed = self.parseMirrors(mirrorsf)
self.mirrors = self.mirrorList(mirrors_parsed, "http+ftp")
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-03 19:06 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-03 19:06 UTC (permalink / raw
To: gentoo-commits
commit: 9b5dd0b0a92646833f952ff8a1d83dab3238a16e
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul 3 19:05:37 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul 3 19:05:37 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=9b5dd0b0
iw/mirrorselect_gui.py: gtk.Fill -> gtk.FILL
---
iw/mirrorselect_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index 1bc606c..48129a7 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -92,7 +92,7 @@ class MirrorselectWindow(InstallWindow):
flags = gtk.Label(flags_text)
flags.set_alignment(0, 0)
- table.attach(cb, 0, 1, rows, rows+1, gtk.Fill)
+ table.attach(cb, 0, 1, rows, rows+1, gtk.FILL)
table.attach(name, 1, 2, rows, rows+1)
table.attach(flags, 2, 3, rows, rows+1)
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-03 19:21 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-03 19:21 UTC (permalink / raw
To: gentoo-commits
commit: a835be410ed4891b3a53eec0b1a41cd4852efb86
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul 3 19:21:10 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul 3 19:21:10 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=a835be41
iw/mirrorselect-sync_gui.py: change heading
---
iw/mirrorselect-sync_gui.py | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/iw/mirrorselect-sync_gui.py b/iw/mirrorselect-sync_gui.py
index 17d84ec..153134c 100644
--- a/iw/mirrorselect-sync_gui.py
+++ b/iw/mirrorselect-sync_gui.py
@@ -46,6 +46,9 @@ class MirrorselectSyncWindow(InstallWindow):
(self.xml, self.align) = gui.getGladeWidget("mirrorselect.glade", "mirrorselect_align")
+ intro_label = self.xml.get_widget("intro_label")
+ intro_label.set_label(_("Choose your Portage sync mirror(s).\nThese are used to sync your Portage tree."))
+
mirrorsf = None
while mirrorsf == None:
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-03 19:28 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-03 19:28 UTC (permalink / raw
To: gentoo-commits
commit: e8a13bc021de2b518f92608aa97beb1f1818e2ea
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul 3 19:28:16 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul 3 19:28:16 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=e8a13bc0
MirrorselectWindow needs InstallWindow
---
iw/mirrorselect-sync_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/mirrorselect-sync_gui.py b/iw/mirrorselect-sync_gui.py
index 153134c..26b5d60 100644
--- a/iw/mirrorselect-sync_gui.py
+++ b/iw/mirrorselect-sync_gui.py
@@ -42,7 +42,7 @@ class MirrorselectSyncWindow(InstallWindow):
def getScreen(self, anaconda):
self.anaconda = anaconda
self.intf = anaconda.intf
- ms = MirrorselectWindow()
+ ms = MirrorselectWindow(InstallWindow)
(self.xml, self.align) = gui.getGladeWidget("mirrorselect.glade", "mirrorselect_align")
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-04 12:42 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-04 12:42 UTC (permalink / raw
To: gentoo-commits
commit: c189f4b4389ddae76265e1bbb9d0028e8e26b0c4
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 4 12:41:58 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 4 12:41:58 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=c189f4b4
iw/use_gui.py: import re
---
iw/use_gui.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/iw/use_gui.py b/iw/use_gui.py
index 1004686..b78e529 100644
--- a/iw/use_gui.py
+++ b/iw/use_gui.py
@@ -27,6 +27,7 @@ import pango
import sys
import gui
import subprocess
+import re
from iw_gui import *
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-04 12:56 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-04 12:56 UTC (permalink / raw
To: gentoo-commits
commit: fe83179fa51294f15aa2e4ad50cefa457d873680
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 4 12:56:03 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 4 12:56:03 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=fe83179f
w/use_gui.py: keep a sorted list of USE flags
---
iw/use_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/use_gui.py b/iw/use_gui.py
index b78e529..f2980ae 100644
--- a/iw/use_gui.py
+++ b/iw/use_gui.py
@@ -58,7 +58,7 @@ class UseWindow(InstallWindow):
s = line.split(" - ")
if s[0] and s[1]:
use[s[0]] = s[1]
- use.append(s[0])
+ use_list.append(s[0])
table = self.xml.get_widget("use_table")
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-04 14:17 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-04 14:17 UTC (permalink / raw
To: gentoo-commits
commit: 8c490ea65b7ec64d6f5055263e696aa39651227e
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 4 14:17:40 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 4 14:17:40 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=8c490ea6
iw/use_gui.py: Check flags enabled by the profile
---
iw/use_gui.py | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/iw/use_gui.py b/iw/use_gui.py
index d903c42..d121cc4 100644
--- a/iw/use_gui.py
+++ b/iw/use_gui.py
@@ -28,6 +28,7 @@ import sys
import gui
import subprocess
import re
+import shutil
from iw_gui import *
@@ -45,6 +46,14 @@ class UseWindow(InstallWindow):
(self.xml, self.align) = gui.getGladeWidget("use.glade", "use_align")
+ # Temporarily move the make.conf file and query emerge to find out the flags selected by the profile
+ shutil.move("/etc/make.conf", "/etc/make.conf.anaconda-backup")
+ emerge = subprocess.check_output(["emerge", "--info"])
+ shutil.move("/etc/make.conf.anaconda-backup", "/etc/make.conf")
+ m = re.search('USE="(.*?)"', emerge)
+ use_enabled = m.group(1)
+ use_enabled = use_enabled.split
+
usef = open("/usr/portage/profiles/use.desc")
lines = usef.read().split("\n")
@@ -67,10 +76,17 @@ class UseWindow(InstallWindow):
rows = table.get_property("n-rows")
table.resize(rows+1, cols)
+ cb = gtk.CheckButton(label=flag)
+ if flag in use_enabled:
+ cb.active = True
+
l = gtk.Label(use[flag])
l.set_alignment(0,0)
- table.attach(gtk.CheckButton(label=flag), 0, 1, rows, rows+1, gtk.FILL)
+
+ table.attach(cb, 0, 1, rows, rows+1, gtk.FILL)
table.attach(l, 1, 2, rows, rows+1)
+
+
return self.align
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-04 14:18 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-04 14:18 UTC (permalink / raw
To: gentoo-commits
commit: 1733b313890053dd276e5da8deff50866a7268f8
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 4 14:18:21 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 4 14:18:21 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=1733b313
iw/use_gui.py: tiny fix (parethesis)
---
iw/use_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/use_gui.py b/iw/use_gui.py
index d121cc4..bff7fc1 100644
--- a/iw/use_gui.py
+++ b/iw/use_gui.py
@@ -52,7 +52,7 @@ class UseWindow(InstallWindow):
shutil.move("/etc/make.conf.anaconda-backup", "/etc/make.conf")
m = re.search('USE="(.*?)"', emerge)
use_enabled = m.group(1)
- use_enabled = use_enabled.split
+ use_enabled = use_enabled.split()
usef = open("/usr/portage/profiles/use.desc")
lines = usef.read().split("\n")
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-04 14:40 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-04 14:40 UTC (permalink / raw
To: gentoo-commits
commit: bf6b9e5e22b6e7e457443b68b508fd86be3458a0
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 4 14:39:23 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 4 14:39:23 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=bf6b9e5e
iw/use_gui.py: CheckButton active assignment doesn't work, use set_active()
---
iw/use_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/use_gui.py b/iw/use_gui.py
index bff7fc1..2ed1d0b 100644
--- a/iw/use_gui.py
+++ b/iw/use_gui.py
@@ -78,7 +78,7 @@ class UseWindow(InstallWindow):
cb = gtk.CheckButton(label=flag)
if flag in use_enabled:
- cb.active = True
+ cb.set_active(True)
l = gtk.Label(use[flag])
l.set_alignment(0,0)
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-04 14:53 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-04 14:53 UTC (permalink / raw
To: gentoo-commits
commit: c62c274c46c80045d5d937808b14ae6a5c5047df
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 4 14:53:16 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 4 14:53:16 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=c62c274c
w/use_gui.py: Use partition instead of split
---
iw/use_gui.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/iw/use_gui.py b/iw/use_gui.py
index 2ed1d0b..a675b60 100644
--- a/iw/use_gui.py
+++ b/iw/use_gui.py
@@ -64,9 +64,9 @@ class UseWindow(InstallWindow):
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]
+ s = line.partition(" - ")
+ if s[0] and s[2]:
+ use[s[0]] = s[2]
use_list.append(s[0])
table = self.xml.get_widget("use_table")
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-04 15:16 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-04 15:16 UTC (permalink / raw
To: gentoo-commits
commit: c37d34f006b4b2b9ca75205ae6db458be7875cfd
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 4 15:16:19 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 4 15:16:19 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=c37d34f0
iw/use_gui.py: store profile-selected USE flags
---
iw/use_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/use_gui.py b/iw/use_gui.py
index a675b60..8fcb199 100644
--- a/iw/use_gui.py
+++ b/iw/use_gui.py
@@ -86,7 +86,7 @@ class UseWindow(InstallWindow):
table.attach(cb, 0, 1, rows, rows+1, gtk.FILL)
table.attach(l, 1, 2, rows, rows+1)
-
+ self.use_profile = use_enabled
return self.align
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-04 16:19 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-04 16:19 UTC (permalink / raw
To: gentoo-commits
commit: 9eaf8ec7c14d36b930dfa17a8bcc5c754f1e6e30
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 4 16:18:49 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 4 16:18:49 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=9eaf8ec7
iw/systools_gui.py: corrected class name
---
iw/systools_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/systools_gui.py b/iw/systools_gui.py
index f1e3773..9a2194a 100644
--- a/iw/systools_gui.py
+++ b/iw/systools_gui.py
@@ -33,7 +33,7 @@ from constants import *
import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
-class SystoolWindow(InstallWindow):
+class SystoolsWindow(InstallWindow):
def getNext(self):
return None
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-04 16:32 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-04 16:32 UTC (permalink / raw
To: gentoo-commits
commit: 0fa08643f85623e7e1bf9bb8e02d2640555e3f7c
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 4 16:32:12 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 4 16:32:12 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=0fa08643
iw/systools_gui.py: fixed glade flie name
---
iw/systools_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/systools_gui.py b/iw/systools_gui.py
index 9a2194a..1bedb1d 100644
--- a/iw/systools_gui.py
+++ b/iw/systools_gui.py
@@ -41,7 +41,7 @@ class SystoolsWindow(InstallWindow):
self.anaconda = anaconda
self.intf = anaconda.intf
- (self.xml, self.align) = gui.getGladeWidget("systool.glade", "systool_align")
+ (self.xml, self.align) = gui.getGladeWidget("systools.glade", "systools_align")
return self.align
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-05 12:07 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-05 12:07 UTC (permalink / raw
To: gentoo-commits
commit: d39ccb8e4d45f1bd8c21b95e95acd39498251a00
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jul 5 12:07:42 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jul 5 12:07:42 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=d39ccb8e
iw/profile_gui.py: fixed typo is -> in
---
iw/profile_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/profile_gui.py b/iw/profile_gui.py
index de3369e..24d47c6 100644
--- a/iw/profile_gui.py
+++ b/iw/profile_gui.py
@@ -36,7 +36,7 @@ _ = lambda x: gettext.ldgettext("anaconda", x)
class ProfileWindow(InstallWindow):
def getNext(self):
- for button is self.buttons:
+ for button in self.buttons:
if button.get_property("active")
self.anaconda.profile = button.get_property("label")
return None
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-05 12:22 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-05 12:22 UTC (permalink / raw
To: gentoo-commits
commit: d206620793b4be55ebc517108c003e357d79b6aa
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jul 5 12:22:06 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jul 5 12:22:06 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=d2066207
iw/profile_gui.py: more typos
---
iw/profile_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/profile_gui.py b/iw/profile_gui.py
index 24d47c6..6641b31 100644
--- a/iw/profile_gui.py
+++ b/iw/profile_gui.py
@@ -37,7 +37,7 @@ _ = lambda x: gettext.ldgettext("anaconda", x)
class ProfileWindow(InstallWindow):
def getNext(self):
for button in self.buttons:
- if button.get_property("active")
+ if button.get_property("active"):
self.anaconda.profile = button.get_property("label")
return None
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-05 12:33 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-05 12:33 UTC (permalink / raw
To: gentoo-commits
commit: 2a7536e8f56298a6cf4f938f43fca186e6453a76
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jul 5 12:32:48 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jul 5 12:32:48 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=2a7536e8
iw/profile_gui.py: fix radiobutton creation
---
iw/profile_gui.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/iw/profile_gui.py b/iw/profile_gui.py
index 6641b31..ecc35cd 100644
--- a/iw/profile_gui.py
+++ b/iw/profile_gui.py
@@ -60,10 +60,10 @@ class ProfileWindow(InstallWindow):
box = self.xml.get_widget("profiles_box")
# This isn't on the page but is required to make a group dynamically.
- dummy = gtk.RadioButton(label=profile)
+ dummy = gtk.RadioButton()
for profile in profiles:
- cb = gtk.RadioButton(dummy, label=profile)
+ cb = gtk.RadioButton(group=dummy, label=profile, use_underline=False)
box.pack_start(cb)
self.buttons = dummy.get_group()
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-05 12:36 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-05 12:36 UTC (permalink / raw
To: gentoo-commits
commit: e5cdeb7d7ee10d56f640e3450c64112d8a001027
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jul 5 12:36:31 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jul 5 12:36:31 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=e5cdeb7d
iw/profile_gui.py: Set the selected profile (needed for USE flags)
---
iw/profile_gui.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/iw/profile_gui.py b/iw/profile_gui.py
index ecc35cd..8b289f8 100644
--- a/iw/profile_gui.py
+++ b/iw/profile_gui.py
@@ -39,6 +39,8 @@ class ProfileWindow(InstallWindow):
for button in self.buttons:
if button.get_property("active"):
self.anaconda.profile = button.get_property("label")
+ # We need this for the USE flags
+ subprocess.call(["eselect", "profile", "set", self.anaconda.profile])
return None
def getScreen(self, anaconda):
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-07 18:58 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-07 18:58 UTC (permalink / raw
To: gentoo-commits
commit: 086c91213bae72fc46d93b683668763fd6a0de4c
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 7 18:51:03 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 7 18:51:03 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=086c9121
Stare systools settings
---
iw/systools_gui.py | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/iw/systools_gui.py b/iw/systools_gui.py
index 1bedb1d..d33a38a 100644
--- a/iw/systools_gui.py
+++ b/iw/systools_gui.py
@@ -35,6 +35,8 @@ _ = lambda x: gettext.ldgettext("anaconda", x)
class SystoolsWindow(InstallWindow):
def getNext(self):
+ self.anaconda.cron = self.cron.get_active_text()
+ self.anaconda.syslog = self.syslog.get_active_text()
return None
def getScreen(self, anaconda):
@@ -43,5 +45,8 @@ class SystoolsWindow(InstallWindow):
(self.xml, self.align) = gui.getGladeWidget("systools.glade", "systools_align")
+ self.cron = self.xml.get_widget("cron")
+ self.syslog = self.xml.get_widget("syslog")
+
return self.align
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-07 18:58 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-07 18:58 UTC (permalink / raw
To: gentoo-commits
commit: 57659968f14e71c124a019d61809a8c7ed90114c
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 7 18:58:02 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 7 18:58:02 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=57659968
iw/makeconf_gui.py: stare the *settings*
---
iw/makeconf_gui.py | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/iw/makeconf_gui.py b/iw/makeconf_gui.py
index 56830c0..1e51756 100644
--- a/iw/makeconf_gui.py
+++ b/iw/makeconf_gui.py
@@ -35,12 +35,12 @@ _ = lambda x: gettext.ldgettext("anaconda", x)
class MakeconfWindow(InstallWindow):
def getNext(self):
- self.anaconda.makeconf_march = self.march
- self.anaconda.makeconf_opt = self.opt
- self.anaconda.makeconf_pipe = self.pipe
- self.anaconda.makeconf_jobs = self.jobs
- self.anaconda.makeconf_load = self.load
- self.anaconda.makeconf_silent = self.silent
+ 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_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")
return None
def getScreen(self, anaconda):
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-07 20:22 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-07 20:22 UTC (permalink / raw
To: gentoo-commits
commit: e6d8b802b7800ce405918464198ae61e02551f09
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 7 20:22:09 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 7 20:22:09 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=e6d8b802
iw/mirrorselect_gui.py: make self.buttons available to the whole class
---
iw/mirrorselect_gui.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index cad5efb..daf50a7 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -36,6 +36,8 @@ import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
class MirrorselectWindow(InstallWindow):
+ buttons = []
+
def getNext(self):
for button in self.buttons:
if button.get_property("active"):
@@ -67,7 +69,6 @@ class MirrorselectWindow(InstallWindow):
self.table = self.xml.get_widget("mirrors_table")
- self.buttons = []
self.addMirrors(self.table, self.mirrors, mirrors_parsed)
return self.align
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-07 20:35 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-07 20:35 UTC (permalink / raw
To: gentoo-commits
commit: 23e46eafd171f75574458a0a57aa145be10f5066
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 7 20:35:31 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 7 20:35:31 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=23e46eaf
iw/systools_gui.py: fix syslog -> logger in glade
---
iw/systools_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/systools_gui.py b/iw/systools_gui.py
index d33a38a..b8c67ac 100644
--- a/iw/systools_gui.py
+++ b/iw/systools_gui.py
@@ -46,7 +46,7 @@ class SystoolsWindow(InstallWindow):
(self.xml, self.align) = gui.getGladeWidget("systools.glade", "systools_align")
self.cron = self.xml.get_widget("cron")
- self.syslog = self.xml.get_widget("syslog")
+ self.syslog = self.xml.get_widget("logger")
return self.align
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-08 15:42 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-08 15:42 UTC (permalink / raw
To: gentoo-commits
commit: 0490badcc7257dc78ffc6c2bf5062e1d4964a541
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul 8 15:41:50 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul 8 15:41:50 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=0490badc
iw/use_gui.py: forgot a self
---
iw/use_gui.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/iw/use_gui.py b/iw/use_gui.py
index b3bf64b..a0f3e8c 100644
--- a/iw/use_gui.py
+++ b/iw/use_gui.py
@@ -48,9 +48,9 @@ class UseWindow(InstallWindow):
use.append(button.get_property("label"))
for flag in use:
- if flag not in use_profile: # flag enabled by user, disabled by profile
+ if flag not in self.use_profile: # flag enabled by user, disabled by profile
self.anaconda.use_flags.append(flag)
- for flag in use_profile:
+ for flag in self.use_profile:
if flag not in use: # flag is disabled by user, enabled by profile
self.anaconda.use_flags.append("-"+flag)
return None
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-08 16:18 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-08 16:18 UTC (permalink / raw
To: gentoo-commits
commit: 4c694082c3d382d15e2b3375f36a8e540b4b723e
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul 8 16:16:40 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul 8 16:16:40 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=4c694082
iw/use_gui.py: ignore non-user-settable flags
---
iw/use_gui.py | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/iw/use_gui.py b/iw/use_gui.py
index a0f3e8c..06361f0 100644
--- a/iw/use_gui.py
+++ b/iw/use_gui.py
@@ -94,6 +94,7 @@ class UseWindow(InstallWindow):
cb = gtk.CheckButton(label=flag)
if flag in use_enabled:
cb.set_active(True)
+ self.use_profile.append(flag) # ignore non-user-settable flags
l = gtk.Label(use[flag])
l.set_alignment(0,0)
@@ -103,7 +104,5 @@ class UseWindow(InstallWindow):
self.buttons.append(cb)
- self.use_profile = use_enabled
-
return self.align
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-09 18:43 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-09 18:43 UTC (permalink / raw
To: gentoo-commits
commit: 29f85a3a28f7d45fa3d5f75e9ba69febbd3cd2b7
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sat Jul 9 18:43:35 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sat Jul 9 18:43:35 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=29f85a3a
iw/xorg_gui.py: colonoscopy
---
iw/xorg_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/xorg_gui.py b/iw/xorg_gui.py
index 9b0f8e2..c4ce6c5 100644
--- a/iw/xorg_gui.py
+++ b/iw/xorg_gui.py
@@ -39,7 +39,7 @@ class XorgWindow(InstallWindow):
def getNext(self):
for de in des:
cb = self.xml.get_widget(de)
- if cb.get_property("active")
+ if cb.get_property("active"):
self.anaconda.xorg = de
return None
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-09 19:06 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-09 19:06 UTC (permalink / raw
To: gentoo-commits
commit: 4721dadad38e9c7f8cab891d43c38149870ff70e
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sat Jul 9 19:05:59 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sat Jul 9 19:05:59 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=4721dada
iw/xorg_gui.py: forgot self
---
iw/xorg_gui.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/iw/xorg_gui.py b/iw/xorg_gui.py
index c4ce6c5..39ab165 100644
--- a/iw/xorg_gui.py
+++ b/iw/xorg_gui.py
@@ -37,7 +37,7 @@ class XorgWindow(InstallWindow):
des = ["fluxbox", "gnome", "kde", "lxde", "xfce4"]
def getNext(self):
- for de in des:
+ for de in self.des:
cb = self.xml.get_widget(de)
if cb.get_property("active"):
self.anaconda.xorg = de
@@ -49,7 +49,7 @@ class XorgWindow(InstallWindow):
(self.xml, self.align) = gui.getGladeWidget("makeconf.glade", "makeconf_align")
- for de in des:
+ for de in self.des:
icon = self.xml.get_widget(de+"_icon")
gui.readImageFromFile(de+".png", image=icon)
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-09 19:20 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-09 19:20 UTC (permalink / raw
To: gentoo-commits
commit: 7eee36df76534bc5582a97f9b5046ee0025ab0ee
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sat Jul 9 19:19:52 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sat Jul 9 19:19:52 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=7eee36df
w/xorg_gui.py: load the xorg screen
---
iw/xorg_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/xorg_gui.py b/iw/xorg_gui.py
index 39ab165..af0434a 100644
--- a/iw/xorg_gui.py
+++ b/iw/xorg_gui.py
@@ -47,7 +47,7 @@ class XorgWindow(InstallWindow):
self.anaconda = anaconda
self.intf = anaconda.intf
- (self.xml, self.align) = gui.getGladeWidget("makeconf.glade", "makeconf_align")
+ (self.xml, self.align) = gui.getGladeWidget("xorg.glade", "xorg_align")
for de in self.des:
icon = self.xml.get_widget(de+"_icon")
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-09 22:43 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-09 22:43 UTC (permalink / raw
To: gentoo-commits
commit: fe7c9eebea59eae21160ee290dba1e44b4cf190a
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sat Jul 9 22:43:29 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sat Jul 9 22:43:29 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=fe7c9eeb
iw/xorg_gui.py: force the X USE flag if installing Xorg
---
iw/xorg_gui.py | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/iw/xorg_gui.py b/iw/xorg_gui.py
index af0434a..aef4e8d 100644
--- a/iw/xorg_gui.py
+++ b/iw/xorg_gui.py
@@ -41,6 +41,12 @@ class XorgWindow(InstallWindow):
cb = self.xml.get_widget(de)
if cb.get_property("active"):
self.anaconda.xorg = de
+ # All DEs need the X use flag
+ if self.anaconda.xorg:
+ if "X" not in self.anaconda.use_flags:
+ self.anaconda.use_flags.append("X")
+ if "-X" in self.anaconda.use_flags:
+ del self.anaconda.use_flags.index("-X")
return None
def getScreen(self, anaconda):
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-10 1:44 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-10 1:44 UTC (permalink / raw
To: gentoo-commits
commit: 259f3d19be63572b706683c1232b0fc902aac419
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul 10 01:44:35 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul 10 01:44:35 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=259f3d19
iw/xorg_gui.py: delete -X useflag properly
---
iw/xorg_gui.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/iw/xorg_gui.py b/iw/xorg_gui.py
index aef4e8d..737b752 100644
--- a/iw/xorg_gui.py
+++ b/iw/xorg_gui.py
@@ -46,7 +46,8 @@ class XorgWindow(InstallWindow):
if "X" not in self.anaconda.use_flags:
self.anaconda.use_flags.append("X")
if "-X" in self.anaconda.use_flags:
- del self.anaconda.use_flags.index("-X")
+ f = self.anaconda.use_flags.index("-X")
+ del self.anaconda.use_flags[f]
return None
def getScreen(self, anaconda):
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-21 12:43 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-21 12:43 UTC (permalink / raw
To: gentoo-commits
commit: a78d105feb840a76acf49435016396c5ad1e6b95
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 12:43:29 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 12:43:29 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=a78d105f
iw/__init__.py: entry point for iw modules
---
iw/__init__.py | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/iw/__init__.py b/iw/__init__.py
new file mode 100644
index 0000000..d32e013
--- /dev/null
+++ b/iw/__init__.py
@@ -0,0 +1,4 @@
+# __init__.py
+# Entry point for anaconda's iw modules.
+
+# Yes, we don't have to do anything.
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-21 13:42 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-21 13:42 UTC (permalink / raw
To: gentoo-commits
commit: b8b73c7edc37bbc5f121ff761104a44cd65d81db
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 13:41:10 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 13:41:10 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=b8b73c7e
iw/welcome_gui.py: rework the system for easy extensibility
---
iw/welcome_gui.py | 142 ++++++++++++++++++++++++++++------------------------
1 files changed, 76 insertions(+), 66 deletions(-)
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index b7576e8..01f3f31 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -28,79 +28,89 @@ _ = lambda x: gettext.ldgettext("anaconda", x)
class WelcomeWindow (InstallWindow):
- def setWindow(self, title, text, chapter, linktext=None):
- (xml, align) = gui.getGladeWidget("welcome.glade", "welcome_align")
- title_ = self.xml.get_widget("title")
- text_ = self.xml.get_widget("text")
- title_.set_markup("<span style=\"font-size: 200%\">%s</span>")
- title_.set_attribute("label", _("Chapter %i: %s") % (chapter, title))
- text_.set_attribute("text", text)
-
- def welcome(self, anaconda):
- self.setWindow(_("Welcome to the Gentoo installer!"),
- _("This wizard will take you through installing Gentoo \
- on your computer. We will follow the official Gentoo \
- Handbook (with a few changes) and if at any point \
- you'd like to consult the handbook, you'll find the \
- link in the top-right corner of the window.\n\n\
- We'll start off asking you for the language and \
- keyboard layout you'd like the installer and your \
- future system to use. We will then skip straight to \
- Chapter 4 and continue with the installation."),
- 0, "Gentoo Handbook")
+ windows = {
+ "welcome" : (
+ _("Welcome to the Gentoo installer!"),
+ _("This wizard will take you through installing Gentoo \
+ on your computer. We will follow the official Gentoo \
+ Handbook (with a few changes) and if at any point \
+ you'd like to consult the handbook, you'll find the \
+ link in the top-right corner of the window.\n\n\
+ We'll start off asking you for the language and \
+ keyboard layout you'd like the installer and your \
+ future system to use. We will then skip straight to \
+ Chapter 4 and continue with the installation."),
+ 0, "Gentoo Handbook"),
- def preparedisks(self, anaconda):
- self.setWindow(_("Preparing the Disks"),
- _("To be able to install Gentoo, you must create the \
- necessary partitions. The following screens will \
- help you choose the right disk configuration for \
- your system."), 4)
+ "preparedisks" : (
+ _("Preparing the Disks"),
+ _("To be able to install Gentoo, you must create the \
+ necessary partitions. The following screens will \
+ help you choose the right disk configuration for \
+ your system."),
+ 4, None),
- def installationfiles(self, anaconda):
- self.setWindow(_("Installing the Gentoo Installation Files"),
- _("Gentoo installs work through a stage3 archive. In \
- this chapter the installer will help you choose the \
- right compilation options for your machine. "), 5)
+ "installationfiles" : (
+ _("Installing the Gentoo Installation Files"),
+ _("Gentoo installs work through a stage3 archive. In \
+ this chapter the installer will help you choose the \
+ right compilation options for your machine. "),
+ 5, None),
- def basesystem(self, anaconda):
- self.setWindow(_("Installing the Gentoo Installation Files"),
- _("In this chapter you will set your Gentoo mirrors, \
- select your profile and choose your the USE flags."),
- 6)
+ "basesystem" : (
+ _("Installing the Gentoo Installation Files"),
+ _("In this chapter you will set your Gentoo mirrors, \
+ select your profile and choose your the USE flags."),
+ 6, None),
- def configurekernel(self, anaconda):
- self.setWindow(_("Configuring the Kernel"),
- _("The Linux kernel is the core of every distribution. \
- This chapter explains how to configure your kernel. \
- You will only have to set your timezone, as the \
- installer will just copy the LiveDVD kernel to your \
- new system."),
- 7)
+ "configurekernel": (
+ _("Configuring the Kernel"),
+ _("The Linux kernel is the core of every distribution. \
+ This chapter explains how to configure your kernel. \
+ You will only have to set your timezone, as the \
+ installer will just copy the LiveDVD kernel to your \
+ new system."),
+ 7, None),
- def configuresystem(self, anaconda):
- self.setWindow(_("Configuring your System"),
- _("In this chapter you will only have to set your root \
- password as the rest is figured out automatically ;-)"),
- 8)
+ "configuresystem" : (
+ _("Configuring your System"),
+ _("In this chapter you will only have to set your root \
+ password as the rest is figured out automatically ;-)"),
+ 8, None),
- def systools(self, anaconda):
- self.setWindow(_("Installing Necessary System Tools"),
- _("In this chapter we help you choose and install some important tools."),
- 9)
+ "systools" : (
+ _("Installing Necessary System Tools"),
+ _("In this chapter we help you choose and install some important tools."),
+ 9, None),
- def bootloader(self, anaconda):
- self.setWindow(_("Configuring the Bootloader"),
- _("In this chapter you'll be able configure the GRUB \
- bootloader."),
- 10)
+ "bootloader" : (
+ _("Configuring the Bootloader"),
+ _("In this chapter you'll be able configure the GRUB bootloader."),
+ 10, None),
- def finalizing(self, anaconda):
- self.setWindow(_("Finalizing your Gentoo Installation"),
- _("You're almost done. We'll just create a user for \
- your system.\n\
- You'll also be able to choose if you'd like the X \
- Window System and a desktop environment installed on \
- your new system. "),
- 11)
+ "finalizing" : (
+ _("Finalizing your Gentoo Installation"),
+ _("You're almost done. We'll just create a user for \
+ your system.\n\
+ You'll also be able to choose if you'd like the X \
+ Window System and a desktop environment installed on \
+ your new system. "),
+ 11, None)
+ }
+
+ def getScreen(self, anaconda):
+ (step, _anaconda) = anaconda.dispatch.currentStep()
+ (title, text, chapter, linktext) = self.windows[step]
+ self.setWindow(title, text, chapter, linktext)
+
+ def setWindow(self, title, text, chapter, linktext):
+ (xml, align) = gui.getGladeWidget("welcome.glade", "welcome_align")
+ title_ = self.xml.get_widget("title")
+ text_ = self.xml.get_widget("text")
+ title_.set_markup("<span style=\"font-size: 200%\">%s</span>")
+ title_.set_attribute("label", _("Chapter %i: %s") % (chapter, title))
+ text_.set_attribute("text", text)
+
+
def getNext(self):
return None
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-21 13:47 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-21 13:47 UTC (permalink / raw
To: gentoo-commits
commit: 8478e492420254becd63d43242150d0963538c06
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 13:47:32 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 13:47:32 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=8478e492
iw/welcome_gui.py: oops, indent
---
iw/welcome_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index 01f3f31..62cf012 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -28,7 +28,7 @@ _ = lambda x: gettext.ldgettext("anaconda", x)
class WelcomeWindow (InstallWindow):
- windows = {
+ windows = {
"welcome" : (
_("Welcome to the Gentoo installer!"),
_("This wizard will take you through installing Gentoo \
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-21 14:19 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-21 14:19 UTC (permalink / raw
To: gentoo-commits
commit: 27b8fe776985122f8f918232ca8a5a54dac2ed31
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 14:19:18 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 14:19:18 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=27b8fe77
iw/welcome_gui.py: fix setting attributes
---
iw/welcome_gui.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index 92f111d..bdeaf51 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -108,8 +108,8 @@ class WelcomeWindow (InstallWindow):
title_ = xml.get_widget("title")
text_ = xml.get_widget("text")
title_.set_markup("<span style=\"font-size: 200%\">%s</span>")
- title_.set_attribute("label", _("Chapter %i: %s") % (chapter, title))
- text_.set_attribute("text", text)
+ title_.set_text(_("Chapter %i: %s") % (chapter, title))
+ text_.set_text(text)
def getNext(self):
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-21 14:36 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-21 14:36 UTC (permalink / raw
To: gentoo-commits
commit: 33ca7143dedea62deb21c27c7569e3900a735f7e
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 14:35:56 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 14:35:56 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=33ca7143
iw/welcome_gui.py: make getScreen return an align
---
iw/welcome_gui.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index bdeaf51..23336f6 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -101,7 +101,7 @@ class WelcomeWindow (InstallWindow):
def getScreen(self, anaconda):
(step, _anaconda) = anaconda.dispatch.currentStep()
(title, text, chapter, linktext) = self.windows[step]
- self.setWindow(title, text, chapter, linktext)
+ return self.setWindow(title, text, chapter, linktext)
def setWindow(self, title, text, chapter, linktext):
(xml, align) = gui.getGladeWidget("welcome.glade", "welcome_align")
@@ -110,6 +110,7 @@ class WelcomeWindow (InstallWindow):
title_.set_markup("<span style=\"font-size: 200%\">%s</span>")
title_.set_text(_("Chapter %i: %s") % (chapter, title))
text_.set_text(text)
+ return align
def getNext(self):
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-21 14:47 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-21 14:47 UTC (permalink / raw
To: gentoo-commits
commit: 9b3338c4de54e5430dd33665e7fce6d0bdbacb5f
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 14:47:34 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 14:47:34 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=9b3338c4
iw/welcome_gui.py: fix font size markup
---
iw/welcome_gui.py | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index 23336f6..538e04c 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -32,50 +32,50 @@ class WelcomeWindow (InstallWindow):
"welcomescreen" : (
_("Welcome to the Gentoo installer!"),
_("This wizard will take you through installing Gentoo \
- on your computer. We will follow the official Gentoo \
- Handbook (with a few changes) and if at any point \
- you'd like to consult the handbook, you'll find the \
- link in the top-right corner of the window.\n\n\
- We'll start off asking you for the language and \
- keyboard layout you'd like the installer and your \
- future system to use. We will then skip straight to \
- Chapter 4 and continue with the installation."),
+on your computer. We will follow the official Gentoo \
+Handbook (with a few changes) and if at any point \
+you'd like to consult the handbook, you'll find the \
+link in the top-right corner of the window.\n\n\
+We'll start off asking you for the language and \
+keyboard layout you'd like the installer and your \
+future system to use. We will then skip straight to \
+Chapter 4 and continue with the installation."),
0, "Gentoo Handbook"),
"preparedisks" : (
_("Preparing the Disks"),
_("To be able to install Gentoo, you must create the \
- necessary partitions. The following screens will \
- help you choose the right disk configuration for \
- your system."),
+necessary partitions. The following screens will \
+help you choose the right disk configuration for \
+your system."),
4, None),
"installationfiles" : (
_("Installing the Gentoo Installation Files"),
_("Gentoo installs work through a stage3 archive. In \
- this chapter the installer will help you choose the \
- right compilation options for your machine. "),
+this chapter the installer will help you choose the \
+right compilation options for your machine. "),
5, None),
"basesystem" : (
_("Installing the Gentoo Installation Files"),
_("In this chapter you will set your Gentoo mirrors, \
- select your profile and choose your the USE flags."),
+select your profile and choose your the USE flags."),
6, None),
"configurekernel": (
_("Configuring the Kernel"),
_("The Linux kernel is the core of every distribution. \
- This chapter explains how to configure your kernel. \
- You will only have to set your timezone, as the \
- installer will just copy the LiveDVD kernel to your \
- new system."),
+This chapter explains how to configure your kernel. \
+You will only have to set your timezone, as the \
+installer will just copy the LiveDVD kernel to your \
+new system."),
7, None),
"configuresystem" : (
_("Configuring your System"),
_("In this chapter you will only have to set your root \
- password as the rest is figured out automatically ;-)"),
+password as the rest is figured out automatically ;-)"),
8, None),
"systools" : (
@@ -91,10 +91,10 @@ class WelcomeWindow (InstallWindow):
"finalizing" : (
_("Finalizing your Gentoo Installation"),
_("You're almost done. We'll just create a user for \
- your system.\n\
- You'll also be able to choose if you'd like the X \
- Window System and a desktop environment installed on \
- your new system. "),
+your system.\n\
+You'll also be able to choose if you'd like the X \
+Window System and a desktop environment installed on \
+your new system. "),
11, None)
}
@@ -107,7 +107,7 @@ class WelcomeWindow (InstallWindow):
(xml, align) = gui.getGladeWidget("welcome.glade", "welcome_align")
title_ = xml.get_widget("title")
text_ = xml.get_widget("text")
- title_.set_markup("<span style=\"font-size: 200%\">%s</span>")
+ title_.set_markup("<span size=\"large\">%s</span>")
title_.set_text(_("Chapter %i: %s") % (chapter, title))
text_.set_text(text)
return align
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-21 15:04 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-21 15:04 UTC (permalink / raw
To: gentoo-commits
commit: ceff147bebd5d447920c9b9cd1692b8659ebb8cc
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 15:03:43 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 15:03:43 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=ceff147b
iw/welcome_gui.py: GTK+ labels are retarded https://bugzilla.gnome.org/show_bug.cgi?id=318276
---
iw/welcome_gui.py | 67 +++++++++++++++++++++++++++-------------------------
1 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index 538e04c..2950b19 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -28,73 +28,76 @@ _ = lambda x: gettext.ldgettext("anaconda", x)
class WelcomeWindow (InstallWindow):
+ # We have to do it this way with the "\n"s because GTK+ is retarded.
+ # https://bugzilla.gnome.org/show_bug.cgi?id=318276
windows = {
"welcomescreen" : (
_("Welcome to the Gentoo installer!"),
- _("This wizard will take you through installing Gentoo \
-on your computer. We will follow the official Gentoo \
-Handbook (with a few changes) and if at any point \
-you'd like to consult the handbook, you'll find the \
-link in the top-right corner of the window.\n\n\
-We'll start off asking you for the language and \
-keyboard layout you'd like the installer and your \
-future system to use. We will then skip straight to \
-Chapter 4 and continue with the installation."),
+ _("\
+This wizard will take you through installing Gentoo on your computer. We will\n\
+follow the official Gentoo Handbook (with a few changes) and if at any point\n\
+you'd like to consult the handbook, you'll find the link in the top-right corner\n\
+ of the window.\n\n\
+We'll start off asking you for the language and keyboard layout you'd like the\n\
+installer and your future system to use. We will then skip straight to Chapter 4\n\
+and continue with the installation."),
0, "Gentoo Handbook"),
"preparedisks" : (
_("Preparing the Disks"),
- _("To be able to install Gentoo, you must create the \
-necessary partitions. The following screens will \
-help you choose the right disk configuration for \
-your system."),
+ _("\
+To be able to install Gentoo, you must create the necessary partitions. The \n\
+following screens will help you choose the right disk configuration for your \n\
+system."),
4, None),
"installationfiles" : (
_("Installing the Gentoo Installation Files"),
- _("Gentoo installs work through a stage3 archive. In \
-this chapter the installer will help you choose the \
-right compilation options for your machine. "),
+ _("\
+Gentoo installs work through a stage3 archive. In this chapter the installer \n\
+will help you choose the right compilation options for your machine. "),
5, None),
"basesystem" : (
_("Installing the Gentoo Installation Files"),
- _("In this chapter you will set your Gentoo mirrors, \
-select your profile and choose your the USE flags."),
+ _("\
+In this chapter you will set your Gentoo mirrors, select your profile and choose\n\
+ your the USE flags."),
6, None),
"configurekernel": (
_("Configuring the Kernel"),
- _("The Linux kernel is the core of every distribution. \
-This chapter explains how to configure your kernel. \
-You will only have to set your timezone, as the \
-installer will just copy the LiveDVD kernel to your \
-new system."),
+ _("\
+The Linux kernel is the core of every distribution. This chapter explains how to\n\
+configure your kernel. You will only have to set your timezone, as the \n\
+installer will just copy the LiveDVD kernel to your new system."),
7, None),
"configuresystem" : (
_("Configuring your System"),
- _("In this chapter you will only have to set your root \
-password as the rest is figured out automatically ;-)"),
+ _("\
+In this chapter you will only have to set your root password as the rest is\n\
+figured out automatically ;-)"),
8, None),
"systools" : (
_("Installing Necessary System Tools"),
- _("In this chapter we help you choose and install some important tools."),
+ _("\
+In this chapter we help you choose and install some important tools."),
9, None),
"bootloader" : (
_("Configuring the Bootloader"),
- _("In this chapter you'll be able configure the GRUB bootloader."),
+ _("\
+In this chapter you'll be able configure the GRUB bootloader."),
10, None),
"finalizing" : (
_("Finalizing your Gentoo Installation"),
- _("You're almost done. We'll just create a user for \
-your system.\n\
-You'll also be able to choose if you'd like the X \
-Window System and a desktop environment installed on \
-your new system. "),
+ _("\
+You're almost done. We'll just create a user for your system.\n\n\
+You'll also be able to choose if you'd like the X Window System and a desktop\n\
+environment installed on your new system. "),
11, None)
}
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-21 15:21 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-21 15:21 UTC (permalink / raw
To: gentoo-commits
commit: 48802e4c0be34f8f4167c91a857c240ae7251047
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 15:21:18 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 15:21:18 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=48802e4c
iw/welcome_gui.py: use <big> markup
---
iw/welcome_gui.py | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index 2950b19..df4ce27 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -110,8 +110,7 @@ environment installed on your new system. "),
(xml, align) = gui.getGladeWidget("welcome.glade", "welcome_align")
title_ = xml.get_widget("title")
text_ = xml.get_widget("text")
- title_.set_markup("<span size=\"large\">%s</span>")
- title_.set_text(_("Chapter %i: %s") % (chapter, title))
+ title_.set_markup("<big>%s</big>" % (_("Chapter %i: %s") % (chapter, title)))
text_.set_text(text)
return align
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-21 16:40 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-21 16:40 UTC (permalink / raw
To: gentoo-commits
commit: 1363617500ae4f46f4082332781d5195bc18d402
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 16:40:47 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 16:40:47 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=13636175
iw/welcome_gui.py: make chapter title even larger
---
iw/welcome_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index df4ce27..1d4eb0d 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -110,7 +110,7 @@ environment installed on your new system. "),
(xml, align) = gui.getGladeWidget("welcome.glade", "welcome_align")
title_ = xml.get_widget("title")
text_ = xml.get_widget("text")
- title_.set_markup("<big>%s</big>" % (_("Chapter %i: %s") % (chapter, title)))
+ title_.set_markup("<span size=\"x-large\">%s</span>" % (_("Chapter %i: %s") % (chapter, title)))
text_.set_text(text)
return align
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-21 20:40 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-21 20:40 UTC (permalink / raw
To: gentoo-commits
commit: fd7fcfc4b97ce088680e0ed6e93734d39e6b68c4
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 20:40:45 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 20:40:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=fd7fcfc4
iw/welcome_gui.py: step is not a function!
---
iw/welcome_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index f9815f4..e558f25 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -115,7 +115,7 @@ environment installed on your new system. "),
ip = anaconda.mainxml.get_widget("install_progress")
current_progress = ip.get_fraction()
step = 1/len(self.windows)
- new_progress = current_progress + step()
+ new_progress = current_progress + step
if chapter == 0:
new_progress = 0
ip.set_fraction(new_progress)
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-21 21:21 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-21 21:21 UTC (permalink / raw
To: gentoo-commits
commit: 6e05edce2034a66776a8b280b4b84a0f83943e0e
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 21:21:26 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 21:21:26 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=6e05edce
iw/welcome_gui.py: rename systools → systoolswelcome to avoid naming conflict
---
iw/welcome_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index 6c8780c..0f64285 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -80,7 +80,7 @@ In this chapter you will only have to set your root password as the rest is\n\
figured out automatically ;-)"),
8, None),
- "systools" : (
+ "systoolswelcome" : (
_("Installing Necessary System Tools"),
_("\
In this chapter we help you choose and install some important tools."),
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-21 21:37 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-21 21:37 UTC (permalink / raw
To: gentoo-commits
commit: 8fb7c5b16473b720396f05a01bd0437d945a6a85
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 21:37:37 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 21:37:37 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=8fb7c5b1
iw/welcome_gui.py: rename bootloader → bootloaderwelcome
---
iw/welcome_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index 0f64285..a03fc3f 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -86,7 +86,7 @@ figured out automatically ;-)"),
In this chapter we help you choose and install some important tools."),
9, None),
- "bootloader" : (
+ "bootloaderwelcome" : (
_("Configuring the Bootloader"),
_("\
In this chapter you'll be able configure the GRUB bootloader."),
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-22 19:16 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-22 19:16 UTC (permalink / raw
To: gentoo-commits
commit: 02a2e94b4f9d140c51222257b1533ff35c332ff7
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul 22 19:16:47 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul 22 19:16:47 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=02a2e94b
iw/welcome_gui.py: set header text
---
iw/welcome_gui.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index a03fc3f..c6f085e 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -23,6 +23,7 @@ import sys
from iw_gui import *
from constants import *
+from gui import InstallControlWindow
import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
@@ -112,6 +113,7 @@ 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)
+ InstallControlWindow().set_chapter(chapter, title, "http://www.gentoo.org/doc/en/handbook/handbook-amd64.xml?part=1&chap="+chapter)
return align
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-22 19:27 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-22 19:27 UTC (permalink / raw
To: gentoo-commits
commit: fb79e296604ad091621a23f786b2e302420a590a
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul 22 19:27:23 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul 22 19:27:23 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=fb79e296
w/welcome_gui.py: InstallControlWindow.__init__ needs anaconda
---
iw/welcome_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index c6f085e..e7b7173 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -113,7 +113,7 @@ 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)
- InstallControlWindow().set_chapter(chapter, title, "http://www.gentoo.org/doc/en/handbook/handbook-amd64.xml?part=1&chap="+chapter)
+ InstallControlWindow(anaconda).set_chapter(chapter, title, "http://www.gentoo.org/doc/en/handbook/handbook-amd64.xml?part=1&chap="+chapter)
return align
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-22 19:34 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-22 19:34 UTC (permalink / raw
To: gentoo-commits
commit: 97277699efdbcc476247aad9dded29de4e77868d
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul 22 19:33:57 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul 22 19:33:57 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=97277699
iw/welcome_gui.py: change concat into %formatting
---
iw/welcome_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index e7b7173..408a3d8 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -113,7 +113,7 @@ 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)
- InstallControlWindow(anaconda).set_chapter(chapter, title, "http://www.gentoo.org/doc/en/handbook/handbook-amd64.xml?part=1&chap="+chapter)
+ InstallControlWindow(anaconda).set_chapter(chapter, title, "http://www.gentoo.org/doc/en/handbook/handbook-amd64.xml?part=1&chap=%i"%chapter)
return align
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-22 21:22 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-22 21:22 UTC (permalink / raw
To: gentoo-commits
commit: 2cc2df40849db86ef25c7bb1d2c6fce47071122c
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul 22 21:22:10 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul 22 21:22:10 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=2cc2df40
iw/welcome_gui.py: use the already created InstallControlWindow
---
iw/welcome_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index 408a3d8..97a73f9 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -113,7 +113,7 @@ 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)
- InstallControlWindow(anaconda).set_chapter(chapter, title, "http://www.gentoo.org/doc/en/handbook/handbook-amd64.xml?part=1&chap=%i"%chapter)
+ anaconda._intf.icw.set_chapter(chapter, title, "http://www.gentoo.org/doc/en/handbook/handbook-amd64.xml?part=1&chap=%i"%chapter)
return align
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-23 0:18 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-23 0:18 UTC (permalink / raw
To: gentoo-commits
commit: 1b08d43d510060246ab104595005c643c3e3061d
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sat Jul 23 00:18:20 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sat Jul 23 00:18:20 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=1b08d43d
iw/makeconf_gui.py: populate the -march combobox
---
iw/makeconf_gui.py | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/iw/makeconf_gui.py b/iw/makeconf_gui.py
index 1e51756..df6dc8e 100644
--- a/iw/makeconf_gui.py
+++ b/iw/makeconf_gui.py
@@ -44,6 +44,27 @@ class MakeconfWindow(InstallWindow):
return None
def getScreen(self, anaconda):
+ if os.env["ANACONDA_PRODUCTARCH"] == "x86":
+ marches = [
+ "prescott",
+ "pentium-m",
+ "athlon-4",
+ "athlon-xp",
+ "athlon-mp",
+ "athlon",
+ "athlon-tbird",
+ "pentium4",
+ "pentium3",
+ "pentium2",
+ "k6-2",
+ "k6-3",
+ "k6",
+ "i686",
+ "pentiumpro",
+ ]
+ if os.env["ANACONDA_PRODUCTARCH"] == "amd64":
+ marches = ["nocona", "k8", "opteron", "athlon64", "athlon-fx"]
+
self.anaconda = anaconda
self.intf = anaconda.intf
@@ -55,6 +76,9 @@ class MakeconfWindow(InstallWindow):
self.jobs = self.xml.get_widget("jobs")
self.load = self.xml.get_widget("load")
self.silent = self.xml.get_widget("silent")
+
+ for x in marches
+ self.march.append_text(x)
# TODO: Get a list of arches available for this installation.
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-26 11:12 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-26 11:12 UTC (permalink / raw
To: gentoo-commits
commit: 23e2f09a59b701e3975b75004dafc95ab59d1f10
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jul 26 11:11:45 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jul 26 11:11:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=23e2f09a
iw/makeconf_gui.py: fix syntax error
---
iw/makeconf_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/makeconf_gui.py b/iw/makeconf_gui.py
index df6dc8e..e9adca0 100644
--- a/iw/makeconf_gui.py
+++ b/iw/makeconf_gui.py
@@ -77,7 +77,7 @@ class MakeconfWindow(InstallWindow):
self.load = self.xml.get_widget("load")
self.silent = self.xml.get_widget("silent")
- for x in marches
+ for x in marches:
self.march.append_text(x)
# TODO: Get a list of arches available for this installation.
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-26 11:27 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-26 11:27 UTC (permalink / raw
To: gentoo-commits
commit: 2be44d08feb17e97bd04733ae65e69587ed2ebba
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jul 26 11:27:05 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jul 26 11:27:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=2be44d08
iw/makeconf_gui.py: import os
---
iw/makeconf_gui.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/iw/makeconf_gui.py b/iw/makeconf_gui.py
index e9adca0..0a38a29 100644
--- a/iw/makeconf_gui.py
+++ b/iw/makeconf_gui.py
@@ -26,6 +26,7 @@ import gobject
import pango
import sys
import gui
+import os
from iw_gui import *
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-26 11:38 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-26 11:38 UTC (permalink / raw
To: gentoo-commits
commit: 43ca6fee5d4fabae6b31cdacad586c874c800c8a
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jul 26 11:38:25 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jul 26 11:38:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=43ca6fee
iw/makeconf_gui.py: os.env is actually os.environ
---
iw/makeconf_gui.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/iw/makeconf_gui.py b/iw/makeconf_gui.py
index 0a38a29..3eb81eb 100644
--- a/iw/makeconf_gui.py
+++ b/iw/makeconf_gui.py
@@ -45,7 +45,7 @@ class MakeconfWindow(InstallWindow):
return None
def getScreen(self, anaconda):
- if os.env["ANACONDA_PRODUCTARCH"] == "x86":
+ if os.environ["ANACONDA_PRODUCTARCH"] == "x86":
marches = [
"prescott",
"pentium-m",
@@ -63,7 +63,7 @@ class MakeconfWindow(InstallWindow):
"i686",
"pentiumpro",
]
- if os.env["ANACONDA_PRODUCTARCH"] == "amd64":
+ if os.environ["ANACONDA_PRODUCTARCH"] == "amd64":
marches = ["nocona", "k8", "opteron", "athlon64", "athlon-fx"]
self.anaconda = anaconda
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-07-30 3:16 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-07-30 3:16 UTC (permalink / raw
To: gentoo-commits
commit: 0d22a93cf263497c7f72558e0def607e20162cd1
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul 29 20:36:49 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul 29 20:36:49 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=0d22a93c
iw/mirrorselect_gui.py: change table into tree
---
iw/mirrorselect_gui.py | 37 ++++++++++++++++---------------------
1 files changed, 16 insertions(+), 21 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index daf50a7..35462a8 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -23,6 +23,7 @@ import gtk
import gtk.glade
import gtk.gdk
import gobject
+import pygtk
import pango
import sys
import gui
@@ -66,41 +67,35 @@ class MirrorselectWindow(InstallWindow):
mirrors_parsed = self.parseMirrors(mirrorsf)
self.mirrors = self.mirrorList(mirrors_parsed, "http+ftp")
-
- self.table = self.xml.get_widget("mirrors_table")
- self.addMirrors(self.table, self.mirrors, mirrors_parsed)
+ self.addMirrors(self.mirrors, mirrors_parsed)
return self.align
- def addMirrors(self, table, mirror_list, mirror_data):
+ def addMirrors(self, mirror_list, mirror_data):
(regions, countries, mirrors) = mirror_list
+ self.treestore = gtk.TreeStore(gtk.CheckButton, str, str, str)
for region in regions:
+ region_ts = self.treestore.append(None, [region])
for country in countries[region]:
+ country_ts = self.treestore.append(region_ts, [country])
for mirror in mirrors[country]:
- self.addMirrorRow(table, 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)
+ treeview.append_column(_("Mirror URL"))
+ treeview.append_column(_("Mirror Name"))
+ treeview.append_column("IPv4?")
+ treeview.append_column("IPv6?")
- def addMirrorRow(self, table, region, country, mirror, data):
- cols = table.get_property("n-columns")
- rows = table.get_property("n-rows")
- table.resize(rows+1, cols)
-
+ def addMirrorRow(self, ts, country_ts, region, country, mirror, data):
cb = gtk.CheckButton(label=data["url"], use_underline=False)
- name = gtk.Label("%s: %s\n%s" % (region, country, mirror))
- name.set_alignment(0, 0)
- flags_text = data["proto"]
if data["ipv4"] == "y":
- flags_text += " ipv4"
+ ipv4 += " ipv4"
if data["ipv6"] == "y":
- flags_text += " ipv6"
- flags = gtk.Label(flags_text)
- flags.set_alignment(0, 0)
+ ipv6 += " ipv6"
- table.attach(cb, 0, 1, rows, rows+1, gtk.FILL)
- table.attach(name, 1, 2, rows, rows+1)
- table.attach(flags, 2, 3, rows, rows+1)
- self.buttons.append(cb)
+ ts.append([cb, mirror, ipv4, ipv6])
def downloadMirrorlist(self):
try:
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-01 0:17 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-01 0:17 UTC (permalink / raw
To: gentoo-commits
commit: 0cc03a10352849a343f4c4dbfd937c6d77860562
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Aug 1 00:17:09 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Aug 1 00:17:09 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=0cc03a10
iw/mirrorselect_gui.py: fix adding to tree
---
iw/mirrorselect_gui.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index a41af24..b9560d4 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -74,11 +74,11 @@ class MirrorselectWindow(InstallWindow):
def addMirrors(self, mirror_list, mirror_data):
(regions, countries, mirrors) = mirror_list
- self.treestore = gtk.TreeStore(gtk.CheckButton, str, str, str)
+ self.treestore = gtk.TreeStore(gtk.Widget, str, str, str)
for region in regions:
- region_ts = self.treestore.append(None, [region])
+ region_ts = self.treestore.append(None, [gtk.Label(region), "", "", ""])
for country in countries[region]:
- country_ts = self.treestore.append(region_ts, [country])
+ country_ts = self.treestore.append(region_ts, [gtk.Label(country), "", "", ""])
for mirror in mirrors[country]:
self.addMirrorRow(self.treestore, country_ts, region, country, mirror, mirror_data[region][country][mirror], )
treeview = gtk.TreeView(self.treestore)
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-01 0:28 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-01 0:28 UTC (permalink / raw
To: gentoo-commits
commit: 5a22751f13a1f48b8686524d45c13f95bdf31013
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Aug 1 00:28:03 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Aug 1 00:28:03 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=5a22751f
iw/mirrorselect_gui.py: fix ipv4/ipv6 flag assignment
---
iw/mirrorselect_gui.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index b9560d4..cd3009a 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -93,9 +93,9 @@ class MirrorselectWindow(InstallWindow):
cb = gtk.CheckButton(label=data["url"], use_underline=False)
if data["ipv4"] == "y":
- ipv4 += " ipv4"
+ ipv4 == "ipv4"
if data["ipv6"] == "y":
- ipv6 += " ipv6"
+ ipv6 == " ipv6"
ts.append([cb, mirror, ipv4, ipv6])
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-01 0:35 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-01 0:35 UTC (permalink / raw
To: gentoo-commits
commit: abe502625317726e3ff855265da6e015693eeb0d
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Aug 1 00:35:24 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Aug 1 00:35:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=abe50262
iw/mirrorselect_gui.py: ipv? flags: fix assignment
---
iw/mirrorselect_gui.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index cd3009a..225d96d 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -93,9 +93,9 @@ class MirrorselectWindow(InstallWindow):
cb = gtk.CheckButton(label=data["url"], use_underline=False)
if data["ipv4"] == "y":
- ipv4 == "ipv4"
+ ipv4 = "ipv4"
if data["ipv6"] == "y":
- ipv6 == " ipv6"
+ ipv6 = " ipv6"
ts.append([cb, mirror, ipv4, ipv6])
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-01 0:44 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-01 0:44 UTC (permalink / raw
To: gentoo-commits
commit: 1af1f80b11294c2a25c6fd7215cfa57c90efc536
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Aug 1 00:44:44 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Aug 1 00:44:44 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=1af1f80b
iw/mirrorselect_gui.py: initialise ipv? flags
---
iw/mirrorselect_gui.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index 225d96d..cedf284 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -92,6 +92,8 @@ class MirrorselectWindow(InstallWindow):
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":
ipv4 = "ipv4"
if data["ipv6"] == "y":
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-01 0:53 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-01 0:53 UTC (permalink / raw
To: gentoo-commits
commit: c1b9267dc4261a2f32cdfb762d33737748d5f829
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Aug 1 00:53:10 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Aug 1 00:53:10 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=c1b9267d
iw/mirrorselect_gui.py: add the mirror to the appropriate country
---
iw/mirrorselect_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index cedf284..0bdde57 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -99,7 +99,7 @@ class MirrorselectWindow(InstallWindow):
if data["ipv6"] == "y":
ipv6 = " ipv6"
- ts.append([cb, mirror, ipv4, ipv6])
+ ts.append(country_ts, [cb, mirror, ipv4, ipv6])
def downloadMirrorlist(self):
try:
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-01 1:01 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-01 1:01 UTC (permalink / raw
To: gentoo-commits
commit: 966de0bda32b8e2638c7721fda8228be5fdb3d6b
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Aug 1 01:01:36 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Aug 1 01:01:36 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=966de0bd
iw/mirrorselect_gui.py: add the columns properly
---
iw/mirrorselect_gui.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index 0bdde57..57ebf1b 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -82,10 +82,10 @@ class MirrorselectWindow(InstallWindow):
for mirror in mirrors[country]:
self.addMirrorRow(self.treestore, country_ts, region, country, mirror, mirror_data[region][country][mirror], )
treeview = gtk.TreeView(self.treestore)
- treeview.append_column(_("Mirror URL"))
- treeview.append_column(_("Mirror Name"))
- treeview.append_column("IPv4?")
- treeview.append_column("IPv6?")
+ treeview.append_column(gtk.TreeViewColumn(_("Mirror URL")))
+ treeview.append_column(gtk.TreeViewColumn(_("Mirror Name")))
+ treeview.append_column(gtk.TreeViewColumn("IPv4?"))
+ treeview.append_column(gtk.TreeViewColumn("IPv6?"))
self.xml.get_widget("mirrors_viewport").add(treeview)
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-01 1:24 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-01 1:24 UTC (permalink / raw
To: gentoo-commits
commit: 37c0a1e34298fb64ba7043a4c0fc0f17309f1df5
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Aug 1 01:24:16 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Aug 1 01:24:16 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=37c0a1e3
iw/mirrorselect_gui.py: rework the treeview render slightly
---
iw/mirrorselect_gui.py | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index 57ebf1b..e5a2b13 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -82,10 +82,27 @@ class MirrorselectWindow(InstallWindow):
for mirror in mirrors[country]:
self.addMirrorRow(self.treestore, country_ts, region, country, mirror, mirror_data[region][country][mirror], )
treeview = gtk.TreeView(self.treestore)
- treeview.append_column(gtk.TreeViewColumn(_("Mirror URL")))
- treeview.append_column(gtk.TreeViewColumn(_("Mirror Name")))
- treeview.append_column(gtk.TreeViewColumn("IPv4?"))
- treeview.append_column(gtk.TreeViewColumn("IPv6?"))
+ url_column = gtk.TreeViewColumn(_("Mirror URL"))
+ treeview.append_column(url_column)
+ name_column = gtk.TreeViewColumn(_("Mirror Name"))
+ treeview.append_column(name_column)
+ ipv4_column = gtk.TreeViewColumn("IPv4?")
+ treeview.append_column(ipv4_column)
+ ipv6_column = gtk.TreeViewColumn("IPv6?")
+ treeview.append_column(ipv6_column)
+ url_cell = gtk.CellRendererToggle()
+ text_cell = gtk.CellRendererText()
+ url_column.pack_start(url_cell, True)
+ 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)
+ 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)
+ treeview.set_sort_column_id(0)
+
self.xml.get_widget("mirrors_viewport").add(treeview)
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-01 1:32 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-01 1:32 UTC (permalink / raw
To: gentoo-commits
commit: 3a9d409bdd8b2c5894ae70c9f51785dc0660cc45
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Aug 1 01:32:22 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Aug 1 01:32:22 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=3a9d409b
iw/mirrorselect_gui.py: remove useless sorting
---
iw/mirrorselect_gui.py | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index e5a2b13..2769144 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -101,7 +101,6 @@ class MirrorselectWindow(InstallWindow):
ipv4_column.add_attribute(text_cell, "text", 2)
ipv6_column.add_attribute(text_cell, "text", 3)
treeview.set_search_column(1)
- treeview.set_sort_column_id(0)
self.xml.get_widget("mirrors_viewport").add(treeview)
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-01 1:41 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-01 1:41 UTC (permalink / raw
To: gentoo-commits
commit: 2fd98cd9fab9464c542df0f0f8e2a4366eda3d0e
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Aug 1 01:41:00 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Aug 1 01:41:00 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=2fd98cd9
iw/mirrorselect-sync_gui.py: update for the new treeview model
---
iw/mirrorselect-sync_gui.py | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/iw/mirrorselect-sync_gui.py b/iw/mirrorselect-sync_gui.py
index 3fbb4cc..64c28af 100644
--- a/iw/mirrorselect-sync_gui.py
+++ b/iw/mirrorselect-sync_gui.py
@@ -69,9 +69,7 @@ class MirrorselectSyncWindow(InstallWindow):
mirrors_parsed = ms.parseMirrors(mirrorsf)
self.mirrors = ms.mirrorList(mirrors_parsed, "rsync")
- self.table = self.xml.get_widget("mirrors_table")
-
- ms.addMirrors(self.table, self.mirrors, mirrors_parsed)
+ ms.addMirrors(self.mirrors, mirrors_parsed)
self.buttons = ms.buttons
return self.align
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-01 1:50 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-01 1:50 UTC (permalink / raw
To: gentoo-commits
commit: 73aa6573245632b27203fef2da72dcd321d767a5
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Aug 1 01:50:08 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Aug 1 01:50:08 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=73aa6573
iw/mirrorselect*_gui.py: pass around self.xml
---
iw/mirrorselect-sync_gui.py | 2 +-
iw/mirrorselect_gui.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/iw/mirrorselect-sync_gui.py b/iw/mirrorselect-sync_gui.py
index 64c28af..9d07d53 100644
--- a/iw/mirrorselect-sync_gui.py
+++ b/iw/mirrorselect-sync_gui.py
@@ -69,7 +69,7 @@ class MirrorselectSyncWindow(InstallWindow):
mirrors_parsed = ms.parseMirrors(mirrorsf)
self.mirrors = ms.mirrorList(mirrors_parsed, "rsync")
- ms.addMirrors(self.mirrors, mirrors_parsed)
+ ms.addMirrors(self.mirrors, mirrors_parsed, self.xml)
self.buttons = ms.buttons
return self.align
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index 2769144..417efb2 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -68,11 +68,11 @@ class MirrorselectWindow(InstallWindow):
mirrors_parsed = self.parseMirrors(mirrorsf)
self.mirrors = self.mirrorList(mirrors_parsed, "http+ftp")
- self.addMirrors(self.mirrors, mirrors_parsed)
+ self.addMirrors(self.mirrors, mirrors_parsed, self.xml)
return self.align
- def addMirrors(self, mirror_list, mirror_data):
+ def addMirrors(self, mirror_list, mirror_data, xml):
(regions, countries, mirrors) = mirror_list
self.treestore = gtk.TreeStore(gtk.Widget, str, str, str)
for region in regions:
@@ -100,7 +100,7 @@ class MirrorselectWindow(InstallWindow):
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)
+ xml.treeview.set_search_column(1)
self.xml.get_widget("mirrors_viewport").add(treeview)
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-01 1:59 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-01 1:59 UTC (permalink / raw
To: gentoo-commits
commit: f09ace692f8c0cf87a757ee5ee3d2090c2bc949a
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Aug 1 01:58:57 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Aug 1 01:58:57 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=f09ace69
iw/mirrorselect_gui.py: use the local xml instance
---
iw/mirrorselect_gui.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index 417efb2..062766f 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -100,9 +100,9 @@ class MirrorselectWindow(InstallWindow):
name_column.add_attribute(text_cell, "text", 1)
ipv4_column.add_attribute(text_cell, "text", 2)
ipv6_column.add_attribute(text_cell, "text", 3)
- xml.treeview.set_search_column(1)
+ treeview.set_search_column(1)
- self.xml.get_widget("mirrors_viewport").add(treeview)
+ xml.get_widget("mirrors_viewport").add(treeview)
def addMirrorRow(self, ts, country_ts, region, country, mirror, data):
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-01 8:58 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-01 8:58 UTC (permalink / raw
To: gentoo-commits
commit: f9939f37bc9457bd7e93bc4ce7c17a36fb9eaa7c
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Aug 1 08:58:38 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Aug 1 08:58:38 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=f9939f37
iw/mirrorselect_gui.py: enable editable column URL
---
iw/mirrorselect_gui.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index 062766f..235aed0 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -116,6 +116,7 @@ class MirrorselectWindow(InstallWindow):
ipv6 = " ipv6"
ts.append(country_ts, [cb, mirror, ipv4, ipv6])
+ ts.set(contry_ts, COLUMN_EDITABLE, True)
def downloadMirrorlist(self):
try:
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-01 9:09 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-01 9:09 UTC (permalink / raw
To: gentoo-commits
commit: 17904e5b34031a5b8b3a45eb6757fa8369e140a8
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Aug 1 09:09:23 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Aug 1 09:09:23 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=17904e5b
iw/mirrorselect_gui.py: typo
---
iw/mirrorselect_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index 235aed0..c2c5caf 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -116,7 +116,7 @@ class MirrorselectWindow(InstallWindow):
ipv6 = " ipv6"
ts.append(country_ts, [cb, mirror, ipv4, ipv6])
- ts.set(contry_ts, COLUMN_EDITABLE, True)
+ ts.set(country_ts, COLUMN_EDITABLE, True)
def downloadMirrorlist(self):
try:
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-01 9:32 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-01 9:32 UTC (permalink / raw
To: gentoo-commits
commit: ce7f2cb8673438aded35d9bade5ae487fb2a1f6e
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Aug 1 09:31:24 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Aug 1 09:31:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=ce7f2cb8
iw/mirrorselect_gui.py: connect the toggle signal to the checkbutton
---
iw/mirrorselect_gui.py | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index c2c5caf..dacd225 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -80,7 +80,7 @@ class MirrorselectWindow(InstallWindow):
for country in countries[region]:
country_ts = self.treestore.append(region_ts, [gtk.Label(country), "", "", ""])
for mirror in mirrors[country]:
- self.addMirrorRow(self.treestore, country_ts, region, country, mirror, mirror_data[region][country][mirror], )
+ cb = 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)
@@ -101,9 +101,15 @@ class MirrorselectWindow(InstallWindow):
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)
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 addMirrorRow(self, ts, country_ts, region, country, mirror, data):
cb = gtk.CheckButton(label=data["url"], use_underline=False)
@@ -116,7 +122,8 @@ class MirrorselectWindow(InstallWindow):
ipv6 = " ipv6"
ts.append(country_ts, [cb, mirror, ipv4, ipv6])
- ts.set(country_ts, COLUMN_EDITABLE, True)
+ return cb
+
def downloadMirrorlist(self):
try:
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-01 9:39 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-01 9:39 UTC (permalink / raw
To: gentoo-commits
commit: a516058d6e6404ceb7ecba52ffc8594c0bbbcb67
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Aug 1 09:39:45 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Aug 1 09:39:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=a516058d
iw/mirrorselect_gui.py: typo
---
iw/mirrorselect_gui.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index dacd225..b66ae7d 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -106,9 +106,9 @@ class MirrorselectWindow(InstallWindow):
xml.get_widget("mirrors_viewport").add(treeview)
def toggleCB(self, cb):
- if cb.get_active() = True
+ if cb.get_active() = True:
cb.set_active(False)
- else
+ else:
cb.set_active(True)
def addMirrorRow(self, ts, country_ts, region, country, mirror, data):
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-01 9:47 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-01 9:47 UTC (permalink / raw
To: gentoo-commits
commit: 9c4510cc7a0f6e862a08721b538a2285049f5ae6
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Aug 1 09:47:02 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Aug 1 09:47:02 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=9c4510cc
iw/mirrorselect_gui.py: more typos
---
iw/mirrorselect_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index b66ae7d..d5aa6f5 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -106,7 +106,7 @@ class MirrorselectWindow(InstallWindow):
xml.get_widget("mirrors_viewport").add(treeview)
def toggleCB(self, cb):
- if cb.get_active() = True:
+ if cb.get_active() == True:
cb.set_active(False)
else:
cb.set_active(True)
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-03 2:52 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-03 2:52 UTC (permalink / raw
To: gentoo-commits
commit: e2f859eff0a72d315f924e8c4438d0d7e6f452ec
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Aug 3 02:51:09 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Aug 3 02:51:09 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=e2f859ef
Resize timezone widget, fix the treeview in mirrorselect
---
iw/mirrorselect-sync_gui.py | 4 +++-
iw/mirrorselect_gui.py | 4 +++-
iw/timezone_gui.py | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/iw/mirrorselect-sync_gui.py b/iw/mirrorselect-sync_gui.py
index 9d07d53..c9bbbc4 100644
--- a/iw/mirrorselect-sync_gui.py
+++ b/iw/mirrorselect-sync_gui.py
@@ -39,7 +39,9 @@ class MirrorselectSyncWindow(InstallWindow):
def getNext(self):
for button in self.buttons:
if button.get_property("active"):
- self.anaconda.mirrors_sync.append(button.get_property("label"))
+ # For while the treeview is broken
+ #self.anaconda.mirrors_sync.append(button.get_property("label"))
+ self.anaconda.mirrors_sync.append("rsync://rsync.gentoo.org/gentoo-portage")
return None
def getScreen(self, anaconda):
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index d5aa6f5..64d536f 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -42,7 +42,9 @@ class MirrorselectWindow(InstallWindow):
def getNext(self):
for button in self.buttons:
if button.get_property("active"):
- self.anaconda.mirrors.append(button.get_property("label"))
+ # For while the treeview is broken
+ #self.anaconda.mirrors.append(button.get_property("label"))
+ self.anaconda.mirrors.append("http://mirrors.kernel.org/gentoo/")
return None
def getScreen(self, anaconda):
diff --git a/iw/timezone_gui.py b/iw/timezone_gui.py
index bfe8029..0e96069 100644
--- a/iw/timezone_gui.py
+++ b/iw/timezone_gui.py
@@ -80,7 +80,7 @@ class TimezoneWindow(InstallWindow):
ratio = float(p_w)/p_h
screen_x, screen_y = self.ics.cw.window.get_size()
screen_x -= 80
- screen_y -= 200
+ screen_y -= 300
p_w -= 80
if screen_x < p_w:
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-03 8:40 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-03 8:40 UTC (permalink / raw
To: gentoo-commits
commit: ea614c12d4c89807df698455900608b0b546dfca
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Aug 3 08:39:53 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Aug 3 08:39:53 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=ea614c12
iw/timezone_gui.py: fix the way the UI is loaded
---
iw/timezone_gui.py | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/iw/timezone_gui.py b/iw/timezone_gui.py
index cf91ce6..0b02096 100644
--- a/iw/timezone_gui.py
+++ b/iw/timezone_gui.py
@@ -55,8 +55,7 @@ class TimezoneWindow(InstallWindow):
self.zonetab = zonetab.ZoneTab()
# Pull in a bunch of widgets.
- self.xml = gtk.glade.XML("timezone.glade", domain="system-config-date")
- self.vbox = self.xml.get_widget("tz_vbox")
+ (self.xml, self.vbox) = gui.getGladeWidget("timezone.glade", "tz_vbox")
self.utcCheckbox = self.xml.get_widget("utc_check")
ics.setTitle(_("Time Zone Selection"))
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-03 8:51 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-03 8:51 UTC (permalink / raw
To: gentoo-commits
commit: 06fbe58d9794d2b3eaea047348cb2710d5cb0100
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Aug 3 08:51:28 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Aug 3 08:51:28 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=06fbe58d
iw/timezone_gui.py: fix indents
---
iw/timezone_gui.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/iw/timezone_gui.py b/iw/timezone_gui.py
index 0b02096..720f87e 100644
--- a/iw/timezone_gui.py
+++ b/iw/timezone_gui.py
@@ -55,7 +55,7 @@ class TimezoneWindow(InstallWindow):
self.zonetab = zonetab.ZoneTab()
# Pull in a bunch of widgets.
- (self.xml, self.vbox) = gui.getGladeWidget("timezone.glade", "tz_vbox")
+ (self.xml, self.vbox) = gui.getGladeWidget("timezone.glade", "tz_vbox")
self.utcCheckbox = self.xml.get_widget("utc_check")
ics.setTitle(_("Time Zone Selection"))
@@ -103,7 +103,7 @@ class TimezoneWindow(InstallWindow):
# TimezoneWindow tag="timezone"
def getScreen(self, anaconda):
- self.intf = anaconda.intf
+ self.intf = anaconda.intf
self.timezone = anaconda.timezone
(self.default, asUTC) = self.timezone.getTimezoneInfo()
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-03 8:59 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-03 8:59 UTC (permalink / raw
To: gentoo-commits
commit: 555834eed9fbbc45703d4f151266768a0cf9f21f
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Aug 3 08:58:59 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Aug 3 08:58:59 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=555834ee
iw/timezone_gui.py: import gui
---
iw/timezone_gui.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/iw/timezone_gui.py b/iw/timezone_gui.py
index 720f87e..202719c 100644
--- a/iw/timezone_gui.py
+++ b/iw/timezone_gui.py
@@ -26,6 +26,7 @@ import gobject
from scdate.core import zonetab
import pango
import sys
+import gui
from timezone_map_gui import TimezoneMap, Enum
from iw_gui import *
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-03 9:16 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-03 9:16 UTC (permalink / raw
To: gentoo-commits
commit: e5ff87bcbed1531faddf938df24981e5a79fbfc8
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Aug 3 09:15:39 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Aug 3 09:15:39 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=e5ff87bc
iw/timezone_gui.py: fix custom_widegt_handler
---
iw/timezone_gui.py | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/iw/timezone_gui.py b/iw/timezone_gui.py
index 202719c..ecac31e 100644
--- a/iw/timezone_gui.py
+++ b/iw/timezone_gui.py
@@ -64,11 +64,14 @@ class TimezoneWindow(InstallWindow):
def custom_widget_handler(self, xml, function_name, widget_name, str1, str2,
int1, int2):
- if hasattr(self, function_name):
- handler = getattr(self, function_name)
- return handler(str1, str2, int1, int2)
+ if isinstance(function_name, string):
+ if hasattr(self, function_name):
+ handler = getattr(self, function_name)
+ return handler(str1, str2, int1, int2)
+ else:
+ # Lame.
+ return gtk.Label()
else:
- # Lame.
return gtk.Label()
def timezone_widget_create (self, str1, str2, int1, int2):
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-03 9:31 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-03 9:31 UTC (permalink / raw
To: gentoo-commits
commit: 755b077c183da69efeef110d90c4d07ce18ba89e
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Aug 3 09:30:57 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Aug 3 09:30:57 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=755b077c
iw/timezone_gui.py: enhance custom_widget_handler
---
iw/timezone_gui.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/iw/timezone_gui.py b/iw/timezone_gui.py
index ecac31e..e61dba3 100644
--- a/iw/timezone_gui.py
+++ b/iw/timezone_gui.py
@@ -64,14 +64,14 @@ class TimezoneWindow(InstallWindow):
def custom_widget_handler(self, xml, function_name, widget_name, str1, str2,
int1, int2):
- if isinstance(function_name, string):
+ try:
if hasattr(self, function_name):
handler = getattr(self, function_name)
return handler(str1, str2, int1, int2)
else:
# Lame.
return gtk.Label()
- else:
+ except:
return gtk.Label()
def timezone_widget_create (self, str1, str2, int1, int2):
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-03 9:47 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-03 9:47 UTC (permalink / raw
To: gentoo-commits
commit: 274cb9cc3b54cb3f5a8410d75376d2d7f76fe8eb
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Aug 3 09:46:45 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Aug 3 09:46:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=274cb9cc
iw/timezone_gui.py: revert to stock
---
iw/timezone_gui.py | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/iw/timezone_gui.py b/iw/timezone_gui.py
index e61dba3..bfe8029 100644
--- a/iw/timezone_gui.py
+++ b/iw/timezone_gui.py
@@ -26,7 +26,6 @@ import gobject
from scdate.core import zonetab
import pango
import sys
-import gui
from timezone_map_gui import TimezoneMap, Enum
from iw_gui import *
@@ -56,22 +55,21 @@ class TimezoneWindow(InstallWindow):
self.zonetab = zonetab.ZoneTab()
# Pull in a bunch of widgets.
- (self.xml, self.vbox) = gui.getGladeWidget("timezone.glade", "tz_vbox")
+ self.xml = gtk.glade.XML("/usr/share/system-config-date/system-config-date.glade", domain="system-config-date")
+ self.vbox = self.xml.get_widget("tz_vbox")
self.utcCheckbox = self.xml.get_widget("utc_check")
+ self.notebook = self.xml.get_widget("notebook")
ics.setTitle(_("Time Zone Selection"))
ics.setNextEnabled(1)
def custom_widget_handler(self, xml, function_name, widget_name, str1, str2,
int1, int2):
- try:
- if hasattr(self, function_name):
- handler = getattr(self, function_name)
- return handler(str1, str2, int1, int2)
- else:
- # Lame.
- return gtk.Label()
- except:
+ if hasattr(self, function_name):
+ handler = getattr(self, function_name)
+ return handler(str1, str2, int1, int2)
+ else:
+ # Lame.
return gtk.Label()
def timezone_widget_create (self, str1, str2, int1, int2):
@@ -107,7 +105,7 @@ class TimezoneWindow(InstallWindow):
# TimezoneWindow tag="timezone"
def getScreen(self, anaconda):
- self.intf = anaconda.intf
+ self.intf = anaconda.intf
self.timezone = anaconda.timezone
(self.default, asUTC) = self.timezone.getTimezoneInfo()
@@ -176,7 +174,6 @@ class AnacondaTZMap(TimezoneMap):
self.tzCombo.add_attribute(cell, 'text', 0)
self.tzCombo.connect("changed", self.selectionChanged)
self.hbox.pack_start(self.tzCombo, False, False)
- self.hbox.pack_start(self.utcCheckbox, False, False)
self.pack_start(self.hbox, False, False)
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-03 11:30 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-03 11:30 UTC (permalink / raw
To: gentoo-commits
commit: 2dfac6886139f775d1c50872508a324ae8fac402
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Aug 3 11:29:35 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Aug 3 11:29:35 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=2dfac688
iw/progress_gui.py: Make some more space
---
iw/progress_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/progress_gui.py b/iw/progress_gui.py
index b1f1012..39799a5 100644
--- a/iw/progress_gui.py
+++ b/iw/progress_gui.py
@@ -120,6 +120,6 @@ class InstallProgressWindow (InstallWindow):
self.intf.setPackageProgressWindow(self)
self.intf.setInstallProgressClass(self)
- vbox.set_border_width(6)
+ vbox.set_border_width(1)
return vbox
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-04 2:16 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-04 2:16 UTC (permalink / raw
To: gentoo-commits
commit: ea3099be6db28a2525acdb4c8c482d95684e1666
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Aug 4 02:02:54 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Aug 4 02:02:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=ea3099be
iw/makeconf_gui.py: validation
---
iw/makeconf_gui.py | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/iw/makeconf_gui.py b/iw/makeconf_gui.py
index 3eb81eb..50a0d69 100644
--- a/iw/makeconf_gui.py
+++ b/iw/makeconf_gui.py
@@ -35,7 +35,17 @@ import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
class MakeconfWindow(InstallWindow):
+
+ def err(title, message):
+ self.intf.messageWindow(title, message, custom_icon="error")
+ raise gui.StayOnScreen
+
def getNext(self):
+ if self.march.get_active_text() == "":
+ self.err(_("Select -march"), _("You need to choose the -march setting!"))
+ if self.opt.get_active_text() == "";
+ self.err(_("Select -O"), _("You need to choose the -O setting!"))
+
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")
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-04 2:16 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-04 2:16 UTC (permalink / raw
To: gentoo-commits
commit: c6a03d072684381bf66ecb0b6c06daedcbf6ac25
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Aug 4 02:11:56 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Aug 4 02:11:56 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=c6a03d07
iw/profile_gui.py: validation
---
iw/profile_gui.py | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/iw/profile_gui.py b/iw/profile_gui.py
index 8b289f8..4081e2e 100644
--- a/iw/profile_gui.py
+++ b/iw/profile_gui.py
@@ -41,6 +41,9 @@ class ProfileWindow(InstallWindow):
self.anaconda.profile = button.get_property("label")
# We need this for the USE flags
subprocess.call(["eselect", "profile", "set", self.anaconda.profile])
+ if self.anaconda.profile == None:
+ self.anaconda.intf.messageWindow(_("Select profile"), _("You must select a profile!"))
+ raise gui.StayOnScreen
return None
def getScreen(self, anaconda):
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-04 2:16 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-04 2:16 UTC (permalink / raw
To: gentoo-commits
commit: 2c2b83edd01fbe9f4e2afb8c915f6dd57d7b05b8
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Aug 4 02:05:11 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Aug 4 02:05:11 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=2c2b83ed
iw/makeconf_gui.py: messageWindow is in anaconda.intf
---
iw/makeconf_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/makeconf_gui.py b/iw/makeconf_gui.py
index 50a0d69..2631d8a 100644
--- a/iw/makeconf_gui.py
+++ b/iw/makeconf_gui.py
@@ -37,7 +37,7 @@ _ = lambda x: gettext.ldgettext("anaconda", x)
class MakeconfWindow(InstallWindow):
def err(title, message):
- self.intf.messageWindow(title, message, custom_icon="error")
+ self.anaconda.intf.messageWindow(title, message, custom_icon="error")
raise gui.StayOnScreen
def getNext(self):
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-11 12:58 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-11 12:58 UTC (permalink / raw
To: gentoo-commits
commit: c7e58db15b3f7327fbc1fd147872a9bd3b6611d0
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Aug 11 12:58:50 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Aug 11 12:58:50 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=c7e58db1
fix typo
---
iw/makeconf_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/makeconf_gui.py b/iw/makeconf_gui.py
index 2631d8a..87041e9 100644
--- a/iw/makeconf_gui.py
+++ b/iw/makeconf_gui.py
@@ -43,7 +43,7 @@ class MakeconfWindow(InstallWindow):
def getNext(self):
if self.march.get_active_text() == "":
self.err(_("Select -march"), _("You need to choose the -march setting!"))
- if self.opt.get_active_text() == "";
+ if self.opt.get_active_text() == "":
self.err(_("Select -O"), _("You need to choose the -O setting!"))
self.anaconda.makeconf_march = self.march.get_active_text()
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-21 0:03 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-21 0:03 UTC (permalink / raw
To: gentoo-commits
commit: 4b562e19396677d8a277c6bdb9d0e8eaeb98b5df
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sat Aug 20 16:06:28 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sat Aug 20 16:06:28 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=4b562e19
mirrorselect_gui.py: tree build fix
---
iw/mirrorselect_gui.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index 0de1d9d..fbacf2c 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -78,9 +78,9 @@ class MirrorselectWindow(InstallWindow):
(regions, countries, mirrors) = mirror_list
self.treestore = gtk.TreeStore(bool, str, str, str, str)
for region in regions:
- region_ts = self.treestore.append(None, [region, "", "", ""])
+ region_ts = self.treestore.append(None, [False, region, "", "", ""])
for country in countries[region]:
- country_ts = self.treestore.append(region_ts, [country, "", "", ""])
+ country_ts = self.treestore.append(region_ts, [False, country, "", "", ""])
for mirror in mirrors[country]:
self.addMirrorRow(self.treestore, country_ts, region, country, mirror, mirror_data[region][country][mirror])
treeview = gtk.TreeView(self.treestore)
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-21 0:03 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-21 0:03 UTC (permalink / raw
To: gentoo-commits
commit: daaaf2982841dff0ea21a1292835f1908b3df90e
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sat Aug 20 15:58:59 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sat Aug 20 15:58:59 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=daaaf298
mirrorselect_gui.py: fix treestore.append when creating the tree
---
iw/mirrorselect_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index 1e0291e..0de1d9d 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -78,7 +78,7 @@ class MirrorselectWindow(InstallWindow):
(regions, countries, mirrors) = mirror_list
self.treestore = gtk.TreeStore(bool, str, str, str, str)
for region in regions:
- region_ts = self.treestore.append(False, [region, "", "", ""])
+ region_ts = self.treestore.append(None, [region, "", "", ""])
for country in countries[region]:
country_ts = self.treestore.append(region_ts, [country, "", "", ""])
for mirror in mirrors[country]:
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-21 0:03 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-21 0:03 UTC (permalink / raw
To: gentoo-commits
commit: 43596fc8ea1ae4a4ce66e5861cebe40bfc67e8ff
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sat Aug 20 16:17:18 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sat Aug 20 16:17:18 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=43596fc8
mirrorselect_gui.py: added mirror name to tree
---
iw/mirrorselect_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index fbacf2c..ad84dd8 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -118,7 +118,7 @@ class MirrorselectWindow(InstallWindow):
if data["ipv6"] == "y":
ipv6 = " ipv6"
- ts.append(country_ts, [False, mirror, ipv4, ipv6])
+ ts.append(country_ts, [False, mirror, data["name"], ipv4, ipv6])
def downloadMirrorlist(self):
try:
^ permalink raw reply related [flat|nested] 97+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: iw/
@ 2011-08-21 0:03 Wiktor W Brodlo
0 siblings, 0 replies; 97+ messages in thread
From: Wiktor W Brodlo @ 2011-08-21 0:03 UTC (permalink / raw
To: gentoo-commits
commit: 2818941482e0c5e6cc98028053ee92db48e40981
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sat Aug 20 16:46:46 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sat Aug 20 16:46:46 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=28189414
mirrorselect_gui.py: the tree is nice now
---
iw/mirrorselect_gui.py | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index ad84dd8..ec8c981 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -76,15 +76,15 @@ class MirrorselectWindow(InstallWindow):
def addMirrors(self, mirror_list, mirror_data, xml):
(regions, countries, mirrors) = mirror_list
- self.treestore = gtk.TreeStore(bool, str, str, str, str)
+ self.treestore = gtk.TreeStore(bool, str, str, str)
for region in regions:
- region_ts = self.treestore.append(None, [False, region, "", "", ""])
+ region_ts = self.treestore.append(None, [False, region, "", ""])
for country in countries[region]:
- country_ts = self.treestore.append(region_ts, [False, country, "", "", ""])
+ country_ts = self.treestore.append(region_ts, [False, country, "", ""])
for mirror in mirrors[country]:
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"))
+ url_column = gtk.TreeViewColumn(_(""))
treeview.append_column(url_column)
name_column = gtk.TreeViewColumn(_("Mirror Name"))
treeview.append_column(name_column)
@@ -118,7 +118,7 @@ class MirrorselectWindow(InstallWindow):
if data["ipv6"] == "y":
ipv6 = " ipv6"
- ts.append(country_ts, [False, mirror, data["name"], ipv4, ipv6])
+ ts.append(country_ts, [False, mirror, ipv4, ipv6])
def downloadMirrorlist(self):
try:
^ permalink raw reply related [flat|nested] 97+ messages in thread
end of thread, other threads:[~2011-08-21 0:03 UTC | newest]
Thread overview: 97+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-03 17:52 [gentoo-commits] proj/anaconda:master commit in: iw/ Wiktor W Brodlo
-- strict thread matches above, loose matches on Subject: below --
2011-08-21 0:03 Wiktor W Brodlo
2011-08-21 0:03 Wiktor W Brodlo
2011-08-21 0:03 Wiktor W Brodlo
2011-08-21 0:03 Wiktor W Brodlo
2011-08-11 12:58 Wiktor W Brodlo
2011-08-04 2:16 Wiktor W Brodlo
2011-08-04 2:16 Wiktor W Brodlo
2011-08-04 2:16 Wiktor W Brodlo
2011-08-03 11:30 Wiktor W Brodlo
2011-08-03 9:47 Wiktor W Brodlo
2011-08-03 9:31 Wiktor W Brodlo
2011-08-03 9:16 Wiktor W Brodlo
2011-08-03 8:59 Wiktor W Brodlo
2011-08-03 8:51 Wiktor W Brodlo
2011-08-03 8:40 Wiktor W Brodlo
2011-08-03 2:52 Wiktor W Brodlo
2011-08-01 9:47 Wiktor W Brodlo
2011-08-01 9:39 Wiktor W Brodlo
2011-08-01 9:32 Wiktor W Brodlo
2011-08-01 9:09 Wiktor W Brodlo
2011-08-01 8:58 Wiktor W Brodlo
2011-08-01 1:59 Wiktor W Brodlo
2011-08-01 1:50 Wiktor W Brodlo
2011-08-01 1:41 Wiktor W Brodlo
2011-08-01 1:32 Wiktor W Brodlo
2011-08-01 1:24 Wiktor W Brodlo
2011-08-01 1:01 Wiktor W Brodlo
2011-08-01 0:53 Wiktor W Brodlo
2011-08-01 0:44 Wiktor W Brodlo
2011-08-01 0:35 Wiktor W Brodlo
2011-08-01 0:28 Wiktor W Brodlo
2011-08-01 0:17 Wiktor W Brodlo
2011-07-30 3:16 Wiktor W Brodlo
2011-07-26 11:38 Wiktor W Brodlo
2011-07-26 11:27 Wiktor W Brodlo
2011-07-26 11:12 Wiktor W Brodlo
2011-07-23 0:18 Wiktor W Brodlo
2011-07-22 21:22 Wiktor W Brodlo
2011-07-22 19:34 Wiktor W Brodlo
2011-07-22 19:27 Wiktor W Brodlo
2011-07-22 19:16 Wiktor W Brodlo
2011-07-21 21:37 Wiktor W Brodlo
2011-07-21 21:21 Wiktor W Brodlo
2011-07-21 20:40 Wiktor W Brodlo
2011-07-21 16:40 Wiktor W Brodlo
2011-07-21 15:21 Wiktor W Brodlo
2011-07-21 15:04 Wiktor W Brodlo
2011-07-21 14:47 Wiktor W Brodlo
2011-07-21 14:36 Wiktor W Brodlo
2011-07-21 14:19 Wiktor W Brodlo
2011-07-21 13:47 Wiktor W Brodlo
2011-07-21 13:42 Wiktor W Brodlo
2011-07-21 12:43 Wiktor W Brodlo
2011-07-10 1:44 Wiktor W Brodlo
2011-07-09 22:43 Wiktor W Brodlo
2011-07-09 19:20 Wiktor W Brodlo
2011-07-09 19:06 Wiktor W Brodlo
2011-07-09 18:43 Wiktor W Brodlo
2011-07-08 16:18 Wiktor W Brodlo
2011-07-08 15:42 Wiktor W Brodlo
2011-07-07 20:35 Wiktor W Brodlo
2011-07-07 20:22 Wiktor W Brodlo
2011-07-07 18:58 Wiktor W Brodlo
2011-07-07 18:58 Wiktor W Brodlo
2011-07-05 12:36 Wiktor W Brodlo
2011-07-05 12:33 Wiktor W Brodlo
2011-07-05 12:22 Wiktor W Brodlo
2011-07-05 12:07 Wiktor W Brodlo
2011-07-04 16:32 Wiktor W Brodlo
2011-07-04 16:19 Wiktor W Brodlo
2011-07-04 15:16 Wiktor W Brodlo
2011-07-04 14:53 Wiktor W Brodlo
2011-07-04 14:40 Wiktor W Brodlo
2011-07-04 14:18 Wiktor W Brodlo
2011-07-04 14:17 Wiktor W Brodlo
2011-07-04 12:56 Wiktor W Brodlo
2011-07-04 12:42 Wiktor W Brodlo
2011-07-03 19:28 Wiktor W Brodlo
2011-07-03 19:21 Wiktor W Brodlo
2011-07-03 19:06 Wiktor W Brodlo
2011-07-03 18:59 Wiktor W Brodlo
2011-07-03 17:15 Wiktor W Brodlo
2011-07-03 16:49 Wiktor W Brodlo
2011-07-03 16:41 Wiktor W Brodlo
2011-07-03 16:00 Wiktor W Brodlo
2011-07-03 15:54 Wiktor W Brodlo
2011-07-01 2:03 Wiktor W Brodlo
2011-06-21 13:40 Wiktor W Brodlo
2011-06-21 13:12 Wiktor W Brodlo
2011-06-21 13:04 Wiktor W Brodlo
2011-06-21 12:56 Wiktor W Brodlo
2011-06-21 12:43 Wiktor W Brodlo
2011-06-21 12:40 Wiktor W Brodlo
2011-06-21 12:15 Wiktor W Brodlo
2011-06-20 19:28 Wiktor W Brodlo
2011-06-20 19:07 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