Author: aschnell Date: Fri Feb 10 11:25:17 2012 New Revision: 67401 URL: http://svn.opensuse.org/viewcvs/yast?rev=67401&view=rev Log: - code simplifications Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67401&r1=67400&r2=67401&view=diff ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Fri Feb 10 11:25:17 2012 @@ -6,9 +6,7 @@ * * $Id$ */ - { - textdomain "s390"; import "Arch"; @@ -163,8 +161,8 @@ /** * Draw the DASD dialog */ -define void DisplayDASDDialog() { - +void DisplayDASDDialog() +{ string help_key = Mode::config () ? "disk_selection_config" : "disk_selection"; @@ -176,7 +174,7 @@ string caption = _("DASD Disk Management"); term header = `header( - // table header + // table header _("Sel."), // table header `Right(_("Channel")), @@ -187,11 +185,12 @@ // table header _("Access Type"), // table header - _("Use DIAG")); - // table header - header = add (header, _("Formatted")); - // table header - header = add (header, _("Partition Information")); + _("Use DIAG"), + // table header + _("Formatted"), + // table header + _("Partition Information") + ); if (Mode::config ()) { @@ -207,17 +206,16 @@ list actions = [ // menu button id - `item (`id (`activate), _("&Activate")), + `item(`id(`activate), _("&Activate")), + // menu button id + `item(`id(`deactivate), _("&Deactivate")), + // menu button id + `item(`id(`diag_on), _("Set DIAG O&n")), + // menu button id + `item(`id(`diag_off), _("Set DIAG O&ff")), // menu button id - `item (`id(`deactivate), _("&Deactivate")), + `item(`id(`format), _("&Format")) ]; - // menu button id - actions = add (actions, `item (`id(`diag_on), _("Set DIAG O&n"))); - // menu button id - actions = add (actions, `item (`id(`diag_off), _("Set DIAG O&ff"))); - - // menu button id - actions = add (actions, `item (`id(`format), _("&Format"))); /* Dialog content */ term content = `VBox( @@ -232,7 +230,7 @@ `PushButton (`id (`filter), _("&Filter")) ) ), - `Table(`id(`table), `opt (`notify), header, []), + `Table(`id(`table), `opt(`notify), header, []), Mode::config () ? `HBox ( // push button @@ -582,7 +580,4 @@ } - -// EOF } - Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67401&r1=67400&r2=67401&view=diff ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Fri Feb 10 11:25:17 2012 @@ -6,9 +6,7 @@ * * $Id$ */ - { - textdomain "s390"; import "Arch"; @@ -98,14 +96,23 @@ /** * Show the ZFCP-Dialog */ -define void DisplayZFCPDialog () { - +void DisplayZFCPDialog() +{ /* Minimal text for the help */ string help = ZFCP_HELPS["disk_selection"]:""; /* Dialog caption */ string caption = _("Configured ZFCP Devices"); + term header = `header( + // table header + `Right(_("Channel Number")), + // table header + `Right(_("WWPN")), + // table header + `Right(_("ZFCP-LUN")) + ); + /* Dialog content */ term content = `VBox( `HBox( @@ -120,18 +127,7 @@ ) ), `HBox( - `Table( - `id(`table), `opt(`keepSorting, `notify), - `header( - // table header - `Right(_("Channel Number")), - // table header - `Right(_("WWPN")), - // table header - `Right(_("zfcp-LUN")) - ), - [] - ) + `Table(`id(`table), `opt(`notify), header, []) ), `HBox( `PushButton(`id(`add), Label::AddButton ()), @@ -378,7 +374,4 @@ } - -// EOF } - -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org