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

[Zongyi Zhang]

SVN commit 1116540 by zhang:

continue kst1kde4

 M  +1 -1      kstmatrixdialog.cpp  
 M  +6 -6      kstvectordialog.cpp  


--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstmatrixdialog.cpp #1116539:1116540
@@ -252,7 +252,7 @@
 
     _w->_field->setEnabled(_w->_field->count() > 0);
     _ok->setEnabled(_w->_field->isEnabled());
-// xxx    _w->_field->setCurrentText(rmp->field());
+    _w->_field->setItemText(_w->_field->currentIndex(), rmp->field());
   
     //
     // fill in the other parameters...
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstvectordialog.cpp #1116539:1116540
@@ -164,7 +164,7 @@
 
     if (dlg->result() == QDialog::Accepted) {
       if (!dlg->selection().isEmpty()) {
-// xxx        _w->Field->setCurrentText(dlg->selection());
+        _w->Field->setItemText(_w->Field->currentIndex(), dlg->selection());
       }
     }
 
@@ -255,11 +255,11 @@
     _fieldCompletion->clear();
     _fieldCompletion->insertItems(list);
   }
+*/
+  if (!currentText.isEmpty() && (list.contains(currentText) || _w->Field->isEditable())) {
+    _w->Field->setItemText(_w->Field->currentIndex(), currentText);
+  }
 
-  if (!currentText.isEmpty() && (list.contains(currentText) || _w->Field->editable())) {
-    _w->Field->setCurrentText(currentText);
-  }
-*/
   _ok->setEnabled(_w->Field->isEnabled() || _editMultipleMode);
 }
 
@@ -316,7 +316,7 @@
 
   _w->Field->setEnabled(_w->Field->count() > 0);
   _ok->setEnabled(_w->Field->isEnabled());
-// xxx  _w->Field->setCurrentText(rvp->field());
+  _w->Field->setItemText(_w->Field->currentIndex(), rvp->field());
 
   // select the proper file
 // xxx  _w->FileName->setURL(rvp->filename());