Removed some additional KDE references

Added option to disable panel icon launch effect


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1176254 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 files changed, 75 insertions, 57 deletions

diff --git a/kcontrol/kicker/lookandfeeltab.ui b/kcontrol/kicker/lookandfeeltab.ui
index 675f5adb0..87f87cfc7 100644
--- a/kcontrol/kicker/lookandfeeltab.ui
+++ b/kcontrol/kicker/lookandfeeltab.ui
@@ -44,6 +44,17 @@
                         <string>When this option is selected a mouseover effect appears when the mouse cursor is moved over panel buttons</string>
                     </property>
                 </widget>
+		<widget class="QCheckBox">
+			<property name="name">
+				<cstring>kcfg_ShowIconActivationEffect</cstring>
+			</property>
+			<property name="text">
+				<string>Enable icon activation effects</string>
+			</property>
+			<property name="whatsThis" stdset="0">
+				<string>When this option is selected an activation effect appears when panel buttons are left clicked.</string>
+			</property>
+                </widget>
                 <widget class="QCheckBox">
                     <property name="name">
                         <cstring>kcfg_ShowToolTips</cstring>
diff --git a/kicker/data/kmenu_side/kside.png b/kicker/data/kmenu_side/kside.png
index d3ad79075..715981db7 100644
--- a/kicker/data/kmenu_side/kside.png
+++ b/kicker/data/kmenu_side/kside.png
diff --git a/kicker/libkicker/kickerSettings.kcfg b/kicker/libkicker/kickerSettings.kcfg
index 99625809d..0f725c35f 100644
--- a/kicker/libkicker/kickerSettings.kcfg
+++ b/kicker/libkicker/kickerSettings.kcfg
@@ -90,6 +90,11 @@
       <default>true</default>
    </entry>
 
+<entry name="ShowIconActivationEffect" type="Bool" >
+      <label>Show visual effect when panel icon is activated.</label>
+      <default>true</default>
+   </entry>
+
 <entry name="UntrustedApplets" type="StringList">
       <label>A list of applets that have been loaded at runtime. In the case of a crash these applets will not be loaded at the next Kicker start, in case they caused the crash</label>
    </entry>
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index f1ab69fb8..a04e9aee0 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -504,7 +504,9 @@ void PanelButton::mouseReleaseEvent(TQMouseEvent *e)
         m_isLeftMouseButtonDown = false;
 	
 	TQPixmap pix = labelIcon();
-	KIconEffect::visualActivate(this, this->geometry(), &pix);
+	if (KickerSettings::showIconActivationEffect() == true) {
+		KIconEffect::visualActivate(this, this->geometry(), &pix);
+	}
     }
     TQButton::mouseReleaseEvent(e);
 }
diff --git a/pics/wallpapers/KDE34.png b/pics/wallpapers/KDE34.png
index 01f3b48ab..e37cf0b6f 100644
--- a/pics/wallpapers/KDE34.png
+++ b/pics/wallpapers/KDE34.png
diff --git a/pics/wallpapers/KDE34.png.desktop b/pics/wallpapers/KDE34.png.desktop
index 5f7bd742d..bedbf05e9 100644
--- a/pics/wallpapers/KDE34.png.desktop
+++ b/pics/wallpapers/KDE34.png.desktop
@@ -1,63 +1,63 @@
 [Wallpaper]
 File=KDE34.png
-Name=KDE 3.5 Default
-Name[af]=KDE 3.5 Standaard
-Name[be]=Стандартныя для KDE 3.5
+Name=Trinity Default
+Name[af]=Trinity Standaard
+Name[be]=Стандартныя для Trinity
 Name[bn]=কে.ডি.ই.-৩.৫ ডিফল্ট
-Name[ca]=KDE 3.5 per omissió
-Name[cs]=Výchozí pro KDE 3.5
-Name[csb]=Domëslnô KDE 3.5
-Name[da]=KDE 3.5 standard
-Name[de]=KDE 3.5 Standard
-Name[el]=Προκαθορισμένο του KDE 3.5
-Name[eo]=KDE 3.5 defaŭlta
-Name[es]=Predeterminado de KDE 3.5
-Name[et]=KDE 3.5 vaiketaustapilt
-Name[eu]=KDE 3.5 lehenetsia
-Name[fa]=پیش‌فرض KDE 3.5
-Name[fi]=KDE 3.5 oletus
-Name[fr]=KDE 3.5 par défaut
-Name[fy]=KDE 3.5 Standert
-Name[ga]=Réamhshocrú KDE 3.5
-Name[gl]=Predeterminado en KDE 3.5
-Name[he]=ברירת מחדל של KDE 3.5
-Name[hr]=KDE 3.5 zadano
-Name[hu]=A KDE 3.5 alapértelmezése
-Name[is]=KDE 3.5 sjálfgefið
-Name[it]=Predefinito di KDE 3.5
-Name[ja]=KDE 3.5 標準
+Name[ca]=Trinity per omissió
+Name[cs]=Výchozí pro Trinity
+Name[csb]=Domëslnô Trinity
+Name[da]=Trinity standard
+Name[de]=Trinity Standard
+Name[el]=Προκαθορισμένο του Trinity
+Name[eo]=Trinity defaŭlta
+Name[es]=Predeterminado de Trinity
+Name[et]=Trinity vaiketaustapilt
+Name[eu]=Trinity lehenetsia
+Name[fa]=پیش‌فرض Trinity
+Name[fi]=Trinity oletus
+Name[fr]=Trinity par défaut
+Name[fy]=Trinity Standert
+Name[ga]=Réamhshocrú Trinity
+Name[gl]=Predeterminado en Trinity
+Name[he]=ברירת מחדל של Trinity
+Name[hr]=Trinity zadano
+Name[hu]=A Trinity alapértelmezése
+Name[is]=Trinity sjálfgefið
+Name[it]=Predefinito di Trinity
+Name[ja]=Trinity 標準
 Name[ka]=KDE 3.4 სტანდარტული
-Name[kk]=KDE 3.5 әдеттісі
+Name[kk]=Trinity әдеттісі
 Name[km]=លំនាំដើម KDE ៣.៥
-Name[lt]=KDE 3.5 numatytoji parinktis
-Name[mk]=Стандардно за KDE 3.5
-Name[nb]=KDE 3.5 Standard
-Name[nds]=KDE 3.5 Standard
-Name[ne]=KDE 3.5 पूर्वनिर्धारित
-Name[nl]=KDE 3.5 Standaard
-Name[nn]=KDE 3.5 Standard
-Name[pa]=KDE 3.5 ਮੂਲ
-Name[pl]=Domyślna KDE 3.5
-Name[pt]=Predefinido do KDE 3.5
-Name[pt_BR]=KDE 3.5 Padrão
-Name[ro]=KDE 3.5 (Implicit)
-Name[ru]=KDE 3.5 по умолчанию
-Name[se]=KDE 3.5 standárda
-Name[sk]=Štandard KDE 3.5
-Name[sl]=Privzeto za KDE 3.5
-Name[sr]=Подразумевано за KDE 3.5
-Name[sr@Latn]=Podrazumevano za KDE 3.5
-Name[sv]=KDE 3.5 förval
+Name[lt]=Trinity numatytoji parinktis
+Name[mk]=Стандардно за Trinity
+Name[nb]=Trinity Standard
+Name[nds]=Trinity Standard
+Name[ne]=Trinity पूर्वनिर्धारित
+Name[nl]=Trinity Standaard
+Name[nn]=Trinity Standard
+Name[pa]=Trinity ਮੂਲ
+Name[pl]=Domyślna Trinity
+Name[pt]=Predefinido do Trinity
+Name[pt_BR]=Trinity Padrão
+Name[ro]=Trinity (Implicit)
+Name[ru]=Trinity по умолчанию
+Name[se]=Trinity standárda
+Name[sk]=Štandard Trinity
+Name[sl]=Privzeto za Trinity
+Name[sr]=Подразумевано за Trinity
+Name[sr@Latn]=Podrazumevano za Trinity
+Name[sv]=Trinity förval
 Name[te]=కెడిఈ 3.5 అప్రమేయం
-Name[tg]=KDE 3.5 Пешфарзӣ
-Name[th]=ค่าปริยาย KDE 3.5 
-Name[tr]=KDE 3.5 Öntanımlı
-Name[uk]=KDE 3.5 типовий
-Name[uz]=KDE 3.5 andozasi
-Name[uz@cyrillic]=KDE 3.5 андозаси
-Name[vi]=Mặc định KDE 3.5
-Name[wa]=Prémetou KDE 3.5
-Name[zh_CN]=KDE 3.5 默认
-Name[zh_TW]=KDE 3.5 預設
+Name[tg]=Trinity Пешфарзӣ
+Name[th]=ค่าปริยาย Trinity 
+Name[tr]=Trinity Öntanımlı
+Name[uk]=Trinity типовий
+Name[uz]=Trinity andozasi
+Name[uz@cyrillic]=Trinity андозаси
+Name[vi]=Mặc định Trinity
+Name[wa]=Prémetou Trinity
+Name[zh_CN]=Trinity 默认
+Name[zh_TW]=Trinity 預設
 ImageType=pixmap
-Author=Martin C (http://www.kde-look.org/content/show.php?content=19342)
+Author=Martin C and Timothy Pearson