projects
/
harmattan
/
cameraplus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Indent and drop unneeded com.nokia.meego import
[harmattan/cameraplus]
/
qml
/
PreviewImage.qml
diff --git
a/qml/PreviewImage.qml
b/qml/PreviewImage.qml
index
eee31dd
..
52a32f3
100644
(file)
--- a/
qml/PreviewImage.qml
+++ b/
qml/PreviewImage.qml
@@
-3,7
+3,7
@@
/*!
* This file is part of CameraPlus.
*
/*!
* 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
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@
-20,36
+20,45
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+@IMPORT_QT_QUICK@
import com.nokia.meego 1.1
import QtCamera 1.0
Image {
import com.nokia.meego 1.1
import QtCamera 1.0
Image {
- id: image
- anchors.fill: parent
- property alias animationRunning: animation.running
- opacity: 0
- z: 1
+ id: image
+ anchors.fill: parent
+ property alias animationRunning: animation.running
-
visible: opacity != 0
+ visible: opacity != 0
-
cache: false
-
fillMode: Image.PreserveAspectFit
+ cache: false
+ fillMode: Image.PreserveAspectFit
-
MouseArea {
-
anchors.fill: parent
-
enabled: parent.visible
-
}
+ MouseArea {
+ anchors.fill: parent
+ enabled: parent.visible
+ }
- SequentialAnimation {
- id: animation
- PauseAnimation { duration: 500; alwaysRunToEnd: true }
- NumberAnimation { target: preview; property: "opacity"; from: 1; to: 0; duration: 250; alwaysRunToEnd: true }
+ SequentialAnimation {
+ id: animation
+ PauseAnimation {
+ duration: 500
+ alwaysRunToEnd: true
}
}
- function setPreview(preview) {
- animation.start();
- image.source = preview;
- image.visible = true;
+ NumberAnimation {
+ target: preview
+ property: "opacity"
+ from: 1
+ to: 0
+ duration: 250
+ alwaysRunToEnd: true
}
}
+ }
+
+ function setPreview(preview) {
+ image.source = preview
+ image.opacity = 1
+ animation.start()
+ }
}
}