Merge lp:~michael-sheldon/webbrowser-app/link-share into lp:webbrowser-app

[Michael Sheldon]

Add support for sharing the URL of the current page via content-hub.

Adds support for sharing links via content-hub. A long press on the URL bar will now show a "Share..." option on mobile devices, which will present the peer picker, allowing the user to select a sharing app.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:575
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/872/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/949
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/861
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/71
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/71/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1343
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1704
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1704/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8531
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/746
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1001
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1001/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/872/rebuild

review: Needs Fixing (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/webbrowser-app) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * Added share action to URL bar long press as specified in old designs, this should be replaced with a share action in the top menu when the new design is complete.

If you changed the packaging (debian), did you subscribe a core-dev to this MP?

 * No change

[Michael Sheldon (michael-sheldon)]

This modified version of Ken's hub example can be used to test receiving links: mikeasoft.com/~mike/com.ubuntu.developer.ken-vandine.hub-importer_0.2_all.click

[Michael Sheldon (michael-sheldon)]

http://mikeasoft.com/~mike/com.ubuntu.developer.ken-vandine.hub-importer_0.2_all.click

[lp:~michael-sheldon/webbrowser-app/link-share]

579. By Michael Sheldon on 2014-06-23

Update translations

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:579
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/885/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/983
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/84
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/84/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1465
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1921
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1921/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8724
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/840
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1126
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1126/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/885/rebuild

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

Seeing a functional issue here: if I clear the address bar, then dismiss the chrome (leaving the address bar empty), then show it again and long press on the empty address bar, I’m still getting the context menu with the share option, even though there doesn’t seem to be anything to share (in fact what happens is that the URL of the current view is being shared, despite the address bar being empty, but I think this is counter-intuitive).

On a related note, instead of disabling the share action when chrome.url is empty or on desktop, this condition should be tested in the onPressAndHold slot before showing the popup. Indeed, the implementation of PopupUtils.open(…) doesn’t check whether the popup is empty, and what happens on desktop is that an empty popover is being shown (and it looks ugly).

review: Needs Fixing

[lp:~michael-sheldon/webbrowser-app/link-share]

580. By Michael Sheldon on 2014-06-25

Use correct ellipsis character

581. By Michael Sheldon on 2014-06-25

Only show share popover if we have a share item to show

582. By Michael Sheldon on 2014-06-25

Update translation template

[Olivier Tilloy (osomon)]

Looks good to me now, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:582
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/889/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1203
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1068
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/88
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/88/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1539
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2079
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2079/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8849
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/888
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1211
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1211/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/889/rebuild

review: Approve (continuous-integration)

=== modified file 'po/webbrowser-app.pot'
--- po/webbrowser-app.pot	2014-06-18 08:33:20 +0000
+++ po/webbrowser-app.pot	2014-06-25 16:34:38 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: webbrowser-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-18 10:33+0200\n"
+"POT-Creation-Date: 2014-06-25 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -81,15 +81,15 @@
 msgid "Back to safety"
 msgstr ""
 
-#: src/app/Chrome.qml:72 src/app/actions/Back.qml:23
+#: src/app/Chrome.qml:75 src/app/actions/Back.qml:23
 msgid "Back"
 msgstr ""
 
-#: src/app/Chrome.qml:91 src/app/actions/Forward.qml:23
+#: src/app/Chrome.qml:94 src/app/actions/Forward.qml:23
 msgid "Forward"
 msgstr ""
 
-#: src/app/Chrome.qml:126 src/app/webbrowser/ActivityView.qml:36
+#: src/app/Chrome.qml:157 src/app/webbrowser/ActivityView.qml:36
 msgid "Activity"
 msgstr ""
 
@@ -244,6 +244,10 @@
 msgid "Save image"
 msgstr ""
 
+#: src/app/actions/ShareLink.qml:22
+msgid "Share…"
+msgstr ""
+
 #: src/app/webbrowser/ActivityView.qml:54
 msgid "Bookmarks"
 msgstr ""

=== modified file 'src/app/AddressBar.qml'
--- src/app/AddressBar.qml	2014-06-06 17:01:55 +0000
+++ src/app/AddressBar.qml	2014-06-25 16:34:38 +0000
@@ -29,6 +29,7 @@
     property bool loading
     signal requestReload()
     signal requestStop()
+    signal pressAndHold()
 
     height: textField.height
 
@@ -120,6 +121,9 @@
                 textField.forceActiveFocus()
                 textField.selectAll()
             }
