Author: lslezak Date: Wed Oct 5 13:54:23 2011 New Revision: 66262 URL: http://svn.opensuse.org/viewcvs/yast?rev=66262&view=rev Log: backported commit #62811: - update the number of the remaining packages when package installation is finished, display it at the beginning (bnc#473822) - reset the list of packages so the next run displays correct values (used when PKGMGR_ACTION_AT_EXIT == "summary") Modified: branches/tmp/lslezak/packager/src/modules/PackageSlideShow.ycp branches/tmp/lslezak/packager/src/modules/SlideShowCallbacks.ycp Modified: branches/tmp/lslezak/packager/src/modules/PackageSlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/packager/src/modules/PackageSlideShow.ycp?rev=66262&r1=66261&r2=66262&view=diff ============================================================================== --- branches/tmp/lslezak/packager/src/modules/PackageSlideShow.ycp (original) +++ branches/tmp/lslezak/packager/src/modules/PackageSlideShow.ycp Wed Oct 5 13:54:23 2011 @@ -79,6 +79,10 @@ total_installed = 0; // avg_download_rate = 0; + installed_packages_list = []; + updated_packages_list = []; + removed_packages_list = []; + // temporary values current_provide_size = 0; current_install_size = 0; @@ -847,7 +851,7 @@ (TotalInstalledSize() * (100 - downloading_pct) / total_size_to_install); } - y2internal("Total package installation progress: %1%%", total_progress); + y2debug("Total package installation progress: %1%%", total_progress); SlideShow::StageProgress( total_progress, nil ); } @@ -1007,6 +1011,23 @@ SlideShow::SubProgress( pkg_percent, new_text ); } + global void DisplayGlobalProgress() + { + string rem_string = ""; + integer tot_rem_t = TotalRemainingTime(); + + rem_string = ( unit_is_seconds && bytes_per_second > 0 && tot_rem_t > 0) ? + sformat("%1 / %2", FormatRemainingSize(TotalRemainingSize()), FormatTimeShowOverflow(tot_rem_t)) + : FormatRemainingSize(TotalRemainingSize()); + + if (rem_string != "") + { + rem_string = rem_string + ", "; + } + + SlideShow::SetGlobalProgressLabel( SlideShow::CurrentStageDescription() + sformat(_(" (Remaining: %1%2 packages)"), rem_string, TotalRemainingPkgCount())); + } + global void DoneProvide( integer error, string reason, string name ) { if (error == 0) @@ -1089,6 +1110,9 @@ UpdateTotalProgress(false); + // Update global progress bar + DisplayGlobalProgress(); + if (updating) { updated_packages = updated_packages + 1; @@ -1192,13 +1216,7 @@ SlideShow::SubProgress( 0, msg ); // Update global progress bar - string rem_string = ""; - integer tot_rem_t = TotalRemainingTime(); - - rem_string = ( unit_is_seconds && bytes_per_second > 0 && tot_rem_t > 0) ? - sformat("%1 / %2", FormatRemainingSize(TotalRemainingSize()), FormatTimeShowOverflow(tot_rem_t)) - : FormatRemainingSize(TotalRemainingSize()); - SlideShow::SetGlobalProgressLabel( SlideShow::CurrentStageDescription() + sformat(_(" (Remaining: %1)"), rem_string)); + DisplayGlobalProgress(); // // Update (user visible) installation log Modified: branches/tmp/lslezak/packager/src/modules/SlideShowCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/packager/src/modules/SlideShowCallbacks.ycp?rev=66262&r1=66261&r2=66262&view=diff ============================================================================== --- branches/tmp/lslezak/packager/src/modules/SlideShowCallbacks.ycp (original) +++ branches/tmp/lslezak/packager/src/modules/SlideShowCallbacks.ycp Wed Oct 5 13:54:23 2011 @@ -121,7 +121,7 @@ } if (SlideShow::GetUserAbort()) { - return "CANCEL"; + return "C"; } if (error != 0) { @@ -505,6 +505,9 @@ PackageSlideShow::SetCurrentCdNo( source, media ); PackageSlideShow::UpdateCurrentPackageProgress(0); PackageSlideShow::UpdateAllCdProgress(false); + + // display remaining packages + PackageSlideShow::DisplayGlobalProgress(); }; global string MediaChange (string error_code, string error, string url, string product, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org