Merge lp:~bfiller/address-book-app/disable-predictive-text into lp:address-book-app

Proposed by Bill Filler
Status: Merged
Approved by: Bill Filler
Approved revision: 122
Merged at revision: 121
Proposed branch: lp:~bfiller/address-book-app/disable-predictive-text
Merge into: lp:address-book-app
Diff against target: 242 lines (+41/-36)
4 files modified
po/address-book-app.pot (+38/-36)
src/imports/ContactEdit/ContactDetailAddressesEditor.qml (+1/-0)
src/imports/ContactEdit/ContactDetailNameEditor.qml (+1/-0)
src/imports/ContactEdit/ContactDetailOrganizationsEditor.qml (+1/-0)
To merge this branch: bzr merge lp:~bfiller/address-book-app/disable-predictive-text
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+202776@code.launchpad.net

Commit message

disable predictive text for some fields where it doesn't make sense

Description of the change

disable predictive text for some fields where it doesn't make sense

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

FAILED: Continuous integration, rev:119
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/357/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-amd64-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/67
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/67/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-i386-ci/67
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2537
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2348/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2215
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2539
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2539/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2349
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2349/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4791/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3275

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/357/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
120. By Bill Filler

merge from trunk

121. By Bill Filler

merge from trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
122. By Bill Filler

merge from trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:122
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/363/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-amd64-ci/73
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/73
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/73/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-i386-ci/73/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2608
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2399/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2277
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2610
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2610/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2400
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2400/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4839/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3345

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/363/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

jenkins finally passed, renato tested so approving

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'po/address-book-app.pot'
--- po/address-book-app.pot 2013-10-11 19:18:14 +0000
+++ po/address-book-app.pot 2014-01-24 19:42:47 +0000
@@ -1,5 +1,5 @@
1# SOME DESCRIPTIVE TITLE.1# SOME DESCRIPTIVE TITLE.
2# Copyright (C) 2013 Canonical Ltd.2# Copyright (C) YEAR Canonical Ltd.
3# This file is distributed under the same license as the PACKAGE package.3# This file is distributed under the same license as the PACKAGE package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5#5#
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: address-book-app\n"9"Project-Id-Version: address-book-app\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2013-10-11 16:16-0300\n"11"POT-Creation-Date: 2014-01-24 11:48-0500\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@
17"Content-Type: text/plain; charset=CHARSET\n"17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#: src/imports/ContactList/ContactListPage.qml:12220#: src/imports/ContactList/ContactListPage.qml:153
21msgid "Add"21msgid "Add"
22msgstr ""22msgstr ""
2323
@@ -26,17 +26,17 @@
26msgid "Address"26msgid "Address"
27msgstr ""27msgstr ""
2828
29#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:6129#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:63
30msgid "Aim"30msgid "Aim"
31msgstr ""31msgstr ""
3232
33#: src/imports/Ubuntu/Contacts/ContactListView.qml:11133#: src/imports/Ubuntu/Contacts/ContactListView.qml:115
34msgid "All contacts"34msgid "All contacts"
35msgstr ""35msgstr ""
3636
37#: src/imports/ContactEdit/ContactEditor.qml:32037#: src/imports/ContactEdit/ContactEditor.qml:347
38#: src/imports/ContactEdit/EditToolbar.qml:3638#: src/imports/ContactEdit/EditToolbar.qml:37
39#: src/imports/Ubuntu/Contacts/DialogButtons.qml:3639#: src/imports/Ubuntu/Contacts/DialogButtons.qml:37
40msgid "Cancel"40msgid "Cancel"
41msgstr ""41msgstr ""
4242
@@ -45,7 +45,7 @@
45msgstr ""45msgstr ""
4646
47#: data/address-book-app.desktop.in:6 data/address-book-app.desktop.in:747#: data/address-book-app.desktop.in:6 data/address-book-app.desktop.in:7
48#: src/imports/ContactList/ContactListPage.qml:4748#: src/imports/ContactList/ContactListPage.qml:53
49msgid "Contacts"49msgid "Contacts"
50msgstr ""50msgstr ""
5151
@@ -57,17 +57,18 @@
57msgid "Country"57msgid "Country"
58msgstr ""58msgstr ""
5959
60#: src/imports/ContactView/ContactView.qml:14960#: src/imports/ContactList/ContactListPage.qml:78
61#: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:23961#: src/imports/ContactView/ContactView.qml:157
62#: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245
62msgid "Delete"63msgid "Delete"
63msgstr ""64msgstr ""
6465
65#: src/imports/ContactEdit/EditToolbar.qml:5066#: src/imports/ContactEdit/EditToolbar.qml:52
66#: src/imports/Ubuntu/Contacts/DialogButtons.qml:5167#: src/imports/Ubuntu/Contacts/DialogButtons.qml:53
67msgid "Done"68msgid "Done"
68msgstr ""69msgstr ""
6970
70#: src/imports/ContactView/ContactView.qml:15971#: src/imports/ContactView/ContactView.qml:169
71msgid "Edit"72msgid "Edit"
72msgstr ""73msgstr ""
7374
@@ -90,33 +91,33 @@
90msgstr ""91msgstr ""
9192
92#: src/imports/ContactEdit/ContactFetchError.qml:2593#: src/imports/ContactEdit/ContactFetchError.qml:25
93#: src/imports/ContactList/ContactListPage.qml:5494#: src/imports/ContactList/ContactListPage.qml:60
94msgid "Error"95msgid "Error"
95msgstr ""96msgstr ""
9697
97#: src/imports/ContactList/ContactListPage.qml:5598#: src/imports/ContactList/ContactListPage.qml:61
98msgid "Fail to Load contacts"99msgid "Fail to Load contacts"
99msgstr ""100msgstr ""
100101
101#: src/imports/ContactView/ContactDetailPhoneNumbersView.qml:33102#: src/imports/ContactView/ContactDetailPhoneNumbersView.qml:33
102#: src/imports/ContactView/ContactDetailPhoneNumbersView.qml:42103#: src/imports/ContactView/ContactDetailPhoneNumbersView.qml:44
103msgid "Favorite"104msgid "Favorite"
104msgstr ""105msgstr ""
105106
106#: src/imports/Ubuntu/Contacts/ContactListView.qml:61107#: src/imports/Ubuntu/Contacts/ContactListView.qml:65
107msgid "Favourites"108msgid "Favourites"
108msgstr ""109msgstr ""
109110
110#: src/imports/ContactEdit/ContactDetailNameEditor.qml:77111#: src/imports/ContactEdit/ContactDetailNameEditor.qml:78
111msgid "First name"112msgid "First name"
112msgstr ""113msgstr ""
113114
114#: src/imports/Common/ContactDetailGroupWithTypeBase.qml:122115#: src/imports/Common/ContactDetailGroupWithTypeBase.qml:116
115#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:102116#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:95
116msgid "Home"117msgid "Home"
117msgstr ""118msgstr ""
118119
119#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:62120#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:64
120msgid "ICQ"121msgid "ICQ"
121msgstr ""122msgstr ""
122123
@@ -124,15 +125,15 @@
124msgid "IM"125msgid "IM"
125msgstr ""126msgstr ""
126127
127#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:64128#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:66
128msgid "Jabber"129msgid "Jabber"
129msgstr ""130msgstr ""
130131
131#: src/imports/ContactEdit/ContactDetailNameEditor.qml:77132#: src/imports/ContactEdit/ContactDetailNameEditor.qml:78
132msgid "Last name"133msgid "Last name"
133msgstr ""134msgstr ""
134135
135#: src/imports/ContactEdit/ContactDetailAvatarEditor.qml:77136#: src/imports/ContactEdit/ContactDetailAvatarEditor.qml:81
136msgid "Loading"137msgid "Loading"
137msgstr ""138msgstr ""
138139
@@ -140,11 +141,11 @@
140msgid "Locality"141msgid "Locality"
141msgstr ""142msgstr ""
142143
143#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:65144#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:67
144msgid "MSN"145msgid "MSN"
145msgstr ""146msgstr ""
146147
147#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:106148#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:99
148msgid "Mobile"149msgid "Mobile"
149msgstr ""150msgstr ""
150151
@@ -152,8 +153,8 @@
152msgid "Organization"153msgid "Organization"
153msgstr ""154msgstr ""
154155
155#: src/imports/Common/ContactDetailGroupWithTypeBase.qml:124156#: src/imports/Common/ContactDetailGroupWithTypeBase.qml:118
156#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:110157#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:103
157msgid "Other"158msgid "Other"
158msgstr ""159msgstr ""
159160
@@ -179,15 +180,16 @@
179msgid "Role"180msgid "Role"
180msgstr ""181msgstr ""
181182
182#: src/imports/ContactEdit/ContactEditor.qml:311183#: src/imports/ContactEdit/ContactEditor.qml:338
183msgid "Save"184msgid "Save"
184msgstr ""185msgstr ""
185186
186#: src/imports/ContactList/ContactListPage.qml:115187#: src/imports/ContactList/ContactListPage.qml:78
188#: src/imports/ContactList/ContactListPage.qml:145
187msgid "Select"189msgid "Select"
188msgstr ""190msgstr ""
189191
190#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:67192#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:69
191msgid "Skype"193msgid "Skype"
192msgstr ""194msgstr ""
193195
@@ -211,15 +213,15 @@
211msgid "View contact's profile"213msgid "View contact's profile"
212msgstr ""214msgstr ""
213215
214#: src/imports/Common/ContactDetailGroupWithTypeBase.qml:123216#: src/imports/Common/ContactDetailGroupWithTypeBase.qml:117
215#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:104217#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:97
216msgid "Work"218msgid "Work"
217msgstr ""219msgstr ""
218220
219#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:108221#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:101
220msgid "Work Mobile"222msgid "Work Mobile"
221msgstr ""223msgstr ""
222224
223#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:68225#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:70
224msgid "Yahoo"226msgid "Yahoo"
225msgstr ""227msgstr ""
226228
=== modified file 'src/imports/ContactEdit/ContactDetailAddressesEditor.qml'
--- src/imports/ContactEdit/ContactDetailAddressesEditor.qml 2013-08-28 17:06:38 +0000
+++ src/imports/ContactEdit/ContactDetailAddressesEditor.qml 2014-01-24 19:42:47 +0000
@@ -33,4 +33,5 @@
33 i18n.tr("Region"),33 i18n.tr("Region"),
34 i18n.tr("Post code"),34 i18n.tr("Post code"),
35 i18n.tr("Country") ]35 i18n.tr("Country") ]
36 inputMethodHints: Qt.ImhNoPredictiveText
36}37}
3738
=== modified file 'src/imports/ContactEdit/ContactDetailNameEditor.qml'
--- src/imports/ContactEdit/ContactDetailNameEditor.qml 2013-11-13 00:17:22 +0000
+++ src/imports/ContactEdit/ContactDetailNameEditor.qml 2014-01-24 19:42:47 +0000
@@ -76,6 +76,7 @@
76 detail: root.detail76 detail: root.detail
77 height: units.gu(4)77 height: units.gu(4)
78 placeholderText: field == QtContacts.Name.FirstName ? i18n.tr("First name") : i18n.tr("Last name")78 placeholderText: field == QtContacts.Name.FirstName ? i18n.tr("First name") : i18n.tr("Last name")
79 inputMethodHints: Qt.ImhNoPredictiveText
79 onTextChanged: checkIsEmpty()80 onTextChanged: checkIsEmpty()
80 onFieldChanged: checkIsEmpty()81 onFieldChanged: checkIsEmpty()
8182
8283
=== modified file 'src/imports/ContactEdit/ContactDetailOrganizationsEditor.qml'
--- src/imports/ContactEdit/ContactDetailOrganizationsEditor.qml 2013-09-18 14:10:33 +0000
+++ src/imports/ContactEdit/ContactDetailOrganizationsEditor.qml 2014-01-24 19:42:47 +0000
@@ -31,4 +31,5 @@
31 i18n.tr("Role"),31 i18n.tr("Role"),
32 i18n.tr("Title")32 i18n.tr("Title")
33 ]33 ]
34 inputMethodHints: Qt.ImhNoPredictiveText
34}35}

Subscribers

People subscribed via source and target branches