1
=== added file 'src/app/webcontainer/AccountErrorScreen.qml'
2
--- src/app/webcontainer/AccountErrorScreen.qml	1970-01-01 00:00:00 +0000
3
+++ src/app/webcontainer/AccountErrorScreen.qml	2015-06-23 12:37:15 +0000
4
@@ -0,0 +1,54 @@
5
1
/*
6
2
 * Copyright 2015 Canonical Ltd.
7
3
 *
8
4
 * This file is part of webbrowser-app.
9
5
 *
10
6
 * webbrowser-app is free software; you can redistribute it and/or modify
11
7
 * it under the terms of the GNU General Public License as published by
12
8
 * the Free Software Foundation; version 3.
13
9
 *
14
10
 * webbrowser-app is distributed in the hope that it will be useful,
15
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
13
 * GNU General Public License for more details.
18
14
 *
19
15
 * You should have received a copy of the GNU General Public License
20
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
21
17
 */
22
18
23
19
import QtQuick 2.0
24
20
import Ubuntu.Components 1.1
25
21
26
22
Rectangle {
27
23
    id: root
28
24
29
25
    property alias message: messageLabel.text
30
26
    signal closed()
31
27
32
28
    anchors.fill: parent
33
29
34
30
    Column {
35
31
        anchors.fill: parent
36
32
        anchors.margins: units.gu(4)
37
33
38
34
        spacing: units.gu(3)
39
35
40
36
        Label {
41
37
            width: parent.width
42
38
            fontSize: "x-large"
43
39
            text: i18n.tr("Account error")
44
40
        }
45
41
46
42
        Label {
47
43
            id: messageLabel
48
44
            width: parent.width
49
45
            wrapMode: Text.Wrap
50
46
        }
51
47
52
48
        Button {
53
49
            anchors.horizontalCenter: parent.horizontalCenter
54
50
            text: i18n.tr("Close")
55
51
            onClicked: root.closed()
56
52
        }
57
53
    }
58
54
}
59
0
55
60
=== modified file 'src/app/webcontainer/AccountsLogic.qml'
61
--- src/app/webcontainer/AccountsLogic.qml	2015-06-23 12:37:14 +0000
62
+++ src/app/webcontainer/AccountsLogic.qml	2015-06-23 12:37:15 +0000
63
@@ -59,6 +59,8 @@
64
59
        onFinished: {
59
        onFinished: {
65
60
            if ("accountId" in reply) {
60
            if ("accountId" in reply) {
66
61
                root.checkAccounts()
61
                root.checkAccounts()
67
62
            } else if ("errorName" in reply) {
68
63
                root.errorScreenRequested(i18n.tr("Account window could not be opened. You can only create one account at a time; please try again after closing all other account windows."))
69
62
            } else {
64
            } else {
70
63
                root.quitRequested()
65
                root.quitRequested()
71
64
            }
66
            }
72
65
67
73
=== modified file 'src/app/webcontainer/AccountsPage.qml'
74
--- src/app/webcontainer/AccountsPage.qml	2015-06-23 12:37:14 +0000
75
+++ src/app/webcontainer/AccountsPage.qml	2015-06-23 12:37:15 +0000
76
@@ -46,6 +46,7 @@
77
46
        onAccountSelected: root.__emitAccountSelected(credentialsId, willMoveCookies)
46
        onAccountSelected: root.__emitAccountSelected(credentialsId, willMoveCookies)
78
47
        onContextReady: root.contextReady()
47
        onContextReady: root.contextReady()
79
48
        onQuitRequested: root.quitRequested()
48
        onQuitRequested: root.quitRequested()
80
49
        onErrorScreenRequested: showErrorScreen(message)
81
49
    }
50
    }
82
50
51
83
51
    AccountsSplashScreen {
52
    AccountsSplashScreen {
84
@@ -61,6 +62,14 @@
85
61
        onSkip: accountsLogic.proceedWithNoAccount()
62
        onSkip: accountsLogic.proceedWithNoAccount()
86
62
    }
63
    }
87
63
64
88
65
    // Only temporarily used for bug https://bugs.launchpad.net/bugs/1441873
89
66
    AccountErrorScreen {
90
67
        id: errorScreen
91
68
92
69
        visible: false
93
70
        onClosed: root.quitRequested()
94
71
    }
95
72
96
64
    Loader {
73
    Loader {
97
65
        id: accountChooserLoader
74
        id: accountChooserLoader
98
66
        anchors.fill: parent
75
        anchors.fill: parent
99
@@ -104,6 +113,11 @@
100
104
        __setupProviderData()
113
        __setupProviderData()
101
105
    }
114
    }
102
106
115
103
116
    function showErrorScreen(message) {
104
117
        errorScreen.message = message
105
118
        errorScreen.visible = true
106
119
    }
107
120
108
107
    function showSplashScreen() {
121
    function showSplashScreen() {
109
108
        splashScreen.visible = true
122
        splashScreen.visible = true
110
109
    }
123
    }
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-06-23
Ubuntu Phablet Team		2015-05-13	Pending
Review via email: mp+258991@code.launchpad.net