Merge lp:~mardy/webbrowser-app/lp1441873 into lp:webbrowser-app

Proposed by Alberto Mardegan on 2015-05-13
Status: Merged
Approved by: David Barth on 2015-07-02
Approved revision: 991
Merged at revision: 1074
Proposed branch: lp:~mardy/webbrowser-app/lp1441873
Merge into: lp:webbrowser-app
Prerequisite: lp:~mardy/webbrowser-app/refactoring
Diff against target: 110 lines (+70/-0)
3 files modified
src/app/webcontainer/AccountErrorScreen.qml (+54/-0)
src/app/webcontainer/AccountsLogic.qml (+2/-0)
src/app/webcontainer/AccountsPage.qml (+14/-0)
To merge this branch: bzr merge lp:~mardy/webbrowser-app/lp1441873
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

Commit message

Show an error screen if the trust session could not be opened.

Description of the change

Show an error screen if the trust session could not be opened.

To post a comment you must log in.
lp:~mardy/webbrowser-app/lp1441873 updated on 2015-06-12
986. By Alberto Mardegan on 2015-06-12

merge refactoring
[ CI Train Bot ]
* Resync trunk.
[ Leo Arias ]
* Fix the base class used when launching the app in autopilot tests.
[ Leonardo Arias Fonseca ]
* Fix the base class used when launching the app in autopilot tests.
[ Olivier Tilloy ]
* Also set XDG_CONFIG_HOME (needed for tests not to override user-
  defined settings).
* Update translation template.
* Use the new Oxide APIs to better control visibility of the chrome.
  This bumps the runtime dependency on liboxideqt-qmlplugin to 1.7.
  (LP: #1441064, #1453908)
[ Riccardo Padovani ]
* Add support for data: URIs in the address bar, and remove length
  limitation for TLDs. (LP: #1377953, #1441281, #1450154)
* Add support for data: URIs in the address bar, and remove length
  limitation for TLDs. (LP: #1377953, #1441281, #1450154)
[ Ugo Riboni ]
* Add suggestions from search engines in the suggestions list. (LP:
  #1351151)

987. By Alberto Mardegan on 2015-06-12

merge refactoring

lp:~mardy/webbrowser-app/lp1441873 updated on 2015-06-17
988. By Alberto Mardegan on 2015-06-17

Store the initialized accounts as a JSON array

lp:~mardy/webbrowser-app/lp1441873 updated on 2015-06-18
989. By Alberto Mardegan on 2015-06-18

Properly propagate the session cookie mode.

lp:~mardy/webbrowser-app/lp1441873 updated on 2015-06-23
990. By Alberto Mardegan on 2015-06-23

Properly initialize variable

lp:~mardy/webbrowser-app/lp1441873 updated on 2015-06-23
991. By Alberto Mardegan on 2015-06-23

Update error message

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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+/*
6+ * Copyright 2015 Canonical Ltd.
7+ *
8+ * This file is part of webbrowser-app.
9+ *
10+ * webbrowser-app is free software; you can redistribute it and/or modify
11+ * it under the terms of the GNU General Public License as published by
12+ * the Free Software Foundation; version 3.
13+ *
14+ * webbrowser-app is distributed in the hope that it will be useful,
15+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
16+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+ * GNU General Public License for more details.
18+ *
19+ * You should have received a copy of the GNU General Public License
20+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
21+ */
22+
23+import QtQuick 2.0
24+import Ubuntu.Components 1.1
25+
26+Rectangle {
27+ id: root
28+
29+ property alias message: messageLabel.text
30+ signal closed()
31+
32+ anchors.fill: parent
33+
34+ Column {
35+ anchors.fill: parent
36+ anchors.margins: units.gu(4)
37+
38+ spacing: units.gu(3)
39+
40+ Label {
41+ width: parent.width
42+ fontSize: "x-large"
43+ text: i18n.tr("Account error")
44+ }
45+
46+ Label {
47+ id: messageLabel
48+ width: parent.width
49+ wrapMode: Text.Wrap
50+ }
51+
52+ Button {
53+ anchors.horizontalCenter: parent.horizontalCenter
54+ text: i18n.tr("Close")
55+ onClicked: root.closed()
56+ }
57+ }
58+}
59
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 onFinished: {
65 if ("accountId" in reply) {
66 root.checkAccounts()
67+ } else if ("errorName" in reply) {
68+ 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 } else {
70 root.quitRequested()
71 }
72
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 onAccountSelected: root.__emitAccountSelected(credentialsId, willMoveCookies)
78 onContextReady: root.contextReady()
79 onQuitRequested: root.quitRequested()
80+ onErrorScreenRequested: showErrorScreen(message)
81 }
82
83 AccountsSplashScreen {
84@@ -61,6 +62,14 @@
85 onSkip: accountsLogic.proceedWithNoAccount()
86 }
87
88+ // Only temporarily used for bug https://bugs.launchpad.net/bugs/1441873
89+ AccountErrorScreen {
90+ id: errorScreen
91+
92+ visible: false
93+ onClosed: root.quitRequested()
94+ }
95+
96 Loader {
97 id: accountChooserLoader
98 anchors.fill: parent
99@@ -104,6 +113,11 @@
100 __setupProviderData()
101 }
102
103+ function showErrorScreen(message) {
104+ errorScreen.message = message
105+ errorScreen.visible = true
106+ }
107+
108 function showSplashScreen() {
109 splashScreen.visible = true
110 }

Subscribers

People subscribed via source and target branches

to status/vote changes: