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

[Andrew Walker]

SVN commit 514587 by arwalker:

BUG:120743 Ensure that two edit fields do not simultaneosuly show blinking cursors.

 M  +8 -7      kstchangefiledialog_i.cpp  
 M  +1 -0      kstchangefiledialog_i.h  


--- trunk/extragear/graphics/kst/src/libkstapp/kstchangefiledialog_i.cpp #514586:514587
@@ -43,8 +43,6 @@
                                            bool modal,
                                            WFlags fl)
 : KstChangeFileDialog(parent, name, modal, fl) {
-  _dataFile->completionObject()->setDir(QDir::currentDirPath());
-  _clearFilter->setPixmap(BarIcon("locationbar_erase"));
   connect(_clearFilter, SIGNAL(clicked()), _filter, SLOT(clear()));
   connect(_clearFilter, SIGNAL(clicked()), ChangeFileCurveList, SLOT(clearSelection()));
   connect(_filter, SIGNAL(textChanged(const QString&)), this, SLOT(updateSelection(const QString&)));
@@ -56,7 +54,10 @@
   connect(_allFromFile, SIGNAL(clicked()), _filter, SLOT(clear()));
   connect(_allFromFile, SIGNAL(clicked()), this, SLOT(allFromFile()));
   connect(_duplicateSelected, SIGNAL(toggled(bool)), _duplicateDependents, SLOT(setEnabled(bool)));
+  
+  _clearFilter->setPixmap(BarIcon("locationbar_erase"));
   _duplicateDependents->setEnabled(_duplicateSelected->isChecked());
+  _first = true;
 }
 
 
@@ -92,10 +93,6 @@
     ChangeFileCurveList->insertItem(rml[i]->tagName());
     filesUsed.insert(rml[i]->filename(), rml[i]->filename()); 
     rml[i]->readUnlock();  
-  } 
-
-  if (!isShown()) {
-    _dataFile->setURL(KST::vectorDefaults.dataSource());
   }
 
   QString currentFile = _files->currentText();
@@ -112,6 +109,11 @@
 
   _allFromFile->setEnabled(_files->count() > 0);
   _files->setEnabled(_files->count() > 0);
+
+  if (_first) {
+    _dataFile->setURL(KST::vectorDefaults.dataSource());
+    _first = false;
+  }
 }
 
 
@@ -119,7 +121,6 @@
   updateChangeFileDialog();
   show();
   raise();
-  _filter->setFocus();
 }
 
 
--- trunk/extragear/graphics/kst/src/libkstapp/kstchangefiledialog_i.h #514586:514587
@@ -42,6 +42,7 @@
     
   private:
     int _lastVectorIndex;
+    bool _first;
 
   private slots:
     void applyFileChange();