Rename ZoomCaptureCancel.qml to CaptureCancel.qml

API cleaned up a bit to make it a bit more generic

diff --git a/qml/ZoomCaptureCancel.qml b/qml/CaptureCancel.qml
similarity index 89%
rename from qml/ZoomCaptureCancel.qml
rename to qml/CaptureCancel.qml
index b17d1a5..cf13899 100644 (file)
--- a/qml/ZoomCaptureCancel.qml
+++ b/qml/CaptureCancel.qml
@@ -24,18 +24,9 @@ import QtQuick 2.0
 import CameraPlus 1.0
 
 MouseArea {
-    id: zoomCancel
-    property Item zoomCapture
-
     signal canceled
 
     z: 100
-    enabled: zoomCapture.zoomPressed
-
-    onPressed: {
-        zoomCancel.zoomCapture.zoomPressed = false
-        zoomCancel.canceled()
-    }
 
     Rectangle {
         anchors.top: parent.top

diff --git a/qml/ImageOverlay.qml b/qml/ImageOverlay.qml
index 77fb6b5..1a73e78 100644 (file)
--- a/qml/ImageOverlay.qml
+++ b/qml/ImageOverlay.qml
@@ -104,10 +104,11 @@ Item {
         onReleased: parent.captureImage()
     }
 
-    ZoomCaptureCancel {
+    CaptureCancel {
         anchors.fill: parent
-        zoomCapture: zoomCapture
-        onCanceled: {
+        enabled: zoomCapture.zoomPressed
+        onPressed: {
+            zoomCapture.zoomPressed = false
             if (!autoFocusTimer.running) {
                 stopAutoFocus()
             }

diff --git a/qml/VideoOverlay.qml b/qml/VideoOverlay.qml
index 24d44aa..df63c91 100644 (file)
--- a/qml/VideoOverlay.qml
+++ b/qml/VideoOverlay.qml
@@ -69,9 +69,10 @@ Item {
         onReleased: overlay.toggleRecording()
     }
 
-    ZoomCaptureCancel {
+    CaptureCancel {
         anchors.fill: parent
-        zoomCapture: zoomCapture
+        enabled: zoomCapture.zoomPressed
+        onPressed: zoomCapture.zoomPressed = false
     }
 
     CaptureButton {

diff --git a/qml/qml.qrc b/qml/qml.qrc
index b207a57..99858db 100644 (file)
--- a/qml/qml.qrc
+++ b/qml/qml.qrc
@@ -45,7 +45,7 @@
        <file>VideoTorchButton.qml</file>
        <file>VideoWhiteBalanceButton.qml</file>
        <file>ZoomCaptureButton.qml</file>
-       <file>ZoomCaptureCancel.qml</file>
+       <file>CaptureCancel.qml</file>
        <file>ZoomSlider.qml</file>
     </qresource>
 </RCC>