Author: juhliarik Date: Thu Apr 2 15:06:57 2009 New Revision: 56585 URL: http://svn.opensuse.org/viewcvs/yast?rev=56585&view=rev Log: updated help text and UI Modified: trunk/bootloader/src/ppc/helps.ycp trunk/bootloader/src/ppc/ppc_options.ycp Modified: trunk/bootloader/src/ppc/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/ppc/helps.ycp?rev=56585&r1=56584&r2=56585&view=diff ============================================================================== --- trunk/bootloader/src/ppc/helps.ycp (original) +++ trunk/bootloader/src/ppc/helps.ycp Thu Apr 2 15:06:57 2009 @@ -65,6 +65,23 @@ The OpenFirmware driver in the nVidia graphics card as shipped with Apple G5 systems will crash if there is no monitor attached.</p>"), + "macos_timeout" : + _("<p><b>Timeout in Seconds for MacOS/Linux</b> +It contains the timeout between MacOS/Linux in seconds until Linux boots automatically +if no key is pressed to boot MacOS</p>"), + + "force_fat" : + _("<p><b>Always Boot from FAT Partition</b> +Normally the lilo script would automagically select the boot partition format +to either be a PReP boot partition or a FAT formatted file system for more +complex setups. This option forces the lilo script to use +the FAT formatted file system</p>"), + + "force" : + _("<p><b>Install Boot Loader Even on Errors</b> +Install the bootloader even if it is unsure whether your firmware is +buggy so that next boot will fail. This results in an unsupported setup.</p>"), + ]; Modified: trunk/bootloader/src/ppc/ppc_options.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/ppc/ppc_options.ycp?rev=56585&r1=56584&r2=56585&view=diff ============================================================================== --- trunk/bootloader/src/ppc/ppc_options.ycp (original) +++ trunk/bootloader/src/ppc/ppc_options.ycp Thu Apr 2 15:06:57 2009 @@ -59,35 +59,15 @@ { UI::ChangeWidget (`id ("boot_pmac_custom"), `Items, devices); } + UI::ChangeWidget (`id ("boot_pmac_custom"), `Value, BootCommon::globals["boot_pmac_custom"]:""); - if (BootCommon::globals["boot_pmac_custom"]:"" == "") - { - UI::ChangeWidget (`id ("enable_pmac"), `Value, false); - UI::ChangeWidget (`id ("boot_pmac_custom"), `Enabled, false); - } else { - UI::ChangeWidget (`id ("enable_pmac"), `Value, true); - UI::ChangeWidget (`id ("boot_pmac_custom"), `Enabled, true); - UI::ChangeWidget (`id ("boot_pmac_custom"), `Value, BootCommon::globals["boot_pmac_custom"]:""); - } } void StoreBootPMAC (string widget, map event) { - if ((boolean) UI::QueryWidget(`id("enable_pmac"), `Value)) - { - BootCommon::globals["boot_pmac_custom"] - = (splitstring( (string)UI::QueryWidget (`id ("boot_pmac_custom"), `Value), " "))[0]:""; - } else { - BootCommon::globals["boot_pmac_custom"] = ""; - } -} + BootCommon::globals["boot_pmac_custom"] + = (splitstring( (string)UI::QueryWidget (`id ("boot_pmac_custom"), `Value), " "))[0]:""; -symbol HandleBootPMAC (string key, map event) { - any ret = event["ID"]:nil; - if (ret == "enable_pmac") { - UI::ChangeWidget (`id ("boot_pmac_custom"), `Enabled, - (boolean) UI::QueryWidget(`id("enable_pmac"), `Value)); - } } map<string,any> BootPMAC(){ @@ -96,13 +76,11 @@ "custom_widget" : `VBox( `Frame ( _("Boot Loader Location"), `VBox( `Left(`HBox(`HSpacing(1),`VBox( - `Left(`CheckBox(`id("enable_pmac"), `opt(`notify), _("HFS Boot &Partition"))), - `Left(`ComboBox(`id("boot_pmac_custom"), `opt(`editable, `hstretch), "", [""])) + `Left(`ComboBox(`id("boot_pmac_custom"), `opt(`editable, `hstretch), _("HFS Boot &Partition"), [""])) ))) ))), "help" : ppc_help_messages["boot_pmac_custom"]:"", "init" : InitBootPMAC, - "handle" : HandleBootPMAC, "store" : StoreBootPMAC, ]; } @@ -115,49 +93,29 @@ UI::ChangeWidget (`id ("boot_chrp_custom"), `Items, devices); } - if (BootCommon::globals["boot_chrp_custom"]:"" == "") - { - UI::ChangeWidget (`id ("enable_chrp"), `Value, false); - UI::ChangeWidget (`id ("boot_chrp_custom"), `Enabled, false); - } else { - UI::ChangeWidget (`id ("enable_chrp"), `Value, true); - UI::ChangeWidget (`id ("boot_chrp_custom"), `Enabled, true); - UI::ChangeWidget (`id ("boot_chrp_custom"), `Value, BootCommon::globals["boot_chrp_custom"]:""); - } + UI::ChangeWidget (`id ("boot_chrp_custom"), `Value, BootCommon::globals["boot_chrp_custom"]:""); + } void StoreBootCHRP (string widget, map event) { - if ((boolean) UI::QueryWidget(`id("enable_chrp"), `Value)) - { - BootCommon::globals["boot_chrp_custom"] - = (splitstring( (string)UI::QueryWidget (`id ("boot_chrp_custom"), `Value), " "))[0]:""; - } else { - BootCommon::globals["boot_chrp_custom"] = ""; - } -} + BootCommon::globals["boot_chrp_custom"] + = (splitstring( (string)UI::QueryWidget (`id ("boot_chrp_custom"), `Value), " "))[0]:""; -symbol HandleBootCHRP (string key, map event) { - any ret = event["ID"]:nil; - if (ret == "enable_chrp") { - UI::ChangeWidget (`id ("boot_chrp_custom"), `Enabled, - (boolean) UI::QueryWidget(`id("enable_chrp"), `Value)); - } } + map<string,any> BootCHRP(){ return $[ "widget" : `custom, "custom_widget" : `VBox( `Frame ( _("Boot Loader Location"), `VBox( `Left(`HBox(`HSpacing(1),`VBox( - `Left(`CheckBox(`id("enable_chrp"), `opt(`notify), _("&PReP or FAT Partition"))), - `Left(`ComboBox(`id("boot_chrp_custom"), `opt(`editable, `hstretch), "", [""])) + `Left(`ComboBox(`id("boot_chrp_custom"), `opt(`editable, `hstretch), _("&PReP or FAT Partition"), [""])) ))) ))), "help" : ppc_help_messages["boot_chrp_custom"]:"", "init" : InitBootCHRP, - "handle" : HandleBootCHRP, "store" : StoreBootCHRP, ]; } @@ -170,49 +128,28 @@ UI::ChangeWidget (`id ("boot_prep_custom"), `Items, devices); } - if (BootCommon::globals["boot_prep_custom"]:"" == "") - { - UI::ChangeWidget (`id ("enable_prep"), `Value, false); - UI::ChangeWidget (`id ("boot_prep_custom"), `Enabled, false); - } else { - UI::ChangeWidget (`id ("enable_prep"), `Value, true); - UI::ChangeWidget (`id ("boot_prep_custom"), `Enabled, true); - UI::ChangeWidget (`id ("boot_prep_custom"), `Value, BootCommon::globals["boot_prep_custom"]:""); - } + UI::ChangeWidget (`id ("boot_prep_custom"), `Value, BootCommon::globals["boot_prep_custom"]:""); } void StoreBootPReP (string widget, map event) { - if ((boolean) UI::QueryWidget(`id("enable_prep"), `Value)) - { - BootCommon::globals["boot_prep_custom"] - = (splitstring( (string)UI::QueryWidget (`id ("boot_prep_custom"), `Value), " "))[0]:""; - } else { - BootCommon::globals["boot_prep_custom"] = ""; - } -} + BootCommon::globals["boot_prep_custom"] + = (splitstring( (string)UI::QueryWidget (`id ("boot_prep_custom"), `Value), " "))[0]:""; -symbol HandleBootPReP (string key, map event) { - any ret = event["ID"]:nil; - if (ret == "enable_prep") { - UI::ChangeWidget (`id ("boot_prep_custom"), `Enabled, - (boolean) UI::QueryWidget(`id("enable_prep"), `Value)); - } } + map<string,any> BootPReP(){ return $[ "widget" : `custom, "custom_widget" : `VBox( `Frame ( _("Boot Loader Location"), `VBox( `Left(`HBox(`HSpacing(1),`VBox( - `Left(`CheckBox(`id("enable_prep"), `opt(`notify), _("&PReP partitions"))), - `Left(`ComboBox(`id("boot_prep_custom"), `opt(`editable, `hstretch), "", [""])) + `Left(`ComboBox(`id("boot_prep_custom"), `opt(`editable, `hstretch), _("&PReP partitions"), [""])) ))) ))), "help" : ppc_help_messages["boot_prep_custom"]:"", "init" : InitBootPReP, - "handle" : HandleBootPReP, "store" : StoreBootPReP, ]; } @@ -338,8 +275,8 @@ // end PREP // PMAC - "no_os_chooser" : CommonCheckboxWidget(_("Do not Use OS-chooser"), ppc_help_messages["no_os_chooser"]:""), - "macos_timeout" : CommonIntFieldWidget (_("Timeout in Seconds for MacOS/Linux"), + "no_os_chooser" : CommonCheckboxWidget(_("&Do not Use OS-chooser"), ppc_help_messages["no_os_chooser"]:""), + "macos_timeout" : CommonIntFieldWidget (_("&Timeout in Seconds for MacOS/Linux"), ppc_help_messages["macos_timeout"]:"",0,60), // end PMAC -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org