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