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

[Adam Treat]

SVN commit 718026 by treat:

* Disable vector selector for now as it was giving designer fits.
* Rename kstwidgets and the curve*widgets.
* Add new curvetab which will be integral to the new curvedialog.



 A             libkstapp/curvetab.ui  
 A             widgets/curveappearance.cpp   widgets/curveappearancewidget.cpp#718011 [License: GPL (v2+)]
 A             widgets/curveappearance.h   widgets/curveappearancewidget.h#718011 [License: GPL (v2+)]
 A             widgets/curveappearance.ui   widgets/curveappearancewidget.ui#718011
 D             widgets/curveappearancewidget.cpp  
 D             widgets/curveappearancewidget.h  
 D             widgets/curveappearancewidget.ui  
 A             widgets/curveplacement.cpp   widgets/curveplacementwidget.cpp#718011 [License: GPL (v2+)]
 A             widgets/curveplacement.h   widgets/curveplacementwidget.h#718011 [License: GPL (v2+)]
 A             widgets/curveplacement.ui   widgets/curveplacementwidget.ui#718011
 D             widgets/curveplacementwidget.cpp  
 D             widgets/curveplacementwidget.h  
 D             widgets/curveplacementwidget.ui  
 D             widgets/kstwidgets.cpp  
 D             widgets/kstwidgets.h  
 M  +28 -28    widgets/vectorselector.cpp  
 M  +1 -1      widgets/vectorselector.h  
 A             widgets/widgets.cpp   widgets/kstwidgets.cpp#718011 [License: GPL (v2+)]
 A             widgets/widgets.h   widgets/kstwidgets.h#718011 [License: GPL (v2+)]
 M  +9 -9      widgets/widgets.pro  


--- branches/work/kst/portto4/kst/src/widgets/vectorselector.cpp #718025:718026
@@ -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;
+// 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);
+// }
 
-  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 #718025:718026
@@ -38,7 +38,7 @@
     void selectionChanged();
 
   private:
-    void fillVectors();
+//     void fillVectors();
 
   private:
     bool _allowEmptySelection;
--- branches/work/kst/portto4/kst/src/widgets/widgets.pro #718025:718026
@@ -20,24 +20,24 @@
     $$OUTPUT_DIR/src/widgets/tmp
 
 SOURCES += \
-    kstwidgets.cpp \
     colorbutton.cpp \
     combobox.cpp \
-    curveappearancewidget.cpp \
-    curveplacementwidget.cpp \
+    curveappearance.cpp \
+    curveplacement.cpp \
     datarange.cpp \
     filerequester.cpp \
     gradienteditor.cpp \
     matrixselector.cpp \
     scalarselector.cpp \
     stringselector.cpp \
-    vectorselector.cpp
+    vectorselector.cpp \
+    widgets.cpp
 
 HEADERS += \
     colorbutton.h \
     combobox.h \
-    curveappearancewidget.h \
-    curveplacementwidget.h \
+    curveappearance.h \
+    curveplacement.h \
     datarange.h \
     filerequester.h \
     gradienteditor.h \
@@ -45,12 +45,12 @@
     scalarselector.h \
     stringselector.h \
     vectorselector.h \
-    kstwidgets.h
+    widgets.h
 
 FORMS += \
     datarange.ui \
-    curveappearancewidget.ui \
-    curveplacementwidget.ui \
+    curveappearance.ui \
+    curveplacement.ui \
     matrixselector.ui \
     scalarselector.ui \
     stringselector.ui \