Merge lp:~lukas-kde/unity-api/liveCaption into lp:unity-api

[Lukáš Tinkl]

Notify about surface name changes

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

[PS Jenkins bot (ps-jenkins)]

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)]

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)]

review: Approve

[Gerry Boland (gerboland)]

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)]

> 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)]

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)]

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)]

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)]

review: Approve

[Michael Zanetti (mzanetti)]

this should bump the application-api version

review: Needs Fixing

[Michael Zanetti (mzanetti)]

> 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

Unmerged revisions

=== modified file 'include/unity/shell/application/MirSurfaceInterface.h'
--- include/unity/shell/application/MirSurfaceInterface.h	2015-08-19 13:18:09 +0000
+++ include/unity/shell/application/MirSurfaceInterface.h	2015-09-29 14:29:43 +0000
@@ -47,7 +47,7 @@
     /**
      * @brief Name of the surface, given by the client application
      */
-    Q_PROPERTY(QString name READ name CONSTANT)
+    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
 
     /**
      * @brief Size of the current surface buffer, in pixels.
@@ -102,6 +102,7 @@
     void stateChanged(Mir::State value);
     void orientationAngleChanged(Mir::OrientationAngle value);
     void sizeChanged(const QSize &value);
+    void nameChanged(const QString &name);
     /// @endcond
 };
 

=== modified file 'include/unity/shell/application/MirSurfaceItemInterface.h'
--- include/unity/shell/application/MirSurfaceItemInterface.h	2015-08-19 13:18:09 +0000
+++ include/unity/shell/application/MirSurfaceItemInterface.h	2015-09-29 14:29:43 +0000
@@ -59,7 +59,7 @@
     /**
      * @brief Name of the given surface or an empty string if no surface is set
      */
-    Q_PROPERTY(QString name READ name CONSTANT)
+    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
 
     /**
      * @brief True if the item has a surface and that surface has a mir client bound to it.
@@ -141,6 +141,7 @@
     void consumesInputChanged(bool value);
     void surfaceWidthChanged(int value);
     void surfaceHeightChanged(int value);
+    void nameChanged(const QString &name);
     /// @endcond
 };