git.iko.soy/unity8
on xenial help sign in
moved sharing widget inside components
2160108Andrea Cimitan
qml/Dash/Previews/PreviewSharing.qml → qml/Components/SharingPicker.qmlrenamed+2−14
compare with xenial
unifiedsplit
@@ -20,8 +20,6 @@ import Ubuntu.Content 1.1
20
20
21Item {
21Item {
22 id: root
22 id: root
23− implicitHeight: button.height
24− implicitWidth: button.width
25
23
26 property var shareData
24 property var shareData
27 property alias active: peerPicker.active
25 property alias active: peerPicker.active
@@ -30,18 +28,8 @@ Item {
30 readonly property var url: shareData ? shareData["uri"] : ""
28 readonly property var url: shareData ? shareData["uri"] : ""
31 readonly property Item rootItem: QuickUtils.rootItem(root)
29 readonly property Item rootItem: QuickUtils.rootItem(root)
32
30
33− AbstractButton {
31+ function showPeerPicker() {
34− id: button
35− height: units.gu(4)
36− width: units.gu(4)
37− onClicked: peerPicker.visible = true
32+ peerPicker.visible = true
38−
39− Icon {
40− anchors.centerIn: parent
41− height: units.gu(3)
42− width: units.gu(3)
43− source: "image://theme/share"
44− }
45 }
33 }
46
34
47 function createExportedItems(url) {
35 function createExportedItems(url) {
qml/Dash/Previews/PreviewMediaToolbar.qml+17−3
@@ -25,13 +25,27 @@ Rectangle {
25 color: Qt.rgba(0, 0, 0, 0.8)
25 color: Qt.rgba(0, 0, 0, 0.8)
26 visible: sharingWidget.active
26 visible: sharingWidget.active
27
27
28− PreviewSharing {
28+ AbstractButton {
29− id: sharingWidget
29+ id: button
30− objectName: "sharingWidget"
31 anchors {
30 anchors {
32 left: parent.left
31 left: parent.left
33 verticalCenter: parent.verticalCenter
32 verticalCenter: parent.verticalCenter
34 leftMargin: units.gu(1)
33 leftMargin: units.gu(1)
35 }
34 }
35+ height: units.gu(4)
36+ width: units.gu(4)
37+ onClicked: sharingWidget.showPeerPicker()
38+
39+ Icon {
40+ anchors.centerIn: parent
41+ height: units.gu(3)
42+ width: units.gu(3)
43+ source: "image://theme/share"
44+ }
45+ }
46+
47+ SharingPicker {
48+ id: sharingWidget
49+ objectName: "sharingWidget"
36 }
50 }
37}
51}
tests/qmltests/CMakeLists.txt+1−1
@@ -18,6 +18,7 @@ add_unity8_qmltest(Components PhysicalKeysMapper)
18add_unity8_qmltest(Components Rating)
18add_unity8_qmltest(Components Rating)
19add_unity8_qmltest(Components ResponsiveGridView)
19add_unity8_qmltest(Components ResponsiveGridView)
20add_unity8_qmltest(Components ResponsiveVerticalJournal)
20add_unity8_qmltest(Components ResponsiveVerticalJournal)
21+add_unity8_qmltest(Components SharingPicker)
21add_unity8_qmltest(Components Showable)
22add_unity8_qmltest(Components Showable)
22add_unity8_qmltest(Components VirtualTouchPad)
23add_unity8_qmltest(Components VirtualTouchPad)
23add_unity8_qmltest(Components WallpaperResolver)
24add_unity8_qmltest(Components WallpaperResolver)
@@ -49,7 +50,6 @@ add_unity8_qmltest(Dash/Previews PreviewRatingDisplay)
49add_unity8_qmltest(Dash/Previews PreviewRatingDisplayCreationRanges)
50add_unity8_qmltest(Dash/Previews PreviewRatingDisplayCreationRanges)
50add_unity8_qmltest(Dash/Previews PreviewRatingEdit)
51add_unity8_qmltest(Dash/Previews PreviewRatingEdit)
51add_unity8_qmltest(Dash/Previews PreviewRatingInput)
52add_unity8_qmltest(Dash/Previews PreviewRatingInput)
52−add_unity8_qmltest(Dash/Previews PreviewSharing)
53add_unity8_qmltest(Dash/Previews PreviewTable)
53add_unity8_qmltest(Dash/Previews PreviewTable)
54add_unity8_qmltest(Dash/Previews PreviewTextSummary)
54add_unity8_qmltest(Dash/Previews PreviewTextSummary)
55add_unity8_qmltest(Dash/Previews PreviewVideoPlayback)
55add_unity8_qmltest(Dash/Previews PreviewVideoPlayback)
tests/qmltests/Dash/Previews/tst_PreviewSharing.qml → tests/qmltests/Components/tst_SharingPicker.qmlrenamed+8−8
@@ -17,7 +17,7 @@
17import QtQuick 2.4
17import QtQuick 2.4
18import QtTest 1.0
18import QtTest 1.0
19import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
20−import "../../../../qml/Dash/Previews"
20+import "../../../qml/Components"
21import Unity.Test 0.1 as UT
21import Unity.Test 0.1 as UT
22
22
23Rectangle {
23Rectangle {
@@ -40,33 +40,33 @@ Rectangle {
40 "content-type": "text"
40 "content-type": "text"
41 }
41 }
42
42
43− PreviewSharing {
43+ SharingPicker {
44− id: previewSharing
44+ id: sharingPicker
45 anchors { left: parent.left; bottom: parent.bottom; }
45 anchors { left: parent.left; bottom: parent.bottom; }
46 shareData: root.shareData
46 shareData: root.shareData
47 }
47 }
48
48
49 UT.UnityTestCase {
49 UT.UnityTestCase {
50− name: "PreviewSharingTest"
50+ name: "SharingPickerTest"
51 when: windowShown
51 when: windowShown
52
52
53− property Item peerPicker: findChild(previewSharing.rootItem, "peerPicker")
53+ property Item peerPicker: findChild(sharingPicker.rootItem, "peerPicker")
54
54
55 function cleanup() {
55 function cleanup() {
56 peerPicker.visible = false;
56 peerPicker.visible = false;
57 }
57 }
58
58
59 function test_open_picker() {
59 function test_open_picker() {
60− mouseClick(previewSharing);
60+ sharingPicker.showPeerPicker();
61 compare(peerPicker.visible, true);
61 compare(peerPicker.visible, true);
62 }
62 }
63
63
64 function test_createExportedItems() {
64 function test_createExportedItems() {
65− var exportedItems = previewSharing.createExportedItems(shareData["uri"]);
65+ var exportedItems = sharingPicker.createExportedItems(shareData["uri"]);
66 for (var i = 0; i < exportedItems.length; i++) {
66 for (var i = 0; i < exportedItems.length; i++) {
67 compare(exportedItems[i].url, shareData["uri"][i]);
67 compare(exportedItems[i].url, shareData["uri"][i]);
68 }
68 }
69− exportedItems = previewSharing.createExportedItems(shareDataString["uri"]);
69+ exportedItems = sharingPicker.createExportedItems(shareDataString["uri"]);
70 compare(exportedItems[0].url, shareDataString["uri"]);
70 compare(exportedItems[0].url, shareDataString["uri"]);
71 }
71 }
72 }
72 }