Author: locilka Date: Mon May 19 17:58:33 2008 New Revision: 47682 URL: http://svn.opensuse.org/viewcvs/yast?rev=47682&view=rev Log: - Fixed Community Repositories module behavior when called from Add-Ons in the initial installation (bnc #392111). - 2.16.50 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_productsources.ycp trunk/packager/src/modules/ProductLicense.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=47682&r1=47681&r2=47682&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Mon May 19 17:58:33 2008 @@ -1 +1 @@ -2.16.49 +2.16.50 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=47682&r1=47681&r2=47682&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon May 19 17:58:33 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 19 17:56:46 CEST 2008 - locilka@suse.cz + +- Fixed Community Repositories module behavior when called from + Add-Ons in the initial installation (bnc #392111). +- 2.16.50 + +------------------------------------------------------------------- Mon May 19 14:58:26 CEST 2008 - lslezak@suse.cz - the repository manager - allow to set priority of a repository Modified: trunk/packager/src/clients/inst_productsources.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_productsources.ycp?rev=47682&r1=47681&r2=47682&view=diff ============================================================================== --- trunk/packager/src/clients/inst_productsources.ycp (original) +++ trunk/packager/src/clients/inst_productsources.ycp Mon May 19 17:58:33 2008 @@ -1145,6 +1145,19 @@ } else { Wizard::SetNextButton (`next, Label::FinishButton()); } + } else { + // Next button must be always enabled + // bnc #392111 + Wizard::RestoreNextButton(); + Wizard::EnableNextButton(); + Wizard::DisableBackButton(); + + // from add-ons + if (script_called_from_another) { + Wizard::SetAbortButton (`cancel, Label::CancelButton()); + } else { + Wizard::RestoreAbortButton (); + } } repos_already_used = $[]; @@ -1168,7 +1181,14 @@ } else if (dialog_ret == `abort || dialog_ret == `cancel) { dialog_ret = `abort; if (Stage::initial()) { - if (Popup::ConfirmAbort (`painless)) break; + // from add-ons + if (script_called_from_another) { + y2milestone ("Back to add-ons"); + break; + // from workflow + } else if (Popup::ConfirmAbort (`painless)) { + break; + } } else { if (script_called_from_another) { break; Modified: trunk/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLicense.ycp?rev=47682&r1=47681&r2=47682&view=diff ============================================================================== --- trunk/packager/src/modules/ProductLicense.ycp (original) +++ trunk/packager/src/modules/ProductLicense.ycp Mon May 19 17:58:33 2008 @@ -107,9 +107,9 @@ } term rt = `Empty(); if (regexpmatch(license_text, "")) - rt = `RichText(`id( `welcome_text), license_text); + rt = `MinWidth (80, `RichText(`id( `welcome_text), license_text)); else - rt = `RichText(`id( `welcome_text), `opt(`plainText), license_text); + rt = `MinWidth (80, `RichText(`id( `welcome_text), `opt(`plainText), license_text)); return rt; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org