[yast-commit] r54171 - in /trunk/packager: package/yast2-packager.changes src/clients/inst_productsources.ycp src/modules/ProductLicense.ycp

Author: locilka Date: Tue Dec 16 14:32:17 2008 New Revision: 54171 URL: http://svn.opensuse.org/viewcvs/yast?rev=54171&view=rev Log: - Fixed progress when adding community repositories (bnc #459391). Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_productsources.ycp 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=54171&r1=54170&r2=54171&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Tue Dec 16 14:32:17 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Dec 16 14:28:42 CET 2008 - locilka@suse.cz + +- Fixed progress when adding community repositories (bnc #459391). + +------------------------------------------------------------------- Thu Dec 11 16:27:25 CET 2008 - locilka@suse.cz - Fixed handling of patterns selected by add-ons (by using Modified: trunk/packager/src/clients/inst_productsources.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_productsources.ycp?rev=54171&r1=54170&r2=54171&view=diff ============================================================================== --- trunk/packager/src/clients/inst_productsources.ycp (original) +++ trunk/packager/src/clients/inst_productsources.ycp Tue Dec 16 14:32:17 2008 @@ -1221,7 +1221,28 @@ return (symbol) dialog_ret; } - boolean CreateSource (string url, string pth, string repo_name) { + void CreateAndAdjustWriteProgress (list <string> & actions_todo, list <string> actions_doing) { + y2milestone ("Creating new Write() progress"); + + Progress::New ( + // TRANSLATORS: dialog caption + _("Writing List of Online Repositories"), + " ", + size (actions_todo), + actions_todo, + actions_doing, + // TRANSLATORS: dialog help + _("<p>Please wait while the repository manager downloads the repository details...</p>") + ); + + Wizard::SetTitleIcon ("yast-sw_source"); + } + + boolean CreateSource ( + string url, string pth, string repo_name, + list <string> & actions_todo, list <string> & actions_doing, + boolean no_progress_updates + ) { integer src_id = nil; string repo_type = Pkg::RepositoryProbe(url, pth); @@ -1285,7 +1306,7 @@ if (Stage::initial()) { AddOnProduct::Integrate (src_id); - map prod = (map ) Pkg::SourceProductData (src_id); + map prod = (map ) Pkg::SourceProductData (src_id); y2milestone ("Product Data: %1", prod); string repo_id = CreateRepoId (url, pth); @@ -1378,17 +1399,8 @@ return `next; } - Progress::New ( - // TRANSLATORS: dialog caption - _("Writing List of Online Repositories"), - " ", - size (actions_todo), - actions_todo, - actions_doing, - // TRANSLATORS: dialog help - _("<p>Please wait while the repository manager downloads the repository details...</p>") - ); - Wizard::SetTitleIcon ("yast-sw_source"); + // Create writing dialog - initial state + CreateAndAdjustWriteProgress (actions_todo, actions_doing); if (UserWantsToAbort()) return `abort; @@ -1415,12 +1427,16 @@ // If not at once, call one stage per repository if (! at_once) Progress::NextStage(); + if (UserWantsToAbort()) return `abort; CreateSource ( list_of_repos[repo_id, "url"]:"", list_of_repos[repo_id, "path"]:"/", - GetLocalizedString (repo_id, ["name"]) + GetLocalizedString (repo_id, ["name"]), + actions_todo, + actions_doing, + at_once ); }); @@ -1435,10 +1451,9 @@ } Progress::Finish(); - if (Stage::initial()) { - sleep (600); - } else { - sleep (2000); + + if (! Stage::initial()) { + sleep (1000); } return `next; Modified: trunk/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLicense.ycp?rev=54171&r1=54170&r2=54171&view=diff ============================================================================== --- trunk/packager/src/modules/ProductLicense.ycp (original) +++ trunk/packager/src/modules/ProductLicense.ycp Tue Dec 16 14:32:17 2008 @@ -25,6 +25,7 @@ import "ProductFeatures"; import "String"; import "WorkflowManager"; +import "Progress"; // IMPORTANT: maintainer of yast2-installation is responsible for this module @@ -866,6 +867,16 @@ return init_ret; } + boolean created_new_dialog = false; + + // #459391 + // If a progress is running open another dialog + if (Progress::IsRunning()) { + y2milestone ("Some progress is running, opening new dialog for license..."); + Wizard::OpenNextBackDialog(); + created_new_dialog = true; + } + DisplayLicenseDialog (available_langs, enable_back, lic_lang, licenses); // Display info as a popup if exists @@ -892,7 +903,7 @@ CleanUpLicense (tmpdir); // bugzilla #303922 - if (!Stage::initial() && src_id != nil) { + if (created_new_dialog || (!Stage::initial() && src_id != nil)) { Wizard::CloseDialog(); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org