git.iko.soy/unity8
on xenial help sign in
Renamed properties
commitf86104c4d217ad26165fddd1a51a2130893184bd authorAndrea Cimitan <andrea.cimitan@gmail.com> dateTue 13 Oct 2015, 10:50 (11 years ago) parent320765a
4 files changed+21−15
compare with xenial
unifiedsplit
qml/Dash/Previews/PreviewSharing.qml+8−6 qml/Dash/Previews/PreviewVideoPlayback.qml+1−1 qml/Dash/Previews/PreviewZoomableImage.qml+1−1 tests/qmltests/Dash/Previews/tst_PreviewSharing.qml+11−7
qml/Dash/Previews/PreviewSharing.qml+8−6
@@ -23,10 +23,10 @@ Item {
2323 implicitHeight: button.height
2424 implicitWidth: button.width
2525
26− property var shareUris
26+ property var shareData
2727 readonly property bool isUrlExternal: url && url.indexOf("file:///") != 0 && url.indexOf("/") != 0
28− readonly property string contentType: shareUris ? shareUris["contentType"] : ""
29− readonly property string url: shareUris ? shareUris["uri"] : ""
28+ readonly property string contentType: shareData ? shareData["contentType"] : ""
29+ readonly property var url: shareData ? shareData["uri"] : ""
3030 readonly property Item rootItem: QuickUtils.rootItem(root)
3131
3232 visible: url != ""
@@ -78,9 +78,11 @@ Item {
7878 var transfer = peer.request();
7979 if (transfer.state === ContentTransfer.InProgress) {
8080 var items = new Array();
81− var exportItem = exportItemComponent.createObject();
82− exportItem.url = url;
83− items.push(exportItem);
81+ for (var i = 0; i < url.length; i++) {
82+ var exportItem = exportItemComponent.createObject();
83+ exportItem.url = url[i];
84+ items.push(exportItem);
85+ }
8486 transfer.items = items;
8587 transfer.state = ContentTransfer.Charged;
8688 }
qml/Dash/Previews/PreviewVideoPlayback.qml+1−1
@@ -92,7 +92,7 @@ PreviewWidget {
9292 verticalCenter: parent.verticalCenter
9393 leftMargin: units.gu(1)
9494 }
95− shareUris: widgetData["shareUris"]
95+ shareData: widgetData["shareData"]
9696 }
9797 }
9898 }
qml/Dash/Previews/PreviewZoomableImage.qml+1−1
@@ -83,7 +83,7 @@ PreviewWidget {
8383 verticalCenter: parent.verticalCenter
8484 leftMargin: units.gu(1)
8585 }
86− shareUris: widgetData["shareUris"]
86+ shareData: widgetData["shareData"]
8787 }
8888 }
8989 }
tests/qmltests/Dash/Previews/tst_PreviewSharing.qml+11−7
@@ -24,14 +24,18 @@ Rectangle {
2424 id: root
2525 width: units.gu(40)
2626 height: units.gu(80)
27− color: Theme.palette.selected.background
27+ color: "black"
2828
29− property var shareUris: {
30− "uri": "Text here",
29+ property var shareData: {
30+ "uri": [
31+ "Text here",
32+ "text here 2",
33+ "text here 3"
34+ ],
3135 "contentType": "text"
3236 }
3337
34− property var shareUrisNoUri: {
38+ property var shareDataNoUri: {
3539 "uri": "",
3640 "contentType": "text"
3741 }
@@ -39,7 +43,7 @@ Rectangle {
3943 PreviewSharing {
4044 id: previewSharing
4145 anchors { left: parent.left; bottom: parent.bottom; }
42− shareUris: root.shareUris
46+ shareData: root.shareData
4347 }
4448
4549 UT.UnityTestCase {
@@ -50,12 +54,12 @@ Rectangle {
5054
5155 function cleanup() {
5256 peerPicker.visible = false;
53− previewSharing.shareUris = root.shareUris;
57+ previewSharing.shareData = root.shareData;
5458 }
5559
5660 function test_visible() {
5761 compare(previewSharing.visible, true);
58− previewSharing.shareUris = shareUrisNoUri;
62+ previewSharing.shareData = shareDataNoUri;
5963 compare(previewSharing.visible, false);
6064 }
6165