Pay Service

Merge lp:~dobey/pay-service/payui-uitk1.3 into lp:pay-service

  1. payui-uitk1.3
  2. Merge into trunk.15.10
Proposed by dobey
Status: Merged
Approved by: Charles Kerr
Approved revision: 135
Merged at revision: 102
Proposed branch: lp:~dobey/pay-service/payui-uitk1.3
Merge into: lp:pay-service
Prerequisite: lp:~dobey/pay-service/nonus-methods
Diff against target: 285 lines (+58/-53)
10 files modified
pay-ui/app/components/AlertDialog.qml (+2/-2)
pay-ui/app/components/BeforeUnloadDialog.qml (+2/-2)
pay-ui/app/components/ConfirmDialog.qml (+2/-2)
pay-ui/app/components/ModalDialog.qml (+3/-3)
pay-ui/app/components/PromptDialog.qml (+2/-2)
pay-ui/app/components/SecurityCertificatePopover.qml (+4/-4)
pay-ui/app/payui.qml (+4/-6)
pay-ui/app/ui/CheckoutPage.qml (+18/-18)
pay-ui/app/ui/ErrorDialog.qml (+3/-3)
pay-ui/app/ui/UbuntuPurchaseWebkit.qml (+18/-11)
To merge this branch: bzr merge lp:~dobey/pay-service/payui-uitk1.3
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+289421@code.launchpad.net

Commit message

Migrate all usage of Ubuntu.Components to 1.3.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:128
http://jenkins.qa.ubuntu.com/job/pay-service-ci/156/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-service-wily-amd64-ci/86/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-service-wily-armhf-ci/86/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-service-ci/156/rebuild

review: Needs Fixing (continuous-integration)
lp:~dobey/pay-service/payui-uitk1.3 updated
129. By dobey

Update page headers for uitk 1.3 too.
Just make checkoutpage visible instead of pushing it to pagestack again.

130. By dobey

Use the correct object id for the webkit security popup.

131. By dobey

Missed a couple 1.3 imports.

132. By dobey

Change QtQuick imports to 2.4 too.

133. By dobey

Must use 2.0 for LocalStorage still.

134. By dobey

Fix typo.

135. By dobey

Use Text instead of Label for accountView.delegate to workaround #1560044.

Revision history for this message
Charles Kerr (charlesk) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'pay-ui/app/components/AlertDialog.qml'
2--- pay-ui/app/components/AlertDialog.qml 2016-03-08 21:28:56 +0000
3+++ pay-ui/app/components/AlertDialog.qml 2016-03-24 19:13:21 +0000
4@@ -16,8 +16,8 @@
5 * along with this program. If not, see <http://www.gnu.org/licenses/>.
6 */
7
8-import QtQuick 2.0
9-import Ubuntu.Components 1.1
10+import QtQuick 2.4
11+import Ubuntu.Components 1.3
12
13 ModalDialog {
14 objectName: "alertDialog"
15
16=== modified file 'pay-ui/app/components/BeforeUnloadDialog.qml'
17--- pay-ui/app/components/BeforeUnloadDialog.qml 2016-03-08 21:28:56 +0000
18+++ pay-ui/app/components/BeforeUnloadDialog.qml 2016-03-24 19:13:21 +0000
19@@ -16,8 +16,8 @@
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+import QtQuick 2.4
26+import Ubuntu.Components 1.3
27
28 ModalDialog {
29 title: i18n.dtr("webbrowser-app", "Confirm Navigation")
30
31=== modified file 'pay-ui/app/components/ConfirmDialog.qml'
32--- pay-ui/app/components/ConfirmDialog.qml 2016-03-08 21:28:56 +0000
33+++ pay-ui/app/components/ConfirmDialog.qml 2016-03-24 19:13:21 +0000
34@@ -16,8 +16,8 @@
35 * along with this program. If not, see <http://www.gnu.org/licenses/>.
36 */
37
38-import QtQuick 2.0
39-import Ubuntu.Components 1.1
40+import QtQuick 2.4
41+import Ubuntu.Components 1.3
42
43 ModalDialog {
44 objectName: "confirmDialog"
45
46=== modified file 'pay-ui/app/components/ModalDialog.qml'
47--- pay-ui/app/components/ModalDialog.qml 2016-03-08 21:28:56 +0000
48+++ pay-ui/app/components/ModalDialog.qml 2016-03-24 19:13:21 +0000
49@@ -16,9 +16,9 @@
50 * along with this program. If not, see <http://www.gnu.org/licenses/>.
51 */
52
53-import QtQuick 2.0
54-import Ubuntu.Components 1.1
55-import Ubuntu.Components.Popups 1.0 as Popups
56+import QtQuick 2.4
57+import Ubuntu.Components 1.3
58+import Ubuntu.Components.Popups 1.3 as Popups
59
60 Popups.Dialog {
61 text: model.message
62
63=== modified file 'pay-ui/app/components/PromptDialog.qml'
64--- pay-ui/app/components/PromptDialog.qml 2016-03-08 21:28:56 +0000
65+++ pay-ui/app/components/PromptDialog.qml 2016-03-24 19:13:21 +0000
66@@ -16,8 +16,8 @@
67 * along with this program. If not, see <http://www.gnu.org/licenses/>.
68 */
69
70-import QtQuick 2.0
71-import Ubuntu.Components 1.1
72+import QtQuick 2.4
73+import Ubuntu.Components 1.3
74
75 ModalDialog {
76 title: i18n.dtr("webbrowser-app", "JavaScript Prompt")
77
78=== modified file 'pay-ui/app/components/SecurityCertificatePopover.qml'
79--- pay-ui/app/components/SecurityCertificatePopover.qml 2016-03-08 21:28:56 +0000
80+++ pay-ui/app/components/SecurityCertificatePopover.qml 2016-03-24 19:13:21 +0000
81@@ -16,10 +16,10 @@
82 * along with this program. If not, see <http://www.gnu.org/licenses/>.
83 */
84
85-import QtQuick 2.0
86-import Ubuntu.Components 1.1
87-import Ubuntu.Components.ListItems 1.0
88-import Ubuntu.Components.Popups 1.0
89+import QtQuick 2.4
90+import Ubuntu.Components 1.3
91+import Ubuntu.Components.ListItems 1.3
92+import Ubuntu.Components.Popups 1.3
93 import payui 0.1 as Oxide
94
95 Popover {
96
97=== modified file 'pay-ui/app/payui.qml'
98--- pay-ui/app/payui.qml 2016-03-24 19:13:21 +0000
99+++ pay-ui/app/payui.qml 2016-03-24 19:13:21 +0000
100@@ -14,10 +14,10 @@
101 * along with this program. If not, see <http://www.gnu.org/licenses/>.
102 */
103
104-import QtQuick 2.0
105+import QtQuick 2.4
106 import QtQuick.LocalStorage 2.0
107-import Ubuntu.Components 1.1
108-import Ubuntu.Components.Popups 0.1
109+import Ubuntu.Components 1.3
110+import Ubuntu.Components.Popups 1.3
111 import Ubuntu.OnlineAccounts 0.1
112 import Ubuntu.OnlineAccounts.Client 0.1
113 import payui 0.1
114@@ -49,8 +49,6 @@
115 width: units.gu(100)
116 height: units.gu(75)
117
118- useDeprecatedToolbar: false
119-
120 property bool loading: false
121 property bool purchasing: false
122 property bool recentLogin: false
123@@ -112,7 +110,7 @@
124 checkout.setSelectedItem();
125
126 mainView.state = "checkout";
127- pageStack.push(checkout);
128+ checkout.visible = true;
129
130 hideLoading();
131 }
132
133=== modified file 'pay-ui/app/ui/CheckoutPage.qml'
134--- pay-ui/app/ui/CheckoutPage.qml 2016-03-08 21:28:56 +0000
135+++ pay-ui/app/ui/CheckoutPage.qml 2016-03-24 19:13:21 +0000
136@@ -14,17 +14,29 @@
137 * along with this program. If not, see <http://www.gnu.org/licenses/>.
138 */
139
140-import QtQuick 2.0
141-import Ubuntu.Components 1.1
142-import Ubuntu.Components.ListItems 0.1 as ListItem
143-import Ubuntu.Components.Popups 0.1
144+import QtQuick 2.4
145+import Ubuntu.Components 1.3
146+import Ubuntu.Components.ListItems 1.3 as ListItem
147+import Ubuntu.Components.Popups 1.3
148 import payui 0.1 as Oxide
149 import "../components"
150
151 Page {
152 id: pageCheckout
153
154- title: i18n.tr("Payment")
155+ header: PageHeader {
156+ title: i18n.tr("Payment")
157+ trailingActionBar.actions: [
158+ Action {
159+ id: lockAction
160+ iconName: pageCheckout.securityStatus.securityLevel == Oxide.SecurityStatus.SecurityLevelSecure ? "lock" : "security-alert"
161+ onTriggered: {
162+ PopupUtils.open(popoverComponent, lockIconPlace, {"securityStatus": pageCheckout.securityStatus})
163+ }
164+ }
165+ ]
166+ flickable: checkoutFlickable
167+ }
168
169 property int keyboardSize: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
170 property alias selectedItem: paymentTypes.selectedIndex
171@@ -83,16 +95,6 @@
172 property var certificate: null
173 }
174
175- head.actions:[
176- Action {
177- id: lockAction
178- iconName: pageCheckout.securityStatus.securityLevel == Oxide.SecurityStatus.SecurityLevelSecure ? "lock" : "security-alert"
179- onTriggered: {
180- PopupUtils.open(popoverComponent, lockIconPlace, {"securityStatus": pageCheckout.securityStatus})
181- }
182- }
183- ]
184-
185 Component {
186 id: popoverComponent
187
188@@ -110,8 +112,6 @@
189 top: parent.top
190 }
191
192- contentHeight: contentItem.childrenRect.height + pageCheckout.keyboardSize
193-
194 Item {
195 id: header
196 height: units.gu(8)
197@@ -213,7 +213,7 @@
198 }
199 height: units.gu(2)
200 enabled: false
201- delegate: Label {
202+ delegate: Text {
203 id: ubuntuIdLabel
204 objectName: "ubuntuIdLabel"
205 text: model.displayName
206
207=== modified file 'pay-ui/app/ui/ErrorDialog.qml'
208--- pay-ui/app/ui/ErrorDialog.qml 2016-03-08 21:28:56 +0000
209+++ pay-ui/app/ui/ErrorDialog.qml 2016-03-24 19:13:21 +0000
210@@ -14,9 +14,9 @@
211 * along with this program. If not, see <http://www.gnu.org/licenses/>.
212 */
213
214-import QtQuick 2.0
215-import Ubuntu.Components 0.1
216-import Ubuntu.Components.Popups 0.1
217+import QtQuick 2.4
218+import Ubuntu.Components 1.3
219+import Ubuntu.Components.Popups 1.3
220
221 Item {
222 id: dialogErrorItem
223
224=== modified file 'pay-ui/app/ui/UbuntuPurchaseWebkit.qml'
225--- pay-ui/app/ui/UbuntuPurchaseWebkit.qml 2016-03-24 19:13:21 +0000
226+++ pay-ui/app/ui/UbuntuPurchaseWebkit.qml 2016-03-24 19:13:21 +0000
227@@ -14,10 +14,11 @@
228 * along with this program. If not, see <http://www.gnu.org/licenses/>.
229 */
230
231-import QtQuick 2.0
232-import Ubuntu.Components 1.1
233-import Ubuntu.Components.Popups 0.1
234+import QtQuick 2.4
235+import Ubuntu.Components 1.3
236+import Ubuntu.Components.Popups 1.3
237 import Ubuntu.Web 0.2
238+import payui 0.1 as Oxide
239 import "../components"
240
241
242@@ -32,6 +33,7 @@
243
244 property int keyboardSize: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
245 property alias url: webView.url
246+ property alias title: pageHeader.title
247 property var securityStatus: webView.securityStatus
248
249 function parseQuery(url) {
250@@ -55,15 +57,19 @@
251 return argsParsed;
252 }
253
254- head.actions:[
255- Action {
256- id: lockAction
257- iconName: pageWebkit.securityStatus.securityLevel ? "lock" : "security-alert"
258- onTriggered: {
259- PopupUtils.open(popoverComponent, lockIconPlace, {"securityStatus": pageWebkit.securityStatus})
260+ header: PageHeader {
261+ id: pageHeader
262+ title: ""
263+ trailingActionBar.actions: [
264+ Action {
265+ id: lockAction
266+ iconName: pageWebkit.securityStatus.securityLevel == Oxide.SecurityStatus.SecurityLevelSecure ? "lock" : "security-alert"
267+ onTriggered: {
268+ PopupUtils.open(popoverComponent, lockIconPlace, {"securityStatus": pageWebkit.securityStatus})
269+ }
270 }
271- }
272- ]
273+ ]
274+ }
275
276 Component {
277 id: popoverComponent
278@@ -78,6 +84,7 @@
279 id: webView
280 objectName: "webView"
281 anchors.fill: parent
282+ anchors.topMargin: pageHeader.height
283 anchors.bottomMargin: pageWebkit.keyboardSize
284
285 // We need to specify the dialogs to use for JS dialogs here.

Subscribers

People subscribed via source and target branches

to all changes: