projects
/
harmattan
/
cameraplus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kill com.nokia.meego importing in the ui.
[harmattan/cameraplus]
/
qml
/
PostCaptureItem.qml
diff --git
a/qml/PostCaptureItem.qml
b/qml/PostCaptureItem.qml
index
5e5b79e
..
b2911fe
100644
(file)
--- a/
qml/PostCaptureItem.qml
+++ b/
qml/PostCaptureItem.qml
@@
-20,8
+20,7
@@
* 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 com.nokia.meego 1.1
+@IMPORT_QT_QUICK@
import CameraPlus 1.0
Item {
import CameraPlus 1.0
Item {
@@
-57,6
+56,7
@@
Item {
onFinished: loader.source = ""
}
onFinished: loader.source = ""
}
+// TODO: rotation
QuillItem {
id: image
width: parent.width - 10
QuillItem {
id: image
width: parent.width - 10
@@
-65,7
+65,7
@@
Item {
Component.onCompleted: initialize(itemData.url, itemData.mimetype)
visible: loader.source == ""
Component.onCompleted: initialize(itemData.url, itemData.mimetype)
visible: loader.source == ""
- Label {
+
Camera
Label {
anchors.fill: parent
visible: image.error
text: qsTr("Failed to load preview")
anchors.fill: parent
visible: image.error
text: qsTr("Failed to load preview")
@@
-81,7
+81,7
@@
Item {
onClicked: postCaptureItem.clicked()
}
onClicked: postCaptureItem.clicked()
}
- ToolIcon {
+
Camera
ToolIcon {
// TODO: this is overlapping with error.
id: playIcon
anchors.centerIn: parent
// TODO: this is overlapping with error.
id: playIcon
anchors.centerIn: parent