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 | ||||
Related bugs: |
|
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:
|
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.
FAILED: Continuous integration, rev:474 jenkins. qa.ubuntu. com/job/ address- book-app- ci/912/ jenkins. qa.ubuntu. com/job/ address- book-app- vivid-i386- ci/215/ console jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 4104/console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 4101/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/address- book-app- ci/912/ rebuild
http://