[Kst] branches/work/kst/kst1kde4/kst/src/libkstapp

[Zongyi Zhang]

SVN commit 1115534 by zhang:

continue kst1kde4

 M  +4 -4      kstlogwidget.cpp  
 M  +6 -6      kstmonochromedialog.cpp  
 M  +2 -2      kstpluginmanager.cpp  
 M  +4 -4      kstviewlegendwidget.cpp  


--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstlogwidget.cpp #1115533:1115534
@@ -162,7 +162,7 @@
   painter.drawEllipse(margin, margin, height - margin * 2, height - margin * 2);
   painter.end();
   pixmap.setMask(pixmap.createHeuristicMask(true));
-// xxx  _msrc.setPixmap("DebugNotice", pixmap);
+// xxx  _msrc.setIcon("DebugNotice", pixmap);
 
   pixmap = QPixmap(height, height);
   pixmap.fill();
@@ -174,7 +174,7 @@
   painter.drawPolygon(polygon);
   painter.end();
   pixmap.setMask(pixmap.createHeuristicMask(true));
-// xxx  _msrc.setPixmap("DebugWarning", pixmap);
+// xxx  _msrc.setIcon("DebugWarning", pixmap);
 
   pixmap = QPixmap(height, height);
   pixmap.fill();
@@ -192,7 +192,7 @@
   painter.drawPolygon(polygon);
   painter.end();
   pixmap.setMask(pixmap.createHeuristicMask(true));
-// xxx  _msrc.setPixmap("DebugError", pixmap);
+// xxx  _msrc.setIcon("DebugError", pixmap);
 
   pixmap = QPixmap(height, height);
   pixmap.fill();
@@ -203,7 +203,7 @@
       (height - 2 * margin) / 3, (height - 2 * margin) / 3);
   painter.end();
   pixmap.setMask(pixmap.createHeuristicMask(true));
-// xxx  _msrc.setPixmap("DebugDebug", pixmap);
+// xxx  _msrc.setIcon("DebugDebug", pixmap);
 }
 
 #include "kstlogwidget.moc"
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstmonochromedialog.cpp #1115533:1115534
@@ -45,12 +45,12 @@
   connect(_down, SIGNAL(clicked()), this, SLOT(downClicked()));
   connect(availableListBox, SIGNAL(highlighted(int)), this, SLOT(updateButtons()));
   connect(selectedListBox, SIGNAL(highlighted(int)), this, SLOT(updateButtons()));
-/* xxx
-  _up->setPixmap(BarIcon("up"));
-  _down->setPixmap(BarIcon("down"));
-  _add->setPixmap(BarIcon("forward"));
-  _remove->setPixmap(BarIcon("back"));
-*/
+
+  _up->setIcon(BarIcon("up"));
+  _down->setIcon(BarIcon("down"));
+  _add->setIcon(BarIcon("forward"));
+  _remove->setIcon(BarIcon("back"));
+
   maxLineWidth->setMaximum(KSTLINESTYLE_MAXTYPE);
   maxLineWidth->setMinimum(1);
 
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstpluginmanager.cpp #1115533:1115534
@@ -125,7 +125,7 @@
   
     if (PluginCollection::self()->isLoaded(item->text(COLUMN_NAME))) {
       PluginCollection::self()->unloadPlugin(item->text(COLUMN_NAME));
-  // xxx    item->setPixmap(COLUMN_LOADED, locate("data", "kst/pics/no.png"));
+    item->setIcon(COLUMN_LOADED, locate("data", "kst/pics/no.png"));
     }
   
     PluginCollection::self()->deletePlugin(PluginCollection::self()->pluginNameList()[item->text(COLUMN_NAME)]);
@@ -163,7 +163,7 @@
     i = new QListWidgetItem(_pluginList, (*it)._readableName, QString::null,
             (*it)._description, (*it)._version, (*it)._author, (*it)._name, path);
     if (loadedPluginList.contains((*it)._name)) {
-      i->setPixmap(COLUMN_LOADED, locate("data", "kst/pics/yes.png"));
+      i->setIcon(COLUMN_LOADED, locate("data", "kst/pics/yes.png"));
     }
 */
   }
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstviewlegendwidget.cpp #1115533:1115534
@@ -42,13 +42,13 @@
   connect(_up, SIGNAL(clicked()), DisplayedCurveList, SIGNAL(changed()));
   connect(_down, SIGNAL(clicked()), DisplayedCurveList, SIGNAL(changed()));
 
-// xxx  _up->setPixmap(BarIcon("up"));
+  _up->setIcon(BarIcon("up"));
   _up->setEnabled(false);
-// xxx  _down->setPixmap(BarIcon("down"));
+  _down->setIcon(BarIcon("down"));
   _down->setEnabled(false);
-// xxx  _add->setPixmap(BarIcon("forward"));
+  _add->setIcon(BarIcon("forward"));
   _add->setEnabled(false);
-// xxx  _remove->setPixmap(BarIcon("back"));
+  _remove->setIcon(BarIcon("back"));
   _remove->setEnabled(false);
 
   _up->setToolTip(QObject::tr("Shortcut: Alt+Up"));