Author: aschnell Date: Tue Apr 22 17:38:02 2008 New Revision: 46966 URL: http://svn.opensuse.org/viewcvs/yast?rev=46966&view=rev Log: - use symbol for widget Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/DualMultiSelectionBox.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/MiniWorkflow.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp?rev=46966&r1=46965&r2=46966&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp Tue Apr 22 17:38:02 2008 @@ -72,7 +72,7 @@ repeat { - widget = (symbol) MiniWorkflow::UserInput(); + widget = MiniWorkflow::UserInput(); if (widget == `max_size) { @@ -167,7 +167,7 @@ repeat { - widget = (symbol) MiniWorkflow::UserInput(); + widget = MiniWorkflow::UserInput(); if (widget == `crypt_fs) { @@ -253,7 +253,7 @@ repeat { - widget = (symbol) MiniWorkflow::UserInput(); + widget = MiniWorkflow::UserInput(); if (widget == `next) { Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp?rev=46966&r1=46965&r2=46966&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp Tue Apr 22 17:38:02 2008 @@ -48,7 +48,7 @@ repeat { - widget = (symbol) MiniWorkflow::UserInput(); + widget = MiniWorkflow::UserInput(); } until (widget == `abort || widget == `back || widget == `next); Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp?rev=46966&r1=46965&r2=46966&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp Tue Apr 22 17:38:02 2008 @@ -82,7 +82,7 @@ repeat { - widget = (symbol) MiniWorkflow::UserInput(); + widget = MiniWorkflow::UserInput(); DualMultiSelectionBox::Handle(widget); if (contains([`add, `add_all, `remove, `remove_all], widget)) @@ -176,7 +176,7 @@ repeat { - widget = (symbol) MiniWorkflow::UserInput(); + widget = MiniWorkflow::UserInput(); } until (widget == `abort || widget == `back || widget == `next); Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/DualMultiSelectionBox.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/modules/DualMultiSelectionBox.ycp?rev=46966&r1=46965&r2=46966&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/DualMultiSelectionBox.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/DualMultiSelectionBox.ycp Tue Apr 22 17:38:02 2008 @@ -93,43 +93,45 @@ } - global void Handle(any widget) + global void Handle(symbol widget) { - if (widget == `add) + switch (widget) { - SetItems(maplist(term item, GetItems(), { - if (item[2]:false == false && item[3]:false == true) - return `item(item[0]:nil, item[1]:nil, true, false); - else - return item; - })); - } - else if (widget == `remove) - { - SetItems(maplist(term item, GetItems(), { - if (item[2]:false == true && item[3]:false == true) - return `item(item[0]:nil, item[1]:nil, false, false); - else - return item; - })); - } - else if (widget == `add_all) - { - SetItems(maplist(term item, GetItems(), { - if (item[2]:false == false) - return `item(item[0]:nil, item[1]:nil, true, false); - else - return item; - })); - } - else if (widget == `remove_all) - { - SetItems(maplist(term item, GetItems(), { - if (item[2]:false == true) - return `item(item[0]:nil, item[1]:nil, false, false); - else - return item; - })); + case `add: + SetItems(maplist(term item, GetItems(), { + if (item[2]:false == false && item[3]:false == true) + return `item(item[0]:nil, item[1]:nil, true, false); + else + return item; + })); + break; + + case `remove: + SetItems(maplist(term item, GetItems(), { + if (item[2]:false == true && item[3]:false == true) + return `item(item[0]:nil, item[1]:nil, false, false); + else + return item; + })); + break; + + case `add_all: + SetItems(maplist(term item, GetItems(), { + if (item[2]:false == false) + return `item(item[0]:nil, item[1]:nil, true, false); + else + return item; + })); + break; + + case `remove_all: + SetItems(maplist(term item, GetItems(), { + if (item[2]:false == true) + return `item(item[0]:nil, item[1]:nil, false, false); + else + return item; + })); + break; } } } Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/MiniWorkflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/modules/MiniWorkflow.ycp?rev=46966&r1=46965&r2=46966&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/MiniWorkflow.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/MiniWorkflow.ycp Tue Apr 22 17:38:02 2008 @@ -24,18 +24,18 @@ } - global void SetLastStep(boolean last) + global void SetLastStep(boolean last_step) { - if (last) + if (last_step) Wizard::SetNextButton(`next, Label::FinishButton()); else Wizard::SetNextButton(`next, Label::NextButton()); } - global any UserInput() + global symbol UserInput() { - return Wizard::UserInput(); + return (symbol) Wizard::UserInput(); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org