From 2e1ed41e69037355023530e8cb6cf78d89b000e1 Mon Sep 17 00:00:00 2001
From: Hugo Pereira Da Costa <hugo@oxygen-icons.org>
Date: Wed, 9 Jun 2010 04:01:57 +0000
Subject: [PATCH] moved shadow mode to expert configuration only, because kwin
 shadow pluggin does not work well with oxygen

svn path=/trunk/KDE/kdebase/workspace/; revision=1136155
---
 .../oxygen/config/oxygenconfigurationui.cpp   |  5 +-
 .../oxygen/config/ui/oxygenconfigurationui.ui | 97 ++++++++++---------
 2 files changed, 56 insertions(+), 46 deletions(-)

diff --git a/clients/oxygen/config/oxygenconfigurationui.cpp b/clients/oxygen/config/oxygenconfigurationui.cpp
index 75e6bcc4d8..5c42bbcede 100644
--- a/clients/oxygen/config/oxygenconfigurationui.cpp
+++ b/clients/oxygen/config/oxygenconfigurationui.cpp
@@ -137,8 +137,9 @@ namespace Oxygen
     expertMode_ = value;
     ui.animateTitleChange->setVisible( expertMode_ );
     ui.narrowButtonSpacing->setVisible( expertMode_ );
-    ui.shadowCacheModeLabel->setVisible( expertMode_ );
-    ui.shadowCacheMode->setVisible( expertMode_ );
+
+    // shadow mode
+    ui.shadowsExpertWidget->setVisible( expertMode_ );
 
     if( expertMode_ ) ui.shadowSpacer->changeSize(0,0, QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
     else ui.shadowSpacer->changeSize(0,0, QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
diff --git a/clients/oxygen/config/ui/oxygenconfigurationui.ui b/clients/oxygen/config/ui/oxygenconfigurationui.ui
index a0287d5011..8add1edd1c 100644
--- a/clients/oxygen/config/ui/oxygenconfigurationui.ui
+++ b/clients/oxygen/config/ui/oxygenconfigurationui.ui
@@ -226,53 +226,62 @@
       <attribute name="title">
        <string>Shadows</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_3">
+      <layout class="QGridLayout" name="gridLayout_4">
        <item row="0" column="0">
-        <widget class="QLabel" name="label_6">
-         <property name="text">
-          <string>Shadow style:</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-         <property name="buddy">
-          <cstring>shadowMode</cstring>
-         </property>
+        <widget class="QWidget" name="shadowsExpertWidget" native="true">
+         <layout class="QGridLayout" name="gridLayout_3">
+          <property name="margin">
+           <number>0</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QLabel" name="shadowModeLabel">
+            <property name="text">
+             <string>Shadow style:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="buddy">
+             <cstring>shadowMode</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="KComboBox" name="shadowMode"/>
+          </item>
+          <item row="0" column="2">
+           <spacer name="horizontalSpacer_7">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>308</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="shadowCacheModeLabel">
+            <property name="text">
+             <string>Shadow caching:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="buddy">
+             <cstring>shadowCacheMode</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="KComboBox" name="shadowCacheMode"/>
+          </item>
+         </layout>
         </widget>
        </item>
-       <item row="0" column="1">
-        <widget class="KComboBox" name="shadowMode"/>
-       </item>
-       <item row="0" column="2">
-        <spacer name="horizontalSpacer_7">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>308</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
        <item row="1" column="0">
-        <widget class="QLabel" name="shadowCacheModeLabel">
-         <property name="text">
-          <string>Shadow caching:</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-         <property name="buddy">
-          <cstring>shadowCacheMode</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <widget class="KComboBox" name="shadowCacheMode"/>
-       </item>
-       <item row="2" column="0" colspan="3">
         <layout class="QHBoxLayout" name="horizontalLayout_7">
          <item>
           <widget class="Oxygen::ShadowConfigurationUi" name="inactiveShadowConfiguration">
@@ -296,7 +305,7 @@
          </item>
         </layout>
        </item>
-       <item row="3" column="0">
+       <item row="2" column="0">
         <spacer name="shadowSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>