silence dbus-send output

[harmattan/cameraplus] / src / settings.cpp

diff --git a/src/settings.cpp b/src/settings.cpp
index 7cafca0..9c82c97 100644 (file)
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -34,7 +34,10 @@
 #define DEFAULT_GRID_ENABLED            false
 #define DEFAULT_FACE_DETECTION_ENABLED  true
 #define DEFAULT_ZOOM_AS_SHUTTER         false
+#define DEFAULT_PROXIMITY_AS_SHUTTER    false
 #define DEFAULT_DEVICE                  0
+#define DEFAULT_ENABLE_PREVIEW          true
+#define DEFAULT_FILE_NAMING_UTC         true
 
 Settings::Settings(QObject *parent) :
   QObject(parent),
@@ -164,6 +167,18 @@ void Settings::setZoomAsShutterEnabled(bool enabled) {
   }
 }
 
+bool Settings::isProximityAsShutterEnabled() const {
+  return m_settings->value("camera/proximityAsShutter", DEFAULT_PROXIMITY_AS_SHUTTER).toBool();
+}
+
+void Settings::setProximityAsShutterEnabled(bool enabled) {
+  if (isProximityAsShutterEnabled() != enabled) {
+    m_settings->setValue("camera/proximityAsShutter", enabled);
+
+    emit proximityAsShutterChanged();
+  }
+}
+
 int Settings::device() const {
   return m_settings->value("camera/device", DEFAULT_DEVICE).toInt();
 }
@@ -175,7 +190,6 @@ void Settings::setDevice(int device) {
     m_settings->setValue("camera/device", device);
 
     delete m_device; m_device = 0;
-    emit deviceChanged();
 
     if (mode() == DEFAULT_MODE) {
       // image
@@ -198,6 +212,8 @@ void Settings::setDevice(int device) {
       emit videoResolutionChanged();
       emit videoTorchOnChanged();
     }
+
+    emit deviceChanged();
   }
 }
 
@@ -407,3 +423,39 @@ void Settings::setVideoTorchOn(bool on) {
     emit videoTorchOnChanged();
   }
 }
+
+QString Settings::fileNamingStamp(const QString& id) const {
+  QString key = QString("fileNaming/%1").arg(id);
+  return m_settings->value(key).toString();
+}
+
+void Settings::setFileNamingStamp(const QString& id, const QString& stamp) {
+  QString key = QString("fileNaming/%1").arg(id);
+  m_settings->setValue(key, stamp);
+}
+
+int Settings::fileNamingCounter(const QString& id) const {
+  QString key = QString("fileNaming/%1").arg(id);
+  return m_settings->value(key).toInt();
+}
+
+void Settings::setFileNamingCounter(const QString& id, int counter) {
+  QString key = QString("fileNaming/%1").arg(id);
+  m_settings->setValue(key, counter);
+}
+
+bool Settings::isPreviewEnabled() const {
+  return m_settings->value("camera/enablePreview", DEFAULT_ENABLE_PREVIEW).toBool();
+}
+
+void Settings::setPreviewEnabled(bool enabled) {
+  if (enabled != isPreviewEnabled()) {
+    m_settings->setValue("camera/enablePreview", enabled);
+
+    emit previewEnabledChanged();
+  }
+}
+
+bool Settings::isUtcForFileNamingUsed() const {
+  return m_settings->value("fileNaming/useUtc", DEFAULT_FILE_NAMING_UTC).toBool();
+}