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

Proposed by dobey on 2016-03-17
Status: Merged
Approved by: Charles Kerr on 2016-03-24
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) 2016-03-17 Approve on 2016-03-24
PS Jenkins bot (community) continuous-integration 2016-03-17 Needs Fixing on 2016-03-17
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.
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~dobey/pay-service/payui-uitk1.3 updated on 2016-03-24
129. By dobey on 2016-03-18

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

130. By dobey on 2016-03-21

Use the correct object id for the webkit security popup.

131. By dobey on 2016-03-21

Missed a couple 1.3 imports.

132. By dobey on 2016-03-21

Change QtQuick imports to 2.4 too.

133. By dobey on 2016-03-21

Must use 2.0 for LocalStorage still.

134. By dobey on 2016-03-21

Fix typo.

135. By dobey on 2016-03-24

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

Charles Kerr (charlesk) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'pay-ui/app/components/AlertDialog.qml'
--- pay-ui/app/components/AlertDialog.qml 2016-03-08 21:28:56 +0000
+++ pay-ui/app/components/AlertDialog.qml 2016-03-24 19:13:21 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
2121
22ModalDialog {22ModalDialog {
23 objectName: "alertDialog"23 objectName: "alertDialog"
2424
=== modified file 'pay-ui/app/components/BeforeUnloadDialog.qml'
--- pay-ui/app/components/BeforeUnloadDialog.qml 2016-03-08 21:28:56 +0000
+++ pay-ui/app/components/BeforeUnloadDialog.qml 2016-03-24 19:13:21 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
2121
22ModalDialog {22ModalDialog {
23 title: i18n.dtr("webbrowser-app", "Confirm Navigation")23 title: i18n.dtr("webbrowser-app", "Confirm Navigation")
2424
=== modified file 'pay-ui/app/components/ConfirmDialog.qml'
--- pay-ui/app/components/ConfirmDialog.qml 2016-03-08 21:28:56 +0000
+++ pay-ui/app/components/ConfirmDialog.qml 2016-03-24 19:13:21 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
2121
22ModalDialog {22ModalDialog {
23 objectName: "confirmDialog"23 objectName: "confirmDialog"
2424
=== modified file 'pay-ui/app/components/ModalDialog.qml'
--- pay-ui/app/components/ModalDialog.qml 2016-03-08 21:28:56 +0000
+++ pay-ui/app/components/ModalDialog.qml 2016-03-24 19:13:21 +0000
@@ -16,9 +16,9 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import Ubuntu.Components.Popups 1.0 as Popups21import Ubuntu.Components.Popups 1.3 as Popups
2222
23Popups.Dialog {23Popups.Dialog {
24 text: model.message24 text: model.message
2525
=== modified file 'pay-ui/app/components/PromptDialog.qml'
--- pay-ui/app/components/PromptDialog.qml 2016-03-08 21:28:56 +0000
+++ pay-ui/app/components/PromptDialog.qml 2016-03-24 19:13:21 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
2121
22ModalDialog {22ModalDialog {
23 title: i18n.dtr("webbrowser-app", "JavaScript Prompt")23 title: i18n.dtr("webbrowser-app", "JavaScript Prompt")
2424
=== modified file 'pay-ui/app/components/SecurityCertificatePopover.qml'
--- pay-ui/app/components/SecurityCertificatePopover.qml 2016-03-08 21:28:56 +0000
+++ pay-ui/app/components/SecurityCertificatePopover.qml 2016-03-24 19:13:21 +0000
@@ -16,10 +16,10 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.021import Ubuntu.Components.ListItems 1.3
22import Ubuntu.Components.Popups 1.022import Ubuntu.Components.Popups 1.3
23import payui 0.1 as Oxide23import payui 0.1 as Oxide
2424
25Popover {25Popover {
2626
=== modified file 'pay-ui/app/payui.qml'
--- pay-ui/app/payui.qml 2016-03-24 19:13:21 +0000
+++ pay-ui/app/payui.qml 2016-03-24 19:13:21 +0000
@@ -14,10 +14,10 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import QtQuick.LocalStorage 2.018import QtQuick.LocalStorage 2.0
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 0.120import Ubuntu.Components.Popups 1.3
21import Ubuntu.OnlineAccounts 0.121import Ubuntu.OnlineAccounts 0.1
22import Ubuntu.OnlineAccounts.Client 0.122import Ubuntu.OnlineAccounts.Client 0.1
23import payui 0.123import payui 0.1
@@ -49,8 +49,6 @@
49 width: units.gu(100)49 width: units.gu(100)
50 height: units.gu(75)50 height: units.gu(75)
5151
52 useDeprecatedToolbar: false
53
54 property bool loading: false52 property bool loading: false
55 property bool purchasing: false53 property bool purchasing: false
56 property bool recentLogin: false54 property bool recentLogin: false
@@ -112,7 +110,7 @@
112 checkout.setSelectedItem();110 checkout.setSelectedItem();
113111
114 mainView.state = "checkout";112 mainView.state = "checkout";
115 pageStack.push(checkout);113 checkout.visible = true;
116114
117 hideLoading();115 hideLoading();
118 }116 }
119117
=== modified file 'pay-ui/app/ui/CheckoutPage.qml'
--- pay-ui/app/ui/CheckoutPage.qml 2016-03-08 21:28:56 +0000
+++ pay-ui/app/ui/CheckoutPage.qml 2016-03-24 19:13:21 +0000
@@ -14,17 +14,29 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import Ubuntu.Components 1.118import Ubuntu.Components 1.3
19import Ubuntu.Components.ListItems 0.1 as ListItem19import Ubuntu.Components.ListItems 1.3 as ListItem
20import Ubuntu.Components.Popups 0.120import Ubuntu.Components.Popups 1.3
21import payui 0.1 as Oxide21import payui 0.1 as Oxide
22import "../components"22import "../components"
2323
24Page {24Page {
25 id: pageCheckout25 id: pageCheckout
2626
27 title: i18n.tr("Payment")27 header: PageHeader {
28 title: i18n.tr("Payment")
29 trailingActionBar.actions: [
30 Action {
31 id: lockAction
32 iconName: pageCheckout.securityStatus.securityLevel == Oxide.SecurityStatus.SecurityLevelSecure ? "lock" : "security-alert"
33 onTriggered: {
34 PopupUtils.open(popoverComponent, lockIconPlace, {"securityStatus": pageCheckout.securityStatus})
35 }
36 }
37 ]
38 flickable: checkoutFlickable
39 }
2840
29 property int keyboardSize: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 041 property int keyboardSize: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
30 property alias selectedItem: paymentTypes.selectedIndex42 property alias selectedItem: paymentTypes.selectedIndex
@@ -83,16 +95,6 @@
83 property var certificate: null95 property var certificate: null
84 }96 }
8597
86 head.actions:[
87 Action {
88 id: lockAction
89 iconName: pageCheckout.securityStatus.securityLevel == Oxide.SecurityStatus.SecurityLevelSecure ? "lock" : "security-alert"
90 onTriggered: {
91 PopupUtils.open(popoverComponent, lockIconPlace, {"securityStatus": pageCheckout.securityStatus})
92 }
93 }
94 ]
95
96 Component {98 Component {
97 id: popoverComponent99 id: popoverComponent
98100
@@ -110,8 +112,6 @@
110 top: parent.top112 top: parent.top
111 }113 }
112114
113 contentHeight: contentItem.childrenRect.height + pageCheckout.keyboardSize
114
115 Item {115 Item {
116 id: header116 id: header
117 height: units.gu(8)117 height: units.gu(8)
@@ -213,7 +213,7 @@
213 }213 }
214 height: units.gu(2)214 height: units.gu(2)
215 enabled: false215 enabled: false
216 delegate: Label {216 delegate: Text {
217 id: ubuntuIdLabel217 id: ubuntuIdLabel
218 objectName: "ubuntuIdLabel"218 objectName: "ubuntuIdLabel"
219 text: model.displayName219 text: model.displayName
220220
=== modified file 'pay-ui/app/ui/ErrorDialog.qml'
--- pay-ui/app/ui/ErrorDialog.qml 2016-03-08 21:28:56 +0000
+++ pay-ui/app/ui/ErrorDialog.qml 2016-03-24 19:13:21 +0000
@@ -14,9 +14,9 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import Ubuntu.Components 0.118import Ubuntu.Components 1.3
19import Ubuntu.Components.Popups 0.119import Ubuntu.Components.Popups 1.3
2020
21Item {21Item {
22 id: dialogErrorItem22 id: dialogErrorItem
2323
=== modified file 'pay-ui/app/ui/UbuntuPurchaseWebkit.qml'
--- pay-ui/app/ui/UbuntuPurchaseWebkit.qml 2016-03-24 19:13:21 +0000
+++ pay-ui/app/ui/UbuntuPurchaseWebkit.qml 2016-03-24 19:13:21 +0000
@@ -14,10 +14,11 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import Ubuntu.Components 1.118import Ubuntu.Components 1.3
19import Ubuntu.Components.Popups 0.119import Ubuntu.Components.Popups 1.3
20import Ubuntu.Web 0.220import Ubuntu.Web 0.2
21import payui 0.1 as Oxide
21import "../components"22import "../components"
2223
2324
@@ -32,6 +33,7 @@
3233
33 property int keyboardSize: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 034 property int keyboardSize: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
34 property alias url: webView.url35 property alias url: webView.url
36 property alias title: pageHeader.title
35 property var securityStatus: webView.securityStatus37 property var securityStatus: webView.securityStatus
3638
37 function parseQuery(url) {39 function parseQuery(url) {
@@ -55,15 +57,19 @@
55 return argsParsed;57 return argsParsed;
56 }58 }
5759
58 head.actions:[60 header: PageHeader {
59 Action {61 id: pageHeader
60 id: lockAction62 title: ""
61 iconName: pageWebkit.securityStatus.securityLevel ? "lock" : "security-alert"63 trailingActionBar.actions: [
62 onTriggered: {64 Action {
63 PopupUtils.open(popoverComponent, lockIconPlace, {"securityStatus": pageWebkit.securityStatus})65 id: lockAction
66 iconName: pageWebkit.securityStatus.securityLevel == Oxide.SecurityStatus.SecurityLevelSecure ? "lock" : "security-alert"
67 onTriggered: {
68 PopupUtils.open(popoverComponent, lockIconPlace, {"securityStatus": pageWebkit.securityStatus})
69 }
64 }70 }
65 }71 ]
66 ]72 }
6773
68 Component {74 Component {
69 id: popoverComponent75 id: popoverComponent
@@ -78,6 +84,7 @@
78 id: webView84 id: webView
79 objectName: "webView"85 objectName: "webView"
80 anchors.fill: parent86 anchors.fill: parent
87 anchors.topMargin: pageHeader.height
81 anchors.bottomMargin: pageWebkit.keyboardSize88 anchors.bottomMargin: pageWebkit.keyboardSize
8289
83 // We need to specify the dialogs to use for JS dialogs here.90 // We need to specify the dialogs to use for JS dialogs here.

Subscribers

People subscribed via source and target branches

to all changes: