Author: juhliarik Date: Wed Mar 4 14:55:45 2009 New Revision: 55923 URL: http://svn.opensuse.org/viewcvs/yast?rev=55923&view=rev Log: updated 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/section_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=55923&r1=55922&r2=55923&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootGRUB.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootGRUB.ycp Wed Mar 4 14:55:45 2009 @@ -796,7 +796,7 @@ list <string> grub_section_types() { - return ["image", "xen", "configfile", "other"]; + return ["image", "xen", "menu", "other"]; } 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=55923&r1=55922&r2=55923&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp Wed Mar 4 14:55:45 2009 @@ -326,6 +326,7 @@ ]); } + /** * Run dialog for kernel section editation * @return symbol for wizard sequencer @@ -369,6 +370,8 @@ return `xen; if (type == "menu") return `menus; + if (type == "image") + return `kernel; 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=55923&r1=55922&r2=55923&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp Wed Mar 4 14:55:45 2009 @@ -54,7 +54,7 @@ */ void SectionOptionStore (string widget, map event) { BootCommon::current_section[widget] - = UI::QueryWidget (`id (widget), `Value); + = UI::QueryWidget (`id (widget), `Value); } /** @@ -387,18 +387,22 @@ return nil; string selected = (string) UI::QueryWidget (`id (`sect_type), `CurrentButton); + string original_name = selected; + if (original_name == "image") + original_name = "linux"; if (selected != "clone") - { + { BootCommon::current_section = $[ "type" : selected, + "original_name" : original_name, ]; } else { BootCommon::current_section["name"] = ""; - // FIXME: the problem with missing YaST commnet in menu.lst + // fix the problem with missing YaST commnet in menu.lst // it seems be correct if original_name stay same... - // BootCommon::current_section["original_name"] = ""; + BootCommon::current_section["original_name"] = ""; BootCommon::current_section["__auto"] = false; // fix for problem with cloning section if (haskey(BootCommon::current_section,"lines_cache_id")) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org