Fix initial enabling of widgets in vector dialog.

Kst-plot · Jan 5, 2014 · f43f356 · f43f356
1 parent 099413d
commit f43f356
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/libkstapp/vectordialog.cpp b/src/libkstapp/vectordialog.cpp
@@ -32,7 +32,7 @@
 namespace Kst {
 
 VectorTab::VectorTab(ObjectStore *store, QWidget *parent)
-  : DataTab(parent), validating(false), _mode(DataVector), _store(store), _initField(QString()), _requestID(0) {
+  : DataTab(parent), validating(false), _mode(DataVector), _store(store), _initField(QString()), _requestID(0), _valid(false) {
 
   setupUi(this);
   setTabTitle(tr("Vector"));
@@ -76,7 +76,7 @@ VectorTab::~VectorTab() {
 void VectorTab::updateUpdateBox()
 {
   if (_dataSource) {
-    _updateBox->setEnabled(true);
+    _updateBox->setEnabled(_mode == DataVector);
     switch (_dataSource->updateType()) {
       case DataSource::Timer: _updateBox->setCurrentIndex(0); break;
       case DataSource::File:  _updateBox->setCurrentIndex(1); break;
@@ -119,6 +119,9 @@ void VectorTab::setVectorMode(VectorMode mode) {
     _dataVectorGroup->setChecked(true);
     _dataRange->setEnabled(true);
     _generatedVectorGroup->setChecked(false);
+    _field->setEnabled(_valid);
+    _configure->setEnabled(_valid);
+    updateUpdateBox();
   } else {
     _generatedVectorGroup->setChecked(true);
     _dataVectorGroup->setChecked(false);
@@ -261,6 +264,7 @@ void VectorTab::sourceValid(QString filename, int requestID) {
   if (_requestID != requestID) {
     return;
   }
+  _valid = true;
   _dataSource = DataSourcePluginManager::findOrLoadSource(_store, filename);
   _field->setEnabled(true);
 
@@ -271,7 +275,7 @@ void VectorTab::sourceValid(QString filename, int requestID) {
     setField(_initField);
   }
   _field->setEditable(!_dataSource->vector().isListComplete());
-  _configure->setEnabled(_dataSource->hasConfigWidget());
+  _configure->setEnabled(_dataSource->hasConfigWidget() && (_mode == DataVector));
 
   updateUpdateBox();
   updateIndexList(_dataSource);
@@ -282,6 +286,7 @@ void VectorTab::sourceValid(QString filename, int requestID) {
   validating = false;
 
   _store->cleanUpDataSourceList();
+  _field->setEnabled(_mode == DataVector);
 
   emit sourceChanged();
 }
@@ -291,6 +296,8 @@ void VectorTab::fileNameChanged(const QString &file) {
   _field->clear();
   _field->setEnabled(false);
   _configure->setEnabled(false);
+  _valid = false;
+
   clearIndexList();
   emit sourceChanged();
 

diff --git a/src/libkstapp/vectordialog.h b/src/libkstapp/vectordialog.h
@@ -97,6 +97,7 @@ class VectorTab : public DataTab, Ui::VectorTab {
     QString _initField;
     int _requestID;
     void updateUpdateBox();
+    bool _valid;
 };
 
 class VectorDialog : public DataDialog {

diff --git a/src/libkstapp/vectortab.ui b/src/libkstapp/vectortab.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>743</width>
-    <height>550</height>
+    <width>741</width>
+    <height>548</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -191,11 +191,7 @@
        </widget>
       </item>
       <item>
-       <widget class="Kst::ComboBox" name="_field">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-       </widget>
+       <widget class="Kst::ComboBox" name="_field"/>
       </item>
       <item>
        <layout class="QHBoxLayout">