comparison main/PreferencesDialog.cpp @ 702:c7945dad2f49

Make octave numbering configurable, and change default to C4 = middle C

     propertyLayout->setCurrentIndex(pl);
 
     connect(propertyLayout, SIGNAL(currentIndexChanged(int)),
             this, SLOT(propertyLayoutChanged(int)));
 
+    
+
     m_tuningFrequency = prefs->getTuningFrequency();
 
     QDoubleSpinBox *frequency = new QDoubleSpinBox;
     frequency->setMinimum(100.0);
     frequency->setMaximum(5000.0);

     frequency->setValue(m_tuningFrequency);
     frequency->setDecimals(2);
 
     connect(frequency, SIGNAL(valueChanged(double)),
             this, SLOT(tuningFrequencyChanged(double)));
+
+    QComboBox *octaveSystem = new QComboBox;
+    int oct = prefs->getPropertyRangeAndValue
+        ("Octave Numbering System", &min, &max, &deflt);
+    m_octaveSystem = oct;
+    for (i = min; i <= max; ++i) {
+        octaveSystem->addItem(prefs->getPropertyValueLabel
+                              ("Octave Numbering System", i));
+    }
+    octaveSystem->setCurrentIndex(oct);
+
+    connect(octaveSystem, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(octaveSystemChanged(int)));
 
     QComboBox *audioDevice = new QComboBox;
     std::vector<QString> devices =
         AudioTargetFactory::getInstance()->getCallbackTargetNames();
     

     subgrid->addWidget(new QLabel(tr("%1:").arg(prefs->getPropertyLabel
                                                 ("Tuning Frequency"))),
                        row, 0);
     subgrid->addWidget(frequency, row++, 1, 1, 2);
 
+    subgrid->addWidget(new QLabel(tr("%1:").arg(prefs->getPropertyLabel
+                                                ("Octave Numbering System"))),
+                       row, 0);
+    subgrid->addWidget(octaveSystem, row++, 1, 1, 2);
+
     subgrid->addWidget(new QLabel(prefs->getPropertyLabel
                                   ("Spectrogram Y Smoothing")),
                        row, 0);
     subgrid->addWidget(smoothing, row++, 1, 1, 2);
 

 
 void
 PreferencesDialog::timeToTextModeChanged(int mode)
 {
     m_timeToTextMode = mode;
+    m_applyButton->setEnabled(true);
+}
+
+void
+PreferencesDialog::octaveSystemChanged(int system)
+{
+    m_octaveSystem = system;
     m_applyButton->setEnabled(true);
 }
 
 void
 PreferencesDialog::viewFontSizeChanged(int sz)

     prefs->setTemporaryDirectoryRoot(m_tempDirRoot);
     prefs->setBackgroundMode(Preferences::BackgroundMode(m_backgroundMode));
     prefs->setTimeToTextMode(Preferences::TimeToTextMode(m_timeToTextMode));
     prefs->setViewFontSize(m_viewFontSize);
     
+    prefs->setProperty("Octave Numbering System", m_octaveSystem);
+
     std::vector<QString> devices =
         AudioTargetFactory::getInstance()->getCallbackTargetNames();
 
     QSettings settings;
     settings.beginGroup("Preferences");