[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Boxygen-gtk=5D_src=3A_Merge_branch_=27tabCloseButton?=
From:       Hugo Pereira Da Costa <hugo () oxygen-icons ! org>
Date:       2011-02-01 9:57:31
Message-ID: 20110201095731.DEBD7A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit cd995e1b465ee4f27b491bf9e09b7c33524d28ee by Hugo Pereira Da Costa.
Committed on 01/02/11 at 10:57.
Pushed by hpereiradacosta into branch 'master'.

Merge branch 'tabCloseButtons'

Conflicts:
	src/oxygenstyle.cpp

MM +58   -4    src/oxygenstyle.cpp     
MM +39   -2    src/oxygenstyle.h     
MM +7    -51   src/oxygenstylewrapper.cpp     

http://commits.kde.org/oxygen-gtk/cd995e1b465ee4f27b491bf9e09b7c33524d28ee

diff --cc src/oxygenstyle.cpp
index fbcce14,6b684f2..ead46b9
--- a/src/oxygenstyle.cpp
+++ b/src/oxygenstyle.cpp
@@@ -47,37 -46,18 +47,33 @@@ namespace Oxyge
      }
  
      //__________________________________________________________________
-     Style::Style( void )
-     {}
- 
-     //__________________________________________________________________
 -    void Style::initialize( void )
 +    void Style::initialize( unsigned int flags )
      {
 -        _settings.initialize();
  
 -        // pass window drag mode to window manager
 -        if( !settings().windowDragEnabled() ) windowManager().setMode( \
                WindowManager::Disabled );
 -        else if( settings().windowDragMode() == QtSettings::WD_MINIMAL ) \
                windowManager().setMode( WindowManager::Minimal );
 -        else windowManager().setMode( WindowManager::Full );
 +        // reset caches if colors have changed
 +        if( flags&QtSettings::Colors )
 +        {
 +            helper().clearCaches();
 +            ColorUtils::clearCaches();
 +        }
 +
 +        // reinitialize settings
 +        _settings.initialize( flags );
 +
 +        if( flags&QtSettings::Oxygen )
 +        {
 +            // pass window drag mode to window manager
 +            if( !settings().windowDragEnabled() ) windowManager().setMode( \
WindowManager::Disabled );  +            else if( settings().windowDragMode() == \
QtSettings::WD_MINIMAL ) windowManager().setMode( WindowManager::Minimal );  +        \
else windowManager().setMode( WindowManager::Full );  +        }
  
 -        // pass drag distance and delay to window manager
 -        windowManager().setDragDistance( settings().startDragDist() );
 -        windowManager().setDragDelay( settings().startDragTime() );
 +        if( flags&QtSettings::KdeGlobals )
 +        {
 +            // pass drag distance and delay to window manager
 +            windowManager().setDragDistance( settings().startDragDist() );
 +            windowManager().setDragDelay( settings().startDragTime() );
 +        }
  
      }
  
diff --cc src/oxygenstyle.h
index 14f8c9e,8409540..e73935c
--- a/src/oxygenstyle.h
+++ b/src/oxygenstyle.h
@@@ -51,10 -51,10 +51,10 @@@ namespace Oxyge
  
          //! destructor
          virtual ~Style( void )
-         { _instance = 0L; }
+         {}
  
          //! initialize
 -        void initialize( void );
 +        void initialize( unsigned int flags = QtSettings::All );
  
          //! settings
          const QtSettings& settings( void ) const


[prev in list] [next in list] [prev in thread] [next in thread]