Merge lp:~saviq/unity8/card-visual-tweaks into lp:unity8

[Michał Sawicz]

Tweak card header to match the spec

- title is Medium only if subtitle is non-empty
- title is only centered if explicitly requested by the scope ("align": "center" in components), with only one allowed line
- subtitle is x-small
- highlighted attribute is Bold
- emblem is allowed non-square

* Are there any related MPs required for this MP to build/function as expected? Please list.
All scopes that want center alignment need to adapt
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y
 * Did you make sure that your branch does not contain spurious tags?
Y
 * 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?
This comes from design, see the referenced bugs.

[lp:~saviq/unity8/card-visual-tweaks]

1234. By Michał Sawicz on 2014-09-04

Bigger coverage.

1235. By Michał Sawicz on 2014-09-04

Unneeded layout assignment.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1233
http://jenkins.qa.ubuntu.com/job/unity8-ci/4241/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4474
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1242
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1335
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1335
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4248
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5726
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5726/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12680

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

review: Needs Fixing (continuous-integration)

[Alejandro J. Cura (alecu)]

Tested the debs produced by jenkins on mako, it looks much nicer overall, but the title is still centered by default.

I'm attaching a screenshot to show this.

review: Needs Fixing

[Alejandro J. Cura (alecu)]

Here: http://pasteboard.co/2NKQOeXz.png

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1235
http://jenkins.qa.ubuntu.com/job/unity8-ci/4244/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4486
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1245
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1338
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1338
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4258
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5738
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5738/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12696

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

review: Needs Fixing (continuous-integration)

[Chris Wayne (cwayne)]

I've verified that this makes rectangular emblems look *much* better, but I'm still seeing the titles centered by default as well

[lp:~saviq/unity8/card-visual-tweaks]

1236. By Michał Sawicz on 2014-09-05

Fix title alignment test and binding, clean up old components from CardHelpers.js

1237. By Michał Sawicz on 2014-09-05

Fix typo

[Michał Sawicz (saviq)]

Yeah, shouldn't have worked so late... Fixed the tests and alignment, as well as the single-line enforcing, even though I expect we won't be doing that in the end.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1237
http://jenkins.qa.ubuntu.com/job/unity8-ci/4246/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4507/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1247
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1340
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1340
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4279/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5759
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5759/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Chris Wayne (cwayne)]

Verified that emblems look better + Titles are now left-aligned as expected

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1237
http://jenkins.qa.ubuntu.com/job/unity8-ci/4250/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4557
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1251
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1344
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1344
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4341
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5809
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5809/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12801

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

review: Needs Fixing (continuous-integration)

[lp:~saviq/unity8/card-visual-tweaks]

1238. By Michał Sawicz on 2014-09-11

Merge trunk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1238
http://jenkins.qa.ubuntu.com/job/unity8-ci/4278/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4728/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1279
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1372
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1372
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4499/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5980
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5980/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13069

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

review: Needs Fixing (continuous-integration)

[lp:~saviq/unity8/card-visual-tweaks]

1239. By Michał Sawicz on 2014-09-11

Merge lp:~unity-team/unity8/scopes_more_things_on_memory

Unmerged revisions

=== modified file 'build.sh'
--- build.sh	2014-08-14 13:37:22 +0000
+++ build.sh	2014-09-11 16:03:35 +0000
@@ -51,6 +51,7 @@
                          qtdeclarative5-ubuntu-settings-components \
                          qtdeclarative5-ubuntu-telephony0.1 \
                          qtdeclarative5-ubuntu-thumbnailer0.1 \
+                         qml-module-ubuntu-connectivity \
                          unity-notifications-impl \
                          ubuntu-mobile-icons \
                          unity-scope-home \
 
=== modified file 'cmake/modules/QmlTest.cmake'
--- cmake/modules/QmlTest.cmake	2014-08-07 15:32:25 +0000
+++ cmake/modules/QmlTest.cmake	2014-09-11 16:03:35 +0000
@@ -131,7 +131,7 @@
     add_manual_qml_test(${SUBPATH} ${COMPONENT_NAME} ${ARGN})
 endmacro(add_qml_test_internal)
 
-macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)
+macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)
     set(testCommand
           LD_LIBRARY_PATH=${LD_PATH}
           ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
@@ -148,6 +148,7 @@
     endif()
     set(xvfbtestCommand
           ${LD_PRELOAD_PATH}
+          ${ENVVAR}
           LD_LIBRARY_PATH=${LD_PATH}
           xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
           ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
 
=== modified file 'debian/control'
--- debian/control	2014-09-03 07:58:32 +0000
+++ debian/control	2014-09-11 16:03:35 +0000
@@ -173,6 +173,7 @@
          libhardware2,
          libunity-core-6.0-9,
          pay-service,
+         qml-module-ubuntu-connectivity,
          ${misc:Depends},
          ${shlibs:Depends},
 Provides: unity-launcher-impl,
 
=== modified file 'plugins/Dash/CardAttributes.qml'
--- plugins/Dash/CardAttributes.qml	2014-08-16 12:41:11 +0000
+++ plugins/Dash/CardAttributes.qml	2014-09-11 16:03:35 +0000
@@ -59,7 +59,7 @@
                 text: "value" in modelData && modelData["value"] || "";
                 elide: Text.ElideRight
                 maximumLineCount: 1
-                font.weight: "style" in modelData && modelData["style"] == "highlighted" ? Font.DemiBold : Font.Light
+                font.weight: "style" in modelData && modelData["style"] === "highlighted" ? Font.Bold : Font.Light
                 fontSize: "small"
                 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
                 color: grid.color
 
=== modified file 'plugins/Dash/CardCreator.js'
--- plugins/Dash/CardCreator.js	2014-08-29 08:19:53 +0000
+++ plugins/Dash/CardCreator.js	2014-09-11 16:03:35 +0000
@@ -84,7 +84,8 @@
                                     } \n\
                                     image: Image { \n\
                                         objectName: "artImage"; \n\
-                                        source: cardData && cardData["art"] || ""; \n\
+                                        property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\
+                                        source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; } \n\
                                         cache: true; \n\
                                         asynchronous: root.asynchronous; \n\
                                         fillMode: Image.PreserveAspectCrop; \n\
@@ -195,7 +196,8 @@
                             objectName: "mascotImage"; \n\
                             anchors { %1 } \n\
                             readonly property int maxSize: Math.max(width, height) * 4; \n\
-                            source: cardData && cardData["mascot"] || ""; \n\
+                            property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\
+                            source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; } \n\
                             width: units.gu(6); \n\
                             height: units.gu(5.625); \n\
                             sourceSize { width: maxSize; height: maxSize } \n\
@@ -215,18 +217,18 @@
                         elide: Text.ElideRight; \n\
                         fontSize: "small"; \n\
                         wrapMode: Text.Wrap; \n\
-                        maximumLineCount: 2; \n\
+                        maximumLineCount: horizontalAlignment === Text.AlignHCenter ? 1 : 2; \n\
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \n\
                         color: %2; \n\
                         visible: showHeader %3; \n\
                         text: root.title; \n\
-                        font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal; \n\
-                        horizontalAlignment: root.headerAlignment; \n\
+                        font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; \n\
+                        horizontalAlignment: root.titleAlignment; \n\
                     }\n';
 
 // %1 is used as extra anchors of emblemIcon
 // %2 is used as color of emblemIcon
-var kEmblemIconCode = 'Icon { \n\
+var kEmblemIconCode = 'StatusIcon { \n\
                             id: emblemIcon; \n\
                             objectName: "emblemIcon"; \n\
                             anchors { \n\
@@ -236,7 +238,6 @@
                             } \n\
                             source: cardData && cardData["emblem"] || ""; \n\
                             color: %2; \n\
-                            width: height; \n\
                             height: source != "" ? titleLabel.font.pixelSize : 0; \n\
                         }\n';
 
@@ -258,13 +259,12 @@
                             anchors { %1 } \n\
                             anchors.topMargin: units.dp(2); \n\
                             elide: Text.ElideRight; \n\
-                            fontSize: "small"; \n\
+                            fontSize: "x-small"; \n\
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \n\
                             color: %2; \n\
                             visible: titleLabel.visible && titleLabel.text; \n\
                             text: cardData && cardData["subtitle"] || ""; \n\
                             font.weight: Font.Light; \n\
-                            horizontalAlignment: root.headerAlignment; \n\
                         }\n';
 
 // %1 is used as anchors of attributesRow
@@ -310,7 +310,7 @@
                 property var artShapeBorderSource: undefined; \n\
                 property real fontScale: 1.0; \n\
                 property var scopeStyle: null; \n\
-                property int headerAlignment: Text.AlignLeft; \n\
+                property int titleAlignment: Text.AlignLeft; \n\
                 property int fixedHeaderHeight: -1; \n\
                 property size fixedArtShapeSize: Qt.size(-1, -1); \n\
                 readonly property string title: cardData && cardData["title"] || ""; \n\
