[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/KDE/4.4/kdebase/runtime/kstyles/oxygen
From: Hugo Pereira Da Costa <hugo.pereira () free ! fr>
Date: 2010-03-31 0:38:17
Message-ID: 20100331003817.75832AC857 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1109315 by hpereiradacosta:
Backport r1109312
Fixed handling of 'enabled' flag so that configuration changes are updated 'on fly' \
rather than being applied to newly launched applications only
M +7 -0 animations/oxygendatamap.h
M +2 -2 animations/oxygenmenubarengine.cpp
M +2 -2 animations/oxygenmenuengine.cpp
M +2 -6 animations/oxygenprogressbarengine.cpp
M +1 -6 animations/oxygenscrollbarengine.cpp
M +2 -2 animations/oxygensliderengine.cpp
M +2 -2 animations/oxygentabbarengine.cpp
M +4 -4 animations/oxygenwidgetstateengine.cpp
M +2 -2 transitions/oxygencomboboxengine.cpp
M +2 -2 transitions/oxygenlabelengine.cpp
M +2 -2 transitions/oxygenlineeditengine.cpp
M +2 -2 transitions/oxygenstackedwidgetengine.cpp
--- branches/KDE/4.4/kdebase/runtime/kstyles/oxygen/animations/oxygendatamap.h \
#1109314:1109315 @@ -53,6 +53,13 @@
virtual ~DataMap( void )
{}
+ //! insertion
+ virtual typename QMap< Key, Value >::iterator insert( const Key& key, const \
Value& value, bool enabled = true ) + {
+ if( value ) value.data()->setEnabled( enabled );
+ return QMap< Key, Value >::insert( key, value );
+ }
+
//! find value
Value find( Key key )
{
--- branches/KDE/4.4/kdebase/runtime/kstyles/oxygen/animations/oxygenmenubarengine.cpp \
#1109314:1109315 @@ -36,10 +36,10 @@
bool MenuBarEngineV1::registerWidget( QWidget* widget )
{
- if( !( enabled() && widget ) ) return false;
+ if( !widget ) return false;
// create new data class
- if( !data_.contains( widget ) ) data_.insert( widget, new MenuBarDataV1( \
this, widget, duration() ) ); + if( !data_.contains( widget ) ) data_.insert( \
widget, new MenuBarDataV1( this, widget, duration() ), enabled() );
// connect destruction signal
disconnect( widget, SIGNAL( destroyed( QObject* ) ), this, SLOT( \
unregisterWidget( QObject* ) ) );
--- branches/KDE/4.4/kdebase/runtime/kstyles/oxygen/animations/oxygenmenuengine.cpp \
#1109314:1109315 @@ -36,10 +36,10 @@
bool MenuEngineV1::registerWidget( QWidget* widget )
{
- if( !( enabled() && widget ) ) return false;
+ if( !widget ) return false;
// create new data class
- if( !data_.contains( widget ) ) data_.insert( widget, new MenuDataV1( this, \
widget, duration() ) ); + if( !data_.contains( widget ) ) data_.insert( \
widget, new MenuDataV1( this, widget, duration() ), enabled() );
// connect destruction signal
disconnect( widget, SIGNAL( destroyed( QObject* ) ), this, SLOT( \
unregisterWidget( QObject* ) ) );
--- branches/KDE/4.4/kdebase/runtime/kstyles/oxygen/animations/oxygenprogressbarengine.cpp \
#1109314:1109315 @@ -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( !data_.contains( widget ) \
) data_.insert( widget, new ProgressBarData( this, widget, duration() \
), enabled() );
if( busyIndicatorEnabled() && !dataSet_.contains( widget ) ) \
dataSet_.insert( widget );
// install event filter
@@ -46,11 +46,7 @@
{ widget->installEventFilter( this ); }
// connect destruction signal
- if( enabled() || busyIndicatorEnabled() )
- {
- disconnect( widget, SIGNAL( destroyed( QObject* ) ), this, SLOT( \
unregisterWidget( QObject* ) ) );
- connect( widget, SIGNAL( destroyed( QObject* ) ), this, SLOT( \
unregisterWidget( QObject* ) ) );
- }
+ connect( widget, SIGNAL( destroyed( QObject* ) ), this, SLOT( \
unregisterWidget( QObject* ) ), Qt::UniqueConnection );
return true;
--- branches/KDE/4.4/kdebase/runtime/kstyles/oxygen/animations/oxygenscrollbarengine.cpp \
#1109314:1109315 @@ -44,12 +44,7 @@
if( !widget ) return false;
// create new data class
- if( !data_.contains( widget ) )
- {
- ScrollBarData* data = new ScrollBarData( this, widget, duration() );
- data->setEnabled( enabled() );
- data_.insert( widget, data );
- }
+ if( !data_.contains( widget ) ) data_.insert( widget, new ScrollBarData( \
this, widget, duration() ), enabled() );
// connect destruction signal
disconnect( widget, SIGNAL( destroyed( QObject* ) ), this, SLOT( \
unregisterWidget( QObject* ) ) );
--- branches/KDE/4.4/kdebase/runtime/kstyles/oxygen/animations/oxygensliderengine.cpp \
#1109314:1109315 @@ -36,10 +36,10 @@
bool SliderEngine::registerWidget( QWidget* widget )
{
- if( !( enabled() && widget ) ) return false;
+ if( !widget ) return false;
// create new data class
- if( !data_.contains( widget ) ) data_.insert( widget, new SliderData( this, \
widget, duration() ) ); + if( !data_.contains( widget ) ) data_.insert( \
widget, new SliderData( this, widget, duration() ), enabled() );
// connect destruction signal
disconnect( widget, SIGNAL( destroyed( QObject* ) ), this, SLOT( \
unregisterWidget( QObject* ) ) );
--- branches/KDE/4.4/kdebase/runtime/kstyles/oxygen/animations/oxygentabbarengine.cpp \
#1109314:1109315 @@ -36,10 +36,10 @@
bool TabBarEngine::registerWidget( QWidget* widget )
{
- if( !( enabled() && widget ) ) return false;
+ if( !widget ) return false;
// create new data class
- if( !data_.contains( widget ) ) data_.insert( widget, new TabBarData( this, \
widget, duration() ) ); + if( !data_.contains( widget ) ) data_.insert( \
widget, new TabBarData( this, widget, duration() ), enabled() );
// connect destruction signal
disconnect( widget, SIGNAL( destroyed( QObject* ) ), this, SLOT( \
unregisterWidget( QObject* ) ) );
--- branches/KDE/4.4/kdebase/runtime/kstyles/oxygen/animations/oxygenwidgetstateengine.cpp \
#1109314:1109315 @@ -38,10 +38,10 @@
bool WidgetStateEngine::registerWidget( QWidget* widget, AnimationModes mode )
{
- if( !( enabled() && widget ) ) return false;
- if( mode&AnimationHover && !hoverData_.contains( widget ) ) { \
hoverData_.insert( widget, new HoverData( this, widget, duration() ) \
); }
- if( mode&AnimationFocus && !focusData_.contains( widget ) ) { \
focusData_.insert( widget, new WidgetStateData( this, widget, \
duration() ) ); }
- if( mode&AnimationEnable && !enableData_.contains( widget ) ) { \
enableData_.insert( widget, new EnableData( this, widget, duration() ) ); } + \
if( !widget ) return false; + if( mode&AnimationHover && !hoverData_.contains( \
widget ) ) { hoverData_.insert( widget, new HoverData( this, widget, duration() ), \
enabled() ); } + if( mode&AnimationFocus && !focusData_.contains( widget ) ) { \
focusData_.insert( widget, new WidgetStateData( this, widget, duration() ), enabled() \
); } + if( mode&AnimationEnable && !enableData_.contains( widget ) ) { \
enableData_.insert( widget, new EnableData( this, widget, duration() ), enabled() ); \
}
// connect destruction signal
disconnect( widget, SIGNAL( destroyed( QObject* ) ), this, SLOT( \
unregisterWidget( QObject* ) ) );
--- branches/KDE/4.4/kdebase/runtime/kstyles/oxygen/transitions/oxygencomboboxengine.cpp \
#1109314:1109315 @@ -34,8 +34,8 @@
bool ComboBoxEngine::registerWidget( QComboBox* widget )
{
- if( !( enabled() && widget ) ) return false;
- if( !data_.contains( widget ) ) { data_.insert( widget, new ComboBoxData( \
this, widget, duration() ) ); } + if( !widget ) return false;
+ if( !data_.contains( widget ) ) { data_.insert( widget, new ComboBoxData( \
this, widget, duration() ), enabled() ); }
// connect destruction signal
disconnect( widget, SIGNAL( destroyed( QObject* ) ), this, SLOT( \
unregisterWidget( QObject* ) ) );
--- branches/KDE/4.4/kdebase/runtime/kstyles/oxygen/transitions/oxygenlabelengine.cpp \
#1109314:1109315 @@ -34,8 +34,8 @@
bool LabelEngine::registerWidget( QLabel* widget )
{
- if( !( enabled() && widget ) ) return false;
- if( !data_.contains( widget ) ) { data_.insert( widget, new LabelData( this, \
widget, duration() ) ); } + if( !widget ) return false;
+ if( !data_.contains( widget ) ) { data_.insert( widget, new LabelData( this, \
widget, duration() ), enabled() ); }
// connect destruction signal
disconnect( widget, SIGNAL( destroyed( QObject* ) ), this, SLOT( \
unregisterWidget( QObject* ) ) );
--- branches/KDE/4.4/kdebase/runtime/kstyles/oxygen/transitions/oxygenlineeditengine.cpp \
#1109314:1109315 @@ -35,13 +35,13 @@
{
// check enability and widget validity
- if( !( enabled() && widget ) ) return false;
+ if( !widget ) return false;
// do not register widget if painted in a scene
if( widget->graphicsProxyWidget() ) return false;
// insert in map if needed
- if( !data_.contains( widget ) ) { data_.insert( widget, new LineEditData( \
this, widget, duration() ) ); } + if( !data_.contains( widget ) ) { \
data_.insert( widget, new LineEditData( this, widget, duration() ), enabled() ); }
// connect destruction signal
disconnect( widget, SIGNAL( destroyed( QObject* ) ), this, SLOT( \
unregisterWidget( QObject* ) ) );
--- branches/KDE/4.4/kdebase/runtime/kstyles/oxygen/transitions/oxygenstackedwidgetengine.cpp \
#1109314:1109315 @@ -34,8 +34,8 @@
bool StackedWidgetEngine::registerWidget( QStackedWidget* widget )
{
- if( !( enabled() && widget ) ) return false;
- if( !data_.contains( widget ) ) { data_.insert( widget, new \
StackedWidgetData( this, widget, duration() ) ); } + if( !widget ) return \
false; + if( !data_.contains( widget ) ) { data_.insert( widget, new \
StackedWidgetData( this, widget, duration() ), enabled() ); }
// connect destruction signal
disconnect( widget, SIGNAL( destroyed( QObject* ) ), this, SLOT( \
unregisterWidget( QObject* ) ) );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic