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

Proposed by Diego Sarmentero on 2013-10-04
Status: Merged
Approved by: Diego Sarmentero on 2013-10-07
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 on 2013-10-04
Roberto Alsina (community) 2013-10-04 Approve on 2013-10-04
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 on 2013-10-04

fixing tests

Roberto Alsina (ralsina) wrote :

Looks good.

review: Approve
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
1=== modified file 'Components/PageUpdate.qml'
2--- Components/PageUpdate.qml 2013-09-27 18:30:17 +0000
3+++ Components/PageUpdate.qml 2013-10-04 12:26:39 +0000
4@@ -55,7 +55,7 @@
5 onCredentialsNotFound: {
6 loadingIndicator.visible = false;
7 installAllButton.visible = false;
8- labelMessage.text = i18n.tr("Please log into your Ubuntu One account in System Settings.")
9+ labelMessage.text = i18n.tr("Please log into your Ubuntu One account in <a href='settings:///system/online-accounts'>System Settings</a>.");
10 labelMessage.visible = true;
11 }
12 }
13@@ -260,6 +260,11 @@
14 wrapMode: Text.WrapAtWordBoundaryOrAnywhere
15 visible: false
16 fontSize: "x-large"
17+
18+ linkColor: UbuntuColors.orange
19+ onLinkActivated: {
20+ Qt.openUrlExternally(link);
21+ }
22 }
23
24 Rectangle {
25
26=== modified file 'tests/unit/tst_pageupdate.qml'
27--- tests/unit/tst_pageupdate.qml 2013-09-30 11:59:01 +0000
28+++ tests/unit/tst_pageupdate.qml 2013-10-04 12:26:39 +0000
29@@ -139,7 +139,7 @@
30 compare(labelMessage.visible, true, "labelMessage should be visible if there isn't a model");
31 compare(installAllButton.visible, false, "installAllButton should not be visible if there isn't a model");
32 compare(loadingIndicator.visible, false, "loadingIndicator should not be visible if there isn't a model");
33- compare(labelMessage.text, i18n.tr("Please log into your Ubuntu One account in System Settings."), "labelMessage text doesn't match");
34+ 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");
35 }
36
37 function test_check_children() {

Subscribers

People subscribed via source and target branches