Added support for strftime() format to creator name text

[harmattan/cameraplus] / qml / SettingsView.qml

diff --git a/qml/SettingsView.qml b/qml/SettingsView.qml
index 41b8773..5003a03 100644 (file)
--- a/qml/SettingsView.qml
+++ b/qml/SettingsView.qml
@@ -20,17 +20,23 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-import QtQuick 1.1
+import QtQuick 2.0
 import QtCamera 1.0
 import CameraPlus 1.0
 
 Item {
-    property int policyMode: settings.mode == Camera.VideoMode ? CameraResources.Video
-        : CameraResources.Image
+    property Camera camera: viewfinder.camera
 
     Loader {
         id: loader
         anchors.fill: parent
-        source: settings.mode == Camera.VideoMode ? Qt.resolvedUrl("VideoSettings.qml") : Qt.resolvedUrl("ImageSettings.qml")
+        source: settings.mode == Camera.VideoMode ? Qt.resolvedUrl("VideoModeSettings.qml") : Qt.resolvedUrl("ImageModeSettings.qml")
+    }
+
+    Binding {
+        target: loader.item
+        property: "camera"
+        value: camera
+        when: loader.item != null
     }
 }