Unity 8

Merge lp:~cimi/unity8/carousel-shadow into lp:unity8

  1. carousel-shadow
  2. Merge into trunk
Proposed by Andrea Cimitan
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 890
Merged at revision: 902
Proposed branch: lp:~cimi/unity8/carousel-shadow
Merge into: lp:unity8
Prerequisite: lp:~aacid/unity8/dynamic_specialized_cards
Diff against target: 145 lines (+25/-1)
8 files modified
plugins/Dash/CardCreator.js (+2/-0)
qml/Dash/CardCarousel.qml (+10/-1)
qml/Dash/graphics/carousel_dropshadow@27.sci (+5/-0)
tests/plugins/Dash/cardcreator/1.res (+2/-0)
tests/plugins/Dash/cardcreator/2.res (+1/-0)
tests/plugins/Dash/cardcreator/3.res (+2/-0)
tests/plugins/Dash/cardcreator/4.res (+1/-0)
tests/plugins/Dash/cardcreator/5.res (+2/-0)
To merge this branch: bzr merge lp:~cimi/unity8/carousel-shadow
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Andrea Cimitan (community) Needs Fixing
Review via email: mp+219233@code.launchpad.net

Commit message

Adds shadow for the carousel

Description of the change

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

To post a comment you must log in.
Revision history for this message
Omer Akram (om26er) wrote :

26 + * Copyright (C) 2013 Canonical, Ltd.

2014 ?

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:885
http://jenkins.qa.ubuntu.com/job/unity8-ci/2947/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/156
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1807/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/41
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/41/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/659
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/351
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/351/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7067

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) wrote :

> 26 + * Copyright (C) 2013 Canonical, Ltd.
>
> 2014 ?

That file shouldn't be there, it's victim of combined merges, I'll remove it tomorrow.

review: Needs Fixing
lp:~cimi/unity8/carousel-shadow updated
887. By Andrea Cimitan

Add newline in js

Revision history for this message
Albert Astals Cid (aacid) wrote :

Why are you setting the borderSouce for all creations now?

Have you run the tests?

review: Needs Information
Revision history for this message
Albert Astals Cid (aacid) wrote :

I mean we are setting "radius_idle.sci" when previously we didn't set anything, no?

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:887
http://jenkins.qa.ubuntu.com/job/unity8-ci/2949/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/168
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1809/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/43/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/669
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/379
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/379/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7094

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

review: Needs Fixing (continuous-integration)
lp:~cimi/unity8/carousel-shadow updated
888. By Andrea Cimitan

Add shadow asset and remove bordersource default value - WIP REQUIRES OPTIMIZATION

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:888
http://jenkins.qa.ubuntu.com/job/unity8-ci/2962/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/218
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1822/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/56
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/56/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/710
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/450
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/450/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7160

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

make xvfbtestCardCreator

review: Needs Fixing
Revision history for this message
Albert Astals Cid (aacid) wrote :

Are we sure this border image with shadow is always going to be carousel only? Maybe it makes more sense to be inside the card than in the carousel?

review: Needs Information
Revision history for this message
Andrea Cimitan (cimi) wrote :

> Are we sure this border image with shadow is always going to be carou
sel only?
> Maybe it makes more sense to be inside the card than in the carousel?

For now it is, so let's not add extra code in the creation!

lp:~cimi/unity8/carousel-shadow updated
889. By Andrea Cimitan

Added semicolon

890. By Andrea Cimitan

Fix tests

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:890
http://jenkins.qa.ubuntu.com/job/unity8-ci/2967/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/232
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1827/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/61
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/61/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/724
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/489
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/489/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7197

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes, looks good

