Merge lp://qastaging/~renatofilho/address-book-app/split-app into lp://qastaging/address-book-app

Proposed by Renato Araujo Oliveira Filho
Status: Superseded
Proposed branch: lp://qastaging/~renatofilho/address-book-app/split-app
Merge into: lp://qastaging/address-book-app
Diff against target: 8892 lines (+3849/-3635)
135 files modified
CMakeLists.txt (+1/-0)
debian/control (+12/-1)
debian/qtdeclarative5-ubuntu-addressbook0.1.install (+4/-0)
src/app/CMakeLists.txt (+0/-2)
src/app/addressbookapp.cpp (+1/-24)
src/app/addressbookapp.h (+1/-2)
src/app/main.cpp (+1/-1)
src/imports/ABContactEditorPage.qml (+56/-0)
src/imports/ABContactListPage.qml (+530/-0)
src/imports/ABContactViewPage.qml (+87/-0)
src/imports/CMakeLists.txt (+3/-5)
src/imports/Common/CMakeLists.txt (+0/-15)
src/imports/Common/ContactDetailItem.qml (+0/-62)
src/imports/Common/ContactExporter.qml (+0/-167)
src/imports/Common/KeyboardRectangle.qml (+0/-74)
src/imports/Common/RemoveContactsDialog.qml (+0/-78)
src/imports/Common/StandardAnimation.qml (+0/-22)
src/imports/ContactEdit/ContactEditor.qml (+0/-461)
src/imports/ContactList/CMakeLists.txt (+0/-11)
src/imports/ContactList/ContactListPage.qml (+0/-554)
src/imports/ContactList/VCardImportDialog.qml (+0/-94)
src/imports/ContactShare/CMakeLists.txt (+0/-10)
src/imports/ContactShare/ContactSharePage.qml (+0/-56)
src/imports/ContactView/ContactView.qml (+0/-123)
src/imports/ContentHubProxy.qml (+1/-1)
src/imports/MainWindow.qml (+1/-2)
src/imports/Ubuntu/AddressBook/Base/CMakeLists.txt (+30/-0)
src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml (+112/-0)
src/imports/Ubuntu/AddressBook/Base/ContactDetailGroupBase.qml (+159/-0)
src/imports/Ubuntu/AddressBook/Base/ContactDetailGroupWithTypeBase.qml (+132/-0)
src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml (+62/-0)
src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml (+167/-0)
src/imports/Ubuntu/AddressBook/Base/KeyboardRectangle.qml (+70/-0)
src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml (+78/-0)
src/imports/Ubuntu/AddressBook/Base/qmldir (+9/-0)
src/imports/Ubuntu/AddressBook/CMakeLists.txt (+4/-0)
src/imports/Ubuntu/AddressBook/ContactEditor/CMakeLists.txt (+20/-7)
src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml (+5/-5)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAddressesEditor.qml (+7/-7)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml (+7/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailEmailsEditor.qml (+3/-3)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml (+3/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml (+4/-3)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailOnlineAccountsEditor.qml (+3/-3)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailOrganizationsEditor.qml (+5/-5)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailPhoneNumbersEditor.qml (+3/-3)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml (+4/-2)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml (+3/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml (+444/-0)
src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/qmldir (+18/-0)
src/imports/Ubuntu/AddressBook/ContactShare/CMakeLists.txt (+26/-0)
src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml (+60/-0)
src/imports/Ubuntu/AddressBook/ContactShare/qmldir (+3/-0)
src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml (+34/-0)
src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml (+85/-0)
src/imports/Ubuntu/AddressBook/ContactView/CMakeLists.txt (+32/-7)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAddressesView.qml (+32/-0)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml (+89/-0)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailEmailsView.qml (+29/-0)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml (+66/-0)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOnlineAccountsView.qml (+31/-0)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOrganizationsView.qml (+32/-0)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailPhoneNumberView.qml (+94/-0)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailPhoneNumbersView.qml (+41/-0)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml (+62/-0)
src/imports/Ubuntu/AddressBook/ContactView/ContactFetchError.qml (+5/-8)
src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml (+198/-0)
src/imports/Ubuntu/AddressBook/ContactView/qmldir (+19/-0)
src/imports/Ubuntu/CMakeLists.txt (+3/-1)
src/imports/Ubuntu/Contacts/ActionButton.qml (+1/-1)
src/imports/Ubuntu/Contacts/BasicFieldView.qml (+0/-85)
src/imports/Ubuntu/Contacts/CMakeLists.txt (+4/-18)
src/imports/Ubuntu/Contacts/ContactDelegate.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactDetailAddressesView.qml (+0/-32)
src/imports/Ubuntu/Contacts/ContactDetailAvatarView.qml (+0/-86)
src/imports/Ubuntu/Contacts/ContactDetailBase.qml (+0/-110)
src/imports/Ubuntu/Contacts/ContactDetailEmailsView.qml (+0/-29)
src/imports/Ubuntu/Contacts/ContactDetailGroupBase.qml (+0/-159)
src/imports/Ubuntu/Contacts/ContactDetailGroupWithTypeBase.qml (+0/-126)
src/imports/Ubuntu/Contacts/ContactDetailGroupWithTypeView.qml (+0/-63)
src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountsView.qml (+0/-29)
src/imports/Ubuntu/Contacts/ContactDetailOrganizationsView.qml (+0/-32)
src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberView.qml (+0/-90)
src/imports/Ubuntu/Contacts/ContactDetailPhoneNumbersView.qml (+0/-38)
src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactDetailWithTypeView.qml (+0/-60)
src/imports/Ubuntu/Contacts/ContactFetch.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactList.js (+1/-1)
src/imports/Ubuntu/Contacts/ContactListModel.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactListView.qml (+5/-5)
src/imports/Ubuntu/Contacts/ContactPreviewPage.qml (+0/-131)
src/imports/Ubuntu/Contacts/ContactSimpleListView.qml (+1/-1)
src/imports/Ubuntu/Contacts/Contacts.js (+24/-0)
src/imports/Ubuntu/Contacts/MostCalledModel.qml (+11/-11)
src/imports/Ubuntu/Contacts/MultipleSelectionVisualModel.qml (+1/-1)
src/imports/Ubuntu/Contacts/SIMCardImportPage.qml (+11/-11)
src/imports/Ubuntu/Contacts/contacts.cpp (+26/-0)
src/imports/Ubuntu/Contacts/contacts.h (+2/-1)
src/imports/Ubuntu/Contacts/imagescalethread.cpp (+1/-1)
src/imports/Ubuntu/Contacts/imagescalethread.h (+1/-1)
src/imports/Ubuntu/Contacts/mostcalledproxymodel.cpp (+1/-1)
src/imports/Ubuntu/Contacts/mostcalledproxymodel.h (+1/-1)
src/imports/Ubuntu/Contacts/plugin.cpp (+1/-1)
src/imports/Ubuntu/Contacts/plugin.h (+1/-1)
src/imports/Ubuntu/Contacts/qmldir (+1/-16)
tests/autopilot/address_book_app/__init__.py (+6/-5)
tests/autopilot/address_book_app/address_book/__init__.py (+34/-0)
tests/autopilot/address_book_app/address_book/_common.py (+52/-0)
tests/autopilot/address_book_app/address_book/_contact_editor_page.py (+303/-0)
tests/autopilot/address_book_app/address_book/_contact_view_page.py (+28/-0)
tests/autopilot/address_book_app/address_book/_remove_contact_dialog.py (+36/-0)
tests/autopilot/address_book_app/address_book/_sim_card_import_page.py (+101/-0)
tests/autopilot/address_book_app/pages/__init__.py (+7/-8)
tests/autopilot/address_book_app/pages/_ab_contact_list_page.py (+142/-0)
tests/autopilot/address_book_app/pages/_ab_contact_view_page.py (+28/-0)
tests/autopilot/address_book_app/pages/_common.py (+0/-52)
tests/autopilot/address_book_app/pages/_contact_editor.py (+0/-299)
tests/autopilot/address_book_app/pages/_contact_list_page.py (+0/-146)
tests/autopilot/address_book_app/pages/_contact_view.py (+0/-28)
tests/autopilot/address_book_app/pages/_sim_card_import_page.py (+0/-103)
tests/autopilot/address_book_app/tests/test_add_contact.py (+2/-2)
tests/autopilot/address_book_app/tests/test_custom_proxy_objects.py (+2/-1)
tests/autopilot/address_book_app/tests/test_data.py (+1/-1)
tests/autopilot/address_book_app/tests/test_edit_contact.py (+1/-1)
tests/autopilot/address_book_app/tests/test_import_from_sim.py (+2/-7)
tests/qml/tst_ContactEditor.qml (+2/-2)
tests/qml/tst_ContactList.qml (+2/-2)
tests/qml/tst_ContactListView.qml (+0/-1)
tests/qml/tst_ContactPreviewPage.qml (+3/-1)
To merge this branch: bzr merge lp://qastaging/~renatofilho/address-book-app/split-app
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+257670@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2015-05-12.

Commit message

Split the app in modules to be used by dialer and messaging app.

To post a comment you must log in.
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)
445. By Renato Araujo Oliveira Filho

Fixed address_book module import.

446. By Renato Araujo Oliveira Filho

Merged: lp:~renatofilho/address-book-app/fix-test_import_from_sim

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
447. By Renato Araujo Oliveira Filho

Revert wrong change on copyImage function.

448. By Renato Araujo Oliveira Filho

Added qtdeclarative5-ubuntu-content1 in the dep list.

449. By Renato Araujo Oliveira Filho

Fixed deps.

450. By Renato Araujo Oliveira Filho

Revert changes on MostCalledModel.qml.

451. By Renato Araujo Oliveira Filho

Update MostCalledList.qml.

452. By Renato Araujo Oliveira Filho

Does not try to fetch contact with invalid model.

453. By Renato Araujo Oliveira Filho

Show empty string instead of "No name" if contact is not fetched yet.

454. By Renato Araujo Oliveira Filho

Trunk merged.

455. By Renato Araujo Oliveira Filho

Show empty title while contact is invalid.

456. By Renato Araujo Oliveira Filho

Added VCardImportDialog.qml file back.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches