Merge lp:~cimi/unity8/card_emblems_2 into lp:unity8

[Andrea Cimitan]

WIP

[lp:~cimi/unity8/card_emblems_2]

1090. By Andrea Cimitan on 2014-07-29

Fix emblem code and padding

1091. By Andrea Cimitan on 2014-07-30

Moving towards unique container

1092. By Andrea Cimitan on 2014-07-31

Conflicts solved

1093. By Andrea Cimitan on 2014-07-31

[ Michael Terry ]
* Check user's pin/password using PAM, instead of a plaintext keyfile.
  New build dependency: libpam0g-dev for phone unlock with PAM (LP:
  #1234983)
[ Gerry Boland ]
[ Daniel d'Andrada ]
* Re-architecture unity8 to use the QtMirCompositor library so that
  the Qt scenegraph renderer is used as the Mir compositor, and
  application surfaces are added to the QML scene as items.

[ Michael Zanetti ]
* Port phone right-edge spread code to use QtCompositor
* Add right-edge spread animation for tablet
[ Ubuntu daily release ]
* New rebuild forced

1094. By Andrea Cimitan on 2014-07-31

Fixed tests

1095. By Andrea Cimitan on 2014-07-31

Fixed test

1096. By Andrea Cimitan on 2014-07-31

Added test

1097. By Andrea Cimitan on 2014-08-01

More fixes

1098. By Andrea Cimitan on 2014-08-01

[ Gerry Boland ]
* Fix the run.sh script - pretend to be running with qtmir and emit
  SIGSTOP at the right time
[ Ying-Chun Liu ]
* Implement Attribute UI. (LP: #1282460)
[ Albert Astals ]
* Hide search history popup as soon as you start typing As discussed
  with Mike and Saviq
* Compile with for scopes-v3 unity-api
* PageHeader: Unfocus search field when search entry is selected
* Show search field if the search query changes
* Test: Add a condition for art.height being > 0 means stuff has
  already been layouted a bit without it it can happen that we get 0
  for everything at startup and tests still pass
* Remove leftover in test of an old headerless implementation
[ Michael Zanetti ]
* Drop Recent apps category from Dash (LP: #1281092)
* update launcher count emblems to match new spec (LP: #1338984)
[ Bill Filler ]
* disable predictive text for dash search field (LP: #1340409)
[ CI bot ]
* Resync trunk
[ Antti Kaijanmäki ]
* DefaultIndicatorPage: use Loader status to determine the visible
  property. (LP: #1350555)

1099. By Andrea Cimitan on 2014-08-01

Merge

1100. By Andrea Cimitan on 2014-08-08

merged trunk

1101. By Andrea Cimitan on 2014-08-08

Fix categories with attributes

1102. By Andrea Cimitan on 2014-08-08

Moar fixes

1103. By Andrea Cimitan on 2014-08-08

Fixed whitespaces

1104. By Andrea Cimitan on 2014-08-08

merged overview

1105. By Andrea Cimitan on 2014-08-08

Fixed right padding

1106. By Andrea Cimitan on 2014-08-08

Fixed issue of spacing when the touchdown is on the art only

1107. By Andrea Cimitan on 2014-08-08

Fixed another review erequest

1108. By Andrea Cimitan on 2014-08-08

Add colorisation

1109. By Andrea Cimitan on 2014-08-11

Fix issue in reviewy

Unmerged revisions

=== modified file 'plugins/Dash/CardCreator.js'
--- plugins/Dash/CardCreator.js	2014-07-09 19:44:44 +0000
+++ plugins/Dash/CardCreator.js	2014-07-29 11:22:19 +0000
@@ -181,15 +181,35 @@
                                 ] \n\
                     }\n';
 
-// %1 is used as first child of the column
-// %2 is used as second child of the column
-var kHeaderColumnCode = 'Column { \n\
-                            anchors.verticalCenter: parent.verticalCenter; \n\
-                            spacing: units.dp(2); \n\
-                            width: parent.width - x;\n\
-                            data: [ %1\n\
-                                    ,\n\
-                                    %2 \n\
+// %1 is used as anchors
+// %2 is used as height of the container
+// %3 is used as first child of the container
+// %4 is used as second child of the container
+var kHeader2ContainerCode = 'Item { \n\
+                            id: headerTitleContainer; \n\
+                            anchors { %1 } \n\
+                            width: parent.width - x; \n\
+                            implicitHeight: %2; \n\
+                            data: [ %3\n\
+                                    ,\n\
+                                    %4 \n\
+                                  ] \n\
+                        }\n';
+
+// %1 is used as anchors
+// %2 is used as first child of the container
+// %3 is used as second child of the container
+// %4 is used as third child of the container
+var kHeader3ContainerCode = 'Item { \n\
+                            id: headerTitleContainer; \n\
+                            anchors { %1 } \n\
+                            width: parent.width - x; \n\
+                            implicitHeight: titleLabel.height + subtitleLabel.height; \n\
+                            data: [ %2\n\
+                                    ,\n\
+                                    %3 \n\
+                                    ,\n\
+                                    %4 \n\
                                   ] \n\
                         }\n';
 
@@ -224,7 +244,7 @@
                         }\n';
 
 // %1 is used as anchors of titleLabel
-// %1 is used as color of titleLabel
+// %2 is used as color of titleLabel
 // %3 is used as extra condition for visible of titleLabel
 var kTitleLabelCode = 'Label { \n\
                         id: titleLabel; \n\
@@ -242,12 +262,35 @@
                         horizontalAlignment: root.headerAlignment; \n\
                     }\n';
 
+var kEmblemImageCode = 'Image { \n\
+                            id: emblemImage; \n\
+                            objectName: "emblemImage"; \n\
+                            anchors { \n\
+                            bottom: titleLabel.baseline; \n\
+                            right: parent.right; \n\ } \n\
+                            source: cardData && cardData["emblem"]; \n\
+                            width: height; \n\
+                            height: titleLabel.font.pixelSize; \n\
+                            fillMode: Image.PreserveAspectFit; \n\
+                        }\n';
+
+// %1 is used as anchors of touchdown effect
+var kTouchdownCode = 'UbuntuShape { \n\
+                        id: touchdown; \n\
+                        objectName: "touchdown"; \n\
+                        anchors { %1 } \n\
+                        visible: root.pressed; \n\
+                        radius: "medium"; \n\
+                        borderSource: "radius_pressed.sci" \n\
+                    }\n';
+
 // %1 is used as anchors of subtitleLabel
 // %2 is used as color of subtitleLabel
 var kSubtitleLabelCode = 'Label { \n\
                             id: subtitleLabel; \n\
                             objectName: "subtitleLabel"; \n\
                             anchors { %1 } \n\
+                            anchors.topMargin: units.dp(2); \n\
                             elide: Text.ElideRight; \n\
                             fontSize: "small"; \n\
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \n\
@@ -305,6 +348,7 @@
     var hasBackground = !isHorizontal && (template["card-background"] || components["background"] || artAndSummary);
     var hasTitle = components["title"] || false;
     var hasMascot = components["mascot"] || false;
+    var hasEmblem = components["emblem"] && !(hasMascot && template["card-size"] === "small") || false;
     var headerAsOverlay = hasArt && template && template["overlay"] === true && (hasTitle || hasMascot);
     var hasSubtitle = hasTitle && components["subtitle"] || false;
     var hasHeaderRow = hasMascot && hasTitle;
@@ -425,24 +469,44 @@
 
         var titleAnchors;
         var subtitleAnchors;
-        if (hasMascot && hasSubtitle) {
-            // Using row + column
-            titleAnchors = 'left: parent.left; right: parent.right';
-            subtitleAnchors = titleAnchors;
+        var titleRightAnchor;
+        var titleContainerAnchors;
+
+        if (hasMascot) {
+            titleContainerAnchors = 'verticalCenter: parent.verticalCenter; ';
+        } else {
+            titleContainerAnchors = 'right: parent.right; ';
+            titleContainerAnchors += headerLeftAnchor;
+            titleContainerAnchors += headerVerticalAnchors;
+        }
+        if (hasEmblem) {
+            titleRightAnchor = 'right: emblemImage.left;\n';
+        } else {
+            titleRightAnchor = 'right: parent.right;\n';
+        }
+
+        if (hasEmblem || (hasMascot && hasSubtitle)) {
+            // Using titleContainer (and maybe row)
+            titleAnchors = titleRightAnchor;
+            titleAnchors += 'left: parent.left;\n\
+                            top: parent.top;';
+            subtitleAnchors = 'right: parent.right;\n\
+                               left: parent.left;\n\
+                               top: titleLabel.bottom;\n';
         } else if (hasMascot) {
-            // Using row + label
-            titleAnchors = 'verticalCenter: parent.verticalCenter;\n'
+            // Using row + titleContainer
+            titleAnchors = 'verticalCenter: parent.verticalCenter;\n';
         } else {
             if (headerAsOverlay) {
                 // Using anchors to the overlay
-                titleAnchors = 'left: parent.left; \n\
-                                leftMargin: units.gu(1); \n\
-                                right: parent.right; \n\
-                                top: overlayLoader.top; \n\
-                                topMargin: units.gu(1);\n';
+                titleAnchors = titleRightAnchor;
+                titleAnchors += 'left: parent.left; \n\
+                                 leftMargin: units.gu(1); \n\
+                                 top: overlayLoader.top; \n\
+                                 topMargin: units.gu(1);\n';
             } else {
                 // Using anchors to the mascot/parent
-                titleAnchors = "right: parent.right;";
+                titleAnchors = titleRightAnchor;
                 titleAnchors += headerLeftAnchor;
                 titleAnchors += headerVerticalAnchors;
                 if (!headerLeftAnchorHasMargin) {
@@ -451,22 +515,34 @@
             }
             subtitleAnchors = 'left: titleLabel.left; \n\
                                leftMargin: titleLabel.leftMargin; \n\
-                               right: titleLabel.right; \n\
-                               top: titleLabel.bottom; \n\
-                               topMargin: units.dp(2);\n';
+                               top: titleLabel.bottom;\n';
+            if (hasEmblem) {
+                // using container
+                subtitleAnchors += 'right: parent.right; \n';
+            } else {
+                subtitleAnchors += 'right: titleLabel.right; \n';
+            }
         }
 
         var titleLabelVisibleExtra = (headerAsOverlay ? '&& overlayLoader.active': '');
-        var titleCode = kTitleLabelCode.arg(titleAnchors).arg(color).arg(titleLabelVisibleExtra);
+        var titleCode;
+        titleCode = kTitleLabelCode.arg(titleAnchors).arg(color).arg(titleLabelVisibleExtra);
         var subtitleCode = "";
         if (hasSubtitle) {
             subtitleCode += kSubtitleLabelCode.arg(subtitleAnchors).arg(color);
         }
 
-        if (hasMascot && hasSubtitle) {
-            // If using row + column wrap the code in the column
-            titleSubtitleCode = kHeaderColumnCode.arg(titleCode).arg(subtitleCode);
+        if (hasEmblem && hasSubtitle) {
+            // using container 3
+            titleSubtitleCode = kHeader3ContainerCode.arg(titleContainerAnchors).arg(titleCode).arg(kEmblemImageCode).arg(kSubtitleLabelCode.arg(subtitleAnchors).arg(color));
+        } else if (hasEmblem) {
+            // container with emblem
+            titleSubtitleCode = kHeader2ContainerCode.arg(titleContainerAnchors).arg('titleLabel.height').arg(titleCode).arg(kEmblemImageCode);
+        } else if (hasMascot && hasSubtitle) {
+            // container with subtitle
+            titleSubtitleCode = kHeader2ContainerCode.arg(titleContainerAnchors).arg('titleLabel.height + subtitleLabel.height').arg(titleCode).arg(subtitleCode);
         } else {
+            // no container
             titleSubtitleCode = titleCode + subtitleCode;
         }
     }
@@ -486,6 +562,7 @@
         if (isHorizontal && hasArt) summaryTopAnchor = "artShapeHolder.bottom";
         else if (headerAsOverlay && hasArt) summaryTopAnchor = "artShapeHolder.bottom";
         else if (hasHeaderRow) summaryTopAnchor = "row.bottom";
+        else if (hasEmblem || (hasMascot && hasSubtitle)) summaryTopAnchor = "headerTitleContainer.bottom";
         else if (hasMascot) summaryTopAnchor = "mascotImage.bottom";
         else if (hasSubtitle) summaryTopAnchor = "subtitleLabel.bottom";
         else if (hasTitle) summaryTopAnchor = "titleLabel.bottom";
@@ -504,6 +581,16 @@
         code += kSummaryLabelCode.arg(summaryTopAnchor).arg(summaryTopMargin).arg(color);
     }
 
+    var touchdownAnchors;
+    if (hasBackground) {
+        touchdownAnchors = 'fill: backgroundLoader';
+    } else if (hasArt && !hasMascot && !hasSummary) {
+        touchdownAnchors = 'fill: artShapeHolder';
+    } else {
+        touchdownAnchors = 'fill: root'
+    }
+    code += kTouchdownCode.arg(touchdownAnchors);
+
     if (hasSummary) {
         code += 'implicitHeight: summary.y + summary.height + (summary.text ? units.gu(1) : 0);\n';
     } else if (hasHeaderRow) {

=== modified file 'tests/plugins/Dash/cardcreator/1.res'
--- tests/plugins/Dash/cardcreator/1.res	2014-07-08 12:37:34 +0000
+++ tests/plugins/Dash/cardcreator/1.res	2014-07-29 11:22:19 +0000
@@ -82,5 +82,13 @@
                     font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal; 
                     horizontalAlignment: root.headerAlignment; 
                 }
+UbuntuShape {
+    id: touchdown;
+    objectName: "touchdown";
+    anchors { fill: artShapeHolder }
+    visible: root.pressed;
+    radius: "medium";
+    borderSource: "radius_pressed.sci"
+}
 implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);
 }

=== modified file 'tests/plugins/Dash/cardcreator/2.res'
--- tests/plugins/Dash/cardcreator/2.res	2014-07-08 12:53:51 +0000
+++ tests/plugins/Dash/cardcreator/2.res	2014-07-29 11:22:19 +0000
@@ -113,5 +113,13 @@
 }
 ]
 }
