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

[Mike Fenton]

SVN commit 875214 by fenton:

Update Vector View Dialog to have vector selector and rename to ViewVectorDialog to accurately represent the feature set.


 M  +6 -8      libkstapp.pro  
 M  +2 -2      mainwindow.cpp  
 M  +1 -3      mainwindow.h  
 D             vectoreditordialog.cpp  
 D             vectoreditordialog.h  
 D             vectoreditordialog.ui  
 D             vectortablemodel.cpp  
 D             vectortablemodel.h  
 AM            viewvectordialog.cpp   vectoreditordialog.cpp#875150 [License: GPL (v2+)]
 AM            viewvectordialog.h   vectoreditordialog.h#875150 [License: GPL (v2+)]
 AM            viewvectordialog.ui   vectoreditordialog.ui#875150


--- branches/work/kst/portto4/kst/src/libkstapp/libkstapp.pro #875213:875214
@@ -106,16 +106,15 @@
     svgitem.cpp \
     tabwidget.cpp \
     vectordialog.cpp \
-    vectoreditordialog.cpp \
     vectormodel.cpp \
-    vectortablemodel.cpp \
     viewcommand.cpp \
     view.cpp \
     viewgridlayout.cpp \
     viewitem.cpp \
     viewitemdialog.cpp \
     viewmanager.cpp \
-    viewprimitivedialog.cpp
+    viewprimitivedialog.cpp \
+    viewvectordialog.cpp
 
 HEADERS += \
     application.h \
@@ -205,9 +204,7 @@
     stroketab.h \
     tabwidget.h \
     vectordialog.h \
-    vectoreditordialog.h \
     vectormodel.h \
-    vectortablemodel.h \
     viewcommand.h \
     view.h \
     viewgridlayout.h \
@@ -215,7 +212,8 @@
     viewitem.h \
     viewitemzorder.h \
     viewmanager.h \
-    viewprimitivedialog.h
+    viewprimitivedialog.h \
+    viewvectordialog.h
 
 FORMS += \
     aboutdialog.ui \
@@ -258,10 +256,10 @@
     scalartab.ui \
     stringtab.ui \
     stroketab.ui \
-    vectoreditordialog.ui \
     vectortab.ui \
     viewmanager.ui \
-    viewprimitivedialog.ui
+    viewprimitivedialog.ui \
+    viewvectordialog.ui
 
 RESOURCES += \
     $$TOPLEVELDIR/src/images/images.qrc
--- branches/work/kst/portto4/kst/src/libkstapp/mainwindow.cpp #875213:875214
@@ -31,7 +31,7 @@
 #include "svgitem.h"
 #include "tabwidget.h"
 #include "ui_aboutdialog.h"
-#include "vectoreditordialog.h"
+#include "viewvectordialog.h"
 #include "matrixeditordialog.h"
 #include "viewprimitivedialog.h"
 #include "view.h"
@@ -895,7 +895,7 @@
 
 
 void MainWindow::showVectorEditor() {
-  VectorEditorDialog vectorDialog(this, _doc);
+  ViewVectorDialog vectorDialog(this, _doc);
   vectorDialog.exec();
 }
 
--- branches/work/kst/portto4/kst/src/libkstapp/mainwindow.h #875213:875214
@@ -27,10 +27,8 @@
 class Document;
 class ExportGraphicsDialog;
 class MatrixEditorDialog;
-class ScalarEditorDialog;
-class StringEditorDialog;
 class TabWidget;
-class VectorEditorDialog;
+class ViewVectorDialog;
 class View;
 
 class MainWindow : public QMainWindow
** branches/work/kst/portto4/kst/src/libkstapp/viewvectordialog.cpp #property svn:mergeinfo
   + 
** branches/work/kst/portto4/kst/src/libkstapp/viewvectordialog.h #property svn:mergeinfo
   + 
** branches/work/kst/portto4/kst/src/libkstapp/viewvectordialog.ui #property svn:mergeinfo
   +