ubuntu-system-settings

Merge lp:~attente/ubuntu-system-settings/enable-predictive-text into lp:ubuntu-system-settings

  1. enable-predictive-text
  2. Merge into trunk
Proposed by William Hua
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 439
Merged at revision: 557
Proposed branch: lp:~attente/ubuntu-system-settings/enable-predictive-text
Merge into: lp:ubuntu-system-settings
Diff against target: 57 lines (+1/-12)
1 file modified
plugins/language/PageComponent.qml (+1/-12)
To merge this branch: bzr merge lp:~attente/ubuntu-system-settings/enable-predictive-text
Reviewer Review Type Date Requested Status
Sebastien Bacher (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+189756@code.launchpad.net

Commit message

Enable auto-completion and predictive text settings.

Description of the change

Enable auto-completion and predictive text settings.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:436
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/447/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/447

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-system-settings-ci/447/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks, setting as "work in progress" though, the osk is behaving buggy more often that not here (I turn the options on, check in gsettings that it worked, go to the dash or the messaging app and type some text, and the option are not active in the osk).

Let's keep them out of that release since the backend they provide seems not reliable enough yet

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

PASSED: Continuous integration, rev:439
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/560/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/64
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/64/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/63

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/560/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

Ths OSK side improved, we should land that

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/language/PageComponent.qml'
2--- plugins/language/PageComponent.qml 2013-11-28 15:09:15 +0000
3+++ plugins/language/PageComponent.qml 2013-12-16 21:45:25 +0000
4@@ -72,12 +72,9 @@
5 }
6
7 ListItem.Divider {
8- visible: showAllUI
9 }
10
11 ListItem.SingleValue {
12- visible: showAllUI
13-
14 text: i18n.tr("Keyboard layouts")
15 value: plugin.keyboardLayoutsModel.subset.length == 1 ?
16 plugin.keyboardLayoutsModel.superset[plugin.keyboardLayoutsModel.subset[0]][0] :
17@@ -88,7 +85,6 @@
18 }
19
20 ListItem.Divider {
21- visible: showAllUI
22 }
23
24 ListItem.SingleValue {
25@@ -104,8 +100,6 @@
26 }
27
28 ListItem.Standard {
29- visible: showAllUI
30-
31 text: i18n.tr("Auto completion")
32
33 control: Switch {
34@@ -116,8 +110,6 @@
35 }
36
37 ListItem.Standard {
38- visible: showAllUI
39-
40 text: i18n.tr("Word suggestions")
41
42 control: Switch {
43@@ -144,13 +136,10 @@
44 text: i18n.tr("Turns on Shift to capitalize the first letter of each sentence.")
45 }
46
47- ListItem.Divider {
48- visible: showAllUI
49+ ListItem.ThinDivider {
50 }
51
52 ListItem.Standard {
53- visible: showAllUI
54-
55 text: i18n.tr("Keyboard sound")
56
57 control: Switch {

Subscribers

People subscribed via source and target branches