unity-scope-click

Merge lp:~unity-team/unity-scope-click/overview-icons into lp:unity-scope-click

  1. overview-icons
  2. Merge into trunk
Proposed by Michal Hruby
Status: Merged
Approved by: Michał Sawicz
Approved revision: 257
Merged at revision: 263
Proposed branch: lp:~unity-team/unity-scope-click/overview-icons
Merge into: lp:unity-scope-click
Diff against target: 80 lines (+20/-6)
5 files modified
data/CMakeLists.txt (+2/-2)
data/clickscope.ini.in.in (+4/-1)
data/com.canonical.scopes.clickstore.ini.in.in (+4/-1)
debian/changelog (+6/-0)
debian/unity-scope-click.install (+4/-2)
To merge this branch: bzr merge lp:~unity-team/unity-scope-click/overview-icons
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
dobey (community) Needs Information
Paweł Stołowski (community) Approve
Review via email: mp+227731@code.launchpad.net

Commit message

Update the icons to fit with the scopes overview.

Description of the change

Update the icons to fit with the scopes overview.

To post a comment you must log in.
Revision history for this message
Michal Hruby (mhr3) wrote :

Please don't merge yet, just misusing jenkins to get armhf debs. :)

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:247
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/494/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-amd64-ci/34/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/34/console

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

review: Needs Fixing (continuous-integration)
lp:~unity-team/unity-scope-click/overview-icons updated
248. By Michal Hruby

Update debian

249. By Michal Hruby

Simplify

250. By Michal Hruby

Add overlay color definition

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:250
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/495/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1920/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/35
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/35/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2150/console

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

review: Approve (continuous-integration)
lp:~unity-team/unity-scope-click/overview-icons updated
251. By Michal Hruby

Remove the simplification, cause it breaks the departmentdb pkg

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:251
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/497/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-amd64-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/37/console

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

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

This needs to be a branch of lp:unity-scope-click/devel and proposed to it I think? I don't see any reason this should land directly to trunk here, as it doesn't appear to be a pressing issue related to gcc versions or build dependencies breaking ABI.

review: Needs Fixing
lp:~unity-team/unity-scope-click/overview-icons updated
252. By Michal Hruby

Merge trunk

Revision history for this message
Michal Hruby (mhr3) wrote :

Actually, it's a super isolated change and we'll want to land it together with the rest of the scopes overview feature.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:252
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/502/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1990/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/42/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2240/console

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

review: Approve (continuous-integration)
lp:~unity-team/unity-scope-click/overview-icons updated
253. By Michal Hruby

Merge trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:253
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/503/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2014/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/43/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2267/console

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

review: Approve (continuous-integration)
Revision history for this message
Paweł Stołowski (stolowski) wrote :

LGTM. +1

review: Approve
Revision history for this message
dobey (dobey) wrote :

Where are the SVGs for these new PNGs that are added? Why aren't the SVGs added and used directly instead? Can we please get the SVGs added, in case they need to be changed in the future?

review: Needs Information
lp:~unity-team/unity-scope-click/overview-icons updated
254. By Michal Hruby

Merge trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:254
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/507/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2242/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-amd64-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/47/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2505/console

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

review: Approve (continuous-integration)
lp:~unity-team/unity-scope-click/overview-icons updated
255. By Michal Hruby

Update the assets

256. By Michal Hruby

Merge trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:256
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/514/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2485/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/54
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/54/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2756/console

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

review: Approve (continuous-integration)
lp:~unity-team/unity-scope-click/overview-icons updated
257. By Michal Hruby

Fix overlay color definitions

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:257
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/515/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2493/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-amd64-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/55
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/55/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2764/console

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt 2014-07-14 16:53:54 +0000
+++ data/CMakeLists.txt 2014-08-07 13:30:55 +0000
@@ -30,12 +30,12 @@
30)30)
3131
32install(32install(
33 FILES clickscope-screenshot.jpg apps-scope.svg store-scope-icon.svg33 FILES clickscope-screenshot.jpg ubuntu-store-scope.png store-scope-icon.svg
34 DESTINATION "${STORE_DATA_DIR}"34 DESTINATION "${STORE_DATA_DIR}"
35)35)
3636
37install(37install(
38 FILES clickscope-screenshot.jpg apps-scope.svg38 FILES clickscope-screenshot.jpg apps-scope.png
39 DESTINATION "${APPS_DATA_DIR}"39 DESTINATION "${APPS_DATA_DIR}"
40)40)
4141
4242
=== added file 'data/apps-scope.png'
43Binary files data/apps-scope.png 1970-01-01 00:00:00 +0000 and data/apps-scope.png 2014-08-07 13:30:55 +0000 differ43Binary files data/apps-scope.png 1970-01-01 00:00:00 +0000 and data/apps-scope.png 2014-08-07 13:30:55 +0000 differ
=== modified file 'data/clickscope.ini.in.in'
--- data/clickscope.ini.in.in 2014-07-25 13:11:26 +0000
+++ data/clickscope.ini.in.in 2014-08-07 13:30:55 +0000
@@ -3,5 +3,8 @@
3_Description=Scope for searching the installed click apps3_Description=Scope for searching the installed click apps
4Author=Canonical Ltd.4Author=Canonical Ltd.
5Art=@APPS_DATA_DIR@/clickscope-screenshot.jpg5Art=@APPS_DATA_DIR@/clickscope-screenshot.jpg
6Icon=@APPS_DATA_DIR@/apps-scope.svg6Icon=@APPS_DATA_DIR@/apps-scope.png
7_SearchHint=Search apps7_SearchHint=Search apps
8
9[Appearance]
10LogoOverlayColor=#ffffffff
811
=== modified file 'data/com.canonical.scopes.clickstore.ini.in.in'
--- data/com.canonical.scopes.clickstore.ini.in.in 2014-07-25 13:11:26 +0000
+++ data/com.canonical.scopes.clickstore.ini.in.in 2014-08-07 13:30:55 +0000
@@ -3,5 +3,8 @@
3_Description=Scope for searching the click app store3_Description=Scope for searching the click app store
4Author=Canonical Ltd.4Author=Canonical Ltd.
5Art=@STORE_DATA_DIR@/clickscope-screenshot.jpg5Art=@STORE_DATA_DIR@/clickscope-screenshot.jpg
6Icon=@STORE_DATA_DIR@/apps-scope.svg6Icon=@STORE_DATA_DIR@/ubuntu-store-scope.png
7_SearchHint=Search store7_SearchHint=Search store
8
9[Appearance]
10LogoOverlayColor=#26000000
811
=== added file 'data/ubuntu-store-scope.png'
9Binary files data/ubuntu-store-scope.png 1970-01-01 00:00:00 +0000 and data/ubuntu-store-scope.png 2014-08-07 13:30:55 +0000 differ12Binary files data/ubuntu-store-scope.png 1970-01-01 00:00:00 +0000 and data/ubuntu-store-scope.png 2014-08-07 13:30:55 +0000 differ
=== modified file 'debian/changelog'
--- debian/changelog 2014-08-05 13:11:42 +0000
+++ debian/changelog 2014-08-07 13:30:55 +0000
@@ -1,3 +1,9 @@
1unity-scope-click (0.1.1+14.10.20140724-0ubuntu1) UNRELEASED; urgency=medium
2
3 * Updated scope icons
4
5 -- Michal Hruby <michal.hruby@canonical.com> Tue, 22 Jul 2014 16:12:07 +0100
6
1unity-scope-click (0.1+14.10.20140805-0ubuntu1) utopic; urgency=medium7unity-scope-click (0.1+14.10.20140805-0ubuntu1) utopic; urgency=medium
28
3 [ Alejandro J. Cura (alecu) ]9 [ Alejandro J. Cura (alecu) ]
410
=== modified file 'debian/unity-scope-click.install'
--- debian/unity-scope-click.install 2014-07-14 16:21:26 +0000
+++ debian/unity-scope-click.install 2014-08-07 13:30:55 +0000
@@ -1,7 +1,9 @@
1usr/lib/*/unity-scopes/*1usr/lib/*/unity-scopes/*
2usr/lib/unity-scope-click/*2usr/lib/unity-scope-click/*
3usr/share/unity/scopes/clickstore/*3usr/share/unity/scopes/clickstore/*jpg
4usr/share/unity/scopes/clickstore/*png
5usr/share/unity/scopes/clickstore/*svg
4usr/share/unity/scopes/clickapps/*jpg6usr/share/unity/scopes/clickapps/*jpg
5usr/share/unity/scopes/clickapps/*svg7usr/share/unity/scopes/clickapps/*png
6usr/share/glib-2.0/schemas/*8usr/share/glib-2.0/schemas/*
7usr/share/locale/*/LC_MESSAGES/unity-scope-click.mo9usr/share/locale/*/LC_MESSAGES/unity-scope-click.mo

Subscribers

People subscribed via source and target branches

to all changes: