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

[Adam Treat]

SVN commit 718428 by treat:

* Make sure rpath is correct for all resources.
* Enable the vector selector.
* Make libkstwidgets link correctly.
* Fix resource issues and cleanup the rest of the .pro files.


 M  +2 -0      kst.pri  
 M  +0 -3      src/kst/kst.pro  
 M  +2 -0      src/libkstapp/libkstapp.pro  
 M  +28 -28    src/widgets/vectorselector.cpp  
 M  +1 -1      src/widgets/vectorselector.h  
 M  +2 -0      src/widgets/widgets.pro  
 M  +1 -3      tests/tests.pro  


--- branches/work/kst/portto4/kst/kst.pri #718427:718428
@@ -9,3 +9,5 @@
 INCLUDEPATH += $$TOPLEVELDIR
 
 LIBS += -L$$OUTPUT_DIR/lib -L$$OUTPUT_DIR/plugin
+
+QMAKE_RPATHDIR += $$OUTPUT_DIR/lib $$OUTPUT_DIR/plugin
--- branches/work/kst/portto4/kst/src/kst/kst.pro #718427:718428
@@ -19,8 +19,5 @@
 SOURCES += \
     main.cpp
 
-QMAKE_RPATHDIR += $$OUTPUT_DIR/lib $$OUTPUT_DIR/plugin
-
 RESOURCES += \
     $$TOPLEVELDIR/src/images/images.qrc
-
--- branches/work/kst/portto4/kst/src/libkstapp/libkstapp.pro #718427:718428
@@ -148,3 +148,5 @@
     vectortab.ui \
     viewmanager.ui
 
+RESOURCES += \
+    $$TOPLEVELDIR/src/images/images.qrc
--- branches/work/kst/portto4/kst/src/widgets/vectorselector.cpp #718427:718428
@@ -28,7 +28,7 @@
   _newVector->setFixedSize(size + 8, size + 8);
   _editVector->setFixedSize(size + 8, size + 8);
 
-//   fillVectors();
+  fillVectors();
 }
 
 
@@ -46,34 +46,34 @@
 }
 
 
-// void VectorSelector::fillVectors() {
-//   QStringList vectors;
-// 
-//   KST::vectorList.lock().readLock();
-// 
-//   KstVectorList::ConstIterator it = KST::vectorList.begin();
-//   for (; it != KST::vectorList.end(); ++it) {
-//     KstVectorPtr vector = (*it);
-//     if (vector->isScalarList())
-//       continue;
-// 
-//     vector->readLock();
-//     vectors << vector->tag().displayString();
-//     vector->unlock();
-//   }
-// 
-//   KST::vectorList.lock().unlock();
-// 
-//   qSort(vectors);
-// 
-//   if (allowEmptySelection()) {
-//     vectors.prepend(tr("<None>"));
-//   }
-// 
-//   _vector->clear();
-//   _vector->addItems(vectors);
-// }
+void VectorSelector::fillVectors() {
+  QStringList vectors;
 
+  KST::vectorList.lock().readLock();
+
+  KstVectorList::ConstIterator it = KST::vectorList.begin();
+  for (; it != KST::vectorList.end(); ++it) {
+    KstVectorPtr vector = (*it);
+    if (vector->isScalarList())
+      continue;
+
+    vector->readLock();
+    vectors << vector->tag().displayString();
+    vector->unlock();
+  }
+
+  KST::vectorList.lock().unlock();
+
+  qSort(vectors);
+
+  if (allowEmptySelection()) {
+    vectors.prepend(tr("<None>"));
+  }
+
+  _vector->clear();
+  _vector->addItems(vectors);
 }
 
+}
+
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/widgets/vectorselector.h #718427:718428
@@ -38,7 +38,7 @@
     void selectionChanged();
 
   private:
-//     void fillVectors();
+    void fillVectors();
 
   private:
     bool _allowEmptySelection;
--- branches/work/kst/portto4/kst/src/widgets/widgets.pro #718427:718428
@@ -19,6 +19,8 @@
     $$TOPLEVELDIR/src/libkstmath \
     $$OUTPUT_DIR/src/widgets/tmp
 
+LIBS += -lkst -lkstmath
+
 SOURCES += \
     colorbutton.cpp \
     combobox.cpp \
--- branches/work/kst/portto4/kst/tests/tests.pro #718427:718428
@@ -43,6 +43,4 @@
     testscalar.h \
     testmatrix.h \
     testpsd.h \
-    testvector.h 
-
-QMAKE_RPATHDIR += $$OUTPUT_DIR/lib $$OUTPUT_DIR/plugin
+    testvector.h