Merge lp://staging/~lielft-deactivatedaccount/ubiquity-slideshow-ubuntu/games-slide into lp://staging/ubiquity-slideshow-ubuntu

Proposed by Liel Fridman
Status: Rejected
Rejected by: Sebastien Bacher
Proposed branch: lp://staging/~lielft-deactivatedaccount/ubiquity-slideshow-ubuntu/games-slide
Merge into: lp://staging/ubiquity-slideshow-ubuntu
Diff against target: 422 lines (+402/-0)
3 files modified
icons-source/games.svg (+388/-0)
slides/games.html (+13/-0)
slides/index.html (+1/-0)
To merge this branch: bzr merge lp://staging/~lielft-deactivatedaccount/ubiquity-slideshow-ubuntu/games-slide
Reviewer Review Type Date Requested Status
Dylan McCall Pending
Review via email: mp+15545@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Liel Fridman (lielft-deactivatedaccount) wrote :

This branch contains a new slideshow about games in Ubuntu.

179. By Liel Fridman <liel@liel-desktop>

Some fixes related to the games slide

180. By Liel Fridman <liel@liel-desktop>

Forgot to changee 'Repositories to 'Software Center'

Revision history for this message
Martin Erik Werner (arand) wrote :

I glanced by here and noticed the "Run your Windows games using Wine" string on the slide.
With the extremely varied success rate of Wine, is it really prudent to put such an optimistic statement in such an "official" spot as the installer?

Would not something like "Many/Several Windows games can be run using Wine" be a bit less "works flawlessly!", but still keeping an optimistic tone?

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Good idea. Fast forward 3 years, should we have steam on linux slide?

Unmerged revisions

180. By Liel Fridman <liel@liel-desktop>

Forgot to changee 'Repositories to 'Software Center'

179. By Liel Fridman <liel@liel-desktop>

Some fixes related to the games slide

178. By Liel Fridman <liel@liel-desktop>

