From e49597ecd39a8386c661ce2652caeb137fb693c5 Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa Date: Mon, 4 Jan 2010 16:42:46 +0000 Subject: [PATCH] use QPropertyAnimation instead of QTimeLine to handle transitions svn path=/trunk/KDE/kdebase/workspace/; revision=1069986 --- clients/oxygen/oxygenbutton.cpp | 2 +- clients/oxygen/oxygenclient.cpp | 3 ++- clients/oxygen/oxygentitleanimationdata.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/clients/oxygen/oxygenbutton.cpp b/clients/oxygen/oxygenbutton.cpp index 02faf03105..625eec20bb 100644 --- a/clients/oxygen/oxygenbutton.cpp +++ b/clients/oxygen/oxygenbutton.cpp @@ -72,7 +72,7 @@ namespace Oxygen glowAnimation().data()->setPropertyName( "glowIntensity" ); // set curve shape. Warning: this is not portable to Qt Kinetic - glowAnimation().data()->setCurveShape( Animation::EaseInOutCurve ); + glowAnimation().data()->setEasingCurve( QEasingCurve::InOutQuad ); // setup connections connect( glowAnimation().data(), SIGNAL( valueChanged( const QVariant& ) ), SLOT( update( void ) ) ); diff --git a/clients/oxygen/oxygenclient.cpp b/clients/oxygen/oxygenclient.cpp index daad1e68ed..5e31b440a6 100644 --- a/clients/oxygen/oxygenclient.cpp +++ b/clients/oxygen/oxygenclient.cpp @@ -120,7 +120,8 @@ namespace Oxygen glowAnimation().data()->setEndValue( 1.0 ); glowAnimation().data()->setTargetObject( this ); glowAnimation().data()->setPropertyName( "glowIntensity" ); - glowAnimation().data()->setCurveShape( Animation::EaseInOutCurve ); + glowAnimation().data()->setEasingCurve( QEasingCurve::InOutQuad ); + connect( glowAnimation().data(), SIGNAL( valueChanged( const QVariant& ) ), widget(), SLOT( update( void ) ) ); connect( glowAnimation().data(), SIGNAL( finished( void ) ), widget(), SLOT( update( void ) ) ); connect( glowAnimation().data(), SIGNAL( finished() ), this, SLOT( clearForceActive() ) ); diff --git a/clients/oxygen/oxygentitleanimationdata.cpp b/clients/oxygen/oxygentitleanimationdata.cpp index faddb384a6..384e1e1db8 100644 --- a/clients/oxygen/oxygentitleanimationdata.cpp +++ b/clients/oxygen/oxygentitleanimationdata.cpp @@ -50,7 +50,7 @@ namespace Oxygen animation().data()->setEndValue( 1 ); animation().data()->setTargetObject( this ); animation().data()->setPropertyName( "opacity" ); - animation().data()->setCurveShape( Animation::EaseInOutCurve ); + animation().data()->setEasingCurve( QEasingCurve::InOutQuad ); connect( animation().data(), SIGNAL( valueChanged( const QVariant& ) ), SLOT( updatePixmaps( void ) ) ); connect( animation().data(), SIGNAL( finished( void ) ), SLOT( updatePixmaps( void ) ) );