lp:~schwann/ubuntu-keyboard/keyboard-size-in-mir

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-keyboard at revision 105

Thomas Moenicke (community): Approve on 2013-11-06

PS Jenkins bot: Approve (continuous-integration) on 2013-11-06

Diff: 1716 lines (+558/-515)

30 files modified

qml/Keyboard.qml (+45/-13)
qml/KeyboardContainer.qml (+1/-0)
src/lib/logic/hitlogic.cpp (+0/-132)
src/lib/logic/hitlogic.h (+0/-62)
src/lib/logic/logic.pri (+0/-2)
src/plugin/inputmethod.cpp (+9/-14)
src/plugin/inputmethod.h (+0/-1)
src/plugin/inputmethod_p.h (+23/-18)
src/plugin/keyboardgeometry.cpp (+138/-0)
src/plugin/keyboardgeometry.h (+78/-0)
src/plugin/keyboardsettings.cpp (+15/-15)
src/plugin/keyboardsettings.h (+5/-5)
src/plugin/plugin.pro (+6/-6)
src/plugin/scenerectwatcher.cpp (+0/-91)
src/plugin/scenerectwatcher.h (+0/-54)
src/plugin/ubuntuapplicationapiwrapper.cpp (+37/-63)
src/plugin/ubuntuapplicationapiwrapper.h (+8/-20)
tests/unittests/unittests.pro (+1/-0)
tests/unittests/ut_editor/ut_editor.pro (+1/-1)
tests/unittests/ut_keyboardgeometry/ut_keyboardgeometry.cpp (+154/-0)
tests/unittests/ut_keyboardgeometry/ut_keyboardgeometry.pro (+19/-0)
tests/unittests/ut_keyboardsettings/ut_keyboardsettings.cpp (+3/-3)
tests/unittests/ut_keyboardsettings/ut_keyboardsettings.pro (+4/-4)
tests/unittests/ut_language-layout-loading/ut_language-layout-loading.pro (+1/-1)
tests/unittests/ut_language-layout-switching/ut_language-layout-switching.pro (+1/-1)
tests/unittests/ut_repeat-backspace/ut_repeat-backspace.pro (+1/-1)
tests/unittests/ut_text/ut_text.pro (+1/-1)
tests/unittests/ut_word-candidates/ut_word-candidates.pro (+1/-1)
tests/unittests/ut_wordengine/ut_wordengine.pro (+1/-1)
ubuntu-keyboard.pro (+5/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1245481: input trap not updated when changing settings to wordribbon enabled

High

Fix Released

Link a bug report

Related blueprints

105. By Günter Schwann on 2013-11-06

Fix using the OSK the first time

104. By Günter Schwann on 2013-11-06

Fix showing/hiding the word ribbon
Fix swiping away the keyboard

103. By Günter Schwann on 2013-11-06

Remove unneded line from pro file

102. By Günter Schwann on 2013-11-06

Add and update/fix unit test(s)

101. By Günter Schwann on 2013-11-05

Remove dead code

100. By Günter Schwann on 2013-11-05

Totally remove to set QML properties from C++

99. By Günter Schwann on 2013-11-05

Minor tweaks and fixes

98. By Günter Schwann on 2013-11-05

Trunk merged

97. By Günter Schwann on 2013-11-05

Set the keyboard geometry from QML to C++, not the other way around

96. By Christopher Lee on 2013-11-04

For ease of testing the ubuntu-keyboard testsuite takes care of restarting maliit-server with testability for the duration of the tests. Fixes: https://bugs.launchpad.net/bugs/1243444.

Approved by Thomas Moenicke, PS Jenkins bot.