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
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2011-09-16 21:26:03 +0000
+++ CMakeLists.txt 2011-09-18 22:15:19 +0000
@@ -78,6 +78,7 @@
78#TODO: Installation78#TODO: Installation
7979
80install (TARGETS scratch RUNTIME DESTINATION bin)80install (TARGETS scratch RUNTIME DESTINATION bin)
81install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/scratch.svg DESTINATION share/icons/hicolor/scalable/apps)
81install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/scratch.desktop DESTINATION share/applications)82install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/scratch.desktop DESTINATION share/applications)
82install (FILES ${CMAKE_BINARY_DIR}/scratch.vapi DESTINATION share/vala/vapi/)83install (FILES ${CMAKE_BINARY_DIR}/scratch.vapi DESTINATION share/vala/vapi/)
83install (FILES ${CMAKE_BINARY_DIR}/scratch.h DESTINATION include/scratch/)84install (FILES ${CMAKE_BINARY_DIR}/scratch.h DESTINATION include/scratch/)
8485
=== modified file 'data/scratch.desktop'
--- data/scratch.desktop 2011-08-01 11:10:04 +0000
+++ data/scratch.desktop 2011-09-18 22:15:19 +0000
@@ -5,7 +5,7 @@
5Comment=Edit Text Files5Comment=Edit Text Files
6GenericName=Text Editor6GenericName=Text Editor
7Exec=scratch7Exec=scratch
8Icon=text-editor8Icon=scratch
9Terminal=false9Terminal=false
10Categories=GNOME;GTK;Utility;TextEditor;10Categories=GNOME;GTK;Utility;TextEditor;
11MimeType=text/plain;11MimeType=text/plain;
1212
=== added file 'data/scratch.svg'
--- data/scratch.svg 1970-01-01 00:00:00 +0000
+++ data/scratch.svg 2011-09-18 22:15:19 +0000
@@ -0,0 +1,496 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<!-- Created with Inkscape (http://www.inkscape.org/) -->
3<svg
4 xmlns:svg="http://www.w3.org/2000/svg"
5 xmlns="http://www.w3.org/2000/svg"
6 xmlns:xlink="http://www.w3.org/1999/xlink"
7 version="1.0"
8 width="48"
9 height="48"
10 id="svg3247">
11 <defs
12 id="defs3249">
13 <linearGradient
14 id="linearGradient5048">
15 <stop
16 id="stop5050"
17 style="stop-color:#000000;stop-opacity:0"
18 offset="0" />
19 <stop
20 id="stop5056"
21 style="stop-color:#000000;stop-opacity:1"
22 offset="0.5" />
23 <stop
24 id="stop5052"
25 style="stop-color:#000000;stop-opacity:0"
26 offset="1" />
27 </linearGradient>
28 <linearGradient
29 x1="302.85715"
30 y1="366.64789"
31 x2="302.85715"
32 y2="609.50507"
33 id="linearGradient2984"
34 xlink:href="#linearGradient5048"
35 gradientUnits="userSpaceOnUse"
36 gradientTransform="matrix(6.689349e-2,0,0,1.235294e-2,-0.1772195,38.470823)" />
37 <radialGradient
38 cx="605.71429"
39 cy="486.64789"
40 r="117.14286"
41 fx="605.71429"
42 fy="486.64789"
43 id="radialGradient2981"
44 xlink:href="#linearGradient5060"
45 gradientUnits="userSpaceOnUse"
46 gradientTransform="matrix(-2.289231e-2,0,0,1.235294e-2,21.646291,38.470849)" />
47 <linearGradient
48 id="linearGradient5060">
49 <stop
50 id="stop5062"
51 style="stop-color:#000000;stop-opacity:1"
52 offset="0" />
53 <stop
54 id="stop5064"
55 style="stop-color:#000000;stop-opacity:0"
56 offset="1" />
57 </linearGradient>
58 <radialGradient
59 cx="605.71429"
60 cy="486.64789"
61 r="117.14286"
62 fx="605.71429"
63 fy="486.64789"
64 id="radialGradient2978"
65 xlink:href="#linearGradient5060"
66 gradientUnits="userSpaceOnUse"
67 gradientTransform="matrix(2.289231e-2,0,0,1.235294e-2,26.353705,38.470849)" />
68 <linearGradient
69 x1="11.536495"
70 y1="44.952385"
71 x2="11.536495"
72 y2="-1.0040783"
73 id="linearGradient2975"
74 xlink:href="#linearGradient3104"
75 gradientUnits="userSpaceOnUse"
76 gradientTransform="translate(5e-7,4.76147e-2)" />
77 <linearGradient
78 id="linearGradient3600">
79 <stop
80 id="stop3828"
81 style="stop-color:#f4f4f4;stop-opacity:1"
82 offset="0" />
83 <stop
84 id="stop3604"
85 style="stop-color:#dbdbdb;stop-opacity:1"
86 offset="1" />
87 </linearGradient>
88 <linearGradient
89 x1="-60.969666"
90 y1="13.668072"
91 x2="-60.908253"
92 y2="114.5354"
93 id="linearGradient2973"
94 xlink:href="#linearGradient3600"
95 gradientUnits="userSpaceOnUse"
96 gradientTransform="matrix(0.4503686,2.7172606e-4,-2.742051e-4,0.446297,46.807779,-6.9909047)" />
97 <linearGradient
98 id="linearGradient3104">
99 <stop
100 id="stop3106"
101 style="stop-color:#a0a0a0;stop-opacity:1"
102 offset="0" />
103 <stop
104 id="stop3108"
105 style="stop-color:#c8c8c8;stop-opacity:1"
106 offset="1" />
107 </linearGradient>
108 <linearGradient
109 x1="22.004084"
110 y1="44.854229"
111 x2="22.004084"
112 y2="3.0718794"
113 id="linearGradient3781"
114 xlink:href="#linearGradient3104"
115 gradientUnits="userSpaceOnUse" />
116 <linearGradient
117 id="linearGradient3155-40">
118 <stop
119 id="stop2541"
120 style="stop-color:#181818;stop-opacity:1"
121 offset="0" />
122 <stop
123 id="stop2543"
124 style="stop-color:#dbdbdb;stop-opacity:1"
125 offset="0.13482948" />
126 <stop
127 id="stop2545"
128 style="stop-color:#a4a4a4;stop-opacity:1"
129 offset="0.20224422" />
130 <stop
131 id="stop2547"
132 style="stop-color:#ffffff;stop-opacity:1"
133 offset="0.26965895" />
134 <stop
135 id="stop2549"
136 style="stop-color:#8d8d8d;stop-opacity:1"
137 offset="0.44650277" />
138 <stop
139 id="stop2551"
140 style="stop-color:#959595;stop-opacity:1"
141 offset="0.57114136" />
142 <stop
143 id="stop2553"
144 style="stop-color:#cecece;stop-opacity:1"
145 offset="0.72038066" />
146 <stop
147 id="stop2555"
148 style="stop-color:#181818;stop-opacity:1"
149 offset="1" />
150 </linearGradient>
151 <linearGradient
152 x1="23.575972"
153 y1="25.356892"
154 x2="23.575972"
155 y2="31.210939"
156 id="linearGradient2697"
157 xlink:href="#linearGradient3155-40"
158 gradientUnits="userSpaceOnUse"
159 gradientTransform="matrix(0.6565695,-0.659788,0.7345237,0.7308691,-1.012959,19.863185)"
160 spreadMethod="pad" />
161 <linearGradient
162 id="linearGradient3240-279">
163 <stop
164 id="stop2559"
165 style="stop-color:#565656;stop-opacity:1"
166 offset="0" />
167 <stop
168 id="stop2561"
169 style="stop-color:#9a9a9a;stop-opacity:1"
170 offset="0.5" />
171 <stop
172 id="stop2563"
173 style="stop-color:#545454;stop-opacity:1"
174 offset="1" />
175 </linearGradient>
176 <linearGradient
177 x1="30.037716"
178 y1="24.989594"
179 x2="30.037716"
180 y2="30.000141"
181 id="linearGradient2691"
182 xlink:href="#linearGradient3240-279"
183 gradientUnits="userSpaceOnUse"
184 gradientTransform="matrix(0.6380091,-0.6411367,0.8596262,0.8553492,-3.419016,16.487099)" />
185 <linearGradient
186 id="linearGradient3223-789">
187 <stop
188 id="stop2567"
189 style="stop-color:#b1b1b1;stop-opacity:1"
190 offset="0" />
191 <stop
192 id="stop2569"
193 style="stop-color:#ffffff;stop-opacity:1"
194 offset="0.5" />
195 <stop
196 id="stop2571"
197 style="stop-color:#8f8f8f;stop-opacity:1"
198 offset="1" />
199 </linearGradient>
200 <linearGradient
201 x1="30.037716"
202 y1="24.989594"
203 x2="30.037716"
204 y2="30.000141"
205 id="linearGradient2688"
206 xlink:href="#linearGradient3223-789"
207 gradientUnits="userSpaceOnUse"
208 gradientTransform="matrix(0.6380091,-0.6411367,0.8596262,0.8553492,-3.601733,16.670712)" />
209 <linearGradient
210 id="linearGradient3240-686">
211 <stop
212 id="stop2575"
213 style="stop-color:#565656;stop-opacity:1"
214 offset="0" />
215 <stop
216 id="stop2577"
217 style="stop-color:#9a9a9a;stop-opacity:1"
218 offset="0.5" />
219 <stop
220 id="stop2579"
221 style="stop-color:#545454;stop-opacity:1"
222 offset="1" />
223 </linearGradient>
224 <linearGradient
225 x1="30.037716"
226 y1="24.989594"
227 x2="30.037716"
228 y2="30.000141"
229 id="linearGradient2685"
230 xlink:href="#linearGradient3240-686"
231 gradientUnits="userSpaceOnUse"
232 gradientTransform="matrix(0.6380091,-0.6411367,0.8596262,0.8553492,-2.784076,15.849046)" />
233 <linearGradient
234 id="linearGradient3223-768">
235 <stop
236 id="stop2583"
237 style="stop-color:#b1b1b1;stop-opacity:1"
238 offset="0" />
239 <stop
240 id="stop2585"
241 style="stop-color:#ffffff;stop-opacity:1"
242 offset="0.5" />
243 <stop
244 id="stop2587"
245 style="stop-color:#8f8f8f;stop-opacity:1"
246 offset="1" />
247 </linearGradient>
248 <linearGradient
249 x1="30.037716"
250 y1="24.989594"
251 x2="30.037716"
252 y2="30.000141"
253 id="linearGradient2682"
254 xlink:href="#linearGradient3223-768"
255 gradientUnits="userSpaceOnUse"
256 gradientTransform="matrix(0.6380091,-0.6411367,0.8596262,0.8553492,-2.966794,16.032658)" />
257 <linearGradient
258 id="linearGradient3240-907">
259 <stop
260 id="stop2591"
261 style="stop-color:#565656;stop-opacity:1"
262 offset="0" />
263 <stop
264 id="stop2593"
265 style="stop-color:#9a9a9a;stop-opacity:1"
266 offset="0.5" />
267 <stop
268 id="stop2595"
269 style="stop-color:#545454;stop-opacity:1"
270 offset="1" />
271 </linearGradient>
272 <linearGradient
273 x1="30.037716"
274 y1="24.989594"
275 x2="30.037716"
276 y2="30.000141"
277 id="linearGradient2679"
278 xlink:href="#linearGradient3240-907"
279 gradientUnits="userSpaceOnUse"
280 gradientTransform="matrix(0.6380091,-0.6411367,0.8596262,0.8553492,-2.146067,15.207909)" />
281 <linearGradient
282 id="linearGradient3223-699">
283 <stop
284 id="stop2599"
285 style="stop-color:#b1b1b1;stop-opacity:1"
286 offset="0" />
287 <stop
288 id="stop2601"
289 style="stop-color:#ffffff;stop-opacity:1"
290 offset="0.5" />
291 <stop
292 id="stop2603"
293 style="stop-color:#8f8f8f;stop-opacity:1"
294 offset="1" />
295 </linearGradient>
296 <linearGradient
297 x1="30.037716"
298 y1="24.989594"
299 x2="30.037716"
300 y2="30.000141"
301 id="linearGradient2676"
302 xlink:href="#linearGradient3223-699"
303 gradientUnits="userSpaceOnUse"
304 gradientTransform="matrix(0.6380091,-0.6411367,0.8596262,0.8553492,-2.328784,15.391523)" />
305 <linearGradient
306 id="linearGradient3191-577">
307 <stop
308 id="stop2613"
309 style="stop-color:#dbce48;stop-opacity:1"
310 offset="0" />
311 <stop
312 id="stop2615"
313 style="stop-color:#c5b625;stop-opacity:1"
314 offset="1" />
315 </linearGradient>
316 <linearGradient
317 x1="5.5178981"
318 y1="37.371799"
319 x2="9.5220556"
320 y2="41.391716"
321 id="linearGradient2673"
322 xlink:href="#linearGradient3191-577"
323 gradientUnits="userSpaceOnUse"
324 gradientTransform="matrix(0.5603647,2.418622e-2,2.415646e-2,0.5596736,19.546549,13.104104)" />
325 <linearGradient
326 id="linearGradient3290-678">
327 <stop
328 id="stop2607"
329 style="stop-color:#ece5a5;stop-opacity:1"
330 offset="0" />
331 <stop
332 id="stop2609"
333 style="stop-color:#fcfbf2;stop-opacity:1"
334 offset="1" />
335 </linearGradient>
336 <linearGradient
337 x1="9"
338 y1="29.056757"
339 x2="9"
340 y2="26.02973"
341 id="linearGradient2670"
342 xlink:href="#linearGradient3290-678"
343 gradientUnits="userSpaceOnUse"
344 gradientTransform="matrix(0.6380091,-0.6411367,0.8596263,0.8553493,-3.661342,16.73061)" />
345 </defs>
346 <g
347 id="layer1">
348 <rect
349 width="32.299999"
350 height="2.9999998"
351 x="7.8499999"
352 y="43"
353 id="rect3706"
354 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" />
355 <path
356 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"
357 id="path3708"
358 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" />
359 <path
360 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"
361 id="path3710"
362 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" />
363 <path
364 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"
365 id="path2855"
366 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" />
367 <path
368 d="M 12.687579,4.2498875 L 12.25,43.749999"
369 id="path5685"
370 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" />
371 <path
372 d="M 40.057439,9.8749988 L 7.8771512,9.6904668"
373 id="path6656"
374 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" />
375 <path
376 d="M 40.131449,11.874999 L 7.8685462,11.690464"
377 id="path6658"
378 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" />
379 <path
380 d="M 40.214067,13.874999 L 7.7859295,13.690468"
381 id="path6660"
382 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" />
383 <path
384 d="M 40.296684,15.874999 L 7.7033144,15.690466"
385 id="path6662"
386 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" />
387 <path
388 d="M 40.296685,17.874999 L 7.7033138,17.690466"
389 id="path6664"
390 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" />
391 <path
392 d="M 40.379302,19.874999 L 7.6206973,19.690465"
393 id="path6666"
394 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" />
395 <path
396 d="M 40.379302,21.874999 L 7.6206974,21.690467"
397 id="path7637"
398 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" />
399 <path
400 d="M 40.461915,23.874999 L 7.538081,23.690466"
401 id="path7639"
402 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" />
403 <path
404 d="M 40.461913,25.874999 L 7.5380821,25.690466"
405 id="path7641"
406 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" />
407 <path
408 d="M 40.627148,27.874999 L 7.3728501,27.690469"
409 id="path7645"
410 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" />
411 <path
412 d="M 40.627148,29.864131 L 7.3728497,29.679597"
413 id="path7647"
414 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" />
415 <path
416 d="M 40.874996,31.874999 L 7.125001,31.690466"
417 id="path7649"
418 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" />
419 <path
420 d="M 40.874996,33.830428 L 7.125001,33.645894"
421 id="path7651"
422 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" />
423 <path
424 d="M 40.874995,35.813576 L 7.1250017,35.629044"
425 id="path7653"
426 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" />
427 <path
428 d="M 40.874996,37.796724 L 7.1250009,37.612188"
429 id="path7655"
430 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" />
431 <path
432 d="M 40.874995,39.779873 L 7.1250018,39.595339"
433 id="path7657"
434 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" />
435 <path
436 d="M 40.874995,41.874999 L 7.1250016,41.690466"
437 id="path7659"
438 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" />
439 <path
440 d="M 35.25,4.1672721 L 36.299508,43.667383"
441 id="path7671"
442 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" />
443 <path
444 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"
445 id="path3715"
446 style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient3781);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
447 <path
448 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"
449 id="path2422"
450 style="opacity:0.15;fill:#0c0c0c;fill-opacity:1;fill-rule:evenodd;stroke:none" />
451 <path
452 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"
453 id="rect2383"
454 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" />
455 <path
456 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"
457 id="rect3175"
458 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" />
459 <path
460 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"
461 id="path3208"
462 style="opacity:0.6;fill:#0c0c0c;fill-opacity:1;stroke:none" />
463 <path
464 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"
465 id="path3233"
466 style="fill:url(#linearGradient2691);fill-opacity:1;stroke:none" />
467 <path
468 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"
469 id="path3216"
470 style="fill:url(#linearGradient2688);fill-opacity:1;stroke:none" />
471 <path
472 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"
473 id="path3248"
474 style="fill:url(#linearGradient2685);fill-opacity:1;stroke:none" />
475 <path
476 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"
477 id="path3250"
478 style="fill:url(#linearGradient2682);fill-opacity:1;stroke:none" />
479 <path
480 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"
481 id="path3256"
482 style="fill:url(#linearGradient2679);fill-opacity:1;stroke:none" />
483 <path
484 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"
485 id="path3258"
486 style="fill:url(#linearGradient2676);fill-opacity:1;stroke:none" />
487 <path
488 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"
489 id="path3270"
490 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" />
491 <path
492 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"
493 id="path3281"
494 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" />
495 </g>
496</svg>
0497
=== modified file 'src/main_window.vala'
--- src/main_window.vala 2011-09-17 14:02:04 +0000
+++ src/main_window.vala 2011-09-18 22:15:19 +0000
@@ -575,7 +575,7 @@
575 try {575 try {
576 set_combobox_language (filename);576 set_combobox_language (filename);
577 } catch (Error e) {577 } catch (Error e) {
578 warning ("Cannont set the combobox id");578 warning ("Cannot set the combobox id");
579 }579 }
580 580
581 if (!current_notebook.welcome_screen.active) {581 if (!current_notebook.welcome_screen.active) {
582582
=== modified file 'src/scratch.vala'
--- src/scratch.vala 2011-09-17 12:10:03 +0000
+++ src/scratch.vala 2011-09-18 22:15:19 +0000
@@ -49,7 +49,7 @@
49 program_name = app_cmd_name;49 program_name = app_cmd_name;
50 exec_name = app_cmd_name.down();50 exec_name = app_cmd_name.down();
51 app_copyright = "GPLv3";51 app_copyright = "GPLv3";
52 app_icon = "text-editor";52 app_icon = "scratch";
53 app_launcher = "scratch.desktop";53 app_launcher = "scratch.desktop";
54 application_id = "net.launchpad." + app_cmd_name.down();54 application_id = "net.launchpad." + app_cmd_name.down();
55 main_url = "https://launchpad.net/scratch";55 main_url = "https://launchpad.net/scratch";
@@ -62,22 +62,23 @@
62 null62 null
63 };63 };
64 //about_documenters = {"",""};64 //about_documenters = {"",""};
65 about_artists = {"Harvey Cabaguio 'BassUltra' <harveycabaguio@gmail.com>",65 about_artists = {"Harvey 'BassUltra' Cabaguio <harveycabaguio@gmail.com>",
66 "Daniel Fore <daniel.p.fore@gmail.com>",
66 null67 null
67 };68 };
68 about_translators = "Launchpad Translators";69 about_translators = "Launchpad Translators";
69 about_license = """This program is free software: you can redistribute it and/or modify it70 about_license = """Scratch is free software: you can redistribute it and/or modify it
70under the terms of the GNU Lesser General Public License version 3,71under the terms of the GNU Lesser General Public License version 3,
71as published by the Free Software Foundation.72as published by the Free Software Foundation.
7273
73This program is distributed in the hope that it will be useful, but74Scratch is distributed in the hope that it will be useful, but
74WITHOUT ANY WARRANTY; without even the implied warranties of75WITHOUT ANY WARRANTY; without even the implied warranties of
75MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A76MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A
76PARTICULAR PURPOSE. See the GNU General Public License for77PARTICULAR PURPOSE. See the GNU General Public License for
77more details.78more details.
7879
79You should have received a copy of the GNU General Public License80You should have received a copy of the GNU General Public License
80along with this program. If not, see <http://www.gnu.org/licenses>""";81along with Scratch. If not, see <http://www.gnu.org/licenses>""";
81 82
82 }83 }
8384

Subscribers

People subscribed via source and target branches