Author: juhliarik Date: Fri Mar 6 14:02:49 2009 New Revision: 55966 URL: http://svn.opensuse.org/viewcvs/yast?rev=55966&view=rev Log: updated bootloader UI for GRUB Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootGRUB.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/global_widgets.ycp Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootGRUB.ycp?rev=55966&r1=55965&r2=55966&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootGRUB.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootGRUB.ycp Fri Mar 6 14:02:49 2009 @@ -61,8 +61,6 @@ include "bootloader/grub/misc.ycp"; include "bootloader/routines/popups.ycp"; include "bootloader/grub/helps.ycp"; -//include "bootloader/generic/device_map_edit_widget.ycp"; -include "bootloader/generic/dialogs.ycp"; include "bootloader/routines/dialogs_i386.ycp"; @@ -815,7 +813,6 @@ "summary" : Summary, "update" : Update, "write" : Write, - "widgets" : genericWidgets, "wizard_sequencer" : WizardSequenzer, "dialogs" : Dialogs, "section_types" : grub_section_types, Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp?rev=55966&r1=55965&r2=55966&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp Fri Mar 6 14:02:49 2009 @@ -102,8 +102,6 @@ list<string> widget_names = ["tab", "adv_button"]; map > widget_descr = $[]; - - y2error("FIXME: add generated UI for non GRUB bootloaders"); if (lt != "grub") widget_descr = (map >) union (CommonGlobalWidgets (), Bootloader::blWidgetMaps ()); else @@ -188,12 +186,10 @@ ,"noverifyroot"]; map > widget_descr = $[]; - - y2error("FIXME: add generated UI for non GRUB bootloaders"); if (lt != "grub") widget_descr = (map >) union (CommonGlobalWidgets (), Bootloader::blWidgetMaps ()); else - widget_descr = CommonGlobalWidgets (); + widget_descr = (map >) union (CommonGlobalWidgets (), CommonSectionWidgets ()); // dialog caption @@ -212,7 +208,7 @@ symbol XenSectionDialog () { y2milestone ("Running kernel section dialog"); - + string lt = Bootloader::getLoaderType (); term contents = `HBox (`HSpacing (2), `VBox ( `VStretch (), // heading @@ -239,8 +235,11 @@ list<string> widget_names = ["name", "image", "initrd", "root", "vgamode", "append" ,"xen_append","xen"]; - - map > widget_descr =CommonSectionWidgets (); + map > widget_descr = $[]; + if (lt != "grub") + widget_descr = (map >) union (CommonGlobalWidgets (), Bootloader::blWidgetMaps ()); + else + widget_descr = (map >) union (CommonGlobalWidgets (), CommonSectionWidgets ()); // dialog caption string caption = _("Boot Loader Settings: Section Management"); return CWM::ShowAndRun ($[ @@ -257,7 +256,7 @@ symbol MenuSectionDialog () { y2milestone ("Running kernel section dialog"); - + string lt = Bootloader::getLoaderType (); term contents = `HBox (`HSpacing (2), `VBox ( `VStretch (), // heading @@ -276,8 +275,11 @@ ), `HSpacing (2)); list<string> widget_names = ["name", "root", "configfile"]; - - map > widget_descr =CommonSectionWidgets (); + map > widget_descr = $[]; + if (lt != "grub") + widget_descr = (map >) union (CommonGlobalWidgets (), Bootloader::blWidgetMaps ()); + else + widget_descr = (map >) union (CommonGlobalWidgets (), CommonSectionWidgets ()); // dialog caption string caption = _("Boot Loader Settings: Section Management"); return CWM::ShowAndRun ($[ @@ -324,11 +326,10 @@ "noverifyroot", "remap", "blockoffset"]; map > widget_descr = $[]; - y2error("FIXME: add generated UI for non GRUB bootloaders"); if (lt != "grub") widget_descr = (map >) union (CommonGlobalWidgets (), Bootloader::blWidgetMaps ()); else - widget_descr = CommonGlobalWidgets (); + widget_descr = (map >) union (CommonGlobalWidgets (), CommonSectionWidgets ()); // dialog caption @@ -361,12 +362,10 @@ list<string> widget_names = ["section_type"]; map > widget_descr = $[]; - - y2error("FIXME: add generated UI for non GRUB bootloaders"); if (lt != "grub") widget_descr = (map >) union (CommonGlobalWidgets (), Bootloader::blWidgetMaps ()); else - widget_descr = CommonGlobalWidgets (); + widget_descr = (map >) union (CommonGlobalWidgets (), CommonSectionWidgets ()); // dialog caption string caption = _("Boot Loader Settings: Section Management"); Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/global_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/global_widgets.ycp?rev=55966&r1=55965&r2=55966&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/global_widgets.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/global_widgets.ycp Fri Mar 6 14:02:49 2009 @@ -523,14 +523,13 @@ term targetlist = `VBox (`HBox(`HSpacing(1),`VBox( `Left(`CheckBox( `id("boot_mbr"), _("Boot from &Master Boot Record"))), `Left(`CheckBox( `id("boot_root"), _("Boot from &Root Partition"))), - `Left(`CheckBox( `id("boot_boot"), _("Boot from &Boot Partition"))), + `Left(`CheckBox( `id("boot_boot"), _("Boo&t from Boot Partition"))), `Left(`CheckBox( `id("boot_extended"), _("Boot from &Extended Partition"))), - `Left(`CheckBox( `id("boot_custom"), `opt(`notify), _("Custom Boot &Partition"))), + `Left(`CheckBox( `id("boot_custom"), `opt(`notify), _("C&ustom Boot Partition"))), `Left(`ComboBox( `id("boot_custom_list"), `opt(`hstretch),"", [])), `VStretch() ))); - // frame widget = `VBox ( `Frame (_("Boot Loader Location"), targetlist), @@ -561,7 +560,8 @@ UI::ChangeWidget (`id (key), `Value, (value == "true")? true: false); }); - if (!haskey(BootCommon::globals,"boot_custom")) + if ((!haskey(BootCommon::globals,"boot_custom")) && + (BootCommon::globals["boot_custom"]:"" != "")) { UI::ChangeWidget (`id ("boot_custom_list"),`Enabled, false); } else { @@ -798,39 +798,6 @@ ]; } - - -/** - * Function for disable back button - * @param string key - */ - -void BackButton (string key) { - if (Mode::installation()) - UI::ChangeWidget(`id(`back), `Enabled, false); -} - - -/** - * Init function where are added UI hadle functions - * special hack widget where is handlig disable back button - * - * @return map map for start-stop widget - */ - -map DisBackButton () { - map result = $[]; - - result["widget"] = `custom; - result["custom_widget"] =`Empty(); - result["init"] = BackButton; - result["help"] = " "; - - return result; -} - - - /** * Get the main dialog tabs description * @return a map the description of the tabs @@ -940,7 +907,6 @@ "help" : InstDetailsHelp (), ], - "DisBackButton" : DisBackButton(), ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org