Merge lp:~diegosarmentero/click-update-manager/settings-link into lp:click-update-manager

Proposed by Diego Sarmentero
Status: Merged
Approved by: Diego Sarmentero
Approved revision: 33
Merged at revision: 31
Proposed branch: lp:~diegosarmentero/click-update-manager/settings-link
Merge into: lp:click-update-manager
Diff against target: 37 lines (+7/-2)
2 files modified
Components/PageUpdate.qml (+6/-1)
tests/unit/tst_pageupdate.qml (+1/-1)
To merge this branch: bzr merge lp:~diegosarmentero/click-update-manager/settings-link
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Roberto Alsina (community) Approve
Review via email: mp+189294@code.launchpad.net

Commit message

- Add link to System Settings / Accounts when credentials are not found (BUG: #1235223).

Description of the change

When credentials are not found the following message is shown:

"Please log into your Ubuntu One account in System Settings."

"System Settings" is an orange highlighted link that allows the user to open System Settings in the Account section directly from there.

(This is only supported in the phone/tablet right now)

To post a comment you must log in.
33. By Diego Sarmentero

fixing tests

Revision history for this message
Roberto Alsina (ralsina) wrote :

Looks good.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Components/PageUpdate.qml'
--- Components/PageUpdate.qml 2013-09-27 18:30:17 +0000
+++ Components/PageUpdate.qml 2013-10-04 12:26:39 +0000
@@ -55,7 +55,7 @@
55 onCredentialsNotFound: {55 onCredentialsNotFound: {
56 loadingIndicator.visible = false;56 loadingIndicator.visible = false;
57 installAllButton.visible = false;57 installAllButton.visible = false;
58 labelMessage.text = i18n.tr("Please log into your Ubuntu One account in System Settings.")58 labelMessage.text = i18n.tr("Please log into your Ubuntu One account in <a href='settings:///system/online-accounts'>System Settings</a>.");
59 labelMessage.visible = true;59 labelMessage.visible = true;
60 }60 }
61 }61 }
@@ -260,6 +260,11 @@
260 wrapMode: Text.WrapAtWordBoundaryOrAnywhere260 wrapMode: Text.WrapAtWordBoundaryOrAnywhere
261 visible: false261 visible: false
262 fontSize: "x-large"262 fontSize: "x-large"
263
264 linkColor: UbuntuColors.orange
265 onLinkActivated: {
266 Qt.openUrlExternally(link);
267 }
263 }268 }
264269
265 Rectangle {270 Rectangle {
266271
=== modified file 'tests/unit/tst_pageupdate.qml'
--- tests/unit/tst_pageupdate.qml 2013-09-30 11:59:01 +0000
+++ tests/unit/tst_pageupdate.qml 2013-10-04 12:26:39 +0000
@@ -139,7 +139,7 @@
139 compare(labelMessage.visible, true, "labelMessage should be visible if there isn't a model");139 compare(labelMessage.visible, true, "labelMessage should be visible if there isn't a model");
140 compare(installAllButton.visible, false, "installAllButton should not be visible if there isn't a model");140 compare(installAllButton.visible, false, "installAllButton should not be visible if there isn't a model");
141 compare(loadingIndicator.visible, false, "loadingIndicator should not be visible if there isn't a model");141 compare(loadingIndicator.visible, false, "loadingIndicator should not be visible if there isn't a model");
142 compare(labelMessage.text, i18n.tr("Please log into your Ubuntu One account in System Settings."), "labelMessage text doesn't match");142 compare(labelMessage.text, i18n.tr("Please log into your Ubuntu One account in <a href='settings:///system/online-accounts'>System Settings</a>."), "labelMessage text doesn't match");
143 }143 }
144144
145 function test_check_children() {145 function test_check_children() {

Subscribers

People subscribed via source and target branches