Merge lp:~codygarver/scratch/fix-bug-852576 into lp:~registry/scratch/scratch

Proposed by Cody Garver
Status: Merged
Approved by: Cody Garver
Approved revision: 184
Merge reported by: Cody Garver
Merged at revision: not available
Proposed branch: lp:~codygarver/scratch/fix-bug-852576
Merge into: lp:~registry/scratch/scratch
Diff against target: 578 lines (+505/-7)
5 files modified
CMakeLists.txt (+1/-0)
data/scratch.desktop (+1/-1)
data/scratch.svg (+496/-0)
src/main_window.vala (+1/-1)
src/scratch.vala (+6/-5)
To merge this branch: bzr merge lp:~codygarver/scratch/fix-bug-852576
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
Review via email: mp+75927@code.launchpad.net

Description of the change

Fix bug 852576, minor license adjustment and fix typo.

To post a comment you must log in.
Revision history for this message
Mario Guerriero (mefrio-g) wrote :

Your icon is the same that is in the elementary icon theme! However why don't you join to Scratch Hackers to push your fix in trunk?

Revision history for this message
Cody Garver (codygarver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2011-09-16 21:26:03 +0000
3+++ CMakeLists.txt 2011-09-18 22:15:19 +0000
4@@ -78,6 +78,7 @@
5 #TODO: Installation
6
7 install (TARGETS scratch RUNTIME DESTINATION bin)
8+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/scratch.svg DESTINATION share/icons/hicolor/scalable/apps)
9 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/scratch.desktop DESTINATION share/applications)
10 install (FILES ${CMAKE_BINARY_DIR}/scratch.vapi DESTINATION share/vala/vapi/)
11 install (FILES ${CMAKE_BINARY_DIR}/scratch.h DESTINATION include/scratch/)
12
13=== modified file 'data/scratch.desktop'
14--- data/scratch.desktop 2011-08-01 11:10:04 +0000
15+++ data/scratch.desktop 2011-09-18 22:15:19 +0000
16@@ -5,7 +5,7 @@
17 Comment=Edit Text Files
18 GenericName=Text Editor
19 Exec=scratch
20-Icon=text-editor
21+Icon=scratch
22 Terminal=false
23 Categories=GNOME;GTK;Utility;TextEditor;
24 MimeType=text/plain;
25
26=== added file 'data/scratch.svg'
27--- data/scratch.svg 1970-01-01 00:00:00 +0000
28+++ data/scratch.svg 2011-09-18 22:15:19 +0000
29@@ -0,0 +1,496 @@
30+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
31+<!-- Created with Inkscape (http://www.inkscape.org/) -->
32+<svg
33+ xmlns:svg="http://www.w3.org/2000/svg"
34+ xmlns="http://www.w3.org/2000/svg"
35+ xmlns:xlink="http://www.w3.org/1999/xlink"
36+ version="1.0"
37+ width="48"
38+ height="48"
39+ id="svg3247">
40+ <defs
41+ id="defs3249">
42+ <linearGradient
43+ id="linearGradient5048">
44+ <stop
45+ id="stop5050"
46+ style="stop-color:#000000;stop-opacity:0"
47+ offset="0" />
48+ <stop
49+ id="stop5056"
50+ style="stop-color:#000000;stop-opacity:1"
51+ offset="0.5" />
52+ <stop
53+ id="stop5052"
54+ style="stop-color:#000000;stop-opacity:0"
55+ offset="1" />
56+ </linearGradient>
57+ <linearGradient
58+ x1="302.85715"
59+ y1="366.64789"
60+ x2="302.85715"
61+ y2="609.50507"
62+ id="linearGradient2984"
63+ xlink:href="#linearGradient5048"
64+ gradientUnits="userSpaceOnUse"
65+ gradientTransform="matrix(6.689349e-2,0,0,1.235294e-2,-0.1772195,38.470823)" />
66+ <radialGradient
67+ cx="605.71429"
68+ cy="486.64789"
69+ r="117.14286"
70+ fx="605.71429"
71+ fy="486.64789"
72+ id="radialGradient2981"
73+ xlink:href="#linearGradient5060"
74+ gradientUnits="userSpaceOnUse"
75+ gradientTransform="matrix(-2.289231e-2,0,0,1.235294e-2,21.646291,38.470849)" />
76+ <linearGradient
77+ id="linearGradient5060">
78+ <stop
79+ id="stop5062"
80+ style="stop-color:#000000;stop-opacity:1"
81+ offset="0" />
82+ <stop
83+ id="stop5064"
84+ style="stop-color:#000000;stop-opacity:0"
85+ offset="1" />
86+ </linearGradient>
87+ <radialGradient
88+ cx="605.71429"
89+ cy="486.64789"
90+ r="117.14286"
91+ fx="605.71429"
92+ fy="486.64789"
93+ id="radialGradient2978"
94+ xlink:href="#linearGradient5060"
95+ gradientUnits="userSpaceOnUse"
96+ gradientTransform="matrix(2.289231e-2,0,0,1.235294e-2,26.353705,38.470849)" />
97+ <linearGradient
98+ x1="11.536495"
99+ y1="44.952385"
100+ x2="11.536495"
101+ y2="-1.0040783"
102+ id="linearGradient2975"
103+ xlink:href="#linearGradient3104"
104+ gradientUnits="userSpaceOnUse"
105+ gradientTransform="translate(5e-7,4.76147e-2)" />
106+ <linearGradient
107+ id="linearGradient3600">
108+ <stop
109+ id="stop3828"
110+ style="stop-color:#f4f4f4;stop-opacity:1"
111+ offset="0" />
112+ <stop
113+ id="stop3604"
114+ style="stop-color:#dbdbdb;stop-opacity:1"
115+ offset="1" />
116+ </linearGradient>
117+ <linearGradient
118+ x1="-60.969666"
119+ y1="13.668072"
120+ x2="-60.908253"
121+ y2="114.5354"
122+ id="linearGradient2973"
123+ xlink:href="#linearGradient3600"
124+ gradientUnits="userSpaceOnUse"
125+ gradientTransform="matrix(0.4503686,2.7172606e-4,-2.742051e-4,0.446297,46.807779,-6.9909047)" />
126+ <linearGradient
127+ id="linearGradient3104">
128+ <stop
129+ id="stop3106"
130+ style="stop-color:#a0a0a0;stop-opacity:1"
131+ offset="0" />
132+ <stop
133+ id="stop3108"
134+ style="stop-color:#c8c8c8;stop-opacity:1"
135+ offset="1" />
136+ </linearGradient>
137+ <linearGradient
138+ x1="22.004084"
139+ y1="44.854229"
140+ x2="22.004084"
141+ y2="3.0718794"
142+ id="linearGradient3781"
143+ xlink:href="#linearGradient3104"
144+ gradientUnits="userSpaceOnUse" />
145+ <linearGradient
146+ id="linearGradient3155-40">
147+ <stop
148+ id="stop2541"
149+ style="stop-color:#181818;stop-opacity:1"
150+ offset="0" />
151+ <stop
152+ id="stop2543"
153+ style="stop-color:#dbdbdb;stop-opacity:1"
154+ offset="0.13482948" />
155+ <stop
156+ id="stop2545"
157+ style="stop-color:#a4a4a4;stop-opacity:1"
158+ offset="0.20224422" />
159+ <stop
160+ id="stop2547"
161+ style="stop-color:#ffffff;stop-opacity:1"
162+ offset="0.26965895" />
163+ <stop
164+ id="stop2549"
165+ style="stop-color:#8d8d8d;stop-opacity:1"
166+ offset="0.44650277" />
167+ <stop
168+ id="stop2551"
169+ style="stop-color:#959595;stop-opacity:1"
170+ offset="0.57114136" />
171+ <stop
172+ id="stop2553"
173+ style="stop-color:#cecece;stop-opacity:1"
174+ offset="0.72038066" />
175+ <stop
176+ id="stop2555"
177+ style="stop-color:#181818;stop-opacity:1"
178+ offset="1" />
179+ </linearGradient>
180+ <linearGradient
181+ x1="23.575972"
182+ y1="25.356892"
183+ x2="23.575972"
184+ y2="31.210939"
185+ id="linearGradient2697"
186+ xlink:href="#linearGradient3155-40"
187+ gradientUnits="userSpaceOnUse"
188+ gradientTransform="matrix(0.6565695,-0.659788,0.7345237,0.7308691,-1.012959,19.863185)"
189+ spreadMethod="pad" />
190+ <linearGradient
191+ id="linearGradient3240-279">
192+ <stop
193+ id="stop2559"
194+ style="stop-color:#565656;stop-opacity:1"
195+ offset="0" />
196+ <stop
197+ id="stop2561"
198+ style="stop-color:#9a9a9a;stop-opacity:1"
199+ offset="0.5" />
200+ <stop
201+ id="stop2563"
202+ style="stop-color:#545454;stop-opacity:1"
203+ offset="1" />
204+ </linearGradient>
205+ <linearGradient
206+ x1="30.037716"
207+ y1="24.989594"
208+ x2="30.037716"
209+ y2="30.000141"
210+ id="linearGradient2691"
211+ xlink:href="#linearGradient3240-279"
212+ gradientUnits="userSpaceOnUse"
213+ gradientTransform="matrix(0.6380091,-0.6411367,0.8596262,0.8553492,-3.419016,16.487099)" />
214+ <linearGradient
215+ id="linearGradient3223-789">
216+ <stop
217+ id="stop2567"
218+ style="stop-color:#b1b1b1;stop-opacity:1"
219+ offset="0" />
220+ <stop
221+ id="stop2569"
222+ style="stop-color:#ffffff;stop-opacity:1"
223+ offset="0.5" />
224+ <stop
225+ id="stop2571"
226+ style="stop-color:#8f8f8f;stop-opacity:1"
227+ offset="1" />
228+ </linearGradient>
229+ <linearGradient
230+ x1="30.037716"
231+ y1="24.989594"
232+ x2="30.037716"
233+ y2="30.000141"
234+ id="linearGradient2688"
235+ xlink:href="#linearGradient3223-789"
236+ gradientUnits="userSpaceOnUse"
237+ gradientTransform="matrix(0.6380091,-0.6411367,0.8596262,0.8553492,-3.601733,16.670712)" />
238+ <linearGradient
239+ id="linearGradient3240-686">
240+ <stop
241+ id="stop2575"
242+ style="stop-color:#565656;stop-opacity:1"
243+ offset="0" />
244+ <stop
245+ id="stop2577"
246+ style="stop-color:#9a9a9a;stop-opacity:1"
247+ offset="0.5" />
248+ <stop
249+ id="stop2579"
250+ style="stop-color:#545454;stop-opacity:1"
251+ offset="1" />
252+ </linearGradient>
253+ <linearGradient
254+ x1="30.037716"
255+ y1="24.989594"
256+ x2="30.037716"
257+ y2="30.000141"
258+ id="linearGradient2685"
259+ xlink:href="#linearGradient3240-686"
260+ gradientUnits="userSpaceOnUse"
261+ gradientTransform="matrix(0.6380091,-0.6411367,0.8596262,0.8553492,-2.784076,15.849046)" />
262+ <linearGradient
263+ id="linearGradient3223-768">
264+ <stop
265+ id="stop2583"
266+ style="stop-color:#b1b1b1;stop-opacity:1"
267+ offset="0" />
268+ <stop
269+ id="stop2585"
270+ style="stop-color:#ffffff;stop-opacity:1"
271+ offset="0.5" />
272+ <stop
273+ id="stop2587"
274+ style="stop-color:#8f8f8f;stop-opacity:1"
275+ offset="1" />
276+ </linearGradient>
277+ <linearGradient
278+ x1="30.037716"
279+ y1="24.989594"
280+ x2="30.037716"
281+ y2="30.000141"
282+ id="linearGradient2682"
283+ xlink:href="#linearGradient3223-768"
284+ gradientUnits="userSpaceOnUse"
285+ gradientTransform="matrix(0.6380091,-0.6411367,0.8596262,0.8553492,-2.966794,16.032658)" />
286+ <linearGradient
287+ id="linearGradient3240-907">
288+ <stop
289+ id="stop2591"
290+ style="stop-color:#565656;stop-opacity:1"
291+ offset="0" />
292+ <stop
293+ id="stop2593"
294+ style="stop-color:#9a9a9a;stop-opacity:1"
295+ offset="0.5" />
296+ <stop
297+ id="stop2595"
298+ style="stop-color:#545454;stop-opacity:1"
299+ offset="1" />
300+ </linearGradient>
301+ <linearGradient
302+ x1="30.037716"
303+ y1="24.989594"
304+ x2="30.037716"
305+ y2="30.000141"
306+ id="linearGradient2679"
307+ xlink:href="#linearGradient3240-907"
308+ gradientUnits="userSpaceOnUse"
309+ gradientTransform="matrix(0.6380091,-0.6411367,0.8596262,0.8553492,-2.146067,15.207909)" />
310+ <linearGradient
311+ id="linearGradient3223-699">
312+ <stop
313+ id="stop2599"
314+ style="stop-color:#b1b1b1;stop-opacity:1"
315+ offset="0" />
316+ <stop
317+ id="stop2601"
318+ style="stop-color:#ffffff;stop-opacity:1"
319+ offset="0.5" />
320+ <stop
321+ id="stop2603"
322+ style="stop-color:#8f8f8f;stop-opacity:1"
323+ offset="1" />
324+ </linearGradient>
325+ <linearGradient
326+ x1="30.037716"
327+ y1="24.989594"
328+ x2="30.037716"
329+ y2="30.000141"
330+ id="linearGradient2676"
331+ xlink:href="#linearGradient3223-699"
332+ gradientUnits="userSpaceOnUse"
333+ gradientTransform="matrix(0.6380091,-0.6411367,0.8596262,0.8553492,-2.328784,15.391523)" />
334+ <linearGradient
335+ id="linearGradient3191-577">
336+ <stop
337+ id="stop2613"
338+ style="stop-color:#dbce48;stop-opacity:1"
339+ offset="0" />
340+ <stop
341+ id="stop2615"
342+ style="stop-color:#c5b625;stop-opacity:1"
343+ offset="1" />
344+ </linearGradient>
345+ <linearGradient
346+ x1="5.5178981"
347+ y1="37.371799"
348+ x2="9.5220556"
349+ y2="41.391716"
350+ id="linearGradient2673"
351+ xlink:href="#linearGradient3191-577"
352+ gradientUnits="userSpaceOnUse"
353+ gradientTransform="matrix(0.5603647,2.418622e-2,2.415646e-2,0.5596736,19.546549,13.104104)" />
354+ <linearGradient
355+ id="linearGradient3290-678">
356+ <stop
357+ id="stop2607"
358+ style="stop-color:#ece5a5;stop-opacity:1"
359+ offset="0" />
360+ <stop
361+ id="stop2609"
362+ style="stop-color:#fcfbf2;stop-opacity:1"
363+ offset="1" />
364+ </linearGradient>
365+ <linearGradient
366+ x1="9"
367+ y1="29.056757"
368+ x2="9"
369+ y2="26.02973"
370+ id="linearGradient2670"
371+ xlink:href="#linearGradient3290-678"
372+ gradientUnits="userSpaceOnUse"
373+ gradientTransform="matrix(0.6380091,-0.6411367,0.8596263,0.8553493,-3.661342,16.73061)" />
374+ </defs>
375+ <g
376+ id="layer1">
377+ <rect
378+ width="32.299999"
379+ height="2.9999998"
380+ x="7.8499999"
381+ y="43"
382+ id="rect3706"
383+ style="opacity:0.40206185;fill:url(#linearGradient2984);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.04588675;marker:none;visibility:visible;display:inline;overflow:visible" />
384+ <path
385+ d="M 7.85,43.000131 C 7.85,43.000131 7.85,45.999965 7.85,45.999965 C 6.6711024,46.005589 5,45.327854 5,44.499855 C 5,43.671856 6.3155607,43.000132 7.85,43.000131 z"
386+ id="path3708"
387+ style="opacity:0.40206185;fill:url(#radialGradient2981);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.04588675;marker:none;visibility:visible;display:inline;overflow:visible" />
388+ <path
389+ d="M 40.15,43.000131 C 40.15,43.000131 40.15,45.999965 40.15,45.999965 C 41.328897,46.005565 43,45.327854 43,44.499855 C 43,43.671856 41.684439,43.000132 40.15,43.000131 z"
390+ id="path3710"
391+ style="opacity:0.40206185;fill:url(#radialGradient2978);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.04588675;marker:none;visibility:visible;display:inline;overflow:visible" />
392+ <path
393+ d="M 7.5,3.4999988 C 16.022149,3.5051388 31.977853,3.4948588 40.5,3.4999988 C 40.57503,5.1057895 41.42418,41.698378 41.499236,44.499999 C 29.832825,44.492964 18.166414,44.485917 6.5,44.478878 C 6.59181,41.331778 7.4081898,4.9121594 7.5,3.4999988 z"
394+ id="path2855"
395+ style="fill:url(#linearGradient2973);fill-opacity:1;stroke:url(#linearGradient2975);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
396+ <path
397+ d="M 12.687579,4.2498875 L 12.25,43.749999"
398+ id="path5685"
399+ style="opacity:0.59069764;fill:#80b3ff;fill-rule:evenodd;stroke:#f6abab;stroke-width:0.49999991;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
400+ <path
401+ d="M 40.057439,9.8749988 L 7.8771512,9.6904668"
402+ id="path6656"
403+ style="opacity:0.43720931;fill:#80b3ff;fill-rule:evenodd;stroke:#80b3ff;stroke-width:0.24999996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
404+ <path
405+ d="M 40.131449,11.874999 L 7.8685462,11.690464"
406+ id="path6658"
407+ style="opacity:0.43720931;fill:#80b3ff;fill-rule:evenodd;stroke:#80b3ff;stroke-width:0.24999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
408+ <path
409+ d="M 40.214067,13.874999 L 7.7859295,13.690468"
410+ id="path6660"
411+ style="opacity:0.43720931;fill:#80b3ff;fill-rule:evenodd;stroke:#80b3ff;stroke-width:0.24999996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
412+ <path
413+ d="M 40.296684,15.874999 L 7.7033144,15.690466"
414+ id="path6662"
415+ style="opacity:0.43720931;fill:#80b3ff;fill-rule:evenodd;stroke:#80b3ff;stroke-width:0.24999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
416+ <path
417+ d="M 40.296685,17.874999 L 7.7033138,17.690466"
418+ id="path6664"
419+ style="opacity:0.43720931;fill:#80b3ff;fill-rule:evenodd;stroke:#80b3ff;stroke-width:0.24999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
420+ <path
421+ d="M 40.379302,19.874999 L 7.6206973,19.690465"
422+ id="path6666"
423+ style="opacity:0.43720931;fill:#80b3ff;fill-rule:evenodd;stroke:#80b3ff;stroke-width:0.24999996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
424+ <path
425+ d="M 40.379302,21.874999 L 7.6206974,21.690467"
426+ id="path7637"
427+ style="opacity:0.43720931;fill:#80b3ff;fill-opacity:1;fill-rule:evenodd;stroke:#80b3ff;stroke-width:0.24999996;stroke-linecap:round;stroke-linejoin:round;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
428+ <path
429+ d="M 40.461915,23.874999 L 7.538081,23.690466"
430+ id="path7639"
431+ style="opacity:0.43720931;fill:#80b3ff;fill-opacity:1;fill-rule:evenodd;stroke:#80b3ff;stroke-width:0.24999997;stroke-linecap:round;stroke-linejoin:round;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
432+ <path
433+ d="M 40.461913,25.874999 L 7.5380821,25.690466"
434+ id="path7641"
435+ style="opacity:0.43720931;fill:#80b3ff;fill-opacity:1;fill-rule:evenodd;stroke:#80b3ff;stroke-width:0.24999997;stroke-linecap:round;stroke-linejoin:round;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
436+ <path
437+ d="M 40.627148,27.874999 L 7.3728501,27.690469"
438+ id="path7645"
439+ style="opacity:0.43720931;fill:#80b3ff;fill-opacity:1;fill-rule:evenodd;stroke:#80b3ff;stroke-width:0.24999997;stroke-linecap:round;stroke-linejoin:round;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
440+ <path
441+ d="M 40.627148,29.864131 L 7.3728497,29.679597"
442+ id="path7647"
443+ style="opacity:0.43720931;fill:#80b3ff;fill-opacity:1;fill-rule:evenodd;stroke:#80b3ff;stroke-width:0.24999997;stroke-linecap:round;stroke-linejoin:round;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
444+ <path
445+ d="M 40.874996,31.874999 L 7.125001,31.690466"
446+ id="path7649"
447+ style="opacity:0.43720931;fill:#80b3ff;fill-opacity:1;fill-rule:evenodd;stroke:#80b3ff;stroke-width:0.24999996;stroke-linecap:round;stroke-linejoin:round;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
448+ <path
449+ d="M 40.874996,33.830428 L 7.125001,33.645894"
450+ id="path7651"
451+ style="opacity:0.43720931;fill:#80b3ff;fill-opacity:1;fill-rule:evenodd;stroke:#80b3ff;stroke-width:0.24999996;stroke-linecap:round;stroke-linejoin:round;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
452+ <path
453+ d="M 40.874995,35.813576 L 7.1250017,35.629044"
454+ id="path7653"
455+ style="opacity:0.43720931;fill:#80b3ff;fill-opacity:1;fill-rule:evenodd;stroke:#80b3ff;stroke-width:0.24999996;stroke-linecap:round;stroke-linejoin:round;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
456+ <path
457+ d="M 40.874996,37.796724 L 7.1250009,37.612188"
458+ id="path7655"
459+ style="opacity:0.43720931;fill:#80b3ff;fill-opacity:1;fill-rule:evenodd;stroke:#80b3ff;stroke-width:0.24999996;stroke-linecap:round;stroke-linejoin:round;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
460+ <path
461+ d="M 40.874995,39.779873 L 7.1250018,39.595339"
462+ id="path7657"
463+ style="opacity:0.43720931;fill:#80b3ff;fill-opacity:1;fill-rule:evenodd;stroke:#80b3ff;stroke-width:0.24999996;stroke-linecap:round;stroke-linejoin:round;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
464+ <path
465+ d="M 40.874995,41.874999 L 7.1250016,41.690466"
466+ id="path7659"
467+ style="opacity:0.43720931;fill:#80b3ff;fill-opacity:1;fill-rule:evenodd;stroke:#80b3ff;stroke-width:0.24999996;stroke-linecap:round;stroke-linejoin:round;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
468+ <path
469+ d="M 35.25,4.1672721 L 36.299508,43.667383"
470+ id="path7671"
471+ style="opacity:0.59069764;fill:none;stroke:#b9d5ff;stroke-width:0.49999991;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
472+ <path
473+ d="M 12.998934,11.546347 L 15.346904,11.546347 M 15.682329,11.546347 L 17.862587,11.546347 M 18.213543,11.546347 L 20.159004,11.546347 M 20.478897,11.546347 L 21.317457,11.546347 M 21.652882,11.546347 L 23.531258,11.546347 M 23.900225,11.546347 L 28.830962,11.546347 M 29.166388,11.546347 L 32.92314,11.546347 M 33.258565,11.546347 L 34.399007,11.546347 M 12.998934,13.5 L 16.639566,13.5 M 17.063128,13.5 L 18.802705,13.5 M 19.124282,13.5 L 19.982732,13.5 M 20.332004,13.5 L 21.93441,13.5 M 22.269835,13.5 L 23.913181,13.5 M 24.223391,13.5 L 26.803832,13.5 M 27.139258,13.5 L 30.543466,13.5 M 12.998934,15.480028 L 16.080361,15.480028 M 16.404065,15.480028 L 21.478902,15.480028 M 21.789932,15.480028 L 24.251118,15.480028 M 24.566571,15.480028 L 26.868981,15.480028 M 27.199162,15.480028 L 29.160483,15.480028 M 29.475937,15.480028 L 32.5606,15.5 M 12.998934,17.5 L 17.283286,17.5 M 17.619719,17.5 L 22.250297,17.5 M 22.57019,17.5 L 24.38985,17.5 M 24.725275,17.5 L 29.056402,17.5 M 29.347914,17.5 L 32.31645,17.5 M 32.651876,17.5 L 33.826785,17.5 M 34.16221,17.5 L 34.812102,17.5 M 12.998934,19.5 L 14.598169,19.5 M 15.089513,19.5 L 21.011012,19.5 M 12.998934,29.5 L 16.639566,29.5 M 17.063128,29.5 L 18.802705,29.5 M 19.124282,29.5 L 19.982732,29.5 M 20.332004,29.5 L 21.93441,29.5 M 22.269835,29.5 L 23.913181,29.5 M 24.223391,29.5 L 26.803832,29.5 M 12.998934,33.480028 L 16.080361,33.480028 M 16.404065,33.480028 L 21.478902,33.480028 M 21.789932,33.480028 L 24.251118,33.480028 M 32.948417,33.541384 L 37.975315,33.541384 M 12.998934,27.5 L 17.283286,27.5 M 17.619719,27.5 L 22.250297,27.5 M 22.57019,27.5 L 24.38985,27.5 M 24.725275,27.5 L 29.056402,27.5 M 12.998934,23.5 L 15.346904,23.5 M 15.682329,23.5 L 17.862587,23.5 M 18.213543,23.5 L 20.159004,23.5 M 20.478897,23.5 L 21.317457,23.5 M 21.652882,23.5 L 23.531258,23.5 M 23.900225,23.5 L 28.830962,23.5 M 29.166388,23.5 L 32.92314,23.5 M 12.998934,25.5 L 16.953218,25.5 M 17.264261,25.5 L 21.463212,25.5 M 21.783105,25.5 L 23.425036,25.5 M 23.735072,25.5 L 27.685351,25.5 M 28.002253,25.5 L 32.31645,25.5 M 12.998934,35.5 L 16.694141,35.5 M 17.090804,35.5 L 18.71992,35.5 M 19.101495,35.5 L 19.914052,35.5 M 20.172707,35.5 L 21.776742,35.5 M 21.989691,35.5 L 30.481775,35.5 M 30.881361,35.5 L 33.148244,35.5 M 33.453051,35.5 L 34.025425,35.5 M 17.208675,37.5 L 18.414065,37.5 M 12.998934,37.5 L 16.855815,37.5 M 18.722347,37.5 L 21.526895,37.5 M 21.823565,37.5 L 25.940467,37.5 M 26.26036,37.5 L 29.053218,37.5 M 29.334357,37.5 L 29.909868,37.5 M 30.224549,37.5 L 33.770992,37.5 M 34.133561,37.5 L 35.990301,37.5 M 17.208675,39.5 L 18.910624,39.5 M 12.998934,39.5 L 16.855815,39.5 M 19.279462,39.5 L 21.672229,39.5"
474+ id="path3715"
475+ style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient3781);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
476+ <path
477+ d="M 38.469055,23.944499 C 38.295798,23.84251 38.161738,23.869039 38.073172,23.925789 L 26.277064,31.437213 L 24.106014,32.823568 L 24.039174,32.851618 L 21.468776,38.643667 L 27.838918,38.835536 L 27.891798,38.800146 L 30.076808,37.421139 L 41.869977,29.844933 C 42.224248,29.61794 41.663959,28.113519 40.613122,26.464308 C 39.824991,25.227406 38.988829,24.250464 38.469055,23.944499 L 38.469055,23.944499 z"
478+ id="path2422"
479+ style="opacity:0.15;fill:#0c0c0c;fill-opacity:1;fill-rule:evenodd;stroke:none" />
480+ <path
481+ d="M 24.934095,31.028461 C 25.380016,30.693845 26.631199,31.321528 27.780983,32.465591 C 28.928017,33.606917 29.532403,34.828193 29.205363,35.278479 C 29.204163,35.280179 29.233503,35.303519 29.232223,35.305209 L 45.242268,19.216683 C 45.64875,18.808208 45.017185,17.517377 43.830899,16.336995 C 42.644617,15.156613 41.35062,14.531459 40.944135,14.939936 L 24.934095,31.028461 z"
482+ id="rect2383"
483+ style="fill:url(#linearGradient2697);fill-opacity:1;stroke:#0c0c0c;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
484+ <path
485+ d="M 38.990234,16.903417 C 39.436155,16.568801 40.687339,17.196485 41.837122,18.340547 C 42.984155,19.481872 43.588542,20.703149 43.261501,21.153434 C 43.260301,21.155134 43.289641,21.178474 43.288361,21.180164 L 45.242264,19.216682 L 45.282144,19.176612 C 45.283444,19.174912 45.254034,19.151592 45.255284,19.149882 C 45.58232,18.699597 44.977932,17.478321 43.830899,16.336996 C 42.681117,15.192934 41.429934,14.565249 40.984012,14.899866 L 40.944132,14.939936 L 38.990231,16.903417 L 38.990234,16.903417 z"
486+ id="rect3175"
487+ style="opacity:0.8;fill:#ffb6ed;fill-opacity:1;stroke:#e28ccd;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
488+ <path
489+ d="M 24.934095,31.028459 C 25.380016,30.693843 26.6312,31.321527 27.780982,32.465589 C 28.928016,33.606915 29.532403,34.828191 29.205362,35.278477 C 29.204162,35.280177 29.233502,35.303517 29.232232,35.305207 L 40.257824,24.225564 L 40.297704,24.185494 C 40.299004,24.183794 40.269594,24.160474 40.270844,24.158764 C 40.597878,23.708475 39.993491,22.4872 38.846458,21.345874 C 37.696675,20.201812 36.44549,19.574128 35.999569,19.908745 L 35.959689,19.948815 L 24.9341,31.028459 L 24.934095,31.028459 z"
490+ id="path3208"
491+ style="opacity:0.6;fill:#0c0c0c;fill-opacity:1;stroke:none" />
492+ <path
493+ d="M 36.800145,19.10424 C 37.246065,18.769623 38.497251,19.397308 39.647033,20.54137 C 40.794066,21.682695 41.398454,22.903971 41.071412,23.354258 C 41.070212,23.355958 41.099552,23.379298 41.098272,23.380988 L 41.29765,23.18063 C 41.29895,23.17893 41.26954,23.15561 41.27079,23.1539 C 41.597832,22.703614 40.993444,21.482337 39.84641,20.341014 C 38.696628,19.196951 37.445443,18.569267 36.999523,18.903883 L 36.800145,19.104239 L 36.800145,19.10424 z"
494+ id="path3233"
495+ style="fill:url(#linearGradient2691);fill-opacity:1;stroke:none" />
496+ <path
497+ d="M 36.617427,19.287853 C 37.063349,18.953236 38.314534,19.58092 39.464315,20.724982 C 40.61135,21.866308 41.215737,23.087583 40.888695,23.537869 C 40.887495,23.539569 40.916825,23.562909 40.915555,23.564599 L 41.114932,23.364242 C 41.116232,23.362542 41.086822,23.339222 41.088072,23.337512 C 41.415116,22.887227 40.810728,21.665951 39.663693,20.524626 C 38.513911,19.380564 37.262727,18.752879 36.816804,19.087496 L 36.617427,19.287852 L 36.617427,19.287853 z"
498+ id="path3216"
499+ style="fill:url(#linearGradient2688);fill-opacity:1;stroke:none" />
500+ <path
501+ d="M 37.435085,18.466187 C 37.881006,18.13157 39.13219,18.759254 40.281973,19.903317 C 41.429006,21.044642 42.033394,22.265917 41.706353,22.716204 C 41.705153,22.717904 41.734483,22.741244 41.733213,22.742934 L 41.932591,22.542579 C 41.933891,22.540879 41.904481,22.517559 41.905731,22.515849 C 42.232772,22.065563 41.628385,20.844286 40.48135,19.702962 C 39.331568,18.558899 38.080386,17.931215 37.634462,18.265832 L 37.435085,18.466187 L 37.435085,18.466187 z"
502+ id="path3248"
503+ style="fill:url(#linearGradient2685);fill-opacity:1;stroke:none" />
504+ <path
505+ d="M 37.252367,18.6498 C 37.69829,18.315183 38.949474,18.942867 40.099255,20.086929 C 41.24629,21.228255 41.850677,22.44953 41.523636,22.899816 C 41.522436,22.901516 41.551776,22.924856 41.550496,22.926546 L 41.749873,22.72619 C 41.751173,22.72449 41.721763,22.70117 41.723013,22.69946 C 42.050055,22.249174 41.445668,21.027897 40.298634,19.886574 C 39.148853,18.742511 37.897668,18.114826 37.451745,18.449444 L 37.252367,18.6498 z"
506+ id="path3250"
507+ style="fill:url(#linearGradient2682);fill-opacity:1;stroke:none" />
508+ <path
509+ d="M 38.073095,17.82505 C 38.519015,17.490434 39.770199,18.118118 40.919982,19.26218 C 42.067015,20.403505 42.671403,21.624781 42.344362,22.075067 C 42.343162,22.076767 42.372492,22.100107 42.371222,22.101797 L 42.570598,21.901441 C 42.571898,21.899741 42.542488,21.876421 42.543738,21.874711 C 42.87078,21.424426 42.266392,20.203149 41.119358,19.061824 C 39.969578,17.917762 38.718393,17.290077 38.272471,17.624695 L 38.073094,17.82505 L 38.073095,17.82505 z"
510+ id="path3256"
511+ style="fill:url(#linearGradient2679);fill-opacity:1;stroke:none" />
512+ <path
513+ d="M 37.890378,18.008663 C 38.336297,17.674046 39.587483,18.30173 40.737265,19.445794 C 41.884298,20.587118 42.488687,21.808394 42.161644,22.258679 C 42.160444,22.260379 42.189784,22.283719 42.188504,22.285409 L 42.387882,22.085055 C 42.389182,22.083355 42.359772,22.060035 42.361022,22.058325 C 42.688064,21.608038 42.083676,20.386762 40.936643,19.245438 C 39.786861,18.101375 38.535676,17.47369 38.089755,17.808308 L 37.890378,18.008663 L 37.890378,18.008663 z"
514+ id="path3258"
515+ style="fill:url(#linearGradient2676);fill-opacity:1;stroke:none" />
516+ <path
517+ d="M 21.865994,38.310367 L 29.149728,35.339529 L 29.211788,35.277479 C 29.538829,34.82719 28.92656,33.605819 27.779526,32.464491 C 26.629743,31.320429 25.380038,30.696214 24.934117,31.030831 L 21.865999,38.310367 L 21.865994,38.310367 z"
518+ id="path3270"
519+ style="fill:url(#linearGradient2670);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2673);stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
520+ <path
521+ d="M 22.697063,36.338766 L 21.865547,38.302576 L 23.852186,37.488142 C 23.69296,37.297418 23.545968,37.103699 23.354795,36.913478 C 23.134704,36.694481 22.918224,36.516791 22.697063,36.338766 z"
522+ id="path3281"
523+ style="fill:#0c0c0c;fill-opacity:1;fill-rule:evenodd;stroke:#0c0c0c;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
524+ </g>
525+</svg>
526
527=== modified file 'src/main_window.vala'
528--- src/main_window.vala 2011-09-17 14:02:04 +0000
529+++ src/main_window.vala 2011-09-18 22:15:19 +0000
530@@ -575,7 +575,7 @@
531 try {
532 set_combobox_language (filename);
533 } catch (Error e) {
534- warning ("Cannont set the combobox id");
535+ warning ("Cannot set the combobox id");
536 }
537
538 if (!current_notebook.welcome_screen.active) {
539
540=== modified file 'src/scratch.vala'
541--- src/scratch.vala 2011-09-17 12:10:03 +0000
542+++ src/scratch.vala 2011-09-18 22:15:19 +0000
543@@ -49,7 +49,7 @@
544 program_name = app_cmd_name;
545 exec_name = app_cmd_name.down();
546 app_copyright = "GPLv3";
547- app_icon = "text-editor";
548+ app_icon = "scratch";
549 app_launcher = "scratch.desktop";
550 application_id = "net.launchpad." + app_cmd_name.down();
551 main_url = "https://launchpad.net/scratch";
552@@ -62,22 +62,23 @@
553 null
554 };
555 //about_documenters = {"",""};
556- about_artists = {"Harvey Cabaguio 'BassUltra' <harveycabaguio@gmail.com>",
557+ about_artists = {"Harvey 'BassUltra' Cabaguio <harveycabaguio@gmail.com>",
558+ "Daniel Fore <daniel.p.fore@gmail.com>",
559 null
560 };
561 about_translators = "Launchpad Translators";
562- about_license = """This program is free software: you can redistribute it and/or modify it
563+ about_license = """Scratch is free software: you can redistribute it and/or modify it
564 under the terms of the GNU Lesser General Public License version 3,
565 as published by the Free Software Foundation.
566
567-This program is distributed in the hope that it will be useful, but
568+Scratch is distributed in the hope that it will be useful, but
569 WITHOUT ANY WARRANTY; without even the implied warranties of
570 MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A
571 PARTICULAR PURPOSE. See the GNU General Public License for
572 more details.
573
574 You should have received a copy of the GNU General Public License
575-along with this program. If not, see <http://www.gnu.org/licenses>""";
576+along with Scratch. If not, see <http://www.gnu.org/licenses>""";
577
578 }
579

Subscribers

People subscribed via source and target branches