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

[Adam Treat]

SVN commit 638415 by treat:

* KFontCombo -> QFontComboBox
* KDualColorButton is no longer...


 M  +1 -2      kst2dplot.cpp  
 M  +3 -3      ksteditviewobjectdialog.cpp  
 M  +1 -2      kstsettingsdlg4.ui  
 M  +1 -2      kstviewlabel.cpp  
 M  +1 -2      kstviewlegend.cpp  
 M  +1 -1      kstviewwidget.h  
 M  +3 -4      view2dplotwidget4.ui  
 M  +2 -4      viewlabelwidget4.ui  
 M  +2 -4      viewlegendwidget4.ui  


--- branches/work/kst/portto4/kst/src/libkstapp/kst2dplot.cpp #638414:638415
@@ -44,10 +44,9 @@
 // include files for KDE
 #include <qdebug.h>
 #include <kglobal.h>
-#include <kdualcolorbutton.h>
 #include <kcolorbutton.h>
 #include <kcombobox.h>
-#include <kfontcombo.h>
+#include <QFontComboBox>
 
 // application specific includes
 #include "dialoglauncher.h"
--- branches/work/kst/portto4/kst/src/libkstapp/ksteditviewobjectdialog.cpp #638414:638415
@@ -34,7 +34,7 @@
 #include <QPixmap>
 
 #include <kcolorbutton.h>
-#include <kfontcombo.h>
+#include <QFontComboBox>
 #include <knuminput.h>
 #include <kurlrequester.h>
   
@@ -227,9 +227,9 @@
             connect(propertyWidget, SIGNAL(valueChanged(double)), this, SLOT(modified()));
             connect(propertyWidget->child("qt_spinbox_edit"), SIGNAL(textChanged(const QString&)), this, SLOT(modified()));
           }
-        } else if (widgetType == "KFontCombo") {
+        } else if (widgetType == "QFontComboBox") {
           // insert a font combo box
-          propertyWidget = new KFontCombo(_propertiesFrame, (propertyName+","+"currentText").toLatin1());
+          propertyWidget = new QFontComboBox(_propertiesFrame, (propertyName+","+"currentText").toLatin1());
           propertyWidget->setProperty("currentText", _viewObject->property(property->name()));  
           if (!_isNew) {
             connect(propertyWidget, SIGNAL(activated(int)), this, SLOT(modified()));
--- branches/work/kst/portto4/kst/src/libkstapp/kstsettingsdlg4.ui #638414:638415
@@ -272,7 +272,7 @@
                     </widget>
                   </item>
                   <item>
-                    <widget class="KDualColorButton" name="_colors" >
+                    <widget class="KColorButton" name="_colors" >
                       <property name="sizePolicy" >
                         <sizepolicy>
                           <hsizetype>5</hsizetype>
@@ -1203,7 +1203,6 @@
     <include location="local" >kstsettings.h</include>
     <include location="local" >kstplotdefines.h</include>
     <include location="local" >ktimezonecombo.h</include>
-    <include location="local" >kdualcolorbutton.h</include>
     <include location="local" >colorpalettewidget.h</include>
     <include location="local" >kcolorbutton.h</include>
     <include location="local" >knuminput.h</include>
--- branches/work/kst/portto4/kst/src/libkstapp/kstviewlabel.cpp #638414:638415
@@ -33,8 +33,7 @@
 #include <kcolorbutton.h>
 #include <kcombobox.h>
 #include <kdatastream.h>
-#include <kdualcolorbutton.h>
-#include <kfontcombo.h>
+#include <QFontComboBox>
 #include <kglobal.h>
 #include <klocale.h>
 #include <knuminput.h>
--- branches/work/kst/portto4/kst/src/libkstapp/kstviewlegend.cpp #638414:638415
@@ -38,8 +38,7 @@
 #include <kpopupmenu.h>
 #include <kcolorbutton.h>
 #include <kcombobox.h>
-#include <kdualcolorbutton.h>
-#include <kfontcombo.h>
+#include <QFontComboBox>
 
 #include <qradiobutton.h>
 #include <qapplication.h>
--- branches/work/kst/portto4/kst/src/libkstapp/kstviewwidget.h #638414:638415
@@ -34,7 +34,7 @@
 #include <QFocusEvent>
 #include <QDragLeaveEvent>
 
-#include <kpopupmenu.h>
+#include <kmenu.h>
 #include "ksttoplevelview.h"
 
 class Q3DragObject;
--- branches/work/kst/portto4/kst/src/libkstapp/view2dplotwidget4.ui #638414:638415
@@ -381,7 +381,7 @@
                       </widget>
                     </item>
                     <item row="0" column="1" >
-                      <widget class="KDualColorButton" name="plotColors" >
+                      <widget class="KColorButton" name="plotColors" >
                         <property name="sizePolicy" >
                           <sizepolicy>
                             <hsizetype>0</hsizetype>
@@ -907,7 +907,7 @@
                       </widget>
                     </item>
                     <item rowspan="1" row="6" column="1" colspan="8" >
-                      <widget class="KFontCombo" name="FontComboBox" >
+                      <widget class="QFontComboBox" name="FontComboBox" >
                         <property name="autoCompletion" >
                           <bool>false</bool>
                         </property>
@@ -3039,9 +3039,8 @@
     <include location="local" >kst2dplot.h</include>
     <include location="local" >plotlistbox.h</include>
     <include location="local" >vectorselector.h</include>
-    <include location="local" >kdualcolorbutton.h</include>
     <include location="local" >kcolorbutton.h</include>
-    <include location="local" >kfontcombo.h</include>
+    <include location="local" >qfontcombobox.h</include>
     <include location="local" >klineedit.h</include>
     <include location="local" >kcombobox.h</include>
   </includes>
--- branches/work/kst/portto4/kst/src/libkstapp/viewlabelwidget4.ui #638414:638415
@@ -145,7 +145,7 @@
                   </widget>
                 </item>
                 <item rowspan="1" row="0" column="1" colspan="3" >
-                  <widget class="KFontCombo" name="_font" />
+                  <widget class="QFontComboBox" name="_font" />
                 </item>
                 <item row="2" column="1" >
                   <widget class="KColorButton" name="_fontColor" >
@@ -262,7 +262,7 @@
                   </widget>
                 </item>
                 <item>
-                  <widget class="KDualColorButton" name="_boxColors" >
+                  <widget class="KColorButton" name="_boxColors" >
                     <property name="sizePolicy" >
                       <sizepolicy>
                         <hsizetype>0</hsizetype>
@@ -359,10 +359,8 @@
     <include location="local" >scalarselector.h</include>
     <include location="local" >stringselector.h</include>
     <include location="local" >knuminput.h</include>
-    <include location="local" >kfontcombo.h</include>
     <include location="local" >klineedit.h</include>
     <include location="local" >kcolorbutton.h</include>
     <include location="local" >kcombobox.h</include>
-    <include location="local" >kdualcolorbutton.h</include>
   </includes>
 </ui>
--- branches/work/kst/portto4/kst/src/libkstapp/viewlegendwidget4.ui #638414:638415
@@ -303,7 +303,7 @@
               </widget>
             </item>
             <item rowspan="1" row="0" column="1" colspan="3" >
-              <widget class="KFontCombo" name="_font" />
+              <widget class="QFontComboBox" name="_font" />
             </item>
           </layout>
         </widget>
@@ -343,7 +343,7 @@
               </widget>
             </item>
             <item>
-              <widget class="KDualColorButton" name="_boxColors" >
+              <widget class="KColorButton" name="_boxColors" >
                 <property name="sizePolicy" >
                   <sizepolicy>
                     <hsizetype>0</hsizetype>
@@ -494,8 +494,6 @@
   </customwidgets>
   <includes>
     <include location="local" >kcolorbutton.h</include>
-    <include location="local" >kfontcombo.h</include>
     <include location="local" >klineedit.h</include>
-    <include location="local" >kdualcolorbutton.h</include>
   </includes>
 </ui>