+UbuntuShape {
+    id: touchdown;
+    objectName: "touchdown";
+    anchors { fill: backgroundLoader }
+    visible: root.pressed;
+    radius: "medium";
+    borderSource: "radius_pressed.sci"
+}
 implicitHeight: row.y + row.height + units.gu(1);
 }

=== modified file 'tests/plugins/Dash/cardcreator/3.res'
--- tests/plugins/Dash/cardcreator/3.res	2014-07-08 12:37:34 +0000
+++ tests/plugins/Dash/cardcreator/3.res	2014-07-29 11:22:19 +0000
@@ -100,5 +100,13 @@
                         font.weight: Font.Light; 
                         horizontalAlignment: root.headerAlignment; 
                     }
+UbuntuShape {
+    id: touchdown;
+    objectName: "touchdown";
+    anchors { fill: artShapeHolder }
+    visible: root.pressed;
+    radius: "medium";
+    borderSource: "radius_pressed.sci"
+}
 implicitHeight: subtitleLabel.y + subtitleLabel.height + units.gu(1);
 }

=== modified file 'tests/plugins/Dash/cardcreator/4.res'
--- tests/plugins/Dash/cardcreator/4.res	2014-07-08 12:37:34 +0000
+++ tests/plugins/Dash/cardcreator/4.res	2014-07-29 11:22:19 +0000
@@ -94,5 +94,13 @@
 }
 ]
 }
