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

List:       kde-core-devel
Subject:    [PATCH] KPersonalizer
From:       Martijn Klingens <mklingens () yahoo ! com>
Date:       2002-01-30 21:25:48
[Download RAW message or body]

Attached patch adds an option to set the icons on pushbuttons on and off in 
KPersonalizer. It is off by default and turned on in the higher eye candy 
levels. Patch is huge, but trivial. The single troublesome part is a mere 
'i18n("Icons on Buttons")' - it adds a new string. And oops...

What should I do with this?

Martijn

["kpersonalizer.diff" (text/x-diff)]

Index: keyecandypage.cpp
===================================================================
RCS file: /home/kde/kdebase/kpersonalizer/keyecandypage.cpp,v
retrieving revision 1.24
diff -u -p -r1.24 keyecandypage.cpp
--- keyecandypage.cpp	2001/12/29 17:24:02	1.24
+++ keyecandypage.cpp	2002/01/30 21:17:21
@@ -98,6 +98,8 @@ KEyeCandyPage::KEyeCandyPage(QWidget *pa
    // Level 5
   preview_images = new QCheckListItem(klv_features, i18n("Image preview"),
                                     QCheckListItem::CheckBox);
+  pushbutton_icons = new QCheckListItem(klv_features, i18n("Icons on Buttons"),
+                                    QCheckListItem::CheckBox);
    // Level 6
   animated_combo = new QCheckListItem(klv_features, i18n("Animated comboboxes"),
                                QCheckListItem::CheckBox);
@@ -144,6 +146,7 @@ void KEyeCandyPage::slotEyeCandySliderMo
 
        // Level 5
        preview_images->setOn(false);
+       pushbutton_icons->setOn(false);
        // Level 6
        animated_combo->setOn(false);
        // Level 7
@@ -187,6 +190,7 @@ void KEyeCandyPage::slotEyeCandySliderMo
     if( value >= 5){
         // Level 5
        preview_images->setOn(true);
+       pushbutton_icons->setOn(true);
   }
     if( value >= 6){
         // Level 6
@@ -444,6 +448,13 @@ void KEyeCandyPage::enableFadingMenus(bo
     kcmdisplayconfig->writeEntry("EffectFadeMenu", enable,true, true);
 
 }
+/** enables/disables icons on pushbuttons, which are off by default in KDE. Enable \
this in Level 5 */ +void KEyeCandyPage::enablePushButtonIcons(bool enable){
+
+    kcmdisplayconfig->setGroup("KDE");
+    kcmdisplayconfig->writeEntry("ShowIconsOnPushButtons", enable,true, true);
+
+}
 /** Enable animated combo boxes, see styles kcontrol module. Enable in Level 6 \
(disabled by default anyway, so doesn't need to be  disabled in levels below 4) */
 void KEyeCandyPage::enableAnimatedCombo(bool enable){
@@ -697,6 +708,7 @@ void KEyeCandyPage::getUserDefaults(){
     desktopiconsize=KGlobal::config()->readNumEntry("Size", 32);
     kcmdisplayconfig->setGroup("KDE");
     b_EffectFadeTooltip=kcmdisplayconfig->readBoolEntry( "EffectFadeTooltip", false \
); +    b_PushButtonIcons=kcmdisplayconfig->readBoolEntry("ShowIconsOnPushButtons", \
false);  
     kcmdisplayconfig->setGroup("KDE");
     b_EffectFadeMenu=kcmdisplayconfig->readBoolEntry("EffectFadeMenu", false);
@@ -748,6 +760,8 @@ void KEyeCandyPage::saveCheckState(bool 
 
       enableAnimatedCombo(animated_combo->isOn());
 
+      enablePushButtonIcons(pushbutton_icons->isOn());
+
       enablePreviewImages(preview_images->isOn());
       enablePreviewText(preview_text->isOn());
       enablePreviewOther(preview_other->isOn());
@@ -769,6 +783,7 @@ void KEyeCandyPage::saveCheckState(bool 
       enableFadingToolTips(b_EffectFadeTooltip);
       enableFadingMenus(b_EffectFadeMenu);
       enableAnimatedCombo(b_EffectAnimateCombo);
+      enablePushButtonIcons(b_PushButtonIcons);
       enablePreview(false);
       enableAntialiasingFonts(b_AntiAliasing);
       enableDesktopWindowMovingContents(false, true);  // the first parameter is \
                equal to this call
Index: keyecandypage.h
===================================================================
RCS file: /home/kde/kdebase/kpersonalizer/keyecandypage.h,v
retrieving revision 1.11
diff -u -p -r1.11 keyecandypage.h
--- keyecandypage.h	2001/06/18 15:36:03	1.11
+++ keyecandypage.h	2002/01/30 21:17:22
@@ -88,6 +88,8 @@ Level 1 enables this (and all levels abo
   /** Enable animated combo boxes, see styles kcontrol module. Enable in Level 4 \
(disabled by default anyway, so doesn't need to be  disabled in levels below 4) */
   void enableAnimatedCombo(bool enable);
+  /** Enable icons on pushbuttons in level 5 and up */
+  void enablePushButtonIcons(bool enable);
 //---------------------------------------------------------------------------------------------------------
  
 //---------------------------------------------------------------------------------------------------------
 @@ -130,7 +132,7 @@ according to the level the slider moved.
   int desktopiconsize;
   bool b_EffectFadeMenu, b_EffectAnimateCombo, b_EffectFadeTooltip, \
b_EnableIconZoom, b_AlphaBlendingPanel,  b_AlphaBlendingDesktop, b_AnimateMinimize, \
                b_AnimateShade, b_MoveResizeMaximizedWindows,
-  b_ShadeHover, b_AntiAliasing;
+  b_ShadeHover, b_AntiAliasing, b_PushButtonIcons;
 
   QString konqbgimage, s_ResizeMode, s_MoveMode, deskbgimage;
   QStringList konq_prev, kdesktop_prev;
@@ -182,6 +184,8 @@ according to the level the slider moved.
 
   QCheckListItem* fading_menus;
   QCheckListItem* fading_tooltips;
+  
+  QCheckListItem* pushbutton_icons;
 
   QCheckListItem* preview_text;
   QCheckListItem* preview_images;



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