git.iko.soy/unity8
on xenial help sign in
Add sharing to inline video
commita41bd80dd01953bec4664f688256d22881dbe574 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateFri 20 May 2016, 13:40 (10 years ago) parent26850f2
3 files changed+29−6
compare with xenial
unifiedsplit
qml/Dash/Previews/PreviewInlineVideo.qml+15 qml/Dash/Previews/PreviewMediaToolbar.qml+5−5 tests/qmltests/Dash/Previews/tst_PreviewInlineVideo.qml+9−1
qml/Dash/Previews/PreviewInlineVideo.qml+15
@@ -18,6 +18,7 @@ import QtQuick 2.4
1818import QtMultimedia 5.0
1919import Ubuntu.Components 1.3
2020import Ubuntu.Thumbnailer 0.1
21+import "../../Components"
2122import "../../Components/MediaServices"
2223
2324/*! \brief Preview widget for video.
@@ -39,11 +40,25 @@ PreviewWidget {
3940 id: services
4041 width: parent.width
4142
43+ actions: sharingAction
4244 context: "video"
4345 sourceData: widgetData
4446 fullscreen: false
4547 maximumEmbeddedHeight: rootItem.height / 2
4648
4749 onClose: fullscreen = false
50+
51+ Action {
52+ id: sharingAction
53+ iconName: "share"
54+ visible: sharingPicker.active
55+ onTriggered: sharingPicker.showPeerPicker()
56+ }
57+ }
58+
59+ SharingPicker {
60+ id: sharingPicker
61+ objectName: "sharingPicker"
62+ shareData: widgetData["share-data"]
4863 }
4964}
qml/Dash/Previews/PreviewMediaToolbar.qml+5−5
@@ -19,16 +19,16 @@ import Ubuntu.Components 1.3
1919import "../../Components"
2020
2121Rectangle {
22− property alias shareData: sharingWidget.shareData
22+ property alias shareData: sharingPicker.shareData
2323
2424 implicitHeight: units.gu(6)
2525 color: Qt.rgba(0, 0, 0, 0.8)
26− visible: sharingWidget.active
26+ visible: sharingPicker.active
2727
2828 Action {
2929 id: sharingAction
3030 iconName: "share"
31− onTriggered: sharingWidget.showPeerPicker()
31+ onTriggered: sharingPicker.showPeerPicker()
3232 }
3333
3434 AbstractButton {
@@ -51,7 +51,7 @@ Rectangle {
5151 }
5252
5353 SharingPicker {
54− id: sharingWidget
55− objectName: "sharingWidget"
54+ id: sharingPicker
55+ objectName: "sharingPicker"
5656 }
5757}
tests/qmltests/Dash/Previews/tst_PreviewInlineVideo.qml+9−1
@@ -28,7 +28,15 @@ Rectangle {
2828
2929 property var widgetData0: {
3030 "source": "file:///test-video1",
31− "screenshot": Qt.resolvedUrl("../artwork/avatar.png")
31+ "screenshot": Qt.resolvedUrl("../artwork/avatar.png"),
32+ "share-data": {
33+ "uri": [
34+ "file:///this/is/an/url",
35+ "file:///this/is/an/url/2",
36+ "file:///this/is/an/url/3"
37+ ],
38+ "content-type": "text"
39+ }
3240 }
3341
3442 property var widgetData1: {