address-book-app

Merge lp:~renatofilho/address-book-app/rotate-import-from-sim into lp:address-book-app

  1. rotate-import-from-sim
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Bill Filler
Approved revision: 611
Merged at revision: 610
Proposed branch: lp:~renatofilho/address-book-app/rotate-import-from-sim
Merge into: lp:address-book-app
Diff against target: 98 lines (+31/-16)
2 files modified
src/imports/ABContactListPage.qml (+23/-14)
src/imports/MainWindow.qml (+8/-2)
To merge this branch: bzr merge lp:~renatofilho/address-book-app/rotate-import-from-sim
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Approve
PS Jenkins bot continuous-integration Pending
Ubuntu Phablet Team Pending
Review via email: mp+299990@code.launchpad.net

Commit message

Does not close settings page if rotate the device while it is open.

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

PASSED: Continuous integration, rev:610
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/11/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/965
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/176
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/965
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/869
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/869
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/869
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/866
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/866/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/866
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/866/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/866
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/866/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/866
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/866/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/866
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/866/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/866
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/866/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/866
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/866/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/866
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/866/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/866
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/866/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/11/rebuild

review: Approve (continuous-integration)
lp:~renatofilho/address-book-app/rotate-import-from-sim updated
611. By Renato Araujo Oliveira Filho

Revert change on minimal grid unit.

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

PASSED: Continuous integration, rev:611
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/12/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/976
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/179
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/976
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/878
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/878
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/878
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/875
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/875/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/875
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/875/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/875
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/875/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/875
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/875/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/875
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/875/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/875
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/875/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/875
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/875/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/875
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/875/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/875
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/875/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/12/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/imports/ABContactListPage.qml'
--- src/imports/ABContactListPage.qml 2016-06-20 23:31:47 +0000
+++ src/imports/ABContactListPage.qml 2016-07-14 18:22:44 +0000
@@ -33,6 +33,7 @@
3333
34 property var viewPage: null34 property var viewPage: null
35 property var emptyPage: null35 property var emptyPage: null
36 property var settingsPage: null
36 property bool pickMode: false37 property bool pickMode: false
37 property alias contentHubTransfer: contactExporter.activeTransfer38 property alias contentHubTransfer: contactExporter.activeTransfer
38 property bool pickMultipleContacts: false39 property bool pickMultipleContacts: false
@@ -80,6 +81,16 @@
80 viewPage = null81 viewPage = null
81 }82 }
8283
84 function clearSettingsPage()
85 {
86 settingsPage = null
87 }
88
89 function hasChildPage()
90 {
91 return (settingsPage != null);
92 }
93
83 function openViewPage(viewPageProperties)94 function openViewPage(viewPageProperties)
84 {95 {
85 if (currentViewContactId === viewPageProperties.contact.contactId) {96 if (currentViewContactId === viewPageProperties.contact.contactId) {
@@ -123,7 +134,7 @@
123 contactList.currentIndex = -1134 contactList.currentIndex = -1
124 pageStack.removePages(mainPage)135 pageStack.removePages(mainPage)
125136
126 if (pageStack.columns > 1) {137 if ((pageStack.columns > 1) && !hasChildPage()) {
127 emptyPage = pageStack.addFileToNextColumnSync(pageStack.primaryPage,138 emptyPage = pageStack.addFileToNextColumnSync(pageStack.primaryPage,
128 Qt.resolvedUrl("ABMultiColumnEmptyState.qml"),139 Qt.resolvedUrl("ABMultiColumnEmptyState.qml"),
129 { 'headerTitle': "",140 { 'headerTitle': "",
@@ -145,19 +156,18 @@
145 {156 {
146 pageStack.removePages(mainPage)157 pageStack.removePages(mainPage)
147158
148 var incubator = pageStack.addPageToNextColumn(mainPage,159
149 Qt.resolvedUrl("./Settings/SettingsPage.qml"),160 if (settingsPage) {
150 {"contactListModel": contactList.listModel})161 settingsPage.Component.onDestruction.disconnect(clearSettingsPage)
151 incubator.onStatusChanged = function(status) {
152 if (status === Component.Ready) {
153 incubator.object.onActiveChanged.connect(function(active) {
154 if (!incubator.object.active) {
155 mainPage.delayFetchContact()
156 contactList.forceActiveFocus()
157 }
158 })
159 }
160 }162 }
163
164 pageStack.removePages(mainPage)
165 viewPage = null
166
167 settingsPage = pageStack.addFileToNextColumnSync(mainPage,
168 Qt.resolvedUrl("./Settings/SettingsPage.qml"),
169 {"contactListModel": contactList.listModel})
170 settingsPage.Component.onDestruction.connect(clearSettingsPage)
161 }171 }
162172
163 function showContactWithId(contactId)173 function showContactWithId(contactId)
@@ -236,7 +246,6 @@
236 return246 return
237 }247 }
238248
239 console.debug("Will fetch new contact")
240 contactList.view._fetchContact(contactList.currentIndex, currentContact)249 contactList.view._fetchContact(contactList.currentIndex, currentContact)
241 }250 }
242 }251 }
243252
=== modified file 'src/imports/MainWindow.qml'
--- src/imports/MainWindow.qml 2016-06-20 23:31:47 +0000
+++ src/imports/MainWindow.qml 2016-07-14 18:22:44 +0000
@@ -181,9 +181,15 @@
181 onColumnsChanged: {181 onColumnsChanged: {
182 if (mainStack.columns > 1) {182 if (mainStack.columns > 1) {
183 if (mainStack.contactListPage)183 if (mainStack.contactListPage)
184 mainStack.contactListPage.delayFetchContact()184 {
185 if (!mainStack.contactListPage.hasChildPage())
186 mainStack.contactListPage.delayFetchContact()
187 }
185 else188 else
186 mainStack.addPageToNextColumn(contactPage, Qt.resolvedUrl("./ABMultiColumnEmptyState.qml"))189 {
190 if (!contactPage.hasChildPage())
191 mainStack.addPageToNextColumn(contactPage, Qt.resolvedUrl("./ABMultiColumnEmptyState.qml"))
192 }
187 }193 }
188 }194 }
189 }195 }

Subscribers

People subscribed via source and target branches