Author: visnov Date: Mon Oct 27 13:01:20 2008 New Revision: 52572 URL: http://svn.opensuse.org/viewcvs/yast?rev=52572&view=rev Log: SlideShow: check stage progress against overflow Modified: trunk/yast2/library/packages/src/SlideShow.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/packages/src/SlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/SlideShow.ycp?rev=52572&r1=52571&r2=52572&view=diff ============================================================================== --- trunk/yast2/library/packages/src/SlideShow.ycp (original) +++ trunk/yast2/library/packages/src/SlideShow.ycp Mon Oct 27 13:01:20 2008 @@ -337,14 +337,21 @@ /** * Update the global progress according to the progress in the current stage. - * The new value will be set to the per cent of the current stage according to \param value, - * if the \text is not nil, the label will be updated + * The new value will be set to the per cent of the current stage according to \param value.The + * value must be lower that the maximum value declared in the map passed to SlideShow::Setup. + * If the \text is not nil, the label will be updated * to this text as well. Otherwise label will not change. * @param value new value for the stage progress * @param text new label for the global progress */ global void StageProgress( integer value, string text ) { + if( value > _current_stage["value"]:0 ) + { + y2error( "Stage progress value larger than expected: %1 vs. %2", value, _current_stage["value"]:nil ); + value = _current_stage["value"]:0; + } + UpdateGlobalProgress( _current_stage["start"]:0 + (value * _current_stage["size"]:1 / 100), text ); } Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=52572&r1=52571&r2=52572&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Mon Oct 27 13:01:20 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Oct 27 13:00:20 CET 2008 - visnov@suse.cz + +- SlideShow: check stage progress against overflow + +------------------------------------------------------------------- Mon Oct 20 17:59:57 CEST 2008 - lslezak@suse.cz - moved PackagesUI.ycp from yast2-packager, added -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org