unity-scopes-api

Merge lp:~michihenning/unity-scopes-api/header-background into lp:unity-scopes-api/devel

  1. header-background
  2. Merge into devel
Proposed by Michi Henning
Status: Merged
Approved by: Marcus Tomlinson
Approved revision: 671
Merged at revision: 671
Proposed branch: lp:~michihenning/unity-scopes-api/header-background
Merge into: lp:unity-scopes-api/devel
Diff against target: 67 lines (+0/-6)
5 files modified
doc/tutorial.dox (+0/-1)
scoperegistry/scoperegistry.cpp (+0/-1)
src/scopes/internal/ScopeConfig.cpp (+0/-2)
test/gtest/scopes/Registry/Registry_test.cpp (+0/-1)
test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.ini.in (+0/-1)
To merge this branch: bzr merge lp:~michihenning/unity-scopes-api/header-background
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Marcus Tomlinson (community) Approve
Review via email: mp+290584@code.launchpad.net

Commit message

Got rid of category header background, as per design.

Description of the change

Got rid of category header background, as per design.

To post a comment you must log in.
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

Missed one: scoperegistry.cpp:341

review: Needs Fixing
lp:~michihenning/unity-scopes-api/header-background updated
671. By Michi Henning

Removed one more category-header-background spotted by Marcus.

Revision history for this message
Michi Henning (michihenning) wrote :

Ouch :-( Thanks for spotting that!

Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

> Ouch :-( Thanks for spotting that!

Np, looks good.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/tutorial.dox'
2--- doc/tutorial.dox 2016-03-16 12:35:22 +0000
3+++ doc/tutorial.dox 2016-04-01 06:08:31 +0000
4@@ -1430,7 +1430,6 @@
5 ForegroundColor = default text color (defaults to theme-provided foreground color)
6 BackgroundColor = color of scope background (default is transparent)
7 ShapeImages = whether to use Ubuntu-shape for all cards and artwork (defaults to true)
8- CategoryHeaderBackground = background scheme of the results categories
9 PreviewButtonColor = color of preview buttons (defaults to theme-provided color)
10 LogoOverlayColor = color for the overlay in scopes overview (defaults to semi-transparent black)
11 PageHeader.Logo = image containing scope's logo
12
13=== modified file 'scoperegistry/scoperegistry.cpp'
14--- scoperegistry/scoperegistry.cpp 2015-09-11 07:29:12 +0000
15+++ scoperegistry/scoperegistry.cpp 2016-04-01 06:08:31 +0000
16@@ -338,7 +338,6 @@
17 convert_relative_attribute(inner_map, "navigation-background", scope_dir);
18 app_attrs["page-header"] = Variant(inner_map);
19 }
20- convert_relative_attribute(app_attrs, "category-header-background", scope_dir);
21 mi->set_appearance_attributes(app_attrs);
22
23 mi->set_scope_directory(scope_dir.native());
24
25=== modified file 'src/scopes/internal/ScopeConfig.cpp'
26--- src/scopes/internal/ScopeConfig.cpp 2015-07-17 09:03:33 +0000
27+++ src/scopes/internal/ScopeConfig.cpp 2016-04-01 06:08:31 +0000
28@@ -67,7 +67,6 @@
29 const string fg_color_key = "ForegroundColor";
30 const string bg_color_key = "BackgroundColor";
31 const string shape_images_key = "ShapeImages";
32- const string category_header_bg_key = "CategoryHeaderBackground";
33 const string preview_button_color_key = "PreviewButtonColor";
34 const string logo_overlay_color_key = "LogoOverlayColor";
35 const string pageheader_logo_key = "PageHeader.Logo";
36@@ -317,7 +316,6 @@
37 fg_color_key,
38 bg_color_key,
39 shape_images_key,
40- category_header_bg_key,
41 preview_button_color_key,
42 logo_overlay_color_key,
43 pageheader_logo_key,
44
45=== modified file 'test/gtest/scopes/Registry/Registry_test.cpp'
46--- test/gtest/scopes/Registry/Registry_test.cpp 2015-07-06 13:47:54 +0000
47+++ test/gtest/scopes/Registry/Registry_test.cpp 2016-04-01 06:08:31 +0000
48@@ -122,7 +122,6 @@
49 EXPECT_EQ("fg_color", attrs["foreground-color"].get_string());
50 EXPECT_EQ("bg_color", attrs["background-color"].get_string());
51 EXPECT_TRUE(attrs["shape-images"].get_bool());
52- EXPECT_EQ(TEST_SCOPE_A_PATH "/cat_header_bg_scheme", attrs["category-header-background"].get_string());
53 EXPECT_EQ("preview_button_color", attrs["preview-button-color"].get_string());
54 EXPECT_EQ("overlay_color", attrs["logo-overlay-color"].get_string());
55 auto page_hdr = attrs["page-header"].get_dict();
56
57=== modified file 'test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.ini.in'
58--- test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.ini.in 2014-12-03 09:25:10 +0000
59+++ test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.ini.in 2016-04-01 06:08:31 +0000
60@@ -16,7 +16,6 @@
61 ForegroundColor = fg_color
62 BackgroundColor = bg_color
63 ShapeImages = true
64-CategoryHeaderBackground = cat_header_bg_scheme
65 PreviewButtonColor = preview_button_color
66 LogoOverlayColor = overlay_color
67 PageHeader.Logo = some_url

Subscribers

People subscribed via source and target branches

to all changes: