Author: juhliarik Date: Thu Mar 19 14:07:15 2009 New Revision: 56236 URL: http://svn.opensuse.org/viewcvs/yast?rev=56236&view=rev Log: updated UI for ppc Added: branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_dialogs.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_options.ycp Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/elilo/elilo_dialogs.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/elilo/elilo_options.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/generic/dialogs.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootCommon.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootPOWERLILO.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/Makefile.am branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/helps.ycp Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/elilo/elilo_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/elilo/elilo_dialogs.ycp?rev=56236&r1=56235&r2=56236&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/elilo/elilo_dialogs.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/elilo/elilo_dialogs.ycp Thu Mar 19 14:07:15 2009 @@ -6,7 +6,7 @@ * Bootloader installation and configuration * * Summary: - * Dialogs for elilo configuraion functions + * Dialogs for elilo configuration functions * * Authors: * Jozef Uhliarik Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/elilo/elilo_options.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/elilo/elilo_options.ycp?rev=56236&r1=56235&r2=56236&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/elilo/elilo_options.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/elilo/elilo_options.ycp Thu Mar 19 14:07:15 2009 @@ -6,7 +6,7 @@ * Bootloader installation and configuration * * Summary: - * Dialogs for elilo configuraion functions + * Dialogs for elilo configuration functions * * Authors: * Jozef Uhliarik @@ -22,6 +22,7 @@ include "bootloader/elilo/helps.ycp"; + /** * Common widgets of global settings for ELILO * @return map > CWS widgets Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/generic/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/generic/dialogs.ycp?rev=56236&r1=56235&r2=56236&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/generic/dialogs.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/generic/dialogs.ycp Thu Mar 19 14:07:15 2009 @@ -115,6 +115,7 @@ }); } + y2error("GENERIC WIDGET: %1", _generic_widgets); return _generic_widgets; } Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootCommon.ycp?rev=56236&r1=56235&r2=56236&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootCommon.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootCommon.ycp Thu Mar 19 14:07:15 2009 @@ -1233,8 +1233,8 @@ // it should be split and designed for each module (bootloader) if ((bootloader == "grub") || (bootloader == "lilo") || (bootloader == "elilo")) bootloader_packages = add(bootloader_packages, bootloader); - else if (bootloader == "ppc") - bootloader_packages = add(bootloader_packages, "lilo"); + //else if (bootloader == "ppc") + // bootloader_packages = add(bootloader_packages, "lilo"); //else if (bootloader == "zipl") XXX TESTING!!!XXX // bootloader_packages = add(bootloader_packages, "s390-tools"); @@ -1284,7 +1284,7 @@ ]; if (Arch::i386 () || Arch::x86_64 ()) { - ret = (list<string>)merge (ret, ["lilo", "grub","zipl"]); //XXX debuging zipl XXX + ret = (list<string>)merge (ret, ["lilo", "grub","zipl", "ppc"]); //XXX debuging zipl XXX if (Arch::x86_64 ()) ret = (list<string>)merge (ret, ["elilo"]); } Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootPOWERLILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootPOWERLILO.ycp?rev=56236&r1=56235&r2=56236&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootPOWERLILO.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootPOWERLILO.ycp Thu Mar 19 14:07:15 2009 @@ -85,6 +85,10 @@ global define void setBoardType (string board); global define void currentBoardInit (); + +include "bootloader/ppc/ppc_dialogs.ycp"; + + /** * Update list of 41 PReP boot partitions * @return boolean true if list changed, false otherwise @@ -1258,8 +1262,7 @@ global map Dialogs () { // PPC definitly needs other text modules return $[ - "loader" : genericBootLoaderOptionsDialog, -// "installation" : ppcInstallDetailsDialog, + "loader" : PPCDetailsDialog, ]; } Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/Makefile.am?rev=56236&r1=56235&r2=56236&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/Makefile.am (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/Makefile.am Thu Mar 19 14:07:15 2009 @@ -5,7 +5,9 @@ yncludedir = @yncludedir@/bootloader/ppc ynclude_DATA = \ - helps.ycp + helps.ycp \ + ppc_dialogs.ycp \ + ppc_options.ycp EXTRA_DIST = \ $(ynclude_DATA) Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/helps.ycp?rev=56236&r1=56235&r2=56236&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/helps.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/helps.ycp Thu Mar 19 14:07:15 2009 @@ -21,6 +21,32 @@ global map ppc_help_messages = $[ "boot-loader-location" : _("<p><big><b>Boot Loader Location</b></big><br>"), + "boot" : _("<p><b>Boot Loacation</b> +This is the partition number of your boot partition. On a +PowerMac it must be in HFS format because we use the hfsutils to +copy the files to that partition. On CHRP you need a 41 PReP +boot partition, /boot/second from the quik package is stored there </p>"), + "bootfolder" : _("<p><b>Boot Folder Path</b> +Only for Pmac. Folder that contains your boot stuff, this +folder will be blessed to mark it bootable.</p>"), + "append" : + _("<p><b>Append string for.global options to pass to kernel command line</b><br> +Lets you define additional global parameters to pass to the kernel. These are +used if no 'append' appears in a given section.</p> +"), + "initrd" : + _("<p><b>Name of the default initrd file</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" : + _("<p><b>Name of default image file</b>, if not empty, defines the image +file to use. Either enter the path and file name directly or choose by using +<b>Browse</b></p>"), + "root" : + _("<p><b>Set Default Root Filesystem</b> +Set global root filesystem for Linux</p>"), + ]; Added: branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_dialogs.ycp?rev=56236&view=auto ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_dialogs.ycp (added) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_dialogs.ycp Thu Mar 19 14:07:15 2009 @@ -0,0 +1,66 @@ +/** + * File: + * include/bootloader/ppc/ppc_dialogs.ycp + * + * Module: + * Bootloader installation and configuration + * + * Summary: + * Dialogs for ppc configuration functions + * + * Authors: + * Jozef Uhliarik + * + */ +{ + +textdomain "bootloader"; + +import "Label"; +import "Wizard"; +import "CWM"; +import "BootCommon"; +import "Stage"; +import "Arch"; + +include "bootloader/routines/common_options.ycp"; +include "bootloader/ppc/ppc_options.ycp"; + + + + +/** + * Run dialog to adjust installation on i386 and AMD64 + * @return symbol for wizard sequencer + */ +symbol PPCDetailsDialog () { + y2milestone ("Running ppc loader details dialog"); + + term contents = `VBox ( + `Frame ( _("Global Section Options"),`HBox(`HSpacing(1),`VBox( + `Left("append"), + "initrd", + `Left("root") + ))), + "timeout", + "default", + "activate", + `VStretch () + ); + + list<string> widget_names = ["append", "initrd", "root", "timeout", "default", "activate",]; + + return CWM::ShowAndRun ($[ + "widget_descr": PPCOptions(), + "widget_names": widget_names, + "contents": contents, + "caption" : _("Boot Loader Options"), + "back_button" : Label::BackButton (), + "abort_button" : Label::CancelButton (), + "next_button" : Label::OKButton () + ]); +} + + + +} \ No newline at end of file Added: branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_options.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_options.ycp?rev=56236&view=auto ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_options.ycp (added) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_options.ycp Thu Mar 19 14:07:15 2009 @@ -0,0 +1,124 @@ +/** + * File: + * include/bootloader/ppc/ppc_options.ycp + * + * Module: + * Bootloader installation and configuration + * + * Summary: + * Dialogs for ppc configuraion functions + * + * Authors: + * Jozef Uhliarik + * + */ + +{ + +textdomain "bootloader"; + +import "Label"; +import "BootCommon"; + +include "bootloader/ppc/helps.ycp"; + + +// FIXME: +// add widget "boot" +/* + boot => ( "$arch" eq "iseries" ) + ? "multi:iSeries boot image location:" + : "select:PPC Boot loader location:", +*/ + +// FIXME: +// add widget "clone" CHRP +/* + $go->{clone} = "selectdevice:Partition for boot loader duplication::" . ":" . $boot_partitions; + +*/ + +// add widget "boot_chrp_custom" CHRP +/* + $go->{boot_chrp_custom} = "select:PReP or FAT partition::" .$boot_partitions; + +*/ + +// FIXME: +// add widget "boot_prep_custom" PREP + +/* +$go->{boot_prep_custom} + = "selectdevice:PReP partition::" . +$boot_partitions; +*/ + + +// FIXME: +// add widget "boot_slot" iSERIES + +/* + $go->{boot_slot} = "select:Write to boot slot:B:" . "A:B:C:D"; +*/ + +// add widget "boot_iseries_custom" iSERIES + +/* +$go->{boot_iseries_custom} +*/ + + +// FIXME: +// add widget "boot_pmac_custom" PMAC + +/* + $go->{boot_pmac_custom} + = "select:HFS boot partition::" . +$boot_partitions; +*/ + + +/** + * Get the globals dialog tabs description + * @return a map the description of the tabs + */ +map > PPCOptions(){ + map > ppc_specific = $[ + "append" : CommonInputFieldWidget(_("Global Append &String of Options to Kernel Command Line"), + ppc_help_messages["append"]:""), + "default" : CommonInputFieldWidget(_("&Default Boot Section"), + ppc_help_messages["default"]:""), + "initrd" : CommonInputFieldBrowseWidget(_("Nam&e of Default Initrd File"), + ppc_help_messages["initrd"]:"", "initrd"), + "root" : CommonInputFieldWidget(_("Set Default &Root Filesystem"), + ppc_help_messages["root"]:""), + "activate": CommonCheckboxWidget(_("Change Boot Device in &NV-RAM"), elilo_help_messages["activate"]:""), + // CHRP + "force_fat": CommonCheckboxWidget(_("&Always Boot from FAT Partition"), elilo_help_messages["force_fat"]:""), + + "force" : CommonCheckboxWidget(_("&Install Boot Loader Even on Errors"), elilo_help_messages["force"]:""), + // end CHRP + + // PREP also for PMAC + "bootfolder": CommonInputFieldWidget(_("Boot &Folder Path"), + ppc_help_messages["bootfolder"]:""), + + // end PREP + + // iSERIES + "boot_file" : CommonInputFieldBrowseWidget(_("Create Boot Image in &File"), + ppc_help_messages["boot_file"]:"", "boot_file"), + + // end iSERIES + + // PMAC + "no_os_chooser" : CommonCheckboxWidget(_("Do not use OS-chooser") elilo_help_messages["no_os_chooser"]:""), + + // end PMAC + ]; + return (map >)union(ppc_specific,CommonOptions()); +} + + + +} \ No newline at end of file -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org