@@ -655,6 +655,8 @@
 function createCardComponent(parent, template, components) {
     var imports = 'import QtQuick 2.2; \n\
                    import Ubuntu.Components 1.1; \n\
+                   import Ubuntu.Settings.Components 0.1; \n\
+                   import Ubuntu.Connectivity 1.0; \n\
                    import Dash 0.1;\n\
                    import Utils 0.1;\n';
     var card = cardString(template, components);
 
=== modified file 'plugins/Dash/listviewwithpageheader.cpp'
--- plugins/Dash/listviewwithpageheader.cpp	2014-09-01 10:45:25 +0000
+++ plugins/Dash/listviewwithpageheader.cpp	2014-09-11 16:03:35 +0000
@@ -104,8 +104,6 @@
 #pragma GCC diagnostic pop
 // #include <private/qquickrectangle_p.h>
 
-static const qreal bufferRatio = 0.5;
-
 qreal ListViewWithPageHeader::ListItem::height() const
 {
     return m_item->height() + (m_sectionItem ? m_sectionItem->height() : 0);
@@ -158,6 +156,7 @@
  , m_forceNoClip(false)
  , m_inLayout(false)
  , m_inContentHeightKeepHeaderShown(false)
+ , m_cacheBuffer(0)
 {
     m_clipItem = new QQuickItem(contentItem());
 //     m_clipItem = new QQuickRectangle(contentItem());
@@ -335,6 +334,20 @@
     return m_headerItemShownHeight;
 }
 
+qreal ListViewWithPageHeader::cacheBuffer() const
+{
+    return m_cacheBuffer;
+}
+
+void ListViewWithPageHeader::setCacheBuffer(qreal cacheBuffer)
+{
+    if (cacheBuffer != m_cacheBuffer) {
+        m_cacheBuffer = cacheBuffer;
+        Q_EMIT cacheBufferChanged();
+        polish();
+    }
+}
+
 void ListViewWithPageHeader::positionAtBeginning()
 {
     if (m_delegateModel->count() <= 0)
@@ -356,8 +369,7 @@
         // Create the subsequent items
         int modelIndex = 1;
         qreal pos = item->y() + item->height();
-        const qreal buffer = height() * bufferRatio;
-        const qreal bufferTo = height() + buffer;
+        const qreal bufferTo = height() + m_cacheBuffer;
         while (modelIndex < m_delegateModel->count() && pos <= bufferTo) {
             if (!(item = createItem(modelIndex, false)))
                 break;
@@ -409,6 +421,16 @@
     }
 }
 
+Q_INVOKABLE int ListViewWithPageHeader::firstCreatedIndex() const
+{
+    return m_firstVisibleIndex;
+}
+
+Q_INVOKABLE int ListViewWithPageHeader::createdItemCount() const
+{
+    return m_visibleItems.count();
+}
+
 QQuickItem *ListViewWithPageHeader::item(int modelIndex) const
 {
     ListItem *item = itemAtIndex(modelIndex);
@@ -593,11 +615,10 @@
         return;
     }
 
-    const qreal buffer = height() * bufferRatio;
     const qreal from = contentY();
     const qreal to = from + height();
-    const qreal bufferFrom = from - buffer;
-    const qreal bufferTo = to + buffer;
+    const qreal bufferFrom = from - m_cacheBuffer;
+    const qreal bufferTo = to + m_cacheBuffer;
 
     bool added = addVisibleItems(from, to, false);
     bool removed = removeNonVisibleItems(bufferFrom, bufferTo);
 
=== modified file 'plugins/Dash/listviewwithpageheader.h'
--- plugins/Dash/listviewwithpageheader.h	2014-09-01 10:45:25 +0000
+++ plugins/Dash/listviewwithpageheader.h	2014-09-11 16:03:35 +0000
@@ -54,6 +54,7 @@
     Q_PROPERTY(bool forceNoClip READ forceNoClip WRITE setForceNoClip NOTIFY forceNoClipChanged)
     Q_PROPERTY(int stickyHeaderHeight READ stickyHeaderHeight NOTIFY stickyHeaderHeightChanged)
     Q_PROPERTY(qreal headerItemShownHeight READ headerItemShownHeight NOTIFY headerItemShownHeightChanged)
+    Q_PROPERTY(qreal cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
 
     friend class ListViewWithPageHeaderTest;
     friend class ListViewWithPageHeaderTestSection;
@@ -84,8 +85,13 @@
     int stickyHeaderHeight() const;
     qreal headerItemShownHeight() const;
 
+    qreal cacheBuffer() const;
+    void setCacheBuffer(qreal cacheBuffer);
+
     Q_INVOKABLE void positionAtBeginning();
     Q_INVOKABLE void showHeader();
+    Q_INVOKABLE int firstCreatedIndex() const;
+    Q_INVOKABLE int createdItemCount() const;
     Q_INVOKABLE QQuickItem *item(int modelIndex) const;
 
     // The index has to be created for this to try to do something
@@ -103,6 +109,7 @@
     void forceNoClipChanged();
     void stickyHeaderHeightChanged();
     void headerItemShownHeightChanged();
+    void cacheBufferChanged();
 
 protected:
     void componentComplete() override;
@@ -197,6 +204,7 @@
     bool m_forceNoClip;
     bool m_inLayout;
     bool m_inContentHeightKeepHeaderShown;
+    qreal m_cacheBuffer;
 
     // Qt 5.0 doesn't like releasing the items just after itemCreated
     // so we delay the releasing until the next updatePolish
 
=== modified file 'qml/Dash/CardGrid.qml'
--- qml/Dash/CardGrid.qml	2014-07-29 08:57:29 +0000
+++ qml/Dash/CardGrid.qml	2014-09-11 16:03:35 +0000
@@ -55,6 +55,7 @@
         delegate: Item {
             width: grid.cellWidth
             height: grid.cellHeight
+            visible: y + height >= root.visibleRangeBegin && y <= root.visibleRangeEnd
             Loader {
                 id: loader
                 sourceComponent: cardTool.cardComponent
@@ -68,7 +69,7 @@
                     item.cardData = Qt.binding(function() { return model; });
                     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.titleAlignment = Qt.binding(function() { return cardTool.titleAlignment; });
                     item.scopeStyle = root.scopeStyle;
                 }
                 Connections {
 
=== modified file 'qml/Dash/CardHorizontalList.qml'
--- qml/Dash/CardHorizontalList.qml	2014-08-15 14:21:42 +0000
+++ qml/Dash/CardHorizontalList.qml	2014-09-11 16:03:35 +0000
@@ -49,7 +49,7 @@
                 item.cardData = Qt.binding(function() { return model; });
                 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.titleAlignment = Qt.binding(function() { return cardTool.titleAlignment; });
                 item.scopeStyle = root.scopeStyle;
             }
             Connections {
 
=== modified file 'qml/Dash/CardTool.qml'
--- qml/Dash/CardTool.qml	2014-09-08 14:11:57 +0000
+++ qml/Dash/CardTool.qml	2014-09-11 16:03:35 +0000
@@ -131,21 +131,26 @@
     property size artShapeSize: cardLoader.item ? cardLoader.item.artShapeSize : 0
 
     /*!
-     \brief Desired alignment of header components.
+     \brief Desired alignment of title
      */
-    readonly property int headerAlignment: {
-        var subtitle = components["subtitle"];
-        var price = components["price"];
-        var summary = components["summary"];
-
-        var hasSubtitle = subtitle && (typeof subtitle === "string" || subtitle["field"])
-        var hasPrice = price && (typeof price === "string" || subtitle["field"]);
-        var hasSummary = summary && (typeof summary === "string" || summary["field"])
-
-        var isOnlyTextComponent = !hasSubtitle && !hasPrice && !hasSummary;
-        if (!isOnlyTextComponent) return Text.AlignLeft;
-
-        return (template["card-layout"] === "horizontal") ? Text.AlignLeft : Text.AlignHCenter;
+    readonly property int titleAlignment: {
+        if (template["card-layout"] === "horizontal"
+            || typeof components["title"] !== "object"
+            || components["title"]["align"] !== "center") return Text.AlignLeft;
+
+        var keys = ["mascot", "emblem", "subtitle", "attributes", "summary"];
+
+        for (var key in keys) {
+            key = keys[key];
+            try {
+                if (typeof components[key] === "string"
+                    || typeof components[key]["field"] === "string") return Text.AlignLeft;
+            } catch (e) {
+                continue;
+            }
+        }
+
+        return Text.AlignHCenter;
     }
 
     QtObject {
@@ -169,16 +174,19 @@
 
     Item {
         id: attributesModel
-        property int numOfAttributes: {
+        property int numOfAttributes: 0
+        property var model: []
+        property bool hasAttributes: {
             var attributes = components["attributes"];
-            if ((attributes != undefined) && attributes["field"]) {
+            var hasAttributesFlag = (attributes != undefined) && attributes["field"];
+
+            if (hasAttributesFlag) {
                 if (attributes["max-count"]) {
-                    return attributes["max-count"];
+                    numOfAttributes = attributes["max-count"];
                 }
             }
-            return 0;
+            return hasAttributesFlag
         }
-        property var model: []
 
         onNumOfAttributesChanged: {
             model = []
 
=== modified file 'qml/Dash/CardVerticalJournal.qml'
--- qml/Dash/CardVerticalJournal.qml	2014-07-29 08:57:29 +0000
+++ qml/Dash/CardVerticalJournal.qml	2014-09-11 16:03:35 +0000
@@ -49,6 +49,7 @@
             id: loader
             sourceComponent: cardTool.cardComponent
             width: cardTool.cardWidth
+            visible: y + height >= root.visibleRangeBegin && y <= root.visibleRangeEnd
             onLoaded: {
                 item.objectName = "delegate" + index;
                 item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
@@ -56,7 +57,7 @@
                 item.cardData = Qt.binding(function() { return model; });
                 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.titleAlignment = Qt.binding(function() { return cardTool.titleAlignment; });
                 item.scopeStyle = root.scopeStyle;
             }
             Connections {
 
=== modified file 'qml/Dash/DashContent.qml'
--- qml/Dash/DashContent.qml	2014-08-27 15:35:52 +0000
+++ qml/Dash/DashContent.qml	2014-09-11 16:03:35 +0000
@@ -177,6 +177,7 @@
                         dashContent.scopeLoaded(item.scope.id)
                         item.paginationCount = Qt.binding(function() { return dashContentList.count } )
                         item.paginationIndex = Qt.binding(function() { return dashContentList.currentIndex } )
+                        item.holdingList = dashContentList;
                     }
                     Connections {
                         target: isCurrent ? scope : null
 
=== modified file 'qml/Dash/DashRenderer.qml'
--- qml/Dash/DashRenderer.qml	2014-07-29 08:57:29 +0000
+++ qml/Dash/DashRenderer.qml	2014-09-11 16:03:35 +0000
@@ -27,6 +27,10 @@
 
     property int displayMarginEnd: 0
 
+    property int visibleRangeBegin: 0
+
+    property int visibleRangeEnd: 0
+
     property real originY: 0
 
     // The model to renderer
 
=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-09-08 14:15:01 +0000
+++ qml/Dash/GenericScopeView.qml	2014-09-11 16:03:35 +0000
@@ -38,6 +38,7 @@
     property int paginationCount: 0
     property int paginationIndex: 0
     property alias pageHeaderTotallyVisible: categoryView.pageHeaderTotallyVisible
+    property var holdingList: null
 
     property var scopeStyle: ScopeStyle {
         style: scope ? scope.customizations : {}
@@ -47,6 +48,10 @@
 
     signal backClicked()
 
+    onScopeChanged: {
+        floatingSeeLess.companionBase = null;
+    }
+
     function positionAtBeginning() {
         categoryView.positionAtBeginning()
     }
@@ -152,11 +157,55 @@
         forceNoClip: subPageLoader.open
         pixelAligned: true
 
-        property Item expandedCategoryItem: null
+        property string expandedCategoryId: ""
+        property int runMaximizeAfterSizeChanges: 0
 
         readonly property bool pageHeaderTotallyVisible: scopeView.showPageHeader &&
             ((headerItemShownHeight == 0 && categoryView.contentY <= categoryView.originY) || (headerItemShownHeight == pageHeaderLoader.item.height))
 
+        onExpandedCategoryIdChanged: {
+            var firstCreated = firstCreatedIndex();
+            var shrinkingAny = false;
+            var shrinkHeightDifference = 0;
+            for (var i = 0; i < createdItemCount(); ++i) {
+                var baseItem = item(firstCreated + i);
+                if (baseItem.expandable) {
+                    var shouldExpand = baseItem.category === expandedCategoryId;
+                    if (shouldExpand != baseItem.expanded) {
+
+                        var animate = false;
+                        if (!subPageLoader.open) {
+                            var animateShrinking = !shouldExpand  && baseItem.y + baseItem.item.collapsedHeight + baseItem.seeAll.height < categoryView.height;
+                            var animateGrowing = shouldExpand && baseItem.y + baseItem.height < categoryView.height;
+                            animate = shrinkingAny || animateShrinking || animateGrowing;
+                        }
+
+                        if (!shouldExpand) {
+                            shrinkingAny = true;
+                            shrinkHeightDifference = baseItem.item.expandedHeight - baseItem.item.collapsedHeight;
+                        }
+
+                        if (shouldExpand && !subPageLoader.open) {
+                            if (!shrinkingAny) {
+                                categoryView.maximizeVisibleArea(firstCreated + i, baseItem.item.expandedHeight + baseItem.seeAll.height);
+                            } else {
+                                // If the space that shrkinking is smaller than the one we need to grow we'll call maximizeVisibleArea
+                                // after the shrink/grow animation ends
+                                var growHeightDifference = baseItem.item.expandedHeight - baseItem.item.collapsedHeight;
+                                if (growHeightDifference > shrinkHeightDifference) {
+                                    runMaximizeAfterSizeChanges = 2;
+                                } else {
+                                    runMaximizeAfterSizeChanges = 0;
+                                }
+                            }
+                        }
+
+                        baseItem.expand(shouldExpand, animate);
+                    }
+                }
+            }
+        }
+
         delegate: ListItems.Base {
             id: baseItem
             objectName: "dashCategory" + category
@@ -175,6 +224,7 @@
             readonly property string category: categoryId
             readonly property string headerLink: model.headerLink
             readonly property var item: rendererLoader.item
+            readonly property var seeAll: seeAll
 
             function expand(expand, animate) {
                 heightBehaviour.enabled = animate;
@@ -194,13 +244,13 @@
                 // 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 === categoryView.expandedCategoryItem;
+                    var shouldExpand = baseItem.category === categoryView.expandedCategoryId;
                     baseItem.expand(shouldExpand, false /*animate*/);
                 }
             }
 
-            onHeightChanged: rendererLoader.updateDelegateCreationRange();
-            onYChanged: rendererLoader.updateDelegateCreationRange();
+            onHeightChanged: rendererLoader.updateRanges();
+            onYChanged: rendererLoader.updateRanges();
 
             Loader {
                 id: rendererLoader
@@ -215,9 +265,23 @@
                     id: heightBehaviour
                     enabled: false
                     animation: UbuntuNumberAnimation {
+                        duration: UbuntuAnimation.FastDuration
                         onRunningChanged: {
                             if (!running) {
                                 heightBehaviour.enabled = false
+                                if (categoryView.runMaximizeAfterSizeChanges > 0) {
+                                    categoryView.runMaximizeAfterSizeChanges--;
+                                    if (categoryView.runMaximizeAfterSizeChanges == 0) {
+                                        var firstCreated = categoryView.firstCreatedIndex();
+                                        for (var i = 0; i < categoryView.createdItemCount(); ++i) {
+                                            var baseItem = categoryView.item(firstCreated + i);
+                                            if (baseItem.category === categoryView.expandedCategoryId) {
+                                                categoryView.maximizeVisibleArea(firstCreated + i, baseItem.item.expandedHeight + baseItem.seeAll.height);
+                                                break;
+                                            }
+                                        }
+                                    }
+                                }
                             }
                         }
                     }
@@ -245,10 +309,10 @@
                     item.objectName = Qt.binding(function() { return categoryId })
                     item.scopeStyle = scopeView.scopeStyle;
                     if (baseItem.expandable) {
-                        var shouldExpand = baseItem === categoryView.expandedCategoryItem;
+                        var shouldExpand = baseItem.category === categoryView.expandedCategoryId;
                         baseItem.expand(shouldExpand, false /*animate*/);
                     }
-                    updateDelegateCreationRange();
+                    updateRanges();
                     if (scope && scope.id === "clickscope" && (categoryId === "predefined" || categoryId === "local")) {
                         // Yeah, hackish :/
                         cardTool.artShapeSize = Qt.size(units.gu(8), units.gu(7.5));
@@ -303,13 +367,25 @@
                             }
                         }
                     }
-                    onOriginYChanged: rendererLoader.updateDelegateCreationRange();
-                    onContentYChanged: rendererLoader.updateDelegateCreationRange();
-                    onHeightChanged: rendererLoader.updateDelegateCreationRange();
-                    onContentHeightChanged: rendererLoader.updateDelegateCreationRange();
-                }
-
-                function updateDelegateCreationRange() {
+                    onOriginYChanged: rendererLoader.updateRanges();
+                    onContentYChanged: rendererLoader.updateRanges();
+                    onHeightChanged: rendererLoader.updateRanges();
+                    onContentHeightChanged: rendererLoader.updateRanges();
+                }
+                Connections {
+                    target: scopeView
+                    onIsCurrentChanged: rendererLoader.updateRanges();
+                }
+                Connections {
+                    target: holdingList
+                    onMovingChanged: if (!moving) rendererLoader.updateRanges();
+                }
+
+                function updateRanges() {
+                    if (holdingList && holdingList.moving) {
+                        return;
+                    }
+
                     if (categoryView.moving) {
                         // Do not update the range if we are overshooting up or down, since we'll come back
                         // to the stable position and delete/create items without any reason
@@ -321,10 +397,18 @@
                         }
                     }
 
+                    if (item && item.hasOwnProperty("visibleRangeBegin")) {
+                        item.visibleRangeBegin = Math.max(-baseItem.y, 0)
+                        item.visibleRangeEnd = item.visibleRangeBegin + Math.min(categoryView.height, rendererLoader.height)
+                    }
+
                     if (item && item.hasOwnProperty("displayMarginBeginning")) {
                         // TODO do we need item.originY here, test 1300302 once we have a silo
                         // and we can run it on the phone
-                        if (baseItem.y + baseItem.height <= 0) {
+                        if (scopeView.isCurrent) {
+                            item.displayMarginBeginning = 1073741823;
+                            item.displayMarginEnd = 1073741823;
+                        } else if (baseItem.y + baseItem.height <= 0) {
                             // Not visible (item at top of the list viewport)
                             item.displayMarginBeginning = -baseItem.height;
                             item.displayMarginEnd = 0;
@@ -333,9 +417,9 @@
                             item.displayMarginBeginning = 0;
                             item.displayMarginEnd = -baseItem.height;
                         } else {
-                            item.displayMarginBeginning = -Math.max(-baseItem.y, 0);
-                            item.displayMarginEnd = -Math.max(baseItem.height - seeAll.height
-                                                              - categoryView.height + baseItem.y, 0)
+                            item.displayMarginBeginning = Math.round(-Math.max(-baseItem.y, 0));
+                            item.displayMarginEnd = -Math.round(Math.max(baseItem.height - seeAll.height
+                                                              - categoryView.height + baseItem.y, 0));
                         }
                     }
                 }
@@ -352,10 +436,11 @@
                 height: seeAllLabel.visible ? seeAllLabel.font.pixelSize + units.gu(4) : 0
 
                 onClicked: {
-                    if (categoryView.expandedCategoryItem !== baseItem) {
-                        categoryView.expandedCategoryItem = baseItem;
+                    if (categoryView.expandedCategoryId !== baseItem.category) {
+                        categoryView.expandedCategoryId = baseItem.category;
+                        floatingSeeLess.companionBase = baseItem;
                     } else {
-                        categoryView.expandedCategoryItem = null;
+                        categoryView.expandedCategoryId = "";
                     }
                 }
 
@@ -455,7 +540,7 @@
         objectName: "floatingSeeLess"
 
         property Item companionTo: companionBase ? companionBase.seeAllButton : null
-        property Item companionBase: categoryView.expandedCategoryItem
+        property Item companionBase: null
         property bool showBecausePosition: false
         property real yOffset: 0
 
@@ -467,7 +552,7 @@
         height: seeLessLabel.font.pixelSize + units.gu(4)
         visible: companionTo && showBecausePosition
 
-        onClicked: categoryView.expandedCategoryItem = null;
+        onClicked: categoryView.expandedCategoryId = "";
 
         function updateVisibility() {
             var companionPos = companionTo.mapToItem(floatingSeeLess, 0, 0);
@@ -476,6 +561,10 @@
             var posToBase = floatingSeeLess.mapToItem(companionBase, 0, -yOffset).y;
             yOffset = Math.max(0, companionBase.item.collapsedHeight - posToBase);
             yOffset = Math.min(yOffset, height);
+
+            if (!showBecausePosition && categoryView.expandedCategoryId === "") {
+                companionBase = null;
+            }
         }
 
         Label {
 
=== modified file 'qml/Dash/ScopeListView.qml'
--- qml/Dash/ScopeListView.qml	2014-07-23 06:54:10 +0000
+++ qml/Dash/ScopeListView.qml	2014-09-11 16:03:35 +0000
@@ -20,4 +20,5 @@
 ListViewWithPageHeader {
     maximumFlickVelocity: height * 10
     flickDeceleration: height * 2
+    cacheBuffer: Number.MAX_VALUE
 }
 
=== modified file 'qml/Dash/ScopesOverviewAll.qml'
--- qml/Dash/ScopesOverviewAll.qml	2014-07-25 08:47:40 +0000
+++ qml/Dash/ScopesOverviewAll.qml	2014-09-11 16:03:35 +0000
@@ -43,6 +43,8 @@
         id: cardGrid
         width: root.width
         height: parent.height
+        visibleRangeBegin: root.contentY
+        visibleRangeEnd: root.contentY + root.height
 
         onClicked: {
             root.clicked(index, result, item, itemModel);
 
=== modified file 'qml/Dash/ScopesOverviewFavorites.qml'
--- qml/Dash/ScopesOverviewFavorites.qml	2014-07-30 10:14:35 +0000
+++ qml/Dash/ScopesOverviewFavorites.qml	2014-09-11 16:03:35 +0000
@@ -61,7 +61,7 @@
                 item.cardData = Qt.binding(function() { return model; });
                 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.titleAlignment = Qt.binding(function() { return cardTool.titleAlignment; });
             }
 
             Connections {
 
=== modified file 'tests/autopilot/unity8/shell/emulators/dash.py'
--- tests/autopilot/unity8/shell/emulators/dash.py	2014-08-25 16:07:45 +0000
+++ tests/autopilot/unity8/shell/emulators/dash.py	2014-09-11 16:03:35 +0000
@@ -93,7 +93,7 @@
                 'No scope found with id {0}'.format(scope_id))
 
     def _get_scope_from_loader(self, loader):
-        return loader.get_children()[0]
+        return loader.wait_select_single('GenericScopeView');
 
     def _open_scope_scrolling(self, scope_loader):
         scroll = self._get_scroll_direction(scope_loader)
@@ -102,8 +102,8 @@
             scroll()
             self.dash_content_list.moving.wait_for(False)
 
+        scope_loader.isCurrent.wait_for(True)
         scope = self._get_scope_from_loader(scope_loader)
-        scope.isCurrent.wait_for(True)
         return scope
 
     def _get_scroll_direction(self, scope_loader):
 
=== modified file 'tests/mocks/Ubuntu/CMakeLists.txt'
--- tests/mocks/Ubuntu/CMakeLists.txt	2014-08-25 10:05:13 +0000
+++ tests/mocks/Ubuntu/CMakeLists.txt	2014-09-11 16:03:35 +0000
@@ -1,3 +1,4 @@
+add_subdirectory(Connectivity)
 add_subdirectory(DownloadDaemonListener)
 add_subdirectory(Payments)
 add_subdirectory(SystemImage)
 
=== added directory 'tests/mocks/Ubuntu/Connectivity'
=== added file 'tests/mocks/Ubuntu/Connectivity/CMakeLists.txt'
--- tests/mocks/Ubuntu/Connectivity/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/Connectivity/CMakeLists.txt	2014-09-11 16:03:35 +0000
@@ -0,0 +1,10 @@
+add_library(connectivity-qml SHARED
+    networking-status.cpp
+    plugin.cpp
+)
+qt5_use_modules(connectivity-qml Qml)
+
+# copy qmldir file into build directory for shadow builds
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
+    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+    )
 
=== added file 'tests/mocks/Ubuntu/Connectivity/networking-status.cpp'
--- tests/mocks/Ubuntu/Connectivity/networking-status.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/Connectivity/networking-status.cpp	2014-09-11 16:03:35 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2013 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 version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#include "networking-status.h"
+
+NetworkingStatus::NetworkingStatus(QObject *parent)
+        : QObject(parent)
+{
+
+    qRegisterMetaType<NetworkingStatus::Limitations>();
+    qRegisterMetaType<QVector<NetworkingStatus::Limitations>>();
+    qRegisterMetaType<NetworkingStatus::Status>();
+}
+
+NetworkingStatus::~NetworkingStatus()
+{}
+
+QVector<NetworkingStatus::Limitations>
+NetworkingStatus::limitations() const
+{
+    return m_limitations;
+}
+
+NetworkingStatus::Status
+NetworkingStatus::status() const
+{
+    return Status::Online;
+}
+
+bool
+NetworkingStatus::online() const
+{
+    return status() == Status::Online;
+}
+
+bool
+NetworkingStatus::limitedBandwith() const
+{
+    return limitations().contains(Limitations::Bandwith);
+}
+
+void NetworkingStatus::setLimitedBandwidth(bool limited)
+{
+    if (limited) {
+        m_limitations << Limitations::Bandwith;
+    } else if (limitedBandwith()) {
+        m_limitations.remove(m_limitations.indexOf(Limitations::Bandwith));
+    }
+}
 
=== added file 'tests/mocks/Ubuntu/Connectivity/networking-status.h'
--- tests/mocks/Ubuntu/Connectivity/networking-status.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/Connectivity/networking-status.h	2014-09-11 16:03:35 +0000
@@ -0,0 +1,73 @@
+/*
+ * Copyright © 2014 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 version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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/>.
+ *
+ */
+
+#ifndef FAKE_NETWORKING_STATUS_H
+#define FAKE_NETWORKING_STATUS_H
+
+#include <QObject>
+#include <QVector>
+
+class Q_DECL_EXPORT NetworkingStatus : public QObject
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(NetworkingStatus)
+
+    Q_ENUMS(Limitations)
+    Q_ENUMS(Status)
+
+    Q_PROPERTY(QVector<Limitations> limitations READ limitations NOTIFY limitationsChanged)
+    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+    Q_PROPERTY(bool online READ online NOTIFY onlineChanged)
+    Q_PROPERTY(bool limitedBandwith READ limitedBandwith WRITE setLimitedBandwidth NOTIFY limitedBandwithChanged)
+
+public:
+    explicit NetworkingStatus(QObject *parent = 0);
+    virtual ~NetworkingStatus();
+
+    enum Limitations {
+        Bandwith
+    };
+
+    enum Status {
+        Offline,
+        Connecting,
+        Online
+    };
+
+    QVector<Limitations> limitations() const;
+    Status status() const;
+    bool online() const;
+    bool limitedBandwith() const;
+
+    // Only in the fake one
+    void setLimitedBandwidth(bool limited);
+
+Q_SIGNALS:
+    void limitationsChanged();
+    void statusChanged(Status value);
+    void onlineChanged(bool value);
+    void limitedBandwithChanged(bool value);
+
+private:
+    QVector<NetworkingStatus::Limitations> m_limitations;
+};
+
+Q_DECLARE_METATYPE(NetworkingStatus::Limitations)
+Q_DECLARE_METATYPE(QVector<NetworkingStatus::Limitations>)
+Q_DECLARE_METATYPE(NetworkingStatus::Status)
+
+#endif // FAKE_NETWORKING_STATUS_H
 
=== added file 'tests/mocks/Ubuntu/Connectivity/plugin.cpp'
--- tests/mocks/Ubuntu/Connectivity/plugin.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/Connectivity/plugin.cpp	2014-09-11 16:03:35 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2014 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 version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#include "plugin.h"
+
+#include <QtQml>
+
+#include "networking-status.h"
+
+static QObject *
+networkingStatusSingletonProvider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(scriptEngine)
+
+    return new NetworkingStatus(engine);
+}
+
+void
+QmlConnectivityNetworkingPlugin::registerTypes(const char *uri)
+{
+    // @uri Ubuntu.Connectivity
+    qmlRegisterSingletonType<NetworkingStatus>(uri, 1, 0, "NetworkingStatus", networkingStatusSingletonProvider);
+}
+
+void
+QmlConnectivityNetworkingPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
+{
+  Q_UNUSED(uri);
+  Q_UNUSED(engine);
+}
 
=== added file 'tests/mocks/Ubuntu/Connectivity/plugin.h'
--- tests/mocks/Ubuntu/Connectivity/plugin.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/Connectivity/plugin.h	2014-09-11 16:03:35 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2014 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 version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#ifndef QML_CONNECTIVITY_PLUGIN_H
+#define QML_CONNECTIVITY_PLUGIN_H
+
+#include <QQmlExtensionPlugin>
+
+class QmlConnectivityNetworkingPlugin : public QQmlExtensionPlugin {
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+    Q_INTERFACES(QQmlExtensionInterface)
+
+public:
+    void registerTypes(const char *uri);
+    void initializeEngine(QQmlEngine *engine, const char *uri);
+};
+
+#endif // QML_CONNECTIVITY_PLUGIN_H
 
=== added file 'tests/mocks/Ubuntu/Connectivity/qmldir'
--- tests/mocks/Ubuntu/Connectivity/qmldir	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/Connectivity/qmldir	2014-09-11 16:03:35 +0000
@@ -0,0 +1,2 @@
+module Ubuntu.Connectivity
+plugin connectivity-qml
 
=== modified file 'tests/mocks/Unity/fake_categories.cpp'
--- tests/mocks/Unity/fake_categories.cpp	2014-08-15 14:21:42 +0000
+++ tests/mocks/Unity/fake_categories.cpp	2014-09-11 16:03:35 +0000
@@ -29,25 +29,12 @@
 
 int Categories::rowCount(const QModelIndex& /*parent*/) const
 {
-    return m_category_count + m_specialCategories.count();
+    return m_category_count;
 }
 
-void Categories::addSpecialCategory(QString const& categoryId, QString const& name, QString const& icon, QString const& rawTemplate, QObject* countObject)
+void Categories::addSpecialCategory(QString const& /*categoryId*/, QString const& /*name*/, QString const& /*icon*/, QString const& /*rawTemplate*/, QObject* /*countObject*/)
 {
-    CategoryData catData;
-    catData.categoryId = categoryId;
-    catData.name = name;
-    catData.icon = icon;
-    catData.rawTemplate = rawTemplate;
-    catData.countObject = countObject;
-
-    beginInsertRows(QModelIndex(), 0, 0);
-    m_specialCategories.prepend(catData);
-    endInsertRows();
-
-    if (countObject) {
-        connect(countObject, SIGNAL(countChanged()), this, SLOT(countChanged()));
-    }
+    qFatal("Using un-implemented Categories::addSpecialCategory");
 }
 
 bool Categories::overrideCategoryJson(QString const& /* categoryId */, QString const& /* json */)
@@ -55,23 +42,6 @@
     qFatal("Using un-implemented Categories::overrideCategoryJson");
 }
 
-void Categories::countChanged()
-{
-    QObject* countObject = sender();
-
-    for (int i = 0; i < m_specialCategories.count(); ++i) {
-        const CategoryData &catData = m_specialCategories.at(i);
-        if (catData.countObject == countObject) {
-            QVector<int> roles;
-            roles.append(RoleCount);
-
-            QModelIndex changedIndex(index(i));
-            dataChanged(changedIndex, changedIndex, roles);
-            break;
-        }
-    }
-}
-
 QVariant
 Categories::data(const QModelIndex& index, int role) const
 {
@@ -79,115 +49,74 @@
         return QVariant();
     }
 
-    ResultsModel *resultsModel = m_resultsModels[index.row()];
-    if (!resultsModel) {
-        resultsModel = new ResultsModel(15, index.row());
-        m_resultsModels[index.row()] = resultsModel;
-    }
-    if (index.row() < m_specialCategories.count()) {
-        const CategoryData &catData = m_specialCategories.at(index.row());
-        switch (role) {
-            case RoleCategoryId:
-                return catData.categoryId;
-            case RoleName:
-                return catData.name;
-            case RoleIcon:
-                return catData.icon;
-            case RoleRawRendererTemplate:
-                return catData.rawTemplate;
-            case RoleRenderer:
-            {
-                QVariantMap map;
-                if (index.row() % 2 == 0) {
-                    map["category-layout"] = "grid";
-                } else {
-                    map["category-layout"] = "carousel";
-                    map["overlay"] = true;
-                }
-                map["card-size"] = "small";
-                return map;
-            }
-            case RoleComponents:
-            {
-                QVariantMap map, artMap, attributeMap;
+    ResultsModel *resultsModel = resultModel(index.row());
+    switch (role) {
+        case RoleCategoryId:
+            return QString("%1").arg(index.row());
+        case RoleName:
+            return QString("Category %1").arg(index.row());
+        case RoleIcon:
+            return "gtk-apply";
+        case RoleRawRendererTemplate:
+            qFatal("Using un-implemented RoleRawRendererTemplate Categories role");
+            return QVariant();
+        case RoleRenderer:
+        {
+            QVariantMap map;
+            if (index.row() % 2 == 0) {
+                map["category-layout"] = "grid";
+            } else {
+                map["category-layout"] = "carousel";
+            }
+            if (index.row() == 18) {
+                map["category-layout"] = "horizontal-list";
+            }
+            if (index.row() == 19) {
+                map["category-layout"] = "grid";
+                map["collapsed-rows"] = 0;
+            }
+            map["card-size"] = "small";
+
+            map["category-layout"] = m_layouts.value(index.row(), map["category-layout"].toString());
+
+            if (map["category-layout"] == "carousel") {
+                map["overlay"] = true;
+            }
+
+            return map;
+        }
+        case RoleComponents:
+        {
+            QVariantMap map, artMap, attributeMap;
+            if (index.row() % 2 != 0) {
+                artMap["aspect-ratio"] = QString("1.%1").arg(index.row());
+            } else {
                 artMap["aspect-ratio"] = "1.0";
-                artMap["field"] = "art";
-                map["art"] = artMap;
-                map["title"] = "HOLA";
-                attributeMap["field"] = "attribute";
-                map["attributes"] = attributeMap;
-                return map;
-            }
-            case RoleHeaderLink:
-                return QString();
-            case RoleResults:
-                return QVariant();
-            case RoleCount:
-                return catData.countObject->property("count");
-            default:
-                qFatal("Using un-implemented Categories role");
-                return QVariant();
-        }
-    } else {
-        switch (role) {
-            case RoleCategoryId:
-                return QString("%1").arg(index.row());
-            case RoleName:
-                return QString("Category %1").arg(index.row());
-            case RoleIcon:
-                return "gtk-apply";
-            case RoleRawRendererTemplate:
-                qFatal("Using un-implemented RoleRawRendererTemplate Categories role");
-                return QVariant();
-            case RoleRenderer:
-            {
-                QVariantMap map;
-                if (index.row() % 2 == 0) {
-                    map["category-layout"] = "grid";
-                } else {
-                    map["category-layout"] = "carousel";
-                    map["card-size"] = "medium";
-                    map["overlay"] = true;
-                }
-                if (index.row() == 18) {
-                    map["category-layout"] = "horizontal-list";
-                }
-                if (index.row() == 19) {
-                    map["category-layout"] = "grid";
-                    map["collapsed-rows"] = 0;
-                }
-                map["card-size"] = "small";
-                return map;
-            }
-            case RoleComponents:
-            {
-                QVariantMap map, artMap, attributeMap;
-                if (index.row() % 2 != 0) {
-                    artMap["aspect-ratio"] = QString("1.%1").arg(index.row());
-                } else {
-                    artMap["aspect-ratio"] = "1.0";
-                }
-                artMap["field"] = "art";
-                map["art"] = artMap;
-                map["title"] = "HOLA";
-                map["subtitle"] = "HOLA";
-                attributeMap["field"] = "attribute";
-                map["attributes"] = attributeMap;
-                return map;
-            }
-            case RoleHeaderLink:
-                if (index.row() == 1 || index.row() == 4) {
-                    return QString("scope://query/1");
-                }
-                return QString();
-            case RoleResults:
-                return QVariant::fromValue(resultsModel);
-            case RoleCount:
-                return resultsModel->rowCount();
-            default:
-                qFatal("Using un-implemented Categories role");
-                return QVariant();
-        }
+            }
+            artMap["field"] = "art";
+            map["art"] = artMap;
+            map["title"] = "HOLA";
+            map["subtitle"] = "HOLA";
+            attributeMap["field"] = "attribute";
+            map["attributes"] = attributeMap;
+            return map;
+        }
+        case RoleHeaderLink:
+        {
+            QString res;
+            if (index.row() == 1 || index.row() == 4) {
+                res = QString("scope://query/1");
+            }
+            res = m_headerLinks.value(index.row(), res);
+            return res;
+        }
+        case RoleResults:
+            return QVariant::fromValue(resultsModel);
+        case RoleCount:
+            return resultsModel->rowCount();
+        default:
+            qFatal("Using un-implemented Categories role");
+            return QVariant();
     }
 }
 
@@ -196,3 +125,33 @@
 {
     return data(index(row, 0), role);
 }
+
+void Categories::setCount(int count)
+{
+    if (m_category_count != count) {
+        beginResetModel(); // This is just for test setup so we can be lazy and reset
+        m_category_count = count;
+        endResetModel();
+    }
+}
+
+ResultsModel* Categories::resultModel(int row) const
+{
+    ResultsModel *result = m_resultsModels[row];
+    if (!result) {
+        Categories *that = const_cast<Categories*>(this);
+        result = new ResultsModel(15, row, that);
+        m_resultsModels[row] = result;
+    }
+    return result;
+}
+
+void Categories::setLayout(int row, const QString &layout)
+{
+    m_layouts[row] = layout;
+}
+
+void Categories::setHeaderLink(int row, const QString &headerLink)
+{
+    m_headerLinks[row] = headerLink;
+}
 
=== modified file 'tests/mocks/Unity/fake_categories.h'
--- tests/mocks/Unity/fake_categories.h	2014-07-11 16:39:33 +0000
+++ tests/mocks/Unity/fake_categories.h	2014-09-11 16:03:35 +0000
@@ -39,22 +39,17 @@
 
     Q_INVOKABLE QVariant data(int row, int role) const;
 
-private Q_SLOTS:
-    void countChanged();
+    // For testing purposes
+    Q_INVOKABLE void setCount(int count);
+    Q_INVOKABLE ResultsModel* resultModel(int row) const;
+    Q_INVOKABLE void setLayout(int row, const QString &layout);
+    Q_INVOKABLE void setHeaderLink(int row, const QString &headerLink);
 
 private:
     mutable QHash<int, ResultsModel*> m_resultsModels;
+    QHash<int, QString> m_layouts;
+    QHash<int, QString> m_headerLinks;
     int m_category_count;
-
-    struct CategoryData {
-        QString categoryId;
-        QString name;
-        QString icon;
-        QString rawTemplate;
-        QObject* countObject;
-    };
-
-    QList<CategoryData> m_specialCategories;
 };
 
 #endif // FAKE_CATEGORIES_H
 
=== modified file 'tests/mocks/Unity/fake_resultsmodel.cpp'
--- tests/mocks/Unity/fake_resultsmodel.cpp	2014-08-13 16:06:40 +0000
+++ tests/mocks/Unity/fake_resultsmodel.cpp	2014-09-11 16:03:35 +0000
@@ -44,6 +44,15 @@
     qFatal("Calling un-implemented ResultsModel::setCategoryId");
 }
 
+void ResultsModel::setResultCount(int result_count)
+{
+    if (m_result_count != result_count) {
+        beginResetModel(); // This is just for test setup so we can be lazy and reset
+        m_result_count = result_count;
+        endResetModel();
+    }
+}
+
 int ResultsModel::rowCount(const QModelIndex& parent) const
 {
     Q_UNUSED(parent);
 
=== modified file 'tests/mocks/Unity/fake_resultsmodel.h'
--- tests/mocks/Unity/fake_resultsmodel.h	2014-08-11 09:57:29 +0000
+++ tests/mocks/Unity/fake_resultsmodel.h	2014-09-11 16:03:35 +0000
@@ -41,6 +41,9 @@
     /* setters */
     void setCategoryId(QString const& id) override;
 
+    // For testing purposes
+    Q_INVOKABLE void setResultCount(int result_count);
+
 private:
     int m_result_count;
     int m_categoryId;
 
=== modified file 'tests/mocks/Unity/fake_scope.cpp'
--- tests/mocks/Unity/fake_scope.cpp	2014-08-27 08:01:40 +0000
+++ tests/mocks/Unity/fake_scope.cpp	2014-09-11 16:03:35 +0000
@@ -145,6 +145,23 @@
         Q_EMIT favoriteChanged();
     }
 }
+
+void Scope::setId(const QString &id)
+{
+    if (id != m_id) {
+        m_id = id;
+        Q_EMIT idChanged();
+    }
+}
+
+void Scope::setName(const QString &name)
+{
+    if (name != m_name) {
+        m_name = name;
+        Q_EMIT nameChanged();
+    }
+}
+
 void Scope::setSearchInProgress(const bool inProg)
 {
     if (inProg != m_searching) {
 
=== modified file 'tests/mocks/Unity/fake_scope.h'
--- tests/mocks/Unity/fake_scope.h	2014-08-12 12:09:49 +0000
+++ tests/mocks/Unity/fake_scope.h	2014-09-11 16:03:35 +0000
@@ -56,6 +56,8 @@
     void setFormFactor(const QString& form_factor) override;
     void setActive(const bool) override;
     void setFavorite(const bool) override;
+    Q_INVOKABLE void setId(const QString &id); // This is not invokable in the Interface, here for testing benefits
+    Q_INVOKABLE void setName(const QString &name); // This is not invokable in the Interface, here for testing benefits
     Q_INVOKABLE void setSearchInProgress(const bool inProg); // This is not invokable in the Interface, here for testing benefits
 
     Q_INVOKABLE void activate(QVariant const& result) override;
 
=== modified file 'tests/plugins/Dash/CMakeLists.txt'
--- tests/plugins/Dash/CMakeLists.txt	2014-07-22 10:03:37 +0000
+++ tests/plugins/Dash/CMakeLists.txt	2014-09-11 16:03:35 +0000
@@ -32,7 +32,7 @@
     qt5_use_modules(${TESTNAME}TestExec Test Core Qml)
     target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
 
-    add_binary_qml_test(${TESTNAME} "" "Dash-qml")
+    add_binary_qml_test(${TESTNAME} "" "Dash-qml" "")
 endmacro()
 
 add_lvwph_test(listviewwithpageheader ListViewWithPageHeader)
@@ -48,7 +48,7 @@
     qt5_use_modules(${TESTNAME}TestExec Test Core Qml)
     target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
 
-    add_binary_qml_test(${TESTNAME} "" "Dash-qml")
+    add_binary_qml_test(${TESTNAME} "" "Dash-qml" "")
 
     add_executable(${TESTNAME}tryExec
         ${FILENAME}try.cpp
@@ -71,7 +71,7 @@
 add_executable(CardCreatorTestExec cardcreatortest.cpp)
 qt5_use_modules(CardCreatorTestExec Test Core Qml)
 target_link_libraries(CardCreatorTestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
-add_binary_qml_test(CardCreator "" "Dash-qml")
+add_binary_qml_test(CardCreator "" "Dash-qml" "QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks/")
 
 # plain qml test
 set(qmltest_DEFAULT_TARGETS qmluitests)
 
=== modified file 'tests/plugins/Dash/cardcreator/1.res'
--- tests/plugins/Dash/cardcreator/1.res	2014-08-13 10:29:21 +0000
+++ tests/plugins/Dash/cardcreator/1.res	2014-09-11 16:03:35 +0000
@@ -6,7 +6,7 @@
                 property var artShapeBorderSource: undefined; 
                 property real fontScale: 1.0; 
                 property var scopeStyle: null; 
-                property int headerAlignment: Text.AlignLeft; 
+                property int titleAlignment: Text.AlignLeft; 
                 property int fixedHeaderHeight: -1; 
                 property size fixedArtShapeSize: Qt.size(-1, -1); 
                 readonly property string title: cardData && cardData["title"] || ""; 
@@ -46,7 +46,8 @@
                                     } 
                                     image: Image { 
                                         objectName: "artImage"; 
-                                        source: cardData && cardData["art"] || ""; 
+                                        property bool doLoadSource: !NetworkingStatus.limitedBandwith;
+                                        source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }
                                         cache: true; 
                                         asynchronous: root.asynchronous; 
                                         fillMode: Image.PreserveAspectCrop;
@@ -68,13 +69,13 @@
                         elide: Text.ElideRight; 
                         fontSize: "small"; 
                         wrapMode: Text.Wrap; 
-                        maximumLineCount: 2; 
+                        maximumLineCount: horizontalAlignment === Text.AlignHCenter ? 1 : 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
                         color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
                         visible: showHeader ; 
                         text: root.title; 
-                        font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal; 
-                        horizontalAlignment: root.headerAlignment; 
+                        font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; 
+                        horizontalAlignment: root.titleAlignment; 
                     }
 UbuntuShape {
     id: touchdown;
 
=== modified file 'tests/plugins/Dash/cardcreator/2.res'
--- tests/plugins/Dash/cardcreator/2.res	2014-08-29 08:31:22 +0000
+++ tests/plugins/Dash/cardcreator/2.res	2014-09-11 16:03:35 +0000
@@ -6,7 +6,7 @@
                 property var artShapeBorderSource: undefined; 
                 property real fontScale: 1.0; 
                 property var scopeStyle: null; 
-                property int headerAlignment: Text.AlignLeft; 
+                property int titleAlignment: Text.AlignLeft; 
                 property int fixedHeaderHeight: -1; 
                 property size fixedArtShapeSize: Qt.size(-1, -1); 
                 readonly property string title: cardData && cardData["title"] || ""; 
@@ -67,7 +67,8 @@
                             objectName: "mascotImage"; 
                             anchors { verticalCenter: parent.verticalCenter; } 
                             readonly property int maxSize: Math.max(width, height) * 4; 
-                            source: cardData && cardData["mascot"] || "";
+                            property bool doLoadSource: !NetworkingStatus.limitedBandwith;
+                            source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }
                             width: units.gu(6); 
                             height: units.gu(5.625); 
                             sourceSize { width: maxSize; height: maxSize } 
@@ -92,13 +93,13 @@
                         elide: Text.ElideRight; 
                         fontSize: "small"; 
                         wrapMode: Text.Wrap; 
-                        maximumLineCount: 2; 
+                        maximumLineCount: horizontalAlignment === Text.AlignHCenter ? 1 : 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
                         color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
                         visible: showHeader ; 
                         text: root.title; 
-                        font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal; 
-                        horizontalAlignment: root.headerAlignment; 
+                        font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; 
+                        horizontalAlignment: root.titleAlignment; 
                     }
                                     ,Label { 
                             id: subtitleLabel; 
@@ -110,13 +111,12 @@
                             } 
                             anchors.topMargin: units.dp(2); 
                             elide: Text.ElideRight; 
-                            fontSize: "small"; 
+                            fontSize: "x-small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
                             color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
                             visible: titleLabel.visible && titleLabel.text; 
                             text: cardData && cardData["subtitle"] || ""; 
                             font.weight: Font.Light; 
-                            horizontalAlignment: root.headerAlignment; 
                         }
  
                                   ] 
 
=== modified file 'tests/plugins/Dash/cardcreator/3.res'
--- tests/plugins/Dash/cardcreator/3.res	2014-08-13 10:29:21 +0000
+++ tests/plugins/Dash/cardcreator/3.res	2014-09-11 16:03:35 +0000
@@ -6,7 +6,7 @@
                 property var artShapeBorderSource: undefined; 
                 property real fontScale: 1.0; 
                 property var scopeStyle: null; 
-                property int headerAlignment: Text.AlignLeft; 
+                property int titleAlignment: Text.AlignLeft; 
                 property int fixedHeaderHeight: -1; 
                 property size fixedArtShapeSize: Qt.size(-1, -1); 
                 readonly property string title: cardData && cardData["title"] || ""; 
@@ -46,8 +46,9 @@
                                     } 
                                     image: Image { 
                                         objectName: "artImage"; 
-                                        source: cardData && cardData["art"] || ""; 
-                                        cache: true; 
+                                        property bool doLoadSource: !NetworkingStatus.limitedBandwith;
+                                        source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }
+                                        cache: true;
                                         asynchronous: root.asynchronous; 
                                         fillMode: Image.PreserveAspectCrop;
                                         width: root.width; 
@@ -68,13 +69,13 @@
                         elide: Text.ElideRight; 
                         fontSize: "small"; 
                         wrapMode: Text.Wrap; 
-                        maximumLineCount: 2; 
+                        maximumLineCount: horizontalAlignment === Text.AlignHCenter ? 1 : 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
                         color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
                         visible: showHeader ; 
                         text: root.title; 
-                        font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal; 
-                        horizontalAlignment: root.headerAlignment; 
+                        font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; 
+                        horizontalAlignment: root.titleAlignment; 
                     }
 Label { 
                             id: subtitleLabel; 
@@ -86,13 +87,12 @@
                             } 
                             anchors.topMargin: units.dp(2);
                             elide: Text.ElideRight; 
-                            fontSize: "small"; 
+                            fontSize: "x-small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
                             color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
                             visible: titleLabel.visible && titleLabel.text; 
                             text: cardData && cardData["subtitle"] || ""; 
                             font.weight: Font.Light; 
-                            horizontalAlignment: root.headerAlignment; 
                         }
 UbuntuShape {
     id: touchdown;
 
=== modified file 'tests/plugins/Dash/cardcreator/4.res'
--- tests/plugins/Dash/cardcreator/4.res	2014-08-13 10:29:21 +0000
+++ tests/plugins/Dash/cardcreator/4.res	2014-09-11 16:03:35 +0000
@@ -6,7 +6,7 @@
                 property var artShapeBorderSource: undefined; 
                 property real fontScale: 1.0; 
                 property var scopeStyle: null;
-                property int headerAlignment: Text.AlignLeft;
+                property int titleAlignment: Text.AlignLeft;
                 property int fixedHeaderHeight: -1; 
                 property size fixedArtShapeSize: Qt.size(-1, -1); 
                 readonly property string title: cardData && cardData["title"] || ""; 
@@ -46,8 +46,9 @@
                     objectName: "mascotImage"; 
                     anchors { verticalCenter: parent.verticalCenter; }
                     readonly property int maxSize: Math.max(width, height) * 4; 
-                    source: cardData && cardData["mascot"] || ""; 
-                    width: units.gu(6); 
+                    property bool doLoadSource: !NetworkingStatus.limitedBandwith;
+                    source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }
+                    width: units.gu(6);
                     height: units.gu(5.625); 
                     sourceSize { width: maxSize; height: maxSize } 
                     fillMode: Image.PreserveAspectCrop; 
@@ -72,13 +73,13 @@
                     elide: Text.ElideRight; 
                     fontSize: "small"; 
                     wrapMode: Text.Wrap; 
-                    maximumLineCount: 2; 
+                    maximumLineCount: horizontalAlignment === Text.AlignHCenter ? 1 : 2; 
                     font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
                     color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
                     visible: showHeader ; 
                     text: root.title; 
-                    font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal; 
-                    horizontalAlignment: root.headerAlignment; 
+                    font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; 
+                    horizontalAlignment: root.titleAlignment; 
                 }
 ,Label { 
                         id: subtitleLabel; 
@@ -90,13 +91,12 @@
                         }
                         anchors.topMargin: units.dp(2);
                         elide: Text.ElideRight; 
-                        fontSize: "small"; 
+                        fontSize: "x-small"; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
                         color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
                         visible: titleLabel.visible && titleLabel.text; 
                         text: cardData && cardData["subtitle"] || ""; 
                         font.weight: Font.Light; 
-                        horizontalAlignment: root.headerAlignment; 
                     }
 ]
 }
 
=== modified file 'tests/plugins/Dash/cardcreator/5.res'
--- tests/plugins/Dash/cardcreator/5.res	2014-08-29 08:31:22 +0000
+++ tests/plugins/Dash/cardcreator/5.res	2014-09-11 16:03:35 +0000
@@ -6,7 +6,7 @@
                 property var artShapeBorderSource: undefined; 
                 property real fontScale: 1.0; 
                 property var scopeStyle: null; 
-                property int headerAlignment: Text.AlignLeft; 
+                property int titleAlignment: Text.AlignLeft; 
                 property int fixedHeaderHeight: -1; 
                 property size fixedArtShapeSize: Qt.size(-1, -1); 
                 readonly property string title: cardData && cardData["title"] || ""; 
@@ -46,8 +46,9 @@
                                     } 
                                     image: Image { 
                                         objectName: "artImage"; 
-                                        source: cardData && cardData["art"] || ""; 
-                                        cache: true; 
+                                        property bool doLoadSource: !NetworkingStatus.limitedBandwith;
+                                        source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }
+                                        cache: true;
                                         asynchronous: root.asynchronous; 
                                         fillMode: Image.PreserveAspectCrop;
                                         width: root.width; 
@@ -112,13 +113,13 @@
                         elide: Text.ElideRight; 
                         fontSize: "small"; 
                         wrapMode: Text.Wrap; 
-                        maximumLineCount: 2; 
+                        maximumLineCount: horizontalAlignment === Text.AlignHCenter ? 1 : 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
                         color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
                         visible: showHeader && overlayLoader.active; 
                         text: root.title; 
-                        font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal; 
-                        horizontalAlignment: root.headerAlignment; 
+                        font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; 
+                        horizontalAlignment: root.titleAlignment; 
                     }
 Label { 
                             id: subtitleLabel; 
@@ -131,13 +132,12 @@
                             } 
                             anchors.topMargin: units.dp(2); 
                             elide: Text.ElideRight; 
-                            fontSize: "small"; 
+                            fontSize: "x-small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
                             color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
                             visible: titleLabel.visible && titleLabel.text; 
                             text: cardData && cardData["subtitle"] || ""; 
                             font.weight: Font.Light; 
-                            horizontalAlignment: root.headerAlignment; 
                         }
 UbuntuShape { 
     id: touchdown; 
 
=== modified file 'tests/plugins/Dash/cardcreator/6.res'
--- tests/plugins/Dash/cardcreator/6.res	2014-08-29 08:31:22 +0000
+++ tests/plugins/Dash/cardcreator/6.res	2014-09-11 16:03:35 +0000
@@ -6,7 +6,7 @@
                 property var artShapeBorderSource: undefined;
                 property real fontScale: 1.0;
                 property var scopeStyle: null;
-                property int headerAlignment: Text.AlignLeft;
+                property int titleAlignment: Text.AlignLeft;
                 property int fixedHeaderHeight: -1;
                 property size fixedArtShapeSize: Qt.size(-1, -1);
                 readonly property string title: cardData && cardData["title"] || "";
@@ -68,13 +68,13 @@
                         elide: Text.ElideRight; 
                         fontSize: "small"; 
                         wrapMode: Text.Wrap; 
-                        maximumLineCount: 2; 
+                        maximumLineCount: horizontalAlignment === Text.AlignHCenter ? 1 : 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
                         color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
                         visible: showHeader ; 
                         text: root.title; 
-                        font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal; 
-                        horizontalAlignment: root.headerAlignment; 
+                        font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; 
+                        horizontalAlignment: root.titleAlignment; 
                     }
 ,Label { 
                             id: subtitleLabel; 
@@ -86,15 +86,14 @@
                             } 
                             anchors.topMargin: units.dp(2); 
                             elide: Text.ElideRight; 
