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
1=== modified file 'src/imports/ABContactListPage.qml'
2--- src/imports/ABContactListPage.qml 2016-06-20 23:31:47 +0000
3+++ src/imports/ABContactListPage.qml 2016-07-14 18:22:44 +0000
4@@ -33,6 +33,7 @@
5
6 property var viewPage: null
7 property var emptyPage: null
8+ property var settingsPage: null
9 property bool pickMode: false
10 property alias contentHubTransfer: contactExporter.activeTransfer
11 property bool pickMultipleContacts: false
12@@ -80,6 +81,16 @@
13 viewPage = null
14 }
15
16+ function clearSettingsPage()
17+ {
18+ settingsPage = null
19+ }
20+
21+ function hasChildPage()
22+ {
23+ return (settingsPage != null);
24+ }
25+
26 function openViewPage(viewPageProperties)
27 {
28 if (currentViewContactId === viewPageProperties.contact.contactId) {
29@@ -123,7 +134,7 @@
30 contactList.currentIndex = -1
31 pageStack.removePages(mainPage)
32
33- if (pageStack.columns > 1) {
34+ if ((pageStack.columns > 1) && !hasChildPage()) {
35 emptyPage = pageStack.addFileToNextColumnSync(pageStack.primaryPage,
36 Qt.resolvedUrl("ABMultiColumnEmptyState.qml"),
37 { 'headerTitle': "",
38@@ -145,19 +156,18 @@
39 {
40 pageStack.removePages(mainPage)
41
42- var incubator = pageStack.addPageToNextColumn(mainPage,
43- Qt.resolvedUrl("./Settings/SettingsPage.qml"),
44- {"contactListModel": contactList.listModel})
45- incubator.onStatusChanged = function(status) {
46- if (status === Component.Ready) {
47- incubator.object.onActiveChanged.connect(function(active) {
48- if (!incubator.object.active) {
49- mainPage.delayFetchContact()
50- contactList.forceActiveFocus()
51- }
52- })
53- }
54+
55+ if (settingsPage) {
56+ settingsPage.Component.onDestruction.disconnect(clearSettingsPage)
57 }
58+
59+ pageStack.removePages(mainPage)
60+ viewPage = null
61+
62+ settingsPage = pageStack.addFileToNextColumnSync(mainPage,
63+ Qt.resolvedUrl("./Settings/SettingsPage.qml"),
64+ {"contactListModel": contactList.listModel})
65+ settingsPage.Component.onDestruction.connect(clearSettingsPage)
66 }
67
68 function showContactWithId(contactId)
69@@ -236,7 +246,6 @@
70 return
71 }
72
73- console.debug("Will fetch new contact")
74 contactList.view._fetchContact(contactList.currentIndex, currentContact)
75 }
76 }
77
78=== modified file 'src/imports/MainWindow.qml'
79--- src/imports/MainWindow.qml 2016-06-20 23:31:47 +0000
80+++ src/imports/MainWindow.qml 2016-07-14 18:22:44 +0000
81@@ -181,9 +181,15 @@
82 onColumnsChanged: {
83 if (mainStack.columns > 1) {
84 if (mainStack.contactListPage)
85- mainStack.contactListPage.delayFetchContact()
86+ {
87+ if (!mainStack.contactListPage.hasChildPage())
88+ mainStack.contactListPage.delayFetchContact()
89+ }
90 else
91- mainStack.addPageToNextColumn(contactPage, Qt.resolvedUrl("./ABMultiColumnEmptyState.qml"))
92+ {
93+ if (!contactPage.hasChildPage())
94+ mainStack.addPageToNextColumn(contactPage, Qt.resolvedUrl("./ABMultiColumnEmptyState.qml"))
95+ }
96 }
97 }
98 }

Subscribers

People subscribed via source and target branches