[Kst] extragear/graphics/kst/src/widgets

[Barth Netterfield]

SVN commit 631275 by netterfield:

More TTC Subway fixes...
The matrix selector now opens the matrix provider's dialog (eg, CSD) if
it has one...



 M  +1 -0      matrixselector.ui  
 M  +15 -1     matrixselector.ui.h  


--- trunk/extragear/graphics/kst/src/widgets/matrixselector.ui #631274:631275
@@ -96,6 +96,7 @@
     <include location="local" impldecl="in declaration">kstdatacollection.h</include>
     <include location="local" impldecl="in declaration">kstcombobox.h</include>
     <include location="local" impldecl="in declaration">kstmatrix.h</include>
+    <include location="local" impldecl="in implementation">kstdataobject.h</include>
     <include location="local" impldecl="in implementation">dialoglauncher.h</include>
     <include location="local" impldecl="in implementation">kiconloader.h</include>
     <include location="global" impldecl="in declaration">kst_export.h</include>
--- trunk/extragear/graphics/kst/src/widgets/matrixselector.ui.h #631274:631275
@@ -129,7 +129,21 @@
 
 void MatrixSelector::editMatrix()
 {
-    KstDialogs::self()->showMatrixDialog(_matrix->currentText(), true);
+    KST::matrixList.lock().readLock();
+    KstMatrixPtr mat = *KST::matrixList.findTag(_matrix->currentText());
+    KST::matrixList.lock().unlock();
+    KstDataObjectPtr pro = 0L;
+    if (mat) {
+      pro = kst_cast<KstDataObject>(mat->provider());
+    }
+    if (pro) {
+      pro->readLock();
+      pro->showDialog(false);
+      pro->unlock();
+    } else {
+      KstDialogs::self()->showMatrixDialog(_matrix->currentText(), true);
+    }
+
 }