git.iko.soy/unity8
on xenial help sign in
moved sharing widget inside components
commit216010810804779ab1c9dbb42502ffe76393e4a7 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateFri 20 May 2016, 13:07 (10 years ago) parent26b5761
4 files changed+28−26
compare with xenial
unifiedsplit
qml/Dash/Previews/PreviewSharing.qml → qml/Components/SharingPicker.qml+2−14 qml/Dash/Previews/PreviewMediaToolbar.qml+17−3 tests/qmltests/CMakeLists.txt+1−1 tests/qmltests/Dash/Previews/tst_PreviewSharing.qml → tests/qmltests/Components/tst_SharingPicker.qml+8−8
qml/Dash/Previews/PreviewSharing.qml → qml/Components/SharingPicker.qmlrenamed+2−14
@@ -20,8 +20,6 @@ import Ubuntu.Content 1.1
2020
2121Item {
2222 id: root
23− implicitHeight: button.height
24− implicitWidth: button.width
2523
2624 property var shareData
2725 property alias active: peerPicker.active
@@ -30,18 +28,8 @@ Item {
3028 readonly property var url: shareData ? shareData["uri"] : ""
3129 readonly property Item rootItem: QuickUtils.rootItem(root)
3230
33− AbstractButton {
34− id: button
35− height: units.gu(4)
36− width: units.gu(4)
37− onClicked: 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− }
31+ function showPeerPicker() {
32+ peerPicker.visible = true
4533 }
4634
4735 function createExportedItems(url) {
qml/Dash/Previews/PreviewMediaToolbar.qml+17−3
@@ -25,13 +25,27 @@ Rectangle {
2525 color: Qt.rgba(0, 0, 0, 0.8)
2626 visible: sharingWidget.active
2727
28− PreviewSharing {
29− id: sharingWidget
30− objectName: "sharingWidget"
28+ AbstractButton {
29+ id: button
3130 anchors {
3231 left: parent.left
3332 verticalCenter: parent.verticalCenter
3433 leftMargin: units.gu(1)
3534 }
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"
3650 }
3751}
tests/qmltests/CMakeLists.txt+1−1
@@ -18,6 +18,7 @@ add_unity8_qmltest(Components PhysicalKeysMapper)
1818add_unity8_qmltest(Components Rating)
1919add_unity8_qmltest(Components ResponsiveGridView)
2020add_unity8_qmltest(Components ResponsiveVerticalJournal)
21+add_unity8_qmltest(Components SharingPicker)
2122add_unity8_qmltest(Components Showable)
2223add_unity8_qmltest(Components VirtualTouchPad)
2324add_unity8_qmltest(Components WallpaperResolver)
@@ -49,7 +50,6 @@ add_unity8_qmltest(Dash/Previews PreviewRatingDisplay)
4950add_unity8_qmltest(Dash/Previews PreviewRatingDisplayCreationRanges)
5051add_unity8_qmltest(Dash/Previews PreviewRatingEdit)
5152add_unity8_qmltest(Dash/Previews PreviewRatingInput)
52−add_unity8_qmltest(Dash/Previews PreviewSharing)
5353add_unity8_qmltest(Dash/Previews PreviewTable)
5454add_unity8_qmltest(Dash/Previews PreviewTextSummary)
5555add_unity8_qmltest(Dash/Previews PreviewVideoPlayback)
tests/qmltests/Dash/Previews/tst_PreviewSharing.qml → tests/qmltests/Components/tst_SharingPicker.qmlrenamed+8−8
@@ -17,7 +17,7 @@
1717import QtQuick 2.4
1818import QtTest 1.0
1919import Ubuntu.Components 1.3
20−import "../../../../qml/Dash/Previews"
20+import "../../../qml/Components"
2121import Unity.Test 0.1 as UT
2222
2323Rectangle {
@@ -40,33 +40,33 @@ Rectangle {
4040 "content-type": "text"
4141 }
4242
43− PreviewSharing {
44− id: previewSharing
43+ SharingPicker {
44+ id: sharingPicker
4545 anchors { left: parent.left; bottom: parent.bottom; }
4646 shareData: root.shareData
4747 }
4848
4949 UT.UnityTestCase {
50− name: "PreviewSharingTest"
50+ name: "SharingPickerTest"
5151 when: windowShown
5252
53− property Item peerPicker: findChild(previewSharing.rootItem, "peerPicker")
53+ property Item peerPicker: findChild(sharingPicker.rootItem, "peerPicker")
5454
5555 function cleanup() {
5656 peerPicker.visible = false;
5757 }
5858
5959 function test_open_picker() {
60− mouseClick(previewSharing);
60+ sharingPicker.showPeerPicker();
6161 compare(peerPicker.visible, true);
6262 }
6363
6464 function test_createExportedItems() {
65− var exportedItems = previewSharing.createExportedItems(shareData["uri"]);
65+ var exportedItems = sharingPicker.createExportedItems(shareData["uri"]);
6666 for (var i = 0; i < exportedItems.length; i++) {
6767 compare(exportedItems[i].url, shareData["uri"][i]);
6868 }
69− exportedItems = previewSharing.createExportedItems(shareDataString["uri"]);
69+ exportedItems = sharingPicker.createExportedItems(shareDataString["uri"]);
7070 compare(exportedItems[0].url, shareDataString["uri"]);
7171 }
7272 }