X-Git-Url: http://cgit.sxemacs.org/?p=harmattan%2Fcameraplus;a=blobdiff_plain;f=qml%2FZoomCaptureButton.qml;h=b3e531e3942fa1a85b932d1c6cf637c17476d463;hp=b2bef31dac57979e4398c590112f1b8b3df1acdb;hb=a52464d477e5a9bf9c75d5d3b4e7db978a78686e;hpb=70f4ba0a064d4a6f210361e61492fd47751e18ec

diff --git a/qml/ZoomCaptureButton.qml b/qml/ZoomCaptureButton.qml
index b2bef31..b3e531e 100644
--- a/qml/ZoomCaptureButton.qml
+++ b/qml/ZoomCaptureButton.qml
@@ -20,61 +20,59 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-import QtQuick 1.1
-import com.nokia.meego 1.1
+import QtQuick 2.0
 import CameraPlus 1.0
 
 Item {
-        id: zoomHandler
-        property Item page
-        property bool zoomPressed: false
+    id: zoomHandler
+    property bool zoomPressed: false
 
-        signal pressed();
-        signal released();
+    signal pressed()
+    signal released()
 
-        property bool active: settings.zoomAsShutter && page.status == PageStatus.Active && Qt.application.active
+    property bool active: settings.zoomAsShutter && Qt.application.active
 
-        function handlePress() {
-                if (!zoomHandler.active || zoomHandler.zoomPressed) {
-                        return;
-                }
-
-                zoomHandler.zoomPressed = true;
-                zoomHandler.pressed();
+    function handlePress() {
+        if (!zoomHandler.active || zoomHandler.zoomPressed) {
+            return
         }
 
-        function handleRelease() {
-                if (!zoomHandler.active || !zoomHandler.zoomPressed) {
-                        return;
-                }
-
-                zoomHandler.zoomPressed = false;
+        zoomHandler.zoomPressed = true
+        zoomHandler.pressed()
+    }
 
-                zoomHandler.released();
+    function handleRelease() {
+        if (!zoomHandler.active || !zoomHandler.zoomPressed) {
+            return
         }
 
-        Connections {
-                id: zoomConnection
-                target: keys
+        zoomHandler.zoomPressed = false
 
-                onActiveChanged: {
-                        if (!zoomConnection.active) {
-                                zoomHandler.zoomPressed = false;
-                        }
-                }
+        zoomHandler.released()
+    }
 
-                onVolumeUpPressed: zoomHandler.handlePress();
-                onVolumeDownPressed: zoomHandler.handlePress();
-                onVolumeUpReleased: zoomHandler.handleRelease();
-                onVolumeDownReleased: zoomHandler.handleRelease();
+    Connections {
+        id: zoomConnection
+        target: keys
+
+        onActiveChanged: {
+            if (!zoomConnection.active) {
+                zoomHandler.zoomPressed = false
+            }
         }
 
-        Connections {
-                target: Qt.application
-                onActiveChanged: {
-                        if (!Qt.application.active) {
-                                zoomHandler.zoomPressed = false;
-                        }
-                }
+        onVolumeUpPressed: zoomHandler.handlePress()
+        onVolumeDownPressed: zoomHandler.handlePress()
+        onVolumeUpReleased: zoomHandler.handleRelease()
+        onVolumeDownReleased: zoomHandler.handleRelease()
+    }
+
+    Connections {
+        target: Qt.application
+        onActiveChanged: {
+            if (!Qt.application.active) {
+                zoomHandler.zoomPressed = false
+            }
         }
+    }
 }