ubuntu-keyboard

Merge lp:~michael-sheldon/ubuntu-keyboard/preedit-style into lp:ubuntu-keyboard

  1. preedit-style
  2. Merge into trunk
Proposed by Michael Sheldon
Status: Merged
Approved by: Bill Filler
Approved revision: 190
Merged at revision: 193
Proposed branch: lp:~michael-sheldon/ubuntu-keyboard/preedit-style
Merge into: lp:ubuntu-keyboard
Diff against target: 21 lines (+2/-2)
1 file modified
src/lib/logic/wordengine.cpp (+2/-2)
To merge this branch: bzr merge lp:~michael-sheldon/ubuntu-keyboard/preedit-style
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+227895@code.launchpad.net

Commit message

Modify the pre-edit style to just underline text instead of making it bold and blue.

Description of the change

Modify the pre-edit style to just underline text instead of making it bold and blue.

To post a comment you must log in.
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

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

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * Yes

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:190
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/420/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/45
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/45/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/45

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

review: Approve (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

tested, works.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/lib/logic/wordengine.cpp'
2--- src/lib/logic/wordengine.cpp 2014-06-30 11:31:44 +0000
3+++ src/lib/logic/wordengine.cpp 2014-07-23 11:23:24 +0000
4@@ -261,7 +261,7 @@
5
6 Q_EMIT preeditFaceChanged(d->candidates->size() == 1 ? (d->correct_spelling ? Model::Text::PreeditDefault
7 : Model::Text::PreeditNoCandidates)
8- : Model::Text::PreeditActive);
9+ : Model::Text::PreeditDefault);
10 }
11
12 void WordEngine::newPredictionSuggestions(QStringList suggestions)
13@@ -286,7 +286,7 @@
14
15 Q_EMIT preeditFaceChanged(d->candidates->size() == 1 ? (d->correct_spelling ? Model::Text::PreeditDefault
16 : Model::Text::PreeditNoCandidates)
17- : Model::Text::PreeditActive);
18+ : Model::Text::PreeditDefault);
19 }
20
21 void WordEngine::addToUserDictionary(const QString &word)

Subscribers

People subscribed via source and target branches