Merge lp:~saviq/unity8/drop-filtergrid into lp:unity8

[Michał Sawicz]

Drop FilterGrid and refactor height animations in GenericScopeView.

Also implement forced category expansion.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No.

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes.

 * Did you make sure that your branch does not contain spurious tags?
Yes.

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[lp:~saviq/unity8/drop-filtergrid]

1047. By Michał Sawicz on 2014-07-11

Merge lp:~saviq/unity8/cmake-pydev-fixes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1046
http://jenkins.qa.ubuntu.com/job/unity8-ci/3400/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1841
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/404
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/494
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/494
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/494/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/494
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2932
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2932/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9670

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3400/rebuild

review: Approve (continuous-integration)

[lp:~saviq/unity8/drop-filtergrid]

1048. By Michał Sawicz on 2014-07-11

Add tests for auto and forced expansion.

1049. By Michał Sawicz on 2014-07-11

Fix DashContent tests.

1050. By Michał Sawicz on 2014-07-11

Reduce cacheBuffer in CardGrid

1051. By Michał Sawicz on 2014-07-11

Drop unnecessary properties in CardCarousel

1052. By Michał Sawicz on 2014-07-18

Merge trunk.

1053. By Michał Sawicz on 2014-07-21

Improve test_set_current_scope_reset reliability.

1054. By Michał Sawicz on 2014-07-21

Merge cmake-pydev-fixes

1055. By Michał Sawicz on 2014-07-22

Pixel-align ScopesListView to avoid visual artifacts at card boundary.

1056. By Michał Sawicz on 2014-07-24

Fix autopilot test.

Unmerged revisions

=== renamed file 'tests/autopilot/.project' => '.project'
--- tests/autopilot/.project	2013-11-18 12:05:58 +0000
+++ .project	2014-07-11 07:35:07 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Unity8 Autopilot</name>
+	<name>Unity8</name>
 	<comment></comment>
 	<projects>
 	</projects>

=== renamed file 'tests/autopilot/.pydevproject' => '.pydevproject'
--- tests/autopilot/.pydevproject	2013-11-18 12:05:58 +0000
+++ .pydevproject	2014-07-11 07:35:07 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?eclipse-pydev version="1.0"?><pydev_project>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/Unity8 Autopilot</path>
+<path>/Unity8/tests/autopilot</path>
 </pydev_pathproperty>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>

=== removed file 'qml/Components/FilterGrid.qml'
--- qml/Components/FilterGrid.qml	2014-05-23 13:52:36 +0000
+++ qml/Components/FilterGrid.qml	1970-01-01 00:00:00 +0000
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program 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.
- *
- * 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 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 Utils 0.1
-import "../Components"
-
-/*
-    A ResponsiveGridView that can optionally have the number of rows being displayed
-    reduced to collapsedRowCount, in which case a button saying "View all (123)"
-    will be shown at the bottom. If clicked, FilterGrid will them expand vertically
-    to display all rows.
- */
-Item {
-    id: root
-
-    /* Whether, when collapsed, a button should be displayed enabling the user to expand
-       the grid to its full size. */
-    readonly property bool expandable: model.count > rowsWhenCollapsed * iconTileGrid.columns
-
-    property var model: null
-
-    /* Maximum number of rows to be show when filter=true. */
-    property int collapsedRowCount: 2
-    property int uncollapsedRowCount: Math.ceil(model.count / columns)
-    /* Never show more rows than model would fill up. */
-    readonly property int rowsWhenCollapsed: Math.min(collapsedRowCount, uncollapsedRowCount)
-    readonly property int collapsedHeight: iconTileGrid.contentHeightForRows(rowsWhenCollapsed)
-    readonly property int uncollapsedHeight: iconTileGrid.contentHeightForRows(uncollapsedRowCount)
-
-    property alias minimumHorizontalSpacing: iconTileGrid.minimumHorizontalSpacing
-    property alias maximumNumberOfColumns: iconTileGrid.maximumNumberOfColumns
-    property alias columns: iconTileGrid.columns
-    property alias delegateWidth: iconTileGrid.delegateWidth
-    property alias delegateHeight: iconTileGrid.delegateHeight
-    property alias verticalSpacing: iconTileGrid.verticalSpacing
-    readonly property alias margins: iconTileGrid.margins
-    property alias delegate: iconTileGrid.delegate
-    property alias cellWidth: iconTileGrid.cellWidth
-    property alias cellHeight: iconTileGrid.cellHeight
-    property alias displayMarginBeginning: iconTileGrid.displayMarginBeginning
-    property alias displayMarginEnd: iconTileGrid.displayMarginEnd
-    readonly property alias originY: iconTileGrid.originY
-    readonly property alias flicking: iconTileGrid.flicking
-    readonly property alias moving: iconTileGrid.moving
-    readonly property alias pressDelay: iconTileGrid.pressDelay
-    property alias highlightIndex: iconTileGrid.highlightIndex
-    readonly property alias currentItem: iconTileGrid.currentItem
-    readonly property alias filtered: d.filter
-
-    QtObject {
-        id: d
-        // We do have filter and collapsed properties because we need to decouple
-        // the real filtering with the animation since the closing animation
-        // i.e. setFilter(false. true) we still need to not be filtering until
-        // the animation finishes otherwise we hide the items when the animation
-        // is still running
-        property bool filter: true
-        property bool collapsed: true
-    }
-
-    height: d.collapsed ? root.collapsedHeight : root.uncollapsedHeight
-    clip: filterAnimation.running
-
-    Behavior on height {
-        id: heightBehaviour
-        enabled: false
-        NumberAnimation {
-            id: filterAnimation
-            // Duration and easing here match the ListViewWithPageHeader::m_contentYAnimation
-            // otherwise since both animations can run at the same time you'll get
-            // some visual weirdness.
-            duration: 200
-            easing.type: Easing.InOutQuad
-            onRunningChanged: {
-                if (!running) {
-                    d.filter = d.collapsed;
-                }
-                heightBehaviour.enabled = false;
-            }
-        }
-    }
-
-    function setFilter(filter, animate) {
-        heightBehaviour.enabled = animate;
-        d.collapsed = filter;
-        if (!animate || !filter) {
-            d.filter = filter;
-        }
-   }
-
-    ResponsiveGridView {
-        id: iconTileGrid
-
-        anchors { left: parent.left; right: parent.right }
-        height: totalContentHeight
-        interactive: false
-
-        minimumHorizontalSpacing: units.gu(0.5)
-        maximumNumberOfColumns: 6
-        delegateWidth: units.gu(11)
-        delegateHeight: units.gu(9.5)
-        verticalSpacing: units.gu(2)
-
-        model: LimitProxyModel {
-            model: root.model
-            limit: d.filter ? rowsWhenCollapsed * iconTileGrid.columns : -1
-        }
-    }
-}

