Unity 8

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

liveCaption
Merge into trunk

Proposed by Michał Sawicz on 2015-10-08

Status:

Merged

Approved by:

Michał Sawicz on 2015-10-08

Approved revision:

1950

Merged at revision:

2007

Proposed branch:

lp:~lukas-kde/unity8/liveCaption

Merge into:

lp:unity8

Prerequisite:

lp:~unity-team/unity8/mousePointer

Diff against target:

37 lines (+4/-1)

3 files modified

qml/Stages/ApplicationWindow.qml (+2/-0)
qml/Stages/DecoratedWindow.qml (+1/-1)
qml/Stages/SurfaceContainer.qml (+1/-0)

To merge this branch:

bzr merge lp:~lukas-kde/unity8/liveCaption

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Daniel d'Andrada (community)		2015-10-08	Approve on 2015-10-21
PS Jenkins bot	continuous-integration	2015-10-08	Pending
Albert Astals Cid		2015-10-08	Pending
Review via email: mp+273792@code.launchpad.net

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

Commit Message

React to window title (aka surface name) changes

Description of the Change

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) wrote on 2015-09-29: Posted in a previous version of this proposal

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

Daniel d'Andrada (dandrader) wrote on 2015-09-29: Posted in a previous version of this proposal

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) wrote on 2015-09-29: Posted in a previous version of this proposal

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) wrote on 2015-09-29: Posted in a previous version of this proposal

> 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) wrote on 2015-09-29: Posted in a previous version of this proposal

> 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) wrote on 2015-09-29: Posted in a previous version of this proposal

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

Done

PS Jenkins bot (ps-jenkins) wrote on 2015-09-29: Posted in a previous version of this proposal

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) wrote on 2015-09-30: Posted in a previous version of this proposal

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) wrote on 2015-09-30: Posted in a previous version of this proposal

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) wrote on 2015-09-30: Posted in a previous version of this proposal

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.

Daniel d'Andrada (dandrader) wrote on 2015-09-30: Posted in a previous version of this proposal

Thanks

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2015-10-01: Posted in a previous version of this proposal

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) wrote on 2015-10-01: Posted in a previous version of this proposal

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) wrote on 2015-10-08: Posted in a previous version of this proposal

Was top approved.

Text conflict in CMakeLists.txt
1 conflicts encountered.

review: Needs Fixing

Michał Sawicz (saviq) wrote on 2015-10-08:

Resubmitted on top of the new prerequisite. Needs merging that to clear the conflict.

lp:~lukas-kde/unity8/liveCaption updated on 2015-10-08

1951. By Lukáš Tinkl on 2015-10-08: merge trunk and fix conflict

Lukáš Tinkl (lukas-kde) wrote on 2015-10-08:

> Resubmitted on top of the new prerequisite. Needs merging that to clear the
> conflict.

Merged, fixed the conflict, tags clean

lp:~lukas-kde/unity8/liveCaption updated on 2015-10-15

1952. By Lukáš Tinkl on 2015-10-08: merge prereq
1953. By Lukáš Tinkl on 2015-10-15: merge lp:~unity-team/unity8/mousePointer

Daniel d'Andrada (dandrader) wrote on 2015-10-21:

In qml/Stages/SurfaceContainer.qml:

"""
+ property string name: surface ? surface.name : ""
"""

Since ApplicationWindow.qml is accessing the surface directly it seems this property is not being used.

review: Needs Fixing

Daniel d'Andrada (dandrader) wrote on 2015-10-21:

> In qml/Stages/SurfaceContainer.qml:
>
> """
> + property string name: surface ? surface.name : ""
> """
>
> Since ApplicationWindow.qml is accessing the surface directly it seems this
> property is not being used.

As in you can just remove it.

Lukáš Tinkl (lukas-kde) wrote on 2015-10-21:

> > In qml/Stages/SurfaceContainer.qml:
> >
> > """
> > + property string name: surface ? surface.name : ""
> > """
> >
> > Since ApplicationWindow.qml is accessing the surface directly it seems this
> > property is not being used.
>
> As in you can just remove it.

Done

Daniel d'Andrada (dandrader) on 2015-10-21:

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Lukáš Tinkl

Mohammad Rakibul Hasan

Unity Team

1	=== modified file 'qml/Stages/ApplicationWindow.qml'
2	--- qml/Stages/ApplicationWindow.qml 2015-09-17 12:25:29 +0000
3	+++ qml/Stages/ApplicationWindow.qml 2015-10-21 17:22:51 +0000
4	@@ -27,6 +27,8 @@
5	readonly property bool fullscreen: application ? application.fullscreen : false
6	property alias interactive: sessionContainer.interactive
7	property bool orientationChangesEnabled: d.supportsSurfaceResize ? d.surfaceOldEnoughToBeResized : true
8	+ readonly property string title: sessionContainer.surface && sessionContainer.surface.name !== "" ?
9	+ sessionContainer.surface.name : d.name
10
11	// to be set from outside
12	property QtObject application
13
14	=== modified file 'qml/Stages/DecoratedWindow.qml'
15	--- qml/Stages/DecoratedWindow.qml 2015-10-21 17:22:50 +0000
16	+++ qml/Stages/DecoratedWindow.qml 2015-10-21 17:22:51 +0000
17	@@ -66,7 +66,7 @@
18	objectName: application ? "appWindowDecoration_" + application.appId : "appWindowDecoration_null"
19	anchors { left: parent.left; top: parent.top; right: parent.right }
20	height: units.gu(3)
21	- title: model.name
22	+ title: window.title !== "" ? window.title : model.name
23	onClose: root.close();
24	onMaximize: root.maximize();
25	onMinimize: root.minimize();
26
27	=== modified file 'qml/Stages/SurfaceContainer.qml'
28	--- qml/Stages/SurfaceContainer.qml 2015-09-09 13:44:12 +0000
29	+++ qml/Stages/SurfaceContainer.qml 2015-10-21 17:22:51 +0000
30	@@ -28,6 +28,7 @@
31	property bool hadSurface: false
32	property bool interactive
33	property int surfaceOrientationAngle: 0
34	+ property string name: surface ? surface.name : ""
35	property bool resizeSurface: true
36
37	onSurfaceChanged: {