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

diff --git a/src/filenaming.cpp b/src/filenaming.cpp
index 25a1c85..fa64a6c 100644 (file)
--- a/src/filenaming.cpp
+++ b/src/filenaming.cpp
@@ -23,6 +23,7 @@
 #include <QDate>
 #include <QDateTime>
 #include <QFile>
+#include "settings.h"
 #if defined(QT4)
 #include <QDeclarativeInfo>
 #elif defined(QT5)
@@ -88,7 +89,13 @@ QString FileNaming::fileName(const QString& path, const QString& suffix, const T
     return QString();
   }
 
-  QString date = QDateTime::currentDateTime().toUTC().date().toString("yyyyMMdd");
+  QString date;
+  if (m_settings && !m_settings->isUtcForFileNamingUsed()) {
+    date = QDate::currentDate().toString("yyyyMMdd");
+  }
+  else {
+    date = QDateTime::currentDateTime().toUTC().date().toString("yyyyMMdd");
+  }
   QDir dir(path);
 
   // index is the last used index

diff --git a/src/settings.cpp b/src/settings.cpp
index 726f6e5..9c82c97 100644 (file)
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -37,6 +37,7 @@
 #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),
@@ -454,3 +455,7 @@ void Settings::setPreviewEnabled(bool enabled) {
     emit previewEnabledChanged();
   }
 }
+
+bool Settings::isUtcForFileNamingUsed() const {
+  return m_settings->value("fileNaming/useUtc", DEFAULT_FILE_NAMING_UTC).toBool();
+}

diff --git a/src/settings.h b/src/settings.h
index 153e83d..74b0d05 100644 (file)
--- a/src/settings.h
+++ b/src/settings.h
@@ -67,6 +67,7 @@ class Settings : public QObject {
   Q_PROPERTY(bool proximityAsShutter READ isProximityAsShutterEnabled WRITE setProximityAsShutterEnabled NOTIFY proximityAsShutterChanged);
   Q_PROPERTY(int device READ device WRITE setDevice NOTIFY deviceChanged);
   Q_PROPERTY(bool enablePreview READ isPreviewEnabled WRITE setPreviewEnabled NOTIFY previewEnabledChanged);
+  Q_PROPERTY(bool useUtcForFileNaming READ isUtcForFileNamingUsed CONSTANT);
 
 public:
   Settings(QObject *parent = 0);
@@ -162,6 +163,8 @@ public:
   bool isPreviewEnabled() const;
   void setPreviewEnabled(bool enabled);
 
+  bool isUtcForFileNamingUsed() const;
+
 signals:
   void modeChanged();
   void creatorNameChanged();