Merge lp://qastaging/~fboucault/address-book-app/converged_bottom_edge into lp://qastaging/address-book-app

Proposed by Florian Boucault
Status: Merged
Approved by: Bill Filler
Approved revision: 512
Merged at revision: 490
Proposed branch: lp://qastaging/~fboucault/address-book-app/converged_bottom_edge
Merge into: lp://qastaging/address-book-app
Prerequisite: lp://qastaging/~fboucault/address-book-app/multicolumns
Diff against target: 2687 lines (+865/-241)
97 files modified
examples/contenthub.qml (+1/-1)
src/imports/ABContactEditorPage.qml (+7/-2)
src/imports/ABContactListPage.qml (+191/-64)
src/imports/ABContactViewPage.qml (+12/-10)
src/imports/BottomEdge.qml (+321/-0)
src/imports/BottomEdgeShadow.qml (+31/-0)
src/imports/CMakeLists.txt (+2/-0)
src/imports/ContentHubProxy.qml (+1/-1)
src/imports/MainWindow.qml (+22/-2)
src/imports/Settings/MyselfPhoneNumbersModel.qml (+1/-1)
src/imports/Settings/SettingsPage.qml (+1/-1)
src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml (+1/-1)
src/imports/Ubuntu/AddressBook/Base/ContactDetailGroupBase.qml (+1/-1)
src/imports/Ubuntu/AddressBook/Base/ContactDetailGroupWithTypeBase.qml (+1/-1)
src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml (+1/-1)
src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml (+1/-1)
src/imports/Ubuntu/AddressBook/Base/KeyboardRectangle.qml (+1/-1)
src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAddressesEditor.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailEmailsEditor.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailOnlineAccountsEditor.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailOrganizationsEditor.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailPhoneNumbersEditor.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml (+17/-5)
src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml (+3/-1)
src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAddressesView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailEmailsView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOnlineAccountsView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOrganizationsView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailPhoneNumberView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailPhoneNumbersView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactFetchError.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactHeaderView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml (+1/-1)
src/imports/Ubuntu/Contacts/ActionButton.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactAvatar.qml (+3/-3)
src/imports/Ubuntu/Contacts/ContactDelegate.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactFetch.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactListModel.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactListView.qml (+61/-4)
src/imports/Ubuntu/Contacts/ContactSimpleListView.qml (+10/-2)
src/imports/Ubuntu/Contacts/FastScroll.qml (+1/-1)
src/imports/Ubuntu/Contacts/ListItemWithActions.qml (+1/-1)
src/imports/Ubuntu/Contacts/ListItemWithActionsCheckBox.qml (+1/-1)
src/imports/Ubuntu/Contacts/MostCalledList.qml (+1/-1)
src/imports/Ubuntu/Contacts/MostCalledModel.qml (+1/-1)
src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml (+1/-1)
src/imports/Ubuntu/Contacts/MultipleSelectionVisualModel.qml (+1/-1)
src/imports/Ubuntu/Contacts/Ofono.qml (+1/-1)
src/imports/Ubuntu/Contacts/OnlineAccountsDummy.qml (+1/-1)
src/imports/Ubuntu/Contacts/OnlineAccountsHelper.qml (+1/-1)
src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml (+2/-2)
src/imports/Ubuntu/Contacts/SIMCardImportPage.qml (+1/-1)
src/imports/Ubuntu/Contacts/SIMList.qml (+1/-1)
src/imports/Ubuntu/Contacts/SectionDelegate.qml (+1/-2)
src/imports/Ubuntu/Contacts/SubtitledWithColors.qml (+1/-1)
src/imports/Ubuntu/Contacts/VCardParser.qml (+1/-1)
src/imports/Ubuntu/Contacts/qmldir (+1/-1)
src/imports/VCardImportDialog.qml (+1/-1)
tests/autopilot/address_book_app/__init__.py (+50/-30)
tests/autopilot/address_book_app/address_book/_contact_view_page.py (+1/-7)
tests/autopilot/address_book_app/address_book/_sim_card_import_page.py (+2/-2)
tests/autopilot/address_book_app/pages/_ab_contact_list_page.py (+26/-7)
tests/autopilot/address_book_app/tests/__init__.py (+2/-2)
tests/autopilot/address_book_app/tests/test_add_contact.py (+8/-5)
tests/autopilot/address_book_app/tests/test_create_new_from_uri.py (+7/-5)
tests/autopilot/address_book_app/tests/test_delete_contact.py (+1/-1)
tests/autopilot/address_book_app/tests/test_edit_contact.py (+10/-10)
tests/qml/tst_ContactAvatar.qml (+1/-1)
tests/qml/tst_ContactEditor.qml (+1/-1)
tests/qml/tst_ContactList.qml (+1/-1)
tests/qml/tst_ContactListModel.qml (+1/-1)
tests/qml/tst_ContactListView.qml (+1/-1)
tests/qml/tst_ContactPreviewPage.qml (+1/-1)
tests/qml/tst_ListWithActions.qml (+1/-1)
tests/qml/tst_UbuntuContacts.qml (+1/-1)
tests/qml/tst_VCardParser.qml (+1/-1)
To merge this branch: bzr merge lp://qastaging/~fboucault/address-book-app/converged_bottom_edge
Reviewer Review Type Date Requested Status
Renato Araujo Oliveira Filho (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Robert Bruce Park (community) Needs Fixing
Review via email: mp+270693@code.qastaging.launchpad.net

Commit message

Make bottom edge usable with a mouse.
Make it smarter when more than one column is available.

To post a comment you must log in.
475. By Florian Boucault

Better avatar for new contact.

476. By Florian Boucault

Better selected contact handling.

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

Avoid crashes upon deletion.

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)
478. By Florian Boucault

Added constraints on AdaptivePageLayout so that right column is not squeezed too small.

479. By Florian Boucault

Do not show other import options when adding a new contact.

480. By Florian Boucault

Correctly set the pageStack property to the contact list page.

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)
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

-Application starts with the keyboard visible.
-Create new contact page appears empty.

review: Needs Fixing
481. By Florian Boucault

Fix 1 column layout.

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

Fixed doc

483. By Florian Boucault

Always highlight the opened contact.

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

Fixed sizing of ABContactEditorPage

485. By Florian Boucault

Always reset state

486. By Florian Boucault

Fixed bottom edge stacking.

487. By Florian Boucault

2 columns width fix

488. By Florian Boucault

Prevent forced focus at startup

489. By Florian Boucault

Fix split second visible anime at startup

490. By Florian Boucault

Missing code for previous fix.

491. By Florian Boucault

Show newly created contact only in multicolumn mode.

492. By Florian Boucault

Better new contact placeholder handling

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)
493. By Florian Boucault

Added confirmation dialog when cancelling contact edit

494. By Florian Boucault

Cleaner opening of view and edit contact pages.

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)
495. By Florian Boucault

Cancel edition before trying to show a contact.

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

Fixed wrong aspect ratio when using UbuntuShape.

497. By Florian Boucault

Fixed freeze upon cancelling new contact.

498. By Florian Boucault

When going back from editing an existing contact, do not go directly back to the contact list.

499. By Florian Boucault

Removed dead code.

500. By Florian Boucault

Support case when pageStack is still a PageStack.

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)
501. By Florian Boucault

use content-hub 1.3 imports

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

Comment inline.

review: Needs Fixing
502. By Florian Boucault

debian: fixed versioning vs arch ordering.

503. By Florian Boucault

Removed edit cancellation dialog.

Revision history for this message
Florian Boucault (fboucault) :
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)
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) :
504. By Florian Boucault

Reverted content hub 13

505. By Florian Boucault

Merged from multicolumns branch

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

Merged lp:~renatofilho/address-book-app/fix-bottom-edge

507. By Florian Boucault

Moved ContactDelegate.qml up in qmldir together with the other public APIs

508. By Florian Boucault

Moved public APIs of elements to their beginning.

509. By Florian Boucault

Merged lp:~renatofilho/address-book-app/code-style-fix

510. By Florian Boucault

Merged from trunk

511. By Florian Boucault

Merged lp:~renatofilho/address-book-app/fix-close-animation

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
512. By Florian Boucault

Switched all imports of QtQuick to version 2.4

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

looks good

review: Approve

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