Author: jreidinger Date: Mon Mar 9 12:31:36 2009 New Revision: 56010 URL: http://svn.opensuse.org/viewcvs/yast?rev=56010&view=rev Log: add help and universal descriptions Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/grub/helps.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/grub_options.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/grub/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/grub/helps.ycp?rev=56010&r1=56009&r2=56010&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/grub/helps.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/grub/helps.ycp Mon Mar 9 12:31:36 2009 @@ -87,11 +87,11 @@ _("<p><b>Image Section</b></p>"), "image_image" : _("<p><b>Kernel Image</b> defines the kernel to boot. Either enter the name directly or choose via <b>Browse</b>.</p>"), - "image_root" : + "root" : _("<p><b>Root Device</b> sets the device to pass to the kernel as root device.</p>"), - "image_vgamode" : + "vgamode" : _("<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>"), - "image_append" : + "append" : _("<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"), "image_initrd" : _("<p><b>Initial RAM Disk</b>, if not empty, defines the initial ramdisk to use. Either enter the path and file name @@ -105,9 +105,9 @@ _("<p>Setting <b>Use Password Protection</p> will require a password to select this section.</p>"), "other_chainloader" : _("<p><b>Other System</b> lets you choose among the non-Linux operating systems found on your computer.</p>"), - "other_makeactive" : + "makeactive" : _("<p>Select <b>Activate this Partition when selected for Boot</b> if your BIOS needs this flag set in order to boot it</p>"), - "other_blockoffset" : + "blockoffset" : _("<p><b>Block Offset for Chainloading</b> lets you specify the list of blocks to boot. In most cases you want to specify <code>+1</code> here. For specifics on blocklist notation see the grub documentation.</p> "), @@ -117,14 +117,8 @@ "), "xen_image" : _("<p><b>Kernel Image</b> defines the kernel to boot. Either enter the name directly or choose via <b>Browse</b>.</p>"), - "xen_append" : - _("<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"), - "xen_xen" : + "xen" : _("<p><b>Hypervisor</b> specifies the Hypervisor to use.</p>"), - "xen_root" : - _("<p><b>Root Device</b> sets the device to pass to the kernel as root device.</p>"), - "xen_vgamode" : - _("<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>"), "xen_initrd" : _("<p><b>Initial RAM Disk</b>,if not empty, defines the initial ramdisk to use. Either enter the path and file name directly or choose by using <b>Browse</b>.</p> @@ -133,9 +127,9 @@ _("<p><b>Menu Section</b></p>"), "menu_root" : _("<p><b>Partition of Menu File</b></p>"), - "menu_configfile" : + "configfile" : _("<p><b>Menu Description File<b></p>"), - "other_remap" : + "remap" : _("<p><b>Map Section to the First Disk from Device Map</b> Windows usually need to be on the first disk.</p>"), "MeasuresTableHelp" : _("<p><b>Measures</b> includes measured files with PCR. Change table is possible via buttons: <b>Add</b> , @@ -175,29 +169,26 @@ "debug" : _("Debugging Flag"), "type_image" : _("Image Section"), "image_image" : _("Kernel Image"), - "image_root" : _("Root Device"), - "image_vgamode" : _("Vga Mode"), - "image_append" : _("Optional Kernel Command Line Parameter"), + "root" : _("Root Device"), + "vgamode" : _("Vga Mode"), + "append" : _("Optional Kernel Command Line Parameter"), "image_initrd" : _("Initial RAM Disk"), "image_noverifyroot" : _("Do not verify Filesystem before Booting"), "type_other" : _("Chainloader Section"), "other_lock" : _("Use Password Protection"), "other_chainloader" : _("Other System"), - "other_noverifyroot" : _("Do not verify Filesystem before Booting"), - "other_makeactive" : _("Activate this Partition when selected for Boot"), - "other_blockoffset" : _("Block Offset for Chainloading"), - "other_remap" : _("Map Section to the First Disk in Device Map"), + "noverifyroot" : _("Do not verify Filesystem before Booting"), + "makeactive" : _("Activate this Partition when selected for Boot"), + "blockoffset" : _("Block Offset for Chainloading"), + "remap" : _("Map Section to the First Disk in Device Map"), "type_xen" : _("Xen Section"), - "xen_xen" : _("Hypervisor"), - "xen_xen_append" : _("Additional Xen Hypervisor Parameters"), + "xen" : _("Hypervisor"), + "xen_append" : _("Additional Xen Hypervisor Parameters"), "xen_image" : _("Kernel Image"), - "xen_root" : _("Root Device"), - "xen_vgamode" : _("Vga Mode"), - "xen_append" : _("Optional Kernel Command Line Parameter"), "xen_initrd" : _("Initial RAM Disk"), "type_menu" : _("Menu Section"), "menu_root" : _("Partition of Menu File"), - "menu_configfile" : _("Menu Description File"), + "configfile" : _("Menu Description File"), ]; Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp?rev=56010&r1=56009&r2=56010&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp Mon Mar 9 12:31:36 2009 @@ -19,6 +19,8 @@ textdomain "bootloader"; +include "bootloader/grub/helps.ycp"; //TODO merge helps + void InitGlobalBool(string widget){ boolean value = false; if (BootCommon::globals[widget]:"false" == "true"){ @@ -58,19 +60,18 @@ map TimeoutWidget () { return $[ "widget" : `intfield, - "label" : _("&Timeout"), + "label" : grub_descriptions["timeout"]:"timeout", "minimum" : 0, "maximum" : 300, "init" : InitGlobalInt, "store" : StoreGlobalInt, - "help" : "", //TODO + "help" : grub_help_messages["timeout"]:"" ]; } void InitConsole( string widget){ boolean enable = BootCommon::globals["terminal"]:"" == "serial"; UI::ChangeWidget(`id(`console_frame),`Value, enable); - //UI::ChangeWidget(`id(`console_args),`Enabled, enable); string args = BootCommon::globals["console"]:""; UI::ChangeWidget(`id(`console_args),`Value, args); } @@ -96,9 +97,8 @@ `HStretch())) ), "init" : InitConsole, -// "handle" : HandleConsole, -// "handle_events" : [`enable_console], - "store" : StoreConsole + "store" : StoreConsole, + "help" : grub_help_messages["serial"]:"" ]; } Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/grub_options.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/grub_options.ycp?rev=56010&r1=56009&r2=56010&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/grub_options.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/grub_options.ycp Mon Mar 9 12:31:36 2009 @@ -22,16 +22,6 @@ include "bootloader/routines/common_options.ycp"; -//TODO -// check if works translated global variables -// helps for widgets -const string activateLabel = - _("&Set active Flag in Partition Table for Boot Partition"); -const string debugLabel = _("&Debugging Flag"); -const string genericLabel = _("&Write generic Boot Code to MBR"); -const string trustedLabel = _("&Use Trusted Grub"); -const string hiddenLabel = _("&Hide Menu on Boot"); - void InitGfx(string widget){ boolean value = BootCommon::globals["trusted_grub"]:"false" != "true"; @@ -62,7 +52,8 @@ map GfxWidget(){ return $[ "widget" : `custom, - "custom_widget" : `HBox(`Left(`InputField(`id(`gfxinput),`opt(`hstretch),_("&Graphical Menu File"))), + "custom_widget" : `HBox(`Left(`InputField(`id(`gfxinput),`opt(`hstretch), + grub_descriptions["gfxmenu"]:"gfxmenu")), `VBox( `Left(`Label("")), `Left(`PushButton(`id(`browsegfx),`opt(`notify), Label::BrowseButton())) @@ -72,7 +63,7 @@ "store" : StoreGfx, "handle" : HandleGfx, "handle_events" : [`browsegfx], - "help" : "" + "help" : grub_help_messages["gfxmenu"]:"" ]; } @@ -83,7 +74,9 @@ } map TrustedWidget(){ - map widget = CommonCheckboxWidget(trustedLabel,""); + map widget = CommonCheckboxWidget( + grub_descriptions["trusted_grub"]:"trusted grub", + grub_help_messages["trusted_grub"]:""); widget["opt"] = [`notify]; widget["handle"] = HandleTrusted; return widget; @@ -92,11 +85,15 @@ map > GrubOptions(){ map > grub_specific = $[ - "activate" : CommonCheckboxWidget(activateLabel,""), - "debug" : CommonCheckboxWidget(debugLabel,""), - "generic_mbr" : CommonCheckboxWidget(genericLabel,""), + "activate" : CommonCheckboxWidget(grub_descriptions["activate"]:"activate", + grub_help_messages["activate"]:""), + "debug" : CommonCheckboxWidget(grub_descriptions["debug"]:"debug", + grub_help_messages["debug"]:""), + "generic_mbr" : CommonCheckboxWidget(grub_descriptions["generic_mbr"]:"generic mbr", + grub_help_messages["generic_mbr"]:""), "trusted_grub" : TrustedWidget(), - "hiddenmenu" : CommonCheckboxWidget(hiddenLabel,""), + "hiddenmenu" : CommonCheckboxWidget(grub_descriptions["hiddenmenu"]:"hidden menu", + grub_help_messages["hiddenmenu"]:""), "gfxmenu" : GfxWidget(), ]; return (map >)union(grub_specific,CommonOptions()); 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=56010&r1=56009&r2=56010&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp Mon Mar 9 12:31:36 2009 @@ -32,11 +32,8 @@ import "Popup"; include "bootloader/routines/helps.ycp"; +include "bootloader/grub/helps.ycp"; -const string activeLabel = _("Activate this Partition when selected for Boot"); -const string offsetLabel = _("Block Offset for Chainloading"); -const string remapLabel = _("Map Section to the First Disk in Device Map"); -const string noverifyLabel = _("Do not verify Filesystem before Booting"); /** * Init function for widget value @@ -501,43 +498,43 @@ "init" : XenInit, "handle" : XenHandle, "handle_events" : [ `xen_browse ], - "help" : "", + "help" : grub_help_messages["xen"]:"", ], "root" : $[ "widget" : `combobox, // combo box - "label" : _("Root &Device"), + "label" : grub_descriptions["root"]:"root", "opt" : [ `editable, `hstretch, `notify ], "init" : RootDeviceInit, "handle" : RootDeviceHandle, "store" : RootDeviceStore, - "help" : RootDeviceHelp (), + "help" : grub_help_messages["root"]:"", ], "vgamode" : $[ "widget" : `combobox, // combo box - "label" : _("&VGA Mode"), + "label" : grub_descriptions["vgamode"]:"vgamode", "opt" : [ `editable, `hstretch ], "init" : VgaModeInit, - "help" : VgaModeHelp (), + "help" : grub_help_messages["vgamode"]:"", ], "append" : $[ // text entry - "label" : _("Other Kernel &Parameters"), + "label" : grub_descriptions["append"]:"append", "widget" : `textentry, - "help" : AppendHelp (), + "help" : grub_help_messages["append"]:"" ], "xen_append" : $[ // text entry - "label" : _("Additional Xen Hypervisor Parameters"), + "label" : grub_descriptions["xen_append"]:"xen_append", "widget" : `textentry, - "help" : "", + "help" : grub_help_messages["xen_append"]:"", ], "configfile" : $[ // text entry - "label" : _("Menu Description File"), + "label" : grub_descriptions["configfile"]:"configfile", "widget" : `textentry, - "help" : "", + "help" : grub_help_messages["configfile"]:"", ], "chainloader" : $[ "widget" : `custom, @@ -566,10 +563,18 @@ "handle" : SectionTypeHandle, "help" : SectionTypeHelp (), ], - "makeactive" : SectionCheckBoxWidget(activeLabel,""), - "noverifyroot" : SectionCheckBoxWidget(noverifyLabel,""), - "remap" : SectionCheckBoxWidget(remapLabel,""), - "blockoffset" : SectionIntFieldWidget(offsetLabel,"",0,nil) + "makeactive" : SectionCheckBoxWidget( + grub_descriptions["makeactive"]:"makeactive", + grub_help_messages["makeactive"]:""), + "noverifyroot" : SectionCheckBoxWidget( + grub_descriptions["noverifyroot"]:"noverifyroot", + grub_help_messages["noverifyroot"]:""), + "remap" : SectionCheckBoxWidget( + grub_descriptions["remap"]:"remap", + grub_help_messages["remap"]:""), + "blockoffset" : SectionIntFieldWidget( + grub_descriptions["blockoffset"]:"blockoffset", + grub_help_messages["blockoffset"]:"",0,nil) ]; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org