Unity 8

Merge lp:~aacid/unity8/circleForAudioCards into lp:unity8

  1. circleForAudioCards
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Andrea Cimitan
Approved revision: 2146
Merged at revision: 2191
Proposed branch: lp:~aacid/unity8/circleForAudioCards
Merge into: lp:unity8
Diff against target: 62 lines (+23/-5)
2 files modified
plugins/Dash/CardCreator.js (+11/-2)
tests/plugins/Dash/cardcreator/9.res (+12/-3)
To merge this branch: bzr merge lp:~aacid/unity8/circleForAudioCards
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Unity8 CI Bot continuous-integration Needs Fixing
Andrea Cimitan (community) Approve
Review via email: mp+284747@code.launchpad.net

Commit message

Visual improvements to the dash audio play cards

Description of the change

 * Are there any related MPs required for this MP to build/function as expected?
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, patty/grazina approve

To post a comment you must log in.
Revision history for this message
Andrea Cimitan (cimi) :
review: Needs Information
lp:~aacid/unity8/circleForAudioCards updated
2146. By Albert Astals Cid

stylistic changes

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

 * Did you perform an exploratory manual test run of the code change and any related functionality?
yes
 * Did CI run pass? If not, please explain why.
waiting to top approve
 * Did you make sure that the branch does not contain spurious tags?
yes

review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2145
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/252/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/252/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2145
http://jenkins.qa.ubuntu.com/job/unity8-ci/7193/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6295/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/608/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1898
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/601
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1793
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1793
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/600
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/599
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4839/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6306
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6306/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27238
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/322/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/606
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/606/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27237

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2146
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/253/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/253/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2146
http://jenkins.qa.ubuntu.com/job/unity8-ci/7195/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6297
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/610/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1900
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/603
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1795
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1795
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/602
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/601
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4840
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6308
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6308/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27241
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/324/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/608
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/608/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27240

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

review: Needs Fixing (continuous-integration)

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 2016-01-29 11:52:58 +0000
3+++ plugins/Dash/CardCreator.js 2016-02-02 15:20:43 +0000
4@@ -152,11 +152,20 @@
5 visible: parent.pressed; \n\
6 radius: "medium"; \n\
7 } \n\
8+ Rectangle { \n\
9+ color: Qt.rgba(0, 0, 0, 0.5); \n\
10+ anchors.centerIn: parent; \n\
11+ width: parent.width * 0.5; \n\
12+ height: width; \n\
13+ radius: width / 2; \n\
14+ } \n\
15 Icon { \n\
16- anchors.fill: parent; \n\
17- anchors.margins: parent.height > units.gu(5) ? units.gu(2) : 0; \n\
18+ anchors.centerIn: parent; \n\
19+ width: parent.width * 0.3; \n\
20+ height: width; \n\
21 opacity: 0.9; \n\
22 name: DashAudioPlayer.playing && AudioUrlComparer.compare(parent.source, DashAudioPlayer.currentSource) ? "media-playback-pause" : "media-playback-start"; \n\
23+ color: "white"; \n\
24 } \n\
25 onClicked: { \n\
26 if (AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)) { \n\
27
28=== modified file 'tests/plugins/Dash/cardcreator/9.res'
29--- tests/plugins/Dash/cardcreator/9.res 2016-01-11 15:40:59 +0000
30+++ tests/plugins/Dash/cardcreator/9.res 2016-02-02 15:20:43 +0000
31@@ -3,7 +3,7 @@
32 property var components;
33 property var cardData;
34 property string artShapeStyle: "inset";
35- property string backgroundShapeStyle: "inset";
36+ property string backgroundShapeStyle: "inset";
37 property real fontScale: 1.0;
38 property var scopeStyle: null;
39 property int titleAlignment: Text.AlignLeft;
40@@ -80,11 +80,20 @@
41 visible: parent.pressed;
42 radius: "medium";
43 }
44+ Rectangle {
45+ color: Qt.rgba(0, 0, 0, 0.5);
46+ anchors.centerIn: parent;
47+ width: parent.width * 0.5;
48+ height: width;
49+ radius: width / 2;
50+ }
51 Icon {
52- anchors.fill: parent;
53- anchors.margins: parent.height > units.gu(5) ? units.gu(2) : 0;
54+ anchors.centerIn: parent;
55+ width: parent.width * 0.3;
56+ height: width;
57 opacity: 0.9;
58 name: DashAudioPlayer.playing && AudioUrlComparer.compare(parent.source, DashAudioPlayer.currentSource) ? "media-playback-pause" : "media-playback-start";
59+ color: "white";
60 }
61 onClicked: {
62 if (AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)) {

Subscribers

People subscribed via source and target branches