Merge lp:~mardy/ubuntu-system-settings-online-accounts/ui-bugs into lp:ubuntu-system-settings-online-accounts

Proposed by Alberto Mardegan on 2014-03-12
Status: Merged
Merged at revision: 106
Proposed branch: lp:~mardy/ubuntu-system-settings-online-accounts/ui-bugs
Merge into: lp:ubuntu-system-settings-online-accounts
Diff against target: 120 lines (+11/-15)
5 files modified
src/module/OAuth.qml (+4/-4)
src/module/OAuthMain.qml (+3/-6)
src/qml/AddAccountLabel.qml (+1/-2)
src/qml/MainPage.qml (+1/-1)
src/qml/ProviderRequest.qml (+2/-2)
To merge this branch: bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/ui-bugs
Reviewer Review Type Date Requested Status
Alexandre Abreu (community) 2014-03-12 Approve on 2014-03-13
David Barth (community) 2014-03-12 Approve on 2014-03-12
PS Jenkins bot (community) continuous-integration Approve on 2014-03-12
Review via email: mp+210628@code.launchpad.net

Commit message

Fix a few UI issues:

- Application title should be "Accounts"
- Explanatory text should use the Caption style
- Cancel button when starting the OAuth process moved to the bottom of the page

(see the linked bugs for details)

Description of the change

Fix a few UI issues:

- Application title should be "Accounts"
- Explanatory text should use the Caption style
- Cancel button when starting the OAuth process moved to the bottom of the page

(see the linked bugs for details)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/module/OAuth.qml'
2--- src/module/OAuth.qml 2014-02-03 10:27:39 +0000
3+++ src/module/OAuth.qml 2014-03-12 15:20:23 +0000
4@@ -21,7 +21,7 @@
5 import Ubuntu.Components.ListItems 0.1 as ListItem
6 import Ubuntu.OnlineAccounts 0.1
7
8-Column {
9+Item {
10 id: root
11
12 /* To override the parameters coming from the .provider file: */
13@@ -40,9 +40,7 @@
14 signal authenticationError(variant error)
15 signal finished
16
17- anchors.left: parent.left
18- anchors.right: parent.right
19- spacing: units.gu(2)
20+ anchors.fill: parent
21
22 Component.onCompleted: {
23 isNewAccount = (account.accountId === 0)
24@@ -84,6 +82,7 @@
25 visible: loading
26 height: units.gu(7)
27 showDivider: false
28+ anchors.top: parent.top
29
30 Item {
31 height: units.gu(5)
32@@ -110,6 +109,7 @@
33 }
34
35 ListItem.SingleControl {
36+ anchors.bottom: parent.bottom
37 showDivider: false
38 control: Button {
39 text: i18n.dtr("ubuntu-system-settings-online-accounts", "Cancel")
40
41=== modified file 'src/module/OAuthMain.qml'
42--- src/module/OAuthMain.qml 2013-06-05 11:33:39 +0000
43+++ src/module/OAuthMain.qml 2014-03-12 15:20:23 +0000
44@@ -20,7 +20,7 @@
45 import Ubuntu.Components 0.1
46 import Ubuntu.OnlineAccounts 0.1
47
48-Flickable {
49+Item {
50 id: root
51
52 property url creationComponentUrl: "OAuth.qml"
53@@ -32,14 +32,11 @@
54
55 signal finished
56
57- anchors.left: parent.left
58- anchors.right: parent.right
59- contentHeight: contentItem.childrenRect.height
60+ anchors.fill: parent
61
62 Loader {
63 id: loader
64- anchors.left: parent.left
65- anchors.right: parent.right
66+ anchors.fill: parent
67 source: sourceComponent === null ? (account.accountId != 0 ? editingComponentUrl : creationComponentUrl) : ""
68 sourceComponent: account.accountId != 0 ? editingComponent : creationComponent
69
70
71=== modified file 'src/qml/AddAccountLabel.qml'
72--- src/qml/AddAccountLabel.qml 2013-09-09 10:56:53 +0000
73+++ src/qml/AddAccountLabel.qml 2014-03-12 15:20:23 +0000
74@@ -20,10 +20,9 @@
75 import Ubuntu.Components 0.1
76 import Ubuntu.Components.ListItems 0.1 as ListItem
77
78-Label {
79+ListItem.Caption {
80 anchors.left: parent.left
81 anchors.right: parent.right
82 anchors.margins: units.gu(2)
83 text: i18n.tr("Storing account details here lets apps use the accounts without you having to sign in for each app.")
84- wrapMode: Text.WordWrap
85 }
86
87=== modified file 'src/qml/MainPage.qml'
88--- src/qml/MainPage.qml 2013-09-09 10:56:53 +0000
89+++ src/qml/MainPage.qml 2014-03-12 15:20:23 +0000
90@@ -39,7 +39,7 @@
91
92 Page {
93 id: mainPage
94- title: i18n.tr("Online Accounts")
95+ title: i18n.tr("Accounts")
96
97 Loader {
98 id: loader
99
100=== modified file 'src/qml/ProviderRequest.qml'
101--- src/qml/ProviderRequest.qml 2014-02-03 10:27:39 +0000
102+++ src/qml/ProviderRequest.qml 2014-03-12 15:20:23 +0000
103@@ -47,7 +47,7 @@
104
105 Page {
106 id: mainPage
107- title: i18n.tr("Online Accounts")
108+ title: i18n.tr("Accounts")
109
110 Loader {
111 id: loader
112@@ -115,7 +115,7 @@
113 Component {
114 id: createAccountPageComponent
115 Page {
116- title: i18n.tr("Online Accounts")
117+ title: i18n.tr("Accounts")
118 Loader {
119 anchors.fill: parent
120 sourceComponent: accountCreationPage

Subscribers

People subscribed via source and target branches