Merge lp:~alecu/unity-scope-click/ubuntu-logo into lp:unity-scope-click/devel

[Alejandro J. Cura]

Display Ubuntu logo in the header of apps scope.

Display Ubuntu logo in the header of apps scope.
Here's a screenshot from the phone with the change of this branch: http://pbrd.co/1oOniHF

This branch is a resubmit of: https://code.launchpad.net/~stolowski/unity-scope-click/ubuntu-logo/+merge/230472 but with extra padding all around the logo.

[dobey (dobey)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2014-08-11 19:08:16 +0000
+++ data/CMakeLists.txt	2014-08-19 18:32:24 +0000
@@ -35,7 +35,7 @@
 )
 
 install(
-  FILES clickscope-screenshot.jpg apps-scope.png
+  FILES clickscope-screenshot.jpg apps-scope.png ubuntu-logo.png
   DESTINATION "${APPS_DATA_DIR}"
 )
 

=== modified file 'data/clickscope.ini.in.in'
--- data/clickscope.ini.in.in	2014-08-07 13:30:34 +0000
+++ data/clickscope.ini.in.in	2014-08-19 18:32:24 +0000
@@ -7,4 +7,5 @@
 _SearchHint=Search apps
 
 [Appearance]
+PageHeader.Logo=@APPS_DATA_DIR@/ubuntu-logo.png
 LogoOverlayColor=#ffffffff

=== added file 'data/ubuntu-logo.png'
Binary files data/ubuntu-logo.png	1970-01-01 00:00:00 +0000 and data/ubuntu-logo.png	2014-08-19 18:32:24 +0000 differ