[Kst] kdeextragear-2/kst/kst

[Andrew Walker]

CVS commit by arwalker: 

Previously if there were no windows in existence then the last page of the data wizard would have the Current Window option selected but disabled. This has now been fixed.


  M +10 -7     datawizard.ui.h   1.43


--- kdeextragear-2/kst/kst/datawizard.ui.h  #1.42:1.43
@@ -30,5 +30,5 @@ void DataWizard::init() {
   // set up the file dialog embedded in the wizard...
   //
-  fd = new KstFileDialog(default_source, QString::null, page(0), "this", false);
+  fd = new KstFileDialog(default_source, QString::null, NULL, "this", false);
   fd->reparent(page(0), point);
   
@@ -196,5 +196,5 @@ void DataWizard::showPage( QWidget *page
     }
   } else if (page == _pagePlot) {
-    updateWindowBox();
+
     if (!_filterList->currentText().isEmpty() && (!_filter || _filter->name() != _filterList->currentText())) {
       _filter = KST::filterSetList.find(_filterList->currentText());
@@ -227,4 +227,7 @@ void DataWizard::showPage( QWidget *page
     }
     _multiplePlots->setChecked(true);
+
+    updateWindowBox();
+    updatePlotBox();
   }
 
@@ -249,9 +253,8 @@ void DataWizard::updateWindowBox()
     _existingWindow->setEnabled(_windowName->count() > 0);
     _currentWindow->setEnabled(_windowName->count() > 0 && KstApp::inst()->activeWindow());
-    if (!_windowGroup->selected()->isEnabled()) {
+
+    if (!_windowGroup->selected() || !_windowGroup->selected()->isEnabled()) {
       _newWindow->setChecked(true);
     }
-
-    updatePlotBox();
 }
 
@@ -264,5 +267,5 @@ void DataWizard::updatePlotBox()
   _existingPlotName->clear();
 
-  if ((_newWindow->isChecked()) || (_newWindows->isChecked())) {
+  if (_newWindow->isChecked() || _newWindows->isChecked()) {
     _onePlot->setEnabled(true);
     _multiplePlots->setEnabled(true);