diff options
author | 2007-03-19 01:01:33 +0000 | |
---|---|---|
committer | 2007-03-19 01:01:33 +0000 | |
commit | 73c24372688c30d59ad534df39dd79ff26f447d6 (patch) | |
tree | 45958016811a5b58c7a8c10cd3a34f81250c7f58 | |
parent | missing self in MakeDotConf (diff) | |
download | gli-73c24372688c30d59ad534df39dd79ff26f447d6.tar.gz gli-73c24372688c30d59ad534df39dd79ff26f447d6.tar.bz2 gli-73c24372688c30d59ad534df39dd79ff26f447d6.zip |
allow bootloader selection in all modes
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/gli/branches/overhaul@1813 f8877401-5920-0410-a79b-8e2d7e04ca0d
-rw-r--r-- | src/fe/gtk/Bootloader.py | 54 | ||||
-rw-r--r-- | src/fe/gtk/Logger.py | 2 |
2 files changed, 24 insertions, 32 deletions
diff --git a/src/fe/gtk/Bootloader.py b/src/fe/gtk/Bootloader.py index e763c1a..f3d3726 100644 --- a/src/fe/gtk/Bootloader.py +++ b/src/fe/gtk/Bootloader.py @@ -47,31 +47,27 @@ you will just leave this blank. vert = gtk.VBox(False, 0) vert.set_border_width(10) - self.tmpbootloaders = self.bootloaders[self.controller.cc.get_arch()] + self.bootloaders['none'] - if self.controller.install_type == "networkless": - hbox = gtk.HBox(False) - label = gtk.Label() - label.set_markup('<b>Your bootloader will be %s</b>' % self.tmpbootloaders[0]) - hbox.pack_start(label, expand=False, fill=False, padding=0) - vert.pack_start(hbox, expand=False, fill=False, padding=20) - else: - hbox = gtk.HBox(False) - label = gtk.Label() - label.set_markup('<b>Choose your bootloader</b>') - hbox.pack_start(label, expand=False, fill=False, padding=0) + self.tmpbootloaders = self.bootloaders[self.controller.cc.get_arch()] + if self.controller.install_type == "advanced": + self.tmpbootloaders += self.bootloaders['none'] + + hbox = gtk.HBox(False) + label = gtk.Label() + label.set_markup('<b>Choose your bootloader</b>') + hbox.pack_start(label, expand=False, fill=False, padding=0) + vert.pack_start(hbox, expand=False, fill=False, padding=20) + + for bootloader in self.tmpbootloaders: + hbox = gtk.HBox(False, 0) + if bootloader == self.tmpbootloaders[0]: + self.radio_bootloaders[bootloader] = gtk.RadioButton(None, bootloader) + else: + self.radio_bootloaders[bootloader] = gtk.RadioButton(self.radio_bootloaders[self.tmpbootloaders[0]], bootloader) + self.radio_bootloaders[bootloader].set_name(bootloader) + self.radio_bootloaders[bootloader].connect("toggled", self.bootloader_selected, bootloader) + hbox.pack_start(self.radio_bootloaders[bootloader], expand=False, fill=False, padding=20) vert.pack_start(hbox, expand=False, fill=False, padding=20) - for bootloader in self.tmpbootloaders: - hbox = gtk.HBox(False, 0) - if bootloader == self.tmpbootloaders[0]: - self.radio_bootloaders[bootloader] = gtk.RadioButton(None, bootloader) - else: - self.radio_bootloaders[bootloader] = gtk.RadioButton(self.radio_bootloaders[self.tmpbootloaders[0]], bootloader) - self.radio_bootloaders[bootloader].set_name(bootloader) - self.radio_bootloaders[bootloader].connect("toggled", self.bootloader_selected, bootloader) - hbox.pack_start(self.radio_bootloaders[bootloader], expand=False, fill=False, padding=20) - vert.pack_start(hbox, expand=False, fill=False, padding=20) - # self.check_install_in_mbr = gtk.CheckButton("Install in MBR") # self.check_install_in_mbr.connect("toggled", self.mbr_selected) # self.check_install_in_mbr.set_size_request(125, -1) @@ -118,11 +114,10 @@ you will just leave this blank. # self.boot_device_combo.set_sensitive(False) def activate(self): - self.controller.SHOW_BUTTON_BACK = True + self.controller.SHOW_BUTTON_BACK = False self.controller.SHOW_BUTTON_FORWARD = True - if self.controller.install_type != "networkless": - self.active_selection = self.controller.install_profile.get_boot_loader_pkg() or self.tmpbootloaders[0] - self.radio_bootloaders[self.active_selection].set_active(True) + self.active_selection = self.controller.install_profile.get_boot_loader_pkg() or self.tmpbootloaders[0] + self.radio_bootloaders[self.active_selection].set_active(True) # self.check_install_in_mbr.set_active(self.controller.install_profile.get_boot_loader_mbr()) # self.boot_devices = self.controller.install_profile.get_partition_tables().keys() # self.boot_devices.sort() @@ -145,10 +140,7 @@ you will just leave this blank. # self.kernel_params_entry.set_text(kernel_params) def next(self): - if self.controller.install_type == "networkless": - self.controller.install_profile.set_boot_loader_pkg(None, self.tmpbootloaders[0], None) - else: - self.controller.install_profile.set_boot_loader_pkg(None, self.active_selection, None) + self.controller.install_profile.set_boot_loader_pkg(None, self.active_selection, None) self.controller.install_profile.set_boot_loader_mbr(None, True, None) # if self.check_install_in_mbr.get_active(): # self.controller.install_profile.set_boot_device(None, self.boot_devices[self.boot_device_combo.get_active()], None) diff --git a/src/fe/gtk/Logger.py b/src/fe/gtk/Logger.py index 6f834f4..d1426ef 100644 --- a/src/fe/gtk/Logger.py +++ b/src/fe/gtk/Logger.py @@ -56,7 +56,7 @@ available in Networkless mode. self.active_selection = data def activate(self): - self.controller.SHOW_BUTTON_BACK = True + self.controller.SHOW_BUTTON_BACK = False self.controller.SHOW_BUTTON_FORWARD = True if self.controller.install_type != "networkless": self.active_selection = self.controller.install_profile.get_logging_daemon_pkg() or self.loggers[0] |