Merge lp:~osomon/webbrowser-app/panel-inside-loader into lp:webbrowser-app

[Olivier Tilloy]

Move the Panel inside the Loader, so that it is not instantiated when in chromeless mode.

[Günter Schwann (schwann)]

Looks good and works as expected

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:142
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/99/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-amd64-ci/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/96
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/96/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-i386-ci/96
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1675

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:142
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/100/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/97
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/97/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-i386-ci/97
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1678

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:142
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/102/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-amd64-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/99
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/99/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-i386-ci/99
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1687

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

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Browser/Browser.qml'
--- src/Ubuntu/Browser/Browser.qml	2013-05-20 14:37:23 +0000
+++ src/Ubuntu/Browser/Browser.qml	2013-05-24 15:38:41 +0000
@@ -187,7 +187,7 @@
 
             onUrlChanged: {
                 if (!browser.chromeless) {
-                    chromeLoader.item.url = url
+                    panel.chrome.url = url
                 }
             }
 
@@ -286,70 +286,67 @@
             align: Qt.AlignBottom
         }
 
-        Panel {
+        Loader {
             id: panel
 
-            locked: browser.chromeless
+            property Item chrome: item ? item.contents[0] : null
+
+            sourceComponent: browser.chromeless ? undefined : panelComponent
 
             anchors {
                 left: parent.left
                 right: parent.right
-                bottom: opened ? osk.top : parent.bottom
+                bottom: (item && item.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.loadProgress == 0)
-                }
-
-                Binding {
-                    target: chromeLoader.item
-                    property: "loadProgress"
-                    value: webview.loadProgress
-                }
-
-                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
-                    property bool stopped: false
-                    onLoadingChanged: {
-                        if (chromeLoader.item.loading) {
-                            panel.opened = true
-                        } else if (stopped) {
-                            stopped = false
-                        } else if (!chromeLoader.item.addressBar.activeFocus) {
-                            panel.opened = false
-                            webview.forceActiveFocus()
-                        }
+
+            Component {
+                id: panelComponent
+
+                Panel {
+                    anchors {
+                        left: parent ? parent.left : undefined
+                        right: parent ? parent.right : undefined
+                        bottom: parent ? parent.bottom : undefined
                     }
-                    onRequestReload: webview.reload()
-                    onRequestStop: {
-                        stopped = true
-                        webview.stop()
+                    height: units.gu(8)
+
+                    opened: true
+
+                    Chrome {
+                        anchors.fill: parent
+
+                        loading: webview.loading || (webview.loadProgress == 0)
+                        loadProgress: webview.loadProgress
+
+                        canGoBack: webview.canGoBack
+                        onGoBackClicked: webview.goBack()
+
+                        canGoForward: webview.canGoForward
+                        onGoForwardClicked: webview.goForward()
+
+                        onUrlValidated: browser.url = url
+
+                        property bool stopped: false
+                        onLoadingChanged: {
+                            if (loading) {
+                                if (panel.item) {
+                                    panel.item.opened = true
+                                }
+                            } else if (stopped) {
+                                stopped = false
+                            } else if (!addressBar.activeFocus) {
+                                if (panel.item) {
+                                    panel.item.opened = false
+                                }
+                                webview.forceActiveFocus()
+                            }
+                        }
+
+                        onRequestReload: webview.reload()
+                        onRequestStop: {
+                            stopped = true
+                            webview.stop()
+                        }
                     }
                 }
             }