projects
/
harmattan
/
cameraplus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed VideoPlayerPage.qml failure to set cameraConfig
[harmattan/cameraplus]
/
qml
/
VideoPlayerPage.qml
diff --git
a/qml/VideoPlayerPage.qml
b/qml/VideoPlayerPage.qml
index
6820030
..
9b6ec4f
100644
(file)
--- a/
qml/VideoPlayerPage.qml
+++ b/
qml/VideoPlayerPage.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 QtQuick 2.0
import CameraPlus 1.0
import QtCamera 1.0
import QtCameraExtras 1.0
import CameraPlus 1.0
import QtCamera 1.0
import QtCameraExtras 1.0
@@
-59,7
+58,7
@@
Item {
VideoPlayer {
id: video
anchors.fill: parent
VideoPlayer {
id: video
anchors.fill: parent
- cameraConfig: cam.cameraConfig
+ cameraConfig: cam
era
.cameraConfig
onError: showError(qsTr("Error playing video. Please try again or restart the application"))
onError: showError(qsTr("Error playing video. Please try again or restart the application"))
@@
-105,19
+104,17
@@
Item {
}
items: [
}
items: [
- ToolIcon {
+
Camera
ToolIcon {
iconId: "icon-m-toolbar-mediacontrol-stop-white"
onClicked: video.stop()
},
iconId: "icon-m-toolbar-mediacontrol-stop-white"
onClicked: video.stop()
},
- Slider {
+
Camera
Slider {
id: slider
height: toolBar.height
anchors.verticalCenter: parent.verticalCenter
id: slider
height: toolBar.height
anchors.verticalCenter: parent.verticalCenter
- platformStyle: SliderStyle {
- handleBackground: ""
- handleBackgroundPressed: ""
- }
+ handleBackground: ""
+ handleBackgroundPressed: ""
minimumValue: 0
maximumValue: video.duration
minimumValue: 0
maximumValue: video.duration
@@
-132,7
+129,7
@@
Item {
hideTimer.restart()
}
},
hideTimer.restart()
}
},
- ToolIcon {
+
Camera
ToolIcon {
id: control
iconId: !video.paused ? "icon-m-toolbar-mediacontrol-pause-white"
: "icon-m-toolbar-mediacontrol-play-white"
id: control
iconId: !video.paused ? "icon-m-toolbar-mediacontrol-pause-white"
: "icon-m-toolbar-mediacontrol-play-white"