Initial ui reimplementation. Still in its early phase.

[harmattan/cameraplus] / qml / CameraPage.qml

diff --git a/qml/CameraPage.qml b/qml/CameraPage.qml
index 43da9c4..7ba3aa8 100644 (file)
--- 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
@@ -32,11 +32,8 @@ Page {
 
         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
 
@@ -74,7 +71,7 @@ Page {
                 anchors.right: parent.right
                 anchors.rightMargin: 20
                 anchors.bottomMargin: 20
-                visible: controlsVisible && modesVisible
+                visible: controlsVisible && activationData.modeSelectorVisible
         }
 
         PreviewImage {
@@ -87,7 +84,7 @@ Page {
                 anchors.top: parent.top
                 anchors.topMargin: 0
                 anchors.horizontalCenter: parent.horizontalCenter
-                visible: controlsVisible && zoomVisible
+                visible: controlsVisible && activationData.zoomBarVisible
         }
 
         function checkDiskSpace() {