+            onPressAndHold: {
+                addressbar.pressAndHold()
+            }
         }
     }
 

=== modified file 'src/app/Chrome.qml'
--- src/app/Chrome.qml	2014-05-22 12:38:25 +0000
+++ src/app/Chrome.qml	2014-06-25 16:34:38 +0000
@@ -18,6 +18,8 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+import "actions" as Actions
 
 Item {
     id: chrome
@@ -25,6 +27,7 @@
     property alias url: addressBar.actualUrl
     signal urlValidated(url url)
     property alias addressBar: addressBar
+    property string title
     property alias loading: addressBar.loading
     property alias loadProgress: progressBar.value
     property alias canGoBack: backButton.enabled
@@ -92,6 +95,29 @@
         onTriggered: chrome.goForwardClicked()
     }
 
+    Component {
+        id: addressBarPopover
+        ActionSelectionPopover {
+            actions: ActionList {
+                Actions.ShareLink {
+                    onTriggered: shareLoader.item.shareLink(chrome.url, chrome.title)
+                }    
+            }
+        }
+    }
+
+    Item {
+        id: addressBarPopOverPositioner
+        anchors.bottom: addressBar.top
+        anchors.horizontalCenter: addressBar.horizontalCenter
+        visible: false
+    }
+
+    Loader {
+        id: shareLoader
+        source: formFactor == "desktop" ? "" : "Share.qml"
+    }
+
     AddressBar {
         id: addressBar
         objectName: "addressBar"
@@ -107,6 +133,11 @@
         onValidated: chrome.urlValidated(requestedUrl)
         onRequestReload: chrome.requestReload()
         onRequestStop: chrome.requestStop()
+        onPressAndHold: {
+            if (chrome.url && shareLoader.status == Loader.Ready) {
+                PopupUtils.open(addressBarPopover, addressBarPopOverPositioner)
+            }
+        }
         visible: addressBarVisible
     }
 

=== added file 'src/app/ContentShareDialog.qml'
--- src/app/ContentShareDialog.qml	1970-01-01 00:00:00 +0000
+++ src/app/ContentShareDialog.qml	2014-06-25 16:34:38 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Content 0.1
+
+PopupBase {
+    id: shareDialog
+    anchors.fill: parent
+    property var activeTransfer
+    property var items: []
+    property alias contentType: peerPicker.contentType
+
+    Rectangle {
+        anchors.fill: parent
+        ContentPeerPicker {
+            id: peerPicker
+            handler: ContentHandler.Share
+            visible: parent.visible
+
+            onPeerSelected: {
+                activeTransfer = peer.request()
+                activeTransfer.items = shareDialog.items
+                activeTransfer.state = ContentTransfer.Charged
+                shareDialog.hide()
+            }
+
+            onCancelPressed: {
+                shareDialog.hide()
+            }
+        }
+    }
+}

=== modified file 'src/app/PanelLoader.qml'
--- src/app/PanelLoader.qml	2014-06-11 07:03:29 +0000
+++ src/app/PanelLoader.qml	2014-06-25 16:34:38 +0000
@@ -75,6 +75,7 @@
                 id: chrome
 
                 anchors.fill: parent
+                title: currentWebview.title
 
                 Connections {
                     target: chromePanel

=== added file 'src/app/Share.qml'
--- src/app/Share.qml	1970-01-01 00:00:00 +0000
+++ src/app/Share.qml	2014-06-25 16:34:38 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.DownloadManager 0.1
+import Ubuntu.Content 0.1
+
+Item {
+    id: shareItem
+
+    ContentShareDialog {
+        id: shareDialog
+    }
+
+    Component {
+        id: contentItemComponent
+        ContentItem { }
+    }
+
+    function share(url, name, contentType) {
+        shareDialog.contentType = contentType
+        shareDialog.items.push(contentItemComponent.createObject(shareItem, {"url" : url, "name" : name}))
+        shareDialog.show()
+    }
+
+    function shareLink(url, title) {
+        share(url, title, ContentType.Links)
+    }
+
+}

=== added file 'src/app/actions/ShareLink.qml'
--- src/app/actions/ShareLink.qml	1970-01-01 00:00:00 +0000
+++ src/app/actions/ShareLink.qml	2014-06-25 16:34:38 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import Ubuntu.Components 0.1
+
+Action {
+    text: i18n.tr("Share…")
+    iconName: "share"
+}