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

[Adam Treat]

SVN commit 642582 by treat:

* Disable the plugindialog and old plugins, fix ui files,
and make it compile.


 M  +2 -2      CMakeLists.txt  
 M  +8 -8      dialoglauncher-gui.cpp  
 M  +1 -1      dialoglauncher-gui.h  
 M  +8 -11     kst.cpp  
 M  +0 -1      kst.h  
 M  +9 -9      kstdatamanager.cpp  
 M  +1 -1      kstdatamanager.h  
 M  +0 -9      ksteventmonitor4.ui  


--- branches/work/kst/portto4/kst/src/libkstapp/CMakeLists.txt #642581:642582
@@ -134,7 +134,7 @@
    kstimagedialog4.ui
    kstmatrixdialog4.ui
    kstmonochromedialog4.ui
-   kstplugindialog4.ui
+#    kstplugindialog4.ui
    kstpsddialog4.ui
    kstquickstartdialog4.ui
    kstsettingsdlg4.ui
@@ -156,7 +156,7 @@
 
 kde4_add_library(kstapp SHARED ${kstapp_LIB_SRCS})
 
-target_link_libraries(kstapp ${KDE4_KDECORE_LIBS} ${KDE4_KDEPRINT_LIBS} kstwidgets)
+target_link_libraries(kstapp ${KDE4_KDECORE_LIBS} ${KDE4_KDEPRINT_LIBS} kstmath kstwidgets)
 
 set_target_properties(kstapp PROPERTIES VERSION ${KST_LIBKST_VERSION} SOVERSION 1)
 install(TARGETS kstapp DESTINATION ${LIB_INSTALL_DIR} )
--- branches/work/kst/portto4/kst/src/libkstapp/dialoglauncher-gui.cpp #642581:642582
@@ -22,7 +22,7 @@
 #include "ksthsdialog.h"
 #include "kstimagedialog.h"
 #include "kstmatrixdialog.h"
-#include "kstplugindialog.h"
+// #include "kstplugindialog.h"
 #include "kstbasicdialog.h"
 #include "kstpsddialog.h"
 #include "kstvectordialog.h"
@@ -46,13 +46,13 @@
 }
 
 
-void KstGuiDialogs::showCPluginDialog(const QString& name, bool edit) {
-  if (!edit) {
-    KstPluginDialogI::globalInstance()->showNew(name);
-  } else {
-    KstPluginDialogI::globalInstance()->showEdit(name);
-  }
-}
+// void KstGuiDialogs::showCPluginDialog(const QString& name, bool edit) {
+//   if (!edit) {
+//     KstPluginDialogI::globalInstance()->showNew(name);
+//   } else {
+//     KstPluginDialogI::globalInstance()->showEdit(name);
+//   }
+// }
 
 
 void KstGuiDialogs::showBasicPluginDialog(const QString& name, bool edit) {
--- branches/work/kst/portto4/kst/src/libkstapp/dialoglauncher-gui.h #642581:642582
@@ -26,7 +26,7 @@
 
     void showHistogramDialog(const QString& name = QString::null, bool edit = false);
 
-    void showCPluginDialog(const QString& name = QString::null, bool edit = false);
+//     void showCPluginDialog(const QString& name = QString::null, bool edit = false);
 
     void showBasicPluginDialog(const QString& name = QString::null, bool edit = false);
 
--- branches/work/kst/portto4/kst/src/libkstapp/kst.cpp #642581:642582
@@ -75,13 +75,13 @@
 // #include "kstfilterdialog.h"
 #include "kstgraphfiledialog.h"
 #include "ksthsdialog.h"
-#include "kstiface_impl.h"
+// #include "kstiface_impl.h"
 #include "kstimagedialog.h"
 #include "kstlogwidget.h"
 #include "kstmatrixdialog.h"
 #include "kstmatrixdefaults.h"
 #include "kstmonochromedialog.h"
-#include "kstplugindialog.h"
+// #include "kstplugindialog.h"
 #include "kstprintoptionspage.h"
 #include "kstpsddialog.h"
 #include "kstquickstartdialog.h"
@@ -196,7 +196,6 @@
 
 
   setAutoSaveSettings("KST-KMainWindow", true);
-  _dcopIface = new KstIfaceImpl(doc, this);
 
   connect(this, SIGNAL(settingsChanged()), this, SLOT(slotSettingsChanged()));
 
@@ -243,8 +242,6 @@
   KstDataObject::cleanupForExit(); // must be before deletions
   delete _updateThread;
   _updateThread = 0L;
-  delete _dcopIface;
-  _dcopIface = 0L;
   ::inst = 0L;
   if (_dataSourceConfig) {
     _dataSourceConfig->sync();
@@ -1007,9 +1004,9 @@
   if (newPlugins.contains(p)) {
     KstDataObjectPtr ptr = KstDataObject::plugin(p);
     ptr->showDialog(true);
-  } else if (oldPlugins.contains(p)) {
+  }/* else if (oldPlugins.contains(p)) {
     KstPluginDialogI::globalInstance()->showNew(readable[p]);
-  }
+  }*/
 }
 
 
@@ -2083,10 +2080,10 @@
     if (!onlyVisible || KstVectorDialogI::globalInstance()->isVisible()) {
       KstVectorDialogI::globalInstance()->update();
     }
-    if (!onlyVisible || KstPluginDialogI::globalInstance()->isVisible()) {
-      KstPluginDialogI::globalInstance()->updateForm();
-    }
 //FIXME PORT!
+//     if (!onlyVisible || KstPluginDialogI::globalInstance()->isVisible()) {
+//       KstPluginDialogI::globalInstance()->updateForm();
+//     }
 //     if (!onlyVisible || KstFitDialogI::globalInstance()->isVisible()) {
 //       KstFitDialogI::globalInstance()->update();
 //     }
@@ -2176,7 +2173,7 @@
   pm->exec();
   delete pm;
 
-  KstPluginDialogI::globalInstance()->updatePluginList();
+//   KstPluginDialogI::globalInstance()->updatePluginList();
 }
 
 
--- branches/work/kst/portto4/kst/src/libkstapp/kst.h #642581:642582
@@ -594,7 +594,6 @@
     StatusLabel *_dataBar;
     QProgressBar *_progressBar;
     bool _stopping;
-    KstIfaceImpl *_dcopIface;
     UpdateThread *_updateThread;
     Kst2DPlotMap *_plotHolderWhileOpeningDocument;
     QTimer _memTimer;
--- branches/work/kst/portto4/kst/src/libkstapp/kstdatamanager.cpp #642581:642582
@@ -56,7 +56,7 @@
 #include "ksthsdialog.h"
 #include "kstimagedialog.h"
 #include "kstmatrixdialog.h"
-#include "kstplugindialog.h"
+// #include "kstplugindialog.h"
 #include "kstpsddialog.h"
 #include "kstvectordialog.h"
 #include "kstviewwindow.h"
@@ -799,16 +799,16 @@
 }
 
 
-void KstDataManagerI::showOldPlugin() {
+// void KstDataManagerI::showOldPlugin() {
+// 
+//   if (QAction *a = qobject_cast<QAction*>(sender())) {
+//     const QMap<QString,QString> readable =
+//       PluginCollection::self()->readableNameList();
+//     KstPluginDialogI::globalInstance()->showNew(readable[a->text()]);
+//   }
+// }
 
-  if (QAction *a = qobject_cast<QAction*>(sender())) {
-    const QMap<QString,QString> readable =
-      PluginCollection::self()->readableNameList();
-    KstPluginDialogI::globalInstance()->showNew(readable[a->text()]);
-  }
-}
 
-
 void KstDataManagerI::doubleClicked(Q3ListViewItem *i) {
   if (i && DataView->selectedItems().contains(i)) {
     edit_I();
--- branches/work/kst/portto4/kst/src/libkstapp/kstdatamanager.h #642581:642582
@@ -66,7 +66,7 @@
     void currentChanged(Q3ListViewItem *);
     void selectionChanged();
     void doubleClicked(Q3ListViewItem *);
-    void showOldPlugin();
+//     void showOldPlugin();
 
   private:
     void createObjectAction(const QString &txt, Q3ToolBar *bar,
--- branches/work/kst/portto4/kst/src/libkstapp/ksteventmonitor4.ui #642581:642582
@@ -416,9 +416,6 @@
                 <property name="text" >
                   <string>&amp;Warning</string>
                 </property>
-                <property name="buttonGroupId" >
-                  <number>1</number>
-                </property>
               </widget>
             </item>
             <item row="0" column="4" >
@@ -426,9 +423,6 @@
                 <property name="text" >
                   <string>&amp;Error</string>
                 </property>
-                <property name="buttonGroupId" >
-                  <number>2</number>
-                </property>
               </widget>
             </item>
             <item row="0" column="2" >
@@ -436,9 +430,6 @@
                 <property name="text" >
                   <string>&amp;Notice</string>
                 </property>
-                <property name="buttonGroupId" >
-                  <number>0</number>
-                </property>
               </widget>
             </item>
             <item row="0" column="0" >