+UbuntuShape {
+    id: touchdown;
+    objectName: "touchdown";
+    anchors { fill: root }
+    visible: root.pressed;
+    radius: "medium";
+    borderSource: "radius_pressed.sci"
+}
 implicitHeight: row.y + row.height + units.gu(1);
 }

=== modified file 'tests/plugins/Dash/cardcreator/5.res'
--- tests/plugins/Dash/cardcreator/5.res	2014-07-08 12:37:34 +0000
+++ tests/plugins/Dash/cardcreator/5.res	2014-07-29 11:22:19 +0000
@@ -141,5 +141,13 @@
                         font.weight: Font.Light; 
                         horizontalAlignment: root.headerAlignment; 
                     }
+UbuntuShape { 
+    id: touchdown; 
+    objectName: "touchdown"; 
+    anchors { fill: artShapeHolder } 
+    visible: root.pressed; 
+    radius: "medium"; 
+    borderSource: "radius_pressed.sci" 
+}
 implicitHeight: subtitleLabel.y + subtitleLabel.height + units.gu(1);
 }

=== modified file 'tests/plugins/Dash/cardcreator/6.res'
--- tests/plugins/Dash/cardcreator/6.res	2014-07-10 18:03:16 +0000
+++ tests/plugins/Dash/cardcreator/6.res	2014-07-29 11:22:19 +0000
@@ -63,5 +63,13 @@
                     }
                 }
 readonly property int headerHeight: 0;
+UbuntuShape {
+    id: touchdown;
+    objectName: "touchdown";
+    anchors { fill: artShapeHolder }
+    visible: root.pressed;
+    radius: "medium";
+    borderSource: "radius_pressed.sci"
+}
 implicitHeight: artShapeHolder.height;
 }

=== modified file 'tests/plugins/Dash/cardcreatortest.cpp'
--- tests/plugins/Dash/cardcreatortest.cpp	2014-05-06 13:09:08 +0000
+++ tests/plugins/Dash/cardcreatortest.cpp	2014-07-29 11:22:19 +0000
@@ -19,6 +19,7 @@
 #include <QQuickItem>
 #include <QQuickView>
 #include <QtTestGui>
+#include <QDebug>
 
 class CardCreatorTest : public QObject
 {
@@ -73,8 +74,11 @@
             QFile testResultFile(testDirPath + resultFileName);
             QVERIFY(testResultFile.open(QIODevice::ReadOnly));
             QTextStream ts2(&testResultFile);
-            const QString expectedResult = ts2.readAll();
-            QCOMPARE(cardStringResult.toString().simplified(), expectedResult.simplified());
+            const QStringList expectedLines = ts2.readAll().trimmed().replace(QRegExp("\n\\s*\n"),"\n").split("\n");
+            const QStringList cardStringResultLines = cardStringResult.toString().trimmed().replace(QRegExp("\n\\s*\n"),"\n").split("\n");
+            for (int i = 0; i < expectedLines.size(); ++i) {
+                QCOMPARE(cardStringResultLines[i].simplified(), expectedLines[i].simplified());
+            }
 
             QVariant createCardComponentResult;
             QMetaObject::invokeMethod(view->rootObject(), "createCardComponent", Q_RETURN_ARG(QVariant, createCardComponentResult), Q_ARG(QVariant, templateJSON), Q_ARG(QVariant, componentsJSON));

=== modified file 'tests/qmltests/Dash/CardHelpers.js'
--- tests/qmltests/Dash/CardHelpers.js	2014-02-04 18:14:07 +0000
+++ tests/qmltests/Dash/CardHelpers.js	2014-07-29 11:22:19 +0000
@@ -59,6 +59,7 @@
   "art": "art", \
   "subtitle": "subtitle", \
   "mascot": "mascot", \
+  "emblem": "emblem", \
   "summary": "summary" \
 }'
 

=== modified file 'tests/qmltests/Dash/tst_Card.qml'
--- tests/qmltests/Dash/tst_Card.qml	2014-06-27 08:47:04 +0000
+++ tests/qmltests/Dash/tst_Card.qml	2014-07-29 11:22:19 +0000
@@ -31,6 +31,7 @@
     {
       "art": "../../../tests/qmltests/Dash/artwork/music-player-design.png",
       "mascot": "../../../tests/qmltests/Dash/artwork/avatar.png",
+      "emblem": "../../../tests/qmltests/Dash/artwork/emblem.png",
       "title": "foo",
       "subtitle": "bar",
       "summary": "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
@@ -456,6 +457,23 @@
             tryCompareFunction(function() { return Qt.colorEqual(subtitle.color, fontColor); }, true);
         }
 
+        function test_emblemImage_data() {
+            return [
+                { tag: "Art and summary", emblem: true, index: 0 },
+                { tag: "Art and summary, small", emblem: false, index: 1 },
+                { tag: "No header", emblem: false, index: 7 },
+                { tag: "With background", emblem: true, index: 10 },
+            ];
+        }
+
+        function test_emblemImage(data) {
+            selector.selectedIndex = data.index;
+            waitForRendering(card);
+
+            var emblemImage = findChild(card, "emblemImage");
+            compare(emblemImage !== null, data.emblem);
+        }
+
         function test_mascotShape_data() {
             return [
                 { tag: "Art and summary", shape: false, index: 0 },
@@ -473,5 +491,17 @@
             compare(shape !== null, data.shape);
             tryCompare(mascotImage, "visible", !data.shape);
         }
+
+        function test_touchdown_visibility() {
+            selector.selectedIndex = 0;
+
+            var touchdown = findChild(card, "touchdown");
+
+            compare(touchdown.visible, false);
+            mousePress(card, card.width/2, card.height/2);
+            compare(touchdown.visible, true);
+            mouseRelease(card, card.width/2, card.height/2);
+            compare(touchdown.visible, false);
+        }
     }
 }