Merge lp:~osomon/webbrowser-app/sdk-generic-toolbar into lp:webbrowser-app

[Olivier Tilloy]

Replace the custom RevealingBar component with the Panel from the UITK.

Note to the reviewer: this change depends on a version of the UITK that hasn’t been released yet (trunk revision 461), so it shouldn’t be approved until the UITK gets a newer release.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:124
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/68/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/65
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/65/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-i386-ci/65

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

review: Approve (continuous-integration)

[lp:~osomon/webbrowser-app/sdk-generic-toolbar]

125. By Olivier Tilloy on 2013-05-03

Merge the latest changes from trunk.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:125
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/71/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-amd64-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/68
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/68/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-i386-ci/68

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

review: Approve (continuous-integration)

[Ugo Riboni (uriboni)]

Works as advertised and can't spot any issues in the code

review: Approve

=== modified file 'src/Ubuntu/Browser/Browser.qml'
--- src/Ubuntu/Browser/Browser.qml	2013-05-03 01:10:43 +0000
+++ src/Ubuntu/Browser/Browser.qml	2013-05-03 17:23:25 +0000
@@ -196,7 +196,7 @@
 
             onActiveFocusChanged: {
                 if (activeFocus) {
-                    revealingBar.hide()
+                    panel.opened = false
                 }
             }
 
@@ -295,11 +295,56 @@
             align: Qt.AlignBottom
         }
 
-        RevealingBar {
-            id: revealingBar
-            enabled: !browser.chromeless
-            contents: chromeLoader.item
-            anchors.bottom: shown ? osk.top : parent.bottom
+        Panel {
+            id: panel
+
+            locked: browser.chromeless
+
+            anchors {
+                left: parent.left
+                right: parent.right
+                bottom: opened ? osk.top : parent.bottom
+            }
+            height: units.gu(8)
+
+            Loader {
+                id: chromeLoader
+
+                active: !browser.chromeless
+                source: "Chrome.qml"
+
+                anchors.fill: parent
+
+                Binding {
+                    target: chromeLoader.item
+                    property: "loading"
+                    value: webview.loading || (webview.progress == 0)
+                }
+
+                Binding {
+                    target: chromeLoader.item
+                    property: "canGoBack"
+                    value: webview.canGoBack
+                }
+
+                Binding {
+                    target: chromeLoader.item
+                    property: "canGoForward"
+                    value: webview.canGoForward
+                }
+
+                Connections {
+                    target: chromeLoader.item
+                    onGoBackClicked: webview.goBack()
+                    onGoForwardClicked: webview.goForward()
+                    onUrlValidated: {
+                        browser.url = url
+                        webview.forceActiveFocus()
+                    }
+                    onRequestReload: webview.reload()
+                    onRequestStop: webview.stop()
+                }
+            }
         }
 
         ProgressBar {
@@ -317,48 +362,6 @@
             value: webview.loadProgress
         }
 
-        Loader {
-            id: chromeLoader
-
-            active: !browser.chromeless
-            source: "Chrome.qml"
-
-            anchors.left: parent.left
-            anchors.right: parent.right
-
-            height: units.gu(8)
-
-            Binding {
-                target: chromeLoader.item
-                property: "loading"
-                value: webview.loading || (webview.progress == 0)
-            }
-
-            Binding {
-                target: chromeLoader.item
-                property: "canGoBack"
-                value: webview.canGoBack
-            }
-
-            Binding {
-                target: chromeLoader.item
-                property: "canGoForward"
-                value: webview.canGoForward
-            }
-
-            Connections {
-                target: chromeLoader.item
-                onGoBackClicked: webview.goBack()
-                onGoForwardClicked: webview.goForward()
-                onUrlValidated: {
-                    browser.url = url
-                    webview.forceActiveFocus()
-                }
-                onRequestReload: webview.reload()
-                onRequestStop: webview.stop()
-            }
-        }
-
         KeyboardRectangle {
             id: osk
         }

=== modified file 'src/Ubuntu/Browser/Chrome.qml'
--- src/Ubuntu/Browser/Chrome.qml	2013-04-18 15:48:38 +0000
+++ src/Ubuntu/Browser/Chrome.qml	2013-05-03 17:23:25 +0000
@@ -94,7 +94,7 @@
 
     Suggestions {
         id: suggestions
-        visible: addressBar.focus && (count > 0)
+        visible: addressBar.activeFocus && (count > 0)
         anchors {
             bottom: parent.top
             horizontalCenter: parent.horizontalCenter

=== removed file 'src/Ubuntu/Browser/RevealingBar.qml'
--- src/Ubuntu/Browser/RevealingBar.qml	2013-03-08 10:53:16 +0000
+++ src/Ubuntu/Browser/RevealingBar.qml	1970-01-01 00:00:00 +0000
@@ -1,112 +0,0 @@
-/*
- * Copyright 2013 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
-
-Item {
-    property bool shown: false
-    property bool locked: false
-    property Item contents: null
-    onContentsChanged: {
-        if (contents) {
-            contents.parent = bar
-        }
-    }
-
-    anchors.left: parent.left
-    anchors.right: parent.right
-
-    height: bar.height - bar.y
-
-    function show() {
-        bar.y = 0
-        if (contents) {
-            contents.forceActiveFocus()
-        }
-        shown = true
-    }
-
-    function hide() {
-        bar.y = bar.height
-        shown = false
-    }
-
-    MouseArea {
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.bottom: parent.bottom
-        height: bar.height
-        enabled: !parent.locked
-
-        drag.target: bar
-        drag.axis: Drag.YAxis
-        drag.minimumY: 0
-        drag.maximumY: height + bar.height
-
-        propagateComposedEvents: true
-
-        property int __pressedY
-        property int __lastY
-        property int __lastDrag
-
-        onPressed: {
-            __pressedY = mouse.y
-            __lastY = __pressedY
-            __lastDrag = 0
-        }
-
-        onPositionChanged: {
-            var drag = __lastY - mouse.y
-            __lastY = mouse.y
-            if (drag != 0 || __lastDrag == 0) {
-                __lastDrag = drag
-            }
-        }
-
-        function __doneDragging() {
-            if (__lastDrag > 0) {
-                show()
-            } else if (__lastDrag < 0) {
-                hide()
-            } else if (shown) {
-                show()
-            } else {
-                hide()
-            }
-        }
-
-        onReleased: __doneDragging()
-        onCanceled: __doneDragging()
-
-        Item {
-            id: bar
-
-            height: contents ? contents.height : 0
-            anchors.left: parent.left
-            anchors.right: parent.right
-            y: parent.height
-
-            Behavior on y {
-                NumberAnimation {
-                    duration: 150
-                }
-            }
-        }
-    }
-}

=== modified file 'tests/autopilot/webbrowser_app/tests/__init__.py'
--- tests/autopilot/webbrowser_app/tests/__init__.py	2013-04-30 23:21:59 +0000
+++ tests/autopilot/webbrowser_app/tests/__init__.py	2013-05-03 17:23:25 +0000
@@ -98,44 +98,22 @@
         self._temp_pages.append(path)
         return "file://" + path
 
-    def swipe_chrome_up(self, distance):
+    def reveal_chrome(self):
+        distance = self.main_window.get_chrome().height
         view = self.main_window.get_qml_view()
         x_line = int(view.x + view.width * 0.5)
         start_y = int(view.y + view.height - 1)
         stop_y = int(start_y - distance)
         self.mouse.drag(x_line, start_y, x_line, stop_y)
 
-    def swipe_chrome_down(self, distance):
+    def hide_chrome(self):
+        distance = self.main_window.get_chrome().height
         view = self.main_window.get_qml_view()
         x_line = int(view.x + view.width * 0.5)
         start_y = int(self.main_window.get_chrome().globalRect[1])
         stop_y = int(start_y + distance)
         self.mouse.drag(x_line, start_y, x_line, stop_y)
 
-    def reveal_chrome(self):
-        self.swipe_chrome_up(self.main_window.get_chrome().height)
-
-    def hide_chrome(self):
-        self.swipe_chrome_down(self.main_window.get_chrome().height)
-
-    def assert_chrome_eventually_shown(self):
-        view = self.main_window.get_qml_view()
-        chrome = self.main_window.get_chrome()
-        expected_y = view.y + view.height - chrome.height
-        self.assertThat(lambda: chrome.globalRect[1],
-                        Eventually(Equals(expected_y)))
-
-    def assert_chrome_hidden(self):
-        view = self.main_window.get_qml_view()
-        chrome = self.main_window.get_chrome()
-        self.assertThat(chrome.globalRect[1], Equals(view.y + view.height))
-
-    def assert_chrome_eventually_hidden(self):
-        view = self.main_window.get_qml_view()
-        chrome = self.main_window.get_chrome()
-        self.assertThat(lambda: chrome.globalRect[1],
-                        Eventually(Equals(view.y + view.height)))
-
     def go_to_url(self, url):
         self.reveal_chrome()
         address_bar = self.main_window.get_address_bar()

=== modified file 'tests/autopilot/webbrowser_app/tests/test_toolbar.py'
--- tests/autopilot/webbrowser_app/tests/test_toolbar.py	2013-04-30 22:59:39 +0000
+++ tests/autopilot/webbrowser_app/tests/test_toolbar.py	2013-05-03 17:23:25 +0000
@@ -8,6 +8,9 @@
 
 from __future__ import absolute_import
 
+from testtools.matchers import Equals
+from autopilot.matchers import Eventually
+
 from webbrowser_app.tests import BrowserTestCaseBase
 
 
@@ -15,59 +18,29 @@
 
     """Tests interaction with the toolbar."""
 
+    def assert_chrome_eventually_hidden(self):
+        view = self.main_window.get_qml_view()
+        chrome = self.main_window.get_chrome()
+        self.assertThat(lambda: chrome.globalRect[1],
+                        Eventually(Equals(view.y + view.height)))
+
     def test_reveal_chrome(self):
-        self.assert_chrome_hidden()
+        view = self.main_window.get_qml_view()
+        chrome = self.main_window.get_chrome()
+        self.assertThat(chrome.globalRect[1], Equals(view.y + view.height))
         self.reveal_chrome()
-        self.assert_chrome_eventually_shown()
-
-    def test_reveal_chrome_with_partial_swipe(self):
-        self.assert_chrome_hidden()
-        self.swipe_chrome_up(10)
-        self.assert_chrome_eventually_shown()
-
-    def test_reveal_chrome_with_long_swipe(self):
-        chrome = self.main_window.get_chrome()
-        self.assert_chrome_hidden()
-        self.swipe_chrome_up(chrome.height * 2)
-        self.assert_chrome_eventually_shown()
+        expected_y = view.y + view.height - chrome.height
+        self.assertThat(lambda: chrome.globalRect[1],
+                        Eventually(Equals(expected_y)))
 
     def test_hide_chrome(self):
         self.reveal_chrome()
         self.hide_chrome()
         self.assert_chrome_eventually_hidden()
 
-    def test_hide_chrome_with_partial_swipe(self):
-        self.reveal_chrome()
-        self.swipe_chrome_down(10)
-        self.assert_chrome_eventually_hidden()
-
-    def test_hide_chrome_with_long_swipe(self):
-        chrome = self.main_window.get_chrome()
-        self.reveal_chrome()
-        self.swipe_chrome_down(chrome.height * 2)
-        self.assert_chrome_eventually_hidden()
-
     def test_unfocus_chrome_hides_it(self):
         webview = self.main_window.get_web_view()
         self.reveal_chrome()
         self.mouse.move_to_object(webview)
         self.mouse.click()
         self.assert_chrome_eventually_hidden()
-
-    def test_swipe_down_hidden_chrome_doesnt_reveal_it(self):
-        view = self.main_window.get_qml_view()
-        x_line = int(view.x + view.width * 0.5)
-        start_y = int(view.y + view.height - 1)
-        stop_y = start_y + 20
-        self.mouse.drag(x_line, start_y, x_line, stop_y)
-        self.assert_chrome_eventually_hidden()
-
-    def test_swipe_shown_chrome_up_doesnt_hide_it(self):
-        view = self.main_window.get_qml_view()
-        chrome = self.main_window.get_chrome()
-        self.reveal_chrome()
-        x_line = int(view.x + view.width * 0.5)
-        start_y = int(chrome.globalRect[1])
-        stop_y = int(view.y - 1)
-        self.mouse.drag(x_line, start_y, x_line, stop_y)
-        self.assert_chrome_eventually_shown()