Author: jreidinger
Date: Tue Mar 3 18:16:38 2009
New Revision: 55909
URL: http://svn.opensuse.org/viewcvs/yast?rev=55909&view=rev
Log:
add menu section
Modified:
branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp
branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp
branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/wizards.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=55909&r1=55908&r2=55909&view=diff
==============================================================================
--- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp (original)
+++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp Tue Mar 3 18:16:38 2009
@@ -227,8 +227,6 @@
list<string> widget_names = ["name", "image", "initrd", "root", "vgamode", "append"
,"xen_append","xen"];
- //map > widget_descr = (map >)
- // union (CommonSectionWidgets (), Bootloader::blWidgetMaps ());
map > widget_descr =CommonSectionWidgets ();
// dialog caption
@@ -244,6 +242,44 @@
"fallback_functions" : section_handlers,
]);
}
+
+symbol MenuSectionDialog () {
+ y2milestone ("Running kernel section dialog");
+
+ term contents = `HBox (`HSpacing (2), `VBox (
+ `VStretch (),
+ // heading
+ `Left (`Heading (_("Menu Section"))),
+ `VSpacing (1),
+ "name",
+ `VStretch (),
+ // frame
+ `Frame (_("Section Settings"), `HBox (`HSpacing (2), `VBox (
+ `VSpacing (1),
+ "root",
+ "menu",
+ `VSpacing (1)
+ ), `HSpacing (2))),
+ `VStretch ()
+ ), `HSpacing (2));
+
+ list<string> widget_names = ["name", "root", "menu"];
+
+ map > widget_descr =CommonSectionWidgets ();
+ // dialog caption
+ string caption = _("Boot Loader Settings: Section Management");
+ return CWM::ShowAndRun ($[
+ "widget_descr" : widget_descr,
+ "widget_names" : widget_names,
+ "contents" : contents,
+ "caption" : caption,
+ "back_button" : Label::BackButton (),
+ "abort_button" : Label::CancelButton (),
+ "next_button" : Label::OKButton (),
+ "fallback_functions" : section_handlers,
+ ]);
+}
+
/**
* Run dialog for kernel section editation
* @return symbol for wizard sequencer
@@ -335,6 +371,8 @@
return `chainloader;
if (type == "xen")
return `xen;
+ if (type == "configfile")
+ return `menu;
else
return `kernel;
}
Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp?rev=55909&r1=55908&r2=55909&view=diff
==============================================================================
--- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp (original)
+++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp Tue Mar 3 18:16:38 2009
@@ -529,6 +529,12 @@
"widget" : `textentry,
"help" : "",
],
+ "configfile" : $[
+ // text entry
+ "label" : _("Menu Description File"),
+ "widget" : `textentry,
+ "help" : "",
+ ],
"chainloader" : $[
"widget" : `custom,
"custom_widget" : `HBox (
Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/wizards.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/wizards.ycp?rev=55909&r1=55908&r2=55909&view=diff
==============================================================================
--- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/wizards.ycp (original)
+++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/wizards.ycp Tue Mar 3 18:16:38 2009
@@ -51,6 +51,7 @@
"kernel_section" : ``(KernelSectionDialog ()),
"kernel_details" : ``(DetailsDialog ("kernel_section")),
"xen_section" : ``(XenSectionDialog ()),
+ "menu_section" : ``(MenuSectionDialog ()),
"chainloader_section" : ``(ChainloaderSectionDialog ()),
"chainloader_details" : ``(DetailsDialog ("chainloader_section")),
"main" : ``(MainDialog ()),
@@ -101,6 +102,10 @@
`next : "store_section",
`abort : `abort,
],
+ "menu_section" : $[
+ `next : "store_section",
+ `abort : `abort,
+ ],
"chainloader_section" : $[
`next : "store_section",
`abort : `abort,
@@ -119,7 +124,8 @@
"edit_section_switch" : $[
`kernel : "kernel_section",
`chainloader : "chainloader_section",
- `xen : "xen_section"
+ `xen : "xen_section",
+ `menu : "menu_section"
],
];
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org