* Did CI run pass? If not, please explain why.
qmluitests are still on trusty

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Dash/CardCreator.js'
2--- plugins/Dash/CardCreator.js 2014-05-07 15:30:16 +0000
3+++ plugins/Dash/CardCreator.js 2014-05-15 09:39:51 +0000
4@@ -73,6 +73,7 @@
5 Component.onCompleted: updateWidthHeightBindings(); \n\
6 onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings(); \n\
7 visible: image.status == Image.Ready; \n\
8+ borderSource: artShapeBorderSource; \n\
9 function updateWidthHeightBindings() { \n\
10 if (aspectSmallerThanImageAspect) { \n\
11 width = Qt.binding(function() { return !visible ? 0 : image.width }); \n\
12@@ -280,6 +281,7 @@
13 property var template; \n\
14 property var components; \n\
15 property var cardData; \n\
16+ property var artShapeBorderSource; \n\
17 property real fontScale: 1.0; \n\
18 property int headerAlignment: Text.AlignLeft; \n\
19 property int fixedHeaderHeight: -1; \n\
20
21=== modified file 'qml/Dash/CardCarousel.qml'
22--- qml/Dash/CardCarousel.qml 2014-05-07 13:55:44 +0000
23+++ qml/Dash/CardCarousel.qml 2014-05-15 09:39:51 +0000
24@@ -18,7 +18,6 @@
25 import Ubuntu.Components 0.1
26 import "../Components"
27
28-
29 DashRenderer {
30 id: cardCarousel
31
32@@ -66,6 +65,16 @@
33 item.components = Qt.binding(function() { return cardTool.components; });
34 item.fontScale = Qt.binding(function() { return carousel.fontScale; });
35 item.showHeader = Qt.binding(function() { return loader.explicitlyScaled; });
36+ item.artShapeBorderSource = "none";
37+ }
38+
39+ BorderImage {
40+ anchors {
41+ fill: parent
42+ margins: -units.gu(1)
43+ }
44+ z: -1
45+ source: "graphics/carousel_dropshadow.sci"
46 }
47 }
48 }
49
50=== added file 'qml/Dash/graphics/carousel_dropshadow@27.png'
51Binary files qml/Dash/graphics/carousel_dropshadow@27.png 1970-01-01 00:00:00 +0000 and qml/Dash/graphics/carousel_dropshadow@27.png 2014-05-15 09:39:51 +0000 differ
52=== added file 'qml/Dash/graphics/carousel_dropshadow@27.sci'
53--- qml/Dash/graphics/carousel_dropshadow@27.sci 1970-01-01 00:00:00 +0000
54+++ qml/Dash/graphics/carousel_dropshadow@27.sci 2014-05-15 09:39:51 +0000
55@@ -0,0 +1,5 @@
56+border.left: 108
57+border.top: 108
58+border.bottom: 108
59+border.right: 108
60+source: carousel_dropshadow@27.png
61\ No newline at end of file
62
63=== modified file 'tests/plugins/Dash/cardcreator/1.res'
64--- tests/plugins/Dash/cardcreator/1.res 2014-05-07 13:31:55 +0000
65+++ tests/plugins/Dash/cardcreator/1.res 2014-05-15 09:39:51 +0000
66@@ -3,6 +3,7 @@
67 property var template;
68 property var components;
69 property var cardData;
70+ property var artShapeBorderSource;
71 property real fontScale: 1.0;
72 property int headerAlignment: Text.AlignLeft;
73 property int fixedHeaderHeight: -1;
74@@ -32,6 +33,7 @@
75 Component.onCompleted: updateWidthHeightBindings();
76 onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings();
77 visible: image.status == Image.Ready;
78+ borderSource: artShapeBorderSource;
79 function updateWidthHeightBindings() {
80 if (aspectSmallerThanImageAspect) {
81 width = Qt.binding(function() { return !visible ? 0 : image.width });
82
83=== modified file 'tests/plugins/Dash/cardcreator/2.res'
84--- tests/plugins/Dash/cardcreator/2.res 2014-05-07 13:31:55 +0000
85+++ tests/plugins/Dash/cardcreator/2.res 2014-05-15 09:39:51 +0000
86@@ -3,6 +3,7 @@
87 property var template;
88 property var components;
89 property var cardData;
90+ property var artShapeBorderSource;
91 property real fontScale: 1.0;
92 property int headerAlignment: Text.AlignLeft;
93 property int fixedHeaderHeight: -1;
94
95=== modified file 'tests/plugins/Dash/cardcreator/3.res'
96--- tests/plugins/Dash/cardcreator/3.res 2014-05-07 15:30:16 +0000
97+++ tests/plugins/Dash/cardcreator/3.res 2014-05-15 09:39:51 +0000
98@@ -3,6 +3,7 @@
99 property var template;
100 property var components;
101 property var cardData;
102+ property var artShapeBorderSource;
103 property real fontScale: 1.0;
104 property int headerAlignment: Text.AlignLeft;
105 property int fixedHeaderHeight: -1;
106@@ -32,6 +33,7 @@
107 Component.onCompleted: updateWidthHeightBindings();
108 onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings();
109 visible: image.status == Image.Ready;
110+ borderSource: artShapeBorderSource;
111 function updateWidthHeightBindings() {
112 if (aspectSmallerThanImageAspect) {
113 width = Qt.binding(function() { return !visible ? 0 : image.width });
114
115=== modified file 'tests/plugins/Dash/cardcreator/4.res'
116--- tests/plugins/Dash/cardcreator/4.res 2014-05-07 13:31:55 +0000
117+++ tests/plugins/Dash/cardcreator/4.res 2014-05-15 09:39:51 +0000
118@@ -3,6 +3,7 @@
119 property var template;
120 property var components;
121 property var cardData;
122+ property var artShapeBorderSource;
123 property real fontScale: 1.0;
124 property int headerAlignment: Text.AlignLeft;
125 property int fixedHeaderHeight: -1;
126
127=== modified file 'tests/plugins/Dash/cardcreator/5.res'
128--- tests/plugins/Dash/cardcreator/5.res 2014-05-07 15:30:16 +0000
129+++ tests/plugins/Dash/cardcreator/5.res 2014-05-15 09:39:51 +0000
130@@ -3,6 +3,7 @@
131 property var template;
132 property var components;
133 property var cardData;
134+ property var artShapeBorderSource;
135 property real fontScale: 1.0;
136 property int headerAlignment: Text.AlignLeft;
137 property int fixedHeaderHeight: -1;
138@@ -32,6 +33,7 @@
139 Component.onCompleted: updateWidthHeightBindings();
140 onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings();
141 visible: image.status == Image.Ready;
142+ borderSource: artShapeBorderSource;
143 function updateWidthHeightBindings() {
144 if (aspectSmallerThanImageAspect) {
145 width = Qt.binding(function() { return !visible ? 0 : image.width });

Subscribers

People subscribed via source and target branches