[Kst] branches/work/kst/kst1kde4/kst/src/widgets

[Andrew Walker]

SVN commit 1102196 by arwalker:

continue kst1kde4

 M  +13 -6     scalarselector.cpp  
 M  +0 -6      vectorlistview.cpp  


--- branches/work/kst/kst1kde4/kst/src/widgets/scalarselector.cpp #1102195:1102196
@@ -10,7 +10,9 @@
  ***************************************************************************/
  
 #include <QMessageBox>
+#include <QTimer>
 
+#include "enodes.h"
 #include "scalareditor.h"
 #include "scalarselector.h"
 #include "dialoglauncher.h"
@@ -80,15 +82,20 @@
   // if directentry is allowed, and if prev is a number, 
   //  then we can put it back into the combobox...
   //
-/* xxx
+
   if (found || ok) {
-    _scalar->setCurrentText(prev);
+    int index;
+
+    index = _scalar->findText(prev);
+    if (index != -1) {
+      _scalar->setCurrentIndex(index);
+    }
   } else {
     _scalar->insertItem(0, "0");
-    _scalar->setCurrentText("0");
+    _scalar->setCurrentIndex(0);
     _editScalar->setEnabled(false);
   }
-*/
+
   blockSignals(false);
 }
 
@@ -103,7 +110,7 @@
     double val = se->_value->text().toFloat(&ok);
 
     if (!ok) {
-// xxx      val = Equation::interpret(se->_value->text().toLatin1(), &ok);
+      val = Equation::interpret(se->_value->text().toLatin1(), &ok);
     }
 
     if (ok) {
@@ -170,7 +177,7 @@
     double val = se->_value->text().toFloat(&ok);
 
     if (!ok) {
-// xxx      val = Equation::interpret(se->_value->text().toLatin1(), &ok);
+      val = Equation::interpret(se->_value->text().toLatin1(), &ok);
     }
 
     if (ok) {
--- branches/work/kst/kst1kde4/kst/src/widgets/vectorlistview.cpp #1102195:1102196
@@ -24,11 +24,9 @@
   setSelectionMode(QAbstractItemView::ExtendedSelection);
 }
 
-
 VectorListView::~VectorListView() {
 }
 
-
 QMimeData *VectorListView::dragObject() {
 /*
   QStoredDrag *drag = new QStoredDrag("application/x-kst-vector-list", this);
@@ -50,12 +48,10 @@
   return 0L;
 }
 
-
 void VectorListView::dragMoveEvent(QDragMoveEvent *e) {
 // xxx  e->accept(e->provides("application/x-kst-vector-list") && e->source() != this);
 }
 
-
 void VectorListView::dropEvent(QDropEvent *e) {
 /* xxx
   if (!e->provides("application/x-kst-vector-list") || e->source() == this) {
@@ -81,7 +77,6 @@
 */
 }
 
-
 void VectorListView::startDrag() {
 /* xxx
   QDragObject *o = dragObject();
@@ -99,5 +94,4 @@
 */
 }
 
-// xxx #include "vectorlistview.moc"