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

[Mike Fenton]

SVN commit 875224 by fenton:

Move MatrixEditorDialog to ViewMatrixDialog.


 M  +3 -3      libkstapp.pro  
 M  +2 -2      mainwindow.cpp  
 M  +2 -2      mainwindow.h  
 D             matrixeditordialog.cpp  
 D             matrixeditordialog.h  
 D             matrixeditordialog.ui  
 AM            viewmatrixdialog.cpp   matrixeditordialog.cpp#875212 [License: GPL (v2+)]
 AM            viewmatrixdialog.h   matrixeditordialog.h#875212 [License: GPL (v2+)]
 AM            viewmatrixdialog.ui   matrixeditordialog.ui#875212


--- branches/work/kst/portto4/kst/src/libkstapp/libkstapp.pro #875223:875224
@@ -84,7 +84,6 @@
     mainwindow.cpp \
     markerstab.cpp \
     matrixdialog.cpp \
-    matrixeditordialog.cpp \
     matrixmodel.cpp \
     memorywidget.cpp \
     pictureitem.cpp \
@@ -113,6 +112,7 @@
     viewitem.cpp \
     viewitemdialog.cpp \
     viewmanager.cpp \
+    viewmatrixdialog.cpp \
     viewprimitivedialog.cpp \
     viewvectordialog.cpp
 
@@ -182,7 +182,6 @@
     mainwindow.h \
     markerstab.h \
     matrixdialog.h \
-    matrixeditordialog.h \
     matrixmodel.h \
     memorywidget.h \
     pictureitem.h \
@@ -212,6 +211,7 @@
     viewitem.h \
     viewitemzorder.h \
     viewmanager.h \
+    viewmatrixdialog.h \
     viewprimitivedialog.h \
     viewvectordialog.h
 
@@ -250,7 +250,6 @@
     layouttab.ui \
     legendtab.ui \
     markerstab.ui \
-    matrixeditordialog.ui \
     matrixtab.ui \
     powerspectrumtab.ui \
     scalartab.ui \
@@ -258,6 +257,7 @@
     stroketab.ui \
     vectortab.ui \
     viewmanager.ui \
+    viewmatrixdialog.ui \
     viewprimitivedialog.ui \
     viewvectordialog.ui
 
--- branches/work/kst/portto4/kst/src/libkstapp/mainwindow.cpp #875223:875224
@@ -32,7 +32,7 @@
 #include "tabwidget.h"
 #include "ui_aboutdialog.h"
 #include "viewvectordialog.h"
-#include "matrixeditordialog.h"
+#include "viewmatrixdialog.h"
 #include "viewprimitivedialog.h"
 #include "view.h"
 #include "viewmanager.h"
@@ -912,7 +912,7 @@
 }
 
 void MainWindow::showMatrixEditor() {
-  MatrixEditorDialog matrixDialog(this, _doc);
+  ViewMatrixDialog matrixDialog(this, _doc);
   matrixDialog.exec();
 }
 
--- branches/work/kst/portto4/kst/src/libkstapp/mainwindow.h #875223:875224
@@ -26,10 +26,10 @@
 class DebugDialog;
 class Document;
 class ExportGraphicsDialog;
-class MatrixEditorDialog;
 class TabWidget;
+class View;
+class ViewMatrixDialog;
 class ViewVectorDialog;
-class View;
 
 class MainWindow : public QMainWindow
 {
** branches/work/kst/portto4/kst/src/libkstapp/viewmatrixdialog.cpp #property svn:mergeinfo
   + 
** branches/work/kst/portto4/kst/src/libkstapp/viewmatrixdialog.h #property svn:mergeinfo
   + 
** branches/work/kst/portto4/kst/src/libkstapp/viewmatrixdialog.ui #property svn:mergeinfo
   +