--- kdebase-runtime-4.3.95.orig/kstyles/oxygen/animations/oxygenprogressbardata.cpp
+++ kdebase-runtime-4.3.95/kstyles/oxygen/animations/oxygenprogressbardata.cpp
@@ -41,7 +41,7 @@
{
// set animation curve shape
- animation().data()->setEasingCurve( QEasingCurve::InOutQuad );
+ animation().data()->setEasingCurve( QEasingCurve::InOutQuint );
// make sure target is a progressbar and store relevant values
QProgressBar* progress = qobject_cast<QProgressBar*>( target );
@@ -93,21 +93,23 @@
// do nothing if not enabled
if( !enabled() ) return;
+
+ if( !(target() && target().data()->isEnabled() && target().data()->isVisible()) ) return;
// do nothing if progress is invalid
QProgressBar* progress = static_cast<QProgressBar*>( target().data() );
if( !( progress && progress->maximum() != progress->minimum() ) ) return;
- // update start and end values
- bool isRunning( animation().data()->isRunning() );
- if( !isRunning ) setStartValue( endValue() );
- setEndValue( value );
-
// start animation only if target is enabled, visible, not running,
// and if end and start values are different enough
- // (with end value being larger than start value)
- if( !(target() && target().data()->isEnabled() && target().data()->isVisible()) ) return;
- if( isRunning || endValue()-startValue() < 2 ) return;
+
+ bool isRunning( animation().data()->isRunning() );
+ if( isRunning ) return;
+
+ setStartValue( endValue() );
+ setEndValue( value );
+
+ if( abs(startValue()-endValue()) < 2 ) return;
animation().data()->start();
--- kdebase-runtime-4.3.95.orig/kstyles/oxygen/animations/oxygenprogressbarengine.cpp
+++ kdebase-runtime-4.3.95/kstyles/oxygen/animations/oxygenprogressbarengine.cpp
@@ -38,7 +38,7 @@
if( !widget ) return false;
// create new data class
- if( enabled() && !data_.contains( widget ) ) data_.insert( widget, new ProgressBarData( this, widget, duration() ) );
+ if( enabled() && !data_.contains( widget ) ) data_.insert( widget, new ProgressBarData( this, widget, 1000 ) );
if( busyIndicatorEnabled() && !dataSet_.contains( widget ) ) dataSet_.insert( widget );
// install event filter
@@ -67,11 +67,11 @@
{
case QEvent::EnabledChange:
if( qobject_cast<QWidget*>(object)->isEnabled() )
- { timer_.start( busyStepDuration(), this ); }
+ { timer_.start( 5, this ); }
break;
case QEvent::Show:
- timer_.start( busyStepDuration(), this );
+ timer_.start( 5, this );
break;
default: break;
@@ -116,7 +116,7 @@
animated = true;
// update value
- progressBar->setValue(progressBar->value()+1);
+ progressBar->setValue(value(*iter));
progressBar->update();
}
--- kdebase-runtime-4.3.95.orig/kstyles/oxygen/animations/oxygenanimationdata.cpp
+++ kdebase-runtime-4.3.95/kstyles/oxygen/animations/oxygenanimationdata.cpp
@@ -37,8 +37,8 @@
{
// setup animation
- animation.data()->setStartValue( 0.1 );
- animation.data()->setEndValue( 0.9 );
+ animation.data()->setStartValue( 0.0 );
+ animation.data()->setEndValue( 1.0 );
animation.data()->setTargetObject( this );
animation.data()->setPropertyName( property );