comparison main/PreferencesDialog.h @ 2467:a0d0657aabfc

Merge from branch background-mode

 class QPushButton;
 class QLineEdit;
 class QTabWidget;
 class QComboBox;
 class PluginPathConfigurator;
+class ColourComboBox;
 
 class PreferencesDialog : public QDialog
 {
     Q_OBJECT
 

     QTabWidget *m_tabs;
     QMap<Tab, int> m_tabOrdering;
 
     QLineEdit *m_tempDirRootEdit;
 
+    ColourComboBox *m_overviewColourCombo;
     QComboBox *m_audioPlaybackDeviceCombo;
     QComboBox *m_audioRecordDeviceCombo;
     void rebuildDeviceCombos();
 
     PluginPathConfigurator *m_pluginPathConfigurator;

     int m_spectrogramSmoothing;
     int m_spectrogramXSmoothing;
     int m_spectrogramGColour;
     int m_spectrogramMColour;
     int m_colour3DColour;
+    bool m_overviewColourIsSet;
     QColor m_overviewColour;
     int m_propertyLayout;
     double m_tuningFrequency;
     int m_audioImplementation;
     int m_audioPlaybackDevice;