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

[Mike Fenton]

SVN commit 726002 by fenton:

Initial stub version of matrix dialog.


 M  +4 -4      datamanager.cpp  
 M  +3 -1      dialoglaunchergui.cpp  
 M  +3 -0      libkstapp.pro  
 A             matrixdialog.cpp   [License: GPL (v2+)]
 A             matrixdialog.h   [License: GPL (v2+)]
 A             matrixtab.ui  


--- branches/work/kst/portto4/kst/src/libkstapp/datamanager.cpp #726001:726002
@@ -59,10 +59,10 @@
   connect(action, SIGNAL(triggered()), DialogLauncher::self(), SLOT(showVectorDialog()));
   _primitives->addAction(action);
 
-//   action = new DataButtonAction(tr("Matrix"));
-//   connect(action, SIGNAL(triggered()), this, SLOT(showMatrixDialog()));
-//   _primitives->addAction(action);
-// 
+   action = new DataButtonAction(tr("Matrix"));
+   connect(action, SIGNAL(triggered()), DialogLauncher::self(), SLOT(showMatrixDialog()));
+   _primitives->addAction(action);
+ 
    action = new DataButtonAction(tr("Scalar"));
    connect(action, SIGNAL(triggered()), DialogLauncher::self(), SLOT(showScalarDialog()));
    _primitives->addAction(action);
--- branches/work/kst/portto4/kst/src/libkstapp/dialoglaunchergui.cpp #726001:726002
@@ -16,6 +16,7 @@
 #include "equationdialog.h"
 #include "vectordialog.h"
 #include "scalardialog.h"
+#include "matrixdialog.h"
 
 namespace Kst {
 
@@ -34,7 +35,8 @@
 
 
 void DialogLauncherGui::showMatrixDialog(ObjectPtr objectPtr) {
-  Q_UNUSED(objectPtr);
+  MatrixDialog dialog(objectPtr, kstApp->mainWindow());
+  dialog.exec();
 }
 
 
--- branches/work/kst/portto4/kst/src/libkstapp/libkstapp.pro #726001:726002
@@ -58,6 +58,7 @@
     lineitem.cpp \
     mainwindow.cpp \
     matrixmodel.cpp \
+    matrixdialog.cpp \
     memorywidget.cpp \
     pictureitem.cpp \
     plotaxisitem.cpp \
@@ -122,6 +123,7 @@
     layouttab.h \
     lineitem.h \
     mainwindow.h \
+    matrixdialog.h \
     matrixmodel.h \
     memorywidget.h \
     pictureitem.h \
@@ -162,6 +164,7 @@
     generaltab.ui \
     gridtab.ui \
     layouttab.ui \
+    matrixtab.ui \
     scalartab.ui \
     stroketab.ui \
     vectoreditordialog.ui \