Merge lp:~elementary-apps/pantheon-photos/rebrand into lp:~pantheon-photos/pantheon-photos/trunk
- rebrand
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Danielle Foré |
Approved revision: | 2521 |
Merged at revision: | 2518 |
Proposed branch: | lp:~elementary-apps/pantheon-photos/rebrand |
Merge into: | lp:~pantheon-photos/pantheon-photos/trunk |
Diff against target: |
999 lines (+36/-659) 15 files modified
Makefile (+5/-24) icons/shotwell-16.svg (+0/-161) icons/shotwell-24.svg (+0/-200) icons/shotwell.svg (+0/-237) misc/shotwell-viewer.desktop.head (+3/-3) misc/shotwell.desktop.head (+3/-3) src/AppWindow.vala (+4/-5) src/DesktopIntegration.vala (+2/-2) src/MetadataWriter.vala (+1/-2) src/Photo.vala (+2/-3) src/Resources.vala (+6/-6) src/camera/ImportPage.vala (+2/-3) src/direct/DirectPhotoPage.vala (+2/-2) src/direct/DirectWindow.vala (+1/-2) src/main.vala (+5/-6) |
To merge this branch: | bzr merge lp:~elementary-apps/pantheon-photos/rebrand |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Victor Martinez (community) | Approve | ||
Review via email: mp+219986@code.launchpad.net |
Commit message
rebrand to Photos
Description of the change
This branch does the absolutely minimum to rebrand to "Photos" for user-facing only parts of the app.
It doesn't fully take into account breakage in the About dialog (there's no icon shown with this branch). But there is a branch out for using Granite.About so I don't think it's a big deal.
Unlike a previous branch, the .desktop files shouldn't be broken upon install.
Danielle Foré (danrabbit) wrote : | # |
Hey Victor,
Thanks for your review! I think I've fixed all the issues you outline, except I couldn't see which icons you were referring to.
- 2519. By Danielle Foré
-
fix all the stuff
- 2520. By Danielle Foré
-
make sure .desktop.head has the empty newline
Victor Martinez (victored) wrote : | # |
Fantastic!
After this is merged all there's left to do is updating the *.po files to reflect the changes.
Is this a typo? multimeda-
Victor Martinez (victored) wrote : | # |
You're right about the icons. The files don't exist anymore. Please disregard my suggestion.
- 2521. By Danielle Foré
-
fix typo
Danielle Foré (danrabbit) wrote : | # |
Oh yup, nice catch! typo fixed :D
Victor Martinez (victored) wrote : | # |
It looks perfect to me. Let's not forget about updating the translations afterwards.
Preview Diff
1 | === modified file 'Makefile' |
2 | --- Makefile 2014-02-04 22:37:33 +0000 |
3 | +++ Makefile 2014-05-20 04:18:55 +0000 |
4 | @@ -195,27 +195,17 @@ |
5 | four-star-filter-plus.svg \ |
6 | four-stars.svg \ |
7 | image-adjust.svg \ |
8 | - import-all.png \ |
9 | - import.svg \ |
10 | make-primary.svg \ |
11 | merge.svg \ |
12 | multiple-events.png \ |
13 | multiple-tags.png \ |
14 | - no-event.png \ |
15 | noninterpretable-video.png \ |
16 | - one-event.png \ |
17 | one-star-filter-plus.svg \ |
18 | one-star.svg \ |
19 | - one-tag.png \ |
20 | pin-toolbar.svg \ |
21 | publish.png \ |
22 | redeye.png \ |
23 | rejected.svg \ |
24 | - shotwell-16.svg \ |
25 | - shotwell-24.svg \ |
26 | - shotwell.ico \ |
27 | - shotwell-street.jpg \ |
28 | - shotwell.svg \ |
29 | sprocket.png \ |
30 | straighten.svg \ |
31 | three-star-filter-plus.svg \ |
32 | @@ -223,9 +213,6 @@ |
33 | two-star-filter-plus.svg \ |
34 | two-stars.svg \ |
35 | videos-page.png \ |
36 | - zoom-in.png \ |
37 | - zoom-out.png \ |
38 | - slideshow-extension-point.png \ |
39 | generic-plugin.png \ |
40 | filter-raw.png \ |
41 | filter-photos.png \ |
42 | @@ -361,13 +348,13 @@ |
43 | BUILD_DIR=src |
44 | endif |
45 | |
46 | -DESKTOP_APP_SHORT_NAME="Shotwell" |
47 | -DESKTOP_APP_FULL_NAME="Shotwell Photo Manager" |
48 | +DESKTOP_APP_SHORT_NAME="Photos" |
49 | +DESKTOP_APP_FULL_NAME="Photo Manager" |
50 | DESKTOP_APPLICATION_COMMENT="Organize your photos" |
51 | DESKTOP_APPLICATION_CLASS="Photo Manager" |
52 | DESKTOP_APP_KEYWORDS="album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;" |
53 | -DIRECT_EDIT_DESKTOP_APP_SHORT_NAME="Shotwell" |
54 | -DIRECT_EDIT_DESKTOP_APP_FULL_NAME="Shotwell Photo Viewer" |
55 | +DIRECT_EDIT_DESKTOP_APP_SHORT_NAME="Photo Viewer" |
56 | +DIRECT_EDIT_DESKTOP_APP_FULL_NAME="Photo Viewer" |
57 | DIRECT_EDIT_DESKTOP_APPLICATION_CLASS="Photo Viewer" |
58 | TEMPORARY_DESKTOP_FILES = misc/shotwell.desktop misc/shotwell-viewer.desktop |
59 | |
60 | @@ -567,12 +554,6 @@ |
61 | $(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(LIBEXECDIR) |
62 | mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/icons |
63 | $(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/shotwell/icons |
64 | - mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps |
65 | - $(INSTALL_DATA) icons/shotwell.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps |
66 | - mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps |
67 | - $(INSTALL_DATA) icons/shotwell-16.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/shotwell.svg |
68 | - mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps |
69 | - $(INSTALL_DATA) icons/shotwell-24.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/shotwell.svg |
70 | mkdir -p $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas |
71 | $(INSTALL_DATA) misc/org.yorba.shotwell.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas |
72 | $(INSTALL_DATA) misc/org.yorba.shotwell-extras.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas |
73 | @@ -765,4 +746,4 @@ |
74 | @ type msgfmt > /dev/null || ( echo 'msgfmt (usually found in the gettext package) is missing and is required to build Shotwell. ' ; exit 1 ) |
75 | ifndef DISABLE_DESKTOP_VALIDATE |
76 | @ type desktop-file-validate > /dev/null || ( echo 'desktop-file-validate (usually found in the desktop-file-utils package) is missing and is required to build Shotwell. ' ; exit 1 ) |
77 | -endif |
78 | +endif |
79 | \ No newline at end of file |
80 | |
81 | === removed file 'icons/shotwell-16.svg' |
82 | --- icons/shotwell-16.svg 2010-08-18 23:46:19 +0000 |
83 | +++ icons/shotwell-16.svg 1970-01-01 00:00:00 +0000 |
84 | @@ -1,161 +0,0 @@ |
85 | -<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
86 | -<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) --> |
87 | - |
88 | -<svg |
89 | - xmlns:dc="http://purl.org/dc/elements/1.1/" |
90 | - xmlns:cc="http://creativecommons.org/ns#" |
91 | - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
92 | - xmlns:svg="http://www.w3.org/2000/svg" |
93 | - xmlns="http://www.w3.org/2000/svg" |
94 | - xmlns:xlink="http://www.w3.org/1999/xlink" |
95 | - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
96 | - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
97 | - version="1.0" |
98 | - id="Layer_1" |
99 | - x="0px" |
100 | - y="0px" |
101 | - width="16" |
102 | - height="16" |
103 | - viewBox="0 0 16 16" |
104 | - enable-background="new 0 0 180 180" |
105 | - xml:space="preserve" |
106 | - inkscape:version="0.47 r22583" |
107 | - sodipodi:docname="shotwell.svg"><metadata |
108 | - id="metadata9"><rdf:RDF><cc:Work |
109 | - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type |
110 | - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs |
111 | - id="defs7"><linearGradient |
112 | - id="linearGradient3710"><stop |
113 | - style="stop-color:#c9332e;stop-opacity:1;" |
114 | - offset="0" |
115 | - id="stop3712" /><stop |
116 | - style="stop-color:#87231f;stop-opacity:1;" |
117 | - offset="1" |
118 | - id="stop3714" /></linearGradient><linearGradient |
119 | - id="linearGradient3665"><stop |
120 | - style="stop-color:#667f2e;stop-opacity:1;" |
121 | - offset="0" |
122 | - id="stop3667" /><stop |
123 | - style="stop-color:#94b641;stop-opacity:1;" |
124 | - offset="1" |
125 | - id="stop3669" /></linearGradient><linearGradient |
126 | - id="linearGradient3628"><stop |
127 | - style="stop-color:#099bd1;stop-opacity:1;" |
128 | - offset="0" |
129 | - id="stop3630" /><stop |
130 | - style="stop-color:#035fa9;stop-opacity:1;" |
131 | - offset="1" |
132 | - id="stop3632" /></linearGradient><linearGradient |
133 | - inkscape:collect="always" |
134 | - xlink:href="#linearGradient3665" |
135 | - id="linearGradient4937" |
136 | - gradientUnits="userSpaceOnUse" |
137 | - gradientTransform="matrix(1.025641,0,0,1.0126582,136.85898,-4.28481)" |
138 | - x1="-17.5" |
139 | - y1="22" |
140 | - x2="-17.5" |
141 | - y2="62.152832" /><linearGradient |
142 | - inkscape:collect="always" |
143 | - xlink:href="#linearGradient3710" |
144 | - id="linearGradient4939" |
145 | - gradientUnits="userSpaceOnUse" |
146 | - gradientTransform="matrix(0.16838723,0,0,0.16838725,40.079373,-0.16517623)" |
147 | - x1="-124.5" |
148 | - y1="101.26834" |
149 | - x2="-124.5" |
150 | - y2="73.998131" /><linearGradient |
151 | - inkscape:collect="always" |
152 | - xlink:href="#linearGradient3628" |
153 | - id="linearGradient4949" |
154 | - gradientUnits="userSpaceOnUse" |
155 | - gradientTransform="matrix(1.0761749,0,0,1.0251887,112.74312,3.0132867)" |
156 | - x1="-43.661713" |
157 | - y1="60.388466" |
158 | - x2="-43.661713" |
159 | - y2="31.618958" /></defs><sodipodi:namedview |
160 | - pagecolor="#ffffff" |
161 | - bordercolor="#e7e7e7" |
162 | - borderopacity="1" |
163 | - objecttolerance="10" |
164 | - gridtolerance="10" |
165 | - guidetolerance="10" |
166 | - inkscape:pageopacity="0" |
167 | - inkscape:pageshadow="2" |
168 | - inkscape:window-width="1024" |
169 | - inkscape:window-height="719" |
170 | - id="namedview5" |
171 | - showgrid="false" |
172 | - inkscape:zoom="16" |
173 | - inkscape:cx="12.787588" |
174 | - inkscape:cy="9.1475636" |
175 | - inkscape:window-x="1024" |
176 | - inkscape:window-y="24" |
177 | - inkscape:window-maximized="1" |
178 | - inkscape:current-layer="Layer_1" |
179 | - showguides="true" |
180 | - inkscape:guide-bbox="true" |
181 | - inkscape:snap-grids="false" |
182 | - inkscape:showpageshadow="false" |
183 | - showborder="true"><inkscape:grid |
184 | - type="xygrid" |
185 | - id="grid2819" |
186 | - empspacing="5" |
187 | - visible="true" |
188 | - enabled="true" |
189 | - snapvisiblegridlinesonly="true" /></sodipodi:namedview> |
190 | - |
191 | -<g |
192 | - id="g4920" |
193 | - transform="matrix(0.62380656,0,0,0.62380656,0.55469739,5.4956476)"><rect |
194 | - style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:1.6030612;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" |
195 | - id="rect2823" |
196 | - width="12.824489" |
197 | - height="14.427549" |
198 | - x="9.5306835" |
199 | - y="-6.4052672" |
200 | - rx="0" |
201 | - ry="0" /><g |
202 | - transform="matrix(0.10019132,0,0,0.12022958,3.6694907,-6.2249229)" |
203 | - id="g3686"><rect |
204 | - style="fill:url(#linearGradient4937);fill-opacity:1;stroke:none" |
205 | - id="rect3663" |
206 | - width="80" |
207 | - height="80" |
208 | - x="82.5" |
209 | - y="18.5" /></g><rect |
210 | - style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:1.60306096;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" |
211 | - id="rect2821" |
212 | - width="11.221428" |
213 | - height="14.427549" |
214 | - x="7.9276218" |
215 | - y="0.0069773095" |
216 | - rx="0" |
217 | - ry="0" /><g |
218 | - transform="matrix(0.59500541,0,0,0.71400649,2.2148058,-6.3674843)" |
219 | - id="g4732"><rect |
220 | - style="fill:url(#linearGradient4939);fill-opacity:1;stroke:none" |
221 | - id="rect3700" |
222 | - width="13.470979" |
223 | - height="13.470979" |
224 | - x="10.948382" |
225 | - y="12.295481" /></g><rect |
226 | - ry="0" |
227 | - rx="0" |
228 | - y="-3.1991448" |
229 | - x="1.5153779" |
230 | - height="16.030609" |
231 | - width="12.824489" |
232 | - id="rect2817" |
233 | - style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:1.6030612;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><g |
234 | - transform="matrix(0.07546143,0,0,0.11203951,2.9656204,-4.8213977)" |
235 | - id="g3636"><rect |
236 | - style="fill:url(#linearGradient4949);fill-opacity:1;stroke:none" |
237 | - id="rect3618" |
238 | - width="106.21725" |
239 | - height="100.15598" |
240 | - x="12.646845" |
241 | - y="35.941288" /><path |
242 | - style="fill:#01131a;fill-opacity:1;stroke:none" |
243 | - d="m 12.646845,93.173279 0,42.923991 105.885315,0 0.33193,-57.231989 -106.217245,14.307998 z" |
244 | - id="path4951" |
245 | - sodipodi:nodetypes="ccccc" /></g></g></svg> |
246 | \ No newline at end of file |
247 | |
248 | === removed file 'icons/shotwell-24.svg' |
249 | --- icons/shotwell-24.svg 2010-08-18 23:46:19 +0000 |
250 | +++ icons/shotwell-24.svg 1970-01-01 00:00:00 +0000 |
251 | @@ -1,200 +0,0 @@ |
252 | -<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
253 | -<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) --> |
254 | - |
255 | -<svg |
256 | - xmlns:dc="http://purl.org/dc/elements/1.1/" |
257 | - xmlns:cc="http://creativecommons.org/ns#" |
258 | - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
259 | - xmlns:svg="http://www.w3.org/2000/svg" |
260 | - xmlns="http://www.w3.org/2000/svg" |
261 | - xmlns:xlink="http://www.w3.org/1999/xlink" |
262 | - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
263 | - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
264 | - version="1.0" |
265 | - id="Layer_1" |
266 | - x="0px" |
267 | - y="0px" |
268 | - width="24" |
269 | - height="24" |
270 | - viewBox="0 0 24 24" |
271 | - enable-background="new 0 0 180 180" |
272 | - xml:space="preserve" |
273 | - inkscape:version="0.47 r22583" |
274 | - sodipodi:docname="shotwell.svg"><metadata |
275 | - id="metadata9"><rdf:RDF><cc:Work |
276 | - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type |
277 | - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs |
278 | - id="defs7"><linearGradient |
279 | - id="linearGradient3710"><stop |
280 | - style="stop-color:#c9332e;stop-opacity:1;" |
281 | - offset="0" |
282 | - id="stop3712" /><stop |
283 | - style="stop-color:#87231f;stop-opacity:1;" |
284 | - offset="1" |
285 | - id="stop3714" /></linearGradient><linearGradient |
286 | - id="linearGradient3665"><stop |
287 | - style="stop-color:#667f2e;stop-opacity:1;" |
288 | - offset="0" |
289 | - id="stop3667" /><stop |
290 | - style="stop-color:#94b641;stop-opacity:1;" |
291 | - offset="1" |
292 | - id="stop3669" /></linearGradient><linearGradient |
293 | - id="linearGradient3628"><stop |
294 | - style="stop-color:#099bd1;stop-opacity:1;" |
295 | - offset="0" |
296 | - id="stop3630" /><stop |
297 | - style="stop-color:#035fa9;stop-opacity:1;" |
298 | - offset="1" |
299 | - id="stop3632" /></linearGradient><linearGradient |
300 | - id="linearGradient3607"><stop |
301 | - style="stop-color:#fffbf7;stop-opacity:1;" |
302 | - offset="0" |
303 | - id="stop3609" /><stop |
304 | - style="stop-color:#fed697;stop-opacity:1;" |
305 | - offset="1" |
306 | - id="stop3611" /></linearGradient><linearGradient |
307 | - inkscape:collect="always" |
308 | - xlink:href="#linearGradient3628" |
309 | - id="linearGradient4849" |
310 | - gradientUnits="userSpaceOnUse" |
311 | - gradientTransform="matrix(0.94709495,0,0,0.99337445,107.10999,4.0351276)" |
312 | - x1="-43.661713" |
313 | - y1="60.388466" |
314 | - x2="-43.661713" |
315 | - y2="31.618958" /><radialGradient |
316 | - inkscape:collect="always" |
317 | - xlink:href="#linearGradient3607" |
318 | - id="radialGradient4851" |
319 | - gradientUnits="userSpaceOnUse" |
320 | - gradientTransform="matrix(0.82352939,-6.1355775e-8,5.2590677e-8,0.7058825,-29.1752,17.22328)" |
321 | - cx="-165.3261" |
322 | - cy="58.559208" |
323 | - fx="-165.3261" |
324 | - fy="58.559208" |
325 | - r="8.9683418" /><linearGradient |
326 | - inkscape:collect="always" |
327 | - xlink:href="#linearGradient3710" |
328 | - id="linearGradient4853" |
329 | - gradientUnits="userSpaceOnUse" |
330 | - gradientTransform="matrix(0.16838723,0,0,0.16838725,40.079373,-0.16517623)" |
331 | - x1="-124.5" |
332 | - y1="101.26834" |
333 | - x2="-124.5" |
334 | - y2="73.998131" /><linearGradient |
335 | - inkscape:collect="always" |
336 | - xlink:href="#linearGradient3665" |
337 | - id="linearGradient4859" |
338 | - gradientUnits="userSpaceOnUse" |
339 | - gradientTransform="matrix(1.025641,0,0,1.0126582,136.85898,-4.28481)" |
340 | - x1="-17.5" |
341 | - y1="22" |
342 | - x2="-17.5" |
343 | - y2="62.152832" /></defs><sodipodi:namedview |
344 | - pagecolor="#ffffff" |
345 | - bordercolor="#e7e7e7" |
346 | - borderopacity="1" |
347 | - objecttolerance="10" |
348 | - gridtolerance="10" |
349 | - guidetolerance="10" |
350 | - inkscape:pageopacity="0" |
351 | - inkscape:pageshadow="2" |
352 | - inkscape:window-width="1024" |
353 | - inkscape:window-height="719" |
354 | - id="namedview5" |
355 | - showgrid="false" |
356 | - inkscape:zoom="4" |
357 | - inkscape:cx="14.262976" |
358 | - inkscape:cy="-4.0941656" |
359 | - inkscape:window-x="1024" |
360 | - inkscape:window-y="24" |
361 | - inkscape:window-maximized="1" |
362 | - inkscape:current-layer="Layer_1" |
363 | - showguides="true" |
364 | - inkscape:guide-bbox="true" |
365 | - inkscape:snap-grids="false" |
366 | - inkscape:showpageshadow="false"><inkscape:grid |
367 | - type="xygrid" |
368 | - id="grid2819" |
369 | - empspacing="5" |
370 | - visible="true" |
371 | - enabled="true" |
372 | - snapvisiblegridlinesonly="true" /></sodipodi:namedview> |
373 | - |
374 | -<rect |
375 | - ry="0" |
376 | - rx="0" |
377 | - y="1.4999686" |
378 | - x="9.5" |
379 | - height="14.000021" |
380 | - width="12" |
381 | - id="rect2823" |
382 | - style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:1.00000012;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><g |
383 | - id="g3686" |
384 | - transform="matrix(0.1125,0,0,0.125,1.71875,0.68750003)"><rect |
385 | - y="18.5" |
386 | - x="82.5" |
387 | - height="80" |
388 | - width="80" |
389 | - id="rect3663" |
390 | - style="fill:url(#linearGradient4859);fill-opacity:1;stroke:none" /><path |
391 | - sodipodi:nodetypes="cssssccccccc" |
392 | - id="path3677" |
393 | - d="m 162.5,69.58583 c -2.28236,-1.229642 -4.57791,-5.41744 -7.58117,-4.432837 -0.78685,0.257961 -1.99733,1.357334 -2.75431,0.985074 -1.3901,-0.683607 -3.07858,-2.289088 -4.13145,-3.324628 -0.80496,-0.791701 -4.70948,0.165709 -5.8842,-0.123135 -3.46751,-0.852608 -6.66988,-3.146265 -8.26291,-6.279853 l -2.3787,-3.940301 c -1.72413,-0.890004 -3.25174,-1.970149 -4.56282,-1.970149 l 0,48 10.69739,0 24.85817,0 0,-28.914171 z" |
394 | - style="fill:#6a8430;fill-opacity:1;stroke:none" /><path |
395 | - sodipodi:nodetypes="csscccc" |
396 | - d="m 162.5,82.622687 c -3.33496,-0.219989 -5.59826,-0.201933 -8.62649,0.541512 -2.36305,0.580142 -3.51283,2.267732 -6.28066,2.558951 -3.82935,0.40291 -7.99575,0.09842 -11.75952,0.09842 l 0.13362,12.597917 26.53305,0.08051 0,-15.877312 z" |
397 | - style="fill:#526726;fill-opacity:1;stroke:none" |
398 | - id="path3681" /><path |
399 | - sodipodi:nodetypes="csscccc" |
400 | - d="m 162.5,93.500098 c -2.06783,0.286598 -2.97748,-3.761525 -5.12192,-2.872127 -2.1533,0.893061 -3.76922,2.389161 -6.30492,2.914995 -2.07742,0.4308 -4.65014,-0.342941 -6.35094,-0.128603 l 0,5.085637 17.77778,0 0,-4.999902 z" |
401 | - style="fill:#384619;fill-opacity:1;stroke:none" |
402 | - id="path3679" /></g><rect |
403 | - ry="0" |
404 | - rx="0" |
405 | - y="8.499979" |
406 | - x="6.5" |
407 | - height="14.000021" |
408 | - width="12" |
409 | - id="rect2821" |
410 | - style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><g |
411 | - id="g4732" |
412 | - transform="matrix(0.74233577,0,0,0.74233656,-1.1273759,0.87261515)"><rect |
413 | - y="12.295481" |
414 | - x="10.948382" |
415 | - height="13.470979" |
416 | - width="13.470979" |
417 | - id="rect3700" |
418 | - style="fill:url(#linearGradient4853);fill-opacity:1;stroke:none" /><path |
419 | - sodipodi:nodetypes="cssssssssssssccccc" |
420 | - id="path3698" |
421 | - d="m 22.746535,19.053834 c 0.198966,-0.08701 0.392759,0.08835 0.48121,0.289058 0.01342,0.03047 -0.02041,0.121367 0,0.144532 0.06273,0.07116 0.189322,-0.132434 0.325522,0.176647 0.0858,0.194719 -0.254487,0.546307 -0.169838,0.642354 0.06335,0.07189 0.242053,-0.07864 0.297218,-0.01604 0.04007,0.04546 0.0063,0.308709 0.02831,0.321178 0.134217,0.07614 0.267055,-0.102667 0.325522,0.09635 0.05617,0.191212 -0.350926,0.215354 -0.22645,0.497826 0.02408,0.05462 0.39413,0.11681 0.479802,0.149211 0.01477,0.0056 0.04442,0.146464 0.0361,0.155907 -0.134993,0.153169 -0.176224,0.05489 -0.176224,0.353295 0,0.181733 0.184661,0.0168 0.268854,0.112343 0.0063,0.0071 5.6e-5,0.843438 5.6e-5,0.99572 l -5.6e-5,2.794243 -2.691384,-9e-6 0,-6.712605 1.021362,0 z" |
422 | - style="fill:#4e1413;fill-opacity:1;stroke:none" /></g><rect |
423 | - style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:1.00000012;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" |
424 | - id="rect2817" |
425 | - width="14" |
426 | - height="16" |
427 | - x="1.5000001" |
428 | - y="4.5000005" |
429 | - rx="0" |
430 | - ry="0" /><g |
431 | - id="g3636" |
432 | - transform="matrix(0.11767575,0,0,0.12365028,0.76185377,1.5558495)"><rect |
433 | - y="35.941288" |
434 | - x="19.019604" |
435 | - height="97.047897" |
436 | - width="93.477203" |
437 | - id="rect3618" |
438 | - style="fill:url(#linearGradient4849);fill-opacity:1;stroke:none" /><path |
439 | - transform="matrix(1.5101535,0,0,1.4371859,298.43013,-28.000866)" |
440 | - d="m -156.8853,58.559208 c 0,4.661721 -3.77907,8.440792 -8.4408,8.440792 -4.66172,0 -8.44079,-3.779071 -8.44079,-8.440792 0,-4.661721 3.77907,-8.440792 8.44079,-8.440792 4.66173,0 8.4408,3.779071 8.4408,8.440792 z" |
441 | - sodipodi:ry="8.4407921" |
442 | - sodipodi:rx="8.4407921" |
443 | - sodipodi:cy="58.559208" |
444 | - sodipodi:cx="-165.3261" |
445 | - id="path2825" |
446 | - style="fill:url(#radialGradient4851);fill-opacity:1;stroke:none" |
447 | - sodipodi:type="arc" /><path |
448 | - sodipodi:nodetypes="csssssssssssssssssssssssssssssccssssssssccsssssssssssssssssssssccccc" |
449 | - id="path3615" |
450 | - d="m 25.001687,93.889677 c 0.911316,-0.506743 0.850357,-2.3054 2.209168,-1.801683 1.901206,0.704784 1.088581,1.128726 1.693696,1.801682 0.128025,0.142384 1.336983,0.198353 1.546421,0.08189 1.290536,-0.717609 1.428811,-2.440343 2.87192,-1.637895 0.77509,0.430994 0.782776,1.443802 1.251858,1.965473 0.572285,0.636442 1.657056,0.246064 2.135532,1.310315 0.408696,0.90903 -0.316283,2.35079 0.368201,3.112 0.06084,0.0676 1.602176,0.0398 1.620057,0 0.375268,-0.83469 -0.166368,-9.806135 0.147274,-10.154947 0.800902,-0.890693 2.36496,-0.486634 3.092835,-0.08189 0.850814,0.473098 2.39736,-1.5924 4.565622,0.818948 0.187913,0.208978 1.572247,0 1.840977,0 2.29394,0 4.124986,0.08234 6.112039,0.818947 0.135439,0.0502 0.567423,-0.106008 0.662742,0 0.554782,0.61697 -0.350598,2.558302 0.3682,3.357685 0.178561,0.198583 1.550798,0.04177 1.767331,0.08189 1.274699,0.236268 0.417431,-1.119379 0.957307,-1.719789 0.07499,-0.08338 0.612402,0 0.736398,0 0.596573,0 2.916669,-0.277812 3.313754,0.16379 0.05519,0.06139 -0.131734,0.275712 -0.147282,0.327579 -0.163445,0.545304 -0.267603,4.303477 0,4.749887 0.06463,0.10778 1.612418,1.71555 1.62006,1.71979 1.272108,0.70737 1.03375,-4.110354 1.178223,-4.913679 0.582646,-3.239845 -0.710646,-4.838944 2.798283,-5.814525 0.577837,-0.160657 0.867674,-0.900842 1.399142,-0.900842 0.310506,0 0.394248,-4.154349 0.58541,-4.154349 0.346514,0 0.454812,4.15007 0.874734,4.383572 1.811343,1.007207 1.397344,1.228836 1.706328,1.572462 0.109111,0.121336 1.703036,0.348342 2.061895,1.146525 0.48508,1.078928 0.220917,8.378506 0.220917,10.236847 l -0.0026,0.21108 c 0.02755,0.3772 -0.02605,0.75608 -0.02605,1.1292 0,0.50385 1.160028,0.0514 1.275727,-0.46327 0.06964,-0.30967 0.175313,-0.62543 0.208285,-0.95548 0.06366,-0.636731 -0.109767,-3.004971 0.286392,-3.445541 0.03557,-0.0396 0.12197,0.0226 0.156208,0.0289 0.66034,0.1224 1.307281,0.11582 1.978689,0.11582 0.338089,0 2.214979,0.25838 2.473355,-0.0289 0.183793,-0.2044 -0.02402,-1.16889 -0.05212,-1.41875 -0.133739,-1.189857 -0.05202,-2.445035 -0.05202,-3.648226 l -0.260336,-0.579082 c 0.324992,-1.036327 0.0053,-8.518315 0.624853,-9.207424 0.459311,-0.510798 0.677051,-0.492295 0.93727,-0.63699 1.029373,-0.572387 0.781067,-1.039801 0.781067,-2.258426 0,-0.897099 0.546294,-10.133954 0.781052,-10.133954 0.196926,0 0.833127,9.129019 0.833127,10.307681 0,0.252495 0.730508,2.028475 0.833135,2.142606 0.221701,0.246555 0.450224,0.4428 0.624843,0.636995 0.510577,0.567815 -0.195042,7.311171 0.312426,7.875531 0.284632,0.316538 0.695485,0.936855 1.093486,1.158165 0.456115,0.253626 0.853489,-0.249266 1.30176,0 0.641571,0.356746 1.34858,-0.474975 1.770404,0.463267 0.757395,1.684608 -0.104456,4.052877 0.624853,5.675017 0.08548,0.19006 0.363841,0.11581 0.5207,0.11581 2.157185,0 0.390534,-4.9222 1.145542,-6.601544 0.04749,-0.105472 6.386881,-0.07772 6.560931,0.115818 0.926132,1.029976 -0.102111,5.329836 0.416542,5.906646 0.167527,0.18629 1.48443,0 1.77041,0 0.30014,0 1.06443,0.43767 1.24969,0.23164 0.9455,-1.05151 2.25726,-2.203427 2.70767,-3.706138 0.1699,-0.56681 -0.26969,-1.458098 -0.52069,-1.737249 -0.33609,-0.373751 0,-2.963371 0,-3.590318 0,-5.010921 -0.87601,-8.40012 3.33251,-9.960231 l 0,50.843517 -84.979273,0 0,-34.973952 c 0.54743,-0.02803 1.511853,-0.07246 1.733112,-0.08189 z" |
451 | - style="fill:#01131a;fill-opacity:1;stroke:#01131a;stroke-width:8.29008293px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /></g></svg> |
452 | \ No newline at end of file |
453 | |
454 | === removed file 'icons/shotwell.ico' |
455 | Binary files icons/shotwell.ico 2009-12-21 20:03:03 +0000 and icons/shotwell.ico 1970-01-01 00:00:00 +0000 differ |
456 | === removed file 'icons/shotwell.svg' |
457 | --- icons/shotwell.svg 2010-08-18 23:46:19 +0000 |
458 | +++ icons/shotwell.svg 1970-01-01 00:00:00 +0000 |
459 | @@ -1,237 +0,0 @@ |
460 | -<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
461 | -<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) --> |
462 | - |
463 | -<svg |
464 | - xmlns:dc="http://purl.org/dc/elements/1.1/" |
465 | - xmlns:cc="http://creativecommons.org/ns#" |
466 | - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
467 | - xmlns:svg="http://www.w3.org/2000/svg" |
468 | - xmlns="http://www.w3.org/2000/svg" |
469 | - xmlns:xlink="http://www.w3.org/1999/xlink" |
470 | - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
471 | - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
472 | - version="1.0" |
473 | - id="Layer_1" |
474 | - x="0px" |
475 | - y="0px" |
476 | - width="120" |
477 | - height="120" |
478 | - viewBox="0 0 120 120" |
479 | - enable-background="new 0 0 180 180" |
480 | - xml:space="preserve" |
481 | - inkscape:version="0.47 r22583" |
482 | - sodipodi:docname="shotwell.svg"><metadata |
483 | - id="metadata9"><rdf:RDF><cc:Work |
484 | - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type |
485 | - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs |
486 | - id="defs7"><linearGradient |
487 | - id="linearGradient3710"><stop |
488 | - style="stop-color:#c9332e;stop-opacity:1;" |
489 | - offset="0" |
490 | - id="stop3712" /><stop |
491 | - style="stop-color:#87231f;stop-opacity:1;" |
492 | - offset="1" |
493 | - id="stop3714" /></linearGradient><linearGradient |
494 | - id="linearGradient3665"><stop |
495 | - style="stop-color:#667f2e;stop-opacity:1;" |
496 | - offset="0" |
497 | - id="stop3667" /><stop |
498 | - style="stop-color:#94b641;stop-opacity:1;" |
499 | - offset="1" |
500 | - id="stop3669" /></linearGradient><linearGradient |
501 | - id="linearGradient3628"><stop |
502 | - style="stop-color:#099bd1;stop-opacity:1;" |
503 | - offset="0" |
504 | - id="stop3630" /><stop |
505 | - style="stop-color:#035fa9;stop-opacity:1;" |
506 | - offset="1" |
507 | - id="stop3632" /></linearGradient><linearGradient |
508 | - id="linearGradient3607"><stop |
509 | - style="stop-color:#fffbf7;stop-opacity:1;" |
510 | - offset="0" |
511 | - id="stop3609" /><stop |
512 | - style="stop-color:#fed697;stop-opacity:1;" |
513 | - offset="1" |
514 | - id="stop3611" /></linearGradient><linearGradient |
515 | - inkscape:collect="always" |
516 | - xlink:href="#linearGradient3710" |
517 | - id="linearGradient2906" |
518 | - gradientUnits="userSpaceOnUse" |
519 | - gradientTransform="matrix(0.66249999,0,0,0.66249999,155.6125,-4.0249993)" |
520 | - x1="-124.5" |
521 | - y1="101.26834" |
522 | - x2="-124.5" |
523 | - y2="73.998131" /><linearGradient |
524 | - inkscape:collect="always" |
525 | - xlink:href="#linearGradient3628" |
526 | - id="linearGradient2918" |
527 | - gradientUnits="userSpaceOnUse" |
528 | - gradientTransform="matrix(1.0131827,0,0,1.0031202,113.23728,-0.21917682)" |
529 | - x1="-43.661713" |
530 | - y1="60.388466" |
531 | - x2="-43.661713" |
532 | - y2="31.618958" /><radialGradient |
533 | - inkscape:collect="always" |
534 | - xlink:href="#linearGradient3607" |
535 | - id="radialGradient2920" |
536 | - gradientUnits="userSpaceOnUse" |
537 | - gradientTransform="matrix(0.82352939,-6.1355775e-8,5.2590677e-8,0.7058825,-29.1752,17.22328)" |
538 | - cx="-165.3261" |
539 | - cy="58.559208" |
540 | - fx="-165.3261" |
541 | - fy="58.559208" |
542 | - r="8.9683418" /><linearGradient |
543 | - inkscape:collect="always" |
544 | - xlink:href="#linearGradient3665" |
545 | - id="linearGradient2922" |
546 | - gradientUnits="userSpaceOnUse" |
547 | - gradientTransform="matrix(1.025641,0,0,1.0126582,136.85898,-4.28481)" |
548 | - x1="-17.5" |
549 | - y1="22" |
550 | - x2="-17.5" |
551 | - y2="62.152832" /><filter |
552 | - inkscape:collect="always" |
553 | - id="filter3702"><feGaussianBlur |
554 | - inkscape:collect="always" |
555 | - stdDeviation="1.5975" |
556 | - id="feGaussianBlur3704" /></filter><filter |
557 | - inkscape:collect="always" |
558 | - id="filter3706"><feGaussianBlur |
559 | - inkscape:collect="always" |
560 | - stdDeviation="1.5975" |
561 | - id="feGaussianBlur3708" /></filter><filter |
562 | - inkscape:collect="always" |
563 | - id="filter3710"><feGaussianBlur |
564 | - inkscape:collect="always" |
565 | - stdDeviation="1.5975" |
566 | - id="feGaussianBlur3712" /></filter></defs><sodipodi:namedview |
567 | - pagecolor="#ffffff" |
568 | - bordercolor="#e7e7e7" |
569 | - borderopacity="1" |
570 | - objecttolerance="10" |
571 | - gridtolerance="10" |
572 | - guidetolerance="10" |
573 | - inkscape:pageopacity="0" |
574 | - inkscape:pageshadow="2" |
575 | - inkscape:window-width="1024" |
576 | - inkscape:window-height="719" |
577 | - id="namedview5" |
578 | - showgrid="false" |
579 | - inkscape:zoom="1" |
580 | - inkscape:cx="36.341145" |
581 | - inkscape:cy="36.952073" |
582 | - inkscape:window-x="1024" |
583 | - inkscape:window-y="24" |
584 | - inkscape:window-maximized="1" |
585 | - inkscape:current-layer="Layer_1" |
586 | - showguides="true" |
587 | - inkscape:guide-bbox="true" |
588 | - inkscape:snap-grids="false" |
589 | - inkscape:showpageshadow="false"><inkscape:grid |
590 | - type="xygrid" |
591 | - id="grid2819" |
592 | - empspacing="5" |
593 | - visible="true" |
594 | - enabled="true" |
595 | - snapvisiblegridlinesonly="true" /></sodipodi:namedview> |
596 | - |
597 | -<rect |
598 | - style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.99999981999999998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter3702);opacity:0.6" |
599 | - id="rect2924" |
600 | - width="62.000004" |
601 | - height="71" |
602 | - x="50.5" |
603 | - y="5.5" |
604 | - rx="0" |
605 | - ry="0" /><rect |
606 | - style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.99999981999999998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter3706);opacity:0.6" |
607 | - id="rect2926" |
608 | - width="65" |
609 | - height="74" |
610 | - x="34.5" |
611 | - y="39.5" |
612 | - rx="0" |
613 | - ry="0" /><rect |
614 | - ry="0" |
615 | - rx="0" |
616 | - y="15.5" |
617 | - x="7.5" |
618 | - height="88" |
619 | - width="78" |
620 | - id="rect2928" |
621 | - style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.99999994000000003;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter3710);opacity:0.6" /><rect |
622 | - ry="0" |
623 | - rx="0" |
624 | - y="5.5" |
625 | - x="50.5" |
626 | - height="71" |
627 | - width="62.000004" |
628 | - id="rect2823" |
629 | - style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:0.99999982;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><g |
630 | - id="g3686" |
631 | - transform="matrix(0.6625,0,0,0.6625,0.34375,-2.25625)"><rect |
632 | - y="18.5" |
633 | - x="82.5" |
634 | - height="80" |
635 | - width="80" |
636 | - id="rect3663" |
637 | - style="fill:url(#linearGradient2922);fill-opacity:1;stroke:none" /><path |
638 | - sodipodi:nodetypes="cssssccccccc" |
639 | - id="path3677" |
640 | - d="m 162.5,69.403979 c -2.22852,-1.237376 -4.46994,-5.451512 -7.40236,-4.460717 -0.76829,0.259584 -1.95022,1.365871 -2.68935,0.99127 -1.35731,-0.687906 -3.00597,-2.303485 -4.03401,-3.345538 -0.78598,-0.79668 -4.59841,0.166751 -5.74542,-0.123909 -3.38574,-0.857971 -6.51258,-3.166053 -8.06803,-6.319349 l -2.32261,-3.965082 c -1.68346,-0.895603 -3.17504,-1.982541 -4.4552,-1.982541 l 0,48.301887 10.4451,0 24.27188,0 0,-29.096021 z" |
641 | - style="fill:#6a8430;fill-opacity:1;stroke:none" /><path |
642 | - sodipodi:nodetypes="csscccc" |
643 | - d="m 162.5,79.027822 c -3.20911,-0.269797 -5.387,-0.247653 -8.30096,0.664119 -2.27389,0.711495 -3.38028,2.781181 -6.04365,3.138337 -3.68484,0.494134 -7.69403,0.120706 -11.31577,0.120706 l 0.12858,15.450277 25.5318,0.09874 0,-19.472178 z" |
644 | - style="fill:#526726;fill-opacity:1;stroke:none" |
645 | - id="path3681" /><path |
646 | - sodipodi:nodetypes="csscccc" |
647 | - d="m 162.5,90.952978 c -2.45799,0.432601 -3.53926,-5.677772 -6.08832,-4.335286 -2.55957,1.348017 -4.48039,3.606282 -7.49452,4.399992 -2.46939,0.650265 -5.52753,-0.517646 -7.54924,-0.194118 l 0,7.676434 21.13208,0 0,-7.547022 z" |
648 | - style="fill:#384619;fill-opacity:1;stroke:none" |
649 | - id="path3679" /></g><rect |
650 | - ry="0" |
651 | - rx="0" |
652 | - y="39.5" |
653 | - x="34.5" |
654 | - height="74" |
655 | - width="65" |
656 | - id="rect2821" |
657 | - style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:0.99999982;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><rect |
658 | - style="fill:url(#linearGradient2906);fill-opacity:1;stroke:none" |
659 | - id="rect3700" |
660 | - width="53" |
661 | - height="53" |
662 | - x="41" |
663 | - y="45" /><path |
664 | - style="fill:#4e1413;fill-opacity:1;stroke:none" |
665 | - d="m 86.549183,74.081477 c 0.886193,-0.310035 1.749359,0.314783 2.143319,1.029989 0.05979,0.10859 -0.09092,0.432448 0,0.514995 0.279367,0.253582 0.843247,-0.471893 1.449895,0.629429 0.38218,0.693827 -1.133497,1.946613 -0.756471,2.288853 0.282161,0.256125 1.078114,-0.280248 1.323818,-0.05721 0.178461,0.161993 0.02823,1.100004 0.126077,1.14443 0.597812,0.271316 1.189475,-0.365825 1.449896,0.343329 0.2502,0.681328 -1.563042,0.767351 -1.008621,1.773859 0.107211,0.194647 1.755465,0.416218 2.137051,0.531672 0.06578,0.01985 0.197844,0.521889 0.160786,0.555535 -0.601263,0.545772 -0.784906,0.195587 -0.784906,1.258864 0,0.647559 0.822487,0.05987 1.197486,0.400301 0.02795,0.02536 2.48e-4,3.005357 2.48e-4,3.547977 L 93.987513,98 82,97.999967 l 0,-23.918486 4.549183,0 z" |
666 | - id="path3698" |
667 | - sodipodi:nodetypes="cssssssssssssccccc" /><rect |
668 | - style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" |
669 | - id="rect2817" |
670 | - width="78" |
671 | - height="88" |
672 | - x="7.5" |
673 | - y="15.5" |
674 | - rx="0" |
675 | - ry="0" /><g |
676 | - id="g3636" |
677 | - transform="matrix(0.65656596,0,0,0.66151013,0.69694898,0.83443815)"><rect |
678 | - y="32" |
679 | - x="19" |
680 | - height="98" |
681 | - width="100" |
682 | - id="rect3618" |
683 | - style="fill:url(#linearGradient2918);fill-opacity:1;stroke:none" /><path |
684 | - transform="matrix(0.90221167,0,0,0.89546848,202.92837,6.7683671)" |
685 | - d="m -156.8853,58.559208 c 0,4.661721 -3.77907,8.440792 -8.4408,8.440792 -4.66172,0 -8.44079,-3.779071 -8.44079,-8.440792 0,-4.661721 3.77907,-8.440792 8.44079,-8.440792 4.66173,0 8.4408,3.779071 8.4408,8.440792 z" |
686 | - sodipodi:ry="8.4407921" |
687 | - sodipodi:rx="8.4407921" |
688 | - sodipodi:cy="58.559208" |
689 | - sodipodi:cx="-165.3261" |
690 | - id="path2825" |
691 | - style="fill:url(#radialGradient2920);fill-opacity:1;stroke:none" |
692 | - sodipodi:type="arc" /><path |
693 | - sodipodi:nodetypes="csssssssssssssssssssssssssssssccssssssssccsssssssssssssssssssssccccc" |
694 | - id="path3615" |
695 | - d="m 21.519059,93.213403 c 1.061673,-0.524535 0.990657,-2.386339 2.573658,-1.864938 2.214885,0.729528 1.268186,1.168354 1.973138,1.864937 0.149149,0.147381 1.557573,0.205316 1.801566,0.08477 1.503461,-0.742803 1.66455,-2.52602 3.345756,-1.695399 0.902974,0.446126 0.911928,1.494492 1.458404,2.034479 0.666705,0.658786 1.930453,0.254702 2.487873,1.356318 0.476127,0.940945 -0.368466,2.433317 0.428949,3.221258 0.07088,0.06998 1.86652,0.04117 1.887352,0 0.437183,-0.863997 -0.193818,-10.150414 0.171571,-10.511472 0.933044,-0.921965 2.755155,-0.503719 3.603123,-0.08477 0.991189,0.489709 2.7929,-1.648306 5.318904,0.8477 0.218916,0.216316 1.83165,0 2.144719,0 2.672417,0 4.805567,0.08523 7.120463,0.8477 0.157786,0.05197 0.661043,-0.10973 0.772089,0 0.646315,0.638631 -0.408444,2.648119 0.428948,3.475566 0.208023,0.205556 1.806665,0.04323 2.058923,0.08477 1.485011,0.244562 0.486304,-1.158679 1.115253,-1.780169 0.08737,-0.08631 0.713443,0 0.857896,0 0.695002,0 3.39789,-0.287565 3.86049,0.16954 0.0643,0.06355 -0.153469,0.285393 -0.171582,0.33908 -0.190411,0.56445 -0.311756,4.454567 0,4.916656 0.07529,0.111549 1.878451,1.775769 1.887354,1.780168 1.481993,0.732198 1.204308,-4.254669 1.372618,-5.086196 0.678776,-3.353592 -0.827896,-5.008833 3.259972,-6.018664 0.673175,-0.166298 1.010831,-0.93247 1.629986,-0.93247 0.361736,0 0.459296,-4.300201 0.681996,-4.300201 0.403686,0 0.529852,4.295772 1.019056,4.537471 2.110196,1.042569 1.627893,1.271979 1.987856,1.627669 0.12711,0.125596 1.98402,0.360573 2.402087,1.186779 0.565113,1.116807 0.257366,8.672665 0.257366,10.596246 l -0.003,0.218489 c 0.0321,0.39045 -0.03036,0.78263 -0.03036,1.16885 0,0.52154 1.35142,0.0532 1.486209,-0.47953 0.08113,-0.32055 0.204238,-0.64739 0.24265,-0.989033 0.07416,-0.65908 -0.127878,-3.110471 0.333644,-3.566513 0.04144,-0.041 0.142094,0.0234 0.181981,0.02997 0.769289,0.126692 1.52297,0.119882 2.305152,0.119882 0.393871,0 2.580428,0.267459 2.881434,-0.02997 0.214116,-0.211576 -0.02799,-1.209927 -0.06072,-1.468564 -0.155806,-1.23163 -0.06061,-2.530874 -0.06061,-3.776308 l -0.303288,-0.599412 c 0.378611,-1.072711 0.0062,-8.817379 0.727946,-9.530682 0.535093,-0.528731 0.788757,-0.509578 1.091909,-0.659354 1.199211,-0.592482 0.909938,-1.076307 0.909938,-2.337715 0,-0.928595 0.636426,-10.489742 0.909916,-10.489742 0.229418,0 0.970585,9.449524 0.970585,10.669567 0,0.261359 0.851034,2.099693 0.970594,2.21783 0.258279,0.255212 0.524507,0.458346 0.727935,0.659358 0.594817,0.587751 -0.227222,7.567856 0.363974,8.152028 0.331592,0.327653 0.810233,0.969748 1.2739,1.198827 0.531369,0.26253 0.994306,-0.258017 1.516538,0 0.747423,0.369271 1.571082,-0.491649 2.062502,0.479531 0.882358,1.743754 -0.121692,4.195166 0.727947,5.874257 0.09958,0.196736 0.423871,0.119883 0.60661,0.119883 2.513101,0 0.45497,-5.095015 1.334551,-6.833319 0.0553,-0.109174 7.44065,-0.08045 7.64341,0.119883 1.07893,1.066138 -0.11895,5.516963 0.48527,6.114022 0.19517,0.192832 1.72935,0 2.06251,0 0.34967,0 1.24005,0.453039 1.45588,0.239764 1.1015,-1.088415 2.62968,-2.28078 3.15441,-3.836248 0.19793,-0.58671 -0.31419,-1.509289 -0.6066,-1.798242 -0.39154,-0.386872 0,-3.06741 0,-3.716366 0,-5.186847 -1.02054,-8.695037 3.88234,-10.309919 l 0,52.628545 -99,0 0,-36.201827 c 0.637751,-0.02902 1.761294,-0.075 2.019059,-0.08477 z" |
696 | - style="fill:#01131a;fill-opacity:1;stroke:#01131a;stroke-width:1.5173738px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /></g></svg> |
697 | \ No newline at end of file |
698 | |
699 | === modified file 'misc/shotwell-viewer.desktop.head' |
700 | --- misc/shotwell-viewer.desktop.head 2013-08-06 01:43:20 +0000 |
701 | +++ misc/shotwell-viewer.desktop.head 2014-05-20 04:18:55 +0000 |
702 | @@ -1,9 +1,9 @@ |
703 | [Desktop Entry] |
704 | Version=1.0 |
705 | -Name=Shotwell Viewer |
706 | +Name=Photo Viewer |
707 | GenericName=Photo Viewer |
708 | Exec=shotwell %f |
709 | -Icon=shotwell |
710 | +Icon=multimedia-photo-viewer |
711 | Terminal=false |
712 | NoDisplay=true |
713 | Type=Application |
714 | @@ -11,4 +11,4 @@ |
715 | Categories=Graphics;Viewer;Photography;GNOME;GTK; |
716 | X-GIO-NoFuse=true |
717 | X-GNOME-Gettext-Domain=shotwell |
718 | -X-GNOME-FullName=Shotwell Photo Viewer |
719 | +X-GNOME-FullName=Photo Viewer |
720 | |
721 | === modified file 'misc/shotwell.desktop.head' |
722 | --- misc/shotwell.desktop.head 2013-01-23 01:34:50 +0000 |
723 | +++ misc/shotwell.desktop.head 2014-05-20 04:18:55 +0000 |
724 | @@ -1,15 +1,15 @@ |
725 | [Desktop Entry] |
726 | Version=1.0 |
727 | -Name=Shotwell |
728 | +Name=Photos |
729 | GenericName=Photo Manager |
730 | Comment=Organize your photos |
731 | Keywords=album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo; |
732 | Exec=shotwell %U |
733 | -Icon=shotwell |
734 | +Icon=multimedia-photo-manager |
735 | Terminal=false |
736 | Type=Application |
737 | MimeType=x-content/image-dcf; |
738 | Categories=Graphics;Photography;GNOME;GTK; |
739 | X-GIO-NoFuse=true |
740 | X-GNOME-Gettext-Domain=shotwell |
741 | -X-GNOME-FullName=Shotwell Photo Manager |
742 | +X-GNOME-FullName=Photos |
743 | |
744 | === modified file 'src/AppWindow.vala' |
745 | --- src/AppWindow.vala 2013-08-05 22:06:09 +0000 |
746 | +++ src/AppWindow.vala 2014-05-20 04:18:55 +0000 |
747 | @@ -440,7 +440,7 @@ |
748 | assert(instance == null); |
749 | instance = this; |
750 | |
751 | - title = Resources.APP_TITLE; |
752 | + title = _(Resources.APP_TITLE); |
753 | |
754 | GLib.List<Gdk.Pixbuf> pixbuf_list = new GLib.List<Gdk.Pixbuf>(); |
755 | foreach (string resource in Resources.APP_ICONS) |
756 | @@ -572,7 +572,7 @@ |
757 | } |
758 | |
759 | public static void error_message(string message, Gtk.Window? parent = null) { |
760 | - error_message_with_title(Resources.APP_TITLE, message, parent); |
761 | + error_message_with_title(_(Resources.APP_TITLE), message, parent); |
762 | } |
763 | |
764 | public static void error_message_with_title(string title, string message, Gtk.Window? parent = null, bool should_escape = true) { |
765 | @@ -632,7 +632,7 @@ |
766 | // Occasionally, with_markup doesn't actually enable markup...? Force the issue. |
767 | dialog.set_markup(message); |
768 | dialog.use_markup = true; |
769 | - dialog.title = (title != null) ? title : Resources.APP_TITLE; |
770 | + dialog.title = (title != null) ? title : _(Resources.APP_TITLE); |
771 | dialog.add_buttons(affirmative, Gtk.ResponseType.YES, _("_Cancel"), |
772 | Gtk.ResponseType.CANCEL); |
773 | |
774 | @@ -648,7 +648,7 @@ |
775 | Gtk.Window? parent = null) { |
776 | Gtk.MessageDialog dialog = new Gtk.MessageDialog((parent != null) ? parent : get_instance(), |
777 | Gtk.DialogFlags.MODAL, Gtk.MessageType.QUESTION, Gtk.ButtonsType.NONE, "%s", message); |
778 | - dialog.title = (title != null) ? title : Resources.APP_TITLE; |
779 | + dialog.title = (title != null) ? title : _(Resources.APP_TITLE); |
780 | dialog.add_buttons(negative, Gtk.ResponseType.NO, affirmative, Gtk.ResponseType.YES, |
781 | affirmative_all, Gtk.ResponseType.APPLY, _("_Cancel"), Gtk.ResponseType.CANCEL); |
782 | |
783 | @@ -953,4 +953,3 @@ |
784 | } |
785 | |
786 | } |
787 | - |
788 | |
789 | === modified file 'src/DesktopIntegration.vala' |
790 | --- src/DesktopIntegration.vala 2013-01-21 21:16:09 +0000 |
791 | +++ src/DesktopIntegration.vala 2014-05-20 04:18:55 +0000 |
792 | @@ -72,7 +72,7 @@ |
793 | } |
794 | |
795 | // dont add Shotwell to app list |
796 | - if (!already_contains && !external_app.get_name().contains(Resources.APP_TITLE)) |
797 | + if (!already_contains && !external_app.get_name().contains(_(Resources.APP_TITLE))) |
798 | external_apps.add(external_app); |
799 | } |
800 | } |
801 | @@ -305,4 +305,4 @@ |
802 | Config.Facade.get_instance().set_desktop_background(xml_file.get_path()); |
803 | } |
804 | |
805 | -} |
806 | +} |
807 | \ No newline at end of file |
808 | |
809 | === modified file 'src/MetadataWriter.vala' |
810 | --- src/MetadataWriter.vala 2013-02-27 02:29:54 +0000 |
811 | +++ src/MetadataWriter.vala 2014-05-20 04:18:55 +0000 |
812 | @@ -147,7 +147,7 @@ |
813 | |
814 | // add the software name/version only if updating the metadata in the file |
815 | if (changed) |
816 | - metadata.set_software(Resources.APP_TITLE, Resources.APP_VERSION); |
817 | + metadata.set_software(_(Resources.APP_TITLE), Resources.APP_VERSION); |
818 | |
819 | return changed; |
820 | } |
821 | @@ -672,4 +672,3 @@ |
822 | count_cancelled_work(1, true); |
823 | } |
824 | } |
825 | - |
826 | |
827 | === modified file 'src/Photo.vala' |
828 | --- src/Photo.vala 2013-10-29 01:04:13 +0000 |
829 | +++ src/Photo.vala 2014-05-20 04:18:55 +0000 |
830 | @@ -3518,7 +3518,7 @@ |
831 | metadata.set_comment(get_comment()); |
832 | metadata.set_pixel_dimensions(get_dimensions()); // created by sniffing pixbuf not metadata |
833 | metadata.set_orientation(get_orientation()); |
834 | - metadata.set_software(Resources.APP_TITLE, Resources.APP_VERSION); |
835 | + metadata.set_software(_(Resources.APP_TITLE), Resources.APP_VERSION); |
836 | |
837 | if (get_orientation() != get_original_orientation()) |
838 | metadata.remove_exif_thumbnail(); |
839 | @@ -3601,7 +3601,7 @@ |
840 | //Yes, set metadata obtained above. |
841 | metadata.set_title(get_title()); |
842 | metadata.set_comment(get_comment()); |
843 | - metadata.set_software(Resources.APP_TITLE, Resources.APP_VERSION); |
844 | + metadata.set_software(_(Resources.APP_TITLE), Resources.APP_VERSION); |
845 | |
846 | if (get_exposure_time() != 0) |
847 | metadata.set_exposure_date_time(new MetadataDateTime(get_exposure_time())); |
848 | @@ -5378,4 +5378,3 @@ |
849 | } |
850 | } |
851 | } |
852 | - |
853 | |
854 | === modified file 'src/Resources.vala' |
855 | --- src/Resources.vala 2014-03-18 07:54:48 +0000 |
856 | +++ src/Resources.vala 2014-05-20 04:18:55 +0000 |
857 | @@ -13,7 +13,7 @@ |
858 | extern const string? _GIT_VERSION; |
859 | |
860 | namespace Resources { |
861 | - public const string APP_TITLE = "Shotwell"; |
862 | + public const string APP_TITLE = _("Photos"); |
863 | public const string APP_LIBRARY_ROLE = _("Photo Manager"); |
864 | public const string APP_DIRECT_ROLE = _("Photo Viewer"); |
865 | public const string APP_VERSION = _VERSION; |
866 | @@ -30,7 +30,7 @@ |
867 | public const string YORBA_URL = "http://www.yorba.org"; |
868 | public const string WIKI_URL = "http://redmine.yorba.org/projects/shotwell/wiki/Shotwell"; |
869 | public const string FAQ_URL = "http://redmine.yorba.org/projects/shotwell/wiki/ShotwellFAQ"; |
870 | - public const string BUG_DB_URL = "http://redmine.yorba.org/projects/shotwell/wiki/ReportingABug"; |
871 | + public const string BUG_DB_URL = "https://bugs.launchpad.net/pantheon-photos"; |
872 | public const string DIR_PATTERN_URI_SYSWIDE = "ghelp:shotwell?other-files"; |
873 | |
874 | private const string LIB = _LIB; |
875 | @@ -85,13 +85,13 @@ |
876 | public const string PUBLISH = "applications-internet"; |
877 | public const string MERGE = "shotwell-merge-events"; |
878 | |
879 | - public const string ICON_APP = "shotwell.svg"; |
880 | - public const string ICON_APP16 = "shotwell-16.svg"; |
881 | - public const string ICON_APP24 = "shotwell-24.svg"; |
882 | + public const string ICON_APP = "multimedia-photo-manager"; |
883 | + public const string ICON_APP16 = "multimedia-photo-manager"; |
884 | + public const string ICON_APP24 = "multimedia-photo-manager"; |
885 | |
886 | public const string APP_ICONS[] = { ICON_APP, ICON_APP16, ICON_APP24 }; |
887 | |
888 | - public const string ICON_ABOUT_LOGO = "shotwell.svg"; |
889 | + public const string ICON_ABOUT_LOGO = "multimedia-photo-manager"; |
890 | public const string ICON_GENERIC_PLUGIN = "generic-plugin.png"; |
891 | public const string ICON_SLIDESHOW_EXTENSION_POINT = "media-playback-start"; |
892 | public const string ICON_RATING_REJECTED = "rejected.svg"; |
893 | |
894 | === modified file 'src/camera/ImportPage.vala' |
895 | --- src/camera/ImportPage.vala 2014-02-02 03:57:33 +0000 |
896 | +++ src/camera/ImportPage.vala 2014-05-20 04:18:55 +0000 |
897 | @@ -1020,7 +1020,7 @@ |
898 | Gtk.MessageDialog dialog = new Gtk.MessageDialog(AppWindow.get_instance(), |
899 | Gtk.DialogFlags.MODAL, Gtk.MessageType.QUESTION, |
900 | Gtk.ButtonsType.CANCEL, "%s", mounted_message); |
901 | - dialog.title = Resources.APP_TITLE; |
902 | + dialog.title = _(Resources.APP_TITLE); |
903 | dialog.add_button(_("_Unmount"), Gtk.ResponseType.YES); |
904 | int dialog_res = dialog.run(); |
905 | dialog.destroy(); |
906 | @@ -1037,7 +1037,7 @@ |
907 | Gtk.MessageDialog dialog = new Gtk.MessageDialog(AppWindow.get_instance(), |
908 | Gtk.DialogFlags.MODAL, Gtk.MessageType.WARNING, |
909 | Gtk.ButtonsType.OK, "%s", locked_message); |
910 | - dialog.title = Resources.APP_TITLE; |
911 | + dialog.title = _(Resources.APP_TITLE); |
912 | dialog.run(); |
913 | dialog.destroy(); |
914 | |
915 | @@ -1802,4 +1802,3 @@ |
916 | return search_filter; |
917 | } |
918 | } |
919 | - |
920 | |
921 | === modified file 'src/direct/DirectPhotoPage.vala' |
922 | --- src/direct/DirectPhotoPage.vala 2013-11-19 23:38:42 +0000 |
923 | +++ src/direct/DirectPhotoPage.vala 2014-05-20 04:18:55 +0000 |
924 | @@ -229,7 +229,7 @@ |
925 | AppWindow.error_message(_("%s is not a file.").printf(file.get_path())); |
926 | else if (!PhotoFileFormat.is_file_supported(file)) |
927 | AppWindow.error_message(_("%s does not support the file format of\n%s.").printf( |
928 | - Resources.APP_TITLE, file.get_path())); |
929 | + _(Resources.APP_TITLE), file.get_path())); |
930 | else |
931 | return true; |
932 | |
933 | @@ -577,4 +577,4 @@ |
934 | // direct.ui. |
935 | ui_filenames.add("direct_context.ui"); |
936 | } |
937 | -} |
938 | +} |
939 | \ No newline at end of file |
940 | |
941 | === modified file 'src/direct/DirectWindow.vala' |
942 | --- src/direct/DirectWindow.vala 2013-01-21 21:16:09 +0000 |
943 | +++ src/direct/DirectWindow.vala 2014-05-20 04:18:55 +0000 |
944 | @@ -38,7 +38,7 @@ |
945 | |
946 | public void update_title(File file, bool modified) { |
947 | title = "%s%s (%s) - %s".printf((modified) ? "*" : "", file.get_basename(), |
948 | - get_display_pathname(file.get_parent()), Resources.APP_TITLE); |
949 | + get_display_pathname(file.get_parent()), _(Resources.APP_TITLE)); |
950 | } |
951 | |
952 | protected override void on_fullscreen() { |
953 | @@ -95,4 +95,3 @@ |
954 | return (base.key_press_event != null) ? base.key_press_event(event) : false; |
955 | } |
956 | } |
957 | - |
958 | |
959 | === modified file 'src/main.vala' |
960 | --- src/main.vala 2014-04-21 05:00:16 +0000 |
961 | +++ src/main.vala 2014-05-20 04:18:55 +0000 |
962 | @@ -76,7 +76,7 @@ |
963 | if (errormsg != null) { |
964 | Gtk.MessageDialog dialog = new Gtk.MessageDialog(null, Gtk.DialogFlags.MODAL, |
965 | Gtk.MessageType.ERROR, Gtk.ButtonsType.OK, "%s", errormsg); |
966 | - dialog.title = Resources.APP_TITLE; |
967 | + dialog.title = _(Resources.APP_TITLE); |
968 | dialog.run(); |
969 | dialog.destroy(); |
970 | |
971 | @@ -346,9 +346,9 @@ |
972 | |
973 | if (CommandlineOptions.show_version) { |
974 | if (Resources.GIT_VERSION != null) |
975 | - print("%s %s (%s)\n", Resources.APP_TITLE, Resources.APP_VERSION, Resources.GIT_VERSION); |
976 | + print("%s %s (%s)\n", _(Resources.APP_TITLE), Resources.APP_VERSION, Resources.GIT_VERSION); |
977 | else |
978 | - print("%s %s\n", Resources.APP_TITLE, Resources.APP_VERSION); |
979 | + print("%s %s\n", _(Resources.APP_TITLE), Resources.APP_VERSION); |
980 | |
981 | AppDirs.terminate(); |
982 | |
983 | @@ -407,7 +407,7 @@ |
984 | startup_timer.start(); |
985 | |
986 | // set up GLib environment |
987 | - GLib.Environment.set_application_name(Resources.APP_TITLE); |
988 | + GLib.Environment.set_application_name(_(Resources.APP_TITLE)); |
989 | |
990 | // in both the case of running as the library or an editor, Resources is always |
991 | // initialized |
992 | @@ -437,5 +437,4 @@ |
993 | Posix.system(cmdline); |
994 | Posix.system("sync"); |
995 | } |
996 | -} |
997 | - |
998 | +} |
999 | \ No newline at end of file |
Nice work!
I'm concerned about a couple of issues:
1) For those cases where 'Shotwell' appears as a standalone string, converting to 'Photos' without translation support isn't ideal. To solve this, hint 'Resources. APP_TITLE' for translation. This can be accomplished as follows:
/* Hint 'Photos' for translation.
* This will also make the translated string available to *.desktop files.
*/
public const string APP_TITLE = _("Photos");
Surround every appearance of 'APP_TITLE' with gettext calls as well. For instance:
dialog.title = Resources.APP_TITLE
Would become:
dialog.title = _(Resources. APP_TITLE) ;
2) No need to alter license headers.
3) X-GNOME- Gettext- Domain= photos (diff lines 719 and 743) breaks translations for *.desktop files because the actual localization files are still named 'shotwell'. This will cause the shell to show an untranslated name and description of the application. Avoid changing this and leave those desktop keys as they were.
4) Some icons are not going to be installed anymore, but they have not been removed from the source tree.