Added a hidden setting (fileNaming/useUtc) to disable UTC usage for file names

[harmattan/cameraplus] / src / settings.cpp

diff --git a/src/settings.cpp b/src/settings.cpp
index dff01d0..9c82c97 100644 (file)
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -36,6 +36,8 @@
 #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),
@@ -422,18 +424,38 @@ void Settings::setVideoTorchOn(bool on) {
   }
 }
 
-QString Settings::fileNamingStamp() const {
-  return m_settings->value("fileNaming/stamp").toString();
+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& stamp) {
-  m_settings->setValue("fileNaming/stamp", stamp);
+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 {
-  return m_settings->value("fileNaming/counter").toInt();
+int Settings::fileNamingCounter(const QString& id) const {
+  QString key = QString("fileNaming/%1").arg(id);
+  return m_settings->value(key).toInt();
 }
 
-void Settings::setFileNamingCounter(int counter) {
-  m_settings->setValue("fileNaming/counter", counter);
+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();
 }