Sophie

Sophie

distrib > Mandriva > 2009.0 > i586 > by-pkgid > 901b66721cd8b67ee1adbc6604574c15 > files > 55

kdebase-3.5.10-6mdv2009.0.src.rpm

diff -u -r kdebase-3.5.9/kicker/libkicker/kickerSettings.kcfg kdebase-3.5.9-new/kicker/libkicker/kickerSettings.kcfg
--- kdebase-3.5.9/kicker/libkicker/kickerSettings.kcfg	2008-04-02 13:05:14.000000000 -0300
+++ kdebase-3.5.9-new/kicker/libkicker/kickerSettings.kcfg	2008-04-02 12:27:59.000000000 -0300
@@ -376,7 +376,12 @@
       <label>Text to be shown on K Menu Button</label>
       <default code="true">i18n("Applications")</default>
    </entry>
-   
+
+<entry name="KMenuTextShadow" key="TextShadow" type="Bool" >
+      <label>Shadow on K Menu text</label>
+	  <default>false</default>
+</entry>
+  
 <entry name="KMenuIcon" key="KMenuIcon" type="String" >
       <label>Icon to be shown on K Menu Button</label>
       <default>kmenu</default>
diff -u -r kdebase-3.5.9/kicker/libkicker/panelbutton.cpp kdebase-3.5.9-new/kicker/libkicker/panelbutton.cpp
--- kdebase-3.5.9/kicker/libkicker/panelbutton.cpp	2008-04-02 13:05:14.000000000 -0300
+++ kdebase-3.5.9-new/kicker/libkicker/panelbutton.cpp	2008-04-02 13:02:40.000000000 -0300
@@ -671,18 +671,25 @@
         pixPainter.drawText( textX + 2, textY + 2, m_buttonText, -1, rtl);
 		pixPainter.end();
 
-        if (!s_textShadowEngine)
-        {
-            KShadowSettings* shadset = new KShadowSettings();
-            shadset->setOffsetX(0);
-            shadset->setOffsetY(0);
-            shadset->setThickness(1);
-            shadset->setMaxOpacity(64);
-            s_textShadowEngine = new KShadowEngine(shadset);
-        }
-
         // draw text
-        QImage img = s_textShadowEngine->makeShadow(textPixmap, shadCol);
+        QImage img;
+		if ( KickerSettings::kMenuTextShadow() )
+		{
+	 		if (!s_textShadowEngine)
+        	{
+            	KShadowSettings* shadset = new KShadowSettings();
+            	shadset->setOffsetX(0);
+            	shadset->setOffsetY(0);
+            	shadset->setThickness(1);
+            	shadset->setMaxOpacity(64);
+            	s_textShadowEngine = new KShadowEngine(shadset);
+        	}
+			img = s_textShadowEngine->makeShadow(textPixmap, shadCol);
+		}
+		else
+		{
+			img = QImage();
+		}
         p->drawImage( 0, orientation() == Horizontal ? 0 : 0 - w, img);
         p->save();
         p->setPen( m_textColor );
@@ -907,11 +914,10 @@
                 KIcon::ActiveState );
     }
     
-    m_iconz = kfx->apply( 
-            QPixmap( KGlobal::iconLoader()->iconPath( nm, KIcon::SizeHuge ) ),
-            KIcon::Panel,
-            defaultState );
-    
+    m_iconz = QImage( KGlobal::iconLoader()->iconPath( nm, KIcon::SizeHuge ) );
+	if ( m_iconz.isNull() )
+		m_iconz = img;
+
     delete kfx;
 }