1
=== modified file 'debian/control'
2
--- debian/control	2014-01-30 12:53:13 +0000
3
+++ debian/control	2014-02-05 09:33:17 +0000
4
@@ -19,7 +19,7 @@
5
19
Architecture: any
19
Architecture: any
6
20
Depends: ${misc:Depends},
20
Depends: ${misc:Depends},
7
21
         account-plugin-evernote,
21
         account-plugin-evernote,
9
22
         qmlscene,
22
         qtdeclarative5-accounts-plugin,
10
23
         qtdeclarative5-evernote0.1,
23
         qtdeclarative5-evernote0.1,
11
24
         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
24
         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
12
25
         qtdeclarative5-localstorage-plugin,
25
         qtdeclarative5-localstorage-plugin,
13
26
26
14
=== modified file 'src/app/qml/reminders.qml'
15
--- src/app/qml/reminders.qml	2014-01-27 13:00:41 +0000
16
+++ src/app/qml/reminders.qml	2014-02-05 09:33:17 +0000
17
@@ -21,12 +21,14 @@
18
21
//import "components"
21
//import "components"
19
22
import "ui"
22
import "ui"
20
23
import Evernote 0.1
23
import Evernote 0.1
21
24
import Ubuntu.OnlineAccounts 0.1
22
24
25
23
25
/*!
26
/*!
24
26
    \brief MainView with a Label and Button elements.
27
    \brief MainView with a Label and Button elements.
25
27
*/
28
*/
26
28
29
27
29
MainView {
30
MainView {
28
31
    id: root
29
30
    // objectName for functional testing purposes (autopilot-qt5)
32
    // objectName for functional testing purposes (autopilot-qt5)
30
31
    objectName: "mainView"
33
    objectName: "mainView"
31
32
34
32
@@ -45,10 +47,38 @@
33
45
    // Temporary background color. This can be changed to other suitable backgrounds when we get official mockup designs
47
    // Temporary background color. This can be changed to other suitable backgrounds when we get official mockup designs
34
46
    backgroundColor: UbuntuColors.coolGrey
48
    backgroundColor: UbuntuColors.coolGrey
35
47
49
36
50
    AccountServiceModel {
37
51
        id: accounts
38
52
        service: "evernote"
39
53
    }
40
54
41
55
    AccountService {
42
56
        id: accountService
43
57
        onObjectHandleChanged: authenticate(null);
44
58
        onAuthenticated: {
45
59
            console.log("Access token is " + reply.AccessToken)
46
60
            EvernoteConnection.token = reply.AccessToken;
47
61
        }
48
62
        onAuthenticationError: {
49
63
            console.log("Authentication failed, code " + error.code)
50
64
        }
51
65
    }
52
66
53
48
    Component.onCompleted: {
67
    Component.onCompleted: {
54
49
        pagestack.push(rootTabs)
68
        pagestack.push(rootTabs)
57
50
        if (EvernoteConnection.token.length === 0) {
69
        print("got accounts:", accounts.count)
58
51
            pagestack.push(Qt.resolvedUrl("ui/AccountSelectorPage.qml"));
70
        switch (accounts.count) {
59
71
        case 0:
60
72
            print("No account available! Please setup an account in the system settings");
61
73
            break;
62
74
        case 1:
63
75
            accountService.objectHandle = accounts.get(0, "accountServiceHandle");
64
76
            break;
65
77
        default:
66
78
            var component = Qt.createComponent(Qt.resolvedUrl("ui/AccountSelectorPage.qml"));
67
79
            var page = component.createObject(root, {accounts: accounts});
68
80
            page.accountSelected.connect(function(handle) { accountService.objectHandle = handle; pagestack.pop(); });
69
81
            pagestack.push(page);
70
52
        }
82
        }
71
53
    }
83
    }
72
54
84
73
55
85
74
=== modified file 'src/app/qml/ui/AccountSelectorPage.qml'
75
--- src/app/qml/ui/AccountSelectorPage.qml	2014-01-27 13:00:41 +0000
76
+++ src/app/qml/ui/AccountSelectorPage.qml	2014-02-05 09:33:17 +0000
77
@@ -26,43 +26,27 @@
78
26
    id: root
26
    id: root
79
27
    title: "Select Evernote account"
27
    title: "Select Evernote account"
80
28
28
86
29
    AccountServiceModel {
29
    property alias accounts: listView.model
87
30
        id: accounts
30
88
31
        // Use the Evernote service
31
    signal accountSelected(var handle)
84
32
        service: "evernote"
85
33
    }
89
34
32
90
35
    Column {
33
    Column {
91
36
        anchors { fill: parent; margins: units.gu(2) }
34
        anchors { fill: parent; margins: units.gu(2) }
92
37
        spacing: units.gu(1)
35
        spacing: units.gu(1)
93
38
36
94
39
        ListView {
37
        ListView {
95
38
            id: listView
96
40
            width: parent.width
39
            width: parent.width
97
41
            height: units.gu(10)
40
            height: units.gu(10)
98
42
            model: accounts
41
            model: accounts
99
42
100
43
            delegate: Standard {
43
            delegate: Standard {
101
44
                text: displayName
44
                text: displayName
102
45
103
46
                // FIXME: remove this Item wrapper once Ubuntu ListItems are fixed to hold non-visual items
104
47
                Item {
105
48
                    AccountService {
106
49
                        id: accountService
107
50
                        objectHandle: accountServiceHandle
108
51
                        // Print the access token on the console
109
52
                        onAuthenticated: {
110
53
                            console.log("Access token is " + reply.AccessToken)
111
54
                            EvernoteConnection.token = reply.AccessToken;
112
55
                            pagestack.pop();
113
56
                        }
114
57
                        onAuthenticationError: { console.log("Authentication failed, code " + error.code) }
115
58
                    }
116
59
                }
117
60
                MouseArea {
45
                MouseArea {
118
61
                    anchors.fill: parent
46
                    anchors.fill: parent
120
62
                    onClicked: accountService.authenticate(null)
47
                    onClicked: root.accountSelected(accountServiceHandle)
121
63
                }
48
                }
122
64
            }
49
            }
123
65
        }
50
        }
124
66
125
67
    }
51
    }
126
68
}
52
}
Status:	Merged
Approved by:	Riccardo Padovani on 2014-02-05
Approved revision:	49
Merged at revision:	51
Proposed branch:	lp:~mzanetti/reminders-app/init-account-rework
Merge into:	lp:reminders-app
Diff against target:	126 lines (+39/-25) 3 files modified debian/control (+1/-1) src/app/qml/reminders.qml (+32/-2) src/app/qml/ui/AccountSelectorPage.qml (+6/-22)
To merge this branch:	bzr merge lp:~mzanetti/reminders-app/init-account-rework
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Riccardo Padovani		2014-01-31	Approve on 2014-02-05
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2014-02-05
Review via email: mp+204228@code.launchpad.net