Merge lp:~alecu/unity-scope-click/fix-store-card into lp:unity-scope-click/devel
- fix-store-card
- Merge into devel
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 |
Related bugs: |
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
Description of the change
Alejandro J. Cura (alecu) wrote : | # |
dobey (dobey) : | # |
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
- 310. By Alejandro J. Cura
-
Missing rename
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:309
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:310
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Preview Diff
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 | 23 | ) | 23 | ) |
6 | 24 | 24 | ||
7 | 25 | install( | 25 | install( |
9 | 26 | FILES clickscope-screenshot.jpg apps-scope.svg | 26 | FILES clickscope-screenshot.jpg apps-scope.svg store-scope-icon.svg |
10 | 27 | DESTINATION "${STORE_DATA_DIR}" | 27 | DESTINATION "${STORE_DATA_DIR}" |
11 | 28 | ) | 28 | ) |
12 | 29 | 29 | ||
13 | 30 | 30 | ||
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 | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
19 | 2 | <!-- Created with Inkscape (http://www.inkscape.org/) --> | ||
20 | 3 | |||
21 | 4 | <svg | ||
22 | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
23 | 6 | xmlns:cc="http://creativecommons.org/ns#" | ||
24 | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
25 | 8 | xmlns:svg="http://www.w3.org/2000/svg" | ||
26 | 9 | xmlns="http://www.w3.org/2000/svg" | ||
27 | 10 | xmlns:xlink="http://www.w3.org/1999/xlink" | ||
28 | 11 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | ||
29 | 12 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||
30 | 13 | width="512" | ||
31 | 14 | height="476" | ||
32 | 15 | id="svg3336" | ||
33 | 16 | version="1.1" | ||
34 | 17 | inkscape:version="0.48.4 r9939" | ||
35 | 18 | sodipodi:docname="apps-scope-icon.svg" | ||
36 | 19 | inkscape:export-filename="app_shape02.png" | ||
37 | 20 | inkscape:export-xdpi="180" | ||
38 | 21 | inkscape:export-ydpi="180" | ||
39 | 22 | style="enable-background:new"> | ||
40 | 23 | <defs | ||
41 | 24 | id="defs3338"> | ||
42 | 25 | <filter | ||
43 | 26 | style="color-interpolation-filters:sRGB" | ||
44 | 27 | inkscape:label="Inner Shadow" | ||
45 | 28 | id="filter4245"> | ||
46 | 29 | <feFlood | ||
47 | 30 | flood-opacity="0.40000000000000002" | ||
48 | 31 | flood-color="rgb(0,0,0)" | ||
49 | 32 | result="flood" | ||
50 | 33 | id="feFlood4247" /> | ||
51 | 34 | <feComposite | ||
52 | 35 | in="flood" | ||
53 | 36 | in2="SourceGraphic" | ||
54 | 37 | operator="out" | ||
55 | 38 | result="composite1" | ||
56 | 39 | id="feComposite4249" /> | ||
57 | 40 | <feGaussianBlur | ||
58 | 41 | in="composite1" | ||
59 | 42 | stdDeviation="6" | ||
60 | 43 | result="blur" | ||
61 | 44 | id="feGaussianBlur4251" /> | ||
62 | 45 | <feOffset | ||
63 | 46 | dx="0" | ||
64 | 47 | dy="2" | ||
65 | 48 | result="offset" | ||
66 | 49 | id="feOffset4253" /> | ||
67 | 50 | <feComposite | ||
68 | 51 | in="offset" | ||
69 | 52 | in2="SourceGraphic" | ||
70 | 53 | operator="atop" | ||
71 | 54 | result="composite2" | ||
72 | 55 | id="feComposite4255" /> | ||
73 | 56 | </filter> | ||
74 | 57 | <filter | ||
75 | 58 | style="color-interpolation-filters:sRGB" | ||
76 | 59 | inkscape:label="Drop Shadow" | ||
77 | 60 | id="filter4711"> | ||
78 | 61 | <feFlood | ||
79 | 62 | flood-opacity="0.501961" | ||
80 | 63 | flood-color="rgb(0,0,0)" | ||
81 | 64 | result="flood" | ||
82 | 65 | id="feFlood4713" /> | ||
83 | 66 | <feComposite | ||
84 | 67 | in="flood" | ||
85 | 68 | in2="SourceGraphic" | ||
86 | 69 | operator="in" | ||
87 | 70 | result="composite1" | ||
88 | 71 | id="feComposite4715" /> | ||
89 | 72 | <feGaussianBlur | ||
90 | 73 | in="composite1" | ||
91 | 74 | stdDeviation="6" | ||
92 | 75 | result="blur" | ||
93 | 76 | id="feGaussianBlur4717" /> | ||
94 | 77 | <feOffset | ||
95 | 78 | dx="0" | ||
96 | 79 | dy="4" | ||
97 | 80 | result="offset" | ||
98 | 81 | id="feOffset4719" /> | ||
99 | 82 | <feComposite | ||
100 | 83 | in="SourceGraphic" | ||
101 | 84 | in2="offset" | ||
102 | 85 | operator="over" | ||
103 | 86 | result="composite2" | ||
104 | 87 | id="feComposite4721" /> | ||
105 | 88 | </filter> | ||
106 | 89 | <filter | ||
107 | 90 | style="color-interpolation-filters:sRGB" | ||
108 | 91 | inkscape:label="Colorize" | ||
109 | 92 | id="filter4260"> | ||
110 | 93 | <feComposite | ||
111 | 94 | in2="SourceGraphic" | ||
112 | 95 | operator="arithmetic" | ||
113 | 96 | k1="0" | ||
114 | 97 | k2="1" | ||
115 | 98 | result="composite1" | ||
116 | 99 | id="feComposite4262" | ||
117 | 100 | k3="0" | ||
118 | 101 | k4="0" /> | ||
119 | 102 | <feColorMatrix | ||
120 | 103 | in="composite1" | ||
121 | 104 | values="0" | ||
122 | 105 | type="saturate" | ||
123 | 106 | result="colormatrix1" | ||
124 | 107 | id="feColorMatrix4264" /> | ||
125 | 108 | <feFlood | ||
126 | 109 | flood-opacity="1" | ||
127 | 110 | flood-color="rgb(158,67,0)" | ||
128 | 111 | result="flood1" | ||
129 | 112 | id="feFlood4266" /> | ||
130 | 113 | <feBlend | ||
131 | 114 | in="flood1" | ||
132 | 115 | in2="colormatrix1" | ||
133 | 116 | mode="multiply" | ||
134 | 117 | result="blend1" | ||
135 | 118 | id="feBlend4268" /> | ||
136 | 119 | <feBlend | ||
137 | 120 | in2="blend1" | ||
138 | 121 | mode="screen" | ||
139 | 122 | result="blend2" | ||
140 | 123 | id="feBlend4270" /> | ||
141 | 124 | <feColorMatrix | ||
142 | 125 | in="blend2" | ||
143 | 126 | values="1" | ||
144 | 127 | type="saturate" | ||
145 | 128 | result="colormatrix2" | ||
146 | 129 | id="feColorMatrix4272" /> | ||
147 | 130 | <feComposite | ||
148 | 131 | in="colormatrix2" | ||
149 | 132 | in2="SourceGraphic" | ||
150 | 133 | operator="in" | ||
151 | 134 | result="composite2" | ||
152 | 135 | id="feComposite4274" /> | ||
153 | 136 | </filter> | ||
154 | 137 | <linearGradient | ||
155 | 138 | inkscape:collect="always" | ||
156 | 139 | id="linearGradient4230-9"> | ||
157 | 140 | <stop | ||
158 | 141 | style="stop-color:#f6f2ec;stop-opacity:1" | ||
159 | 142 | offset="0" | ||
160 | 143 | id="stop4151" /> | ||
161 | 144 | <stop | ||
162 | 145 | style="stop-color:#e1d4c0;stop-opacity:1" | ||
163 | 146 | offset="1" | ||
164 | 147 | id="stop4153" /> | ||
165 | 148 | </linearGradient> | ||
166 | 149 | <clipPath | ||
167 | 150 | clipPathUnits="userSpaceOnUse" | ||
168 | 151 | id="clipPath4241"> | ||
169 | 152 | <path | ||
170 | 153 | sodipodi:nodetypes="sssssssss" | ||
171 | 154 | inkscape:connector-curvature="0" | ||
172 | 155 | id="path4243" | ||
173 | 156 | 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 | 157 | style="fill:#0000ff;fill-opacity:0.08118083;stroke:#0000ff;display:inline" /> | ||
175 | 158 | </clipPath> | ||
176 | 159 | <clipPath | ||
177 | 160 | clipPathUnits="userSpaceOnUse" | ||
178 | 161 | id="clipPath4510"> | ||
179 | 162 | <path | ||
180 | 163 | style="fill:#0000ff;fill-opacity:0.08118083;stroke:#0000ff;display:inline" | ||
181 | 164 | 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 | 165 | id="path4512" | ||
183 | 166 | inkscape:connector-curvature="0" | ||
184 | 167 | sodipodi:nodetypes="sssssssss" /> | ||
185 | 168 | </clipPath> | ||
186 | 169 | <clipPath | ||
187 | 170 | clipPathUnits="userSpaceOnUse" | ||
188 | 171 | id="clipPath4707"> | ||
189 | 172 | <path | ||
190 | 173 | sodipodi:nodetypes="sssssssss" | ||
191 | 174 | inkscape:connector-curvature="0" | ||
192 | 175 | id="path4709" | ||
193 | 176 | 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 | 177 | style="fill:#ff00ff;fill-opacity:0.50479234;stroke:none;display:inline" /> | ||
195 | 178 | </clipPath> | ||
196 | 179 | <clipPath | ||
197 | 180 | clipPathUnits="userSpaceOnUse" | ||
198 | 181 | id="clipPath4170"> | ||
199 | 182 | <path | ||
200 | 183 | style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline" | ||
201 | 184 | 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 | 185 | id="path4172" | ||
203 | 186 | inkscape:connector-curvature="0" | ||
204 | 187 | sodipodi:nodetypes="sssssssss" /> | ||
205 | 188 | </clipPath> | ||
206 | 189 | <linearGradient | ||
207 | 190 | inkscape:collect="always" | ||
208 | 191 | xlink:href="#linearGradient7537" | ||
209 | 192 | id="linearGradient3223" | ||
210 | 193 | gradientUnits="userSpaceOnUse" | ||
211 | 194 | gradientTransform="matrix(5.3329426,0,0,-5.4179322,0.01904181,5682.273)" | ||
212 | 195 | x1="44.236801" | ||
213 | 196 | y1="1046.2661" | ||
214 | 197 | x2="44.236801" | ||
215 | 198 | y2="960.21375" /> | ||
216 | 199 | <linearGradient | ||
217 | 200 | id="linearGradient7537"> | ||
218 | 201 | <stop | ||
219 | 202 | style="stop-color:#f6814e;stop-opacity:0.99607843" | ||
220 | 203 | offset="0" | ||
221 | 204 | id="stop7539" /> | ||
222 | 205 | <stop | ||
223 | 206 | id="stop4265" | ||
224 | 207 | offset="0.49599037" | ||
225 | 208 | style="stop-color:#e9354a;stop-opacity:0.99607843" /> | ||
226 | 209 | <stop | ||
227 | 210 | style="stop-color:#be245a;stop-opacity:1" | ||
228 | 211 | offset="1" | ||
229 | 212 | id="stop7541" /> | ||
230 | 213 | </linearGradient> | ||
231 | 214 | <clipPath | ||
232 | 215 | clipPathUnits="userSpaceOnUse" | ||
233 | 216 | id="clipPath4967"> | ||
234 | 217 | <path | ||
235 | 218 | 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 | 219 | 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 | 220 | id="path4969" | ||
238 | 221 | inkscape:connector-curvature="0" | ||
239 | 222 | sodipodi:nodetypes="ccccccc" /> | ||
240 | 223 | </clipPath> | ||
241 | 224 | <clipPath | ||
242 | 225 | clipPathUnits="userSpaceOnUse" | ||
243 | 226 | id="clipPath4126"> | ||
244 | 227 | <path | ||
245 | 228 | 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 | 229 | d="m 160.28233,309.99918 122.94966,60 0,124.0008 -122.94966,0 z" | ||
247 | 230 | id="path4128" | ||
248 | 231 | inkscape:connector-curvature="0" | ||
249 | 232 | sodipodi:nodetypes="ccccc" /> | ||
250 | 233 | </clipPath> | ||
251 | 234 | <clipPath | ||
252 | 235 | clipPathUnits="userSpaceOnUse" | ||
253 | 236 | id="clipPath4235"> | ||
254 | 237 | <path | ||
255 | 238 | 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 | 239 | 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 | 240 | id="path4237" | ||
258 | 241 | inkscape:connector-curvature="0" | ||
259 | 242 | sodipodi:nodetypes="ccccccccc" /> | ||
260 | 243 | </clipPath> | ||
261 | 244 | <clipPath | ||
262 | 245 | clipPathUnits="userSpaceOnUse" | ||
263 | 246 | id="clipPath4251"> | ||
264 | 247 | <path | ||
265 | 248 | 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 | 249 | 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 | 250 | id="path4253" | ||
268 | 251 | inkscape:connector-curvature="0" | ||
269 | 252 | sodipodi:nodetypes="ccccccc" /> | ||
270 | 253 | </clipPath> | ||
271 | 254 | <clipPath | ||
272 | 255 | clipPathUnits="userSpaceOnUse" | ||
273 | 256 | id="clipPath4277"> | ||
274 | 257 | <path | ||
275 | 258 | 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 | 259 | d="m 190.21352,387.1221 82.28733,10.67687 0,96.20103 -82.28733,0 z" | ||
277 | 260 | id="path4279" | ||
278 | 261 | inkscape:connector-curvature="0" | ||
279 | 262 | sodipodi:nodetypes="ccccc" /> | ||
280 | 263 | </clipPath> | ||
281 | 264 | <clipPath | ||
282 | 265 | clipPathUnits="userSpaceOnUse" | ||
283 | 266 | id="clipPath4196"> | ||
284 | 267 | <path | ||
285 | 268 | 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 | 269 | d="m 638.21375,486.59579 63.81095,88.00549 153.12554,3.39578 71.06351,-91.40127 0,238 -288,0 z" | ||
287 | 270 | id="path4198" | ||
288 | 271 | inkscape:connector-curvature="0" | ||
289 | 272 | sodipodi:nodetypes="ccccccc" /> | ||
290 | 273 | </clipPath> | ||
291 | 274 | <clipPath | ||
292 | 275 | clipPathUnits="userSpaceOnUse" | ||
293 | 276 | id="clipPath4215"> | ||
294 | 277 | <rect | ||
295 | 278 | 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 | 279 | id="rect4217" | ||
297 | 280 | width="146.32043" | ||
298 | 281 | height="150.33058" | ||
299 | 282 | x="702.04108" | ||
300 | 283 | y="574.2652" /> | ||
301 | 284 | </clipPath> | ||
302 | 285 | <clipPath | ||
303 | 286 | clipPathUnits="userSpaceOnUse" | ||
304 | 287 | id="clipPath4171"> | ||
305 | 288 | <path | ||
306 | 289 | id="path4173" | ||
307 | 290 | 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 | 291 | style="fill:#ff0000" | ||
309 | 292 | inkscape:connector-curvature="0" /> | ||
310 | 293 | </clipPath> | ||
311 | 294 | <clipPath | ||
312 | 295 | clipPathUnits="userSpaceOnUse" | ||
313 | 296 | id="clipPath4149"> | ||
314 | 297 | <rect | ||
315 | 298 | y="340.15625" | ||
316 | 299 | x="147.149" | ||
317 | 300 | height="155.84375" | ||
318 | 301 | width="217.28188" | ||
319 | 302 | id="rect4151" | ||
320 | 303 | 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 | 304 | </clipPath> | ||
322 | 305 | <clipPath | ||
323 | 306 | clipPathUnits="userSpaceOnUse" | ||
324 | 307 | id="clipPath4240"> | ||
325 | 308 | <path | ||
326 | 309 | 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 | 310 | d="m 123.20169,213.81313 131.91243,-39.95605 130.18771,40.41597 0,258.27583 -261.29528,0 z" | ||
328 | 311 | id="path4242" | ||
329 | 312 | inkscape:connector-curvature="0" /> | ||
330 | 313 | </clipPath> | ||
331 | 314 | <linearGradient | ||
332 | 315 | inkscape:collect="always" | ||
333 | 316 | xlink:href="#linearGradient4142" | ||
334 | 317 | id="linearGradient4148" | ||
335 | 318 | x1="221.78072" | ||
336 | 319 | y1="353.00031" | ||
337 | 320 | x2="221.78072" | ||
338 | 321 | y2="494" | ||
339 | 322 | gradientUnits="userSpaceOnUse" /> | ||
340 | 323 | <linearGradient | ||
341 | 324 | inkscape:collect="always" | ||
342 | 325 | id="linearGradient4142"> | ||
343 | 326 | <stop | ||
344 | 327 | style="stop-color:#000000;stop-opacity:1;" | ||
345 | 328 | offset="0" | ||
346 | 329 | id="stop4144" /> | ||
347 | 330 | <stop | ||
348 | 331 | id="stop4158" | ||
349 | 332 | offset="0.75" | ||
350 | 333 | style="stop-color:#000000;stop-opacity:0" /> | ||
351 | 334 | <stop | ||
352 | 335 | style="stop-color:#000000;stop-opacity:0" | ||
353 | 336 | offset="1" | ||
354 | 337 | id="stop4146" /> | ||
355 | 338 | </linearGradient> | ||
356 | 339 | <linearGradient | ||
357 | 340 | inkscape:collect="always" | ||
358 | 341 | xlink:href="#linearGradient4230-9" | ||
359 | 342 | id="linearGradient4161-8" | ||
360 | 343 | x1="238.52586" | ||
361 | 344 | y1="209.36218" | ||
362 | 345 | x2="238.52586" | ||
363 | 346 | y2="149.36218" | ||
364 | 347 | gradientUnits="userSpaceOnUse" | ||
365 | 348 | gradientTransform="matrix(3.3777778,0,0,3.3777778,-136.53334,-370.1123)" /> | ||
366 | 349 | <linearGradient | ||
367 | 350 | id="linearGradient7537-6"> | ||
368 | 351 | <stop | ||
369 | 352 | style="stop-color:#73c1da;stop-opacity:1" | ||
370 | 353 | offset="0" | ||
371 | 354 | id="stop7539-5" /> | ||
372 | 355 | <stop | ||
373 | 356 | style="stop-color:#3aa3c6;stop-opacity:1" | ||
374 | 357 | offset="1" | ||
375 | 358 | id="stop7541-5" /> | ||
376 | 359 | </linearGradient> | ||
377 | 360 | <linearGradient | ||
378 | 361 | id="linearGradient7537-2"> | ||
379 | 362 | <stop | ||
380 | 363 | style="stop-color:#73c1da;stop-opacity:1" | ||
381 | 364 | offset="0" | ||
382 | 365 | id="stop7539-7" /> | ||
383 | 366 | <stop | ||
384 | 367 | style="stop-color:#3aa3c6;stop-opacity:1" | ||
385 | 368 | offset="1" | ||
386 | 369 | id="stop7541-6" /> | ||
387 | 370 | </linearGradient> | ||
388 | 371 | <clipPath | ||
389 | 372 | clipPathUnits="userSpaceOnUse" | ||
390 | 373 | id="clipPath4135"> | ||
391 | 374 | <rect | ||
392 | 375 | y="179.92949" | ||
393 | 376 | x="389.53821" | ||
394 | 377 | height="302.44305" | ||
395 | 378 | width="116.61196" | ||
396 | 379 | id="rect4137" | ||
397 | 380 | 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 | 381 | </clipPath> | ||
399 | 382 | <filter | ||
400 | 383 | style="color-interpolation-filters:sRGB" | ||
401 | 384 | inkscape:label="Colorize" | ||
402 | 385 | id="filter4154"> | ||
403 | 386 | <feComposite | ||
404 | 387 | in2="SourceGraphic" | ||
405 | 388 | operator="arithmetic" | ||
406 | 389 | k1="0" | ||
407 | 390 | k2="1" | ||
408 | 391 | result="composite1" | ||
409 | 392 | id="feComposite4156" | ||
410 | 393 | k3="0" | ||
411 | 394 | k4="0" /> | ||
412 | 395 | <feColorMatrix | ||
413 | 396 | in="composite1" | ||
414 | 397 | values="0" | ||
415 | 398 | type="saturate" | ||
416 | 399 | result="colormatrix1" | ||
417 | 400 | id="feColorMatrix4158" /> | ||
418 | 401 | <feFlood | ||
419 | 402 | flood-opacity="1" | ||
420 | 403 | flood-color="rgb(119,50,131)" | ||
421 | 404 | result="flood1" | ||
422 | 405 | id="feFlood4160" /> | ||
423 | 406 | <feBlend | ||
424 | 407 | in="flood1" | ||
425 | 408 | in2="colormatrix1" | ||
426 | 409 | mode="multiply" | ||
427 | 410 | result="blend1" | ||
428 | 411 | id="feBlend4162" /> | ||
429 | 412 | <feBlend | ||
430 | 413 | in2="blend1" | ||
431 | 414 | mode="screen" | ||
432 | 415 | result="blend2" | ||
433 | 416 | id="feBlend4164" /> | ||
434 | 417 | <feColorMatrix | ||
435 | 418 | in="blend2" | ||
436 | 419 | values="1" | ||
437 | 420 | type="saturate" | ||
438 | 421 | result="colormatrix2" | ||
439 | 422 | id="feColorMatrix4166" /> | ||
440 | 423 | <feComposite | ||
441 | 424 | in="colormatrix2" | ||
442 | 425 | in2="SourceGraphic" | ||
443 | 426 | operator="in" | ||
444 | 427 | result="composite2" | ||
445 | 428 | id="feComposite4168" /> | ||
446 | 429 | </filter> | ||
447 | 430 | </defs> | ||
448 | 431 | <sodipodi:namedview | ||
449 | 432 | id="base" | ||
450 | 433 | pagecolor="#333333" | ||
451 | 434 | bordercolor="#666666" | ||
452 | 435 | borderopacity="1.0" | ||
453 | 436 | inkscape:pageopacity="0" | ||
454 | 437 | inkscape:pageshadow="2" | ||
455 | 438 | inkscape:zoom="1.66893" | ||
456 | 439 | inkscape:cx="78.128889" | ||
457 | 440 | inkscape:cy="218.97283" | ||
458 | 441 | inkscape:document-units="px" | ||
459 | 442 | inkscape:current-layer="layer4" | ||
460 | 443 | showgrid="false" | ||
461 | 444 | inkscape:window-width="2495" | ||
462 | 445 | inkscape:window-height="1416" | ||
463 | 446 | inkscape:window-x="65" | ||
464 | 447 | inkscape:window-y="24" | ||
465 | 448 | inkscape:window-maximized="1" | ||
466 | 449 | inkscape:snap-page="true" | ||
467 | 450 | inkscape:showpageshadow="false" | ||
468 | 451 | showborder="true" | ||
469 | 452 | inkscape:snap-bbox="true" | ||
470 | 453 | inkscape:bbox-paths="true" | ||
471 | 454 | inkscape:bbox-nodes="true" | ||
472 | 455 | inkscape:snap-bbox-edge-midpoints="true" | ||
473 | 456 | inkscape:snap-bbox-midpoints="true" | ||
474 | 457 | inkscape:object-paths="true" | ||
475 | 458 | inkscape:object-nodes="true" | ||
476 | 459 | inkscape:snap-intersection-paths="true" | ||
477 | 460 | inkscape:snap-smooth-nodes="true" | ||
478 | 461 | inkscape:snap-midpoints="true" | ||
479 | 462 | inkscape:snap-object-midpoints="true" | ||
480 | 463 | inkscape:snap-center="true" | ||
481 | 464 | showguides="true" | ||
482 | 465 | inkscape:guide-bbox="true" | ||
483 | 466 | inkscape:snap-grids="true" | ||
484 | 467 | fit-margin-top="0" | ||
485 | 468 | fit-margin-left="0" | ||
486 | 469 | fit-margin-right="0.4" | ||
487 | 470 | fit-margin-bottom="0" | ||
488 | 471 | inkscape:snap-global="true" | ||
489 | 472 | inkscape:snap-others="true"> | ||
490 | 473 | <inkscape:grid | ||
491 | 474 | type="xygrid" | ||
492 | 475 | id="grid811" | ||
493 | 476 | originx="0px" | ||
494 | 477 | originy="-1.999997px" | ||
495 | 478 | visible="true" | ||
496 | 479 | enabled="true" /> | ||
497 | 480 | <sodipodi:guide | ||
498 | 481 | orientation="1,0" | ||
499 | 482 | position="104,158" | ||
500 | 483 | id="guide819" /> | ||
501 | 484 | <sodipodi:guide | ||
502 | 485 | orientation="1,0" | ||
503 | 486 | position="120,142" | ||
504 | 487 | id="guide821" /> | ||
505 | 488 | <sodipodi:guide | ||
506 | 489 | orientation="1,0" | ||
507 | 490 | position="392,126" | ||
508 | 491 | id="guide823" /> | ||
509 | 492 | <sodipodi:guide | ||
510 | 493 | orientation="1,0" | ||
511 | 494 | position="408,126" | ||
512 | 495 | id="guide825" /> | ||
513 | 496 | <sodipodi:guide | ||
514 | 497 | orientation="0,1" | ||
515 | 498 | position="176,102" | ||
516 | 499 | id="guide831" /> | ||
517 | 500 | <sodipodi:guide | ||
518 | 501 | orientation="0,1" | ||
519 | 502 | position="216,86" | ||
520 | 503 | id="guide833" /> | ||
521 | 504 | <inkscape:grid | ||
522 | 505 | type="axonomgrid" | ||
523 | 506 | id="grid835" | ||
524 | 507 | units="px" | ||
525 | 508 | empspacing="60" | ||
526 | 509 | gridanglex="42.9" | ||
527 | 510 | gridanglez="42.9" | ||
528 | 511 | spacingy="3.522px" | ||
529 | 512 | enabled="false" | ||
530 | 513 | originx="0px" | ||
531 | 514 | originy="3e-06px" /> | ||
532 | 515 | <sodipodi:guide | ||
533 | 516 | orientation="0,1" | ||
534 | 517 | position="160,118" | ||
535 | 518 | id="guide4128" /> | ||
536 | 519 | <sodipodi:guide | ||
537 | 520 | orientation="1,0" | ||
538 | 521 | position="136,78.000003" | ||
539 | 522 | id="guide4130" /> | ||
540 | 523 | <sodipodi:guide | ||
541 | 524 | orientation="1,0" | ||
542 | 525 | position="376,118" | ||
543 | 526 | id="guide4134" /> | ||
544 | 527 | </sodipodi:namedview> | ||
545 | 528 | <metadata | ||
546 | 529 | id="metadata3341"> | ||
547 | 530 | <rdf:RDF> | ||
548 | 531 | <cc:Work | ||
549 | 532 | rdf:about=""> | ||
550 | 533 | <dc:format>image/svg+xml</dc:format> | ||
551 | 534 | <dc:type | ||
552 | 535 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||
553 | 536 | <dc:title /> | ||
554 | 537 | </cc:Work> | ||
555 | 538 | </rdf:RDF> | ||
556 | 539 | </metadata> | ||
557 | 540 | <g | ||
558 | 541 | inkscape:groupmode="layer" | ||
559 | 542 | id="layer3" | ||
560 | 543 | inkscape:label="Background" | ||
561 | 544 | transform="translate(0,-18)" | ||
562 | 545 | sodipodi:insensitive="true" | ||
563 | 546 | style="display:none"> | ||
564 | 547 | <rect | ||
565 | 548 | 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 | 549 | id="rect4158" | ||
567 | 550 | width="512" | ||
568 | 551 | height="476" | ||
569 | 552 | x="0" | ||
570 | 553 | y="18" /> | ||
571 | 554 | </g> | ||
572 | 555 | <g | ||
573 | 556 | inkscape:groupmode="layer" | ||
574 | 557 | id="layer4" | ||
575 | 558 | inkscape:label="Pictogram" | ||
576 | 559 | transform="translate(0,-18)" | ||
577 | 560 | style="display:inline"> | ||
578 | 561 | <path | ||
579 | 562 | 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 | 563 | 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 | 564 | id="path2996" | ||
582 | 565 | inkscape:connector-curvature="0" /> | ||
583 | 566 | </g> | ||
584 | 567 | </svg> | ||
585 | 0 | 568 | ||
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 | 84 | 84 | ||
591 | 85 | static const char CATEGORY_STORE[] = R"( | 85 | static const char CATEGORY_STORE[] = R"( |
592 | 86 | { | 86 | { |
593 | 87 | "schema-version": 1, | ||
594 | 88 | "template": { | 87 | "template": { |
595 | 89 | "category-layout": "grid", | 88 | "category-layout": "grid", |
598 | 90 | "card-size": "medium", | 89 | "overlay": true, |
599 | 91 | "card-background": "color:///#E9E9E9" | 90 | "card-size": "small", |
600 | 91 | "card-background": "color:///#DD4814" | ||
601 | 92 | }, | 92 | }, |
602 | 93 | "components": { | 93 | "components": { |
603 | 94 | "title": "title", | 94 | "title": "title", |
609 | 95 | "subtitle": "author", | 95 | "art": { |
610 | 96 | "mascot": { | 96 | "aspect-ratio": 0.55, |
611 | 97 | "field": "art" | 97 | "field": "art" |
612 | 98 | }, | 98 | } |
608 | 99 | "background": "background" | ||
613 | 100 | } | 99 | } |
614 | 101 | } | 100 | } |
615 | 101 | |||
616 | 102 | )"; | 102 | )"; |
617 | 103 | 103 | ||
618 | 104 | 104 | ||
619 | @@ -167,7 +167,8 @@ | |||
620 | 167 | 167 | ||
621 | 168 | void click::Query::add_fake_store_app(scopes::SearchReplyProxy const& searchReply) | 168 | void click::Query::add_fake_store_app(scopes::SearchReplyProxy const& searchReply) |
622 | 169 | { | 169 | { |
624 | 170 | static const std::string title = _("Get more apps in Ubuntu store"); | 170 | static const std::string title = _("Ubuntu Store"); |
625 | 171 | static const std::string cat_title = _("Get more apps from the store"); | ||
626 | 171 | auto name = title; | 172 | auto name = title; |
627 | 172 | 173 | ||
628 | 173 | std::string querystr = query().query_string(); | 174 | std::string querystr = query().query_string(); |
629 | @@ -176,13 +177,13 @@ | |||
630 | 176 | if (querystr.empty() || name.find(querystr) != std::string::npos) | 177 | if (querystr.empty() || name.find(querystr) != std::string::npos) |
631 | 177 | { | 178 | { |
632 | 178 | scopes::CategoryRenderer rdr(CATEGORY_STORE); | 179 | scopes::CategoryRenderer rdr(CATEGORY_STORE); |
634 | 179 | auto cat = searchReply->register_category("store", "", "", rdr); | 180 | auto cat = searchReply->register_category("store", cat_title, "", rdr); |
635 | 180 | 181 | ||
636 | 181 | static const unity::scopes::CannedQuery store_scope("com.canonical.scopes.clickstore"); | 182 | static const unity::scopes::CannedQuery store_scope("com.canonical.scopes.clickstore"); |
637 | 182 | 183 | ||
638 | 183 | scopes::CategorisedResult res(cat); | 184 | scopes::CategorisedResult res(cat); |
639 | 184 | res.set_title(title); | 185 | res.set_title(title); |
641 | 185 | res.set_art(STORE_DATA_DIR "/apps-scope.svg"); | 186 | res.set_art(STORE_DATA_DIR "/store-scope-icon.svg"); |
642 | 186 | res.set_uri(store_scope.to_uri()); | 187 | res.set_uri(store_scope.to_uri()); |
643 | 187 | res[click::Query::ResultKeys::NAME] = title; | 188 | res[click::Query::ResultKeys::NAME] = title; |
644 | 188 | res[click::Query::ResultKeys::DESCRIPTION] = ""; | 189 | res[click::Query::ResultKeys::DESCRIPTION] = ""; |
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