From 6a7368175b5c16a39005d601ac2a97c057895d4c Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa Date: Thu, 11 Nov 2010 16:37:52 +0000 Subject: [PATCH] re-ordered option loading svn path=/trunk/KDE/kdebase/workspace/; revision=1195626 --- clients/oxygen/config/oxygenconfig.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clients/oxygen/config/oxygenconfig.cpp b/clients/oxygen/config/oxygenconfig.cpp index b593ae6e98..6c256ebb39 100644 --- a/clients/oxygen/config/oxygenconfig.cpp +++ b/clients/oxygen/config/oxygenconfig.cpp @@ -48,7 +48,7 @@ extern "C" namespace Oxygen { - + //_______________________________________________________________________ Config::Config( KConfig*, QWidget* parent ): QObject( parent ) @@ -117,14 +117,14 @@ namespace Oxygen else if( userInterface_->ui.separatorMode->currentIndex() != configuration.separatorMode() ) modified = true; else if( userInterface_->ui.titleOutline->isChecked() != configuration.drawTitleOutline() ) modified = true; - else if( userInterface_->shadowConfigurations[0]->isChecked() != configuration.useOxygenShadows() ) modified = true; - else if( userInterface_->shadowConfigurations[1]->isChecked() != configuration.useDropShadows() ) modified = true; else if( userInterface_->ui.tabsEnabled->isChecked() != configuration.tabsEnabled() ) modified = true; else if( userInterface_->ui.useAnimations->isChecked() != configuration.useAnimations() ) modified = true; else if( userInterface_->ui.animateTitleChange->isChecked() != configuration.animateTitleChange() ) modified = true; else if( userInterface_->ui.narrowButtonSpacing->isChecked() != configuration.useNarrowButtonSpacing() ) modified = true; // shadow configurations + else if( userInterface_->shadowConfigurations[0]->isChecked() != configuration.useOxygenShadows() ) modified = true; + else if( userInterface_->shadowConfigurations[1]->isChecked() != configuration.useDropShadows() ) modified = true; else if( shadowConfigurationChanged( ShadowConfiguration( QPalette::Active, KConfigGroup( configuration_, "ActiveShadow") ), *userInterface_->shadowConfigurations[0] ) ) modified = true; else if( shadowConfigurationChanged( ShadowConfiguration( QPalette::Inactive, KConfigGroup( configuration_, "InactiveShadow") ), *userInterface_->shadowConfigurations[1] ) ) modified = true;