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

[Mike Fenton]

SVN commit 886668 by fenton:

Fix ASCII plugin not loading / reading values correctly.


 M  +2 -1      datasources/ascii/ascii.cpp  
 M  +1 -1      libkstapp/dialogtab.cpp  
 M  +1 -0      libkstapp/vectordialog.cpp  


--- branches/work/kst/portto4/kst/src/datasources/ascii/ascii.cpp #886667:886668
@@ -863,6 +863,7 @@
       // Update the instance from our new settings
       if (src && src->reusable()) {
         src->_config->read(_cfg, src->fileName());
+        src->reset();
       }
     }
 
@@ -1072,10 +1073,10 @@
 
 
 Kst::DataSourceConfigWidget *AsciiPlugin::configWidget(QSettings *cfg, const QString& filename) const {
-
   Q_UNUSED(filename)
   ConfigWidgetAscii *config = new ConfigWidgetAscii;
   config->setConfig(cfg);
+  config->load();
   return config;
 
 }
--- branches/work/kst/portto4/kst/src/libkstapp/dialogtab.cpp #886667:886668
@@ -34,7 +34,7 @@
 
 
 DialogPage *DialogTab::dialogPage() const {
-  return qobject_cast<DialogPage*>(parentWidget()->parentWidget());
+  return qobject_cast<DialogPage*>(parentWidget());
 }
 
 }
--- branches/work/kst/portto4/kst/src/libkstapp/vectordialog.cpp #886667:886668
@@ -243,6 +243,7 @@
 void VectorTab::showConfigWidget() {
   DataSourceDialog dialog(dataDialog()->editMode(), _dataSource, this);
   dialog.exec();
+  fileNameChanged(file());
 }