Unity 8

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

fixPromptSurfaceKeymap
Merge into trunk

Proposed by Lukáš Tinkl on 2016-08-08

Status:

Merged

Approved by:

Albert Astals Cid on 2016-08-08

Approved revision:

2578

Merged at revision:

2588

Proposed branch:

lp:~lukas-kde/unity8/fixPromptSurfaceKeymap

Merge into:

lp:unity8

Diff against target:

102 lines (+16/-3)

7 files modified

qml/Stages/ApplicationWindow.qml (+1/-0)
qml/Stages/DecoratedWindow.qml (+1/-0)
qml/Stages/DesktopStage.qml (+2/-1)
qml/Stages/PhoneStage.qml (+1/-1)
qml/Stages/SpreadDelegate.qml (+1/-0)
qml/Stages/TabletStage.qml (+1/-1)
tests/qmltests/tst_Shell.qml (+9/-0)

To merge this branch:

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

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration	2016-08-08	Needs Fixing on 2016-08-10
Albert Astals Cid (community)		2016-08-08	Approve on 2016-08-08
Daniel d'Andrada		2016-08-08	Pending
Review via email: mp+302276@code.launchpad.net

This proposal supersedes a proposal from 2016-08-02.

Commit Message

Apply the correct keymap also on prompt surfaces

Description of the Change

Apply the correct keymap also on prompt surfaces, not just the regular ones

Fixes e.g. getting US keymap when adding an account in u-s-s

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

* Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

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

N/A

Daniel d'Andrada (dandrader) wrote on 2016-07-28: Posted in a previous version of this proposal

Looks ok. Didn't test though.

review: Approve (code)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-28: Posted in a previous version of this proposal

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1841/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-02: Posted in a previous version of this proposal

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1867/rebuild