-                            fontSize: "small"; 
+                            fontSize: "x-small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
                             color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
                             visible: titleLabel.visible && titleLabel.text; 
                             text: cardData && cardData["subtitle"] || ""; 
                             font.weight: Font.Light; 
-                            horizontalAlignment: root.headerAlignment; 
                         }
-,Icon { 
+,StatusIcon { 
                             id: emblemIcon; 
                             objectName: "emblemIcon"; 
                             anchors { 
@@ -104,7 +103,6 @@
                             } 
                             source: cardData && cardData["emblem"] || ""; 
                             color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
-                            width: height; 
                             height: source != "" ? titleLabel.font.pixelSize : 0; 
                         }
  
 
=== modified file 'tests/plugins/Dash/cardcreator/7.res'
--- tests/plugins/Dash/cardcreator/7.res	2014-08-29 08:31:22 +0000
+++ tests/plugins/Dash/cardcreator/7.res	2014-09-11 16:03:35 +0000
@@ -6,7 +6,7 @@
                 property var artShapeBorderSource: undefined; 
                 property real fontScale: 1.0; 
                 property var scopeStyle: null; 
-                property int headerAlignment: Text.AlignLeft; 
+                property int titleAlignment: Text.AlignLeft; 
                 property int fixedHeaderHeight: -1; 
                 property size fixedArtShapeSize: Qt.size(-1, -1); 
                 readonly property string title: cardData && cardData["title"] || ""; 
@@ -67,8 +67,9 @@
                             objectName: "mascotImage"; 
                             anchors { verticalCenter: parent.verticalCenter; } 
                             readonly property int maxSize: Math.max(width, height) * 4; 
-                            source: cardData && cardData["mascot"] || ""; 
-                            width: units.gu(6); 
+                            property bool doLoadSource: !NetworkingStatus.limitedBandwith;
+                            source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }
+                            width: units.gu(6);
                             height: units.gu(5.625); 
                             sourceSize { width: maxSize; height: maxSize } 
                             fillMode: Image.PreserveAspectCrop; 
@@ -93,13 +94,13 @@
                         elide: Text.ElideRight; 
                         fontSize: "small"; 
                         wrapMode: Text.Wrap; 
-                        maximumLineCount: 2; 
+                        maximumLineCount: horizontalAlignment === Text.AlignHCenter ? 1 : 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
                         color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
                         visible: showHeader ; 
                         text: root.title; 
-                        font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal; 
-                        horizontalAlignment: root.headerAlignment; 
+                        font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; 
+                        horizontalAlignment: root.titleAlignment; 
                     }
 ,Label { 
                             id: subtitleLabel; 
@@ -111,13 +112,12 @@
                             } 
                             anchors.topMargin: units.dp(2); 
                             elide: Text.ElideRight; 
-                            fontSize: "small"; 
+                            fontSize: "x-small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
                             color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
                             visible: titleLabel.visible && titleLabel.text; 
                             text: cardData && cardData["subtitle"] || ""; 
                             font.weight: Font.Light; 
-                            horizontalAlignment: root.headerAlignment; 
                         }
 ,CardAttributes { 
                             id: attributesRow; 
 
=== modified file 'tests/plugins/Dash/listviewwithpageheadertest.cpp'
--- tests/plugins/Dash/listviewwithpageheadertest.cpp	2014-04-24 14:13:21 +0000
+++ tests/plugins/Dash/listviewwithpageheadertest.cpp	2014-09-11 16:03:35 +0000
@@ -28,6 +28,8 @@
 #include <private/qquickitem_p.h>
 #pragma GCC diagnostic pop
 
+#include <limits>
+
 // TODO Think on how doing a test for lost items
 // particullary making sure that lost items are culled
 // and then removed in the next updatePolish cycle
@@ -1899,6 +1901,43 @@
         QTRY_COMPARE(lvwph->m_firstVisibleIndex, 0);
     }
 
