Merge lp:~cimi/unity8/tweaks-libertine-scope into lp:unity8

[Andrea Cimitan]

Same tweaks we have for click scope now for libertine

 * Are there any related MPs required for this MP to build/function as expected? Please list.
no, but you need latest libertine-scope
 * Did you perform an exploratory manual test run of your code change and any related functionality?
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?
n/a

[lp:~cimi/unity8/tweaks-libertine-scope]

2445. By Andrea Cimitan on 2016-06-07

libertine can be unfavorited

Unmerged revisions

2441. By Launchpad Translations on behalf of unity-team on 2016-06-02

Launchpad automatic translations update.

=== modified file 'plugins/Dash/CardCreatorCache.qml'
--- plugins/Dash/CardCreatorCache.qml	2016-03-04 13:57:48 +0000
+++ plugins/Dash/CardCreatorCache.qml	2016-06-07 13:19:08 +0000
@@ -29,7 +29,7 @@
 
         var tString = JSON.stringify(template);
         var cString = JSON.stringify(components);
-        var allString = tString + cString + isCardTool;
+        var allString = tString + cString + isCardTool + artShapeStyle;
         var component = cache[allString];
         if (component === undefined) {
             component = CardCreator.createCardComponent(root, template, components, isCardTool, artShapeStyle, allString);

=== modified file 'qml/Dash/CardTool.qml'
--- qml/Dash/CardTool.qml	2016-05-09 08:34:38 +0000
+++ qml/Dash/CardTool.qml	2016-06-07 13:19:08 +0000
@@ -70,7 +70,7 @@
     // Not readonly because gets overwritten from GenericScopeView in some cases
     property string artShapeStyle: categoryLayout === "carousel" ? "shadow" : "inset"
 
-    property var cardComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, false, artShapeStyle);
+    property var cardComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, false, cardTool.artShapeStyle);
 
     // FIXME: Saviq
     // Only way for the card below to actually be laid out completely.
@@ -212,7 +212,7 @@
             "attributes": attributesModel.model,
             "socialActions": socialActionsModel.model
         }
-        sourceComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, true, artShapeStyle);
+        sourceComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, true, cardTool.artShapeStyle);
         onLoaded: {
             item.objectName = "cardToolCard";
             item.width = Qt.binding(function() { return cardTool.cardWidth !== -1 ? cardTool.cardWidth : item.implicitWidth; });

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2016-05-27 13:52:20 +0000
+++ qml/Dash/GenericScopeView.qml	2016-06-07 13:19:08 +0000
@@ -342,8 +342,8 @@
                     }
                     updateRanges();
                     clickScopeSizingHacks();
-                    if (scope && scope.id === "clickscope") {
-                        if (categoryId === "predefined" || categoryId === "local") {
+                    if (scope && (scope.id === "clickscope" || scope.id === "libertine-scope.ubuntu_libertine-scope")) {
+                        if (scope.id === "libertine-scope.ubuntu_libertine-scope" || categoryId === "predefined" || categoryId === "local") {
                             cardTool.artShapeSize = Qt.binding(function() { return Qt.size(units.gu(8), units.gu(7.5)) });
                             cardTool.artShapeStyle = "icon";
                         } else {
@@ -367,8 +367,9 @@
                 onPxpguChanged: clickScopeSizingHacks();
 
                 function clickScopeSizingHacks() {
-                    if (scope && scope.id === "clickscope" &&
-                        (categoryId === "predefined" || categoryId === "local")) {
+                    if (scope &&
+                        ((scope.id === "clickscope" && (categoryId === "predefined" || categoryId === "local")) ||
+                         scope.id === "libertine-scope.ubuntu_libertine-scope")) {
                         // Yeah, hackish :/
                         if (scopeView.width > units.gu(45)) {
                             if (scopeView.width >= units.gu(70)) {
@@ -639,7 +640,7 @@
             showBackButton: scopeView.hasBackAction
             searchEntryEnabled: true
             settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false
-            favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope"
+            favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope" && scopeView.scope.id !== "libertine-scope.ubuntu_libertine-scope"
             favorite: scopeView.scope && scopeView.scope.favorite
             navigationTag: scopeView.scope ? scopeView.scope.primaryNavigationTag : ""
             scopeStyle: scopeView.scopeStyle

=== modified file 'tests/mocks/Unity/fake_scopes.cpp'
--- tests/mocks/Unity/fake_scopes.cpp	2016-04-29 14:57:44 +0000
+++ tests/mocks/Unity/fake_scopes.cpp	2016-06-07 13:19:08 +0000
@@ -60,6 +60,7 @@
     addScope(new Scope("MockScope7", "MS7", false, this));
     addScope(new Scope("MockScope8", "MS8", false, this));
     addScope(new Scope("MockScope9", "MS9", false, this));
+    addScope(new Scope("libertine-scope.ubuntu_libertine-scope", "Libertine", true, this));
 
     Scope *longNavigationScope = new Scope(
             "LongPrimaryNavigation", "LongPrimaryNavigation", true, this, 1, false,

=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2016-05-27 13:54:07 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2016-06-07 13:19:08 +0000
@@ -58,7 +58,7 @@
             tryCompare(dashContentList, "count", 0);
             scopes.load();
             tryCompare(dashContentList, "currentIndex", 0);
-            tryCompare(dashContentList, "count", 7);
+            tryCompare(dashContentList, "count", 8);
             tryCompare(scopes, "loaded", true);
             tryCompareFunction(function() {
                 var mockScope1Loader = findChild(dash, "scopeLoader0");
@@ -88,7 +88,7 @@
             return findChild(genericScopeView, categoryName);
         }
 
-        function clickCategoryDelegate(category, delegate) {
+        function getCategoryDelegate(category, delegate) {
             var dashContentList = findChild(dash, "dashContentList");
             var genericScopeView = dashContentList.currentItem;
             if (category === undefined) category = 0;
@@ -104,6 +104,11 @@
                                 true);
             var tile = findChild(findChild(genericScopeView, "dashCategory"+category), "delegate"+delegate);
             waitForRendering(tile);
+            return tile;
+        }
+
+        function clickCategoryDelegate(category, delegate) {
+            var tile = getCategoryDelegate(category, delegate);
             mouseClick(tile);
         }
 
@@ -637,6 +642,27 @@
             tryCompare(dashContent, "x", 0);
         }
 
+        function test_cardIconStyle()
+        {
+            dash.setCurrentScope("clickscope");
+            var dashContent = findChild(dash, "dashContent");
+            tryCompare(dashContent.currentScope, "id", "clickscope");
+
+            scrollToCategory("dashCategorypredefined");
+            var tile = getCategoryDelegate("predefined", 2);
+            var proportionalShape = findChildsByType(tile, "UCProportionalShape");
+            compare(proportionalShape.length, 1);
+
+            dash.setCurrentScope("libertine-scope.ubuntu_libertine-scope");
+            var dashContent = findChild(dash, "dashContent");
+            tryCompare(dashContent.currentScope, "id", "libertine-scope.ubuntu_libertine-scope");
+
+            scrollToCategory("dashCategory2");
+            tile = getCategoryDelegate("2", 2);
+            proportionalShape = findChildsByType(tile, "UCProportionalShape");
+            compare(proportionalShape.length, 1);
+        }
+
         function test_tempScopeItemXOnResize()
         {
             // Go to a temp scope

=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
--- tests/qmltests/Dash/tst_DashContent.qml	2016-05-27 13:52:20 +0000
+++ tests/qmltests/Dash/tst_DashContent.qml	2016-06-07 13:19:08 +0000
@@ -124,7 +124,7 @@
 
             loadScopes();
 
-            compare(dashContentList.count, 7);
+            compare(dashContentList.count, 8);
             verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < dashContentList.count);
         }
 

=== modified file 'tests/qmltests/Dash/tst_DashShell.qml'
--- tests/qmltests/Dash/tst_DashShell.qml	2016-05-03 22:39:09 +0000
+++ tests/qmltests/Dash/tst_DashShell.qml	2016-06-07 13:19:08 +0000
@@ -60,7 +60,7 @@
             tryCompare(dashContentList, "count", 0);
             scopes.load();
             tryCompare(dashContentList, "currentIndex", 0);
-            tryCompare(dashContentList, "count", 7);
+            tryCompare(dashContentList, "count", 8);
             tryCompare(scopes, "loaded", true);
             tryCompareFunction(function() {
                 var mockScope1Loader = findChild(dash, "scopeLoader0");