X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=qml%2FCameraPage.qml;h=7ba3aa880413ba0b1c2a8b26b4bfb2fe2121dcfa;hb=960eb792acde51e3e0b862c19d58acaf3082c500;hp=98503cf6f530ed76d4e111ee50832038352af076;hpb=6be6d68dcb479c31c11baf14f81ff8539c618394;p=harmattan%2Fcameraplus

diff --git a/qml/CameraPage.qml b/qml/CameraPage.qml
index 98503cf..7ba3aa8 100644
--- a/qml/CameraPage.qml
+++ b/qml/CameraPage.qml
@@ -3,7 +3,7 @@
 /*!
  * This file is part of CameraPlus.
  *
- * Copyright (C) 2012 Mohammed Sameer <msameer@foolab.org>
+ * Copyright (C) 2012-2013 Mohammed Sameer <msameer@foolab.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,19 +24,16 @@ import QtQuick 1.1
 import com.nokia.meego 1.1
 import QtCamera 1.0
 import CameraPlus 1.0
-import QtMobility.systeminfo 1.2
 
 Page {
         id: page
 
-        property bool needsPipeline: true
         property int policyMode: CameraResources.None
 
         property Camera cam: null
+        property Item dimmer: null
+        property ControlsActivationData activationData: ControlsActivationData {}
         property bool controlsVisible: cam.running && !standby.visible
-        property bool zoomVisible: true
-        property bool modesVisible: true
-        property bool standbyVisible: true
         property bool focusReticleVisible: true
         property bool enableViewfinder: true
 
@@ -57,7 +54,7 @@ Page {
                         cam.renderingEnabled = true;
                 }
                 else if (status == PageStatus.Active) {
-                        focusReticle.setRegionOfInterest();
+                        focusReticle.resetReticle();
 
                         if (!enableViewfinder) {
                                 cam.renderingEnabled = false;
@@ -65,37 +62,6 @@ Page {
                 }
         }
 
-        Rectangle {
-                // TODO: fade out transition
-                // TODO: there is a toolbar visible on the first startup
-                id: standby
-                color: "black"
-                anchors.fill: parent
-                visible: standbyVisible && page.status == PageStatus.Active && pipelineManager.showStandBy
-                z: 2
-                MouseArea {
-                        anchors.fill: parent
-                        enabled: parent.visible
-                }
-
-                Image {
-                        id: icon
-                        source: "image://theme/icon-l-camera-standby"
-                        anchors.centerIn: parent
-                }
-
-                Label {
-                        anchors.top: icon.bottom
-                        anchors.right: parent.right
-                        anchors.left: parent.left
-                        text: qsTr("Resources lost")
-                        color: "white"
-                        font.pixelSize: 36
-                        horizontalAlignment: Text.AlignHCenter
-                        visible: pipelineManager.state == "policyLost"
-                }
-        }
-
         function setPreview(image) {
                 preview.setPreview(image);
         }
@@ -105,7 +71,7 @@ Page {
                 anchors.right: parent.right
                 anchors.rightMargin: 20
                 anchors.bottomMargin: 20
-                visible: controlsVisible && modesVisible
+                visible: controlsVisible && activationData.modeSelectorVisible
         }
 
         PreviewImage {
@@ -118,42 +84,10 @@ Page {
                 anchors.top: parent.top
                 anchors.topMargin: 0
                 anchors.horizontalCenter: parent.horizontalCenter
-                visible: controlsVisible && zoomVisible
+                visible: controlsVisible && activationData.zoomBarVisible
         }
 
         function checkDiskSpace() {
                 return fileSystem.hasFreeSpace(fileNaming.path);
         }
-
-        function checkBattery() {
-                // We are fine if we are connected to the charger:
-                if (batteryMonitor.chargingState == BatteryInfo.Charging) {
-                        return true;
-                }
-
-                // If we have enough battery then we are fine:
-                if (batteryMonitor.batteryStatus > BatteryInfo.BatteryCritical) {
-                        return true;
-                }
-
-                return false;
-        }
-
-        BatteryInfo {
-                id: batteryMonitor
-                monitorChargingStateChanges: cam.running
-                monitorBatteryStatusChanges: cam.running
-
-                onChargingStateChanged: {
-                        if (!checkBattery()) {
-                                parent.batteryLow();
-                        }
-                }
-
-                onBatteryStatusChanged:  {
-                        if (!checkBattery()) {
-                                parent.batteryLow();
-                        }
-                }
-        }
 }