Author: locilka Date: Thu Aug 23 18:33:03 2007 New Revision: 40440 URL: http://svn.opensuse.org/viewcvs/yast?rev=40440&view=rev Log: - Displaying license in a separate Wizard dialog not to rewrite the progress or other dialogs below (#303922). Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/ProductLicense.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=40440&r1=40439&r2=40440&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Aug 23 18:33:03 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Aug 23 18:31:31 CEST 2007 - locilka@suse.cz + +- Displaying license in a separate Wizard dialog not to rewrite the + progress or other dialogs below (#303922). + +------------------------------------------------------------------- Thu Aug 23 16:35:51 CEST 2007 - sh@suse.de - Beautification for bug #299787: Preserve spacings even with Modified: trunk/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLicense.ycp?rev=40440&r1=40439&r2=40440&view=diff ============================================================================== --- trunk/packager/src/modules/ProductLicense.ycp (original) +++ trunk/packager/src/modules/ProductLicense.ycp Thu Aug 23 18:33:03 2007 @@ -493,10 +493,6 @@ lic_lang = available_langs[0]:""; y2milestone ("Preselected language: '%1'", lic_lang); - DisplayLicenseDialog (available_langs, enable_back, lic_lang, licenses); - // Display info as a popup if exists - if (info_file != nil) - InstShowInfo::show_info_txt (info_file); if (lic_lang == nil) { @@ -504,6 +500,18 @@ return `auto; } + // bugzilla #303922 + if (Stage::initial()) { + Wizard::OpenNextBackStepsDialog(); + } else { + Wizard::OpenNextBackDialog(); + } + + DisplayLicenseDialog (available_langs, enable_back, lic_lang, licenses); + // Display info as a popup if exists + if (info_file != nil) + InstShowInfo::show_info_txt (info_file); + // initial loop symbol ret = `first; @@ -520,7 +528,8 @@ if (timeout) { sleep (2000); y2milestone("AutoYaST: License has been accepted after timeout..."); - return `accepted; + ret = `accepted; + break; } ret = (symbol) UI::UserInput(); @@ -533,6 +542,8 @@ UI::ReplaceWidget (`id (`license_rp), GetLicenseContent (lic_lang, licenses)); } + // FIXME: rewrite this if () ... else if () ... else {}; + // to something readable, please! symbol accept = (symbol) UI::QueryWidget(`id(`eula), `CurrentButton); // Aborting the license dialog if (ret == `abort) { @@ -540,13 +551,15 @@ if (base_product) { if (Popup::ConfirmAbort (`painless)) { y2milestone("Aborting..."); - return `abort; + ret = `abort; + break; } } else { // popup question if (Popup::ContinueCancel(_("Really abort the add-on product installation?"))) { y2milestone("Aborting..."); - return `abort; + ret = `abort; + break; } } } @@ -559,7 +572,8 @@ if (action == "continue") { y2milestone ("action in case of license refusal is continue, not asking user"); - return `accepted; + ret = `accepted; + break; } // text changed due to bug #162499 string refuse_popup_text = base_product @@ -577,12 +591,19 @@ { y2milestone("License has been declined."); if (action == "abort") - return `abort; + { + ret = `abort; + break; + } else if (action == "continue") - return `accepted; + { + ret = `accepted; + break; + } else if (action == "halt") { - return `halt; + ret = `halt; + break; // timed ok/cancel popup if (!Popup::TimedOKCancel(_("The system is shutting down..."), 10)) { @@ -590,13 +611,15 @@ } else { - return `halt; + ret = `halt; + break; } } else { y2error ("Unknown action %1", action); - return `abort; + ret = `abort; + break; } } } @@ -604,7 +627,8 @@ else if (accept == `yes) { y2milestone("License has been accepted."); - return `accepted; + ret = `accepted; + break; } else { @@ -615,12 +639,17 @@ } else if (ret == `back) { - return `back; + ret = `back; + break; } } CleanUpLicense(tmpdir); + // bugzilla #303922 + Wizard::CloseDialog(); + + return ret; } global symbol AskAddOnLicenseAgreement (integer src_id) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org