Post capture timeout removed.

Unlikely to be implemented.
Removed its commented code and properties from settings.

diff --git a/qml/CameraSettings.qml b/qml/CameraSettings.qml
index 5fc4bcb..b9e6057 100644 (file)
--- a/qml/CameraSettings.qml
+++ b/qml/CameraSettings.qml
@@ -33,40 +33,7 @@ Column {
                 text: qsTr("Camera settings");
                 width: parent.width
         }
-/*
-// TODO:
-        SectionHeader {
-                text: qsTr("Show captured content");
-        }
-
-        ButtonRow {
-                anchors.horizontalCenter: parent.horizontalCenter
 
-                Button {
-                        text: qsTr("Disabled");
-                        checked: settings.postCaptureTimeout == 0;
-                        onClicked: settings.postCaptureTimeout = 0;
-                }
-
-                Button {
-                        text: qsTr("2 seconds");
-                        checked: settings.postCaptureTimeout == 2;
-                        onClicked: settings.postCaptureTimeout = 2;
-                }
-
-                Button {
-                        text: qsTr("5 seconds");
-                        checked: settings.postCaptureTimeout == 10;
-                        onClicked: settings.postCaptureTimeout = 10;
-                }
-
-                Button {
-                        text: qsTr("No timeout");
-                        checked: settings.postCaptureTimeout == -1;
-                        onClicked: settings.postCaptureTimeout = -1;
-                }
-        }
-*/
         SectionHeader {
                 text: qsTr("Creator name");
                 width: parent.width

diff --git a/src/settings.cpp b/src/settings.cpp
index 963a6ff..514d9a6 100644 (file)
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -26,7 +26,6 @@
 
 #define DEFAULT_MODE               1
 #define DEFAULT_SCENE_MODE         6 // Auto
-#define DEFAULT_TIMEOUT            0
 #define DEFAULT_USE_GPS            true
 #define DEFAULT_USE_GEOTAGS        true
 #define DEFAULT_COLOR_FILTER       0
@@ -76,18 +75,6 @@ void Settings::setCreatorName(const QString& name) {
   }
 }
 
-int Settings::postCaptureTimeout() const {
-  return m_settings->value("camera/postCaptureTimeout", DEFAULT_TIMEOUT).toInt();
-}
-
-void Settings::setPostCaptureTimeout(int timeout) {
-  if (timeout != postCaptureTimeout()) {
-    m_settings->setValue("camera/postCaptureTimeout", timeout);
-
-    emit postCaptureTimeoutChanged();
-  }
-}
-
 bool Settings::useGps() const {
   return m_settings->value("camera/useGps", DEFAULT_USE_GPS).toBool();
 }

diff --git a/src/settings.h b/src/settings.h
index b3995e1..c32908e 100644 (file)
--- a/src/settings.h
+++ b/src/settings.h
@@ -32,7 +32,6 @@ class Settings : public QObject {
 
   Q_PROPERTY(int mode READ mode WRITE setMode NOTIFY modeChanged);
   Q_PROPERTY(QString creatorName READ creatorName WRITE setCreatorName NOTIFY creatorNameChanged);
-  Q_PROPERTY(int postCaptureTimeout READ postCaptureTimeout WRITE setPostCaptureTimeout NOTIFY postCaptureTimeoutChanged);
   Q_PROPERTY(bool useGps READ useGps WRITE setUseGps NOTIFY useGpsChanged);
   Q_PROPERTY(bool useGeotags READ useGeotags WRITE setUseGeotags NOTIFY useGeotagsChanged);
   Q_PROPERTY(int imageSceneMode READ imageSceneMode WRITE setImageSceneMode NOTIFY imageSceneModeChanged);
@@ -70,9 +69,6 @@ public:
   QString creatorName() const;
   void setCreatorName(const QString& name);
 
-  int postCaptureTimeout() const;
-  void setPostCaptureTimeout(int timeout);
-
   bool useGps() const;
   void setUseGps(bool enable);
 
@@ -136,7 +132,6 @@ public:
 signals:
   void modeChanged();
   void creatorNameChanged();
-  void postCaptureTimeoutChanged();
   void useGpsChanged();
   void useGeotagsChanged();
   void imageSceneModeChanged();