comparison base/Preferences.cpp @ 383:94fc0591ea43 1.2-stable

* merge from trunk (1.2 ended up being tracked from trunk, but we may want
  this branch for fixes later)

 
 #include <QDir>
 #include <QFileInfo>
 #include <QMutex>
 #include <QSettings>
+#include <QApplication>
+#include <QFont>
 
 Preferences *
 Preferences::m_instance = 0;
 
 Preferences *

     m_propertyBoxLayout(VerticallyStacked),
     m_windowType(HanningWindow),
     m_resampleQuality(1),
     m_omitRecentTemps(true),
     m_tempDirRoot(""),
-    m_resampleOnLoad(false)
+    m_resampleOnLoad(false),
+    m_viewFontSize(10),
+    m_backgroundMode(BackgroundFromTheme),
+    m_showSplash(true)
 {
     QSettings settings;
     settings.beginGroup("Preferences");
     m_spectrogramSmoothing = SpectrogramSmoothing
         (settings.value("spectrogram-smoothing", int(m_spectrogramSmoothing)).toInt());

         (settings.value("window-type", int(HanningWindow)).toInt());
     m_resampleQuality = settings.value("resample-quality", 1).toInt();
     m_resampleOnLoad = settings.value("resample-on-load", false).toBool();
     m_backgroundMode = BackgroundMode
         (settings.value("background-mode", int(BackgroundFromTheme)).toInt());
+    m_viewFontSize = settings.value
+        ("view-font-size", int(QApplication::font().pointSize() * 0.9))
+        .toInt();
+    m_showSplash = settings.value("show-splash", true).toBool();
     settings.endGroup();
 
     settings.beginGroup("TempDirectory");
     m_tempDirRoot = settings.value("create-in", "$HOME").toString();
     settings.endGroup();

     props.push_back("Resample Quality");
     props.push_back("Omit Temporaries from Recent Files");
     props.push_back("Resample On Load");
     props.push_back("Temporary Directory Root");
     props.push_back("Background Mode");
+    props.push_back("View Font Size");
+    props.push_back("Show Splash Screen");
     return props;
 }
 
 QString
 Preferences::getPropertyLabel(const PropertyName &name) const
 {
     if (name == "Spectrogram Smoothing") {
-        return tr("Spectrogram y-axis smoothing:");
+        return tr("Spectrogram y-axis interpolation:");
     }
     if (name == "Tuning Frequency") {
         return tr("Frequency of concert A");
     }
     if (name == "Property Box Layout") {

     if (name == "Temporary Directory Root") {
         return tr("Location for cache file directory");
     }
     if (name == "Background Mode") {
         return tr("Background colour preference");
+    }
+    if (name == "View Font Size") {
+        return tr("Font size for text overlays");
+    }
+    if (name == "Show Splash Screen") {
+        return tr("Show splash screen on startup");
     }
     return name;
 }
 
 Preferences::PropertyType

         // It's an arbitrary string, we don't have a set of values for this
         return InvalidProperty;
     }
     if (name == "Background Mode") {
         return ValueProperty;
+    }
+    if (name == "View Font Size") {
+        return RangeProperty;
+    }
+    if (name == "Show Splash Screen") {
+        return ToggleProperty;
     }
     return InvalidProperty;
 }
 
 int

         if (max) *max = 2;
         if (deflt) *deflt = 0;
         return int(m_backgroundMode);
     }        
 
+    if (name == "View Font Size") {
+        if (min) *min = 3;
+        if (max) *max = 48;
+        if (deflt) *deflt = int(QApplication::font().pointSize() * 0.9);
+        return int(m_viewFontSize);
+    }
+
+    if (name == "Show Splash Screen") {
+        if (deflt) *deflt = 1;
+    }
+
     return 0;
 }
 
 QString
 Preferences::getPropertyValueLabel(const PropertyName &name,

     if (name == "Window Type") {
         switch (WindowType(value)) {
         case RectangularWindow: return tr("Rectangular");
         case BartlettWindow: return tr("Triangular");
         case HammingWindow: return tr("Hamming");
-        case HanningWindow: return tr("Hanning");
+        case HanningWindow: return tr("Hann");
         case BlackmanWindow: return tr("Blackman");
         case GaussianWindow: return tr("Gaussian");
         case ParzenWindow: return tr("Parzen");
         case NuttallWindow: return tr("Nuttall");
         case BlackmanHarrisWindow: return tr("Blackman-Harris");

         }
     }
     if (name == "Spectrogram Smoothing") {
         switch (value) {
         case NoSpectrogramSmoothing: return tr("None - blocky but accurate");
-        case SpectrogramInterpolated: return tr("Interpolate - fast but fuzzy");
-        case SpectrogramZeroPadded: return tr("Zero pad FFT - slow but clear");
+        case SpectrogramInterpolated: return tr("Linear - fast but fuzzy");
+        case SpectrogramZeroPadded: return tr("4 x Oversampled - slow but clear");
         }
     }
     if (name == "Background Mode") {
         switch (value) {
         case BackgroundFromTheme: return tr("Follow desktop theme");

         setResampleQuality(value);
     } else if (name == "Omit Temporaries from Recent Files") {
         setOmitTempsFromRecentFiles(value ? true : false);
     } else if (name == "Background Mode") {
         setBackgroundMode(BackgroundMode(value));
+    } else if (name == "View Font Size") {
+        setViewFontSize(value);
+    } else if (name == "Show Splash Screen") {
+        setShowSplash(value ? true : false);
     }
 }
 
 void
 Preferences::setSpectrogramSmoothing(SpectrogramSmoothing smoothing)

         settings.endGroup();
         emit propertyChanged("Background Mode");
     }
 }
 
-
+void
+Preferences::setViewFontSize(int size)
+{
+    if (m_viewFontSize != size) {
+
+        m_viewFontSize = size;
+
+        QSettings settings;
+        settings.beginGroup("Preferences");
+        settings.setValue("view-font-size", size);
+        settings.endGroup();
+        emit propertyChanged("View Font Size");
+    }
+}
+
+void
+Preferences::setShowSplash(bool show) 
+{
+    if (m_showSplash != show) {
+
+        m_showSplash = show;
+
+        QSettings settings;
+        settings.beginGroup("Preferences");
+        settings.setValue("show-splash", show);
+        settings.endGroup();
+        emit propertyChanged("Show Splash Screen");
+    }
+}
+