/*!
* 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
* 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 QtCamera 1.0
Item {
- id: controller
- property int mode: settings.mode
- property Camera cam: null
- property Item dimmer: null
- property alias animationRunning: animation.running
-
- SequentialAnimation {
- id: animation
- property int mode: 0
-
- function setMode() {
- cam.mode = mode;
- }
-
- NumberAnimation { target: dimmer; property: "opacity"; from: 0; to: 1; duration: 150; alwaysRunToEnd: true }
-
- PauseAnimation { duration: 50 }
-
- ParallelAnimation {
- ScriptAction { script: animation.setMode(); }
- PauseAnimation { duration: 200 }
- }
-
- PauseAnimation { duration: 50 }
-
- NumberAnimation { target: dimmer; property: "opacity"; from: 1; to: 0; duration: 150; alwaysRunToEnd: true }
+ id: controller
+ property Camera cam: null
+ property Item dimmer: null
+ property bool busy: cam.mode != settings.mode
+
+ onBusyChanged: {
+ if (busy) {
+ controller.dimmer.dimmed = true
}
+ }
+ Connections {
+ target: controller.cam
onModeChanged: {
- set(mode);
+ controller.dimmer.dimmed = false
}
+ }
- function set(newMode) {
- if (cam.mode == newMode) {
- return;
- }
-
- animation.mode = newMode;
+ PauseAnimation {
+ id: pause
+ duration: 50
+ running: controller.dimmer.opacity == 1.0 && controller.busy
- animation.start();
+ onRunningChanged: {
+ if (!running && controller.busy) {
+ root.resetCamera(cam.deviceId, settings.mode)
+ }
}
+ }
}