[yast-commit] r56582 - in /trunk/metapackage: VERSION package/yast2-metapackage-handler.changes src/OneClickInstallWorker.ycp src/OneClickInstallWorkerFunctions.ycp

Author: lslezak Date: Thu Apr 2 15:06:07 2009 New Revision: 56582 URL: http://svn.opensuse.org/viewcvs/yast?rev=56582&view=rev Log: - properly initialize package slideshow, display correct installation progress (bnc#482320) - 0.8.9 Modified: trunk/metapackage/VERSION trunk/metapackage/package/yast2-metapackage-handler.changes trunk/metapackage/src/OneClickInstallWorker.ycp trunk/metapackage/src/OneClickInstallWorkerFunctions.ycp Modified: trunk/metapackage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/VERSION?rev=56582&r1=56581&r2=56582&view=diff ============================================================================== --- trunk/metapackage/VERSION (original) +++ trunk/metapackage/VERSION Thu Apr 2 15:06:07 2009 @@ -1 +1 @@ -0.8.8 +0.8.9 Modified: trunk/metapackage/package/yast2-metapackage-handler.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/package/yast2-metapackage-handler.changes?rev=56582&r1=56581&r2=56582&view=diff ============================================================================== --- trunk/metapackage/package/yast2-metapackage-handler.changes (original) +++ trunk/metapackage/package/yast2-metapackage-handler.changes Thu Apr 2 15:06:07 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Apr 2 13:57:51 CEST 2009 - lslezak@suse.cz + +- properly initialize package slideshow, display correct + installation progress (bnc#482320) +- 0.8.9 + +------------------------------------------------------------------- Thu Feb 12 12:31:43 CET 2009 - coolo@suse.de - make the desktop files more XDG compliant Modified: trunk/metapackage/src/OneClickInstallWorker.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/OneClickInstallWorker.ycp?rev=56582&r1=56581&r2=56582&view=diff ============================================================================== --- trunk/metapackage/src/OneClickInstallWorker.ycp (original) +++ trunk/metapackage/src/OneClickInstallWorker.ycp Thu Apr 2 15:06:07 2009 @@ -57,7 +57,6 @@ if (success) { SlideShow::SetLanguage (UI::GetLanguage(true)); - PackageSlideShow::InitPkgData(true); SlideShow::Setup( [$[ Modified: trunk/metapackage/src/OneClickInstallWorkerFunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/OneClickInstallWorkerFunctions.ycp?rev=56582&r1=56581&r2=56582&view=diff ============================================================================== --- trunk/metapackage/src/OneClickInstallWorkerFunctions.ycp (original) +++ trunk/metapackage/src/OneClickInstallWorkerFunctions.ycp Thu Apr 2 15:06:07 2009 @@ -15,6 +15,8 @@ import "PackageCallbacks"; import "SourceManager"; import "Progress"; + import "PackageSlideShow"; + import "SlideShow"; import "CommandLine"; @@ -138,6 +140,26 @@ return addRepoSuccess; } + + void InitSlideShow(string description) + { + PackageSlideShow::InitPkgData(true); // force reinitialization + + // TODO FIXME: doesn't work properly for removed packages + list< map > stages = [ + $[ + "name" : "packages", + "description": description, + "value" : PackageSlideShow::total_size_to_install / 1024 , // kilobytes + "units" : `kb, + ], + ]; + + SlideShow::Setup(stages); + + SlideShow::MoveToStage("packages"); + } + /** ** Install all the specified packages ** return true if all installations were successful, false otherwise @@ -178,6 +200,9 @@ Pkg::TargetInit( "/", false ); if(Pkg::PkgSolve(true)) { + // initialize slideshow data (package counters) + InitSlideShow(_("Installing Packages...")); + print(_("Performing Installation...")); state = !(Pkg::PkgCommit(0)[0]:-1 < 0); } else //xxx no callback for resolve failures @@ -216,6 +241,9 @@ if(Pkg::PkgSolve(true)) { + // initialize slideshow data (package counters) + InitSlideShow(_("Installing Patterns...")); + state = !(Pkg::PkgCommit(0)[0]:-1 < 0); } else //xxx no callback for resolve failures { @@ -248,6 +276,9 @@ boolean state = true; if(Pkg::PkgSolve(true)) { + // initialize slideshow data (package counters) + InitSlideShow(_("Removing Packages...")); + state = !(Pkg::PkgCommit(0)[0]:-1 < 0); } else //xxx no callback for resolve failures { @@ -297,4 +328,4 @@ return nil; } -} \ No newline at end of file +} -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org