From kde-commits  Sun Feb 06 17:51:49 2005
From: Stephan Binner <binner () kde ! org>
Date: Sun, 06 Feb 2005 17:51:49 +0000
To: kde-commits
Subject: kdepim
Message-Id: <20050206175149.343CF1D019 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=110771236614231

CVS commit by binner: 

more icon sets for disabled icons


  M +2 -2      korganizer/koeditorgeneral.cpp   1.51
  M +3 -3      libkdepim/kscoringeditor.cpp   1.47
  M +8 -8      libkdepim/ksubscription.cpp   1.17
  M +1 -1      libkdepim/ksubscription.h   1.9


--- kdepim/korganizer/koeditorgeneral.cpp  #1.50:1.51
@@ -213,5 +213,5 @@ void KOEditorGeneral::initAlarm(QWidget 
                    i18n("Sets a sound to play in conjunction with the popup "
                         "dialog as a reminder.") );
-  mAlarmSoundButton->setPixmap(KOGlobals::self()->smallIcon("playsound"));
+  mAlarmSoundButton->setIconSet(KOGlobals::self()->smallIconSet("playsound"));
   mAlarmSoundButton->setToggleButton(true);
   QToolTip::add(mAlarmSoundButton, i18n("No sound set"));
@@ -223,5 +223,5 @@ void KOEditorGeneral::initAlarm(QWidget 
                    i18n("Sets a program to execute in conjunction with the "
                         "popup dialog.") );
-  mAlarmProgramButton->setPixmap(KOGlobals::self()->smallIcon("runprog"));
+  mAlarmProgramButton->setIconSet(KOGlobals::self()->smallIconSet("runprog"));
   mAlarmProgramButton->setToggleButton(true);
   QToolTip::add(mAlarmProgramButton, i18n("No program set"));

--- kdepim/libkdepim/kscoringeditor.cpp  #1.46:1.47
@@ -606,5 +606,5 @@ RuleListWidget::RuleListWidget(KScoringM
   if (standalone) {
     editRule = new QPushButton(this);
-    editRule->setPixmap( BarIcon("edit", KIcon::SizeSmall) );
+    editRule->setIconSet( BarIconSet("edit", KIcon::SizeSmall) );
     QToolTip::add(editRule,i18n("Edit rule"));
     btnL->addWidget(editRule);
@@ -612,10 +612,10 @@ RuleListWidget::RuleListWidget(KScoringM
   }
   delRule = new QPushButton(this);
-  delRule->setPixmap( BarIcon( "editdelete", KIcon::SizeSmall ) );
+  delRule->setIconSet( BarIconSet( "editdelete", KIcon::SizeSmall ) );
   QToolTip::add(delRule,i18n("Remove rule"));
   btnL->addWidget(delRule);
   connect(delRule, SIGNAL(clicked()), this, SLOT(slotDelRule()));
   copyRule = new QPushButton(this);
-  copyRule->setPixmap(BarIcon("editcopy", KIcon::SizeSmall));
+  copyRule->setIconSet(BarIconSet("editcopy", KIcon::SizeSmall));
   QToolTip::add(copyRule,i18n("Copy rule"));
   btnL->addWidget(copyRule);

--- kdepim/libkdepim/ksubscription.cpp  #1.16:1.17
@@ -240,6 +240,6 @@ KSubscription::KSubscription( QWidget *p
 
   // icons
-  pmRight = BarIcon("forward");
-  pmLeft = BarIcon("back");
+  pmRight = BarIconSet("forward");
+  pmLeft = BarIconSet("back");
 
   arrowBtn1 = new QPushButton(page);
@@ -247,6 +247,6 @@ KSubscription::KSubscription( QWidget *p
   arrowBtn2 = new QPushButton(page);
   arrowBtn2->setEnabled(false);
-  arrowBtn1->setPixmap(pmRight);
-  arrowBtn2->setPixmap(pmRight);
+  arrowBtn1->setIconSet(pmRight);
+  arrowBtn2->setIconSet(pmRight);
   arrowBtn1->setFixedSize(35,30);
   arrowBtn2->setFixedSize(35,30);
@@ -407,7 +407,7 @@ void KSubscription::setDirectionButton1(
   mDirButton1 = dir;
   if (dir == Left)
-    arrowBtn1->setPixmap(pmLeft);
+    arrowBtn1->setIconSet(pmLeft);
   else
-    arrowBtn1->setPixmap(pmRight);
+    arrowBtn1->setIconSet(pmRight);
 }
 
@@ -417,7 +417,7 @@ void KSubscription::setDirectionButton2(
   mDirButton2 = dir;
   if (dir == Left)
-    arrowBtn2->setPixmap(pmLeft);
+    arrowBtn2->setIconSet(pmLeft);
   else
-    arrowBtn2->setPixmap(pmRight);
+    arrowBtn2->setIconSet(pmRight);
 }
 

--- kdepim/libkdepim/ksubscription.h  #1.8:1.9
@@ -355,5 +355,5 @@ class KDE_EXPORT KSubscription : public 
     QCheckBox *noTreeCB, *subCB, *newCB;
     QPushButton  *arrowBtn1, *arrowBtn2;
-    QPixmap pmRight, pmLeft;
+    QIconSet pmRight, pmLeft;
     QGridLayout *listL;
     QLabel *leftLabel, *rightLabel;