Added gallery integration

[harmattan/cameraplus] / qml / main.qml

diff --git a/qml/main.qml b/qml/main.qml
index 3400488..421d06f 100644 (file)
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -31,13 +31,11 @@ import QtMobility.location 1.2
 // TODO: postcapture
 // TODO: flash not ready (battery low or flash not ready message)
 // TODO: portrait/landscape
-// TODO: stop viewfinder in settings pages ?
 // TODO: grid lines, face tracking
 // TODO: select primary/secondary camera.
 // TODO: disable debug builds.
 // TODO: a way to get buffers to the application
 // TODO: fcam like functionality (precise control over capture parameters).
-// TODO: mute video sound
 
 PageStackWindow {
         id: root
@@ -222,7 +220,7 @@ PageStackWindow {
                         visible: pageStack.currentPage && pageStack.currentPage.controlsVisible && pageStack.currentPage.focusReticleVisible && cam && cam.autoFocus.canFocus(cam.scene.value);
                         cafStatus: cam ? cam.autoFocus.cafStatus : -1
                         status: cam ? cam.autoFocus.status : -1
-        }
+                }
 
 /*
                 onDeviceIdChanged: {
@@ -374,6 +372,12 @@ PageStackWindow {
                 value: cam.iso.value
         }
 
+        Binding {
+                target: cam.videoMute
+                property: "enabled"
+                value: settings.videoMuted
+        }
+
         TrackerStore {
                 id: trackerStore
                 active: cam.running
@@ -398,4 +402,9 @@ PageStackWindow {
                         }
                 }
         }
+
+        Standby {
+                policyLost: pipelineManager.state == "policyLost"
+                show: !pageStack.currentPage || (pageStack.currentPage.standbyVisible && pageStack.currentPage.status == PageStatus.Active && pipelineManager.showStandBy)
+        }
 }