Author: juhliarik Date: Thu Mar 5 18:23:10 2009 New Revision: 55951 URL: http://svn.opensuse.org/viewcvs/yast?rev=55951&view=rev Log: - enabled generated UI for other bootloaders than GRUB Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp 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=55951&r1=55950&r2=55951&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp Thu Mar 5 18:23:10 2009 @@ -81,7 +81,7 @@ */ symbol MainDialog () { y2milestone ("Running Main Dialog"); - + string lt = Bootloader::getLoaderType (); term contents = `VBox ( "tab", `Right ("adv_button") @@ -101,10 +101,14 @@ //F#300779: end list<string> widget_names = ["tab", "adv_button"]; - //map > widget_descr = (map >) - // union (CommonGlobalWidgets (), Bootloader::blWidgetMaps ()); + 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 (); - map > widget_descr = CommonGlobalWidgets (); widget_descr["tab"] = CWMTab::CreateWidget($[ "tab_order": ["sections", "installation"], "tabs": TabsDescr (), @@ -156,7 +160,7 @@ */ symbol KernelSectionDialog () { y2milestone ("Running kernel section dialog"); - + string lt = Bootloader::getLoaderType (); term contents = `HBox (`HSpacing (2), `VBox ( `VStretch (), // heading @@ -182,10 +186,16 @@ list<string> widget_names = ["name", "image", "initrd", "root", "vgamode", "append" ,"noverifyroot"]; - //map > widget_descr = (map >) - // union (CommonSectionWidgets (), Bootloader::blWidgetMaps ()); - map > widget_descr =CommonSectionWidgets (); + 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 (); + + // dialog caption string caption = _("Boot Loader Settings: Section Management"); return CWM::ShowAndRun ($[ @@ -288,7 +298,7 @@ */ symbol ChainloaderSectionDialog () { y2milestone ("Running chainloader section dialog"); - + string lt = Bootloader::getLoaderType (); term contents = `HBox (`HSpacing (4), `VBox ( // label `Left (`Heading (_("Other System Section"))), @@ -312,10 +322,15 @@ list<string> widget_names = ["name", "chainloader", "makeactive", "noverifyroot", "remap", "blockoffset"]; - //map > widget_descr = (map >) - // union (CommonSectionWidgets (), Bootloader::blWidgetMaps ()); + 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 (); + - map > widget_descr = CommonSectionWidgets (); // dialog caption string caption = _("Boot Loader Settings: Section Management"); return CWM::ShowAndRun ($[ @@ -337,7 +352,7 @@ */ symbol AddNewSectionDialog () { y2milestone ("Running new section dialog"); - + string lt = Bootloader::getLoaderType (); term contents = `HBox (`HStretch (), `VBox ( `VStretch (), "section_type", @@ -345,9 +360,13 @@ ), `HStretch ()); list<string> widget_names = ["section_type"]; - //map > widget_descr = (map >) - // union (CommonSectionWidgets (), Bootloader::blWidgetMaps ()); - map > widget_descr = CommonSectionWidgets (); + 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 (); // dialog caption string caption = _("Boot Loader Settings: Section Management"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org