Merge lp:~mihirsoni/ubuntu-calendar-app/1337879 into lp:ubuntu-calendar-app
- 1337879
- Merge into trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Kunal Parmar | ||||
Approved revision: | 396 | ||||
Merged at revision: | 395 | ||||
Proposed branch: | lp:~mihirsoni/ubuntu-calendar-app/1337879 | ||||
Merge into: | lp:ubuntu-calendar-app | ||||
Diff against target: |
692 lines (+7/-600) 9 files modified
CalendarChoicePopup.qml (+1/-1) ContactChoicePopup.qml (+2/-2) EventDetails.qml (+2/-2) calendar-today.svg (+0/-112) calendar.qml (+2/-1) cancel.svg (+0/-102) edit.svg (+0/-109) save.svg (+0/-118) search.svg (+0/-153) |
||||
To merge this branch: | bzr merge lp:~mihirsoni/ubuntu-calendar-app/1337879 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Kunal Parmar | Approve | ||
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Nekhelesh Ramananthan | Approve | ||
Review via email: mp+230891@code.launchpad.net |
Commit message
Modified icons according to suru-theme
Description of the change
Modified icons according to suru-theme
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
Nekhelesh Ramananthan (nik90) wrote : | # |
Nice. You have however not removed the local image assets. Do you require them in other places? If not remove the unnecessary icon assets.
- 395. By Mihir Soni
-
Removed svg files & added Icon in contact popup
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:395
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Nekhelesh Ramananthan (nik90) wrote : | # |
I noticed 3 more icons -> icon-location@
- 396. By Mihir Soni
-
Removed unnecessary icons
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:396
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Kunal Parmar (pkunal-parmar) wrote : | # |
Top approving as Nekhelesh already reviewed and approved it.
Preview Diff
1 | === modified file 'CalendarChoicePopup.qml' |
2 | --- CalendarChoicePopup.qml 2014-07-12 02:19:12 +0000 |
3 | +++ CalendarChoicePopup.qml 2014-08-15 08:39:47 +0000 |
4 | @@ -28,7 +28,7 @@ |
5 | ToolbarButton { |
6 | action: Action { |
7 | text: i18n.tr("Save"); |
8 | - iconSource: Qt.resolvedUrl("save.svg"); |
9 | + iconName: "save" |
10 | onTriggered: { |
11 | root.collectionUpdated(); |
12 | pageStack.pop(); |
13 | |
14 | === modified file 'ContactChoicePopup.qml' |
15 | --- ContactChoicePopup.qml 2014-07-31 16:09:04 +0000 |
16 | +++ ContactChoicePopup.qml 2014-08-15 08:39:47 +0000 |
17 | @@ -64,12 +64,12 @@ |
18 | focus: true |
19 | width: parent.width |
20 | placeholderText: i18n.tr("Search contact") |
21 | - primaryItem: Image { |
22 | + primaryItem: Icon { |
23 | height: parent.height*0.5 |
24 | width: parent.height*0.5 |
25 | anchors.verticalCenter: parent.verticalCenter |
26 | anchors.verticalCenterOffset: -units.gu(0.2) |
27 | - source: Qt.resolvedUrl("search.svg") |
28 | + name:"find" |
29 | } |
30 | } |
31 | |
32 | |
33 | === modified file 'EventDetails.qml' |
34 | --- EventDetails.qml 2014-07-31 19:24:09 +0000 |
35 | +++ EventDetails.qml 2014-08-15 08:39:47 +0000 |
36 | @@ -194,7 +194,7 @@ |
37 | action:Action { |
38 | text: i18n.tr("Delete"); |
39 | objectName: "delete" |
40 | - iconSource: "image://theme/delete,edit-delete-symbolic" |
41 | + iconName: "delete" |
42 | onTriggered: { |
43 | var dialog = PopupUtils.open(Qt.resolvedUrl("DeleteConfirmationDialog.qml"),root,{"event": event}); |
44 | dialog.deleteEvent.connect( function(eventId){ |
45 | @@ -208,7 +208,7 @@ |
46 | ToolbarButton { |
47 | action:Action { |
48 | text: i18n.tr("Edit"); |
49 | - iconSource: Qt.resolvedUrl("edit.svg"); |
50 | + iconName: "edit"; |
51 | onTriggered: { |
52 | if( event.itemType === Type.EventOccurrence ) { |
53 | var dialog = PopupUtils.open(Qt.resolvedUrl("EditEventConfirmationDialog.qml"),root,{"event": event}); |
54 | |
55 | === removed file 'avatar@8.png' |
56 | Binary files avatar@8.png 2013-03-27 11:44:20 +0000 and avatar@8.png 1970-01-01 00:00:00 +0000 differ |
57 | === removed file 'calendar-today.svg' |
58 | --- calendar-today.svg 2013-10-11 11:08:47 +0000 |
59 | +++ calendar-today.svg 1970-01-01 00:00:00 +0000 |
60 | @@ -1,112 +0,0 @@ |
61 | -<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
62 | -<!-- Created with Inkscape (http://www.inkscape.org/) --> |
63 | - |
64 | -<svg |
65 | - xmlns:dc="http://purl.org/dc/elements/1.1/" |
66 | - xmlns:cc="http://creativecommons.org/ns#" |
67 | - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
68 | - xmlns:svg="http://www.w3.org/2000/svg" |
69 | - xmlns="http://www.w3.org/2000/svg" |
70 | - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
71 | - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
72 | - width="90" |
73 | - height="89.999916" |
74 | - id="svg3140" |
75 | - version="1.1" |
76 | - inkscape:version="0.48+devel r12648" |
77 | - sodipodi:docname="calendar-today.svg"> |
78 | - <defs |
79 | - id="defs3142" /> |
80 | - <sodipodi:namedview |
81 | - id="base" |
82 | - pagecolor="#ffffff" |
83 | - bordercolor="#666666" |
84 | - borderopacity="1.0" |
85 | - inkscape:pageopacity="0.0" |
86 | - inkscape:pageshadow="2" |
87 | - inkscape:zoom="2.0861625" |
88 | - inkscape:cx="69.7309" |
89 | - inkscape:cy="85.472641" |
90 | - inkscape:document-units="px" |
91 | - inkscape:current-layer="layer1" |
92 | - showgrid="true" |
93 | - inkscape:window-width="1920" |
94 | - inkscape:window-height="1029" |
95 | - inkscape:window-x="0" |
96 | - inkscape:window-y="24" |
97 | - inkscape:window-maximized="1" |
98 | - showguides="true" |
99 | - inkscape:guide-bbox="true" |
100 | - fit-margin-top="0" |
101 | - fit-margin-left="0" |
102 | - fit-margin-right="0" |
103 | - fit-margin-bottom="0" |
104 | - inkscape:snap-bbox="true" |
105 | - inkscape:bbox-paths="true" |
106 | - inkscape:bbox-nodes="true" |
107 | - inkscape:snap-bbox-edge-midpoints="true" |
108 | - inkscape:snap-bbox-midpoints="true" |
109 | - inkscape:object-paths="true" |
110 | - inkscape:snap-intersection-paths="true" |
111 | - inkscape:object-nodes="true" |
112 | - inkscape:snap-smooth-nodes="true" |
113 | - inkscape:snap-midpoints="true" |
114 | - inkscape:snap-object-midpoints="true" |
115 | - inkscape:snap-center="true"> |
116 | - <inkscape:grid |
117 | - type="xygrid" |
118 | - id="grid4083" |
119 | - empspacing="6" /> |
120 | - </sodipodi:namedview> |
121 | - <metadata |
122 | - id="metadata3145"> |
123 | - <rdf:RDF> |
124 | - <cc:Work |
125 | - rdf:about=""> |
126 | - <dc:format>image/svg+xml</dc:format> |
127 | - <dc:type |
128 | - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
129 | - <dc:title></dc:title> |
130 | - </cc:Work> |
131 | - </rdf:RDF> |
132 | - </metadata> |
133 | - <g |
134 | - inkscape:label="Layer 1" |
135 | - inkscape:groupmode="layer" |
136 | - id="layer1" |
137 | - transform="translate(0,-962.36224)"> |
138 | - <rect |
139 | - style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
140 | - id="rect4198" |
141 | - width="90" |
142 | - height="89.999916" |
143 | - x="0" |
144 | - y="962.36224" /> |
145 | - <path |
146 | - style="fill:#808080;fill-opacity:1" |
147 | - d="M 35.914062 6 L 35.914062 15 C 35.914062 19.83649 31.836488 23.914062 27 23.914062 C 22.163512 23.914062 18.085938 19.83649 18.085938 15 L 18.085938 6.453125 C 7.5592366 7.5299788 6 11.226273 6 24 L 6 66 C 6 84 9 84 36 84 L 54 84 C 81 84 84 84 84 66 L 84 24 C 84 11.226273 82.440763 7.5299788 71.914062 6.453125 L 71.914062 15 C 71.914062 19.83649 67.836488 23.914062 63 23.914062 C 58.163512 23.914062 54.085938 19.83649 54.085938 15 L 54.085938 6 C 54.053925 6 54.03208 6 54 6 L 36 6 C 35.96792 6 35.946075 6 35.914062 6 z M 36 30 L 54 30 C 78 30 78 29.99998 78 42 L 78 66 C 78 78 78 78 54 78 L 36 78 C 12 78 12 78 12 66 L 12 42 C 12 29.99998 12 30 36 30 z " |
148 | - transform="translate(0,962.36224)" |
149 | - id="path3759" /> |
150 | - <path |
151 | - style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" |
152 | - d="m 68.169693,998.36216 -0.360676,0.31559 -25.917969,22.70195 -15.193488,-13.0331 -4.592987,5.194 19.790231,20.8216 L 72,1002.6828 68.169693,998.36216 Z" |
153 | - id="path4041-9" |
154 | - inkscape:connector-curvature="0" /> |
155 | - <rect |
156 | - style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
157 | - id="rect4114" |
158 | - width="6" |
159 | - height="17.999973" |
160 | - x="24" |
161 | - y="962.36218" |
162 | - ry="3" /> |
163 | - <rect |
164 | - ry="3" |
165 | - y="962.36218" |
166 | - x="60" |
167 | - height="17.999973" |
168 | - width="6" |
169 | - id="rect4122" |
170 | - style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> |
171 | - </g> |
172 | -</svg> |
173 | |
174 | === modified file 'calendar.qml' |
175 | --- calendar.qml 2014-07-17 23:45:17 +0000 |
176 | +++ calendar.qml 2014-08-15 08:39:47 +0000 |
177 | @@ -282,7 +282,8 @@ |
178 | |
179 | ToolbarButton { |
180 | action: Action { |
181 | - iconSource: Qt.resolvedUrl("calendar-today.svg"); |
182 | + iconName: "calendar-today" |
183 | + |
184 | text: i18n.tr("Today"); |
185 | objectName: "todaybutton" |
186 | onTriggered: { |
187 | |
188 | === removed file 'cancel.svg' |
189 | --- cancel.svg 2013-10-11 11:08:47 +0000 |
190 | +++ cancel.svg 1970-01-01 00:00:00 +0000 |
191 | @@ -1,102 +0,0 @@ |
192 | -<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
193 | -<!-- Created with Inkscape (http://www.inkscape.org/) --> |
194 | - |
195 | -<svg |
196 | - xmlns:dc="http://purl.org/dc/elements/1.1/" |
197 | - xmlns:cc="http://creativecommons.org/ns#" |
198 | - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
199 | - xmlns:svg="http://www.w3.org/2000/svg" |
200 | - xmlns="http://www.w3.org/2000/svg" |
201 | - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
202 | - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
203 | - width="90" |
204 | - height="90" |
205 | - id="svg3140" |
206 | - version="1.1" |
207 | - inkscape:version="0.48.3.1 r9886" |
208 | - sodipodi:docname="cancel@30.svg"> |
209 | - <defs |
210 | - id="defs3142" /> |
211 | - <sodipodi:namedview |
212 | - id="base" |
213 | - pagecolor="#ffffff" |
214 | - bordercolor="#666666" |
215 | - borderopacity="1.0" |
216 | - inkscape:pageopacity="0.0" |
217 | - inkscape:pageshadow="2" |
218 | - inkscape:zoom="6.3664629" |
219 | - inkscape:cx="34.728861" |
220 | - inkscape:cy="49.305217" |
221 | - inkscape:document-units="px" |
222 | - inkscape:current-layer="g4978" |
223 | - showgrid="true" |
224 | - inkscape:window-width="1920" |
225 | - inkscape:window-height="1029" |
226 | - inkscape:window-x="0" |
227 | - inkscape:window-y="24" |
228 | - inkscape:window-maximized="1" |
229 | - fit-margin-top="0" |
230 | - fit-margin-left="0" |
231 | - fit-margin-right="0" |
232 | - fit-margin-bottom="0"> |
233 | - <inkscape:grid |
234 | - type="xygrid" |
235 | - id="grid3178" |
236 | - empspacing="6" |
237 | - visible="true" |
238 | - enabled="true" |
239 | - snapvisiblegridlinesonly="true" |
240 | - originx="0px" |
241 | - originy="-1.7382813e-05px" /> |
242 | - </sodipodi:namedview> |
243 | - <metadata |
244 | - id="metadata3145"> |
245 | - <rdf:RDF> |
246 | - <cc:Work |
247 | - rdf:about=""> |
248 | - <dc:format>image/svg+xml</dc:format> |
249 | - <dc:type |
250 | - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
251 | - <dc:title /> |
252 | - </cc:Work> |
253 | - </rdf:RDF> |
254 | - </metadata> |
255 | - <g |
256 | - inkscape:label="Layer 1" |
257 | - inkscape:groupmode="layer" |
258 | - id="layer1" |
259 | - transform="translate(0,-962.36218)"> |
260 | - <rect |
261 | - style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
262 | - id="rect4198" |
263 | - width="90" |
264 | - height="90" |
265 | - x="0" |
266 | - y="962.36218" /> |
267 | - <g |
268 | - id="g4978" |
269 | - transform="translate(-60,548.00002)"> |
270 | - <path |
271 | - style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
272 | - d="M 45 6 C 23.460914 6 6 23.46091 6 45 C 6 66.53909 23.460914 84 45 84 C 66.5391 84 84 66.53909 84 45 C 84 23.46091 66.5391 6 45 6 z M 45 15 C 61.56857 15 75 28.43144 75 45 C 75 61.56856 61.56857 75 45 75 C 28.431442 75 15 61.56856 15 45 C 15 28.43144 28.431442 15 45 15 z " |
273 | - transform="translate(60,414.36216)" |
274 | - id="path2989" /> |
275 | - <rect |
276 | - style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
277 | - id="rect3011" |
278 | - width="67.500038" |
279 | - height="9" |
280 | - x="-284.32196" |
281 | - y="394.56436" |
282 | - transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" /> |
283 | - <rect |
284 | - style="color:#000000;fill:none;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
285 | - id="rect3032" |
286 | - width="90" |
287 | - height="90" |
288 | - x="0" |
289 | - y="1.7382814e-05" |
290 | - transform="translate(60,414.36216)" /> |
291 | - </g> |
292 | - </g> |
293 | -</svg> |
294 | |
295 | === removed file 'edit.svg' |
296 | --- edit.svg 2013-10-11 11:08:47 +0000 |
297 | +++ edit.svg 1970-01-01 00:00:00 +0000 |
298 | @@ -1,109 +0,0 @@ |
299 | -<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
300 | -<!-- Created with Inkscape (http://www.inkscape.org/) --> |
301 | - |
302 | -<svg |
303 | - xmlns:dc="http://purl.org/dc/elements/1.1/" |
304 | - xmlns:cc="http://creativecommons.org/ns#" |
305 | - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
306 | - xmlns:svg="http://www.w3.org/2000/svg" |
307 | - xmlns="http://www.w3.org/2000/svg" |
308 | - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
309 | - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
310 | - width="90" |
311 | - height="90" |
312 | - id="svg3140" |
313 | - version="1.1" |
314 | - inkscape:version="0.48.3.1 r9886" |
315 | - sodipodi:docname="edit@30.svg"> |
316 | - <defs |
317 | - id="defs3142" /> |
318 | - <sodipodi:namedview |
319 | - id="base" |
320 | - pagecolor="#ffffff" |
321 | - bordercolor="#666666" |
322 | - borderopacity="1.0" |
323 | - inkscape:pageopacity="0.0" |
324 | - inkscape:pageshadow="2" |
325 | - inkscape:zoom="3.259629" |
326 | - inkscape:cx="90.378383" |
327 | - inkscape:cy="40.541369" |
328 | - inkscape:document-units="px" |
329 | - inkscape:current-layer="layer1" |
330 | - showgrid="true" |
331 | - inkscape:window-width="1920" |
332 | - inkscape:window-height="1029" |
333 | - inkscape:window-x="0" |
334 | - inkscape:window-y="24" |
335 | - inkscape:window-maximized="1" |
336 | - fit-margin-top="0" |
337 | - fit-margin-left="0" |
338 | - fit-margin-right="0" |
339 | - fit-margin-bottom="0" |
340 | - inkscape:snap-global="true"> |
341 | - <inkscape:grid |
342 | - type="xygrid" |
343 | - id="grid3178" |
344 | - empspacing="6" |
345 | - visible="true" |
346 | - enabled="true" |
347 | - snapvisiblegridlinesonly="true" |
348 | - originx="0px" |
349 | - originy="-1.7382813e-05px" /> |
350 | - </sodipodi:namedview> |
351 | - <metadata |
352 | - id="metadata3145"> |
353 | - <rdf:RDF> |
354 | - <cc:Work |
355 | - rdf:about=""> |
356 | - <dc:format>image/svg+xml</dc:format> |
357 | - <dc:type |
358 | - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
359 | - <dc:title /> |
360 | - </cc:Work> |
361 | - </rdf:RDF> |
362 | - </metadata> |
363 | - <g |
364 | - inkscape:label="Layer 1" |
365 | - inkscape:groupmode="layer" |
366 | - id="layer1" |
367 | - transform="translate(0,-962.36218)"> |
368 | - <path |
369 | - inkscape:connector-curvature="0" |
370 | - style="fill:#808080;stroke:none" |
371 | - d="m 14.942852,1010.6204 a 2.6452116,2.6344441 45 0 0 -4.192087,1.2857 l -10.61999287,31.9717 a 2.6452116,2.6344441 45 0 0 3.35369047,3.3535 l 31.9717214,-10.6198 a 2.6452116,2.6344441 45 0 0 1.061987,-4.4158 l -0.726628,-0.7266 -21.854793,7.3222 -5.365894,-5.366 7.322214,-21.8547 -0.726628,-0.7267 a 2.6452116,2.6344441 45 0 0 -0.223537,-0.223 z" |
372 | - id="path4157" /> |
373 | - <path |
374 | - inkscape:connector-curvature="0" |
375 | - style="color:#000000;fill:#808080;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
376 | - d="m 72.011262,968.08465 c -7.654068,-7.40964 -10.005134,-7.76937 -17.830386,0.0558 l -42.927073,42.92698 3.577254,3.5775 c 2.96359,-2.9637 6.567073,-4.1647 8.048841,-2.683 1.481768,1.4816 0.280643,5.0852 -2.682947,8.0489 2.96359,-2.9637 6.967448,-3.7643 8.943148,-1.7887 1.975673,1.9757 1.174949,5.9797 -1.78864,8.9432 2.963589,-2.9635 6.567046,-4.1649 8.048841,-2.683 1.481768,1.4817 0.280616,5.0854 -2.682946,8.0487 l 3.577253,3.5773 42.927073,-42.92696 c 8.943149,-8.94307 7.154508,-10.7319 -3.577254,-21.46352 -1.341487,-1.34149 -2.539294,-2.57519 -3.633164,-3.63314 z" |
377 | - id="rect4148" /> |
378 | - <rect |
379 | - style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
380 | - id="rect4198" |
381 | - width="89.999954" |
382 | - height="89.999954" |
383 | - x="0" |
384 | - y="962.36218" /> |
385 | - <rect |
386 | - style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
387 | - id="rect3972-1" |
388 | - width="21" |
389 | - height="5.9999852" |
390 | - x="69" |
391 | - y="1016.3622" /> |
392 | - <rect |
393 | - style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
394 | - id="rect3974-0" |
395 | - width="36" |
396 | - height="5.9999852" |
397 | - x="54" |
398 | - y="1031.3622" /> |
399 | - <rect |
400 | - style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
401 | - id="rect3976-5" |
402 | - width="51" |
403 | - height="5.9999771" |
404 | - x="39" |
405 | - y="1046.3622" /> |
406 | - </g> |
407 | -</svg> |
408 | |
409 | === removed file 'icon-contacts@8.png' |
410 | Binary files icon-contacts@8.png 2013-03-26 00:42:47 +0000 and icon-contacts@8.png 1970-01-01 00:00:00 +0000 differ |
411 | === removed file 'icon-location@18.png' |
412 | Binary files icon-location@18.png 2013-03-26 00:42:47 +0000 and icon-location@18.png 1970-01-01 00:00:00 +0000 differ |
413 | === removed file 'save.svg' |
414 | --- save.svg 2013-10-11 11:08:47 +0000 |
415 | +++ save.svg 1970-01-01 00:00:00 +0000 |
416 | @@ -1,118 +0,0 @@ |
417 | -<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
418 | -<!-- Created with Inkscape (http://www.inkscape.org/) --> |
419 | - |
420 | -<svg |
421 | - xmlns:dc="http://purl.org/dc/elements/1.1/" |
422 | - xmlns:cc="http://creativecommons.org/ns#" |
423 | - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
424 | - xmlns:svg="http://www.w3.org/2000/svg" |
425 | - xmlns="http://www.w3.org/2000/svg" |
426 | - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
427 | - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
428 | - width="90" |
429 | - height="90.000076" |
430 | - id="svg3140" |
431 | - version="1.1" |
432 | - inkscape:version="0.48+devel r12275" |
433 | - sodipodi:docname="save.svg"> |
434 | - <defs |
435 | - id="defs3142" /> |
436 | - <sodipodi:namedview |
437 | - id="base" |
438 | - pagecolor="#ffffff" |
439 | - bordercolor="#666666" |
440 | - borderopacity="1.0" |
441 | - inkscape:pageopacity="0.0" |
442 | - inkscape:pageshadow="2" |
443 | - inkscape:zoom="4.0745362" |
444 | - inkscape:cx="2.7487785" |
445 | - inkscape:cy="2.6996916" |
446 | - inkscape:document-units="px" |
447 | - inkscape:current-layer="g4978" |
448 | - showgrid="true" |
449 | - inkscape:window-width="1920" |
450 | - inkscape:window-height="1029" |
451 | - inkscape:window-x="0" |
452 | - inkscape:window-y="24" |
453 | - inkscape:window-maximized="1" |
454 | - showguides="true" |
455 | - inkscape:guide-bbox="true" |
456 | - fit-margin-top="0" |
457 | - fit-margin-left="0" |
458 | - fit-margin-right="0" |
459 | - fit-margin-bottom="0"> |
460 | - <inkscape:grid |
461 | - type="xygrid" |
462 | - id="grid3178" |
463 | - empspacing="6" |
464 | - visible="true" |
465 | - enabled="true" |
466 | - snapvisiblegridlinesonly="true" |
467 | - originx="0px" |
468 | - originy="-1.1368684e-13px" /> |
469 | - </sodipodi:namedview> |
470 | - <metadata |
471 | - id="metadata3145"> |
472 | - <rdf:RDF> |
473 | - <cc:Work |
474 | - rdf:about=""> |
475 | - <dc:format>image/svg+xml</dc:format> |
476 | - <dc:type |
477 | - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
478 | - <dc:title></dc:title> |
479 | - </cc:Work> |
480 | - </rdf:RDF> |
481 | - </metadata> |
482 | - <g |
483 | - inkscape:label="Layer 1" |
484 | - inkscape:groupmode="layer" |
485 | - id="layer1" |
486 | - transform="translate(0,-962.36212)"> |
487 | - <rect |
488 | - style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
489 | - id="rect4198" |
490 | - width="90" |
491 | - height="90" |
492 | - x="0" |
493 | - y="962.36212" /> |
494 | - <g |
495 | - id="g4978" |
496 | - transform="translate(-60,548.00002)"> |
497 | - <path |
498 | - sodipodi:type="star" |
499 | - style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
500 | - id="path4984" |
501 | - sodipodi:sides="3" |
502 | - sodipodi:cx="111" |
503 | - sodipodi:cy="174.09448" |
504 | - sodipodi:r1="5.8309517" |
505 | - sodipodi:r2="2.9154758" |
506 | - sodipodi:arg1="1.0471976" |
507 | - sodipodi:arg2="2.0943951" |
508 | - inkscape:flatsided="true" |
509 | - inkscape:rounded="0.06" |
510 | - inkscape:randomized="0" |
511 | - d="m 113.91548,179.14423 c -0.52479,0.30299 -8.74643,-4.44378 -8.74643,-5.04975 0,-0.60597 8.22164,-5.35273 8.74643,-5.04975 C 114.44026,169.34772 114.44026,178.84125 113.91548,179.14423 Z" |
512 | - transform="matrix(0,-5.2516315,5.3321268,0,-823.29386,1035.6713)" |
513 | - inkscape:transform-center-y="5.0717206" /> |
514 | - <path |
515 | - style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#808080;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" |
516 | - d="m 96.00005,414.36213 0,35.00002 17.99995,0 0,-35.00002 -17.99995,0 z" |
517 | - id="path4988" |
518 | - inkscape:connector-curvature="0" /> |
519 | - <path |
520 | - style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
521 | - d="M 23.3125 75 C 15.751955 75.102539 15 75.937491 15 82.5 C 15 90 16 90 27 90 L 63 90 C 74 90 75 90 75 82.5 C 75 74.99999 74 75 63 75 L 27 75 C 25.625 75 24.392578 74.985352 23.3125 75 z M 65.75 80 L 66.25 80 C 69.70007 80 70 79.99999 70 82.5 C 70 84.99999 69.70007 85 66.25 85 L 65.75 85 C 62.29992 85 62 84.99999 62 82.5 C 62 79.99999 62.29992 80 65.75 80 z " |
522 | - transform="translate(60,414.3621)" |
523 | - id="rect3408" /> |
524 | - <rect |
525 | - style="color:#000000;fill:none;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
526 | - id="rect3047" |
527 | - width="90" |
528 | - height="90" |
529 | - x="0" |
530 | - y="7.6293945e-05" |
531 | - transform="translate(60,414.3621)" /> |
532 | - </g> |
533 | - </g> |
534 | -</svg> |
535 | |
536 | === removed file 'search.svg' |
537 | --- search.svg 2014-06-18 14:14:56 +0000 |
538 | +++ search.svg 1970-01-01 00:00:00 +0000 |
539 | @@ -1,153 +0,0 @@ |
540 | -<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
541 | -<!-- Created with Inkscape (http://www.inkscape.org/) --> |
542 | - |
543 | -<svg |
544 | - xmlns:dc="http://purl.org/dc/elements/1.1/" |
545 | - xmlns:cc="http://creativecommons.org/ns#" |
546 | - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
547 | - xmlns:svg="http://www.w3.org/2000/svg" |
548 | - xmlns="http://www.w3.org/2000/svg" |
549 | - xmlns:xlink="http://www.w3.org/1999/xlink" |
550 | - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
551 | - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
552 | - width="90" |
553 | - height="90.000015" |
554 | - id="svg3133" |
555 | - version="1.1" |
556 | - inkscape:version="0.48+devel r12262" |
557 | - sodipodi:docname="search.svg"> |
558 | - <defs |
559 | - id="defs3135"> |
560 | - <linearGradient |
561 | - inkscape:collect="always" |
562 | - id="linearGradient3803"> |
563 | - <stop |
564 | - style="stop-color:#e7e5e5;stop-opacity:1;" |
565 | - offset="0" |
566 | - id="stop3805" /> |
567 | - <stop |
568 | - style="stop-color:#e2dfdf;stop-opacity:1" |
569 | - offset="1" |
570 | - id="stop3807" /> |
571 | - </linearGradient> |
572 | - <linearGradient |
573 | - inkscape:collect="always" |
574 | - xlink:href="#linearGradient3803" |
575 | - id="linearGradient3809" |
576 | - x1="53.012165" |
577 | - y1="-102.79017" |
578 | - x2="53.012165" |
579 | - y2="-66.661224" |
580 | - gradientUnits="userSpaceOnUse" /> |
581 | - <linearGradient |
582 | - inkscape:collect="always" |
583 | - xlink:href="#linearGradient3803" |
584 | - id="linearGradient3813" |
585 | - gradientUnits="userSpaceOnUse" |
586 | - x1="53.012165" |
587 | - y1="-102.79017" |
588 | - x2="53.012165" |
589 | - y2="-66.661224" |
590 | - gradientTransform="translate(-625,0)" /> |
591 | - </defs> |
592 | - <sodipodi:namedview |
593 | - id="base" |
594 | - pagecolor="#ffffff" |
595 | - bordercolor="#666666" |
596 | - borderopacity="1.0" |
597 | - inkscape:pageopacity="0.0" |
598 | - inkscape:pageshadow="2" |
599 | - inkscape:zoom="7.9580781" |
600 | - inkscape:cx="47.57328" |
601 | - inkscape:cy="40.531144" |
602 | - inkscape:document-units="px" |
603 | - inkscape:current-layer="g3842" |
604 | - showgrid="true" |
605 | - inkscape:window-width="1920" |
606 | - inkscape:window-height="1029" |
607 | - inkscape:window-x="0" |
608 | - inkscape:window-y="24" |
609 | - inkscape:window-maximized="1" |
610 | - inkscape:snap-grids="true" |
611 | - inkscape:snap-global="true" |
612 | - fit-margin-top="0" |
613 | - fit-margin-left="0" |
614 | - fit-margin-right="0" |
615 | - fit-margin-bottom="0" |
616 | - inkscape:snap-bbox="true" |
617 | - inkscape:bbox-paths="true" |
618 | - inkscape:bbox-nodes="true" |
619 | - inkscape:snap-bbox-edge-midpoints="true" |
620 | - inkscape:snap-bbox-midpoints="true" |
621 | - inkscape:object-paths="true" |
622 | - inkscape:snap-intersection-paths="true" |
623 | - inkscape:snap-midpoints="true" |
624 | - inkscape:snap-smooth-nodes="true" |
625 | - inkscape:object-nodes="true" |
626 | - inkscape:snap-object-midpoints="true" |
627 | - inkscape:snap-center="true"> |
628 | - <inkscape:grid |
629 | - type="xygrid" |
630 | - id="grid3016" |
631 | - empspacing="6" |
632 | - visible="true" |
633 | - enabled="true" |
634 | - snapvisiblegridlinesonly="true" |
635 | - originx="-2.98e-06px" |
636 | - originy="2.6171874e-06px" /> |
637 | - </sodipodi:namedview> |
638 | - <metadata |
639 | - id="metadata3138"> |
640 | - <rdf:RDF> |
641 | - <cc:Work |
642 | - rdf:about=""> |
643 | - <dc:format>image/svg+xml</dc:format> |
644 | - <dc:type |
645 | - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
646 | - <dc:title /> |
647 | - </cc:Work> |
648 | - </rdf:RDF> |
649 | - </metadata> |
650 | - <g |
651 | - inkscape:label="Layer 1" |
652 | - inkscape:groupmode="layer" |
653 | - id="layer1" |
654 | - transform="translate(-2.98e-6,-962.36219)" |
655 | - style="display:inline"> |
656 | - <g |
657 | - transform="matrix(0.99934414,0,0,1,-106.92982,549.00002)" |
658 | - id="g3842" |
659 | - style="display:inline"> |
660 | - <rect |
661 | - style="opacity:0.05;color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
662 | - id="rect3844" |
663 | - width="90.059067" |
664 | - height="90.000015" |
665 | - x="107" |
666 | - y="-503.36218" |
667 | - transform="scale(1,-1)" /> |
668 | - <path |
669 | - sodipodi:type="arc" |
670 | - style="color:#000000;fill:none;stroke:#808080;stroke-width:10.49972248;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
671 | - id="path2995" |
672 | - sodipodi:cx="35.999996" |
673 | - sodipodi:cy="36.500011" |
674 | - sodipodi:rx="33" |
675 | - sodipodi:ry="33.5" |
676 | - d="m 68.999996,36.500011 a 33,33.5 0 1 1 -65.9999998,0 A 33,33.5 0 1 1 68.999996,36.500011 Z" |
677 | - transform="matrix(0.86331274,0,0,0.85161915,120.95028,427.27807)" /> |
678 | - <path |
679 | - style="font-size:xx-small;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#808080;fill-opacity:1;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" |
680 | - d="m 175.1697,477.23717 -4.25279,4.25 12.00787,12 L 187.17757,489.23717 Z" |
681 | - id="path3765" |
682 | - inkscape:connector-curvature="0" |
683 | - sodipodi:nodetypes="ccccc" /> |
684 | - <path |
685 | - style="font-size:xx-small;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#808080;fill-opacity:1;stroke:none;stroke-width:11.80387211;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" |
686 | - d="m 180.97203,481.40625 c -2.32437,0.012 -4.57033,1.53501 -5.44162,3.68994 -0.87128,2.15492 -0.31496,4.81092 1.34787,6.43506 l 8.79632,8.79991 c 4.02735,4.27401 4.89575,3.69726 8.46955,0.1258 3.57381,-3.57146 4.15747,-4.18909 -0.1258,-8.46955 l -8.79632,-8.79991 C 184.12024,482.05781 182.55003,481.39971 180.97203,481.40625 Z" |
687 | - id="path3767" |
688 | - inkscape:connector-curvature="0" |
689 | - sodipodi:nodetypes="cscczccc" /> |
690 | - </g> |
691 | - </g> |
692 | -</svg> |
PASSED: Continuous integration, rev:394 91.189. 93.70:8080/ job/ubuntu- calendar- app-ci/ 682/ 91.189. 93.70:8080/ job/generic- mediumtests- utopic/ 1534 91.189. 93.70:8080/ job/generic- mediumtests- utopic/ 1534/artifact/ work/output/ *zip*/output. zip 91.189. 93.70:8080/ job/ubuntu- calendar- app-utopic- amd64-ci/ 240
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: 91.189. 93.70:8080/ job/ubuntu- calendar- app-ci/ 682/rebuild
http://