unity-scope-click

Merge lp:~alecu/unity-scope-click/fix-store-card into lp:unity-scope-click/devel

  1. fix-store-card
  2. Merge into devel
Proposed by Alejandro J. Cura
Status: Merged
Approved by: Alejandro J. Cura
Approved revision: 310
Merged at revision: 309
Proposed branch: lp:~alecu/unity-scope-click/fix-store-card
Merge into: lp:unity-scope-click/devel
Diff against target: 644 lines (+580/-12)
3 files modified
data/CMakeLists.txt (+1/-1)
data/store-scope-icon.svg (+567/-0)
scope/clickapps/apps-query.cpp (+12/-11)
To merge this branch: bzr merge lp:~alecu/unity-scope-click/fix-store-card
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
dobey (community) Approve
Diego Sarmentero (community) Approve
Review via email: mp+225079@code.launchpad.net

Commit message

Make the app store card look like the final designs

To post a comment you must log in.
Revision history for this message
Alejandro J. Cura (alecu) wrote :

Since this branch is about adding a file and changing a few strings, here's a screenshot that shows it in action: http://pasteboard.co/1berRCDi.png

Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

+1

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-autolanding/68/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-autolanding/53/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-autolanding/53/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-autolanding/53/console

review: Needs Fixing (continuous-integration)
lp:~alecu/unity-scope-click/fix-store-card updated
310. By Alejandro J. Cura

Missing rename

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

FAILED: Continuous integration, rev:309
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/158/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/133/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/132/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/132/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:310
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/159/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/133
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/133/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/133

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/CMakeLists.txt'
2--- data/CMakeLists.txt 2014-05-27 13:15:52 +0000
3+++ data/CMakeLists.txt 2014-06-30 21:50:16 +0000
4@@ -23,7 +23,7 @@
5 )
6
7 install(
8- FILES clickscope-screenshot.jpg apps-scope.svg
9+ FILES clickscope-screenshot.jpg apps-scope.svg store-scope-icon.svg
10 DESTINATION "${STORE_DATA_DIR}"
11 )
12
13
14=== added file 'data/store-scope-icon.svg'
15--- data/store-scope-icon.svg 1970-01-01 00:00:00 +0000
16+++ data/store-scope-icon.svg 2014-06-30 21:50:16 +0000
17@@ -0,0 +1,567 @@
18+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
19+<!-- Created with Inkscape (http://www.inkscape.org/) -->
20+
21+<svg
22+ xmlns:dc="http://purl.org/dc/elements/1.1/"
23+ xmlns:cc="http://creativecommons.org/ns#"
24+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
25+ xmlns:svg="http://www.w3.org/2000/svg"
26+ xmlns="http://www.w3.org/2000/svg"
27+ xmlns:xlink="http://www.w3.org/1999/xlink"
28+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
29+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
30+ width="512"
31+ height="476"
32+ id="svg3336"
33+ version="1.1"
34+ inkscape:version="0.48.4 r9939"
35+ sodipodi:docname="apps-scope-icon.svg"
36+ inkscape:export-filename="app_shape02.png"
37+ inkscape:export-xdpi="180"
38+ inkscape:export-ydpi="180"
39+ style="enable-background:new">
40+ <defs
41+ id="defs3338">
42+ <filter
43+ style="color-interpolation-filters:sRGB"
44+ inkscape:label="Inner Shadow"
45+ id="filter4245">
46+ <feFlood
47+ flood-opacity="0.40000000000000002"
48+ flood-color="rgb(0,0,0)"
49+ result="flood"
50+ id="feFlood4247" />
51+ <feComposite
52+ in="flood"
53+ in2="SourceGraphic"
54+ operator="out"
55+ result="composite1"
56+ id="feComposite4249" />
57+ <feGaussianBlur
58+ in="composite1"
59+ stdDeviation="6"
60+ result="blur"
61+ id="feGaussianBlur4251" />
62+ <feOffset
63+ dx="0"
64+ dy="2"
65+ result="offset"
66+ id="feOffset4253" />
67+ <feComposite
68+ in="offset"
69+ in2="SourceGraphic"
70+ operator="atop"
71+ result="composite2"
72+ id="feComposite4255" />
73+ </filter>
74+ <filter
75+ style="color-interpolation-filters:sRGB"
76+ inkscape:label="Drop Shadow"
77+ id="filter4711">
78+ <feFlood
79+ flood-opacity="0.501961"
80+ flood-color="rgb(0,0,0)"
81+ result="flood"
82+ id="feFlood4713" />
83+ <feComposite
84+ in="flood"
85+ in2="SourceGraphic"
86+ operator="in"
87+ result="composite1"
88+ id="feComposite4715" />
89+ <feGaussianBlur
90+ in="composite1"
91+ stdDeviation="6"
92+ result="blur"
93+ id="feGaussianBlur4717" />
94+ <feOffset
95+ dx="0"
96+ dy="4"
97+ result="offset"
98+ id="feOffset4719" />
99+ <feComposite
100+ in="SourceGraphic"
101+ in2="offset"
102+ operator="over"
103+ result="composite2"
104+ id="feComposite4721" />
105+ </filter>
106+ <filter
107+ style="color-interpolation-filters:sRGB"
108+ inkscape:label="Colorize"
109+ id="filter4260">
110+ <feComposite
111+ in2="SourceGraphic"
112+ operator="arithmetic"
113+ k1="0"
114+ k2="1"
115+ result="composite1"
116+ id="feComposite4262"
117+ k3="0"
118+ k4="0" />
119+ <feColorMatrix
120+ in="composite1"
121+ values="0"
122+ type="saturate"
123+ result="colormatrix1"
124+ id="feColorMatrix4264" />
125+ <feFlood
126+ flood-opacity="1"
127+ flood-color="rgb(158,67,0)"
128+ result="flood1"
129+ id="feFlood4266" />
130+ <feBlend
131+ in="flood1"
132+ in2="colormatrix1"
133+ mode="multiply"
134+ result="blend1"
135+ id="feBlend4268" />
136+ <feBlend
137+ in2="blend1"
138+ mode="screen"
139+ result="blend2"
140+ id="feBlend4270" />
141+ <feColorMatrix
142+ in="blend2"
143+ values="1"
144+ type="saturate"
145+ result="colormatrix2"
146+ id="feColorMatrix4272" />
147+ <feComposite
148+ in="colormatrix2"
149+ in2="SourceGraphic"
150+ operator="in"
151+ result="composite2"
152+ id="feComposite4274" />
153+ </filter>
154+ <linearGradient
155+ inkscape:collect="always"
156+ id="linearGradient4230-9">
157+ <stop
158+ style="stop-color:#f6f2ec;stop-opacity:1"
159+ offset="0"
160+ id="stop4151" />
161+ <stop
162+ style="stop-color:#e1d4c0;stop-opacity:1"
163+ offset="1"
164+ id="stop4153" />
165+ </linearGradient>
166+ <clipPath
167+ clipPathUnits="userSpaceOnUse"
168+ id="clipPath4241">
169+ <path
170+ sodipodi:nodetypes="sssssssss"
171+ inkscape:connector-curvature="0"
172+ id="path4243"
173+ d="m 166.05406,17.99997 179.89189,0 c 145.29729,0 166.05406,20.73726 166.05406,165.89904 l 0,144.20253 c 0,145.16118 -20.75677,165.89848 -166.05406,165.89848 l -179.89189,0 C 20.756757,494.00002 0,473.26272 0,328.10154 L 0,183.89901 C 0,38.73723 20.756757,17.99997 166.05406,17.99997 Z"
174+ style="fill:#0000ff;fill-opacity:0.08118083;stroke:#0000ff;display:inline" />
175+ </clipPath>
176+ <clipPath
177+ clipPathUnits="userSpaceOnUse"
178+ id="clipPath4510">
179+ <path
180+ style="fill:#0000ff;fill-opacity:0.08118083;stroke:#0000ff;display:inline"
181+ d="m 463.30663,-109.56117 179.89189,0 c 145.29729,0 166.05406,20.73726 166.05406,165.89904 l 0,144.20253 c 0,145.16118 -20.75677,165.89848 -166.05406,165.89848 l -179.89189,0 c -145.2973,0 -166.05406,-20.7373 -166.05406,-165.89848 l 0,-144.20253 c 0,-145.16178 20.75676,-165.89904 166.05406,-165.89904 z"
182+ id="path4512"
183+ inkscape:connector-curvature="0"
184+ sodipodi:nodetypes="sssssssss" />
185+ </clipPath>
186+ <clipPath
187+ clipPathUnits="userSpaceOnUse"
188+ id="clipPath4707">
189+ <path
190+ sodipodi:nodetypes="sssssssss"
191+ inkscape:connector-curvature="0"
192+ id="path4709"
193+ d="m 166.05406,17.99997 179.89189,0 c 145.29729,0 166.05406,20.73726 166.05406,165.89904 l 0,144.20253 c 0,145.16118 -20.75677,165.89848 -166.05406,165.89848 l -179.89189,0 C 20.75676,494.00002 0,473.26272 0,328.10154 L 0,183.89901 C 0,38.73723 20.75676,17.99997 166.05406,17.99997 Z"
194+ style="fill:#ff00ff;fill-opacity:0.50479234;stroke:none;display:inline" />
195+ </clipPath>
196+ <clipPath
197+ clipPathUnits="userSpaceOnUse"
198+ id="clipPath4170">
199+ <path
200+ style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
201+ d="m 166.05406,17.99997 179.89189,0 c 145.29729,0 166.05406,20.73726 166.05406,165.89904 l 0,144.20253 c 0,145.16118 -20.75677,165.89848 -166.05406,165.89848 l -179.89189,0 C 20.75676,494.00002 0,473.26272 0,328.10154 L 0,183.89901 C 0,38.73723 20.75676,17.99997 166.05406,17.99997 Z"
202+ id="path4172"
203+ inkscape:connector-curvature="0"
204+ sodipodi:nodetypes="sssssssss" />
205+ </clipPath>
206+ <linearGradient
207+ inkscape:collect="always"
208+ xlink:href="#linearGradient7537"
209+ id="linearGradient3223"
210+ gradientUnits="userSpaceOnUse"
211+ gradientTransform="matrix(5.3329426,0,0,-5.4179322,0.01904181,5682.273)"
212+ x1="44.236801"
213+ y1="1046.2661"
214+ x2="44.236801"
215+ y2="960.21375" />
216+ <linearGradient
217+ id="linearGradient7537">
218+ <stop
219+ style="stop-color:#f6814e;stop-opacity:0.99607843"
220+ offset="0"
221+ id="stop7539" />
222+ <stop
223+ id="stop4265"
224+ offset="0.49599037"
225+ style="stop-color:#e9354a;stop-opacity:0.99607843" />
226+ <stop
227+ style="stop-color:#be245a;stop-opacity:1"
228+ offset="1"
229+ id="stop7541" />
230+ </linearGradient>
231+ <clipPath
232+ clipPathUnits="userSpaceOnUse"
233+ id="clipPath4967">
234+ <path
235+ style="opacity:0.4;color:#000000;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
236+ d="M 119.86447,193.96008 236.17789,151.15047 339.16724,166.36466 392.09848,328.03894 392.283,494 119.86447,494 Z"
237+ id="path4969"
238+ inkscape:connector-curvature="0"
239+ sodipodi:nodetypes="ccccccc" />
240+ </clipPath>
241+ <clipPath
242+ clipPathUnits="userSpaceOnUse"
243+ id="clipPath4126">
244+ <path
245+ style="opacity:0.57099998;color:#000000;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
246+ d="m 160.28233,309.99918 122.94966,60 0,124.0008 -122.94966,0 z"
247+ id="path4128"
248+ inkscape:connector-curvature="0"
249+ sodipodi:nodetypes="ccccc" />
250+ </clipPath>
251+ <clipPath
252+ clipPathUnits="userSpaceOnUse"
253+ id="clipPath4235">
254+ <path
255+ style="opacity:0.4;color:#000000;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
256+ d="m 112,274 46.7049,63.80269 47.91779,-18.12276 71.9684,12.14543 39.48326,12.85956 L 384,274 l 0,220 -272,0 z"
257+ id="path4237"
258+ inkscape:connector-curvature="0"
259+ sodipodi:nodetypes="ccccccccc" />
260+ </clipPath>
261+ <clipPath
262+ clipPathUnits="userSpaceOnUse"
263+ id="clipPath4251">
264+ <path
265+ style="opacity:0.3;color:#000000;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
266+ d="m 151.09711,359.41623 32.64849,-39.40714 101.92348,7.11528 31.70175,32.29186 0,134.58377 -166.27372,0 z"
267+ id="path4253"
268+ inkscape:connector-curvature="0"
269+ sodipodi:nodetypes="ccccccc" />
270+ </clipPath>
271+ <clipPath
272+ clipPathUnits="userSpaceOnUse"
273+ id="clipPath4277">
274+ <path
275+ style="opacity:0.58999999;color:#000000;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
276+ d="m 190.21352,387.1221 82.28733,10.67687 0,96.20103 -82.28733,0 z"
277+ id="path4279"
278+ inkscape:connector-curvature="0"
279+ sodipodi:nodetypes="ccccc" />
280+ </clipPath>
281+ <clipPath
282+ clipPathUnits="userSpaceOnUse"
283+ id="clipPath4196">
284+ <path
285+ style="opacity:0.3;color:#000000;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
286+ d="m 638.21375,486.59579 63.81095,88.00549 153.12554,3.39578 71.06351,-91.40127 0,238 -288,0 z"
287+ id="path4198"
288+ inkscape:connector-curvature="0"
289+ sodipodi:nodetypes="ccccccc" />
290+ </clipPath>
291+ <clipPath
292+ clipPathUnits="userSpaceOnUse"
293+ id="clipPath4215">
294+ <rect
295+ style="opacity:0.3;color:#000000;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
296+ id="rect4217"
297+ width="146.32043"
298+ height="150.33058"
299+ x="702.04108"
300+ y="574.2652" />
301+ </clipPath>
302+ <clipPath
303+ clipPathUnits="userSpaceOnUse"
304+ id="clipPath4171">
305+ <path
306+ id="path4173"
307+ d="m 233.75,180.15625 c -23.89408,0 -47.55791,3.41205 -70.34375,10.125 -6.26939,1.84752 -9.84555,8.44936 -8,14.71875 1.84883,6.26874 8.41092,9.84751 14.6875,8 20.61186,-6.07313 42.02773,-9.15625 63.65625,-9.15625 40.03239,0 79.37086,10.66957 113.71875,30.84375 1.8835,1.10629 3.93413,1.625 5.96875,1.625 4.05944,0 8.01272,-2.05858 10.21875,-5.8125 3.31035,-5.63545 1.44795,-12.9084 -4.1875,-16.21875 -37.98009,-22.30826 -81.47515,-34.125 -125.71875,-34.125 z m 0,49.0625 c -20.84803,0 -41.3983,3.20428 -61.125,9.53125 -5.60012,1.79779 -8.70274,7.80548 -6.90625,13.40625 1.79779,5.60144 7.80481,8.66887 13.40625,6.875 17.62011,-5.65312 35.98758,-8.5 54.625,-8.5 33.54514,0 66.26798,9.358 94.59375,27.0625 1.75528,1.09778 3.6957,1.625 5.625,1.625 3.55111,0 7.04161,-1.79941 9.0625,-5.03125 3.118,-4.98778 1.58348,-11.53889 -3.40625,-14.65625 -31.71594,-19.82418 -68.33454,-30.3125 -105.875,-30.3125 z m 0,48.53125 c -17.90666,0 -35.42422,3.0797 -52.09375,9.1875 -4.91058,1.79845 -7.42345,7.24567 -5.625,12.15625 1.79976,4.90796 7.21507,7.45535 12.125,5.65625 14.57602,-5.33975 29.91733,-8.0625 45.59375,-8.0625 27.10238,0 53.1999,8.13992 75.4375,23.5625 1.64667,1.13835 3.5144,1.6875 5.375,1.6875 3.00026,0 5.94289,-1.4116 7.78125,-4.0625 2.97736,-4.29692 1.92323,-10.20818 -2.375,-13.1875 C 294.54968,287.05954 264.72667,277.75 233.75,277.75 Z"
308+ style="fill:#ff0000"
309+ inkscape:connector-curvature="0" />
310+ </clipPath>
311+ <clipPath
312+ clipPathUnits="userSpaceOnUse"
313+ id="clipPath4149">
314+ <rect
315+ y="340.15625"
316+ x="147.149"
317+ height="155.84375"
318+ width="217.28188"
319+ id="rect4151"
320+ style="opacity:0.5;color:#000000;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
321+ </clipPath>
322+ <clipPath
323+ clipPathUnits="userSpaceOnUse"
324+ id="clipPath4240">
325+ <path
326+ style="opacity:0.3;color:#000000;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:40;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
327+ d="m 123.20169,213.81313 131.91243,-39.95605 130.18771,40.41597 0,258.27583 -261.29528,0 z"
328+ id="path4242"
329+ inkscape:connector-curvature="0" />
330+ </clipPath>
331+ <linearGradient
332+ inkscape:collect="always"
333+ xlink:href="#linearGradient4142"
334+ id="linearGradient4148"
335+ x1="221.78072"
336+ y1="353.00031"
337+ x2="221.78072"
338+ y2="494"
339+ gradientUnits="userSpaceOnUse" />
340+ <linearGradient
341+ inkscape:collect="always"
342+ id="linearGradient4142">
343+ <stop
344+ style="stop-color:#000000;stop-opacity:1;"
345+ offset="0"
346+ id="stop4144" />
347+ <stop
348+ id="stop4158"
349+ offset="0.75"
350+ style="stop-color:#000000;stop-opacity:0" />
351+ <stop
352+ style="stop-color:#000000;stop-opacity:0"
353+ offset="1"
354+ id="stop4146" />
355+ </linearGradient>
356+ <linearGradient
357+ inkscape:collect="always"
358+ xlink:href="#linearGradient4230-9"
359+ id="linearGradient4161-8"
360+ x1="238.52586"
361+ y1="209.36218"
362+ x2="238.52586"
363+ y2="149.36218"
364+ gradientUnits="userSpaceOnUse"
365+ gradientTransform="matrix(3.3777778,0,0,3.3777778,-136.53334,-370.1123)" />
366+ <linearGradient
367+ id="linearGradient7537-6">
368+ <stop
369+ style="stop-color:#73c1da;stop-opacity:1"
370+ offset="0"
371+ id="stop7539-5" />
372+ <stop
373+ style="stop-color:#3aa3c6;stop-opacity:1"
374+ offset="1"
375+ id="stop7541-5" />
376+ </linearGradient>
377+ <linearGradient
378+ id="linearGradient7537-2">
379+ <stop
380+ style="stop-color:#73c1da;stop-opacity:1"
381+ offset="0"
382+ id="stop7539-7" />
383+ <stop
384+ style="stop-color:#3aa3c6;stop-opacity:1"
385+ offset="1"
386+ id="stop7541-6" />
387+ </linearGradient>
388+ <clipPath
389+ clipPathUnits="userSpaceOnUse"
390+ id="clipPath4135">
391+ <rect
392+ y="179.92949"
393+ x="389.53821"
394+ height="302.44305"
395+ width="116.61196"
396+ id="rect4137"
397+ style="opacity:0.3;color:#000000;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
398+ </clipPath>
399+ <filter
400+ style="color-interpolation-filters:sRGB"
401+ inkscape:label="Colorize"
402+ id="filter4154">
403+ <feComposite
404+ in2="SourceGraphic"
405+ operator="arithmetic"
406+ k1="0"
407+ k2="1"
408+ result="composite1"
409+ id="feComposite4156"
410+ k3="0"
411+ k4="0" />
412+ <feColorMatrix
413+ in="composite1"
414+ values="0"
415+ type="saturate"
416+ result="colormatrix1"
417+ id="feColorMatrix4158" />
418+ <feFlood
419+ flood-opacity="1"
420+ flood-color="rgb(119,50,131)"
421+ result="flood1"
422+ id="feFlood4160" />
423+ <feBlend
424+ in="flood1"
425+ in2="colormatrix1"
426+ mode="multiply"
427+ result="blend1"
428+ id="feBlend4162" />
429+ <feBlend
430+ in2="blend1"
431+ mode="screen"
432+ result="blend2"
433+ id="feBlend4164" />
434+ <feColorMatrix
435+ in="blend2"
436+ values="1"
437+ type="saturate"
438+ result="colormatrix2"
439+ id="feColorMatrix4166" />
440+ <feComposite
441+ in="colormatrix2"
442+ in2="SourceGraphic"
443+ operator="in"
444+ result="composite2"
445+ id="feComposite4168" />
446+ </filter>
447+ </defs>
448+ <sodipodi:namedview
449+ id="base"
450+ pagecolor="#333333"
451+ bordercolor="#666666"
452+ borderopacity="1.0"
453+ inkscape:pageopacity="0"
454+ inkscape:pageshadow="2"
455+ inkscape:zoom="1.66893"
456+ inkscape:cx="78.128889"
457+ inkscape:cy="218.97283"
458+ inkscape:document-units="px"
459+ inkscape:current-layer="layer4"
460+ showgrid="false"
461+ inkscape:window-width="2495"
462+ inkscape:window-height="1416"
463+ inkscape:window-x="65"
464+ inkscape:window-y="24"
465+ inkscape:window-maximized="1"
466+ inkscape:snap-page="true"
467+ inkscape:showpageshadow="false"
468+ showborder="true"
469+ inkscape:snap-bbox="true"
470+ inkscape:bbox-paths="true"
471+ inkscape:bbox-nodes="true"
472+ inkscape:snap-bbox-edge-midpoints="true"
473+ inkscape:snap-bbox-midpoints="true"
474+ inkscape:object-paths="true"
475+ inkscape:object-nodes="true"
476+ inkscape:snap-intersection-paths="true"
477+ inkscape:snap-smooth-nodes="true"
478+ inkscape:snap-midpoints="true"
479+ inkscape:snap-object-midpoints="true"
480+ inkscape:snap-center="true"
481+ showguides="true"
482+ inkscape:guide-bbox="true"
483+ inkscape:snap-grids="true"
484+ fit-margin-top="0"
485+ fit-margin-left="0"
486+ fit-margin-right="0.4"
487+ fit-margin-bottom="0"
488+ inkscape:snap-global="true"
489+ inkscape:snap-others="true">
490+ <inkscape:grid
491+ type="xygrid"
492+ id="grid811"
493+ originx="0px"
494+ originy="-1.999997px"
495+ visible="true"
496+ enabled="true" />
497+ <sodipodi:guide
498+ orientation="1,0"
499+ position="104,158"
500+ id="guide819" />
501+ <sodipodi:guide
502+ orientation="1,0"
503+ position="120,142"
504+ id="guide821" />
505+ <sodipodi:guide
506+ orientation="1,0"
507+ position="392,126"
508+ id="guide823" />
509+ <sodipodi:guide
510+ orientation="1,0"
511+ position="408,126"
512+ id="guide825" />
513+ <sodipodi:guide
514+ orientation="0,1"
515+ position="176,102"
516+ id="guide831" />
517+ <sodipodi:guide
518+ orientation="0,1"
519+ position="216,86"
520+ id="guide833" />
521+ <inkscape:grid
522+ type="axonomgrid"
523+ id="grid835"
524+ units="px"
525+ empspacing="60"
526+ gridanglex="42.9"
527+ gridanglez="42.9"
528+ spacingy="3.522px"
529+ enabled="false"
530+ originx="0px"
531+ originy="3e-06px" />
532+ <sodipodi:guide
533+ orientation="0,1"
534+ position="160,118"
535+ id="guide4128" />
536+ <sodipodi:guide
537+ orientation="1,0"
538+ position="136,78.000003"
539+ id="guide4130" />
540+ <sodipodi:guide
541+ orientation="1,0"
542+ position="376,118"
543+ id="guide4134" />
544+ </sodipodi:namedview>
545+ <metadata
546+ id="metadata3341">
547+ <rdf:RDF>
548+ <cc:Work
549+ rdf:about="">
550+ <dc:format>image/svg+xml</dc:format>
551+ <dc:type
552+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
553+ <dc:title />
554+ </cc:Work>
555+ </rdf:RDF>
556+ </metadata>
557+ <g
558+ inkscape:groupmode="layer"
559+ id="layer3"
560+ inkscape:label="Background"
561+ transform="translate(0,-18)"
562+ sodipodi:insensitive="true"
563+ style="display:none">
564+ <rect
565+ style="color:#000000;fill:#ea3f4b;fill-opacity:0.99607843;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
566+ id="rect4158"
567+ width="512"
568+ height="476"
569+ x="0"
570+ y="18" />
571+ </g>
572+ <g
573+ inkscape:groupmode="layer"
574+ id="layer4"
575+ inkscape:label="Pictogram"
576+ transform="translate(0,-18)"
577+ style="display:inline">
578+ <path
579+ style="font-size:12.0041132px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Medium"
580+ d="m 246.12516,203.3342 -0.37618,0.7994 c -3.44514,7.29888 -6.72093,14.79449 -9.96889,22.28892 -3.24716,7.49441 -6.6247,15.56144 -9.96888,23.84066 -0.93212,2.37762 -1.88024,4.85474 -2.82138,7.28858 l 21.20739,0 c 1.71891,-4.53711 3.41054,-8.93958 4.98444,-13.0724 2.42507,-6.15621 4.58117,-11.14133 6.5362,-15.75271 1.87096,4.45643 3.76474,9.21542 6.16001,15.37653 1.64261,4.22467 3.31675,8.78231 5.03148,13.44858 l 21.67761,0 c -0.99262,-2.43671 -2.00246,-4.91184 -2.96244,-7.28858 -3.24769,-8.28411 -6.29642,-16.34117 -9.54568,-23.84066 -3.24807,-7.49439 -6.57088,-14.99129 -10.01591,-22.28892 l -0.37619,-0.7994 -19.56158,0 z m -35.26727,58.77879 c -6.669,0 -12.03789,5.3689 -12.03789,12.0379 0,6.66899 5.36889,12.0379 12.03789,12.0379 l 90.28422,0 c 6.669,0 12.03789,-5.36891 12.03789,-12.0379 0,-6.669 -5.36889,-12.0379 -12.03789,-12.0379 l -90.28422,0 z m 0,6.01895 52.66579,0 c 3.33453,0 6.01895,2.68442 6.01895,6.01895 0,3.33454 -2.68442,6.01895 -6.01895,6.01895 l -52.66579,0 c -3.33453,0 -6.01895,-2.68441 -6.01895,-6.01895 0,-3.33453 2.68442,-6.01895 6.01895,-6.01895 z m -0.18809,22.61809 c -1.80313,5.12633 -3.65558,10.45445 -5.59574,15.98782 l -0.75238,1.92795 22.2419,0 4.60825,-12.69622 c 0.63131,-1.72923 1.27783,-3.47038 1.88094,-5.21955 l -22.19488,0 c -0.063,0 -0.12535,7.4e-4 -0.18809,0 z m 67.384,0 c 0.596,1.77201 1.19714,3.51825 1.8339,5.21955 1.46811,3.92263 2.86148,7.92307 4.23208,11.94385 l 0.32916,0.75237 1.17558,0 22.28891,0 -0.7994,-1.92795 c -1.94339,-5.54224 -3.86063,-10.86844 -5.73681,-15.98782 -0.0784,7.4e-4 -0.15646,0 -0.23511,0 l -23.08831,0 z"
581+ id="path2996"
582+ inkscape:connector-curvature="0" />
583+ </g>
584+</svg>
585
586=== modified file 'scope/clickapps/apps-query.cpp'
587--- scope/clickapps/apps-query.cpp 2014-06-16 12:40:06 +0000
588+++ scope/clickapps/apps-query.cpp 2014-06-30 21:50:16 +0000
589@@ -84,21 +84,21 @@
590
591 static const char CATEGORY_STORE[] = R"(
592 {
593- "schema-version": 1,
594 "template": {
595 "category-layout": "grid",
596- "card-size": "medium",
597- "card-background": "color:///#E9E9E9"
598+ "overlay": true,
599+ "card-size": "small",
600+ "card-background": "color:///#DD4814"
601 },
602 "components": {
603 "title": "title",
604- "subtitle": "author",
605- "mascot": {
606- "field": "art"
607- },
608- "background": "background"
609+ "art": {
610+ "aspect-ratio": 0.55,
611+ "field": "art"
612+ }
613 }
614 }
615+
616 )";
617
618
619@@ -167,7 +167,8 @@
620
621 void click::Query::add_fake_store_app(scopes::SearchReplyProxy const& searchReply)
622 {
623- static const std::string title = _("Get more apps in Ubuntu store");
624+ static const std::string title = _("Ubuntu Store");
625+ static const std::string cat_title = _("Get more apps from the store");
626 auto name = title;
627
628 std::string querystr = query().query_string();
629@@ -176,13 +177,13 @@
630 if (querystr.empty() || name.find(querystr) != std::string::npos)
631 {
632 scopes::CategoryRenderer rdr(CATEGORY_STORE);
633- auto cat = searchReply->register_category("store", "", "", rdr);
634+ auto cat = searchReply->register_category("store", cat_title, "", rdr);
635
636 static const unity::scopes::CannedQuery store_scope("com.canonical.scopes.clickstore");
637
638 scopes::CategorisedResult res(cat);
639 res.set_title(title);
640- res.set_art(STORE_DATA_DIR "/apps-scope.svg");
641+ res.set_art(STORE_DATA_DIR "/store-scope-icon.svg");
642 res.set_uri(store_scope.to_uri());
643 res[click::Query::ResultKeys::NAME] = title;
644 res[click::Query::ResultKeys::DESCRIPTION] = "";

Subscribers

People subscribed via source and target branches

to all changes: