[SCM] GUI front-end for Debian Live. branch, master, updated. ee1fcdc9c4f24843c4be883020457b97d0dc3bce
Chris Lamb
chris at chris-lamb.co.uk
Thu Jul 24 18:43:27 UTC 2008
The following commit has been merged in the master branch:
commit ee1fcdc9c4f24843c4be883020457b97d0dc3bce
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Thu Jul 24 19:43:07 2008 +0100
Add d-i integration step which sets LH_DEBIAN_INSTALLER="live" (Closes: #492082)
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/LiveMagic/views/wizard.py b/LiveMagic/views/wizard.py
index bd82816..776c4ab 100644
--- a/LiveMagic/views/wizard.py
+++ b/LiveMagic/views/wizard.py
@@ -61,7 +61,7 @@ class WizardView(object):
for i in range(notebook.get_n_pages()):
# Only show architecture page if using amd64
- if notebook.get_n_pages() - 3 == i and \
+ if notebook.get_n_pages() - 4 == i and \
self.controller.get_host_architecture() != 'amd64':
continue
@@ -118,6 +118,7 @@ class WizardView(object):
'packages_lists' : get_active('radio_desktop_gnome'),
'binary_images' : get_active('radio_media_iso'),
'distribution' : get_active('radio_distribution_etch'),
+ 'debian_installer' : get_active('radio_installer_disabled'),
'mirror' : self['combobox_mirror'].get_active_text()
}
diff --git a/debian/changelog b/debian/changelog
index 5a08433..eec9c39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+live-magic (0.7) unstable; urgency=low
+
+ * Add d-i integration step which sets LH_DEBIAN_INSTALLER="live"
+ (Closes: #492082)
+
+ -- Chris Lamb <chris at chris-lamb.co.uk> Thu, 24 Jul 2008 19:42:35 +0100
+
live-magic (0.6) unstable; urgency=medium
* Remove "--preserve-env" when calling gksu. Contrary to #490134, the
diff --git a/misc/live-magic.glade b/misc/live-magic.glade
index bb7a808..aebf017 100644
--- a/misc/live-magic.glade
+++ b/misc/live-magic.glade
@@ -238,26 +238,26 @@ of building your own Debian Live system.</property>
<property name="n_rows">1</property>
<property name="n_columns">2</property>
<child>
- <widget class="GtkLabel" id="label36">
+ <widget class="GtkLabel" id="label18">
<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="label" translatable="yes"><b>What type of image would you like?</b></property>
- <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
+ <property name="x_padding">20</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label18">
+ <widget class="GtkLabel" id="label36">
<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="label" translatable="yes"><b>What type of image would you like?</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="x_padding">20</property>
</packing>
</child>
</widget>
@@ -272,26 +272,88 @@ of building your own Debian Live system.</property>
<property name="n_rows">5</property>
<property name="n_columns">2</property>
<child>
- <widget class="GtkRadioButton" id="radio_desktop_rescue">
+ <widget class="GtkLabel" id="label56">
+ <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>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="x_padding">40</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label106">
+ <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>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="x_padding">40</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label110">
+ <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>
+ </widget>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="x_padding">40</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label111">
+ <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>
+ </widget>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="x_padding">40</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label112">
+ <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>
+ </widget>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="x_padding">40</property>
+ </packing>
+ </child>
+ <child>
+ <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>
<property name="response_id">0</property>
+ <property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">radio_desktop_gnome</property>
<child>
- <widget class="GtkHBox" id="hbox21">
+ <widget class="GtkHBox" id="hbox9">
<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="spacing">10</property>
<child>
- <placeholder/>
+ <widget class="GtkImage" id="image4">
+ <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="pixbuf">gnome-logo-icon-transparent.png</property>
+ </widget>
</child>
<child>
- <widget class="GtkLabel" id="label71">
+ <widget class="GtkLabel" id="label119">
<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="label" translatable="yes">Debian GNU/Linux rescue image</property>
+ <property name="label" translatable="yes">GNOME desktop environment</property>
</widget>
<packing>
<property name="position">1</property>
@@ -303,14 +365,12 @@ of building your own Debian Live system.</property>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_padding">5</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radio_desktop_standard">
+ <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>
@@ -318,22 +378,22 @@ of building your own Debian Live system.</property>
<property name="draw_indicator">True</property>
<property name="group">radio_desktop_gnome</property>
<child>
- <widget class="GtkHBox" id="hbox20">
+ <widget class="GtkHBox" id="hbox14">
<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="spacing">10</property>
<child>
- <widget class="GtkImage" id="image11">
+ <widget class="GtkImage" id="image7">
<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="pixbuf">debian_sm.png</property>
+ <property name="pixbuf">kde.png</property>
</widget>
</child>
<child>
- <widget class="GtkLabel" id="label70">
+ <widget class="GtkLabel" id="label118">
<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="label" translatable="yes">Standard Debian GNU/Linux image</property>
+ <property name="label" translatable="yes">KDE desktop environment</property>
</widget>
<packing>
<property name="position">1</property>
@@ -345,8 +405,8 @@ of building your own Debian Live system.</property>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_padding">5</property>
</packing>
@@ -394,7 +454,7 @@ of building your own Debian Live system.</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radio_desktop_kde">
+ <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>
@@ -402,22 +462,22 @@ of building your own Debian Live system.</property>
<property name="draw_indicator">True</property>
<property name="group">radio_desktop_gnome</property>
<child>
- <widget class="GtkHBox" id="hbox14">
+ <widget class="GtkHBox" id="hbox20">
<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="spacing">10</property>
<child>
- <widget class="GtkImage" id="image7">
+ <widget class="GtkImage" id="image11">
<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="pixbuf">kde.png</property>
+ <property name="pixbuf">debian_sm.png</property>
</widget>
</child>
<child>
- <widget class="GtkLabel" id="label118">
+ <widget class="GtkLabel" id="label70">
<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="label" translatable="yes">KDE desktop environment</property>
+ <property name="label" translatable="yes">Standard Debian GNU/Linux image</property>
</widget>
<packing>
<property name="position">1</property>
@@ -429,37 +489,33 @@ of building your own Debian Live system.</property>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_padding">5</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radio_desktop_gnome">
+ <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="response_id">0</property>
- <property name="active">True</property>
<property name="draw_indicator">True</property>
+ <property name="group">radio_desktop_gnome</property>
<child>
- <widget class="GtkHBox" id="hbox9">
+ <widget class="GtkHBox" id="hbox21">
<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="spacing">10</property>
<child>
- <widget class="GtkImage" id="image4">
- <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="pixbuf">gnome-logo-icon-transparent.png</property>
- </widget>
+ <placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="label119">
+ <widget class="GtkLabel" id="label71">
<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="label" translatable="yes">GNOME desktop environment</property>
+ <property name="label" translatable="yes">Debian GNU/Linux rescue image</property>
</widget>
<packing>
<property name="position">1</property>
@@ -471,66 +527,10 @@ of building your own Debian Live system.</property>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_padding">5</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label112">
- <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>
- </widget>
- <packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
- <property name="x_padding">40</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label111">
- <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>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="x_padding">40</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label110">
- <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>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="x_padding">40</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label106">
- <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>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="x_padding">40</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label56">
- <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>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="x_padding">40</property>
+ <property name="y_padding">5</property>
</packing>
</child>
</widget>
@@ -576,29 +576,29 @@ of building your own Debian Live system.</property>
<property name="n_rows">1</property>
<property name="n_columns">2</property>
<child>
- <widget class="GtkLabel" id="label95">
+ <widget class="GtkLabel" id="label100">
<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="label" translatable="yes"><b>What distribution of Debian would you like to build?</b>
-
-If unsure, select "<i>Stable (etch)</i>".</property>
- <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ <property name="x_padding">20</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label100">
+ <widget class="GtkLabel" id="label95">
<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="label" translatable="yes"><b>What distribution of Debian would you like to build?</b>
+
+If unsure, select "<i>Stable (etch)</i>".</property>
+ <property name="use_markup">True</property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">20</property>
</packing>
</child>
</widget>
@@ -614,38 +614,43 @@ If unsure, select "<i>Stable (etch)</i>".</property>
<property name="n_rows">3</property>
<property name="n_columns">2</property>
<child>
- <widget class="GtkLabel" id="label101">
- <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>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label105">
+ <widget class="GtkRadioButton" id="radio_distribution_etch">
<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">Stable (etch) - well-tested and rarely changes.</property>
+ <property name="response_id">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
+ <property name="y_padding">4</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label107">
+ <widget class="GtkRadioButton" id="radio_distribution_lenny">
<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">Testing (lenny) - receives new versions from unstable if they are not too buggy.</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radio_distribution_etch</property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
- <property name="x_padding">40</property>
+ <property name="y_padding">4</property>
</packing>
</child>
<child>
@@ -670,43 +675,38 @@ If unsure, select "<i>Stable (etch)</i>".</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radio_distribution_lenny">
+ <widget class="GtkLabel" id="label107">
<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">Testing (lenny) - receives new versions from unstable if they are not too buggy.</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">radio_distribution_etch</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
- <property name="y_padding">4</property>
+ <property name="x_padding">40</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radio_distribution_etch">
+ <widget class="GtkLabel" id="label105">
<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">Stable (etch) - well-tested and rarely changes.</property>
- <property name="response_id">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label101">
+ <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>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
- <property name="y_padding">4</property>
</packing>
</child>
</widget>
@@ -752,27 +752,27 @@ If unsure, select "<i>Stable (etch)</i>".</property>
<property name="n_rows">1</property>
<property name="n_columns">2</property>
<child>
- <widget class="GtkLabel" id="label102">
+ <widget class="GtkLabel" id="label74">
<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="label" translatable="yes"><b>What media type would you like to target?</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">20</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label74">
+ <widget class="GtkLabel" id="label102">
<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="label" translatable="yes"><b>What media type would you like to target?</b></property>
- <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ <property name="x_padding">20</property>
</packing>
</child>
</widget>
@@ -788,129 +788,65 @@ If unsure, select "<i>Stable (etch)</i>".</property>
<property name="n_rows">4</property>
<property name="n_columns">2</property>
<child>
- <widget class="GtkTable" id="table_netboot_settings">
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <child>
- <widget class="GtkComboBox" id="combo_net_root_filesystem">
- <property name="width_request">216</property>
- <property name="visible">True</property>
- <property name="has_frame">False</property>
- <property name="items" translatable="yes"></property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Server path:</property>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND</property>
- <property name="y_padding">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Server address:</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Server type:</property>
- </widget>
- <packing>
- <property name="x_options">GTK_EXPAND</property>
- <property name="x_padding">30</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="entry_net_root_path">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="entry_net_root_server">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
+ <widget class="GtkLabel" id="label76">
+ <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>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="x_padding">24</property>
- <property name="y_padding">7</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label6">
+ <widget class="GtkLabel" id="label94">
<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>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label96">
+ <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>
+ </widget>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
<property name="x_padding">40</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radio_media_net">
+ <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>
<property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">radio_media_iso</property>
- <signal name="toggled" handler="on_radio_media_net_group_changed"/>
<child>
- <widget class="GtkHBox" id="hbox26">
+ <widget class="GtkHBox" id="hbox23">
<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="spacing">5</property>
<child>
- <widget class="GtkImage" id="image20">
+ <widget class="GtkImage" id="image18">
<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="stock">gtk-network</property>
+ <property name="stock">gtk-cdrom</property>
</widget>
</child>
<child>
- <widget class="GtkLabel" id="label99">
+ <widget class="GtkLabel" id="label97">
<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="label" translatable="yes">Network boot image</property>
+ <property name="label" translatable="yes">ISO image for a CD or DVD</property>
</widget>
<packing>
<property name="position">1</property>
@@ -922,8 +858,6 @@ If unsure, select "<i>Stable (etch)</i>".</property>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_padding">5</property>
</packing>
@@ -972,30 +906,32 @@ If unsure, select "<i>Stable (etch)</i>".</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radio_media_iso">
+ <widget class="GtkRadioButton" id="radio_media_net">
<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="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
+ <property name="group">radio_media_iso</property>
+ <signal name="toggled" handler="on_radio_media_net_group_changed"/>
<child>
- <widget class="GtkHBox" id="hbox23">
+ <widget class="GtkHBox" id="hbox26">
<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="spacing">5</property>
<child>
- <widget class="GtkImage" id="image18">
+ <widget class="GtkImage" id="image20">
<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="stock">gtk-cdrom</property>
+ <property name="stock">gtk-network</property>
</widget>
</child>
<child>
- <widget class="GtkLabel" id="label97">
+ <widget class="GtkLabel" id="label99">
<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="label" translatable="yes">ISO image for a CD or DVD</property>
+ <property name="label" translatable="yes">Network boot image</property>
</widget>
<packing>
<property name="position">1</property>
@@ -1007,43 +943,107 @@ If unsure, select "<i>Stable (etch)</i>".</property>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_padding">5</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label96">
- <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>
- </widget>
- <packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">40</property>
+ <property name="y_padding">5</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label94">
+ <widget class="GtkLabel" id="label6">
<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>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
+ <property name="x_padding">40</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label76">
- <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>
+ <widget class="GtkTable" id="table_netboot_settings">
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <child>
+ <widget class="GtkEntry" id="entry_net_root_server">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="entry_net_root_path">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Server type:</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_EXPAND</property>
+ <property name="x_padding">30</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Server address:</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_EXPAND</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Server path:</property>
+ </widget>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_EXPAND</property>
+ <property name="y_padding">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox" id="combo_net_root_filesystem">
+ <property name="width_request">216</property>
+ <property name="visible">True</property>
+ <property name="has_frame">False</property>
+ <property name="items" translatable="yes"></property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="x_padding">24</property>
+ <property name="y_padding">7</property>
</packing>
</child>
</widget>
@@ -1089,29 +1089,29 @@ If unsure, select "<i>Stable (etch)</i>".</property>
<property name="n_rows">1</property>
<property name="n_columns">2</property>
<child>
- <widget class="GtkLabel" id="label77">
+ <widget class="GtkLabel" id="label83">
<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="label" translatable="yes"><b>Please choose a local mirror.</b>
-
-To select a mirror that is not on the list, simply enter it below.</property>
- <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ <property name="x_padding">20</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label83">
+ <widget class="GtkLabel" id="label77">
<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="label" translatable="yes"><b>Please choose a local mirror.</b>
+
+To select a mirror that is not on the list, simply enter it below.</property>
+ <property name="use_markup">True</property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">20</property>
</packing>
</child>
</widget>
@@ -1127,28 +1127,6 @@ To select a mirror that is not on the list, simply enter it below.</property>
<property name="n_rows">1</property>
<property name="n_columns">3</property>
<child>
- <widget class="GtkLabel" id="label88">
- <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>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="x_padding">20</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label90">
- <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>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="x_padding">30</property>
- </packing>
- </child>
- <child>
<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>
@@ -1207,6 +1185,28 @@ http://ftp.uk.debian.org/debian
<property name="right_attach">2</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label90">
+ <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>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="x_padding">30</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label88">
+ <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>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="x_padding">20</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -1251,29 +1251,29 @@ http://ftp.uk.debian.org/debian
<property name="n_rows">1</property>
<property name="n_columns">2</property>
<child>
- <widget class="GtkLabel" id="label104">
+ <widget class="GtkLabel" id="label103">
<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="label" translatable="yes" comments="Should only be displayed when building on amd64."><b>What type of machine is your Debian Live system for?</b>
-
-If you are unsure, select "<i>i386</i>".</property>
- <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ <property name="x_padding">20</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label103">
+ <widget class="GtkLabel" id="label104">
<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="label" translatable="yes" comments="Should only be displayed when building on amd64."><b>What type of machine is your Debian Live system for?</b>
+
+If you are unsure, select "<i>i386</i>".</property>
+ <property name="use_markup">True</property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">20</property>
</packing>
</child>
</widget>
@@ -1289,6 +1289,52 @@ If you are unsure, select "<i>i386</i>".</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<child>
+ <widget class="GtkLabel" id="label86">
+ <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>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ <property name="x_padding">40</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label89">
+ <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>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <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
+Most new computers with e.g. AMD Opteron, Turion 64, Athlon 64, or
+Intel Core2, Pentium 4xx, Pentium D CPUs.</property>
+ <property name="response_id">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radio_architecture_i386</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ <property name="y_padding">4</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkRadioButton" id="radio_architecture_i386">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1308,18 +1354,100 @@ desktop computers dating 2004 or earlier.</property>
<property name="y_padding">4</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label81">
+ <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="label" translatable="yes">Select architecture</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ <property name="position">5</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox_installer">
+ <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>
+ <child>
+ <widget class="GtkVBox" id="vbox3">
+ <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>
+ <child>
+ <widget class="GtkTable" id="table3">
+ <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="n_rows">1</property>
+ <property name="n_columns">2</property>
+ <child>
+ <widget class="GtkLabel" id="label11">
+ <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>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ <property name="x_padding">20</property>
+ </packing>
+ </child>
<child>
- <widget class="GtkRadioButton" id="radio_architecture_amd64">
+ <widget class="GtkLabel" id="label12">
+ <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="label" translatable="yes"><b>Select Debian Installer integration</b>
+
+Selecting "<i>yes</i>" below adds additional boot options that launch the Debian Installer, the
+official installation system for Debian systems.
+
+If unsure, select "<i>no</i>".</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">14</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkTable" id="table4">
+ <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="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <child>
+ <widget class="GtkRadioButton" id="radio_installer_disabled">
<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
-Most new computers with e.g. AMD Opteron, Turion 64, Athlon 64, or
-Intel Core2, Pentium 4xx, Pentium D CPUs.</property>
+ <property name="label" translatable="yes">No, do not integrate the Debian Installer.</property>
+ <property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">radio_architecture_i386</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -1332,7 +1460,7 @@ Intel Core2, Pentium 4xx, Pentium D CPUs.</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label89">
+ <widget class="GtkLabel" id="label14">
<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>
</widget>
@@ -1344,7 +1472,25 @@ Intel Core2, Pentium 4xx, Pentium D CPUs.</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label86">
+ <widget class="GtkRadioButton" id="radio_installer_live">
+ <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">Yes, integrate the Debian Installer.</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radio_installer_disabled</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ <property name="y_padding">4</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label13">
<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>
</widget>
@@ -1368,23 +1514,22 @@ Intel Core2, Pentium 4xx, Pentium D CPUs.</property>
</child>
</widget>
<packing>
- <property name="position">5</property>
+ <property name="position">6</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label81">
+ <widget class="GtkLabel" id="label10">
<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="label" translatable="yes">Select architecture</property>
+ <property name="label" translatable="yes">Select Debian Installer integration</property>
</widget>
<packing>
<property name="type">tab</property>
- <property name="position">5</property>
+ <property name="position">6</property>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox_mirror1">
+ <widget class="GtkVBox" id="vbox_build_dir">
<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>
<child>
@@ -1438,8 +1583,8 @@ If the specified directory is not empty, images will be created in a <i>De
<child>
<widget class="GtkFileChooserButton" id="filechooser_build_directory">
<property name="visible">True</property>
- <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
<property name="use_preview_label">False</property>
+ <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
<property name="focus_on_click">False</property>
<property name="title" translatable="yes">Select A Build Folder</property>
</widget>
@@ -1484,7 +1629,7 @@ If the specified directory is not empty, images will be created in a <i>De
</child>
</widget>
<packing>
- <property name="position">6</property>
+ <property name="position">7</property>
</packing>
</child>
<child>
@@ -1494,7 +1639,7 @@ If the specified directory is not empty, images will be created in a <i>De
</widget>
<packing>
<property name="type">tab</property>
- <property name="position">6</property>
+ <property name="position">7</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -1528,7 +1673,7 @@ Press <i>Apply</i> to begin the build process.</property>
</child>
</widget>
<packing>
- <property name="position">7</property>
+ <property name="position">8</property>
</packing>
</child>
<child>
@@ -1540,7 +1685,7 @@ Press <i>Apply</i> to begin the build process.</property>
</widget>
<packing>
<property name="type">tab</property>
- <property name="position">6</property>
+ <property name="position">8</property>
<property name="tab_fill">False</property>
</packing>
</child>
--
GUI front-end for Debian Live.
More information about the debian-live-changes
mailing list