Use loaders for post capture and settings views

diff --git a/qml/MainPage.qml b/qml/MainPage.qml
index 58ef4f4..6ae8d58 100644 (file)
--- a/qml/MainPage.qml
+++ b/qml/MainPage.qml
@@ -42,10 +42,14 @@ CameraPage {
     VisualItemModel {
         id: mainModel
 
-        SettingsView {
-            camera: viewfinder.camera
+        Loader {
+            id: settingsLoader
             width: mainView.width
             height: mainView.height
+
+            property bool pressed: false
+            property bool inhibitDim: false
+            property int policyMode: settings.mode == Camera.VideoMode ? CameraResources.Video : CameraResources.Image
         }
 
         CameraView {
@@ -54,8 +58,12 @@ CameraPage {
             height: mainView.height
         }
 
-        PostCaptureView {
-            camera: viewfinder.camera
+        Loader {
+            id: postCaptureLoader
+            property bool pressed: item ? item.pressed : false
+            property bool inhibitDim: item ? item.inhibitDim : false
+            property int policyMode: item ? item.policyMode : settings.mode == Camera.VideoMode ? CameraResources.Video : CameraResources.Image
+
             width: mainView.width
             height: mainView.height
         }
@@ -72,6 +80,13 @@ CameraPage {
         boundsBehavior: Flickable.StopAtBounds
         currentIndex: 1
         interactive: !currentItem.pressed
+        onContentXChanged: {
+            if (contentX == 0) {
+                settingsLoader.source = Qt.resolvedUrl("SettingsView.qml")
+            } else if (contentX == width * 2) {
+                postCaptureLoader.source = Qt.resolvedUrl("PostCaptureView.qml")
+            }
+        }
     }
 
     Component.onCompleted: {

diff --git a/qml/PostCaptureView.qml b/qml/PostCaptureView.qml
index 2dd6f29..4aabbb8 100644 (file)
--- a/qml/PostCaptureView.qml
+++ b/qml/PostCaptureView.qml
@@ -27,7 +27,7 @@ import QtCamera 1.0
 Item {
     id: postCaptureView
 
-    property Camera camera: null
+    property Camera camera: viewfinder.camera
     property bool pressed: view.currentItem ? view.currentItem.playing : false
     property int policyMode: view.currentItem && view.currentItem.playing ?
         CameraResources.Player : settings.mode == Camera.VideoMode ? CameraResources.Video :

diff --git a/qml/SettingsView.qml b/qml/SettingsView.qml
index 150d8b8..5003a03 100644 (file)
--- a/qml/SettingsView.qml
+++ b/qml/SettingsView.qml
@@ -25,11 +25,7 @@ import QtCamera 1.0
 import CameraPlus 1.0
 
 Item {
-    property Camera camera: null
-    property int policyMode: settings.mode == Camera.VideoMode ? CameraResources.Video
-        : CameraResources.Image
-    property bool pressed: false
-    property bool inhibitDim: false
+    property Camera camera: viewfinder.camera
 
     Loader {
         id: loader

diff --git a/qml/VideoTorchButton.qml b/qml/VideoTorchButton.qml
index 0f05773..b51462f 100644 (file)
--- a/qml/VideoTorchButton.qml
+++ b/qml/VideoTorchButton.qml
@@ -25,7 +25,7 @@ import QtCamera 1.0
 
 CameraToolIcon {
     id: button
-    property Camera camera: null
+    property Camera camera
 
     iconSource: settings.videoTorchOn ? cameraTheme.cameraTorchOnIconId : cameraTheme.cameraTorchOffIconId
     onClicked: settings.videoTorchOn = !settings.videoTorchOn