Merge lp:~zsombi/ubuntu-ui-toolkit/listitem_selectmode into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Fixing selected connection with the ListItem's select mode checkbox state.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1554
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1974/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/702/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/704/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/701/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1974/rebuild

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/listitem_selectmode]

1555. By Tim Peeters on 2015-07-10

trunk sync

1556. By Cris Dywan on 2015-07-10

Initialize defaultTypes later to avoid bogus types.

Approved by Zsombor Egri, PS Jenkins bot.

1557. By Cris Dywan on 2015-07-13

Remove "do cleanup" comments. Fixes: https://bugs.launchpad.net/bugs/1369874.

Approved by Zsombor Egri, PS Jenkins bot.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1556
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1979/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/707/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/709/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/706/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1979/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1557
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1982/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/710
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/712
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/712/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/709

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1982/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1558
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1986/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/714
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/716
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/716/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/713

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1986/rebuild

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/listitem_selectmode]

1558. By Cris Dywan on 2015-07-13

Add apicheck unit test for QML and Javascript.

Approved by PS Jenkins bot, Zsombor Egri.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1559
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1987/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/715
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/717
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/717/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/714

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1987/rebuild

review: Approve (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/listitem_selectmode]

1559. By Cris Dywan on 2015-07-13

Avoid hard-coded skipping of members by name

"type" can be a property name regardless of also
being a field in the JSON description of a property.

Approved by Zsombor Egri, PS Jenkins bot.

1560. By Timo Jyrinki on 2015-07-13

Add PageHeadStyle 1.3 reference to fix install_plugins_qmltypes failure with Qt 5.5. Fixes: https://bugs.launchpad.net/bugs/1466484.

Approved by PS Jenkins bot, Zsombor Egri.

1561. By Timo Jyrinki on 2015-07-13

Fix ucstylehints.cpp compilation with Qt 5.5. Fixes: https://bugs.launchpad.net/bugs/1473873.

Approved by Zsombor Egri, PS Jenkins bot.

[Tim Peeters (tpeeters)]

Looks good, only one comment: can you add the bug id in the test function name? See
$ grep test tests/unit_x11/tst_components/* | grep bug

[lp:~zsombi/ubuntu-ui-toolkit/listitem_selectmode]

1562. By Zsombor Egri on 2015-07-14

Fixing selected connection with the ListItem's select mode checkbox state. Fixes: https://bugs.launchpad.net/bugs/1461501, https://bugs.launchpad.net/bugs/1469471.

Approved by PS Jenkins bot.

=== modified file 'components.api'
--- components.api	2015-07-13 18:26:32 +0000
+++ components.api	2015-07-14 09:15:55 +0000
@@ -465,6 +465,7 @@
     property bool selectMode
     property bool selected
     property ListItemActions trailingActions
+Ubuntu.Components.ListItem 1.3: ListItem
 Ubuntu.Components.ListItemActions 1.2: QtObject
     readonly property Action actions
     default readonly property QtObject data

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.2/ListItemStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.2/ListItemStyle.qml	2015-04-24 14:43:08 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.2/ListItemStyle.qml	2015-07-14 09:15:55 +0000
@@ -29,6 +29,8 @@
 
     // anchoring
     anchors {
+        // do not anchor fill
+        fill: undefined
         top: parent ? parent.top : undefined
         bottom: parent ? parent.bottom : undefined
         bottomMargin: styledItem.divider.visible ? styledItem.divider.height : 0
@@ -141,6 +143,11 @@
                 // for the initial value
                 checked: styledItem.selected
                 onCheckedChanged: styledItem.selected = checked;
+                Binding {
+                    target: checkbox
+                    property: "checked"
+                    value: styledItem.selected
+                }
             }
 
             states: State {

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml	2015-07-14 09:15:55 +0000
@@ -138,6 +138,11 @@
                 // for the initial value
                 checked: styledItem.selected
                 onCheckedChanged: styledItem.selected = checked;
+                Binding {
+                    target: checkbox
+                    property: "checked"
+                    value: styledItem.selected
+                }
             }
 
             states: State {

=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2015-07-07 13:57:50 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2015-07-14 09:15:55 +0000
@@ -208,6 +208,7 @@
     qmlRegisterType<UCUbuntuShapeOverlay>(uri, 1, 2, "UbuntuShapeOverlay");
 
     // register 1.3 API
+    qmlRegisterType<UCListItem13>(uri, 1, 3, "ListItem");
     qmlRegisterType<UCTheme>(uri, 1, 3, "ThemeSettings");
     qmlRegisterType<UCStyledItemBase, 2>(uri, 1, 3, "StyledItem");
     qmlRegisterSingletonType<UCNamespaceV13>(uri, 1, 3, "Ubuntu", registerUbuntuNamespace13);

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem.cpp'
--- modules/Ubuntu/Components/plugin/uclistitem.cpp	2015-05-26 08:33:49 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem.cpp	2015-07-14 09:15:55 +0000
@@ -25,6 +25,7 @@
 #include "i18n.h"
 #include "quickutils.h"
 #include "ucaction.h"
+#include "ucnamespace.h"
 #include <QtQml/QQmlInfo>
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtQuick/private/qquickflickable_p.h>
@@ -179,6 +180,7 @@
  */
 UCListItemPrivate::UCListItemPrivate()
     : UCStyledItemBasePrivate()
