Author: jreidinger Date: Mon Mar 16 13:03:32 2009 New Revision: 56135 URL: http://svn.opensuse.org/viewcvs/yast?rev=56135&view=rev Log: improve info part of table Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/global_widgets.ycp Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/global_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/global_widgets.ycp?rev=56135&r1=56134&r2=56135&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/global_widgets.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/global_widgets.ycp Mon Mar 16 13:03:32 2009 @@ -106,22 +106,48 @@ * @param sects list of current sections */ void RedrawSectionsTable (list > sects) { - boolean elilo = Bootloader::getLoaderType () == "elilo"; list sec = maplist (map s, sects, { - string image = s["image"]:""; - string root = (BootCommon::getHintedPartitionList ([s["root"]:""]))[0]:""; + string info = ""; string type = _("Other"); if (s["type"]:"" == "image") + { type = _("Image"); - else if (s["type"]:"" == "xen") + string image = s["image"]:""; + string root = (BootCommon::getHintedPartitionList ([s["root"]:""]))[0]:""; + boolean elilo = Bootloader::getLoaderType () == "elilo"; + info = (image != "" && image != nil) ? sformat ("%1 (%2%3)", + image, elilo ? "" : BootCommon::splitPath (image)[0]:"", + root == "" ? "": ((elilo ? "" : ", ")+ sformat ("root=%1", root))):""; + } + else if (s["type"]:"" == "xen"){ type = _("Xen"); - else if (s["type"]:"" == "floppy") + string image = s["image"]:""; + string root = (BootCommon::getHintedPartitionList ([s["root"]:""]))[0]:""; + boolean elilo = Bootloader::getLoaderType () == "elilo"; + info = (image != "" && image != nil) ? sformat ("%1 (%2%3)", + image, elilo ? "" : BootCommon::splitPath (image)[0]:"", + root == "" ? "": ((elilo ? "" : ", ")+ sformat ("root=%1", root))):""; + } + else if (s["type"]:"" == "floppy"){ type = _("Floppy"); - else if (s["type"]:"" == "menu") + } + else if (s["type"]:"" == "menu"){ type = _("Menu"); - else if (s["type"]:"" == "dump") + if (Bootloader::getLoaderType () == "grub"){ + string paths = s["configfile"]:""; + string root = s["root"]:""; + info = sformat ("dev=%1 path=%2", root, paths); + } else if (Bootloader::getLoaderType () == "zipl"){ + info = s["list"]:""; + } + } + else if (s["type"]:"" == "dump"){ type = _("Dump"); + info = s["dumpto"]:(s["dumptofs"]:""); + } else if (s["type"]:"" == "other"){ + info = s["chainloader"]:""; + } return `item (`id (s["name"]:""), // FIXME: do not match against key "name" (can be changed by user when editing section) tolower (BootCommon::globals["default"]:"") @@ -129,16 +155,7 @@ ? UI::Glyph (`CheckMark) : "", s["name"]:"", type, - (image != "" && image != nil) - ? sformat ("%1 (%2%3)", - image, - elilo - ? "" - : BootCommon::splitPath (image)[0]:"", - root == "" ? "" - : ((elilo ? "" : ", ") - + sformat ("root=%1", root))) - : s["chainloader"]:"" + info ); }); UI::ChangeWidget (`id (`sects), `Items, sec); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org