diff --git a/clients/oxygen/oxygenbutton.cpp b/clients/oxygen/oxygenbutton.cpp index df8346e6a6..18d9d9a5ad 100644 --- a/clients/oxygen/oxygenbutton.cpp +++ b/clients/oxygen/oxygenbutton.cpp @@ -72,7 +72,6 @@ namespace Oxygen glowAnimation().data()->setEasingCurve( QEasingCurve::InOutQuad ); // setup connections - connect( glowAnimation().data(), SIGNAL( valueChanged( const QVariant& ) ), SLOT( update( void ) ) ); reset(0); } diff --git a/clients/oxygen/oxygenbutton.h b/clients/oxygen/oxygenbutton.h index b7cb958abe..17683010a1 100644 --- a/clients/oxygen/oxygenbutton.h +++ b/clients/oxygen/oxygenbutton.h @@ -86,7 +86,11 @@ namespace Oxygen { return glowAnimation_; } void setGlowIntensity( qreal value ) - { glowIntensity_ = value; } + { + if( glowIntensity_ == value ) return; + glowIntensity_ = value; + update(); + } qreal glowIntensity( void ) const { return glowIntensity_; } diff --git a/clients/oxygen/oxygenclient.cpp b/clients/oxygen/oxygenclient.cpp index 3dfd1b58ec..5fc1f700a4 100644 --- a/clients/oxygen/oxygenclient.cpp +++ b/clients/oxygen/oxygenclient.cpp @@ -116,8 +116,6 @@ namespace Oxygen glowAnimation().data()->setTargetObject( this ); glowAnimation().data()->setPropertyName( "glowIntensity" ); glowAnimation().data()->setEasingCurve( QEasingCurve::InOutQuad ); - - connect( glowAnimation().data(), SIGNAL( valueChanged( const QVariant& ) ), widget(), SLOT( update( void ) ) ); connect( glowAnimation().data(), SIGNAL( finished( void ) ), this, SLOT( clearForceActive( void ) ) ); diff --git a/clients/oxygen/oxygenclient.h b/clients/oxygen/oxygenclient.h index 54fecc845e..1005eef9ad 100644 --- a/clients/oxygen/oxygenclient.h +++ b/clients/oxygen/oxygenclient.h @@ -51,7 +51,6 @@ namespace Oxygen Q_OBJECT //! declare glow intensity property - //!Q_PROPERTY( qreal glowIntensity READ glowIntensity WRITE setGlowIntensity ) Q_PROPERTY( qreal glowIntensity READ glowIntensityUnbiased WRITE setGlowIntensity ) public: @@ -123,7 +122,11 @@ namespace Oxygen { return glowAnimation_; } void setGlowIntensity( qreal value ) - { glowIntensity_ = value; } + { + if( glowIntensity_ == value ) return; + glowIntensity_ = value; + widget()->update(); + } //! unbiased glow intensity qreal glowIntensityUnbiased( void ) const diff --git a/clients/oxygen/oxygenclientgroupitemdata.cpp b/clients/oxygen/oxygenclientgroupitemdata.cpp index be4a7255b5..085891376c 100644 --- a/clients/oxygen/oxygenclientgroupitemdata.cpp +++ b/clients/oxygen/oxygenclientgroupitemdata.cpp @@ -53,9 +53,6 @@ namespace Oxygen animation().data()->setTargetObject( this ); animation().data()->setPropertyName( "progress" ); - // setup connections - connect( animation().data(), SIGNAL( valueChanged( const QVariant& ) ), SLOT( updateBoundingRects( void ) ) ); - } //________________________________________________________________ diff --git a/clients/oxygen/oxygenclientgroupitemdata.h b/clients/oxygen/oxygenclientgroupitemdata.h index 6a98dbdb2b..4a4259ec21 100644 --- a/clients/oxygen/oxygenclientgroupitemdata.h +++ b/clients/oxygen/oxygenclientgroupitemdata.h @@ -168,14 +168,18 @@ namespace Oxygen { return animation_; } void setProgress( qreal value ) - { progress_ = value; } + { + if( progress_ == value ) return; + progress_ = value; + updateBoundingRects(); + } qreal progress( void ) const { return progress_; } //@} - protected slots: + protected: //! update bounding rects void updateBoundingRects( bool alsoUpdate = true ); diff --git a/clients/oxygen/oxygentitleanimationdata.cpp b/clients/oxygen/oxygentitleanimationdata.cpp index 2b0b7c4eb7..7faf6a0e16 100644 --- a/clients/oxygen/oxygentitleanimationdata.cpp +++ b/clients/oxygen/oxygentitleanimationdata.cpp @@ -53,8 +53,6 @@ namespace Oxygen animation().data()->setTargetObject( this ); animation().data()->setPropertyName( "opacity" ); animation().data()->setEasingCurve( QEasingCurve::InOutQuad ); - connect( animation().data(), SIGNAL( valueChanged( const QVariant& ) ), SLOT( updatePixmaps( void ) ) ); - connect( animation().data(), SIGNAL( finished( void ) ), SLOT( updatePixmaps( void ) ) ); } diff --git a/clients/oxygen/oxygentitleanimationdata.h b/clients/oxygen/oxygentitleanimationdata.h index 7645111486..94f3ff0cb1 100644 --- a/clients/oxygen/oxygentitleanimationdata.h +++ b/clients/oxygen/oxygentitleanimationdata.h @@ -134,7 +134,11 @@ namespace Oxygen { return opacity_; } void setOpacity( qreal value ) - { opacity_ = value; } + { + if( opacity_ == value ) return; + opacity_ = value; + updatePixmaps(); + } //@} @@ -154,13 +158,11 @@ namespace Oxygen void pixmapsChanged( void ); - protected slots: + protected: //! update pixmaps virtual void updatePixmaps( void ); - protected: - //! timer event void timerEvent( QTimerEvent* );