Merge lp:~unity-team/unity-api/music_cards_extra_attributes into lp:unity-api

Proposed by Paweł Stołowski on 2015-09-15
Status: Merged
Approved by: Paweł Stołowski on 2015-09-16
Approved revision: 184
Merged at revision: 205
Proposed branch: lp:~unity-team/unity-api/music_cards_extra_attributes
Merge into: lp:unity-api
Diff against target: 49 lines (+10/-3)
3 files modified
debian/changelog (+7/-0)
include/unity/shell/scopes/CMakeLists.txt (+1/-1)
include/unity/shell/scopes/ResultsModelInterface.h (+2/-2)
To merge this branch: bzr merge lp:~unity-team/unity-api/music_cards_extra_attributes
Reviewer Review Type Date Requested Status
Paweł Stołowski Approve on 2015-09-16
PS Jenkins bot continuous-integration 2015-09-15 Approve on 2015-09-16
Marcus Tomlinson 2015-09-15 Pending
Michael Zanetti 2015-09-15 Pending
Gerry Boland 2015-09-15 Pending
Review via email: mp+271084@code.launchpad.net

This proposal supersedes a proposal from 2015-08-10.

Commit Message

New properties to support more complex cards

Like music cards that play directly in the UI from the Dash

Description of the Change

This introduces two new properties activationUri and type that will be used by the Dash to be able to special case some behaviours like playing audio files directly from the dash.

Land together with branches from https://requests.ci-train.ubuntu.com/#/ticket/29

To post a comment you must log in.
Paweł Stołowski (stolowski) wrote : Posted in a previous version of this proposal

Looks good, but I've reservations about the name of the new attribute. Will be confusing for developers as it has nothing to do with result activation in the API. How about quickPreviewUri?

review: Abstain
Michael Zanetti (mzanetti) wrote : Posted in a previous version of this proposal

looks good to me.

review: Approve
Michael Zanetti (mzanetti) wrote : Posted in a previous version of this proposal

Actually no, needs to bump versions still

review: Needs Fixing
Gerry Boland (gerboland) wrote : Posted in a previous version of this proposal

=== modified file 'debian/changelog'
+unity-api (7.97+15.04.20150619-0ubuntu1) UNRELEASED; urgency=medium

Since you've made API change, suggest you bump the minor version and have something more like this:

+unity-api (7.98) UNRELEASED; urgency=medium
+
+ * New property to support more complex cards
+
+ -- Albert Astals Cid <email address hidden> Fri, 29 May 2015 18:16:26 +0200

The CI train will fill in the rest of the version string on release & reformat it to suit itself. But it won't bump the major/minor version unless we do this.

review: Needs Fixing
Marcus Tomlinson (marcustomlinson) wrote : Posted in a previous version of this proposal

Had a scan over this along with the associated changes in:

https://code.launchpad.net/~unity-team/unity8/audioCardSupport/+merge/269029
and https://code.launchpad.net/~stolowski/unity-scopes-shell/audio-card/+merge/267341

Looks good to me. Although, I am a an outsider regarding this development, so best to confirm this review with someone directly involved.

review: Approve
184. By Paweł Stołowski on 2015-09-16

Merged trunk

Paweł Stołowski (stolowski) wrote :

Since the branch was proposed by Albert and I only re-proposed the MP, I take the liberty of top-approving.

review: Approve
185. By Albert Astals Cid on 2015-09-16

move the new enum value at the end

186. By Paweł Stołowski on 2015-10-16

Merged trunk

187. By Paweł Stołowski on 2015-10-27

Merge trunk

188. By Paweł Stołowski on 2015-11-30

Merged trunk

189. By Paweł Stołowski on 2015-12-15

Merged trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-12-07 16:21:29 +0000
3+++ debian/changelog 2015-12-15 15:21:45 +0000
4@@ -1,3 +1,10 @@
5+unity-api (7.105-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ [Albert Astals Cid ]
8+ * New property to support more complex cards
9+
10+ -- Michael Zanetti <michael.zanetti@canonical.com> Fri, 29 May 2015 18:16:26 +0200
11+
12 unity-api (7.104+16.04.20151207-0ubuntu1) xenial; urgency=medium
13
14 [ Daniel d'Andrada ]
15
16=== modified file 'include/unity/shell/scopes/CMakeLists.txt'
17--- include/unity/shell/scopes/CMakeLists.txt 2015-10-06 16:07:24 +0000
18+++ include/unity/shell/scopes/CMakeLists.txt 2015-12-15 15:21:45 +0000
19@@ -7,7 +7,7 @@
20
21 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
22
23-set(VERSION 8)
24+set(VERSION 9)
25 set(PKGCONFIG_NAME "unity-shell-scopes")
26 set(PKGCONFIG_DESCRIPTION "Unity shell Scopes APIs")
27 set(PKGCONFIG_REQUIRES "Qt5Core")
28
29=== modified file 'include/unity/shell/scopes/ResultsModelInterface.h'
30--- include/unity/shell/scopes/ResultsModelInterface.h 2015-05-18 15:07:49 +0000
31+++ include/unity/shell/scopes/ResultsModelInterface.h 2015-12-15 15:21:45 +0000
32@@ -61,7 +61,6 @@
33 RoleCategoryId,
34 RoleDndUri,
35 RoleResult,
36- RoleQuickPreviewData, ///< Data for UI quick previewing. In case of audio should contain uri and duration
37 // card components
38 RoleTitle,
39 RoleArt,
40@@ -71,7 +70,8 @@
41 RoleSummary,
42 RoleAttributes,
43 RoleBackground,
44- RoleOverlayColor
45+ RoleOverlayColor,
46+ RoleQuickPreviewData ///< Data for UI quick previewing. In case of audio should contain uri and duration
47 };
48
49 // @cond

Subscribers

People subscribed via source and target branches

to all changes: