Author: jreidinger Date: Mon Mar 9 12:58:57 2009 New Revision: 56013 URL: http://svn.opensuse.org/viewcvs/yast?rev=56013&view=rev Log: another help unify Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/grub/helps.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/helps.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=56013&r1=56012&r2=56013&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:58:57 2009 @@ -85,25 +85,23 @@ it in <b>Retype Password</b>.</p>"), "type_image" : _("<p><b>Image Section</b></p>"), - "image_image" : + "image" : _("<p><b>Kernel Image</b> defines the kernel to boot. Either enter the name directly or choose via <b>Browse</b>.</p>"), "root" : _("<p><b>Root Device</b> sets the device to pass to the kernel as root device.</p>"), "vgamode" : _("<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>"), - "append" : + "append" : _("<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"), - "image_initrd" : + "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> "), - "image_noverifyroot" : - _("<p>Selecting <b>Do not verify Filesystem before Booting</b> will skip all file system checks.</p>"), "type_other" : _("<p>Select <b>Chainloader Section</b> if you want to define a section for booting an OS other than Linux.</p>"), "other_lock" : _("<p>Setting <b>Use Password Protection</p> will require a password to select this section.</p>"), - "other_chainloader" : + "chainloader" : _("<p><b>Other System</b> lets you choose among the non-Linux operating systems found on your computer.</p>"), "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>"), @@ -168,15 +166,14 @@ "password" : _("Password for the Menu Interface"), "debug" : _("Debugging Flag"), "type_image" : _("Image Section"), - "image_image" : _("Kernel Image"), + "image" : _("Kernel Image"), "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"), + "initrd" : _("Initial RAM Disk"), "type_other" : _("Chainloader Section"), "other_lock" : _("Use Password Protection"), - "other_chainloader" : _("Other System"), + "chainloader" : _("Other System"), "noverifyroot" : _("Do not verify Filesystem before Booting"), "makeactive" : _("Activate this Partition when selected for Boot"), "blockoffset" : _("Block Offset for Chainloading"), Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/helps.ycp?rev=56013&r1=56012&r2=56013&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/helps.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/helps.ycp Mon Mar 9 12:58:57 2009 @@ -163,7 +163,7 @@ */ string InstDetailsHelp () { // help text 1/1 - return _("<p><big><b>Boot Loader Installation Details</b></big><br> + return _("<p><b>Boot Loader Installation Details</b><br> To adjust advanced boot loader installation options (such as the device mapping), click <b>Boot Loader Installation Details</b>.</p>"); } @@ -174,7 +174,7 @@ */ string LoaderTypeHelp () { // help text 1/1 - return _("<p><big><b>Boot Loader Type</b></big><br> + return _("<p><b>Boot Loader Type</b><br> To select whether to install a boot loader and which bootloader to install, use <b>Boot Loader</b>.</p>"); } @@ -186,7 +186,7 @@ */ string LoaderOptionsHelp () { // help text 1/1 - return _("<p><big><b>Boot Loader Options</b></big><br> + return _("<p><b>Boot Loader Options</b><br> To adjust options of the boot loader, such as the time-out, click <b>Boot Loader Options</b>.</p>"); } @@ -208,7 +208,7 @@ */ string SectionNameHelp () { // help text 1/1 - return _("<p><b><big>Section Name</big></b><br> + return _("<p><b>Section Name</b><br> Use <b>Section Name</b> to specify the boot loader section name. The section name must be unique.</p>"); } @@ -217,73 +217,6 @@ * Get help text * @return string help text */ -string KernelHelp () { - // help text 1/1 - return _("<p><big><b>Kernel</b></big><br> -Use <b>Kernel</b> to specify the kernel image to load.</p>"); -} - -/** - * Get help text - * @return string help text - */ -string InitrdHelp () { - // help text 1/1 - return _("<p><big><b>Initial RAM Disk</b></big><br> -Use <b>Initial RAM Disk</b> to specify the initial RAM disk (initrd) to load. If it is -left empty, no initial RAM disk is loaded during boot.</p>"); -} - -/** - * Get help text - * @return string help text - */ -string RootDeviceHelp () { - // help text 1/1 - return _("<p><big><b>Root Device<b></big><br> -Use <b>Root Device</b> to specify the root file system to mount after the kernel is -loaded.</p> -"); -} - -/** - * Get help text - * @return string help text - */ -string VgaModeHelp () { - // help text 1/1 - return _("<p><big><b>VGA Mode</b></big><br> -Use <b>VGA Mode</b> to specify the resolution and color depth to set after -the kernel has booted.</p>"); -} - -/** - * Get help text - * @return string help text - */ -string AppendHelp () { - // help text 1/1 - return _("<p><big><b>Other Kernel Parameters</b></big><br> -Use <b>Other Kernel Parameters</b> to set other parameters to append -to the kernel command line.</p>"); -} - -/** - * Get help text - * @return string help text - */ -string ChainloaderHelp () { - // help text 1/1 - return _("<p><big><b>Device</b></big><br> -Use <b>Device</b> to set the device from which to load the operating system. -In most cases, it is the disk partition in which -the other system is installed.</p>"); -} - -/** - * Get help text - * @return string help text - */ string SectionTypeHelp () { // help text 1/5 return _("<p><big><b>Type of the New Section</b></big><br> @@ -304,17 +237,4 @@ booting other operating systems.</p>"); } - -/** - * Get help text - * @return string help text - */ -string TrustedGrubHelp () { - // help text 1/1 - return _("<p><b>Trusted GRUB Details</b><br> -allows to add aditional measured files and also to define own PCR for kernel, initrd or chainloader</p>"); -} - - - } // EOF 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=56013&r1=56012&r2=56013&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:58:57 2009 @@ -439,11 +439,11 @@ "custom_widget" : Stage::initial () ? `InputField (`id ("image"), `opt (`hstretch), // text entry - _("&Kernel")) + grub_descriptions["image"]:"image") : `HBox ( `ComboBox (`id ("image"), `opt (`editable, `hstretch), // combo box - _("&Kernel"), + grub_descriptions["image"]:"image", []), `VBox ( `Label (""), @@ -452,7 +452,7 @@ ) ), "init" : KernelImageInit, - "help" : KernelHelp (), + "help" : grub_help_messages["image"]:"", "handle" : KernelImageHandle, "handle_events" : [ `kernel_browse ], ], @@ -461,11 +461,11 @@ "custom_widget" : Stage::initial () ? `InputField (`id ("initrd"), `opt (`hstretch), // text entry - _("&Initial RAM Disk")) + grub_descriptions["initrd"]:"initrd") : `HBox ( `ComboBox (`id ("initrd"), `opt (`editable, `hstretch), // combo box - _("&Initial RAM Disk"), + grub_descriptions["initrd"]:"initrd", []), `VBox ( `Label (""), @@ -476,7 +476,7 @@ "init" : InitrdInit, "handle" : InitrdHandle, "handle_events" : [ `initrd_browse ], - "help" : InitrdHelp (), + "help" : grub_help_messages["initrd"]:"", ], "xen" : $[ "widget" : `custom, @@ -542,7 +542,7 @@ `ComboBox (`id ("chainloader"), `opt (`editable, `hstretch), // combo box - _("&Device"), + grub_descriptions["chainloader"]:"chainloader", []), Stage::initial () ? `VBox () @@ -555,7 +555,7 @@ "init" : ChainloaderInit, "handle" : ChainloaderHandle, "handle_events" : [ `chainloader_browse ], - "help" : ChainloaderHelp (), + "help" : grub_help_messages["chainloader"]:"" ], "section_type" : $[ "widget" : `func, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org