+    void testNoCacheBuffer()
+    {
+        lvwph->setCacheBuffer(0);
+        QTRY_COMPARE(lvwph->m_visibleItems.count(), 3);
+        QCOMPARE(lvwph->m_firstVisibleIndex, 0);
+        verifyItem(0, 50., 150., false);
+        verifyItem(1, 200., 200., false);
+        verifyItem(2, 400., 350., false);
+        QCOMPARE(lvwph->m_minYExtent, 0.);
+        QCOMPARE(lvwph->m_clipItem->y(), 0.);
+        QCOMPARE(lvwph->m_clipItem->clip(), false);
+        QCOMPARE(lvwph->m_headerItem->y(), 0.);
+        QCOMPARE(lvwph->m_headerItem->height(), 50.);
+        QCOMPARE(lvwph->contentY(), 0.);
+        QCOMPARE(lvwph->m_headerItemShownHeight, 0.);
+    }
+
+    void testAllCacheBuffer()
+    {
+        lvwph->setCacheBuffer(std::numeric_limits<qreal>::max());
+        QTRY_COMPARE(lvwph->m_visibleItems.count(), 6);
+        QCOMPARE(lvwph->m_firstVisibleIndex, 0);
+        verifyItem(0, 50., 150., false);
+        verifyItem(1, 200., 200., false);
+        verifyItem(2, 400., 350., false);
+        verifyItem(3, 750., 350., true);
+        verifyItem(4, 1100., 350., true);
+        verifyItem(5, 1450., 350., true);
+        QCOMPARE(lvwph->m_minYExtent, 0.);
+        QCOMPARE(lvwph->m_clipItem->y(), 0.);
+        QCOMPARE(lvwph->m_clipItem->clip(), false);
+        QCOMPARE(lvwph->m_headerItem->y(), 0.);
+        QCOMPARE(lvwph->m_headerItem->height(), 50.);
+        QCOMPARE(lvwph->contentY(), 0.);
+        QCOMPARE(lvwph->m_headerItemShownHeight, 0.);
+    }
+
 private:
     QQuickView *view;
     ListViewWithPageHeader *lvwph;
 
=== modified file 'tests/plugins/Dash/listviewwithpageheadertest.qml'
--- tests/plugins/Dash/listviewwithpageheadertest.qml	2014-04-30 10:06:33 +0000
+++ tests/plugins/Dash/listviewwithpageheadertest.qml	2014-09-11 16:03:35 +0000
@@ -60,6 +60,7 @@
         anchors.top: parent.top
         anchors.bottom: parent.bottom
         model: model
