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

[Andrew Walker]

SVN commit 1104845 by arwalker:

continue kst1kde4

 A             kstbasicdialog.cpp   [License: GPL (v2+)]
 A             kstbasicdialog.h   [License: GPL (v2+)]
 D             kstbasicdialog_i.cpp  
 D             kstbasicdialog_i.h  
 M  +3 -2      ksthsdialog.h  
 M  +31 -33    kstmatrixdialog.h  
 D             kstmatrixdialog_i.cpp  
 D             kstmatrixdialog_i.h  
 A             kstplugindialog.cpp   [License: GPL (v2+)]
 A             kstplugindialog.h   [License: GPL (v2+)]
 D             kstplugindialog_i.cpp  
 D             kstplugindialog_i.h  
 A             kstpsddialog.cpp   [License: GPL (v2+)]
 A             kstpsddialog.h   [License: GPL (v2+)]
 D             kstpsddialog_i.cpp  
 D             kstpsddialog_i.h  
 A             kstvectordialog.cpp   [License: GPL (v2+)]
 A             kstvectordialog.h   [License: GPL (v2+)]
 D             kstvectordialog_i.cpp  
 D             kstvectordialog_i.h  
 M  +3 -3      kstvvdialog.h  


--- branches/work/kst/kst1kde4/kst/src/libkstapp/ksthsdialog.h #1104844:1104845
@@ -45,7 +45,9 @@
     void setVector(const QString& name);
 
   private:
-    static QPointer<KstHsDialogI> _inst;
+    static QPointer<KstHsDialog> _inst;
+    Ui::HistogramDialogWidget *_w;
+
     // the following are for the multiple edit mode
     bool _vectorDirty;
     bool _minDirty;
@@ -74,7 +76,6 @@
     void fillFieldsForEdit();
     void fillFieldsForNew();
     void cleanup();
-    Ui::HistogramDialogWidget *_w;
 };
 
 #endif
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstmatrixdialog.h #1104844:1104845
@@ -50,11 +50,28 @@
   signals:
     void matrixCreated(KstMatrixPtr v);
 
-  private:
-    QPointer<KCompletion> _fieldCompletion;
-    QPointer<KstDataSourceConfigWidget> _configWidget;
+  private slots:
+    void updateEnables();
+    void xStartCountFromEndClicked();
+    void xNumStepsReadToEndClicked();
+    void yStartCountFromEndClicked();
+    void yNumStepsReadToEndClicked();
+    void configureSource();
+    void enableSource();
+    void markSourceAndSave();
+    void testURL();
 
-    static QPointer<KstMatrixDialogI> _inst;
+    void setXStartCountFromEndDirty();
+    void setYStartCountFromEndDirty();
+    void setXNumStepsReadToEndDirty();
+    void setYNumStepsReadToEndDirty();
+    void setDoSkipDirty();
+    void setDoAveDirty();
+
+  protected:
+    KstObjectPtr findObject(const QString& name);
+
+  private:
     bool checkParameters(bool ok1, bool ok2, bool ok3, bool ok4, double xStep, double yStep);
 
     bool new_ISMatrix();
@@ -68,7 +85,17 @@
 
     void fillFieldsForRMatrixEdit();
     void fillFieldsForSMatrixEdit();
+    void fillFieldsForEdit();
+    void fillFieldsForNew();
+    void cleanup();
+    bool editSingleObject(KstMatrixPtr mxPtr);
 
+    QPointer<KCompletion> _fieldCompletion;
+    QPointer<KstDataSourceConfigWidget> _configWidget;
+
+    static QPointer<KstMatrixDialog> _inst;
+    Ui::MatrixDialogWidget *_w;
+
     bool _inTest; // testing URL for datasource
 
     bool _fileNameDirty : 1;
@@ -94,35 +121,6 @@
     bool _doSkipDirty : 1;
     bool _skipDirty : 1;
     bool _doAveDirty : 1;
-
-    bool editSingleObject(KstMatrixPtr mxPtr);
-
-  private slots:
-    void updateEnables();
-    void xStartCountFromEndClicked();
-    void xNumStepsReadToEndClicked();
-    void yStartCountFromEndClicked();
-    void yNumStepsReadToEndClicked();
-    void configureSource();
-    void enableSource();
-    void markSourceAndSave();
-    void testURL();
-
-    void setXStartCountFromEndDirty();
-    void setYStartCountFromEndDirty();
-    void setXNumStepsReadToEndDirty();
-    void setYNumStepsReadToEndDirty();
-    void setDoSkipDirty();
-    void setDoAveDirty();
-
-  protected:
-    KstObjectPtr findObject(const QString& name);
-
-  private:
-    void fillFieldsForEdit();
-    void fillFieldsForNew();
-    void cleanup();
-    Ui::MatrixDialogWidget *_w;
 };
 
 #endif
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstvvdialog.h #1104844:1104845
@@ -21,12 +21,12 @@
 #include "kstdatadialog.h"
 #include "kstvectorview.h"
 #include "kst_export.h"
-#include "ui_vectordialogwidget.h"
+#include "ui_vectorviewdialogwidget.h"
 
 class KST_EXPORT KstVvDialog : public KstDataDialog {
   Q_OBJECT
   public:
-    KstVvDialogI(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WFlags fl = 0 );
+    KstVvDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WFlags fl = 0 );
     virtual ~KstVvDialog();
     static KstVvDialog *globalInstance();
 
@@ -46,6 +46,7 @@
 
   private:
     static QPointer<KstVvDialog> _inst;
+    Ui::VectorViewDialogWidget *_w;
 
     // the following are for the multiple edit mode
     bool _xVectorDirty;
@@ -80,7 +81,6 @@
     void fillFieldsForEdit();
     void fillFieldsForNew();
     void cleanup();
-    Ui::VectorViewDialogWidget *_w;
 };
 
 #endif