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

[Andrew Walker]

SVN commit 747795 by arwalker:

continue move away from .ui.h

 M  +1 -1      Makefile.am  
 M  +2 -2      kst.cpp  
 M  +2 -2      kst.h  
 A             kstvectorsavedialog_i.cpp   [License: GPL (v2+)]
 A             kstvectorsavedialog_i.h   [License: GPL (v2+)]
 M  +0 -32     vectorsavedialog.ui  


--- branches/work/kst/1.6/kst/src/libkstapp/Makefile.am #747794:747795
@@ -95,6 +95,7 @@
 	kstviewvectorsdialog_i.cpp \
 	kstviewmatricesdialog_i.cpp \
 	kstviewfitsdialog_i.cpp \
+	kstvectorsavedialog_i.cpp \
 	kstchoosecolordialog_i.cpp \
 	kstchangenptsdialog_i.cpp \
 	kstchangefiledialog_i.cpp \
@@ -160,7 +161,6 @@
 kstviewlegend.lo: editviewobjectdialog.h
 matrixselector.lo: matrixselector.ui.h
 pluginmanager.lo: pluginmanager.ui.h pluginmanager.ui
-vectorsavedialog.lo: vectorsavedialog.ui.h vectorsavedialog.ui
 
 METASOURCES=AUTO
 
--- branches/work/kst/1.6/kst/src/libkstapp/kst.cpp #747794:747795
@@ -83,6 +83,7 @@
 #include "kstsettingsdlg_i.h"
 #include "kstuinames.h"
 #include "kstvectordefaults.h"
+#include "kstvectorsavedialog_i.h"
 #include "kstvectordialog_i.h"
 #include "kstviewmanager_i.h"
 #include "kstviewscalarsdialog_i.h"
@@ -99,7 +100,6 @@
 #include "statuslabel.h"
 #include "sysinfo.h"
 #include "updatethread.h"
-#include "vectorsavedialog.h"
 #include "kstobjectdefaults.h"
 
 #define MODE_BUTTON_ID       5
@@ -162,7 +162,7 @@
   differentiateCurvesDialog = new KstCurveDifferentiateI(this);
   changeNptsDialog = new KstChangeNptsDialogI(this);
   graphFileDialog = new KstGraphFileDialogI(this);
-  vectorSaveDialog = new VectorSaveDialog(this);
+  vectorSaveDialog = new KstVectorSaveDialogI(this);
   _monochromeDialog = new KstMonochromeDialogI(this);
 #ifdef KST_QUICKSTART_DLG
   _quickStartDialog = new KstQuickStartDialogI(this, 0 , true);
--- branches/work/kst/1.6/kst/src/libkstapp/kst.h #747794:747795
@@ -57,6 +57,7 @@
 class KstMonochromeDialogI;
 class KstPlotDialogI;
 class KstQuickStartDialogI;
+class KstVectorSaveDialogI;
 class KstViewFitsDialogI;
 class KstViewManagerI;
 class KstViewMatricesDialogI;
@@ -66,7 +67,6 @@
 class KstViewWindow;
 class StatusLabel;
 class UpdateThread;
-class VectorSaveDialog;
 
 class QLabel;
 class QProgressBar;
@@ -433,7 +433,7 @@
     KstGraphFileDialogI *graphFileDialog;
 
     /* Dialog for exporting to a text file */
-    VectorSaveDialog *vectorSaveDialog;
+    KstVectorSaveDialogI *vectorSaveDialog;
 
     /* Dialog for looking at data */
     KstDataManagerI *dataManager;
--- branches/work/kst/1.6/kst/src/libkstapp/vectorsavedialog.ui #747794:747795
@@ -113,32 +113,6 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<connections>
-    <connection>
-        <sender>pushButton2</sender>
-        <signal>clicked()</signal>
-        <receiver>VectorSaveDialog</receiver>
-        <slot>hide()</slot>
-    </connection>
-    <connection>
-        <sender>_saveButton</sender>
-        <signal>clicked()</signal>
-        <receiver>VectorSaveDialog</receiver>
-        <slot>save()</slot>
-    </connection>
-    <connection>
-        <sender>_vectorList</sender>
-        <signal>selectionChanged()</signal>
-        <receiver>VectorSaveDialog</receiver>
-        <slot>selectionChanged()</slot>
-    </connection>
-    <connection>
-        <sender>_vectorList</sender>
-        <signal>doubleClicked(QListBoxItem*)</signal>
-        <receiver>VectorSaveDialog</receiver>
-        <slot>save()</slot>
-    </connection>
-</connections>
 <tabstops>
     <tabstop>_vectorList</tabstop>
     <tabstop>_multiOptions</tabstop>
@@ -157,12 +131,6 @@
     <include location="local" impldecl="in implementation">kstdatacollection.h</include>
     <include location="local" impldecl="in implementation">vectorsavedialog.ui.h</include>
 </includes>
-<slots>
-    <slot access="private">save()</slot>
-    <slot>show()</slot>
-    <slot>init()</slot>
-    <slot access="private">selectionChanged()</slot>
-</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>