[Debian-live-changes] r2469 - in dists/trunk/live-magic: glade livemagic/controllers livemagic/views
lamby-guest at alioth.debian.org
lamby-guest at alioth.debian.org
Thu Jul 12 22:28:39 UTC 2007
Author: lamby-guest
Date: 2007-07-12 22:28:39 +0000 (Thu, 12 Jul 2007)
New Revision: 2469
Modified:
dists/trunk/live-magic/glade/main.glade
dists/trunk/live-magic/livemagic/controllers/wizard.py
dists/trunk/live-magic/livemagic/views/wizard.py
Log:
Actually make it fill in the details from the wizard.
Modified: dists/trunk/live-magic/glade/main.glade
===================================================================
--- dists/trunk/live-magic/glade/main.glade 2007-07-12 21:36:51 UTC (rev 2468)
+++ dists/trunk/live-magic/glade/main.glade 2007-07-12 22:28:39 UTC (rev 2469)
@@ -3060,7 +3060,7 @@
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radiobutton1">
+ <widget class="GtkRadioButton" id="radio_desktop_gnome">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -3099,12 +3099,12 @@
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radiobutton4">
+ <widget class="GtkRadioButton" id="radio_desktop_kde">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="draw_indicator">True</property>
- <property name="group">radiobutton1</property>
+ <property name="group">radio_desktop_gnome</property>
<child>
<widget class="GtkHBox" id="hbox14">
<property name="visible">True</property>
@@ -3140,12 +3140,12 @@
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radiobutton6">
+ <widget class="GtkRadioButton" id="radio_desktop_xfce">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="draw_indicator">True</property>
- <property name="group">radiobutton4</property>
+ <property name="group">radio_desktop_kde</property>
<child>
<widget class="GtkHBox" id="hbox15">
<property name="visible">True</property>
@@ -3181,12 +3181,12 @@
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radiobutton7">
+ <widget class="GtkRadioButton" id="radio_desktop_gnustep">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="draw_indicator">True</property>
- <property name="group">radiobutton1</property>
+ <property name="group">radio_desktop_gnome</property>
<child>
<widget class="GtkHBox" id="hbox27">
<property name="visible">True</property>
@@ -3222,12 +3222,12 @@
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radiobutton16">
+ <widget class="GtkRadioButton" id="radio_desktop_standard">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="draw_indicator">True</property>
- <property name="group">radiobutton1</property>
+ <property name="group">radio_desktop_gnome</property>
<child>
<widget class="GtkHBox" id="hbox28">
<property name="visible">True</property>
@@ -3263,12 +3263,12 @@
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radiobutton18">
+ <widget class="GtkRadioButton" id="radio_desktop_rescue">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="draw_indicator">True</property>
- <property name="group">radiobutton1</property>
+ <property name="group">radio_desktop_gnome</property>
<child>
<widget class="GtkHBox" id="hbox29">
<property name="visible">True</property>
@@ -3414,7 +3414,7 @@
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radiobutton13">
+ <widget class="GtkRadioButton" id="radio_media_iso">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -3453,13 +3453,13 @@
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radiobutton14">
+ <widget class="GtkRadioButton" id="radio_media_usb">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">radiobutton13</property>
+ <property name="group">radio_media_iso</property>
<child>
<widget class="GtkHBox" id="hbox25">
<property name="visible">True</property>
@@ -3495,13 +3495,13 @@
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radiobutton15">
+ <widget class="GtkRadioButton" id="radio_media_netboot">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">radiobutton13</property>
+ <property name="group">radio_media_iso</property>
<child>
<widget class="GtkHBox" id="hbox26">
<property name="visible">True</property>
@@ -3616,7 +3616,7 @@
<property name="n_rows">3</property>
<property name="n_columns">2</property>
<child>
- <widget class="GtkRadioButton" id="radiobutton5">
+ <widget class="GtkRadioButton" id="radio_architecture_i386">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -3633,14 +3633,14 @@
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radiobutton11">
+ <widget class="GtkRadioButton" id="radio_architecture_amd64">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">amd64</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">radiobutton5</property>
+ <property name="group">radio_architecture_i386</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -3653,14 +3653,14 @@
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radiobutton12">
+ <widget class="GtkRadioButton" id="radio_architecture_powerpc">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">PowerPC</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">radiobutton5</property>
+ <property name="group">radio_architecture_i386</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -3790,7 +3790,7 @@
<property name="n_rows">1</property>
<property name="n_columns">3</property>
<child>
- <widget class="GtkComboBoxEntry" id="comboboxentry5">
+ <widget class="GtkComboBoxEntry" id="combobox_mirror">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="items">http://ftp.debian.org/debian
Modified: dists/trunk/live-magic/livemagic/controllers/wizard.py
===================================================================
--- dists/trunk/live-magic/livemagic/controllers/wizard.py 2007-07-12 21:36:51 UTC (rev 2468)
+++ dists/trunk/live-magic/livemagic/controllers/wizard.py 2007-07-12 22:28:39 UTC (rev 2469)
@@ -1,3 +1,4 @@
+import gtk
class WizardController(object):
@@ -2,3 +3,12 @@
def on_wizard_apply(self, _):
- self.view.do_hide_wizard()
+
+ # Fill in data from model
+ data = self.view.get_wizard_completed_details()
+ self.model.binary.LIVE_BINARY_IMAGES = [data['media']]
+ self.model.bootstrap.LIVE_MIRROR_BOOTSTRAP = data['mirror']
+ self.model.chroot.LIVE_PACKAGES_LISTS = data['desktop']
+ self.model.bootstrap.LIVE_ARCHITECTURE = data['arch']
+ self.model.save()
+
+ self.view.do_dim_wizard()
self.do_show_build_window(self.on_wizard_build_completed)
@@ -10,5 +20,4 @@
self.view.do_show_main_window()
def on_wizard_build_completed(self):
- import gtk
gtk.main_quit()
Modified: dists/trunk/live-magic/livemagic/views/wizard.py
===================================================================
--- dists/trunk/live-magic/livemagic/views/wizard.py 2007-07-12 21:36:51 UTC (rev 2468)
+++ dists/trunk/live-magic/livemagic/views/wizard.py 2007-07-12 22:28:39 UTC (rev 2469)
@@ -7,7 +7,7 @@
def do_show_wizard(self):
self.asst.show()
- def do_hide_wizard(self):
+ def do_dim_wizard(self):
self.asst.set_sensitive(False)
def construct_assistant(self):
@@ -54,3 +54,18 @@
asst.set_page_title(page, notebook.get_tab_label_text(page))
return asst
+
+ def get_wizard_completed_details(self):
+ data = {}
+
+ def get_active(name):
+ for button in self[name].get_group():
+ if button.get_active() == True:
+ return button.get_name().split('_')[2]
+
+ return {
+ 'desktop' : get_active('radio_desktop_gnome'),
+ 'media' : get_active('radio_media_usb'),
+ 'arch' : get_active('radio_architecture_i386'),
+ 'mirror' : self['combobox_mirror'].get_active_text()
+ }
More information about the Debian-live-changes
mailing list