Merge lp:~osomon/webbrowser-app/itemSelector into lp:webbrowser-app

[Olivier Tilloy]

Add support for <select> dropdowns.

The bug was originally reported for the dropdowns at http://juju.ubuntu.com/survey. This branch fixes it, however it uncovered another bug (a crasher), which makes this page not usable (and thus not a good one for testing).

The following page is suitable for testing the functionality though: http://mdn.mozillademos.org/en-US/docs/HTML/Element/optgroup$samples/Example?revision=344959

A known issue is that when an option is selected, the dropdown widget on the page is not always updated to display the current selection, until clicking somewhere else on the page. This seems to be an issue in QtWebkit itself though, as I’m observing the same problem with the QML MiniBrowser built from WebKit’s source tree. I’ll try to get confirmation from the QtWebKit developers.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:100
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-i386-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/222

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

Note: a minor issue I’m seeing is a binding loop warning issued when the item selector is shown:

    file:///home/osomon/dev/phablet/browser/itemSelector/src/Ubuntu/Browser/Browser.qml:166:36: QML ItemSelector: Binding loop detected for property "contentHeight"

This is harmless though, and I haven’t found a way to get rid of it yet. I think it can be addressed separately.

[Günter Schwann (schwann)]

In case there is no grouping - should the section delegate have height 0, and be set visible false?

After every model.accept(), the itemSelector would become invisible (I guess). So in that case every model.accept() would be followed by a model.reject(). Is that correct?

[Olivier Tilloy (osomon)]

> In case there is no grouping - should the section delegate have height 0, and
> be set visible false?

Not needed: the listview internals already take care of that, so if there is no grouping the section delegates won’t even be instantiated. You can test it with e.g. http://www.w3schools.com/tags/tryit.asp?filename=tryhtml_select.

> After every model.accept(), the itemSelector would become invisible (I guess).
> So in that case every model.accept() would be followed by a model.reject(). Is
> that correct?

No need to call selectorModel.reject(). Calling selectorModel.accept() already takes care of destroying the component and communicating the selected value back to the <select> element.

[Günter Schwann (schwann)]

I see that warning: src/Ubuntu/Browser/Browser.qml:166:36: QML ItemSelector: Binding loop detected for property "contentHeight"

And the selector only gets updated, once I click somewhere in the document.

[Günter Schwann (schwann)]

And good to know the first issues are no issues :)

[Olivier Tilloy (osomon)]

> I see that warning: src/Ubuntu/Browser/Browser.qml:166:36: QML ItemSelector:
> Binding loop detected for property "contentHeight"
>
> And the selector only gets updated, once I click somewhere in the document.

Yes, known issues. See the description of the MR, and my first comment.

[lp:~osomon/webbrowser-app/itemSelector]

101. By Olivier Tilloy on 2013-03-21

Use an intermediate property to fool the QML engine and get rid of a binding loop warning.

[Olivier Tilloy (osomon)]

> Note: a minor issue I’m seeing is a binding loop warning issued when the item
> selector is shown:
>
> file:///home/osomon/dev/phablet/browser/itemSelector/src/Ubuntu/Browser/Br
> owser.qml:166:36: QML ItemSelector: Binding loop detected for property
> "contentHeight"
>
> This is harmless though, and I haven’t found a way to get rid of it yet. I
> think it can be addressed separately.

Revision 101 fixes that.

[lp:~osomon/webbrowser-app/itemSelector]

102. By Olivier Tilloy on 2013-03-21

Get rid of a useless id.

[Günter Schwann (schwann)]

fine now

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:102
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-i386-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-i386-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/230

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

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Browser/Browser.qml'
--- src/Ubuntu/Browser/Browser.qml	2013-03-14 09:27:06 +0000
+++ src/Ubuntu/Browser/Browser.qml	2013-03-21 16:47:19 +0000
@@ -163,6 +163,8 @@
             }
         }
 
+        experimental.itemSelector: ItemSelector {}
+
         onUrlChanged: {
             if (!browser.chromeless) {
                 chromeLoader.item.url = url

=== added file 'src/Ubuntu/Browser/ItemSelector.qml'
--- src/Ubuntu/Browser/ItemSelector.qml	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Browser/ItemSelector.qml	2013-03-21 16:47:19 +0000
@@ -0,0 +1,63 @@
+/*
+ * 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
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components.Popups 0.1
+
+Popover {
+    id: itemSelector
+
+    property QtObject selectorModel: model
+
+    caller: parent
+    contentWidth: Math.min(parent.width - units.gu(10), units.gu(40))
+    property real listContentHeight: 0 // intermediate property to avoid binding loop
+    contentHeight: Math.min(parent.height - units.gu(10), listContentHeight)
+
+    ListView {
+        clip: true
+        width: itemSelector.contentWidth
+        height: itemSelector.contentHeight
+
+        model: selectorModel.items
+
+        delegate: ListItem.Standard {
+            text: model.text
+            enabled: model.enabled
+            selected: model.selected
+            onClicked: selectorModel.accept(model.index)
+        }
+
+        section.property: "group"
+        section.delegate: ListItem.Header {
+            text: section
+        }
+
+        onContentHeightChanged: itemSelector.listContentHeight = contentHeight
+    }
+
+    Component.onCompleted: show()
+
+    onVisibleChanged: {
+        if (!visible) {
+            selectorModel.reject()
+        }
+    }
+}