projects
/
harmattan
/
cameraplus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't anchor the tool bar menu button.
[harmattan/cameraplus]
/
qml
/
PostCaptureItem.qml
diff --git
a/qml/PostCaptureItem.qml
b/qml/PostCaptureItem.qml
index
abe6fa9
..
f648a5f
100644
(file)
--- a/
qml/PostCaptureItem.qml
+++ b/
qml/PostCaptureItem.qml
@@
-26,16
+26,21
@@
import CameraPlus 1.0
Item {
id: postCaptureItem
Item {
id: postCaptureItem
- property bool isVideo: itemData.type.search("nmm#Video") > 0
+ property url itemUrl: url
+ property string itemTitle: title
+ property string itemMimeType: mimeType
+ property string itemCreated: created
+ property string itemFileName: fileName
+
+ property bool isVideo: itemMimeType.search("video/") >= 0
property alias error: image.error
property alias error: image.error
- property variant itemData: item
property bool playing: loader.source != ""
signal clicked
clip: true
function startPlayback() {
loader.source = Qt.resolvedUrl("VideoPlayerPage.qml")
property bool playing: loader.source != ""
signal clicked
clip: true
function startPlayback() {
loader.source = Qt.resolvedUrl("VideoPlayerPage.qml")
- loader.item.source = item
Data.u
rl
+ loader.item.source = item
U
rl
if (!loader.item.play()) {
showError(qsTr("Error playing video. Please try again."))
loader.source = ""
if (!loader.item.play()) {
showError(qsTr("Error playing video. Please try again."))
loader.source = ""
@@
-60,8
+65,8
@@
Item {
FullScreenThumbnail {
id: image
FullScreenThumbnail {
id: image
- source: item
Data.u
rl
- mimeType: item
Data.m
imeType
+ source: item
U
rl
+ mimeType: item
M
imeType
rotation: calculateRotation(orientation.orientation)
width: isPortrait ? parent.height : parent.width - 10
height: isPortrait ? parent.width - 10 : parent.height
rotation: calculateRotation(orientation.orientation)
width: isPortrait ? parent.height : parent.width - 10
height: isPortrait ? parent.width - 10 : parent.height
@@
-118,7
+123,7
@@
Item {
CameraToolIcon {
id: playIcon
anchors.horizontalCenter: parent.horizontalCenter
CameraToolIcon {
id: playIcon
anchors.horizontalCenter: parent.horizontalCenter
- icon
Id
: cameraTheme.videoPlayIconId
+ icon
Source
: cameraTheme.videoPlayIconId
visible: isVideo
onClicked: startPlayback()
}
visible: isVideo
onClicked: startPlayback()
}