diff -Nru address-book-app-0.2+14.04.20140321/debian/changelog address-book-app-0.2+14.04.20140325.2/debian/changelog --- address-book-app-0.2+14.04.20140321/debian/changelog 2014-03-26 15:06:13.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/debian/changelog 2014-03-26 15:06:13.000000000 +0000 @@ -1,3 +1,19 @@ +address-book-app (0.2+14.04.20140325.2-0ubuntu1) trusty; urgency=low + + [ Leo Arias ] + * Added an autopilot helper to fill the contact editor form. + + [ Renato Araujo Oliveira Filho ] + * Optimize contact loading. Use the same contact object retrieved on + contact list to show and edit. This save the use some queries and + make the ui more responsive. + * Optimize contact loading. *Use the same contact object retrieved on + contact list to show and edit. *Avoid go through all contacts to see + if the contact get remove. (Fix on QtPin was necessary) (LP: + #1276679) + + -- Ubuntu daily release Tue, 25 Mar 2014 13:35:41 +0000 + address-book-app (0.2+14.04.20140321-0ubuntu1) trusty; urgency=low [ Michael Sheldon ] diff -Nru address-book-app-0.2+14.04.20140321/po/ar.po address-book-app-0.2+14.04.20140325.2/po/ar.po --- address-book-app-0.2+14.04.20140321/po/ar.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/ar.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-01-22 19:09+0000\n" "Last-Translator: Ibrahim Saed \n" "Language-Team: Arabic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:18+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "إضافة" @@ -57,7 +57,7 @@ msgid "Country" msgstr "الدولة" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "حفظ" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "انتقاء" diff -Nru address-book-app-0.2+14.04.20140321/po/ast.po address-book-app-0.2+14.04.20140325.2/po/ast.po --- address-book-app-0.2+14.04.20140321/po/ast.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/ast.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-01-26 03:40+0000\n" "Last-Translator: Xuacu Saturio \n" "Language-Team: Asturian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:18+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "Amestar" @@ -57,7 +57,7 @@ msgid "Country" msgstr "País" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "" diff -Nru address-book-app-0.2+14.04.20140321/po/bg.po address-book-app-0.2+14.04.20140325.2/po/bg.po --- address-book-app-0.2+14.04.20140321/po/bg.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/bg.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-01-25 21:12+0000\n" "Last-Translator: Gangov \n" "Language-Team: Bulgarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:18+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "Добави" @@ -57,7 +57,7 @@ msgid "Country" msgstr "Държава" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "Съхрани" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "Избери" diff -Nru address-book-app-0.2+14.04.20140321/po/bn.po address-book-app-0.2+14.04.20140325.2/po/bn.po --- address-book-app-0.2+14.04.20140321/po/bn.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/bn.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-02-03 04:29+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Bengali \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:18+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "" @@ -57,7 +57,7 @@ msgid "Country" msgstr "" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "" diff -Nru address-book-app-0.2+14.04.20140321/po/br.po address-book-app-0.2+14.04.20140325.2/po/br.po --- address-book-app-0.2+14.04.20140321/po/br.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/br.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-03-11 07:41+0000\n" "Last-Translator: Fohanno Thierry \n" "Language-Team: Breton \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-12 05:31+0000\n" -"X-Generator: Launchpad (build 16963)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "Ouzhpennañ" @@ -57,7 +57,7 @@ msgid "Country" msgstr "Bro" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "Enrollañ" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "Diuzañ" diff -Nru address-book-app-0.2+14.04.20140321/po/ca.po address-book-app-0.2+14.04.20140325.2/po/ca.po --- address-book-app-0.2+14.04.20140321/po/ca.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/ca.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-01-14 23:31+0000\n" "Last-Translator: David Planella \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:18+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "Afegeix" @@ -57,7 +57,7 @@ msgid "Country" msgstr "País" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "Desa" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "Selecciona" diff -Nru address-book-app-0.2+14.04.20140321/po/ckb.po address-book-app-0.2+14.04.20140325.2/po/ckb.po --- address-book-app-0.2+14.04.20140321/po/ckb.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/ckb.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-01-15 01:39+0000\n" "Last-Translator: Hiwa \n" "Language-Team: Kurdish (Sorani) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:19+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:28+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "زیادكردن" @@ -57,7 +57,7 @@ msgid "Country" msgstr "وڵات" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "پاشەکەوت" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "هەڵبژێرە" diff -Nru address-book-app-0.2+14.04.20140321/po/cs.po address-book-app-0.2+14.04.20140325.2/po/cs.po --- address-book-app-0.2+14.04.20140321/po/cs.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/cs.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-01-14 20:34+0000\n" "Last-Translator: Tadeáš Pařík \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:18+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "Přidat" @@ -57,7 +57,7 @@ msgid "Country" msgstr "Země" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "Uložit" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "Vybrat" diff -Nru address-book-app-0.2+14.04.20140321/po/de.po address-book-app-0.2+14.04.20140325.2/po/de.po --- address-book-app-0.2+14.04.20140321/po/de.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/de.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-02-02 20:00+0000\n" "Last-Translator: Dennis Baudys \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:18+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "Hinzufügen" @@ -57,7 +57,7 @@ msgid "Country" msgstr "Land" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "Speichern" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "Auswählen" diff -Nru address-book-app-0.2+14.04.20140321/po/es.po address-book-app-0.2+14.04.20140325.2/po/es.po --- address-book-app-0.2+14.04.20140321/po/es.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/es.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-01-14 19:45+0000\n" "Last-Translator: Jose Luis Tirado \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:19+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "Añadir" @@ -57,7 +57,7 @@ msgid "Country" msgstr "País" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "Guardar" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "Seleccionar" diff -Nru address-book-app-0.2+14.04.20140321/po/fi.po address-book-app-0.2+14.04.20140325.2/po/fi.po --- address-book-app-0.2+14.04.20140321/po/fi.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/fi.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-01-20 21:52+0000\n" "Last-Translator: Aleksi Kinnunen \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:18+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "Lisää" @@ -57,7 +57,7 @@ msgid "Country" msgstr "Maa" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "Tallenna" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "Valitse" diff -Nru address-book-app-0.2+14.04.20140321/po/fr.po address-book-app-0.2+14.04.20140325.2/po/fr.po --- address-book-app-0.2+14.04.20140321/po/fr.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/fr.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-01-16 15:46+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:18+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "" @@ -57,7 +57,7 @@ msgid "Country" msgstr "" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "" diff -Nru address-book-app-0.2+14.04.20140321/po/gl.po address-book-app-0.2+14.04.20140325.2/po/gl.po --- address-book-app-0.2+14.04.20140321/po/gl.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/gl.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-01-16 08:34+0000\n" "Last-Translator: Marcos Lans \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:18+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "Engadir" @@ -57,7 +57,7 @@ msgid "Country" msgstr "País" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "Gardar" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "Seleccionar" diff -Nru address-book-app-0.2+14.04.20140321/po/he.po address-book-app-0.2+14.04.20140325.2/po/he.po --- address-book-app-0.2+14.04.20140321/po/he.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/he.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-01-15 08:22+0000\n" "Last-Translator: Yaron \n" "Language-Team: Hebrew \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:18+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "הוספה" @@ -57,7 +57,7 @@ msgid "Country" msgstr "מדינה" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "שמירה" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "בחירה" diff -Nru address-book-app-0.2+14.04.20140321/po/hr.po address-book-app-0.2+14.04.20140325.2/po/hr.po --- address-book-app-0.2+14.04.20140321/po/hr.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/hr.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-01-16 13:10+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:19+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "" @@ -57,7 +57,7 @@ msgid "Country" msgstr "" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "" diff -Nru address-book-app-0.2+14.04.20140321/po/hu.po address-book-app-0.2+14.04.20140325.2/po/hu.po --- address-book-app-0.2+14.04.20140321/po/hu.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/hu.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-01-14 21:52+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:18+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "" @@ -57,7 +57,7 @@ msgid "Country" msgstr "" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "" diff -Nru address-book-app-0.2+14.04.20140321/po/it.po address-book-app-0.2+14.04.20140325.2/po/it.po --- address-book-app-0.2+14.04.20140321/po/it.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/it.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-01-22 09:12+0000\n" "Last-Translator: Claudio Arseni \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:19+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "Aggiungi" @@ -57,7 +57,7 @@ msgid "Country" msgstr "Paese" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "Salva" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "Seleziona" diff -Nru address-book-app-0.2+14.04.20140321/po/ja.po address-book-app-0.2+14.04.20140325.2/po/ja.po --- address-book-app-0.2+14.04.20140321/po/ja.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/ja.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-01-18 15:11+0000\n" "Last-Translator: Shushi Kurose \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:19+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "追加" @@ -57,7 +57,7 @@ msgid "Country" msgstr "国" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "保存" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "選択" diff -Nru address-book-app-0.2+14.04.20140321/po/km.po address-book-app-0.2+14.04.20140325.2/po/km.po --- address-book-app-0.2+14.04.20140321/po/km.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/km.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-02-10 03:10+0000\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:19+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "បន្ថែម​" @@ -57,7 +57,7 @@ msgid "Country" msgstr "ប្រទេស" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "រក្សា​​ទុក​​" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "ជ្រើស" diff -Nru address-book-app-0.2+14.04.20140321/po/ms.po address-book-app-0.2+14.04.20140325.2/po/ms.po --- address-book-app-0.2+14.04.20140321/po/ms.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/ms.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-01-17 09:34+0000\n" "Last-Translator: abuyop \n" "Language-Team: Malay \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:19+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "Tambah" @@ -57,7 +57,7 @@ msgid "Country" msgstr "Negara" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "Simpan" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "Pilih" diff -Nru address-book-app-0.2+14.04.20140321/po/nl.po address-book-app-0.2+14.04.20140325.2/po/nl.po --- address-book-app-0.2+14.04.20140321/po/nl.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/nl.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-01-14 21:48+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:18+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "" @@ -57,7 +57,7 @@ msgid "Country" msgstr "" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "" diff -Nru address-book-app-0.2+14.04.20140321/po/pt_BR.po address-book-app-0.2+14.04.20140325.2/po/pt_BR.po --- address-book-app-0.2+14.04.20140321/po/pt_BR.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/pt_BR.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-02-05 12:23+0000\n" "Last-Translator: Pablo Diego Moço \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:19+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:28+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "Adicionar" @@ -57,7 +57,7 @@ msgid "Country" msgstr "País" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "Salvar" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "Selecionar" diff -Nru address-book-app-0.2+14.04.20140321/po/ru.po address-book-app-0.2+14.04.20140325.2/po/ru.po --- address-book-app-0.2+14.04.20140321/po/ru.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/ru.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-01-26 15:51+0000\n" "Last-Translator: Zonov Roman \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:19+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "Добавить" @@ -57,7 +57,7 @@ msgid "Country" msgstr "Страна" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "Сохранить" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "Выбрать" diff -Nru address-book-app-0.2+14.04.20140321/po/sl.po address-book-app-0.2+14.04.20140325.2/po/sl.po --- address-book-app-0.2+14.04.20140321/po/sl.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/sl.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-01-16 07:23+0000\n" "Last-Translator: Damir Jerovšek \n" "Language-Team: Slovenian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:19+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "Dodaj" @@ -57,7 +57,7 @@ msgid "Country" msgstr "Država" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "Shrani" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "Izberi" diff -Nru address-book-app-0.2+14.04.20140321/po/ta.po address-book-app-0.2+14.04.20140325.2/po/ta.po --- address-book-app-0.2+14.04.20140321/po/ta.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/ta.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-01-14 19:48+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Tamil \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:19+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "" @@ -57,7 +57,7 @@ msgid "Country" msgstr "" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "" diff -Nru address-book-app-0.2+14.04.20140321/po/tr.po address-book-app-0.2+14.04.20140325.2/po/tr.po --- address-book-app-0.2+14.04.20140321/po/tr.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/tr.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-01-14 19:20+0000\n" "Last-Translator: Volkan Gezer \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:19+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "Ekle" @@ -57,7 +57,7 @@ msgid "Country" msgstr "Ülke" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "Kaydet" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "Seç" diff -Nru address-book-app-0.2+14.04.20140321/po/ug.po address-book-app-0.2+14.04.20140325.2/po/ug.po --- address-book-app-0.2+14.04.20140321/po/ug.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/ug.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-02-08 14:17+0000\n" "Last-Translator: omarjan \n" "Language-Team: Uyghur \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:19+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "قوش" @@ -57,7 +57,7 @@ msgid "Country" msgstr "دۆلەت" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "ساقلا" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "تاللا" diff -Nru address-book-app-0.2+14.04.20140321/po/uk.po address-book-app-0.2+14.04.20140325.2/po/uk.po --- address-book-app-0.2+14.04.20140321/po/uk.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/uk.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-01-14 20:50+0000\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:19+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "Додати" @@ -57,7 +57,7 @@ msgid "Country" msgstr "Країна" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "Зберегти" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "Вибрати" diff -Nru address-book-app-0.2+14.04.20140321/po/zh_HK.po address-book-app-0.2+14.04.20140325.2/po/zh_HK.po --- address-book-app-0.2+14.04.20140321/po/zh_HK.po 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/po/zh_HK.po 2014-03-25 13:35:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: address-book-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-24 11:48-0500\n" +"POT-Creation-Date: 2014-03-12 14:11+0000\n" "PO-Revision-Date: 2014-01-26 08:31+0000\n" "Last-Translator: Daniel Cheung \n" "Language-Team: Chinese (Hong Kong) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:19+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:27+0000\n" +"X-Generator: Launchpad (build 16967)\n" -#: src/imports/ContactList/ContactListPage.qml:153 +#: src/imports/ContactList/ContactListPage.qml:152 msgid "Add" msgstr "新增" @@ -57,7 +57,7 @@ msgid "Country" msgstr "國家" -#: src/imports/ContactList/ContactListPage.qml:78 +#: src/imports/ContactList/ContactListPage.qml:77 #: src/imports/ContactView/ContactView.qml:157 #: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245 msgid "Delete" @@ -184,8 +184,8 @@ msgid "Save" msgstr "儲存" -#: src/imports/ContactList/ContactListPage.qml:78 -#: src/imports/ContactList/ContactListPage.qml:145 +#: src/imports/ContactList/ContactListPage.qml:77 +#: src/imports/ContactList/ContactListPage.qml:144 msgid "Select" msgstr "選擇" diff -Nru address-book-app-0.2+14.04.20140321/src/imports/Common/ContactDetailGroupBase.qml address-book-app-0.2+14.04.20140325.2/src/imports/Common/ContactDetailGroupBase.qml --- address-book-app-0.2+14.04.20140321/src/imports/Common/ContactDetailGroupBase.qml 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/src/imports/Common/ContactDetailGroupBase.qml 2014-03-25 13:35:29.000000000 +0000 @@ -21,7 +21,7 @@ FocusScope { id: root - readonly property variant details: contact && contact.contactDetails && detailType ? contact.details(detailType) : [] + property var details: [] readonly property alias detailDelegates: contents.children readonly property int detailsCount: detailsModel.count @@ -38,7 +38,27 @@ signal newFieldAdded(var index) - implicitHeight: detailsModel.values.length > 0 ? contents.implicitHeight : minimumHeight + function reloadDetails(clearFields) + { + if (clearFields) { + root.inputFields = [] + } + + if (contact && detailType) { + root.details = contact.details(detailType) + } else { + root.details = [] + } + } + + onContactChanged: reloadDetails(true) + onDetailTypeChanged: reloadDetails(true) + Connections { + target: root.contact + onContactChanged: reloadDetails(false) + } + + implicitHeight: detailsCount > 0 ? contents.implicitHeight : minimumHeight visible: implicitHeight > 0 // This model is used to avoid rebuild the repeater every time that the details change @@ -46,7 +66,7 @@ ListModel { id: detailsModel - property var values: root.showEmpty ? root.details : filterDetails(root.details) + property var values: root.showEmpty && root.details ? root.details : filterDetails(root.details) function filterDetails(details) { var result = [] @@ -68,6 +88,7 @@ onValuesChanged: { if (!values) { + root.inputFields = [] clear() return } @@ -78,7 +99,7 @@ var modelCount = count for(var i=0; i < values.length; i++) { - if (modelCount < i) { + if (modelCount <= i) { append({"detail": values[i]}) } else if (get(i) != values[i]) { set(i, {"detail": values[i]}) @@ -112,7 +133,7 @@ Binding { target: detailItem.item property: "detail" - value: root.contact && root.details ? root.details[index] : null + value: model.detail } Binding { diff -Nru address-book-app-0.2+14.04.20140321/src/imports/Common/ContactDetailGroupWithTypeBase.qml address-book-app-0.2+14.04.20140325.2/src/imports/Common/ContactDetailGroupWithTypeBase.qml --- address-book-app-0.2+14.04.20140321/src/imports/Common/ContactDetailGroupWithTypeBase.qml 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/src/imports/Common/ContactDetailGroupWithTypeBase.qml 2014-03-25 13:35:11.000000000 +0000 @@ -23,6 +23,7 @@ property string defaultIcon : "artwork:/protocol-other.png" property ListModel typeModel + property bool typeModelReady: false function getType(detail) { if (typeModel) { @@ -40,7 +41,6 @@ } typeModel: ListModel { - property bool ready: false signal loaded() function getTypeIndex(detail) { @@ -116,8 +116,12 @@ append({"value": QtContacts.ContactDetail.ContextHome, "label": i18n.tr("Home"), "icon": null}) append({"value": QtContacts.ContactDetail.ContextWork, "label": i18n.tr("Work"), "icon": null}) append({"value": QtContacts.ContactDetail.ContextOther, "label": i18n.tr("Other"), "icon": null}) - ready = true loaded() } } + onTypeModelChanged: root.typeModelReady = false + Connections { + target: root.typeModel + onLoaded: root.typeModelReady = true + } } diff -Nru address-book-app-0.2+14.04.20140321/src/imports/ContactEdit/ContactDetailAvatarEditor.qml address-book-app-0.2+14.04.20140325.2/src/imports/ContactEdit/ContactDetailAvatarEditor.qml --- address-book-app-0.2+14.04.20140321/src/imports/ContactEdit/ContactDetailAvatarEditor.qml 2014-03-21 00:35:39.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/src/imports/ContactEdit/ContactDetailAvatarEditor.qml 2014-03-25 13:35:29.000000000 +0000 @@ -27,6 +27,10 @@ readonly property string defaultAvatar: Qt.resolvedUrl("../../artwork/contact-default-profile.png") + function isEmpty() { + return false; + } + function save() { if (avatarImage.source != root.defaultAvatar) { if (root.detail && (root.detail === avatarImage.source)) { diff -Nru address-book-app-0.2+14.04.20140321/src/imports/ContactEdit/ContactDetailGroupWithTypeEditor.qml address-book-app-0.2+14.04.20140325.2/src/imports/ContactEdit/ContactDetailGroupWithTypeEditor.qml --- address-book-app-0.2+14.04.20140321/src/imports/ContactEdit/ContactDetailGroupWithTypeEditor.qml 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/src/imports/ContactEdit/ContactDetailGroupWithTypeEditor.qml 2014-03-25 13:35:29.000000000 +0000 @@ -40,6 +40,7 @@ function save() { var changed = false + var removedDetails = [] for(var i=0; i < detailDelegates.length; i++) { var delegate = detailDelegates[i] @@ -49,17 +50,30 @@ } if (delegate.save) { - // save type - if (updateDetail(delegate.detail, delegate.selectedTypeIndex)) { + // check if was removed + if (delegate.isEmpty()) { + removedDetails.push(delegate.detail) changed = true - } + } else { + if (updateDetail(delegate.detail, delegate.selectedTypeIndex)) { + changed = true + } - // save fields - if (delegate.save()) { - changed = true + // save field changes + if (delegate.save()) { + changed = true + } } } } + + for(var i=0; i < removedDetails.length; i++) { + if (contact.isPreferredDetail("TEL", removedDetails[i])) { + contact.favorite.favorite = false + } + contact.removeDetail(removedDetails[i]) + } + return changed } @@ -146,7 +160,6 @@ } } } - placeholderTexts: root.placeholderTexts contact: root.contact fields: root.fields @@ -161,7 +174,7 @@ Item { Connections { target: root.typeModel - onReadyChanged: updateCombo(true) + onLoaded: updateCombo(true) } } } diff -Nru address-book-app-0.2+14.04.20140321/src/imports/ContactEdit/ContactDetailNameEditor.qml address-book-app-0.2+14.04.20140325.2/src/imports/ContactEdit/ContactDetailNameEditor.qml --- address-book-app-0.2+14.04.20140321/src/imports/ContactEdit/ContactDetailNameEditor.qml 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/src/imports/ContactEdit/ContactDetailNameEditor.qml 2014-03-25 13:35:29.000000000 +0000 @@ -26,6 +26,10 @@ property bool isEmpty: (fields == -1) || (emptyFields.length === fields.length) property variant emptyFields: [] + function isEmpty() { + return false + } + function save() { var changed = false; diff -Nru address-book-app-0.2+14.04.20140321/src/imports/ContactEdit/ContactDetailWithTypeEditor.qml address-book-app-0.2+14.04.20140325.2/src/imports/ContactEdit/ContactDetailWithTypeEditor.qml --- address-book-app-0.2+14.04.20140321/src/imports/ContactEdit/ContactDetailWithTypeEditor.qml 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/src/imports/ContactEdit/ContactDetailWithTypeEditor.qml 2014-03-25 13:35:29.000000000 +0000 @@ -36,33 +36,32 @@ detailTypeSelector.selectItem(type) } + function isEmpty() { + for (var i=0; i < fieldValues.children.length; i++) { + var input = fieldValues.children[i] + if (input.text && (input.text !== "")) { + return false + } + } + return true + } + function save() { var detailchanged = false // save field values - var isEmpty = true for (var i=0; i < fieldValues.children.length; i++) { var input = fieldValues.children[i] if (input.detail && (input.field >= 0)) { - var originalValue = input.detail.value(input.field) - originalValue = originalValue ? String(originalValue) : "" if (input.text !== "") { - isEmpty = false + var originalValue = input.detail.value(input.field) + originalValue = originalValue ? String(originalValue) : "" + if (originalValue !== input.text) { + root.detail.setValue(input.field, input.text) + detailchanged = true + } } - - if (originalValue !== input.text) { - input.detail.setValue(input.field, input.text) - detailchanged = true - } - } - } - - if (isEmpty) { - // unfavorite the contact if the favorite number was removed - if (contact.isPreferredDetail("TEL", detail)) { - contact.favorite.favorite = false } - contact.removeDetail(input.detail) } return detailchanged diff -Nru address-book-app-0.2+14.04.20140321/src/imports/ContactEdit/ContactEditor.qml address-book-app-0.2+14.04.20140325.2/src/imports/ContactEdit/ContactEditor.qml --- address-book-app-0.2+14.04.20140321/src/imports/ContactEdit/ContactEditor.qml 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/src/imports/ContactEdit/ContactEditor.qml 2014-03-25 13:35:29.000000000 +0000 @@ -19,16 +19,16 @@ import Ubuntu.Components 0.1 import Ubuntu.Components.ListItems 0.1 as ListItem import Ubuntu.Components.Popups 0.1 +import Ubuntu.Contacts 0.1 as ContactsUI Page { id: contactEditor objectName: "contactEditorPage" property QtObject contact: null - property QtObject model: null + property alias model: contactFetch.model // this is used to add a phone number to a existing contact - property int currentFetchOperation: -1 property string contactId: "" property string newPhoneNumber: "" @@ -78,10 +78,10 @@ } if (changed) { - model.saveContact(contact) - } else { - pageStack.pop() + // backend error will be handled by the root page (contact list) + contactEditor.model.saveContact(contact) } + pageStack.pop() } function makeMeVisible(item) { @@ -114,38 +114,14 @@ id: fetchErrorDialog } - Connections { - target: model - onContactsFetched: { - if (requestId == currentFetchOperation) { - currentFetchOperation = -1 - // this fetch request can only return one contact - if(fetchedContacts.length !== 1) { - PopupUtils.open(fetchErrorDialog, null) - } - contact = fetchedContacts[0] - } - } - } - - onContactIdChanged: { - if (contactId) { - currentFetchOperation = model.fetchContacts(contactId) - } - } - - onContactChanged: { - if (contact && (newPhoneNumber.length > 0)) { - var detailSourceTemplate = "import QtContacts 5.0; PhoneNumber{ number: \"" + newPhoneNumber + "\" }" - var newDetail = Qt.createQmlObject(detailSourceTemplate, contactEditor) - if (newDetail) { - contact.addDetail(newDetail) - // we need to wait for the field be created - focusTimer.restart() + ContactsUI.ContactFetch { + id: contactFetch + onContactNotFound: PopupUtils.open(fetchErrorDialog, null) + onContactFetched: { + if (contactEditor.contact == null) { + contactEditor.contact = contact } - newPhoneNumber = "" - } } @@ -176,7 +152,6 @@ } contentHeight: contents.height contentWidth: parent.width - visible: !busyIndicator.visible // after add a new field we need to wait for the contentHeight to change to scroll to the correct position onContentHeightChanged: contactEditor.makeMeVisible(contactEditor.activeItem) @@ -286,46 +261,6 @@ } } - Component.onCompleted: nameEditor.forceActiveFocus() - - ActivityIndicator { - id: busyIndicator - - running: contactSaveLock.saving - visible: running - anchors.centerIn: parent - } - - Connections { - id: contactSaveLock - - property bool saving: false - - target: contactEditor.model - - onContactsChanged: { - if (saving) { - saving = false - pageStack.contactCreated(contactEditor.contact) - pageStack.pop() - } else if (contactEditor.contact && - (contactEditor.contact.contactId != "qtcontacts:::")) { - for (var i=0; i < contactEditor.model.contacts.length; i++) { - if (contactEditor.model.contacts[i].contactId == contactEditor.contact.contactId) { - return - } - } - contactEditor.contact = null - pageStack.pop() - } - } - - onErrorChanged: { - //TODO: show a dialog - console.debug("Save error:" + contactEditor.model.error) - } - } - EditToolbar { id: toolbar anchors { @@ -337,11 +272,7 @@ acceptAction: Action { text: i18n.tr("Save") enabled: !nameEditor.isEmpty - onTriggered: { - // wait for contact to be saved or cause a error - contactSaveLock.saving = true - contactEditor.save() - } + onTriggered: contactEditor.save() } rejectAction: Action { text: i18n.tr("Cancel") @@ -358,4 +289,26 @@ } } } + + // This will load the contact information and add the new phone number + // when the app was launched with the URI: addressbook:///addphone?id=&phone= + onContactChanged: { + if (contact && (newPhoneNumber.length > 0)) { + var detailSourceTemplate = "import QtContacts 5.0; PhoneNumber{ number: \"" + newPhoneNumber + "\" }" + var newDetail = Qt.createQmlObject(detailSourceTemplate, contactEditor) + if (newDetail) { + contact.addDetail(newDetail) + // we need to wait for the field be created + focusTimer.restart() + } + newPhoneNumber = "" + } + } + + Component.onCompleted: { + if (contactId !== "") { + contactFetch.fetchContact(contactId) + } + nameEditor.forceActiveFocus() + } } diff -Nru address-book-app-0.2+14.04.20140321/src/imports/ContactList/ContactListPage.qml address-book-app-0.2+14.04.20140325.2/src/imports/ContactList/ContactListPage.qml --- address-book-app-0.2+14.04.20140321/src/imports/ContactList/ContactListPage.qml 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/src/imports/ContactList/ContactListPage.qml 2014-03-25 13:35:29.000000000 +0000 @@ -17,7 +17,6 @@ import QtQuick 2.0 import Ubuntu.Components 0.1 import Ubuntu.Components.ListItems 0.1 as ListItem -import Ubuntu.Components.Popups 0.1 as Popups import Ubuntu.Contacts 0.1 as ContactsUI import QtContacts 5.0 @@ -48,25 +47,7 @@ return newContact } - - title: i18n.tr("Contacts") - Component { - id: dialog - - Popups.Dialog { - id: dialogue - - title: i18n.tr("Error") - text: i18n.tr("Fail to Load contacts") - - Button { - text: "Cancel" - gradient: UbuntuColors.greyGradient - onClicked: PopupUtils.close(dialogue) - } - } - } ContactsUI.ContactListView { id: contactList @@ -83,7 +64,6 @@ bottomMargin: contactList.isInSelectionMode ? 0 : units.gu(2) fill: parent } - onError: PopupUtils.open(dialog, null) swipeToDelete: !pickMode ActivityIndicator { @@ -96,7 +76,8 @@ onContactClicked: { pageStack.push(Qt.resolvedUrl("../ContactView/ContactView.qml"), - {model: contactList.listModel, contactId: contact.contactId}) + {model: contactList.listModel, + contact: contact}) } onSelectionDone: { @@ -116,6 +97,7 @@ contactList.listModel.removeContacts(ids) } } + onSelectionCanceled: { if (pickMode) { if (contactContentHub) { @@ -131,6 +113,8 @@ toolbar.opened = false } } + + onError: pageStack.contactModelError(error) } tools: ToolbarItems { @@ -159,6 +143,12 @@ } } + // WORKAROUND: Avoid the gap btw the header and the contact list when the list moves + // see bug #1296764 + onActiveChanged: { + contactList.returnToBounds() + } + Connections { target: pageStack onContactRequested: { diff -Nru address-book-app-0.2+14.04.20140321/src/imports/ContactView/ContactDetailAvatarView.qml address-book-app-0.2+14.04.20140325.2/src/imports/ContactView/ContactDetailAvatarView.qml --- address-book-app-0.2+14.04.20140321/src/imports/ContactView/ContactDetailAvatarView.qml 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/src/imports/ContactView/ContactDetailAvatarView.qml 2014-03-25 13:35:29.000000000 +0000 @@ -23,10 +23,12 @@ ContactDetailBase { id: root + readonly property string defaultAvatar: Qt.resolvedUrl("../../artwork/contact-default-profile.png") + function getAvatar(avatarDetail) { // use this verbose mode to avoid problems with binding loops - var avatarUrl = Qt.resolvedUrl("../../artwork/contact-default-profile.png") + var avatarUrl = defaultAvatar if (avatarDetail) { var avatarValue = avatarDetail.value(Avatar.ImageUrl) if (avatarValue != "") { @@ -39,11 +41,43 @@ detail: contact ? contact.detail(ContactDetail.Avatar) : null implicitHeight: units.gu(17) + // update the contact detail in case of the contact change + Connections { + target: root.contact + onContactChanged: { + if (root.contact) { + root.detail = contact.detail(ContactDetail.Avatar) + } else { + root.detail = null + } + } + } + + onDetailChanged: updateAvatar.restart() + + // Wait some milliseconds before update the avatar, in some cases the avatac get update later and this cause the image flick + Timer { + id: updateAvatar + + interval: 100 + running: false + repeat: false + onTriggered: { + if (root.detail && contact) { + avatar.source = root.getAvatar(root.detail) + } else { + avatar.source = root.defaultAvatar + } + } + } + Image { + id: avatar + anchors.fill: parent - source: root.getAvatar(root.detail) asynchronous: true smooth: true + source: root.defaultAvatar fillMode: Image.PreserveAspectCrop } } diff -Nru address-book-app-0.2+14.04.20140321/src/imports/ContactView/ContactDetailGroupWithTypeView.qml address-book-app-0.2+14.04.20140325.2/src/imports/ContactView/ContactDetailGroupWithTypeView.qml --- address-book-app-0.2+14.04.20140321/src/imports/ContactView/ContactDetailGroupWithTypeView.qml 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/src/imports/ContactView/ContactDetailGroupWithTypeView.qml 2014-03-25 13:35:11.000000000 +0000 @@ -51,7 +51,7 @@ } detailDelegate: ContactDetailWithTypeView { - property variant detailType: detail && root.contact && root.typeModel.ready ? root.getType(detail) : null + property variant detailType: detail && root.contact && root.typeModelReady ? root.getType(detail) : "" action: root.defaultAction contact: root.contact diff -Nru address-book-app-0.2+14.04.20140321/src/imports/ContactView/ContactDetailPhoneNumbersView.qml address-book-app-0.2+14.04.20140325.2/src/imports/ContactView/ContactDetailPhoneNumbersView.qml --- address-book-app-0.2+14.04.20140321/src/imports/ContactView/ContactDetailPhoneNumbersView.qml 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/src/imports/ContactView/ContactDetailPhoneNumbersView.qml 2014-03-25 13:35:11.000000000 +0000 @@ -35,7 +35,7 @@ } detailDelegate: ContactDetailPhoneNumberView { - property variant detailType: detail && root.contact && root.typeModel.ready ? root.getType(detail) : null + property variant detailType: detail && root.contact && root.typeModelReady ? root.getType(detail) : null contact: root.contact fields: root.fields diff -Nru address-book-app-0.2+14.04.20140321/src/imports/ContactView/ContactDetailPhoneNumberView.qml address-book-app-0.2+14.04.20140325.2/src/imports/ContactView/ContactDetailPhoneNumberView.qml --- address-book-app-0.2+14.04.20140321/src/imports/ContactView/ContactDetailPhoneNumberView.qml 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/src/imports/ContactView/ContactDetailPhoneNumberView.qml 2014-03-25 13:35:29.000000000 +0000 @@ -25,10 +25,11 @@ property alias typeLabel: view.typeLabel property alias lineHeight: view.lineHeight + readonly property bool isReady: (fields != null) && (detail != null) function populateValues() { - if (fields && detail) { + if (isReady) { var values = [] for(var i=0; i < fields.length; i++) { values.push(detail.value(fields[i])) @@ -38,8 +39,11 @@ } implicitHeight: view.implicitHeight - onFieldsChanged: populateValues() - onDetailChanged: populateValues() + onIsReadyChanged: populateValues() + Connections { + target: root.detail + onDetailChanged: populateValues() + } BasicFieldView { id: view diff -Nru address-book-app-0.2+14.04.20140321/src/imports/ContactView/ContactDetailWithTypeView.qml address-book-app-0.2+14.04.20140325.2/src/imports/ContactView/ContactDetailWithTypeView.qml --- address-book-app-0.2+14.04.20140321/src/imports/ContactView/ContactDetailWithTypeView.qml 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/src/imports/ContactView/ContactDetailWithTypeView.qml 2014-03-25 13:35:29.000000000 +0000 @@ -27,10 +27,11 @@ property alias typeLabel: view.typeLabel property string typeIcon: null property alias lineHeight: view.lineHeight + readonly property bool isReady: (fields != null) && (detail != null) function populateValues() { - if (fields && detail) { + if (isReady) { var values = [] for(var i=0; i < fields.length; i++) { values.push(detail.value(fields[i])) @@ -39,9 +40,12 @@ } } - onFieldsChanged: populateValues() - onDetailChanged: populateValues() implicitHeight: view.implicitHeight + onIsReadyChanged: populateValues() + Connections { + target: root.detail + onDetailChanged: populateValues() + } BasicFieldView { id: view diff -Nru address-book-app-0.2+14.04.20140321/src/imports/ContactView/ContactView.qml address-book-app-0.2+14.04.20140325.2/src/imports/ContactView/ContactView.qml --- address-book-app-0.2+14.04.20140321/src/imports/ContactView/ContactView.qml 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/src/imports/ContactView/ContactView.qml 2014-03-25 13:35:29.000000000 +0000 @@ -24,15 +24,15 @@ id: root objectName: "contactViewPage" - readonly property alias contact: contactFetch.contact - property variant contactId: null + property QtObject contact: null property alias model: contactFetch.model + // used by main page to open the contact view on app startup + property string contactId: "" function formatNameToDisplay(contact) { if (!contact) { return "" } - if (contact.name) { var detail = contact.name return detail.firstName +" " + detail.lastName @@ -43,14 +43,10 @@ } } - title: formatNameToDisplay(contact) onActiveChanged: { if (active) { - contactFetch.fetchContact(root.contactId) - //WORKAROUND: to correct scroll back the page - flickable.contentY = -100 flickable.returnToBounds() } } @@ -141,14 +137,13 @@ } height: implicitHeight } - } } ActivityIndicator { id: busyIndicator - running: contactFetch.running + running: (root.contact === null) && contactFetch.running visible: running anchors.centerIn: parent } @@ -156,7 +151,17 @@ ContactsUI.ContactFetch { id: contactFetch - onContactRemoved: pageStack.pop() + onContactRemoved: { + pageStack.pop() + } + + onContactNotFound: { + pageStack.pop() + } + + onContactFetched: { + root.contact = contact + } } tools: ToolbarItems { @@ -185,4 +190,12 @@ } } } + + // This will load the contact information when the app was launched with + // the URI: addressbook:///contact?id= + Component.onCompleted: { + if (contactId !== "") { + contactFetch.fetchContact(contactId) + } + } } diff -Nru address-book-app-0.2+14.04.20140321/src/imports/MainWindow.qml address-book-app-0.2+14.04.20140325.2/src/imports/MainWindow.qml --- address-book-app-0.2+14.04.20140321/src/imports/MainWindow.qml 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/src/imports/MainWindow.qml 2014-03-25 13:35:11.000000000 +0000 @@ -17,10 +17,13 @@ import QtQuick 2.0 import QtContacts 5.0 import Ubuntu.Components 0.1 +import Ubuntu.Components.Popups 0.1 as Popups MainView { id: mainWindow + property string modelErrorMessage: "" + width: units.gu(40) height: units.gu(71) anchorToKeyboard: false @@ -59,6 +62,7 @@ signal createContactRequested(string phoneNumber) signal editContatRequested(string contactId, string phoneNumber) signal contactCreated(QtObject contact) + signal contactModelError(string errorMessage) anchors { fill: parent @@ -69,6 +73,11 @@ } } } + + onContactModelError: { + modelErrorMessage = errorMessage + PopupUtils.open(errorDialog, null) + } } Component.onCompleted: { @@ -76,6 +85,23 @@ mainWindow.applicationReady() } + Component { + id: errorDialog + + Popups.Dialog { + id: dialogue + + title: i18n.tr("Error") + text: mainWindow.modelErrorMessage + + Button { + text: "Cancel" + gradient: UbuntuColors.greyGradient + onClicked: PopupUtils.close(dialogue) + } + } + } + Connections { target: UriHandler onOpened: { diff -Nru address-book-app-0.2+14.04.20140321/src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml address-book-app-0.2+14.04.20140325.2/src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml --- address-book-app-0.2+14.04.20140321/src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml 2014-03-25 13:35:11.000000000 +0000 @@ -20,8 +20,6 @@ ListModel { id: typeModel - property bool ready: false - signal loaded() function getTypeIndex(detail) { @@ -69,6 +67,5 @@ /*4*/ append({"value": 7, "label": i18n.tr("Skype"), "icon": "artwork:/protocol-skype.svg"}) /*5*/ append({"value": 8, "label": i18n.tr("Yahoo"), "icon": "artwork:/protocol-yahoo.svg"}) loaded() - ready = true } } diff -Nru address-book-app-0.2+14.04.20140321/src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml address-book-app-0.2+14.04.20140325.2/src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml --- address-book-app-0.2+14.04.20140321/src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml 2014-03-25 13:35:11.000000000 +0000 @@ -20,7 +20,6 @@ ListModel { id: typeModel - property bool ready: false signal loaded() function getTypeIndex(detail) { @@ -103,6 +102,5 @@ append({"value": "Other", "label": i18n.tr("Other"), "icon": null, "context": QtContacts.ContactDetail.ContextOther, "subType": QtContacts.PhoneNumber.Landline }) loaded() - ready = true } } diff -Nru address-book-app-0.2+14.04.20140321/src/imports/Ubuntu/Contacts/ContactFetch.qml address-book-app-0.2+14.04.20140325.2/src/imports/Ubuntu/Contacts/ContactFetch.qml --- address-book-app-0.2+14.04.20140321/src/imports/Ubuntu/Contacts/ContactFetch.qml 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/src/imports/Ubuntu/Contacts/ContactFetch.qml 2014-03-25 13:35:29.000000000 +0000 @@ -19,9 +19,11 @@ Item { id: root + readonly property alias contact: connections.contact + readonly property alias contactId: connections.contactId property alias model: connections.target + property bool running: false - property QtObject contact: null property bool contactIsDirty: false property string _pendingId: "" @@ -29,6 +31,7 @@ signal contactFetched(QtObject contact) signal contactRemoved() + signal contactNotFound() function fetchContact(contactId) { if (root._ready) { @@ -58,20 +61,9 @@ } } - Connections { - target: root.model - - onContactsChanged: { - if (root.contact) { - root.contactIsDirty = true - - for (var i=0; i < root.model.contacts.length; i++) { - if (root.model.contacts[i].contactId == root.contact.contactId) { - return - } - } - contactRemoved() - } + onContactChanged: { + if (contact == null) { + contactRemoved() } } @@ -79,6 +71,8 @@ id: connections property int currentQueryId: -1 + property QtObject contact: null + property string contactId: contact ? contact.contactId : "" onContactsFetched: { // currentQueryId == -2 is used during a fetch using "memory" manager @@ -86,8 +80,12 @@ root.contactIsDirty = false root.running = false currentQueryId = -1 - root.contact = fetchedContacts[0] - root.contactFetched(fetchedContacts[0]) + if (fetchedContacts.length > 0) { + contact = fetchedContacts[0] + root.contactFetched(fetchedContacts[0]) + } else { + contactNotFound() + } } } } diff -Nru address-book-app-0.2+14.04.20140321/tests/autopilot/address_book_app/emulators/main_window.py address-book-app-0.2+14.04.20140325.2/tests/autopilot/address_book_app/emulators/main_window.py --- address-book-app-0.2+14.04.20140321/tests/autopilot/address_book_app/emulators/main_window.py 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/tests/autopilot/address_book_app/emulators/main_window.py 2014-03-25 13:35:20.000000000 +0000 @@ -12,6 +12,10 @@ logger = logging.getLogger(__name__) +class AddressBookAppError(uitk.ToolkitEmulatorException): + """Exception raised when there is an error with the emulator.""" + + class MainWindow(uitk.MainView): """An emulator class that makes it easy to interact with the app.""" @@ -74,4 +78,43 @@ class ContactEditor(uitk.UbuntuUIToolkitEmulatorBase): - """ An emulator class for the Contact Editor.""" + """Custom proxy object for the Contact Editor.""" + + TEXT_FIELD_OBJECT_NAMES = { + 'first_name': 'firstName', + 'last_name': 'lastName' + } + + @autopilot_logging.log_action(logger.info) + def fill_form(self, contact_information): + """Fill the edit contact form. + + :param contact_information: Values of the contact to fill the form. + :type contact_information: dict + :raises AddressBookAppError: If one of the keys doesn't correspond to + any of the fields. + + """ + for field, value in contact_information.iteritems(): + self._fill_field(field, value) + + def _fill_field(self, field, value): + text_field = self._get_text_field(field) + text_field.write(value) + + def _get_text_field(self, field): + if field not in self.TEXT_FIELD_OBJECT_NAMES: + raise AddressBookAppError('Unknown field: {}.'.format(field)) + + object_name = self.TEXT_FIELD_OBJECT_NAMES[field] + return self.select_single(TextInputDetail, objectName=object_name) + + def _get_form_values(self): + information = dict() + information['first_name'] = self._get_text_field('first_name').text + information['last_name'] = self._get_text_field('last_name').text + return information + + +class TextInputDetail(uitk.TextField): + """Custom proxy object for the Text Input Detail field.""" diff -Nru address-book-app-0.2+14.04.20140321/tests/autopilot/address_book_app/tests/test_create_new_from_uri.py address-book-app-0.2+14.04.20140325.2/tests/autopilot/address_book_app/tests/test_create_new_from_uri.py --- address-book-app-0.2+14.04.20140321/tests/autopilot/address_book_app/tests/test_create_new_from_uri.py 1970-01-01 00:00:00.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/tests/autopilot/address_book_app/tests/test_create_new_from_uri.py 2014-03-25 13:35:29.000000000 +0000 @@ -0,0 +1,63 @@ +# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- +# Copyright 2013 Canonical +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 3, as published +# by the Free Software Foundation. + +"""Tests for the Addressbook App""" + +from __future__ import absolute_import +from testtools.matchers import Equals +from autopilot.matchers import Eventually + +from address_book_app.tests import AddressBookAppTestCase + + +class TestCreateNewContactFromURI(AddressBookAppTestCase): + """Tests call the app with different uri""" + + def setUp(self): + self.ARGS.append("addressbook:///create?phone=1234567890") + AddressBookAppTestCase.PRELOAD_VCARD = False + super(TestCreateNewContactFromURI, self).setUp() + + def test_save_new_contact(self): + edit_page = self.main_window.get_contact_edit_page() + self.assertThat(edit_page.visible, Eventually(Equals(True))) + + # add name to the contact + firstNameField = self.main_window.wait_select_single( + "TextInputDetail", + objectName="firstName") + lastNameField = self.main_window.wait_select_single( + "TextInputDetail", + objectName="lastName") + + self.type_on_field(firstNameField, "Fulano") + self.type_on_field(lastNameField, "de Tal") + + # save the contact + acceptButton = self.main_window.get_button("accept") + self.pointing_device.click_object(acceptButton) + + # open contact view + contacts = self.main_window.select_many("ContactDelegate") + self.pointing_device.click_object(contacts[0]) + view_page = self.main_window.get_contact_view_page() + self.assertThat(view_page.visible, Eventually(Equals(True))) + + + # check if we have the new phone""" + phone_group = view_page.select_single( + "ContactDetailGroupWithTypeView", + objectName="phones") + self.assertThat(phone_group.detailsCount, Eventually(Equals(1))) + phone_type = view_page.select_single( + "Label", + objectName="type_phoneNumber_0") + phone_label = view_page.select_single( + "Label", + objectName="label_phoneNumber_0.0") + self.assertThat(phone_label.text, Eventually(Equals("1234567890"))) + self.assertThat(phone_type.text, Eventually(Equals("Mobile"))) diff -Nru address-book-app-0.2+14.04.20140321/tests/autopilot/address_book_app/tests/test_edit_contact.py address-book-app-0.2+14.04.20140325.2/tests/autopilot/address_book_app/tests/test_edit_contact.py --- address-book-app-0.2+14.04.20140321/tests/autopilot/address_book_app/tests/test_edit_contact.py 2014-03-21 00:35:30.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/tests/autopilot/address_book_app/tests/test_edit_contact.py 2014-03-25 13:35:29.000000000 +0000 @@ -79,7 +79,12 @@ def test_add_email(self): self.add_contact("Fulano", "") - self.edit_contact(0) + edit_page = self.edit_contact(0) + + emailGroup = edit_page.select_single( + "ContactDetailGroupWithTypeEditor", + objectName="emails") + self.create_new_detail(emailGroup) # fill email address email_field = self.main_window.select_single( diff -Nru address-book-app-0.2+14.04.20140321/tests/autopilot/address_book_app/tests/test_emulators.py address-book-app-0.2+14.04.20140325.2/tests/autopilot/address_book_app/tests/test_emulators.py --- address-book-app-0.2+14.04.20140321/tests/autopilot/address_book_app/tests/test_emulators.py 1970-01-01 00:00:00.000000000 +0000 +++ address-book-app-0.2+14.04.20140325.2/tests/autopilot/address_book_app/tests/test_emulators.py 2014-03-25 13:35:20.000000000 +0000 @@ -0,0 +1,46 @@ +# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- +# +# Copyright 2014 Canonical +# +# This file is part of address-book-app +# +# address-book-app is free software: you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3, as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +from address_book_app import tests +from address_book_app.emulators import main_window + + +class ContactEditorTestCase(tests.AddressBookAppTestCase): + + def test_fill_form(self): + """Test that the form can be filled with contact information.""" + test_form_values = { + 'first_name': 'Test first name', + 'last_name': 'Test last name' + } + + contact_editor = self.main_window.go_to_add_contact() + contact_editor.fill_form(test_form_values) + + form_values = contact_editor._get_form_values() + self.assertEqual(test_form_values, form_values) + + def test_fill_form_with_unknown_field_must_raise_error(self): + """Test the error when you fill the form with an unknown field.""" + test_form_values = {'unknown': 'dummy'} + + contact_editor = self.main_window.go_to_add_contact() + error = self.assertRaises( + main_window.AddressBookAppError, + contact_editor.fill_form, test_form_values) + self.assertEqual('Unknown field: unknown.', str(error))