comparison main/PreferencesDialog.cpp @ 114:a46d68ae3c3e sv1-1.0pre1

* Make getPropertyRangeAndValue return the default separately from the current
  value.  Previously some contexts were incorrectly treating the current value
  as a default.

 
     // Create this first, as slots that get called from the ctor will
     // refer to it
     m_applyButton = new QPushButton(tr("Apply"));
 
-    int min, max, i;
+    int min, max, deflt, i;
 
     m_windowType = WindowType(prefs->getPropertyRangeAndValue
-                              ("Window Type", &min, &max));
+                              ("Window Type", &min, &max, &deflt));
     m_windowTypeSelector = new WindowTypeSelector(m_windowType);
 
     connect(m_windowTypeSelector, SIGNAL(windowTypeChanged(WindowType)),
             this, SLOT(windowTypeChanged(WindowType)));
 

 
     connect(smoothing, SIGNAL(stateChanged(int)),
             this, SLOT(smoothSpectrogramChanged(int)));
 
     QComboBox *propertyLayout = new QComboBox;
-    int pl = prefs->getPropertyRangeAndValue("Property Box Layout", &min, &max);
+    int pl = prefs->getPropertyRangeAndValue("Property Box Layout", &min, &max,
+                                             &deflt);
     m_propertyLayout = pl;
 
     for (i = min; i <= max; ++i) {
         propertyLayout->addItem(prefs->getPropertyValueLabel("Property Box Layout", i));
     }

     connect(frequency, SIGNAL(valueChanged(double)),
             this, SLOT(tuningFrequencyChanged(double)));
 
     QComboBox *resampleQuality = new QComboBox;
 
-    int rsq = prefs->getPropertyRangeAndValue("Resample Quality", &min, &max);
+    int rsq = prefs->getPropertyRangeAndValue("Resample Quality", &min, &max,
+                                              &deflt);
     m_resampleQuality = rsq;
 
     for (i = min; i <= max; ++i) {
         resampleQuality->addItem(prefs->getPropertyValueLabel("Resample Quality", i));
     }