Merge lp:~lukas-kde/unity8/liveCaption into lp:unity8

[Lukáš Tinkl]

React to window title (aka surface name) changes

React to window caption (surface name) changes

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: unity-api: https://code.launchpad.net/~lukas-kde/unity-api/liveCaption/+merge/272769
Functionality also depends on qtmir: https://code.launchpad.net/~lukas-kde/qtmir/liveCaption/+merge/272757 and qtubuntu: https://code.launchpad.net/~lukas-kde/qtubuntu/liveCaption/+merge/272756

* 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

[Daniel d'Andrada (dandrader)]

Please rebase it on top of mousePointer, as you did for the unity-api one.

[Daniel d'Andrada (dandrader)]

Unrelated changes in po/sr.po.

There's debug output in qml/Stages/SurfaceContainer.qml

In qml/Stages/ApplicationWindow.qml, please use sessionContainer.surfaceContainer.name instead of going all the way down to sessionContainer.surfaceContainer.surface.name

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

In qml/Stages/SurfaceContainer.qml:

"""
property string name: surface && surface.name !== "" ? surface.name : ""
"""

Has some redundancy. It could be written as:
property string name: surface ? surface.name : ""

review: Needs Fixing

[Lukáš Tinkl (lukas-kde)]

> Unrelated changes in po/sr.po.

Fixed

> There's debug output in qml/Stages/SurfaceContainer.qml

Fixed

> In qml/Stages/ApplicationWindow.qml, please use
> sessionContainer.surfaceContainer.name instead of going all the way down to
> sessionContainer.surfaceContainer.surface.name

Fixed

[Lukáš Tinkl (lukas-kde)]

> In qml/Stages/SurfaceContainer.qml:
>
> """
> property string name: surface && surface.name !== "" ? surface.name : ""
> """
>
> Has some redundancy. It could be written as:
> property string name: surface ? surface.name : ""

Fixed

[Lukáš Tinkl (lukas-kde)]

> Please rebase it on top of mousePointer, as you did for the unity-api one.

Done

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1942
http://jenkins.qa.ubuntu.com/job/unity8-ci/6380/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4413/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/757/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1092/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/410/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/987/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/988/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/619/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/620/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4410/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/757/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1947
http://jenkins.qa.ubuntu.com/job/unity8-ci/6385/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4426/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/762/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1097/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/415/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/992/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/993/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/624/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/625/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4423/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/762/console

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

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

In qml/Stages/SurfaceContainer.qml:

"""
+ Connections {
+ target: root.surface
+ onNameChanged: {
+ if (name !== "") {
+ root.name = name;
+ }
+ }
+ }
"""

I don't think we need this code. Let name be empty if it was set like that.

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

You have to resubmit your proposal to add lp:~dandrader/unity8/mousePointer as a prerequisite. Otherwise launchpad will think your MP includes mousePointer changes as well.

[lp:~lukas-kde/unity8/liveCaption]

1949. By Lukáš Tinkl on 2015-09-30

allow setting the surface name to empty string

1950. By Lukáš Tinkl on 2015-09-30

remove unneeded connections

[Daniel d'Andrada (dandrader)]

Thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1948
http://jenkins.qa.ubuntu.com/job/unity8-ci/6391/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4436/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/769/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1103/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/421/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/998/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/999/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/630/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/631/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4433/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/769/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1949
http://jenkins.qa.ubuntu.com/job/unity8-ci/6392/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4439/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/770/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1104/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/422/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/999/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1000/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/631/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/632/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4436/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/770/console

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Was top approved.

Text conflict in CMakeLists.txt
1 conflicts encountered.

review: Needs Fixing

[lp:~lukas-kde/unity8/liveCaption]

1951. By Lukáš Tinkl on 2015-10-08

merge trunk and fix conflict

1952. By Lukáš Tinkl on 2015-10-08

merge prereq

1953. By Lukáš Tinkl on 2015-10-15

merge lp:~unity-team/unity8/mousePointer

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2015-09-30 14:25:25 +0000
+++ debian/control	2015-09-30 14:25:25 +0000
@@ -173,7 +173,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Provides: unity-application-impl,
-          unity-application-impl-8,
+          unity-application-impl-9,
 Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
 Description: Fake environment for running Unity 8 shell
  Provides fake implementations of some QML modules used by Unity 8 shell

=== modified file 'qml/Stages/ApplicationWindow.qml'
--- qml/Stages/ApplicationWindow.qml	2015-09-17 12:25:29 +0000
+++ qml/Stages/ApplicationWindow.qml	2015-09-30 14:25:25 +0000
@@ -27,6 +27,8 @@
     readonly property bool fullscreen: application ? application.fullscreen : false
     property alias interactive: sessionContainer.interactive
     property bool orientationChangesEnabled: d.supportsSurfaceResize ? d.surfaceOldEnoughToBeResized : true
+    readonly property string title: sessionContainer.surface && sessionContainer.surface.name !== "" ?
+                                        sessionContainer.surface.name : d.name
 
     // to be set from outside
     property QtObject application

=== modified file 'qml/Stages/DecoratedWindow.qml'
--- qml/Stages/DecoratedWindow.qml	2015-09-30 14:25:25 +0000
+++ qml/Stages/DecoratedWindow.qml	2015-09-30 14:25:25 +0000
@@ -66,7 +66,7 @@
         objectName: application ? "appWindowDecoration_" + application.appId : "appWindowDecoration_null"
         anchors { left: parent.left; top: parent.top; right: parent.right }
         height: units.gu(3)
-        title: model.name
+        title: window.title !== "" ? window.title : model.name
         onClose: root.close();
         onMaximize: root.maximize();
         onMinimize: root.minimize();

=== modified file 'qml/Stages/SurfaceContainer.qml'
--- qml/Stages/SurfaceContainer.qml	2015-09-09 13:44:12 +0000
+++ qml/Stages/SurfaceContainer.qml	2015-09-30 14:25:25 +0000
@@ -28,6 +28,7 @@
     property bool hadSurface: false
     property bool interactive
     property int surfaceOrientationAngle: 0
+    property string name: surface ? surface.name : ""
     property bool resizeSurface: true
 
     onSurfaceChanged: {