=== modified file 'qml/Components/ResponsiveGridView.qml'
--- qml/Components/ResponsiveGridView.qml	2014-05-15 14:50:23 +0000
+++ qml/Components/ResponsiveGridView.qml	2014-07-11 07:35:07 +0000
@@ -47,7 +47,7 @@
     readonly property alias currentItem: gridView.currentItem
 
     function contentHeightForRows(rows) {
-        return rows * cellHeight + verticalSpacing
+        return rows * cellHeight;
     }
 
     GridView {

=== modified file 'qml/Dash/CardCarousel.qml'
--- qml/Dash/CardCarousel.qml	2014-07-09 19:44:02 +0000
+++ qml/Dash/CardCarousel.qml	2014-07-11 07:35:07 +0000
@@ -27,7 +27,8 @@
     property alias selectedItemScaleFactor: carousel.selectedItemScaleFactor
     property alias tileAspectRatio: carousel.tileAspectRatio
 
-    height: carousel.implicitHeight + units.gu(6)
+    expandedHeight: carousel.implicitHeight + units.gu(6)
+    collapsedHeight: expandedHeight
 
     Carousel {
         id: carousel

=== renamed file 'qml/Dash/CardFilterGrid.qml' => 'qml/Dash/CardGrid.qml'
--- qml/Dash/CardFilterGrid.qml	2014-07-08 08:30:46 +0000
+++ qml/Dash/CardGrid.qml	2014-07-11 07:35:07 +0000
@@ -18,33 +18,31 @@
 import "../Components"
 
 DashRenderer {
-    id: genericFilterGrid
-
-    expandable: filterGrid.expandable
-    collapsedHeight: filterGrid.collapsedHeight
-    uncollapsedHeight: filterGrid.uncollapsedHeight
-    originY: filterGrid.originY
-    height: filterGrid.height
-    filtered: filterGrid.filtered
-
-    function setFilter(filter, animate) {
-        filterGrid.setFilter(filter, animate)
+    id: root
+
+    readonly property int collapsedRows: {
+        if (!cardTool || !cardTool.template || typeof cardTool.template["collapsed-rows"] != "number") return 2;
+        return cardTool.template["collapsed-rows"];
     }
 
-    FilterGrid {
-        id: filterGrid
-        width: genericFilterGrid.width
+    expandedHeight: grid.totalContentHeight
+    collapsedHeight: Math.min(grid.contentHeightForRows(collapsedRows), expandedHeight)
+    originY: grid.originY
+
+    ResponsiveGridView {
+        id: grid
+        anchors.fill: parent
         minimumHorizontalSpacing: units.gu(1)
         delegateWidth: cardTool.cardWidth
         delegateHeight: cardTool.cardHeight
         verticalSpacing: units.gu(1)
-        model: genericFilterGrid.model
-        collapsedRowCount: Math.min(2, cardTool && cardTool.template && cardTool.template["collapsed-rows"] || 2)
-        displayMarginBeginning: genericFilterGrid.displayMarginBeginning
-        displayMarginEnd: genericFilterGrid.displayMarginEnd
+        model: root.model
+        displayMarginBeginning: root.displayMarginBeginning
+        displayMarginEnd: root.displayMarginEnd
+        interactive: false
         delegate: Item {
-            width: filterGrid.cellWidth
-            height: filterGrid.cellHeight
+            width: grid.cellWidth
+            height: grid.cellHeight
             Loader {
                 id: loader
                 sourceComponent: cardTool.cardComponent
@@ -58,12 +56,12 @@
                     item.template = Qt.binding(function() { return cardTool.template; });
                     item.components = Qt.binding(function() { return cardTool.components; });
                     item.headerAlignment = Qt.binding(function() { return cardTool.headerAlignment; });
-                    item.scopeStyle = genericFilterGrid.scopeStyle;
+                    item.scopeStyle = root.scopeStyle;
                 }
                 Connections {
                     target: loader.item
-                    onClicked: genericFilterGrid.clicked(index, result)
-                    onPressAndHold: genericFilterGrid.pressAndHold(index)
+                    onClicked: root.clicked(index, result)
+                    onPressAndHold: root.pressAndHold(index)
                 }
             }
         }

=== modified file 'qml/Dash/CardVerticalJournal.qml'
--- qml/Dash/CardVerticalJournal.qml	2014-07-09 19:44:02 +0000
+++ qml/Dash/CardVerticalJournal.qml	2014-07-11 07:35:07 +0000
@@ -23,33 +23,14 @@
 
     readonly property double collapseLimit: units.gu(35)
 
-    uncollapsedHeight: cardVerticalJournal.implicitHeight
-    collapsedHeight: Math.min(collapseLimit, cardVerticalJournal.implicitHeight)
-    expandable: uncollapsedHeight > collapseLimit
+    expandedHeight: Math.max(cardVerticalJournal.implicitHeight, minHeight)
+    collapsedHeight: Math.max(Math.min(collapseLimit, cardVerticalJournal.implicitHeight), minHeight)
 
     // This minHeight is used as bootstrapper for the height. Vertical Journal
     // is special by the fact that it doesn't know how to calculate its implicit height unless we give it
     // enough height that it can start creating its children so we make sure it has enough height for that
     // in case the model is non empty
     readonly property double minHeight: root.model.count >= 1 ? cardVerticalJournal.rowSpacing + 1 : 0
-    height: filtered ? Math.max(collapsedHeight, minHeight) : uncollapsedHeight
-
-    Behavior on height {
-        id: heightBehaviour
-        enabled: false
-        animation: UbuntuNumberAnimation {
-            onRunningChanged: {
-                if (!running) {
-                    heightBehaviour.enabled = false
-                }
-            }
-        }
-    }
-
-    function setFilter(filter, animate) {
-        heightBehaviour.enabled = animate;
-        filtered = filter;
-    }
 
     ResponsiveVerticalJournal {
         id: cardVerticalJournal

=== modified file 'qml/Dash/DashRenderer.qml'
--- qml/Dash/DashRenderer.qml	2014-07-08 08:30:46 +0000
+++ qml/Dash/DashRenderer.qml	2014-07-11 07:35:07 +0000
@@ -17,15 +17,9 @@
 import QtQuick 2.0
 
 Item {
-    // Can the item be expanded?
-    property bool expandable: false
-
-    // In case it can be expanded, is it filtered
-    property bool filtered: true
-
-    property int collapsedHeight: height
-
-    property int uncollapsedHeight: height
+    property int collapsedHeight
+
+    property int expandedHeight
 
     property int displayMarginBeginning: 0
 
@@ -50,7 +44,4 @@
     /// Emitted when the user pressed and held on an item
     /// @param index is the index of the held item
     signal pressAndHold(int index)
-
-    function setFilter(filter, animate) {
-    }
 }

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-07-09 19:44:02 +0000
+++ qml/Dash/GenericScopeView.qml	2014-07-11 07:35:07 +0000
@@ -128,11 +128,21 @@
             highlightWhenPressed: false
             showDivider: false
 
-            readonly property bool expandable: rendererLoader.item ? rendererLoader.item.expandable : false
-            readonly property bool filtered: rendererLoader.item ? rendererLoader.item.filtered : true
+            readonly property bool expandable: {
+                if (categoryView.model.count === 1) return false;
+                if (cardTool.template && cardTool.template["collapsed-rows"] === 0) return false;
+                if (item && item.expandedHeight > item.collapsedHeight) return true;
+                return false;
+            }
+            property bool expanded: false
             readonly property string category: categoryId
             readonly property var item: rendererLoader.item
 
+            function expand(expand, animate) {
+                heightBehaviour.enabled = animate;
+                expanded = expand;
+            }
+
             CardTool {
                 id: cardTool
                 objectName: "cardTool"
@@ -142,6 +152,18 @@
                 viewWidth: parent.width
             }
 
+            onExpandableChanged: {
+                // This can happen with the VJ that doesn't know how height it will be on creation
+                // so doesn't set expandable until a bit too late for onLoaded
+                if (expandable) {
+                    var shouldExpand = baseItem.category === categoryView.expandedCategoryId;
+                    baseItem.expand(shouldExpand, false /*animate*/);
+                }
+            }
+
+            onHeightChanged: rendererLoader.updateDelegateCreationRange();
+            onYChanged: rendererLoader.updateDelegateCreationRange();
+
             Loader {
                 id: rendererLoader
                 anchors {
@@ -151,13 +173,27 @@
                     topMargin: hasSectionHeader ? 0 : units.gu(2)
                 }
 
+                Behavior on height {
+                    id: heightBehaviour
+                    enabled: false
+                    animation: UbuntuNumberAnimation {
+                        onRunningChanged: {
+                            if (!running) {
+                                heightBehaviour.enabled = false
+                            }
+                        }
+                    }
+                }
+
+                height: baseItem.expandable && !baseItem.expanded ? item.collapsedHeight : item.expandedHeight
+
                 source: {
                     switch (cardTool.categoryLayout) {
                         case "carousel": return "CardCarousel.qml";
                         case "vertical-journal": return "CardVerticalJournal.qml";
                         case "running-apps": return "Apps/RunningApplicationsGrid.qml";
                         case "grid":
-                        default: return "CardFilterGrid.qml";
+                        default: return "CardGrid.qml";
                     }
                 }
 
@@ -176,9 +212,9 @@
                     }
                     item.objectName = Qt.binding(function() { return categoryId })
                     item.scopeStyle = scopeView.scopeStyle;
-                    if (item.expandable) {
-                        var shouldFilter = categoryId != categoryView.expandedCategoryId;
-                        item.setFilter(shouldFilter, false /*animate*/);
+                    if (baseItem.expandable) {
+                        var shouldExpand = categoryId === categoryView.expandedCategoryId;
+                        baseItem.expand(shouldExpand, false /*animate*/);
                     }
                     updateDelegateCreationRange();
                     item.cardTool = cardTool;
@@ -211,14 +247,6 @@
                         previewListView.currentIndex = index;
                         previewListView.open = true
                     }
-                    onExpandableChanged: {
-                        // This can happen with the VJ that doesn't know how height it will be on creation
-                        // so doesn't set expandable until a bit too late for onLoaded
-                        if (rendererLoader.item.expandable) {
-                            var shouldFilter = baseItem.category != categoryView.expandedCategoryId;
-                            rendererLoader.item.setFilter(shouldFilter, false /*animate*/);
-                        }
-                    }
                 }
                 Connections {
                     target: categoryView
@@ -227,17 +255,17 @@
                     }
                     function collapseAllButExpandedCategory() {
                         var item = rendererLoader.item;
-                        if (item.expandable) {
-                            var shouldFilter = categoryId != categoryView.expandedCategoryId;
-                            if (shouldFilter != item.filter) {
+                        if (baseItem.expandable) {
+                            var shouldExpand = categoryId === categoryView.expandedCategoryId;
+                            if (shouldExpand != baseItem.expanded) {
                                 // If the filter animation will be seen start it, otherwise, just flip the switch
-                                var shrinkingVisible = shouldFilter && y + item.collapsedHeight < categoryView.height;
-                                var growingVisible = !shouldFilter && y + height < categoryView.height;
-                                if (!previewListView.open || !shouldFilter) {
+                                var shrinkingVisible = !shouldExpand && y + item.collapsedHeight < categoryView.height;
+                                var growingVisible = shouldExpand && y + height < categoryView.height;
+                                if (!previewListView.open || shouldExpand) {
                                     var animate = shrinkingVisible || growingVisible;
-                                    item.setFilter(shouldFilter, animate)
-                                    if (!shouldFilter && !previewListView.open) {
-                                        categoryView.maximizeVisibleArea(index, item.uncollapsedHeight);
+                                    baseItem.expand(shouldExpand, animate)
+                                    if (shouldExpand && !previewListView.open) {
+                                        categoryView.maximizeVisibleArea(index, item.expandedHeight);
                                     }
                                 }
                             }
@@ -304,9 +332,6 @@
                     z: -1
                 }
             }
-
-            onHeightChanged: rendererLoader.updateDelegateCreationRange();
-            onYChanged: rendererLoader.updateDelegateCreationRange();
         }
 
         sectionProperty: "name"
@@ -318,7 +343,7 @@
             textColor: scopeStyle ? scopeStyle.foreground : "grey"
             image: {
                 if (delegate && delegate.expandable)
-                    return delegate.filtered ? "graphics/header_handlearrow.png" : "graphics/header_handlearrow2.png"
+                    return delegate.expanded ? "graphics/header_handlearrow2.png" : "graphics/header_handlearrow.png"
                 return "";
             }
             onClicked: {

=== modified file 'tests/autopilot/unity8/shell/emulators/dash.py'
--- tests/autopilot/unity8/shell/emulators/dash.py	2014-07-09 18:31:52 +0000
+++ tests/autopilot/unity8/shell/emulators/dash.py	2014-07-11 07:35:07 +0000
@@ -40,7 +40,7 @@
 
     def get_applications_grid(self):
         get_grid = self.get_scope('clickscope').wait_select_single(
-            'CardFilterGrid', objectName='local')
+            'CardGrid', objectName='local')
         return get_grid
 
     def get_application_icon(self, text):
@@ -196,9 +196,12 @@
         category_element = self._get_category_element(category)
         application_cards = category_element.select_many('AbstractButton')
 
-        # sort by y, x
+        # sort by y, x, filter those out of view
+        categoryBottom = category_element.globalRect.y \
+            + category_element.height
         application_cards = sorted(
-            application_cards,
+            (card for card in application_cards
+                if card.globalRect.y < categoryBottom),
             key=lambda card: (card.globalRect.y, card.globalRect.x))
 
         result = []

=== modified file 'tests/autopilot/unity8/shell/tests/test_emulators.py'
--- tests/autopilot/unity8/shell/tests/test_emulators.py	2014-07-09 13:16:20 +0000
+++ tests/autopilot/unity8/shell/tests/test_emulators.py	2014-07-11 07:35:07 +0000
@@ -191,9 +191,9 @@
     def _get_number_of_application_slots(self, category):
         category_element = self.applications_scope._get_category_element(
             category)
-        grid = category_element.select_single('CardFilterGrid')
-        filtergrid = grid.select_single('FilterGrid')
-        if (grid.filtered):
-            return filtergrid.collapsedRowCount * filtergrid.columns
+        cardgrid = category_element.select_single('CardGrid')
+        if (category_element.expanded):
+            return cardgrid.select_single('QQuickGridView').count
         else:
-            return filtergrid.uncollapsedRowCount * filtergrid.columns
+            return cardgrid.collapsedRows \
+                * cardgrid.select_single('ResponsiveGridView').columns

=== modified file 'tests/plugins/Dash/cardcreator/6.res'
--- tests/plugins/Dash/cardcreator/6.res	2014-07-08 09:50:44 +0000
+++ tests/plugins/Dash/cardcreator/6.res	2014-07-11 07:35:07 +0000
@@ -5,6 +5,7 @@
                 property var cardData;
                 property var artShapeBorderSource: undefined;
                 property real fontScale: 1.0;
+                property var scopeStyle: null;
                 property int headerAlignment: Text.AlignLeft;
                 property int fixedHeaderHeight: -1;
                 property size fixedArtShapeSize: Qt.size(-1, -1);

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2014-07-09 19:44:14 +0000
+++ tests/qmltests/CMakeLists.txt	2014-07-11 07:35:07 +0000
@@ -24,7 +24,6 @@
 add_qml_test(Components Carousel)
 add_qml_test(Components DraggingArea)
 add_qml_test(Components EdgeDemoOverlay)
-add_qml_test(Components FilterGrid)
 add_qml_test(Components LazyImage)
 add_qml_test(Components Rating)
 add_qml_test(Components ResponsiveFlowView)

=== removed file 'tests/qmltests/Components/tst_FilterGrid.qml'
--- tests/qmltests/Components/tst_FilterGrid.qml	2014-05-01 14:25:18 +0000
+++ tests/qmltests/Components/tst_FilterGrid.qml	1970-01-01 00:00:00 +0000
@@ -1,190 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program 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.
- *
- * 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 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 QtTest 1.0
-import "../../../qml/Components"
-import Ubuntu.Components.ListItems 0.1 as ListItem
-import Ubuntu.Components 0.1
-import Unity.Test 0.1 as UT
-import Utils 0.1
-
-/*
-  You should see 6 green squares (from "A" to "F") and a button "View all (12)".
-  Once you press that button other 6 green squares (from "G" to "L") should show up.
-*/
-Rectangle {
-    width: gridRect.width + controls.width
-    height: units.gu(50)
-    color: "white"
-
-    Column {
-        id: controls
-        width: units.gu(30)
-        height: parent.height
-        anchors.top: parent.top
-        anchors.right: parent.right
-        ListItem.ValueSelector {
-            id: collapsedRowCountSelector
-            text: "collapsedRowCount"
-            values: [1,2,3,4]
-            selectedIndex: 1
-        }
-        Row {
-            spacing: units.gu(1)
-            Label { anchors.verticalCenter: parent.verticalCenter
-                    text: "Filter" }
-            CheckBox {
-                id: filterCheckBox
-                checked: true
-                onCheckedChanged: filterGrid.setFilter(checked, false /*animate*/)
-            }
-        }
-    }
-
-    ListModel {
-        id: fakeModel
-        ListElement { name: "A" }
-        ListElement { name: "B" }
-        ListElement { name: "C" }
-        ListElement { name: "D" }
-        ListElement { name: "E" }
-        ListElement { name: "F" }
-        ListElement { name: "G" }
-        ListElement { name: "H" }
-        ListElement { name: "I" }
-        ListElement { name: "J" }
-        ListElement { name: "K" }
-        ListElement { name: "L" }
-    }
-
-    ListModel {
-        id: fakeModelTwoItems
-        ListElement { name: "A" }
-        ListElement { name: "B" }
-    }
-
-    ListModel {
-        id: fakeModelFourItems
-        ListElement { name: "A" }
-        ListElement { name: "B" }
-        ListElement { name: "C" }
-        ListElement { name: "D" }
-    }
-
-    Rectangle {
-        id: gridRect
-        width: units.gu(30)
-        height: parent.height
-        color: "grey"
-        anchors.top: parent.top
-        anchors.left: parent.left
-
-        FilterGrid {
-            id: filterGrid
-            anchors.fill: parent
-            model: fakeModel
-            maximumNumberOfColumns: 3
-            collapsedRowCount:
-                collapsedRowCountSelector.values[collapsedRowCountSelector.selectedIndex]
-            minimumHorizontalSpacing: units.gu(1)
-            delegateWidth: units.gu(6)
-            delegateHeight: units.gu(6)
-            verticalSpacing: units.gu(1)
-
-            delegate: Rectangle {
-                // So that it can be identified by countVisibleDelegates()
-                property bool isGridDelegate: true
-
-                color: "green"
-                width: units.gu(6)
-                height: units.gu(6)
-                Text {
-                    anchors.centerIn: parent
-                    text: name
-                }
-            }
-        }
-    }
-
-    UT.UnityTestCase {
-        name: "FilterGrid"
-        when: windowShown
-
-        function init() {
-            filterGrid.model = fakeModel
-        }
-
-        function cleanup() {
-            filterCheckBox.checked = true
-            collapsedRowCountSelector.selectedIndex = 1
-        }
-
-        function test_turningFilterOffShowsAllElements() {
-            tryCompareFunction(countVisibleDelegates, 6)
-
-            filterCheckBox.checked = false
-
-            tryCompareFunction(countVisibleDelegates, 12)
-        }
-
-        function test_collapsedRowCount() {
-            for (var i = 0; i < 4; ++i) {
-                collapsedRowCountSelector.selectedIndex = i
-                // We have 3 elements per row.
-                // row count == index + 1
-                tryCompareFunction(countVisibleDelegates, 3*(i+1))
-            }
-        }
-
-        function test_modelSizeAffectsCollapsedRowCount_data() {
-            return [
-                { tag: "2 items, collapsedRows 1", model: fakeModelTwoItems, collapsedRowCountIndex: 0,
-                  rowsWhenCollapsed: 1, visibleDelegates: 2 },
-                { tag: "2 items, collapsedRows 2", model: fakeModelTwoItems, collapsedRowCountIndex: 1,
-                  rowsWhenCollapsed: 1, visibleDelegates: 2 },
-                { tag: "4 items, collapsedRows 1", model: fakeModelFourItems, collapsedRowCountIndex: 0,
-                  rowsWhenCollapsed: 1, visibleDelegates: 3 },
-                { tag: "4 items, collapsedRows 2", model: fakeModelFourItems, collapsedRowCountIndex: 1,
-                  rowsWhenCollapsed: 2, visibleDelegates: 4 },
-            ]
-        }
-
-        function test_modelSizeAffectsCollapsedRowCount(data) {
-            filterGrid.model = data.model
-            collapsedRowCountSelector.selectedIndex = data.collapsedRowCountIndex
-
-            tryCompare(filterGrid, "rowsWhenCollapsed", data.rowsWhenCollapsed)
-            tryCompareFunction(countVisibleDelegates, data.visibleDelegates)
-        }
-
-        function countVisibleDelegates() {
-            return __countVisibleDelegates(filterGrid.visibleChildren, 0)
-        }
-
-        function __countVisibleDelegates(objList, total) {
-            for (var i = 0; i < objList.length; ++i) {
-                var child = objList[i];
-                if (child.isGridDelegate !== undefined) {
-                    ++total;
-                } else {
-                    total = __countVisibleDelegates(child.visibleChildren, total)
-                }
-            }
-            return total
-        }
-    }
-}

=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2014-07-09 19:44:02 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2014-07-11 07:35:07 +0000
@@ -59,6 +59,7 @@
                 genericScopeView.scope = scopes.getScope(2)
                 shell.width = units.gu(120)
                 genericScopeView.categoryView.positionAtBeginning();
+                waitForRendering(genericScopeView.categoryView);
                 tryCompare(genericScopeView.categoryView, "contentY", 0)
             }
 
@@ -105,8 +106,6 @@
             }
 
             function test_filter_expand_collapse() {
-                // wait for the item to be there
-                waitForRendering(genericScopeView);
                 tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader0") != null; }, true);
 
                 var header = findChild(genericScopeView, "dashSectionHeader0")
@@ -114,18 +113,18 @@
 
                 waitForRendering(header);
                 verify(category.expandable);
-                verify(category.filtered);
+                verify(!category.expanded);
 
                 var initialHeight = category.height;
                 var middleHeight;
                 mouseClick(header, header.width / 2, header.height / 2);
                 tryCompareFunction(function() { middleHeight = category.height; return category.height > initialHeight; }, true);
-                tryCompare(category, "filtered", false);
+                tryCompare(category, "expanded", true);
                 tryCompareFunction(function() { return category.height > middleHeight; }, true);
 
                 mouseClick(header, header.width / 2, header.height / 2);
                 verify(category.expandable);
-                tryCompare(category, "filtered", true);
+                tryCompare(category, "expanded", false);
             }
 
             function test_filter_expand_expand_collapse() {
@@ -137,51 +136,47 @@
 
                 var header2 = findChild(genericScopeView, "dashSectionHeader2")
                 var category2 = findChild(genericScopeView, "dashCategory2")
-                var category2FilterGrid = category2.children[1].children[2];
-                verify(UT.Util.isInstanceOf(category2FilterGrid, "CardFilterGrid"));
 
                 waitForRendering(header2);
                 verify(category2.expandable);
-                verify(category2.filtered);
+                verify(!category2.expanded);
 
                 mouseClick(header2, header2.width / 2, header2.height / 2);
-                tryCompare(category2, "filtered", false);
-                tryCompare(category2FilterGrid, "filtered", false);
+                tryCompare(category2, "expanded", true);
 
                 categoryListView.positionAtBeginning();
 
                 var header0 = findChild(genericScopeView, "dashSectionHeader0")
                 var category0 = findChild(genericScopeView, "dashCategory0")
                 mouseClick(header0, header0.width / 2, header0.height / 2);
-                tryCompare(category0, "filtered", false);
-                tryCompare(category2, "filtered", true);
-                tryCompare(category2FilterGrid, "filtered", true);
+                tryCompare(category0, "expanded", true);
+                tryCompare(category2, "expanded", false);
                 mouseClick(header0, header0.width / 2, header0.height / 2);
-                tryCompare(category0, "filtered", true);
-                tryCompare(category2, "filtered", true);
+                tryCompare(category0, "expanded", false);
+                tryCompare(category2, "expanded", false);
             }
 
             function test_narrow_delegate_ranges_expand() {
                 tryCompareFunction(function() { return findChild(genericScopeView, "dashCategory0") != undefined; }, true);
                 var category = findChild(genericScopeView, "dashCategory0")
-                tryCompare(category, "filtered", true);
+                tryCompare(category, "expanded", false);
 
                 shell.width = units.gu(20)
                 var categoryListView = findChild(genericScopeView, "categoryListView");
                 categoryListView.contentY = units.gu(20);
                 var header0 = findChild(genericScopeView, "dashSectionHeader0")
                 mouseClick(header0, header0.width / 2, header0.height / 2);
-                tryCompare(category, "filtered", false);
+                tryCompare(category, "expanded", true);
                 tryCompareFunction(function() { return category.item.height == genericScopeView.height - category.item.displayMarginBeginning - category.item.displayMarginEnd; }, true);
                 mouseClick(header0, header0.width / 2, header0.height / 2);
-                tryCompare(category, "filtered", true);
+                tryCompare(category, "expanded", false);
             }
 
             function openPreview() {
                 tryCompareFunction(function() {
-                                        var filterGrid = findChild(genericScopeView, "0");
-                                        if (filterGrid != null) {
-                                            var tile = findChild(filterGrid, "delegate0");
+                                        var cardGrid = findChild(genericScopeView, "0");
+                                        if (cardGrid != null) {
+                                            var tile = findChild(cardGrid, "delegate0");
                                             return tile != null;
                                         }
                                         return false;
@@ -257,7 +252,7 @@
                 closePreview();
             }
 
-            function test_haeder_logo() {
+            function test_header_logo() {
                 genericScopeView.scope = scopes.getScope(3);
 
                 var image = findChild(genericScopeView, "titleImage");