Author: jsrain Date: Fri May 23 12:25:29 2008 New Revision: 47826 URL: http://svn.opensuse.org/viewcvs/yast?rev=47826&view=rev Log: adjusted button handling in CWM (bnc#392983) Modified: trunk/yast2/library/cwm/src/CWM.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/cwm/src/CWM.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/cwm/src/CWM.ycp?rev=47826&r1=47825&r2=47826&view=diff ============================================================================== --- trunk/yast2/library/cwm/src/CWM.ycp (original) +++ trunk/yast2/library/cwm/src/CWM.ycp Fri May 23 12:25:29 2008 @@ -851,6 +851,8 @@ global define void AdjustButtons (string next, string back, string abort, string help) { +// FIXME: there is no point in the help parameter, since we cannot hide the Help +// button anyway, get rid of it, it's not used at all if (UI::HasSpecialWidget (`Wizard)) help = ""; if (help == nil) @@ -861,29 +863,20 @@ back = ""; if (abort == nil) abort = ""; - if (back == "" || help == "") - // back or help is missing, great! - { - if (next != "") + if (next != "") Wizard::SetNextButton (`next, next); - else + else Wizard::HideNextButton (); - if (abort != "") + if (abort != "") Wizard::SetAbortButton (`abort, abort); - else + else Wizard::HideAbortButton (); - if (back != "") + if (back != "") Wizard::SetBackButton (`back, back); - else - Wizard::HideBackButton (); - } else - // both back and help are present, problem! - { - // TODO this situation if it is needed - } + Wizard::HideBackButton (); } /** Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=47826&r1=47825&r2=47826&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri May 23 12:25:29 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 23 12:23:25 CEST 2008 - jsrain@suse.cz + +- adjusted button handling in CWM (bnc#392983) + +------------------------------------------------------------------- Thu May 22 15:53:55 CEST 2008 - lslezak@suse.cz - Added Product::ReadProducts() to explicitly read products from -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org