Merge lp:~unity-team/unity8/carouselTool-new-dash into lp:~unity-team/unity8/new-scopes-clean-to-trunk

[Andrea Cimitan]

Adds carousel dynamic switch

Adds carousel dynamic switch

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
No
 * If you changed the UI, has there been a design review?
No

[Albert Astals Cid (aacid)]

file:///home/tsdgeos_work/phablet/unity8/carouselTool-new-dash/qml/Shell.qml:170:9: Type Dash unavailable
             Dash {
             ^
file:///home/tsdgeos_work/phablet/unity8/carouselTool-new-dash/qml/Dash/Dash.qml:100:5: Type ScopeItem unavailable
         ScopeItem {
         ^
file:///home/tsdgeos_work/phablet/unity8/carouselTool-new-dash/qml/Dash/ScopeItem.qml:42:9: Type GenericScopeView unavailable
             GenericScopeView {
             ^
file:///home/tsdgeos_work/phablet/unity8/carouselTool-new-dash/qml/Dash/GenericScopeView.qml:141:13: Type CardTool unavailable
                 CardTool {
                 ^
file:///home/tsdgeos_work/phablet/unity8/carouselTool-new-dash/qml/Dash/CardTool.qml:71:21: Duplicate property name
         property string categoryLayout: template ? template["category-layout"] : ""
                         ^

review: Needs Fixing

[Albert Astals Cid (aacid)]

Loooks good :)

review: Approve

=== modified file 'qml/Dash/CardCarousel.qml'
--- qml/Dash/CardCarousel.qml	2014-02-07 16:23:09 +0000
+++ qml/Dash/CardCarousel.qml	2014-03-06 18:07:09 +0000
@@ -32,14 +32,6 @@
     height: carousel.implicitHeight + units.gu(6)
     verticalSpacing: units.gu(3)
 
-    CardTool {
-        id: cardTool
-
-        template: cardCarousel.template
-        components: cardCarousel.components
-        viewWidth: cardCarousel.width
-    }
-
     Carousel {
         id: carousel
         anchors.fill: parent
@@ -47,7 +39,7 @@
         // FIXME we need to "reverse" the carousel to make the selected item the size
         // and push others back.
         minimumTileWidth: cardTool.cardWidth / selectedItemScaleFactor
-        selectedItemScaleFactor: 1.38
+        selectedItemScaleFactor: cardTool.carouselSelectedItemScaleFactor
         cacheBuffer: 1404 // 18px * 13gu * 6
         model: cardCarousel.model
         highlightIndex: cardCarousel.highlightIndex
@@ -63,8 +55,8 @@
             objectName: "delegate" + index
             headerHeight: carousel.headerHeight
             cardData: model
-            template: cardCarousel.template
-            components: cardCarousel.components
+            template: cardTool.template
+            components: cardTool.components
 
             property bool explicitlyScaled
             property var model

=== modified file 'qml/Dash/CardFilterGrid.qml'
--- qml/Dash/CardFilterGrid.qml	2014-02-20 10:58:13 +0000
+++ qml/Dash/CardFilterGrid.qml	2014-03-06 18:07:09 +0000
@@ -26,16 +26,6 @@
     verticalSpacing: units.gu(1)
     collapsedRowCount: Math.min(2, template && template["collapsed-rows"] || 2)
 
-    CardTool {
-        id: cardTool
-
-        template: genericFilterGrid.template
-        // We can't trust the template since it may happen it is carousel
-        // that is being should as a grid because of the lack of elements
-        categoryLayout: "grid"
-        components: genericFilterGrid.components
-    }
-
     delegate: Item {
         width: genericFilterGrid.cellWidth
         height: genericFilterGrid.cellHeight
@@ -47,8 +37,8 @@
             anchors.horizontalCenter: parent.horizontalCenter
             objectName: "delegate" + index
             cardData: model
-            template: genericFilterGrid.template
-            components: genericFilterGrid.components
+            template: cardTool.template
+            components: cardTool.components
 
             headerAlignment: cardTool.headerAlignment
 

=== modified file 'qml/Dash/DashRenderer.qml'
--- qml/Dash/DashRenderer.qml	2014-02-26 11:04:54 +0000
+++ qml/Dash/DashRenderer.qml	2014-03-06 18:07:09 +0000
@@ -50,6 +50,11 @@
     // The model to renderer
     property var model
 
+    /*!
+     \brief CardTool component.
+     */
+    property var cardTool
+
     /// Emitted when the user clicked on an item
     /// @param index is the index of the clicked item
     /// @param itemY is y of the clicked delegate
@@ -62,10 +67,4 @@
 
     function startFilterAnimation(filter) {
     }
-
-    /// Category template definition from the scope
-    property var template
-
-    /// Component mapping and configuration from the scope
-    property var components
 }

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-03-06 11:06:07 +0000
+++ qml/Dash/GenericScopeView.qml	2014-03-06 18:07:09 +0000
@@ -138,6 +138,15 @@
             readonly property string category: categoryId
             readonly property var item: rendererLoader.item
 
+            CardTool {
+                id: cardTool
+
+                count: results.count
+                template: model.renderer
+                components: model.components
+                viewWidth: parent.width
+            }
+
             Loader {
                 id: rendererLoader
                 anchors {
@@ -146,7 +155,14 @@
                     right: parent.right
                 }
 
-                source: getRenderer(model.renderer, results)
+                source: {
+                    switch (cardTool.categoryLayout) {
+                        case "carousel": return "CardCarousel.qml";
+                        case "running-apps": return "Apps/RunningApplicationsGrid.qml";
+                        case "grid":
+                        default: return "CardFilterGrid.qml";
+                    }
+                }
 
                 onLoaded: {
                     if (item.enableHeightBehavior !== undefined && item.enableHeightBehaviorOnNextCreation !== undefined) {
@@ -170,9 +186,7 @@
                         }
                     }
                     updateDelegateCreationRange();
-                    // FIXME: should be "template", not "renderer"
-                    item.template = Qt.binding(function() { return model.renderer });
-                    item.components = Qt.binding(function() { return model.components });
+                    item.cardTool = cardTool;
                 }
 
                 Component.onDestruction: {
@@ -325,22 +339,4 @@
             }
         }
     }
-
-    function getRenderer(template, results) {
-        var layout = template["category-layout"];
-
-        if (layout == "running-apps") {
-            return "Apps/RunningApplicationsGrid.qml";
-        }
-
-        if (layout === "carousel") {
-            // TODO: Selectively disable carousel, 4 is fixed for now, should change depending on form factor
-            if (results.count <= 4) layout = "grid";
-        }
-        switch (layout) {
-            case "carousel": return "CardCarousel.qml";
-            case "grid":
-            default: return "CardFilterGrid.qml";
-        }
-    }
 }

=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2014-02-12 23:25:47 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2014-03-06 18:07:09 +0000
@@ -300,21 +300,6 @@
                 tryCompare(category, "filtered", true);
             }
 
-            function test_getRendererCarouselGridFallback() {
-                var template = new Object()
-                template["category-layout"] = "carousel"
-                var results = new Object()
-                var renderer
-
-                results.count = 5
-                renderer = genericScopeView.getRenderer(template, results)
-                compare(renderer, "CardCarousel.qml")
-
-                results.count = 4
-                renderer = genericScopeView.getRenderer(template, results)
-                compare(renderer, "CardFilterGrid.qml")
-            }
-
             function test_showPreviewCarousel() {
                 tryCompareFunction(function() { return findChild(genericScopeView, "carouselDelegate") != null; }, true);
                 var tile = findChild(genericScopeView, "carouselDelegate");