+        cacheBuffer: height * 0.5
         delegate: Rectangle {
             property bool timerDone: false
             width: parent.width - 20
 
=== modified file 'tests/plugins/Dash/listviewwithpageheadertestsection.qml'
--- tests/plugins/Dash/listviewwithpageheadertestsection.qml	2014-04-30 10:06:33 +0000
+++ tests/plugins/Dash/listviewwithpageheadertestsection.qml	2014-09-11 16:03:35 +0000
@@ -60,6 +60,7 @@
         anchors.top: parent.top
         anchors.bottom: parent.bottom
         model: model
+        cacheBuffer: height * 0.5
         delegate: Rectangle {
             property bool timerDone: false
             width: parent.width - 20
 
=== modified file 'tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qml'
--- tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qml	2014-04-30 10:06:33 +0000
+++ tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qml	2014-09-11 16:03:35 +0000
@@ -28,6 +28,7 @@
         anchors.top: parent.top
         anchors.bottom: parent.bottom
         model: model
+        cacheBuffer: height * 0.5
         delegate: Rectangle {
             property bool timerDone: false
             width: parent.width - 20
 
=== modified file 'tests/plugins/Ubuntu/Gestures/CMakeLists.txt'
--- tests/plugins/Ubuntu/Gestures/CMakeLists.txt	2014-05-01 14:25:18 +0000
+++ tests/plugins/Ubuntu/Gestures/CMakeLists.txt	2014-09-11 16:03:35 +0000
@@ -19,7 +19,7 @@
     qt5_use_modules(${CLASSNAME}TestExec Test Core Qml Gui Quick)
     target_link_libraries(${CLASSNAME}TestExec UbuntuGestureQml)
 
-    add_binary_qml_test(${CLASSNAME} ${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures UbuntuGesturesTestQmlFiles)
+    add_binary_qml_test(${CLASSNAME} ${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures UbuntuGesturesTestQmlFiles "")
     add_manual_qml_test(. ${CLASSNAME} IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
 endmacro(add_gesture_ui_test)
 
 
=== modified file 'tests/qmltests/Components/CMakeLists.txt'
--- tests/qmltests/Components/CMakeLists.txt	2014-05-01 14:25:18 +0000
+++ tests/qmltests/Components/CMakeLists.txt	2014-09-11 16:03:35 +0000
@@ -10,7 +10,7 @@
 qt5_use_modules(DragHandleTestExec Test Core Qml Gui Quick)
 target_link_libraries(DragHandleTestExec UbuntuGestureQml)
 
-add_binary_qml_test(DragHandle ${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures "")
+add_binary_qml_test(DragHandle ${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures "" "")
 add_manual_qml_test(. DragHandle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
 
 add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")
 
=== modified file 'tests/qmltests/Dash/CardHelpers.js'
--- tests/qmltests/Dash/CardHelpers.js	2014-08-08 14:56:53 +0000
+++ tests/qmltests/Dash/CardHelpers.js	2014-09-11 16:03:35 +0000
@@ -16,7 +16,7 @@
 
 .pragma library
 
-var components = ["title", "art", "subtitle", "mascot", "emblem", "old-price", "price", "alt-price", "rating", "alt-rating", "summary", "attributes", "overlayColor"]
+var components = ["title", "art", "subtitle", "mascot", "emblem", "summary", "attributes", "overlayColor"]
 
 var defaultLayout = ' \
 { \
@@ -37,17 +37,6 @@
     "overlayColor": null, \
     "mascot": null, \
     "emblem": null, \
-    "old-price": null, \
-    "price": null, \
-    "alt-price": null, \
-    "rating": { \
-      "type": "stars", \
-      "range": [0, 5], \
-      "full": "image://theme/rating-star-full", \
-      "half": "image://theme/rating-star-half", \
-      "empty": "image://theme/rating-star-empty" \
-    }, \
-    "alt-rating": null, \
     "summary": null, \
     "attributes": { "max-count": 2 } \
   }, \
 
=== modified file 'tests/qmltests/Dash/tst_Card.qml'
--- tests/qmltests/Dash/tst_Card.qml	2014-08-22 14:43:02 +0000
+++ tests/qmltests/Dash/tst_Card.qml	2014-09-11 16:03:35 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import Ubuntu.Components 0.1
+import Ubuntu.Connectivity 1.0
 import Unity.Test 0.1 as UT
 import "../../../qml/Dash"
 import "CardHelpers.js" as Helpers
@@ -566,5 +567,25 @@
                 verify((card.width - titleToCard.x - titleToCard.width) === units.gu(1));
             }
         }
+
+        function test_load_images_visibility_network_data() {
+            return [
+                { tag: "Visible, network", visible: true, limitedBandwith: false },
+                { tag: "Visible, no network", visible: true, limitedBandwith: true },
+                { tag: "Not Visible, network", visible: false, limitedBandwith: false },
+                { tag: "Not Visible, no network", visible: false, limitedBandwith: true }
+            ];
+        }
+
+        function test_load_images_visibility_network(data) {
+            loader.visible = data.visible;
+            NetworkingStatus.limitedBandwith = data.limitedBandwith;
+
+            selector.selectedIndex = 0;
+            waitForRendering(selector);
+            waitForRendering(card);
+
+            verify(data.visible || !data.limitedBandwith || artImage.source == "");
+        }
     }
 }
 
=== modified file 'tests/qmltests/Dash/tst_CardTool.qml'
--- tests/qmltests/Dash/tst_CardTool.qml	2014-08-14 23:07:21 +0000
+++ tests/qmltests/Dash/tst_CardTool.qml	2014-09-11 16:03:35 +0000
@@ -85,8 +85,8 @@
             "layout": { "template": { "card-layout": "vertical" }, "components": { "title": "title", "subtitle": "subtitle" } }
         },
         {
-            "name": "Title, price - horizontal",
-            "layout": { "template": { "card-layout": "horizontal" }, "components": { "title": "title", "price": "price" } }
+            "name": "Title, attributes - horizontal",
+            "layout": { "template": { "card-layout": "horizontal" }, "components": { "title": "title", "attributes": "attributes" } }
         },
     ]
 
@@ -100,6 +100,7 @@
     }
 
     Column {
+        id: column
         width: units.gu(38)
         anchors { left: parent.left; top: parent.top; margins: units.gu(1) }
 
@@ -111,7 +112,7 @@
             ]
 
             delegate: Row {
-                anchors { left: parent.left; right: parent.right; margins: units.gu(3) }
+                anchors { left: column.left; right: column.right; margins: units.gu(3) }
 
                 Label {
                     height: units.gu(5)
@@ -315,28 +316,35 @@
             }
         }
 
-        function test_card_header_component_alignment_data() {
+        function test_card_title_alignment_data() {
             return [
-                { tag: "Title - vertical", component: "titleLabel", property: "headerAlignment",
-                  value: Text.AlignHCenter, index: 11, layout_index: 0 },
-                { tag: "Title - horizontal", component: "titleLabel", property: "headerAlignment",
-                  value: Text.AlignLeft, index: 12, layout_index: 0},
-                { tag: "Title, subtitle - vertical", component: "titleLabel", property: "headerAlignment",
-                  value: Text.AlignLeft, index: 13, layout_index: 0},
-                { tag: "Title, price - horizontal", component: "titleLabel", property: "headerAlignment",
-                  value: Text.AlignLeft, index: 14, layout_index: 0},
-            ]
+                { tag: "Art, header, summary", value: Text.AlignLeft, index: 0 },
+                { tag: "Header, summary", value: Text.AlignLeft, index: 1 },
+                { tag: "Art, header", value: Text.AlignLeft, index: 2 },
+                { tag: "Header only", value: Text.AlignLeft, index: 3 },
+                { tag: "Header title only", value: Text.AlignHCenter, index: 4 },
+                { tag: "Header title and subtitle", value: Text.AlignLeft, index: 5 },
+                { tag: "Header title and mascot", value: Text.AlignLeft, index: 6 },
+                { tag: "Art, header, summary - small", value: Text.AlignLeft, index: 7 },
+                { tag: "Art, header, summary - large", value: Text.AlignLeft, index: 8 },
+                { tag: "Art, header, summary - horizontal", value: Text.AlignLeft, index: 9 },
+                { tag: "Art, header - portrait", value: Text.AlignLeft, index: 10 },
+                { tag: "Title - vertical", value: Text.AlignHCenter, index: 11 },
+                { tag: "Title - horizontal", value: Text.AlignLeft, index: 12 },
+                { tag: "Title, subtitle - vertical", value: Text.AlignLeft, index: 13 },
+                { tag: "Title, attributes - horizontal", value: Text.AlignLeft, index: 14 },
+            ];
         }
 
-        function test_card_header_component_alignment(data) {
+        function test_card_title_alignment(data) {
             selector.selectedIndex = data.index;
-            if (data.hasOwnProperty("layout_index")) {
-                layoutSelector.selectedIndex = data.layout_index;
-            }
-
-            if (data.hasOwnProperty("property")) {
-                tryCompare(cardTool, data.property, data.value);
-            }
+
+            tryCompare(cardTool, "titleAlignment", Text.AlignLeft);
+
+            cardTool.components['title'] = { "field": "title", "align": "center" };
+            cardTool.componentsChanged();
+
+            tryCompare(cardTool, "titleAlignment", data.value);
         }
 
         function test_categoryLayout_data() {
 
=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2014-09-08 14:14:12 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2014-09-11 16:03:35 +0000
@@ -249,8 +249,7 @@
             var categoryListView = findChild(dashContentList.currentItem, "categoryListView");
             var dashCategory2 = findChild(categoryListView, "dashCategory2");
             tryCompareFunction(function() {
-                    var d = findChild(dashCategory2, "delegate2");
-                    if (d) return true;
+                    if (dashCategory2.y < 200) return true;
                     categoryListView.contentY += 100;
                     return false;
                 }, true);
 
=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2014-08-26 19:25:41 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2014-09-11 16:03:35 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013, 2014 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
@@ -43,6 +43,10 @@
         onLoadedChanged: if (loaded) genericScopeView.scope = scopes.getScope(2);
     }
 
+    MockScope {
+        id: mockScope
+    }
+
     SignalSpy {
         id: spy
     }
@@ -78,18 +82,29 @@
                 spy.signalName = "";
             }
 
-            function scrollToCategory(category) {
+            function scrollToCategory(categoryName) {
                 var categoryListView = findChild(genericScopeView, "categoryListView");
                 tryCompareFunction(function() {
-                    if (findChild(genericScopeView, category)) return true;
+                    var category = findChild(genericScopeView, categoryName);
+                    if (category && category.y > 0 && category.y < genericScopeView.height) return true;
                     mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height,
                                genericScopeView.width/2, genericScopeView.y)
                     tryCompare(categoryListView, "moving", false);
-                    return findChild(genericScopeView, category) !== null;
+                    return false;
                 }, true);
 
                 tryCompareFunction(function() { return findChild(genericScopeView, "delegate0") !== null; }, true);
-                return findChild(genericScopeView, category);
+                return findChild(genericScopeView, categoryName);
+            }
+
+            function scrollToEnd()
+            {
+                var categoryListView = findChild(genericScopeView, "categoryListView");
+                while (!categoryListView.atYEnd) {
+                    mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height - units.gu(8),
+                               genericScopeView.width/2, genericScopeView.y)
+                    tryCompare(categoryListView, "moving", false);
+                }
             }
 
             function test_isActive() {
@@ -268,7 +283,7 @@
                 if (category === undefined) category = 0;
                 if (delegate === undefined) delegate = 0;
                 tryCompareFunction(function() {
-                                        var cardGrid = findChild(genericScopeView, category);
+                                        var cardGrid = findChild(genericScopeView, "dashCategory"+category);
                                         if (cardGrid != null) {
                                             var tile = findChild(cardGrid, "delegate"+delegate);
                                             return tile != null;
@@ -276,7 +291,7 @@
                                         return false;
                                     },
                                     true);
-                var tile = findChild(findChild(genericScopeView, category), "delegate"+delegate);
+                var tile = findChild(findChild(genericScopeView, "dashCategory"+category), "delegate"+delegate);
                 mouseClick(tile, tile.width / 2, tile.height / 2);
                 tryCompare(testCase.subPageLoader, "open", true);
                 tryCompare(testCase.subPageLoader, "x", 0);
@@ -426,6 +441,87 @@
                 compare(image.source, data.logo, "Title image has the wrong source");
             }
 
+            function test_seeAllTwoCategoriesScenario1() {
+                mockScope.setId("mockScope");
+                mockScope.setName("Mock Scope");
+                mockScope.categories.setCount(2);
+                mockScope.categories.resultModel(0).setResultCount(50);
+                mockScope.categories.resultModel(1).setResultCount(15);
+                mockScope.categories.setLayout(0, "grid");
+                mockScope.categories.setLayout(1, "grid");
+                mockScope.categories.setHeaderLink(0, "");
+                mockScope.categories.setHeaderLink(1, "");
+                genericScopeView.scope = mockScope;
+                waitForRendering(genericScopeView.categoryView);
+
+                var category0 = findChild(genericScopeView, "dashCategory0")
+                var seeAll0 = findChild(category0, "seeAll")
+
+                waitForRendering(seeAll0);
+                verify(category0.expandable);
+                verify(!category0.expanded);
+
+                mouseClick(seeAll0, seeAll0.width / 2, seeAll0.height / 2);
+                verify(category0.expanded);
+                tryCompare(category0, "height", category0.item.expandedHeight + seeAll0.height);
+                tryCompare(genericScopeView.categoryView, "contentY", units.gu(13.5));
+
+                scrollToEnd();
+
+                tryCompareFunction(function() { return findChild(genericScopeView, "dashCategory1") !== null; }, true);
+                var category1 = findChild(genericScopeView, "dashCategory1")
+                var seeAll1 = findChild(category1, "seeAll")
+                verify(category1.expandable);
+                verify(!category1.expanded);
+
+                mouseClick(seeAll1, seeAll1.width / 2, seeAll1.height / 2);
+                verify(!category0.expanded);
+                verify(category1.expanded);
+                tryCompare(category1, "height", category1.item.expandedHeight + seeAll1.height);
+                tryCompareFunction(function() {
+                    return genericScopeView.categoryView.contentY + category1.y + category1.height + genericScopeView.categoryView.pageHeader.height
+                           == genericScopeView.categoryView.contentHeight;}
+                    , true);
+            }
+
+            function test_seeAllTwoCategoriesScenario2() {
+                mockScope.setId("mockScope");
+                mockScope.setName("Mock Scope");
+                mockScope.categories.setCount(2);
+                mockScope.categories.resultModel(0).setResultCount(15);
+                mockScope.categories.resultModel(1).setResultCount(50);
+                mockScope.categories.setLayout(0, "grid");
+                mockScope.categories.setLayout(1, "grid");
+                mockScope.categories.setHeaderLink(0, "");
+                mockScope.categories.setHeaderLink(1, "");
+                genericScopeView.scope = mockScope;
+                waitForRendering(genericScopeView.categoryView);
+
+                var category0 = findChild(genericScopeView, "dashCategory0")
+                var seeAll0 = findChild(category0, "seeAll")
+
+                waitForRendering(seeAll0);
+                verify(category0.expandable);
+                verify(!category0.expanded);
+
+                mouseClick(seeAll0, seeAll0.width / 2, seeAll0.height / 2);
+                verify(category0.expanded);
+                tryCompare(category0, "height", category0.item.expandedHeight + seeAll0.height);
+
+                scrollToEnd();
+
+                var category1 = findChild(genericScopeView, "dashCategory1")
+                var seeAll1 = findChild(category1, "seeAll")
+                verify(category1.expandable);
+                verify(!category1.expanded);
+
+                mouseClick(seeAll1, seeAll1.width / 2, seeAll1.height / 2);
+                verify(!category0.expanded);
+                verify(category1.expanded);
+                tryCompare(category1, "height", category1.item.expandedHeight + seeAll1.height);
+                tryCompare(category1, "y", units.gu(5));
+            }
+
             function test_favorite_data() {
                 return [
                     { tag: "People", id: "MockScope1", favorite: true },