Initial ui reimplementation. Still in its early phase.

[harmattan/cameraplus] / qml / ModeController.qml

diff --git a/qml/ModeController.qml b/qml/ModeController.qml
index 2fd164a..a986dd7 100644 (file)
--- a/qml/ModeController.qml
+++ b/qml/ModeController.qml
@@ -1,43 +1,57 @@
 // -*- qml -*-
+
+/*!
+ * This file is part of CameraPlus.
+ *
+ * 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
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
 import QtQuick 1.1
 import com.nokia.meego 1.1
 import QtCamera 1.0
 
 Item {
         id: controller
-        property int mode: settings.mode
         property Camera cam: null
         property Item dimmer: null
-        property alias animationRunning: animation.running
+        property bool busy: cam.mode != settings.mode
 
-        SequentialAnimation {
-                id: animation
-                property int mode: 0
-
-                function setMode() {
-                        cam.mode = mode;
+        onBusyChanged: {
+                if (busy) {
+                        controller.dimmer.dimmed = true;
                 }
+        }
 
-                NumberAnimation { target: dimmer; property: "opacity"; from: 0; to: 1; duration: 250; alwaysRunToEnd: true }
-                ParallelAnimation {
-                        ScriptAction { script: animation.setMode(); }
-                        PauseAnimation { duration: 100 }
+        Connections {
+                target: controller.cam
+                onModeChanged: {
+                        controller.dimmer.dimmed = false;
                 }
-
-                NumberAnimation { target: dimmer; property: "opacity"; from: 1; to: 0; duration: 250; alwaysRunToEnd: true }
         }
 
-        onModeChanged: {
-                set(mode);
-        }
+        PauseAnimation {
+                id: pause
+                duration: 50
+                running: controller.dimmer.opacity == 1.0 && controller.busy
 
-        function set(newMode) {
-                if (cam.mode == newMode) {
-                        return;
+                onRunningChanged: {
+                        if (!running && controller.busy) {
+                                root.resetCamera(cam.deviceId, settings.mode);
+                        }
                 }
-
-                animation.mode = newMode;
-
-                animation.start();
         }
 }