unity-scope-click

Merge lp:~stolowski/unity-scope-click/fix-1542854 into lp:unity-scope-click

  1. fix-1542854
  2. Merge into trunk
Proposed by Paweł Stołowski
Status: Merged
Approved by: dobey
Approved revision: 445
Merged at revision: 452
Proposed branch: lp:~stolowski/unity-scope-click/fix-1542854
Merge into: lp:unity-scope-click
Diff against target: 36 lines (+4/-4)
2 files modified
libclickscope/click/preview.cpp (+3/-3)
libclickscope/click/preview.h (+1/-1)
To merge this branch: bzr merge lp:~stolowski/unity-scope-click/fix-1542854
Reviewer Review Type Date Requested Status
dobey (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+293796@code.launchpad.net

Commit message

Use text widget to display error strings.

Description of the change

Use text widget to display error strings - this is how it looks: http://i.imgur.com/pMhFv78.png

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

FAILED: Continuous integration, rev:445
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/737/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/141/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/137/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/737/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
dobey (dobey) wrote :

Looks ok. And thanks for the screen shot.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libclickscope/click/preview.cpp'
2--- libclickscope/click/preview.cpp 2016-04-01 17:16:05 +0000
3+++ libclickscope/click/preview.cpp 2016-05-05 07:27:22 +0000
4@@ -623,16 +623,16 @@
5 }
6
7 scopes::PreviewWidgetList PreviewStrategy::errorWidgets(const scopes::Variant& title,
8- const scopes::Variant& subtitle,
9+ const scopes::Variant& summary,
10 const scopes::Variant& action_id,
11 const scopes::Variant& action_label,
12 const scopes::Variant& uri)
13 {
14 scopes::PreviewWidgetList widgets;
15
16- scopes::PreviewWidget header("hdr", "header");
17+ scopes::PreviewWidget header("hdr", "text");
18 header.add_attribute_value("title", title);
19- header.add_attribute_value("subtitle", subtitle);
20+ header.add_attribute_value("text", summary);
21 widgets.push_back(header);
22
23 scopes::PreviewWidget buttons("buttons", "actions");
24
25=== modified file 'libclickscope/click/preview.h'
26--- libclickscope/click/preview.h 2016-03-07 14:10:27 +0000
27+++ libclickscope/click/preview.h 2016-05-05 07:27:22 +0000
28@@ -186,7 +186,7 @@
29 virtual scopes::PreviewWidgetList downloadErrorWidgets();
30 virtual scopes::PreviewWidgetList loginErrorWidgets(const std::string& download_url, const std::string& download_sha512);
31 virtual scopes::PreviewWidgetList errorWidgets(const scopes::Variant& title,
32- const scopes::Variant& subtitle,
33+ const scopes::Variant& summary,
34 const scopes::Variant& action_id,
35 const scopes::Variant& action_label,
36 const scopes::Variant& action_uri = scopes::Variant::null());

Subscribers

People subscribed via source and target branches