Merge lp:~michihenning/unity-scopes-api/header-background into lp:unity-scopes-api/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
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
=== modified file 'doc/tutorial.dox'
--- doc/tutorial.dox 2016-03-16 12:35:22 +0000
+++ doc/tutorial.dox 2016-04-01 06:08:31 +0000
@@ -1430,7 +1430,6 @@
1430 ForegroundColor = default text color (defaults to theme-provided foreground color)1430 ForegroundColor = default text color (defaults to theme-provided foreground color)
1431 BackgroundColor = color of scope background (default is transparent)1431 BackgroundColor = color of scope background (default is transparent)
1432 ShapeImages = whether to use Ubuntu-shape for all cards and artwork (defaults to true)1432 ShapeImages = whether to use Ubuntu-shape for all cards and artwork (defaults to true)
1433 CategoryHeaderBackground = background scheme of the results categories
1434 PreviewButtonColor = color of preview buttons (defaults to theme-provided color)1433 PreviewButtonColor = color of preview buttons (defaults to theme-provided color)
1435 LogoOverlayColor = color for the overlay in scopes overview (defaults to semi-transparent black)1434 LogoOverlayColor = color for the overlay in scopes overview (defaults to semi-transparent black)
1436 PageHeader.Logo = image containing scope's logo1435 PageHeader.Logo = image containing scope's logo
14371436
=== modified file 'scoperegistry/scoperegistry.cpp'
--- scoperegistry/scoperegistry.cpp 2015-09-11 07:29:12 +0000
+++ scoperegistry/scoperegistry.cpp 2016-04-01 06:08:31 +0000
@@ -338,7 +338,6 @@
338 convert_relative_attribute(inner_map, "navigation-background", scope_dir);338 convert_relative_attribute(inner_map, "navigation-background", scope_dir);
339 app_attrs["page-header"] = Variant(inner_map);339 app_attrs["page-header"] = Variant(inner_map);
340 }340 }
341 convert_relative_attribute(app_attrs, "category-header-background", scope_dir);
342 mi->set_appearance_attributes(app_attrs);341 mi->set_appearance_attributes(app_attrs);
343342
344 mi->set_scope_directory(scope_dir.native());343 mi->set_scope_directory(scope_dir.native());
345344
=== modified file 'src/scopes/internal/ScopeConfig.cpp'
--- src/scopes/internal/ScopeConfig.cpp 2015-07-17 09:03:33 +0000
+++ src/scopes/internal/ScopeConfig.cpp 2016-04-01 06:08:31 +0000
@@ -67,7 +67,6 @@
67 const string fg_color_key = "ForegroundColor";67 const string fg_color_key = "ForegroundColor";
68 const string bg_color_key = "BackgroundColor";68 const string bg_color_key = "BackgroundColor";
69 const string shape_images_key = "ShapeImages";69 const string shape_images_key = "ShapeImages";
70 const string category_header_bg_key = "CategoryHeaderBackground";
71 const string preview_button_color_key = "PreviewButtonColor";70 const string preview_button_color_key = "PreviewButtonColor";
72 const string logo_overlay_color_key = "LogoOverlayColor";71 const string logo_overlay_color_key = "LogoOverlayColor";
73 const string pageheader_logo_key = "PageHeader.Logo";72 const string pageheader_logo_key = "PageHeader.Logo";
@@ -317,7 +316,6 @@
317 fg_color_key,316 fg_color_key,
318 bg_color_key,317 bg_color_key,
319 shape_images_key,318 shape_images_key,
320 category_header_bg_key,
321 preview_button_color_key,319 preview_button_color_key,
322 logo_overlay_color_key,320 logo_overlay_color_key,
323 pageheader_logo_key,321 pageheader_logo_key,
324322
=== modified file 'test/gtest/scopes/Registry/Registry_test.cpp'
--- test/gtest/scopes/Registry/Registry_test.cpp 2015-07-06 13:47:54 +0000
+++ test/gtest/scopes/Registry/Registry_test.cpp 2016-04-01 06:08:31 +0000
@@ -122,7 +122,6 @@
122 EXPECT_EQ("fg_color", attrs["foreground-color"].get_string());122 EXPECT_EQ("fg_color", attrs["foreground-color"].get_string());
123 EXPECT_EQ("bg_color", attrs["background-color"].get_string());123 EXPECT_EQ("bg_color", attrs["background-color"].get_string());
124 EXPECT_TRUE(attrs["shape-images"].get_bool());124 EXPECT_TRUE(attrs["shape-images"].get_bool());
125 EXPECT_EQ(TEST_SCOPE_A_PATH "/cat_header_bg_scheme", attrs["category-header-background"].get_string());
126 EXPECT_EQ("preview_button_color", attrs["preview-button-color"].get_string());125 EXPECT_EQ("preview_button_color", attrs["preview-button-color"].get_string());
127 EXPECT_EQ("overlay_color", attrs["logo-overlay-color"].get_string());126 EXPECT_EQ("overlay_color", attrs["logo-overlay-color"].get_string());
128 auto page_hdr = attrs["page-header"].get_dict();127 auto page_hdr = attrs["page-header"].get_dict();
129128
=== modified file 'test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.ini.in'
--- test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.ini.in 2014-12-03 09:25:10 +0000
+++ test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.ini.in 2016-04-01 06:08:31 +0000
@@ -16,7 +16,6 @@
16ForegroundColor = fg_color16ForegroundColor = fg_color
17BackgroundColor = bg_color17BackgroundColor = bg_color
18ShapeImages = true18ShapeImages = true
19CategoryHeaderBackground = cat_header_bg_scheme
20PreviewButtonColor = preview_button_color19PreviewButtonColor = preview_button_color
21LogoOverlayColor = overlay_color20LogoOverlayColor = overlay_color
22PageHeader.Logo = some_url21PageHeader.Logo = some_url

Subscribers

People subscribed via source and target branches

to all changes: