Unity API

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

  1. liveCaption
  2. Merge into trunk
Proposed by Michał Sawicz on 2015-10-01
Status: Merged
Approved by: Daniel d'Andrada on 2015-10-01
Approved revision: 191
Merged at revision: 190
Proposed branch: lp:~unity-team/unity-api/liveCaption
Merge into: lp:unity-api
Prerequisite: lp:~dandrader/unity-api/mousePointer
Diff against target: 58 lines (+8/-2)
3 files modified
debian/changelog (+4/-0)
include/unity/shell/application/MirSurfaceInterface.h (+2/-1)
include/unity/shell/application/MirSurfaceItemInterface.h (+2/-1)
To merge this branch: bzr merge lp:~unity-team/unity-api/liveCaption
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration 2015-10-01 Approve on 2015-10-01
Daniel d'Andrada (community) 2015-10-01 Approve on 2015-10-01
Gerry Boland 2015-10-01 Pending
Michael Zanetti 2015-10-01 Pending
Review via email: mp+273073@code.launchpad.net

This proposal supersedes a proposal from 2015-09-29.

Commit Message

Notify about surface name changes

Description of the Change

Notify about surface name changes, bump api version

Cf: https://bugs.launchpad.net/ubuntu/+source/unity-api/+bug/1497092

* Are there any related MPs required for this MP to build/function as expected? Please list.

Yes: https://code.launchpad.net/~dandrader/unity-api/mousePointer/+merge/271620

* 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?

Yes

* If you changed the UI, has there been a design review?

N/A

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:189
http://jenkins.qa.ubuntu.com/job/unity-api-ci/341/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/30/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/40
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/40/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-i386-ci/40

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/341/rebuild

review: Approve (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:190
http://jenkins.qa.ubuntu.com/job/unity-api-ci/342/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/31/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/41
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/41/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-i386-ci/41

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/342/rebuild

review: Approve (continuous-integration)
Daniel d'Andrada (dandrader) : Posted in a previous version of this proposal
review: Approve
Gerry Boland (gerboland) wrote : Posted in a previous version of this proposal

Do you think "name" is the best name for this property? I chose "name" as it matches the Mir terminology. I've always had a hunch "title" is a better name. Thoughts?

review: Needs Information
Lukáš Tinkl (lukas-kde) wrote : Posted in a previous version of this proposal

> Do you think "name" is the best name for this property? I chose "name" as it
> matches the Mir terminology. I've always had a hunch "title" is a better name.
> Thoughts?

I don't know honestly but I kept "name" for this very reason, to match the Mir's terminology.

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

Since you're asking for opinions, I agree, title is better... Name really makes me think of the "Name=" entry in the .desktop file.

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

Thinking it over, IMO it's probably better to stick with mir terminology. It's annoying if a wrapper lib decides to rename the things it is wrapping

Daniel d'Andrada (dandrader) wrote : Posted in a previous version of this proposal

On 30/09/2015 09:44, Gerry Boland wrote:
> Thinking it over, IMO it's probably better to stick with mir terminology. It's annoying if a wrapper lib decides to rename the things it is wrapping
 +1

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

this should bump the application-api version

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

> this should bump the application-api version

ok... as it is confirmed we'll land this together with another change that bumps the version, I'm fine with not bumping it again here...

review: Abstain
Daniel d'Andrada (dandrader) :
review: Approve
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:191
http://jenkins.qa.ubuntu.com/job/unity-api-ci/344/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/33
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/33/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/43/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-i386-ci/43

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/344/rebuild

review: Approve (continuous-integration)

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-10-01 14:11:56 +0000
3+++ debian/changelog 2015-10-01 14:11:56 +0000
4@@ -1,9 +1,13 @@
5 unity-api (7.101) UNRELEASED; urgency=medium
6
7+ [ Daniel d'Andrada ]
8 * unity/shell/application: Add Mir.cursorName
9 * unity/shell/application: Added MirMousePointerInterface.h
10 * unity/shell/application: Added MirPlatformCursor.h
11
12+ [ Lukáš Tinkl ]
13+ * unity/shell/application: Add MirSurfaceInterface.nameChanged
14+
15 -- Daniel d'Andrada <daniel.dandrada@canonical.com> Tue, 01 Sep 2015 13:38:11 -0300
16
17 unity-api (7.100+15.10.20150903-0ubuntu1) wily; urgency=medium
18
19=== modified file 'include/unity/shell/application/MirSurfaceInterface.h'
20--- include/unity/shell/application/MirSurfaceInterface.h 2015-08-19 13:18:09 +0000
21+++ include/unity/shell/application/MirSurfaceInterface.h 2015-10-01 14:11:56 +0000
22@@ -47,7 +47,7 @@
23 /**
24 * @brief Name of the surface, given by the client application
25 */
26- Q_PROPERTY(QString name READ name CONSTANT)
27+ Q_PROPERTY(QString name READ name NOTIFY nameChanged)
28
29 /**
30 * @brief Size of the current surface buffer, in pixels.
31@@ -102,6 +102,7 @@
32 void stateChanged(Mir::State value);
33 void orientationAngleChanged(Mir::OrientationAngle value);
34 void sizeChanged(const QSize &value);
35+ void nameChanged(const QString &name);
36 /// @endcond
37 };
38
39
40=== modified file 'include/unity/shell/application/MirSurfaceItemInterface.h'
41--- include/unity/shell/application/MirSurfaceItemInterface.h 2015-08-19 13:18:09 +0000
42+++ include/unity/shell/application/MirSurfaceItemInterface.h 2015-10-01 14:11:56 +0000
43@@ -59,7 +59,7 @@
44 /**
45 * @brief Name of the given surface or an empty string if no surface is set
46 */
47- Q_PROPERTY(QString name READ name CONSTANT)
48+ Q_PROPERTY(QString name READ name NOTIFY nameChanged)
49
50 /**
51 * @brief True if the item has a surface and that surface has a mir client bound to it.
52@@ -141,6 +141,7 @@
53 void consumesInputChanged(bool value);
54 void surfaceWidthChanged(int value);
55 void surfaceHeightChanged(int value);
56+ void nameChanged(const QString &name);
57 /// @endcond
58 };
59

Subscribers

People subscribed via source and target branches

to all changes: