Author: benjimanw Date: Sat May 3 12:02:22 2008 New Revision: 47258 URL: http://svn.opensuse.org/viewcvs/yast?rev=47258&view=rev Log: Fix opening/closing of many popups when adding repositories (bnc 386383). Modified: trunk/metapackage/package/yast2-metapackage-handler.changes trunk/metapackage/src/OneClickInstallWorker.ycp trunk/metapackage/src/OneClickInstallWorkerFunctions.ycp Modified: trunk/metapackage/package/yast2-metapackage-handler.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/package/yast2-metapackage-handler.changes?rev=47258&r1=47257&r2=47258&view=diff ============================================================================== --- trunk/metapackage/package/yast2-metapackage-handler.changes (original) +++ trunk/metapackage/package/yast2-metapackage-handler.changes Sat May 3 12:02:22 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sat May 03 11:00:00 BST 2008 - benji@opensuse.org + +- Fixed progress dialogue flicker when adding repositories (bnc#386383) + +------------------------------------------------------------------- Wed Apr 30 09:15:18 CEST 2008 - mvidner@suse.cz - reviewed for autobuild Modified: trunk/metapackage/src/OneClickInstallWorker.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/OneClickInstallWorker.ycp?rev=47258&r1=47257&r2=47258&view=diff ============================================================================== --- trunk/metapackage/src/OneClickInstallWorker.ycp (original) +++ trunk/metapackage/src/OneClickInstallWorker.ycp Sat May 3 12:02:22 2008 @@ -12,8 +12,7 @@ import "PackageInstallation"; import "SourceManager"; import "Progress"; - - //Get the catalogues to add and packages to install from the arguments + import "Wizard"; list args = WFM::Args(); @@ -21,9 +20,23 @@ if (xmlFileName == "") return false; + + Wizard::CreateDialog(); + Wizard::SetDesktopIcon("sw_single"); + //Load the xml communication from the user interface. OneClickInstall::FromXML(xmlFileName); + + list<string> rurls = OneClickInstall::GetRequiredRepositories(); + list<string> rnames = []; + foreach (string url, rurls, + { + rnames = add(rnames,OneClickInstall::GetRepositoryName(url)); + }); + //xxx add better stage and title when not in string freeze. + Progress::New(_("Perform Installation"), "", 2, rnames, [], ""); + Progress::NextStage(); boolean success = true; @@ -35,6 +48,7 @@ OneClickInstallWorkerResponse::SetErrorMessage(_("An error occurred while attempting to subscribe to the required repositories. Review the yast2 logs for more information.")); } + Progress::NextStage(); if (success) { @@ -105,5 +119,8 @@ //Overwrite the information we were passed with our response back to the UI. OneClickInstallWorkerResponse::ToXML(xmlFileName); + + UI::CloseDialog(); + return success; } \ No newline at end of file Modified: trunk/metapackage/src/OneClickInstallWorkerFunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/OneClickInstallWorkerFunctions.ycp?rev=47258&r1=47257&r2=47258&view=diff ============================================================================== --- trunk/metapackage/src/OneClickInstallWorkerFunctions.ycp (original) +++ trunk/metapackage/src/OneClickInstallWorkerFunctions.ycp Sat May 3 12:02:22 2008 @@ -132,6 +132,8 @@ } } + //Should be safe, definition ignores call when in command line mode or no progress is visible. + Progress::NextStage(); }); return addRepoSuccess; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org