Merge lp:~osomon/webbrowser-app/preview-hoveredUrl into lp:webbrowser-app

[Olivier Tilloy]

Display the currently hovered hyperlink’s target URL in an overlay.

[lp:~osomon/webbrowser-app/preview-hoveredUrl]

1453. By Olivier Tilloy on 2016-05-06

Property anchor the HoveredUrlLabel to the tab container.

[Michael Terry (mterry)]

I don't want to review the code itself for this project since I'm not really involved. But I tested this, and it worked great. Thanks Olivier!

review: Approve (test)

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1452
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/480/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/482
    FAILURE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/36/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/482
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/481
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/481
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/488
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/488/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/488
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/488/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/488
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/488/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/488
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/488/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/488
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/488/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/488
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/488/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/480/rebuild

review: Needs Fixing (continuous-integration)

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1453
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/481/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/483
    FAILURE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/37/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/483
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/482
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/482
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/489
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/489/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/489
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/489/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/489
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/489/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/489
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/489/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/489
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/489/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/489
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/489/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/481/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2016-04-28 14:39:20 +0000
+++ debian/control	2016-05-06 15:43:33 +0000
@@ -46,7 +46,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          fonts-liberation,
-         liboxideqt-qmlplugin (>= 1.9),
+         liboxideqt-qmlplugin (>= 1.12),
          libqt5sql5-sqlite,
          qml-module-qt-labs-folderlistmodel,
          qml-module-qt-labs-settings,

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2016-04-15 11:37:54 +0000
+++ src/app/webbrowser/Browser.qml	2016-05-06 15:43:33 +0000
@@ -19,7 +19,7 @@
 import QtQuick 2.4
 import QtQuick.Window 2.2
 import Qt.labs.settings 1.0
-import com.canonical.Oxide 1.8 as Oxide
+import com.canonical.Oxide 1.12 as Oxide
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
 import Unity.InputInfo 0.1
@@ -351,6 +351,18 @@
 
             asynchronous: true
         }
+
+        HoveredUrlLabel {
+            anchors {
+                left: tabContainer.left
+                leftMargin: units.dp(-1)
+                bottom: tabContainer.bottom
+                bottomMargin: units.dp(-1)
+            }
+            height: units.gu(3)
+            collapsedWidth: Math.min(units.gu(40), tabContainer.width)
+            webview: browser.currentWebview
+        }
     }
 
     FocusScope {

=== added file 'src/app/webbrowser/HoveredUrlLabel.qml'
--- src/app/webbrowser/HoveredUrlLabel.qml	1970-01-01 00:00:00 +0000
+++ src/app/webbrowser/HoveredUrlLabel.qml	2016-05-06 15:43:33 +0000
@@ -0,0 +1,89 @@
+/*
+* Copyright 2016 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.4
+import Ubuntu.Components 1.3
+
+Item {
+    id: root
+
+    property var webview: null
+    property real collapsedWidth: 0
+
+    states: [
+        State {
+            name: "hidden"
+        },
+        State {
+            name: "collapsed"
+        },
+        State {
+            name: "expanded"
+        }
+    ]
+    state: "hidden"
+    visible: state != "hidden"
+
+    width: (state == "expanded")
+               ? Math.max(collapsedWidth, label.contentWidth + label.anchors.margins * 2)
+               : collapsedWidth
+    Behavior on width {
+        UbuntuNumberAnimation {
+            duration: UbuntuAnimation.SnapDuration
+        }
+    }
+
+    Rectangle {
+        color: "#f6f6f6"
+        border {
+            width: units.dp(1)
+            color: UbuntuColors.silk
+        }
+        anchors.fill: parent
+    }
+
+    Timer {
+        id: timer
+        interval: 1000
+        onTriggered: root.state = "expanded"
+    }
+
+    Label {
+        id: label
+        anchors {
+            verticalCenter: parent.verticalCenter
+            margins: units.gu(1)
+            left: parent.left
+            right: (root.state == "expanded") ? undefined : parent.right
+        }
+        fontSize: "small"
+        elide: (root.state == "expanded") ? Text.ElideNone : Text.ElideRight
+        text: (root.webview && root.webview.visible) ? root.webview.hoveredUrl : ""
+        onTextChanged: {
+            if (text) {
+                if (root.state == "hidden") {
+                    root.state = "collapsed"
+                }
+                timer.restart()
+            } else {
+                timer.stop()
+                root.state = "hidden"
+            }
+        }
+    }
+}

=== added file 'tests/unittests/qml/tst_HoveredUrlLabel.qml'
--- tests/unittests/qml/tst_HoveredUrlLabel.qml	1970-01-01 00:00:00 +0000
+++ tests/unittests/qml/tst_HoveredUrlLabel.qml	2016-05-06 15:43:33 +0000
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2016 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.4
+import QtTest 1.0
+import "../../../src/app/webbrowser"
+
+Item {
+    width: 200
+    height: 200
+
+    Item {
+        id: webviewMock
+        property url hoveredUrl
+    }
+
+    Loader {
+        id: loader
+        active: false
+        sourceComponent: HoveredUrlLabel {
+            webview: webviewMock
+        }
+    }
+
+    SignalSpy {
+        id: visibleSpy
+        target: loader.item
+        signalName: "visibleChanged"
+    }
+
+    SignalSpy {
+        id: stateSpy
+        target: loader.item
+        signalName: "stateChanged"
+    }
+
+    TestCase {
+        name: "HoveredUrlLabel"
+        when: windowShown
+
+        readonly property var label: loader.item
+
+        function init() {
+            visibleSpy.clear()
+            stateSpy.clear()
+            webviewMock.hoveredUrl = ""
+            loader.active = true
+        }
+
+        function cleanup() {
+            loader.active = false
+        }
+
+        function test_states() {
+            compare(label.state, "hidden")
+            compare(stateSpy.count, 0)
+            verify(!label.visible)
+            compare(visibleSpy.count, 0)
+
+            webviewMock.hoveredUrl = "http://example.org"
+            compare(label.state, "collapsed")
+            compare(stateSpy.count, 1)
+            verify(label.visible)
+            compare(visibleSpy.count, 1)
+
+            webviewMock.hoveredUrl = "http://example.com"
+            compare(label.state, "collapsed")
+            compare(stateSpy.count, 1)
+            verify(label.visible)
+            compare(visibleSpy.count, 1)
+
+            stateSpy.clear()
+            stateSpy.wait(2000)
+            compare(label.state, "expanded")
+            compare(stateSpy.count, 1)
+            verify(label.visible)
+            compare(visibleSpy.count, 1)
+
+            webviewMock.hoveredUrl = "http://ubuntu.com"
+            compare(label.state, "expanded")
+            compare(stateSpy.count, 1)
+            verify(label.visible)
+            compare(visibleSpy.count, 1)
+
+            webviewMock.hoveredUrl = ""
+            compare(label.state, "hidden")
+            compare(stateSpy.count, 2)
+            verify(!label.visible)
+            compare(visibleSpy.count, 2)
+        }
+    }
+}