New slide - games - added

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'icons-source/games.svg'
--- icons-source/games.svg 1970-01-01 00:00:00 +0000
+++ icons-source/games.svg 2009-12-04 15:44:10 +0000
@@ -0,0 +1,388 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<!-- Created with Inkscape (http://www.inkscape.org/) -->
3
4<svg
5 xmlns:svg="http://www.w3.org/2000/svg"
6 xmlns="http://www.w3.org/2000/svg"
7 xmlns:xlink="http://www.w3.org/1999/xlink"
8 version="1.0"
9 width="48"
10 height="48"
11 id="svg11300">
12 <defs
13 id="defs3">
14 <linearGradient
15 id="linearGradient5460">
16 <stop
17 id="stop5462"
18 style="stop-color:#e5e5e5;stop-opacity:1"
19 offset="0" />
20 <stop
21 id="stop5464"
22 style="stop-color:#c8c8c8;stop-opacity:1"
23 offset="1" />
24 </linearGradient>
25 <linearGradient
26 id="linearGradient2296">
27 <stop
28 id="stop2298"
29 style="stop-color:white;stop-opacity:1"
30 offset="0" />
31 <stop
32 id="stop2300"
33 style="stop-color:white;stop-opacity:0"
34 offset="1" />
35 </linearGradient>
36 <linearGradient
37 id="linearGradient3116">
38 <stop
39 id="stop3118"
40 style="stop-color:#e5e5e5;stop-opacity:1"
41 offset="0" />
42 <stop
43 id="stop3120"
44 style="stop-color:#dfdfdf;stop-opacity:1"
45 offset="1" />
46 </linearGradient>
47 <linearGradient
48 id="linearGradient3702">
49 <stop
50 id="stop3704"
51 style="stop-color:black;stop-opacity:0"
52 offset="0" />
53 <stop
54 id="stop3710"
55 style="stop-color:black;stop-opacity:1"
56 offset="0.5" />
57 <stop
58 id="stop3706"
59 style="stop-color:black;stop-opacity:0"
60 offset="1" />
61 </linearGradient>
62 <linearGradient
63 id="linearGradient3688">
64 <stop
65 id="stop3690"
66 style="stop-color:black;stop-opacity:1"
67 offset="0" />
68 <stop
69 id="stop3692"
70 style="stop-color:black;stop-opacity:0"
71 offset="1" />
72 </linearGradient>
73 <linearGradient
74 x1="48"
75 y1="18.534204"
76 x2="78"
77 y2="18.534204"
78 id="linearGradient6424"
79 xlink:href="#linearGradient2296"
80 gradientUnits="userSpaceOnUse"
81 gradientTransform="matrix(0.969324,0.303467,-0.313034,0.999884,-26.51354,-28.87764)" />
82 <linearGradient
83 x1="54.287079"
84 y1="9.1136208"
85 x2="68.843483"
86 y2="38.118332"
87 id="linearGradient6436"
88 xlink:href="#linearGradient2296"
89 gradientUnits="userSpaceOnUse"
90 gradientTransform="matrix(0.869923,-0.01268995,0.0134065,0.8761486,-36.670258,2.5190229)" />
91 <linearGradient
92 x1="34.561821"
93 y1="17.249048"
94 x2="50.808903"
95 y2="44.769524"
96 id="linearGradient6441"
97 xlink:href="#linearGradient3116"
98 gradientUnits="userSpaceOnUse"
99 gradientTransform="matrix(0.7594396,0,0,0.9967147,-10.445355,1.1420554)" />
100 <radialGradient
101 cx="10.185099"
102 cy="20.631657"
103 r="12.97739"
104 fx="10.185099"
105 fy="20.631657"
106 id="radialGradient6443"
107 xlink:href="#linearGradient2296"
108 gradientUnits="userSpaceOnUse"
109 gradientTransform="matrix(1,0,0,1.3086506,-5.0101896,-15.856636)" />
110 <linearGradient
111 x1="35.321308"
112 y1="24.984463"
113 x2="51.861248"
114 y2="41.370472"
115 id="linearGradient6446"
116 xlink:href="#linearGradient5460"
117 gradientUnits="userSpaceOnUse"
118 gradientTransform="matrix(0.7782624,0,0,1.0030321,-10.791192,0.790029)" />
119 <linearGradient
120 x1="48"
121 y1="18.534204"
122 x2="78"
123 y2="18.534204"
124 id="linearGradient6462"
125 xlink:href="#linearGradient2296"
126 gradientUnits="userSpaceOnUse"
127 gradientTransform="matrix(0.969324,0.303467,-0.313034,0.999884,-26.51354,-28.87764)" />
128 <linearGradient
129 x1="54.287079"
130 y1="9.1136208"
131 x2="68.843483"
132 y2="38.118332"
133 id="linearGradient6475"
134 xlink:href="#linearGradient2296"
135 gradientUnits="userSpaceOnUse"
136 gradientTransform="matrix(0.869923,-0.01268995,0.0134065,0.8761486,-22.672053,-3.4827791)" />
137 <linearGradient
138 x1="34.561821"
139 y1="17.249048"
140 x2="50.808903"
141 y2="44.769524"
142 id="linearGradient6479"
143 xlink:href="#linearGradient3116"
144 gradientUnits="userSpaceOnUse"
145 gradientTransform="matrix(0.7594396,0,0,0.9967147,3.5426311,-4.8841207)" />
146 <radialGradient
147 cx="24.260418"
148 cy="14.132573"
149 r="12.97739"
150 fx="24.260418"
151 fy="14.132573"
152 id="radialGradient6481"
153 xlink:href="#linearGradient2296"
154 gradientUnits="userSpaceOnUse"
155 gradientTransform="matrix(1,0,0,1.3086506,-5.0101896,-13.996654)" />
156 <linearGradient
157 x1="35.321308"
158 y1="24.984463"
159 x2="51.861248"
160 y2="41.370472"
161 id="linearGradient6484"
162 xlink:href="#linearGradient5460"
163 gradientUnits="userSpaceOnUse"
164 gradientTransform="matrix(0.7782624,0,0,1.0030321,3.1969407,-5.2365324)" />
165 <radialGradient
166 cx="4.9929786"
167 cy="43.5"
168 r="2.5"
169 fx="4.9929786"
170 fy="43.5"
171 id="radialGradient6494"
172 xlink:href="#linearGradient3688"
173 gradientUnits="userSpaceOnUse"
174 gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)" />
175 <radialGradient
176 cx="4.9929786"
177 cy="43.5"
178 r="2.5"
179 fx="4.9929786"
180 fy="43.5"
181 id="radialGradient6496"
182 xlink:href="#linearGradient3688"
183 gradientUnits="userSpaceOnUse"
184 gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)" />
185 <linearGradient
186 x1="25.058096"
187 y1="47.027729"
188 x2="25.058096"
189 y2="39.999443"
190 id="linearGradient6498"
191 xlink:href="#linearGradient3702"
192 gradientUnits="userSpaceOnUse" />
193 <radialGradient
194 cx="4.9929786"
195 cy="43.5"
196 r="2.5"
197 fx="4.9929786"
198 fy="43.5"
199 id="radialGradient6500"
200 xlink:href="#linearGradient3688"
201 gradientUnits="userSpaceOnUse"
202 gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)" />
203 <radialGradient
204 cx="4.9929786"
205 cy="43.5"
206 r="2.5"
207 fx="4.9929786"
208 fy="43.5"
209 id="radialGradient6502"
210 xlink:href="#linearGradient3688"
211 gradientUnits="userSpaceOnUse"
212 gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)" />
213 <linearGradient
214 x1="25.058096"
215 y1="47.027729"
216 x2="25.058096"
217 y2="39.999443"
218 id="linearGradient6504"
219 xlink:href="#linearGradient3702"
220 gradientUnits="userSpaceOnUse" />
221 </defs>
222 <g
223 id="g6506">
224 <g
225 transform="matrix(0.7499997,0,0,0.7777785,13.000001,3.4444095)"
226 id="g7130"
227 style="display:inline;enable-background:new">
228 <g
229 transform="translate(-2e-6,2.838692e-5)"
230 id="g7132"
231 style="display:inline">
232 <g
233 transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)"
234 id="g7134"
235 style="opacity:0.4">
236 <rect
237 width="5"
238 height="7"
239 x="38"
240 y="40"
241 id="rect7136"
242 style="fill:url(#radialGradient6500);fill-opacity:1;stroke:none" />
243 <rect
244 width="5"
245 height="7"
246 x="-10"
247 y="-47"
248 transform="scale(-1,-1)"
249 id="rect7138"
250 style="fill:url(#radialGradient6502);fill-opacity:1;stroke:none" />
251 <rect
252 width="28"
253 height="7.0000005"
254 x="10"
255 y="40"
256 id="rect7140"
257 style="fill:url(#linearGradient6504);fill-opacity:1;stroke:none" />
258 </g>
259 </g>
260 </g>
261 <g
262 transform="matrix(0.8008931,-0.1965967,0.211334,0.7450423,5.495629,12.05506)"
263 id="g6536"
264 style="stroke-width:1.25171566;stroke-miterlimit:4;stroke-dasharray:none;display:inline;enable-background:new">
265 <path
266 d="m 11.249051,13.68551 c 11.018461,7.81637 20.073808,0.268022 29.079725,9.104008 L 45.504535,4.7780871 44.31062,2.2533867 19.506897,-5.5996203 16.789787,-4.2944189 11.249051,13.68551 z"
267 id="path6538"
268 style="opacity:0.51648356;fill:url(#linearGradient6462);fill-opacity:1;fill-rule:evenodd;stroke:none" />
269 </g>
270 <rect
271 width="26.953573"
272 height="34.965298"
273 rx="2.6408303"
274 ry="2.5337005"
275 x="17.554857"
276 y="2.4606693"
277 transform="matrix(0.9999984,0.00176942,-0.00167447,0.9999986,0,0)"
278 id="rect6540"
279 style="fill:url(#linearGradient6484);fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new" />
280 <rect
281 width="24.954815"
282 height="32.965771"
283 rx="1.9233968"
284 ry="1.7255259"
285 x="18.554743"
286 y="3.4625199"
287 transform="matrix(0.9999985,0.00174183,-0.00169947,0.9999986,0,0)"
288 id="rect6542"
289 style="fill:url(#linearGradient6479);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient6481);stroke-width:0.99996448;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new" />
290 <path
291 d="m 21.951161,5 c -1.394519,1.252397 -1.959054,1.600817 -1.951078,2.291735 0.0078,0.671645 0.944971,1.243343 1.743486,0.808143 0.09197,0.300782 0.117758,0.637925 -0.31445,0.902343 0.03536,-5.88e-4 1.142614,0 1.142614,0 C 22.179445,8.731151 22.156895,8.382123 22.267649,8.045277 23.162657,8.541166 24.009817,7.972511 23.999914,7.190715 23.989796,6.370975 23.463736,6.118291 21.951161,5 z"
292 id="path6605"
293 style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline;enable-background:new" />
294 <path
295 d="m 19.162723,20.21094 c 11.059278,3.324311 14.140092,-5.299829 23.835482,-0.638828 L 42.977788,4.674206 C 42.984918,3.831408 42.582244,3.270255 41.333713,3.286119 L 20.860821,2.998205 c -1.175326,-0.003 -1.90726,0.995496 -1.860501,1.74796 l 0.162403,15.464775 z"
296 id="path6546"
297 style="opacity:0.51648356;fill:url(#linearGradient6475);fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline;enable-background:new" />
298 <path
299 d="m 30.830522,14 c -4.88186,4.38165 -6.858151,5.60064 -6.830231,8.017892 0.02715,2.349826 3.308101,4.349977 6.103501,2.827382 0.32197,1.052316 0.41224,2.231852 -1.10081,3.156947 0.12379,-0.0021 4,0 4,0 -1.3733,-0.948368 -1.45224,-2.169484 -1.06452,-3.347976 3.1332,1.734923 6.09889,-0.254581 6.06422,-2.989781 -0.03542,-2.867952 -1.87702,-3.752 -7.17216,-7.664464 z"
300 id="path3059"
301 style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:none" />
302 <path
303 d="m 39.951161,35 c -1.394519,-1.252397 -1.959054,-1.600817 -1.951078,-2.291735 0.0078,-0.671645 0.944971,-1.243343 1.743486,-0.808143 0.09197,-0.300782 0.117758,-0.637925 -0.31445,-0.902343 0.03536,5.88e-4 1.142614,0 1.142614,0 -0.392288,0.27107 -0.414838,0.620098 -0.304084,0.956944 0.895008,-0.495889 1.742168,0.07277 1.732265,0.854562 -0.01012,0.81974 -0.536178,1.072424 -2.048753,2.190715 z"
304 id="path6607"
305 style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline;enable-background:new" />
306 <g
307 transform="matrix(0.7499997,0,0,0.7777787,-0.9999988,9.4444028)"
308 id="g7056">
309 <g
310 transform="translate(-2e-6,2.838692e-5)"
311 id="g2033"
312 style="display:inline">
313 <g
314 transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)"
315 id="g3712"
316 style="opacity:0.4">
317 <rect
318 width="5"
319 height="7"
320 x="38"
321 y="40"
322 id="rect2801"
323 style="fill:url(#radialGradient6494);fill-opacity:1;stroke:none" />
324 <rect
325 width="5"
326 height="7"
327 x="-10"
328 y="-47"
329 transform="scale(-1,-1)"
330 id="rect3696"
331 style="fill:url(#radialGradient6496);fill-opacity:1;stroke:none" />
332 <rect
333 width="28"
334 height="7.0000005"
335 x="10"
336 y="40"
337 id="rect3700"
338 style="fill:url(#linearGradient6498);fill-opacity:1;stroke:none" />
339 </g>
340 </g>
341 </g>
342 <g
343 transform="matrix(0.8008931,-0.1965967,0.211334,0.7450423,-8.5025753,18.056862)"
344 id="g3042"
345 style="stroke-width:1.25171566;stroke-miterlimit:4;stroke-dasharray:none">
346 <path
347 d="m 11.249051,13.68551 c 11.018461,7.81637 20.073808,0.268022 29.079725,9.104008 L 45.504535,4.7780871 44.31062,2.2533867 19.506897,-5.5996203 16.789787,-4.2944189 11.249051,13.68551 z"
348 id="path3055"
349 style="opacity:0.51648356;fill:url(#linearGradient6424);fill-opacity:1;fill-rule:evenodd;stroke:none" />
350 </g>
351 <rect
352 width="26.953573"
353 height="34.965298"
354 rx="2.6408303"
355 ry="2.5337005"
356 x="3.5667241"
357 y="8.4872303"
358 transform="matrix(0.9999984,0.00176942,-0.00167447,0.9999986,0,0)"
359 id="rect7756"
360 style="fill:url(#linearGradient6446);fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
361 <rect
362 width="24.954815"
363 height="32.965771"
364 rx="1.9233968"
365 ry="1.7255256"
366 x="4.5667577"
367 y="9.4886971"
368 transform="matrix(0.9999985,0.00174183,-0.00169947,0.9999986,0,0)"
369 id="rect7758"
370 style="fill:url(#linearGradient6441);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient6443);stroke-width:0.99996436;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
371 <path
372 d="m 16.919494,22.373916 c 3.009357,-3.135065 7.118326,-0.218362 7.080243,2.765938 C 23.964923,27.868024 21.9793,29.166823 16.9851,34 11.792986,29.465022 9.961597,28.416744 10.000609,25.179852 c 0.03943,-3.350675 3.57545,-5.851566 6.918885,-2.805936 z"
373 id="path920"
374 style="fill:#c00;fill-opacity:1;fill-rule:evenodd;stroke:none" />
375 <path
376 d="m 7.976998,11.422743 c 0.859817,-0.964635 2.033808,-0.06719 2.022927,0.851058 C 9.989978,13.113238 9.422657,13.512869 7.995743,15 6.512282,13.604622 5.989028,13.282075 6.000174,12.286108 6.011441,11.255131 7.021731,10.485627 7.976998,11.422743 z"
377 id="path6639"
378 style="fill:#c00;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline;enable-background:new" />
379 <path
380 d="M 5.164518,26.212742 C 16.223796,29.537053 19.30461,20.912913 29,25.573914 L 28.979583,10.676008 C 28.986713,9.83321 28.584039,9.272057 27.335508,9.287921 L 6.862616,9.000007 c -1.175326,-0.003 -1.9072592,0.995496 -1.860501,1.74796 l 0.162403,15.464775 z"
381 id="path3820"
382 style="opacity:0.51648356;fill:url(#linearGradient6436);fill-opacity:1;fill-rule:evenodd;stroke:none" />
383 <path
384 d="m 25.976998,40.577257 c 0.859817,0.964635 2.033808,0.06719 2.022927,-0.851058 C 27.989978,38.886762 27.422657,38.487131 25.995743,37 c -1.483461,1.395378 -2.006715,1.717925 -1.995569,2.713892 0.01127,1.030977 1.021557,1.800481 1.976824,0.863365 z"
385 id="path6641"
386 style="fill:#c00;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline;enable-background:new" />
387 </g>
388</svg>
0389
=== added file 'slides/games.html'
--- slides/games.html 1970-01-01 00:00:00 +0000
+++ slides/games.html 2009-12-04 15:44:10 +0000
@@ -0,0 +1,13 @@
1<h1 class="title">Many games for Ubuntu</h1>
2
3<div class="main">
4
5<div class="content"><ul>
6<li>Spend your free time witch many games bundled with Ubuntu: Solitaire, Tetris, For-in-a-row and more!</li>
7<li>Many games are avilable in the Software Center</li>
8<li>Run your Windows games using Wine</li>
9
10</div>
11
12<img class="icon" src="icons/games.png" alt="" />
13
014
=== modified file 'slides/index.html'
--- slides/index.html 2009-10-24 15:54:37 +0000
+++ slides/index.html 2009-12-04 15:44:11 +0000
@@ -36,6 +36,7 @@
36 <div><a href="openoffice.html" class="load"></a></div>36 <div><a href="openoffice.html" class="load"></a></div>
37 <div><a href="accessibility.html" class="load"></a></div>37 <div><a href="accessibility.html" class="load"></a></div>
38 <div><a href="installing-software.html" class="load"></a></div>38 <div><a href="installing-software.html" class="load"></a></div>
39 <div><a href="games.html" class="load"></a></div>
39 <div><a href="ubuntuone.html" class="load"></a></div>40 <div><a href="ubuntuone.html" class="load"></a></div>
40 <div><a href="documentation.html" class="load"></a></div>41 <div><a href="documentation.html" class="load"></a></div>
41 </div>42 </div>

Subscribers

People subscribed via source and target branches