review: Approve (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-02: Posted in a previous version of this proposal

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1868/rebuild

review: Needs Fixing (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2016-08-02: Posted in a previous version of this proposal

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass? If not, please explain why.
No. Missing deps

review: Approve

Albert Astals Cid (aacid) wrote on 2016-08-08: Posted in a previous version of this proposal

Note: was top approved already.

Text conflict in po/unity8.pot
Text conflict in qml/Stages/DesktopStage.qml
2 conflicts encountered.

review: Needs Fixing

Lukáš Tinkl (lukas-kde) wrote on 2016-08-08: Posted in a previous version of this proposal

Merged and fixed

lp:~lukas-kde/unity8/fixPromptSurfaceKeymap updated on 2016-08-08

2577. By Lukáš Tinkl on 2016-08-08: apply the correct keymap also for prompt surfaces

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-08:

FAILED: Continuous integration, rev:2555
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1911/
Executed test runs:
FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2487/console
FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2515/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1911/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-08-08:

If possible, i'd like a test.

Note: This was top-approved before but if it's not hard a test is always nice.

review: Needs Fixing

lp:~lukas-kde/unity8/fixPromptSurfaceKeymap updated on 2016-08-08

2578. By Lukáš Tinkl on 2016-08-08: extend the keymap test with a prompt surface

Albert Astals Cid (aacid) wrote on 2016-08-08:

Daniel had approved before and the new tests is good.

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-08: Posted in a previous version of this proposal

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1910/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-08:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1912/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-10:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1930/rebuild

review: Needs Fixing (continuous-integration)

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 2016-06-22 13:53:00 +0000
3	+++ qml/Stages/ApplicationWindow.qml 2016-08-08 13:43:26 +0000
4	@@ -27,6 +27,7 @@
5	property alias interactive: surfaceContainer.interactive
6	property bool orientationChangesEnabled: d.supportsSurfaceResize ? d.surfaceOldEnoughToBeResized : true
7	readonly property string title: surface && surface.name !== "" ? surface.name : d.name
8	+ readonly property QtObject focusedSurface: d.focusedSurface.surface
9
10	// overridable from outside
11	property bool fullscreen: {
12
13	=== modified file 'qml/Stages/DecoratedWindow.qml'
14	--- qml/Stages/DecoratedWindow.qml 2016-06-20 10:31:44 +0000
15	+++ qml/Stages/DecoratedWindow.qml 2016-08-08 13:43:26 +0000
16	@@ -26,6 +26,7 @@
17
18	property alias application: applicationWindow.application
19	property alias surface: applicationWindow.surface
20	+ readonly property alias focusedSurface: applicationWindow.focusedSurface
21	property alias active: decoration.active
22	readonly property alias title: applicationWindow.title
23	property alias fullscreen: applicationWindow.fullscreen
24
25	=== modified file 'qml/Stages/DesktopStage.qml'
26	--- qml/Stages/DesktopStage.qml 2016-08-03 15:48:10 +0000
27	+++ qml/Stages/DesktopStage.qml 2016-08-08 13:43:26 +0000
28	@@ -230,7 +230,7 @@
29	Binding {
30	target: MirFocusController
31	property: "focusedSurface"
32	- value: priv.focusedAppDelegate ? priv.focusedAppDelegate.surface : null
33	+ value: priv.focusedAppDelegate ? priv.focusedAppDelegate.focusedSurface : null
34	when: !appRepeater.startingUp && root.parent
35	}
36
37	@@ -334,6 +334,7 @@
38
39	readonly property var surface: model.surface
40	readonly property alias resizeArea: resizeArea
41	+ readonly property alias focusedSurface: decoratedWindow.focusedSurface
42
43	readonly property bool isDash: model.application.appId == "unity8-dash"
44
45
46	=== modified file 'qml/Stages/PhoneStage.qml'
47	--- qml/Stages/PhoneStage.qml 2016-06-02 13:11:54 +0000
48	+++ qml/Stages/PhoneStage.qml 2016-08-08 13:43:26 +0000
49	@@ -244,7 +244,7 @@
50	Binding {
51	target: MirFocusController
52	property: "focusedSurface"
53	- value: priv.focusedAppDelegate ? priv.focusedAppDelegate.surface : null
54	+ value: priv.focusedAppDelegate ? priv.focusedAppDelegate.focusedSurface : null
55	when: root.parent && !spreadRepeater.startingUp
56	}
57
58
59	=== modified file 'qml/Stages/SpreadDelegate.qml'
60	--- qml/Stages/SpreadDelegate.qml 2016-06-22 20:19:55 +0000
61	+++ qml/Stages/SpreadDelegate.qml 2016-08-08 13:43:26 +0000
62	@@ -37,6 +37,7 @@
63	\| Qt.LandscapeOrientation
64	\| Qt.InvertedPortraitOrientation
65	\| Qt.InvertedLandscapeOrientation
66	+ readonly property alias focusedSurface: appWindow.focusedSurface
67
68	// to be set from outside
69	property bool interactive: true
70
71	=== modified file 'qml/Stages/TabletStage.qml'
72	--- qml/Stages/TabletStage.qml 2016-07-12 09:43:50 +0000
73	+++ qml/Stages/TabletStage.qml 2016-08-08 13:43:26 +0000
74	@@ -307,7 +307,7 @@
75	Binding {
76	target: MirFocusController
77	property: "focusedSurface"
78	- value: priv.focusedAppDelegate ? priv.focusedAppDelegate.surface : null
79	+ value: priv.focusedAppDelegate ? priv.focusedAppDelegate.focusedSurface : null
80	when: root.parent && !spreadRepeater.startingUp
81	}
82
83
84	=== modified file 'tests/qmltests/tst_Shell.qml'
85	--- tests/qmltests/tst_Shell.qml 2016-08-03 15:53:36 +0000
86	+++ tests/qmltests/tst_Shell.qml 2016-08-08 13:43:26 +0000
87	@@ -2429,6 +2429,15 @@
88	// verify the initial keymap of the newly started app is the first one from the list
89	tryCompare(appSurface, "keymap", "sk");
90
91	+ // try to create a prompt surface, verify it also has the same keymap
92	+ app.promptSurfaceList.createSurface();
93	+ var promptSurface = app.promptSurfaceList.get(0);
94	+ verify(promptSurface);
95	+ tryCompare(appSurface, "keymap", promptSurface.keymap);
96	+ // ... and that the controller's surface keymap is also the same
97	+ tryCompare(MirFocusController.focusedSurface, "keymap", "sk");
98	+ app.promptSurfaceList.get(0).close();
99	+
100	// switch to next keymap, should go to "cz+qwerty"
101	keyClick(Qt.Key_Space, Qt.MetaModifier);
102	tryCompare(appSurface, "keymap", "cz+qwerty");