+    , defaultThemeVersion(0)
     , highlighted(false)
     , contentMoved(false)
     , swiped(false)
@@ -901,6 +903,7 @@
 {
     Q_D(UCListItem);
     d->init();
+    d->defaultThemeVersion = BUILD_VERSION(1, 2);
 }
 
 UCListItem::~UCListItem()
@@ -912,6 +915,10 @@
     UCStyledItemBase::classBegin();
     Q_D(UCListItem);
     // initialize theme
+    UCTheme *theme = d->getTheme();
+    if (theme == &UCTheme::defaultTheme()) {
+        theme->setVersion(d->defaultThemeVersion);
+    }
     d->_q_themeChanged();
     d->divider->paletteChanged();
 }
@@ -1551,4 +1558,14 @@
     return QQuickItemPrivate::get(contentItem)->children();
 }
 
+/******************************************************************************
+ * Versioning
+ */
+UCListItem13::UCListItem13(QQuickItem *parent)
+    : UCListItem(parent)
+{
+    Q_D(UCListItem);
+    d->defaultThemeVersion = BUILD_VERSION(1, 3);
+}
+
 #include "moc_uclistitem.cpp"

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem.h'
--- modules/Ubuntu/Components/plugin/uclistitem.h	2015-04-14 08:31:20 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem.h	2015-07-14 09:15:55 +0000
@@ -95,8 +95,10 @@
 
 public Q_SLOTS:
 
-private:
+protected:
     Q_DECLARE_PRIVATE(UCListItem)
+
+private:
     Q_PRIVATE_SLOT(d_func(), void _q_themeChanged())
     Q_PRIVATE_SLOT(d_func(), void _q_relayout())
     Q_PRIVATE_SLOT(d_func(), void _q_updateSwiping())
@@ -107,6 +109,13 @@
     Q_PRIVATE_SLOT(d_func(), void _q_syncDragMode())
 };
 
+class UCListItem13 : public UCListItem
+{
+    Q_OBJECT
+public:
+    explicit UCListItem13(QQuickItem *parent = 0);
+};
+
 class UCListItemDividerPrivate;
 class UCListItemDivider : public QQuickItem
 {

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem_p.h'
--- modules/Ubuntu/Components/plugin/uclistitem_p.h	2015-05-21 10:50:35 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem_p.h	2015-07-14 09:15:55 +0000
@@ -68,6 +68,7 @@
     void snapOut();
     void swipeEvent(const QPointF &localPos, UCSwipeEvent::Status status);
 
+    quint16 defaultThemeVersion;
     bool highlighted:1;
     bool contentMoved:1;
     bool swiped:1;

=== added file 'tests/unit_x11/tst_components/tst_listitem_selectmode.qml'
--- tests/unit_x11/tst_components/tst_listitem_selectmode.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_listitem_selectmode.qml	2015-07-14 09:15:55 +0000
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.2
+import QtTest 1.0
+import Ubuntu.Test 1.0
+
+MainView {
+    applicationName: "testapp.nik90"
+
+    width: units.gu(100)
+    height: units.gu(75)
+
+    Page {
+        title: i18n.tr("ListView Bug")
+
+        UbuntuListView {
+            id: listView
+
+            ListModel {
+                id: instructionModel
+                ListElement { text: "Let's try to reproduce this listview bug ;)" }
+                ListElement { text: "Step 1: Long press to active multiselect mode" }
+                ListElement { text: "Step 2: Press on any checkbox to select that listitem" }
+                ListElement { text: "Step 3: Now press on the list item of the checkbox you chose in the previous step." }
+                ListElement { text: "Notice how it doesn't select/unselect it despite pressing it" }
+                ListElement { text: "Also notice how when pressing on the listitem in step 3, the selected indice still changes!" }
+            }
+
+            anchors.fill: parent
+            model: instructionModel
+
+            delegate: ListItem {
+                objectName: "listItem" + index
+                height: units.gu(8)
+                contentItem.anchors { leftMargin: units.gu(2); rightMargin: units.gu(2) }
+
+                Label {
+                    id: label
+                    text: modelData
+                    anchors.fill: parent
+                    wrapMode: Text.WordWrap
+                    verticalAlignment: Text.AlignVCenter
+                }
+
+                onPressAndHold: {
+                    ListView.view.ViewItems.selectMode = !ListView.view.ViewItems.selectMode
+                }
+
+                onClicked: {
+                    if (selectMode) {
+                        selected = !selected
+                    }
+                }
+            }
+
+            footer: Label {
+                anchors { left: parent.left; leftMargin: units.gu(2) }
+                width: parent.width
+                text: "Selected Indices: " + listView.ViewItems.selectedIndices
+            }
+        }
+    }
+
+    UbuntuTestCase {
+        when: windowShown
+
+        function test_select_toggle_breaks_property_binding_bug1469471() {
+            listView.ViewItems.selectMode = true;
+            wait(400);
+
+            // select through checkbox
+            var listItem = findChild(listView, "listItem0");
+            verify(listItem);
+            var panel = findChild(listItem, "selection_panel0");
+            verify(panel);
+            var checkBox = findChild(panel, "listitem_select");
+            verify(checkBox);
+
+            // check the box
+            mouseClick(checkBox, 0, 0);
+            compare(checkBox.checked, true);
+
+            // now toggle selected
+            listItem.selected = !listItem.selected;
+            compare(checkBox.checked, false);
+        }
+    }
+}
+

=== added file 'tests/unit_x11/tst_components/tst_listitem_selectmode13.qml'
--- tests/unit_x11/tst_components/tst_listitem_selectmode13.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_listitem_selectmode13.qml	2015-07-14 09:15:55 +0000
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import QtTest 1.0
+import Ubuntu.Test 1.0
+
+MainView {
+    applicationName: "testapp.nik90"
+
+    width: units.gu(100)
+    height: units.gu(75)
+
+    Page {
+        title: i18n.tr("ListView Bug")
+
+        UbuntuListView {
+            id: listView
+
+            ListModel {
+                id: instructionModel
+                ListElement { text: "Let's try to reproduce this listview bug ;)" }
+                ListElement { text: "Step 1: Long press to active multiselect mode" }
+                ListElement { text: "Step 2: Press on any checkbox to select that listitem" }
+                ListElement { text: "Step 3: Now press on the list item of the checkbox you chose in the previous step." }
+                ListElement { text: "Notice how it doesn't select/unselect it despite pressing it" }
+                ListElement { text: "Also notice how when pressing on the listitem in step 3, the selected indice still changes!" }
+            }
+
+            anchors.fill: parent
+            model: instructionModel
+
+            delegate: ListItem {
+                objectName: "listItem" + index
+                height: units.gu(8)
+                contentItem.anchors { leftMargin: units.gu(2); rightMargin: units.gu(2) }
+
+                Label {
+                    id: label
+                    text: modelData
+                    anchors.fill: parent
+                    wrapMode: Text.WordWrap
+                    verticalAlignment: Text.AlignVCenter
+                }
+
+                onPressAndHold: {
+                    ListView.view.ViewItems.selectMode = !ListView.view.ViewItems.selectMode
+                }
+
+                onClicked: {
+                    if (selectMode) {
+                        selected = !selected
+                    }
+                }
+            }
+
+            footer: Label {
+                anchors { left: parent.left; leftMargin: units.gu(2) }
+                width: parent.width
+                text: "Selected Indices: " + listView.ViewItems.selectedIndices
+            }
+        }
+    }
+
+    UbuntuTestCase {
+        when: windowShown
+
+        function test_select_toggle_breaks_property_binding_bug1469471() {
+            listView.ViewItems.selectMode = true;
+            wait(400);
+
+            // select through checkbox
+            var listItem = findChild(listView, "listItem0");
+            verify(listItem);
+            var panel = findChild(listItem, "selection_panel0");
+            verify(panel);
+            var checkBox = findChild(panel, "listitem_select");
+            verify(checkBox);
+
+            // check the box
+            mouseClick(checkBox, 0, 0);
+            compare(checkBox.checked, true);
+
+            // now toggle selected
+            listItem.selected = !listItem.selected;
+            compare(checkBox.checked, false);
+        }
+    }
+}
+