Merge lp:~apachelogger/ubiquity/breezeification into lp:ubiquity

Proposed by Harald Sitter on 2015-09-09
Status: Merged
Merged at revision: 6319
Proposed branch: lp:~apachelogger/ubiquity/breezeification
Merge into: lp:ubiquity
Diff against target: 2622 lines (+2321/-68)
12 files modified
bin/ubiquity-dm (+20/-0)
data/icons/48x48/apps/ubiquity-kde.svg (+318/-0)
data/icons/Makefile.am (+6/-6)
debian/changelog (+7/-0)
gui/qt/app.ui (+12/-28)
gui/qt/images/source/kubuntu-install.svg (+1016/-0)
gui/qt/images/source/kubuntu-live.svg (+849/-0)
gui/qt/stepKeyboardConf.ui (+54/-23)
gui/qt/stepUserSetup.ui (+8/-2)
gui/qt/style.qss (+2/-2)
ubiquity/frontend/kde_ui.py (+7/-0)
ubiquity/qtwidgets.py (+22/-7)
To merge this branch: bzr merge lp:~apachelogger/ubiquity/breezeification
Reviewer Review Type Date Requested Status
Jonathan Riddell 2015-09-09 Pending
Ubuntu Installer Team 2015-09-09 Pending
Review via email: mp+270549@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/ubiquity-dm'
2--- bin/ubiquity-dm 2015-08-31 16:30:49 +0000
3+++ bin/ubiquity-dm 2015-09-09 14:58:25 +0000
4@@ -596,6 +596,8 @@
5 stdin=null, stdout=logfile, stderr=logfile,
6 preexec_fn=self.drop_privileges))
7 elif self.frontend == 'kde_ui':
8+ # Force Qt5 KDE theming to load for kwin and friends.
9+ os.environ["QT_QPA_PLATFORMTHEME"] = "kde"
10 if 'access=v1' not in proc_cmdline:
11 log('paint background')
12 path = \
13@@ -607,6 +609,24 @@
14
15 log("add_ubiquity_kdedir")
16 add_ubiquity_kdedir()
17+ log('start kde4breeze')
18+ if osextras.find_on_path('kf5-config'):
19+ output = subprocess.check_output(
20+ ['kf5-config', '--path', 'lib'],
21+ preexec_fn=self.drop_privileges)
22+ output = output.decode()
23+ output = output.replace('\n', '')
24+ output = output.split(':')[1]
25+ breeze = subprocess.Popen(
26+ [output + '/kconf_update_bin/kde4breeze'],
27+ stdin=null, stdout=logfile, stderr=logfile,
28+ preexec_fn=self.drop_privileges)
29+ ret = breeze.wait()
30+ log('kde4breeze exited with code {}'.format(ret))
31+ if ret != 0:
32+ raise
33+ else:
34+ raise
35 log('start kwin')
36 if osextras.find_on_path('kwin'):
37 wm_cmd = ['kwin']
38
39=== removed file 'data/icons/128x128/apps/ubiquity-kde.png'
40Binary files data/icons/128x128/apps/ubiquity-kde.png 2013-07-11 18:23:07 +0000 and data/icons/128x128/apps/ubiquity-kde.png 1970-01-01 00:00:00 +0000 differ
41=== added symlink 'data/icons/128x128/apps/ubiquity-kde.svg'
42=== target is u'../../48x48/apps/ubiquity-kde.svg'
43=== removed file 'data/icons/16x16/apps/ubiquity-kde.png'
44Binary files data/icons/16x16/apps/ubiquity-kde.png 2013-07-11 18:23:07 +0000 and data/icons/16x16/apps/ubiquity-kde.png 1970-01-01 00:00:00 +0000 differ
45=== added symlink 'data/icons/16x16/apps/ubiquity-kde.svg'
46=== target is u'../../48x48/apps/ubiquity-kde.svg'
47=== removed file 'data/icons/22x22/apps/ubiquity-kde.png'
48Binary files data/icons/22x22/apps/ubiquity-kde.png 2013-07-11 18:23:07 +0000 and data/icons/22x22/apps/ubiquity-kde.png 1970-01-01 00:00:00 +0000 differ
49=== added symlink 'data/icons/22x22/apps/ubiquity-kde.svg'
50=== target is u'../../48x48/apps/ubiquity-kde.svg'
51=== added symlink 'data/icons/24x24/apps/ubiquity-kde.svg'
52=== target is u'../../48x48/apps/ubiquity-kde.svg'
53=== removed file 'data/icons/32x32/apps/ubiquity-kde.png'
54Binary files data/icons/32x32/apps/ubiquity-kde.png 2013-07-11 18:23:07 +0000 and data/icons/32x32/apps/ubiquity-kde.png 1970-01-01 00:00:00 +0000 differ
55=== added symlink 'data/icons/32x32/apps/ubiquity-kde.svg'
56=== target is u'../../48x48/apps/ubiquity-kde.svg'
57=== removed file 'data/icons/48x48/apps/ubiquity-kde.png'
58Binary files data/icons/48x48/apps/ubiquity-kde.png 2013-07-11 18:23:07 +0000 and data/icons/48x48/apps/ubiquity-kde.png 1970-01-01 00:00:00 +0000 differ
59=== added file 'data/icons/48x48/apps/ubiquity-kde.svg'
60--- data/icons/48x48/apps/ubiquity-kde.svg 1970-01-01 00:00:00 +0000
61+++ data/icons/48x48/apps/ubiquity-kde.svg 2015-09-09 14:58:25 +0000
62@@ -0,0 +1,318 @@
63+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
64+<!-- Created with Inkscape (http://www.inkscape.org/) -->
65+
66+<svg
67+ xmlns:dc="http://purl.org/dc/elements/1.1/"
68+ xmlns:cc="http://creativecommons.org/ns#"
69+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
70+ xmlns:svg="http://www.w3.org/2000/svg"
71+ xmlns="http://www.w3.org/2000/svg"
72+ xmlns:xlink="http://www.w3.org/1999/xlink"
73+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
74+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
75+ width="48"
76+ height="48"
77+ id="svg5453"
78+ version="1.1"
79+ inkscape:version="0.91 r13725"
80+ sodipodi:docname="ubiquity.svg"
81+ inkscape:export-filename="/home/jamboarder/Projects/KDE VDG/Calamares/calamares-icon-2.png"
82+ inkscape:export-xdpi="90"
83+ inkscape:export-ydpi="90">
84+ <defs
85+ id="defs5455">
86+ <linearGradient
87+ id="linearGradient5623">
88+ <stop
89+ id="stop5625"
90+ offset="0"
91+ style="stop-color:#d35400;stop-opacity:1;" />
92+ <stop
93+ style="stop-color:#d35400;stop-opacity:1;"
94+ offset="1"
95+ id="stop5627" />
96+ </linearGradient>
97+ <linearGradient
98+ id="linearGradient3819">
99+ <stop
100+ style="stop-color:#eff0f1;stop-opacity:1;"
101+ offset="0"
102+ id="stop3821" />
103+ <stop
104+ style="stop-color:#bdc3c7;stop-opacity:1;"
105+ offset="1"
106+ id="stop3823" />
107+ </linearGradient>
108+ <linearGradient
109+ inkscape:collect="always"
110+ xlink:href="#linearGradient3819"
111+ id="linearGradient3825"
112+ x1="24"
113+ y1="20"
114+ x2="24"
115+ y2="43.999973"
116+ gradientUnits="userSpaceOnUse"
117+ gradientTransform="translate(384.57143,499.798)" />
118+ <linearGradient
119+ inkscape:collect="always"
120+ xlink:href="#linearGradient4227"
121+ id="linearGradient3843"
122+ x1="10"
123+ y1="36"
124+ x2="15"
125+ y2="41"
126+ gradientUnits="userSpaceOnUse"
127+ gradientTransform="translate(384.57143,500.798)" />
128+ <linearGradient
129+ inkscape:collect="always"
130+ xlink:href="#linearGradient4227"
131+ id="linearGradient3847"
132+ gradientUnits="userSpaceOnUse"
133+ x1="9.9047623"
134+ y1="36"
135+ x2="14.90477"
136+ y2="41.000008"
137+ gradientTransform="translate(398.66666,500.798)" />
138+ <linearGradient
139+ inkscape:collect="always"
140+ xlink:href="#linearGradient5623"
141+ id="linearGradient3948"
142+ x1="25.065147"
143+ y1="33.843651"
144+ x2="25"
145+ y2="10"
146+ gradientUnits="userSpaceOnUse"
147+ gradientTransform="matrix(1,0,0,1.0833332,384.57143,492.96467)" />
148+ <linearGradient
149+ inkscape:collect="always"
150+ xlink:href="#linearGradient4227"
151+ id="linearGradient3080"
152+ gradientUnits="userSpaceOnUse"
153+ gradientTransform="matrix(1.3793103,0,0,1.3793103,384.81281,499.0393)"
154+ x1="8.5250006"
155+ y1="7.8000579"
156+ x2="25.200001"
157+ y2="25.200058" />
158+ <linearGradient
159+ id="linearGradient4227"
160+ inkscape:collect="always">
161+ <stop
162+ id="stop4229"
163+ offset="0"
164+ style="stop-color:#292c2f;stop-opacity:1" />
165+ <stop
166+ id="stop4231"
167+ offset="1"
168+ style="stop-color:#000000;stop-opacity:0;" />
169+ </linearGradient>
170+ </defs>
171+ <sodipodi:namedview
172+ id="base"
173+ pagecolor="#ffffff"
174+ bordercolor="#666666"
175+ borderopacity="1.0"
176+ inkscape:pageopacity="0"
177+ inkscape:pageshadow="2"
178+ inkscape:zoom="10.854086"
179+ inkscape:cx="15.323054"
180+ inkscape:cy="18.776517"
181+ inkscape:document-units="px"
182+ inkscape:current-layer="layer1"
183+ showgrid="true"
184+ fit-margin-top="0"
185+ fit-margin-left="0"
186+ fit-margin-right="0"
187+ fit-margin-bottom="0"
188+ inkscape:window-width="1920"
189+ inkscape:window-height="1021"
190+ inkscape:window-x="-4"
191+ inkscape:window-y="0"
192+ inkscape:window-maximized="1"
193+ inkscape:showpageshadow="false"
194+ borderlayer="true"
195+ showguides="true"
196+ inkscape:snap-global="true"
197+ inkscape:snap-nodes="true"
198+ inkscape:snap-bbox="true"
199+ inkscape:bbox-nodes="true"
200+ inkscape:object-nodes="true">
201+ <inkscape:grid
202+ type="xygrid"
203+ id="grid4063"
204+ empspacing="4"
205+ visible="true"
206+ enabled="true"
207+ snapvisiblegridlinesonly="true" />
208+ <sodipodi:guide
209+ position="1.1650391e-05,47.999996"
210+ orientation="4,0"
211+ id="guide4146" />
212+ <sodipodi:guide
213+ position="1.1650391e-05,43.999996"
214+ orientation="0,48"
215+ id="guide4148" />
216+ <sodipodi:guide
217+ position="48.000012,43.999996"
218+ orientation="-4,0"
219+ id="guide4150" />
220+ <sodipodi:guide
221+ position="1.1650391e-05,4.0000264"
222+ orientation="4,0"
223+ id="guide4154" />
224+ <sodipodi:guide
225+ position="1.1650391e-05,2.6367188e-05"
226+ orientation="0,48"
227+ id="guide4156" />
228+ <sodipodi:guide
229+ position="48.000012,2.6367188e-05"
230+ orientation="-4,0"
231+ id="guide4158" />
232+ <sodipodi:guide
233+ position="48.000012,4.0000264"
234+ orientation="0,-48"
235+ id="guide4160" />
236+ <sodipodi:guide
237+ position="48.000012,48.000026"
238+ orientation="0,-4"
239+ id="guide4162" />
240+ <sodipodi:guide
241+ position="44.000012,48.000026"
242+ orientation="48,0"
243+ id="guide4164" />
244+ <sodipodi:guide
245+ position="44.000012,2.6367188e-05"
246+ orientation="0,4"
247+ id="guide4166" />
248+ <sodipodi:guide
249+ position="48.000012,2.6367188e-05"
250+ orientation="-48,0"
251+ id="guide4168" />
252+ <sodipodi:guide
253+ position="4.0000422,48.000026"
254+ orientation="0,-4"
255+ id="guide4170" />
256+ <sodipodi:guide
257+ position="4.2167969e-05,48.000026"
258+ orientation="48,0"
259+ id="guide4172" />
260+ <sodipodi:guide
261+ position="4.2167969e-05,2.6367188e-05"
262+ orientation="0,4"
263+ id="guide4174" />
264+ <sodipodi:guide
265+ position="4.0000422,2.6367188e-05"
266+ orientation="-48,0"
267+ id="guide4176" />
268+ <sodipodi:guide
269+ position="4.0000117,47.999996"
270+ orientation="43.999969,0"
271+ id="guide4638" />
272+ <sodipodi:guide
273+ position="4.0000117,4.0000264"
274+ orientation="0,20"
275+ id="guide4640" />
276+ <sodipodi:guide
277+ position="24.000012,47.999996"
278+ orientation="0,-20"
279+ id="guide4644" />
280+ <sodipodi:guide
281+ position="4.0000422,24.000026"
282+ orientation="20,0"
283+ id="guide4666" />
284+ <sodipodi:guide
285+ position="4.0000422,4.0000264"
286+ orientation="0,39.999969"
287+ id="guide4668" />
288+ <sodipodi:guide
289+ position="44.000012,4.0000264"
290+ orientation="-20,0"
291+ id="guide4670" />
292+ </sodipodi:namedview>
293+ <metadata
294+ id="metadata5458">
295+ <rdf:RDF>
296+ <cc:Work
297+ rdf:about="">
298+ <dc:format>image/svg+xml</dc:format>
299+ <dc:type
300+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
301+ <dc:title />
302+ </cc:Work>
303+ </rdf:RDF>
304+ </metadata>
305+ <g
306+ inkscape:label="Capa 1"
307+ inkscape:groupmode="layer"
308+ id="layer1"
309+ transform="translate(-384.57143,-499.798)">
310+ <rect
311+ style="fill:url(#linearGradient3948);fill-opacity:1;stroke:none"
312+ id="rect3936"
313+ width="32"
314+ height="25.999996"
315+ x="392.57144"
316+ y="503.798"
317+ ry="0" />
318+ <path
319+ style="opacity:0.2;fill:#232629;fill-opacity:1;stroke:none"
320+ d="m 408.57143,533.798 c -1.662,0 -3,1.338 -3,3 0,1.662 1.338,3 3,3 1.30536,0 2.39817,-0.84052 2.8125,-2 l 8.375,0 c 0.41433,1.15948 1.50714,2 2.8125,2 1.662,0 3,-1.338 3,-3 0,-1.662 -1.338,-3 -3,-3 -1.30536,0 -2.39817,0.84052 -2.8125,2 l -8.375,0 c -0.41433,-1.15948 -1.50714,-2 -2.8125,-2 z"
321+ id="path3911"
322+ inkscape:connector-curvature="0" />
323+ <path
324+ style="fill:url(#linearGradient3825);fill-opacity:1;stroke:none"
325+ d="m 388.57144,529.798 -10e-6,14 40,0 10e-6,-14 z"
326+ id="rect3804"
327+ inkscape:connector-curvature="0"
328+ sodipodi:nodetypes="ccccc" />
329+ <path
330+ inkscape:connector-curvature="0"
331+ id="path3829"
332+ d="m 411.38393,537.798 8.375,0 c 0.41433,1.15948 1.50714,2 2.8125,2 1.662,0 3,-1.338 3,-3 0,-1.662 -1.338,-3 -3,-3 -1.30536,0 -2.39817,0.84052 -2.8125,2 l -8.375,0 c 0.1875,1 0.1875,1 0,2 z"
333+ style="opacity:0.77876108;fill:#4d4d4d;fill-opacity:1;stroke:none"
334+ sodipodi:nodetypes="ccsssccc" />
335+ <path
336+ sodipodi:nodetypes="ccccc"
337+ inkscape:connector-curvature="0"
338+ id="path3845"
339+ d="m 406.66666,539.13133 4.76191,4.66667 8.14286,0 -9.14286,-9.42857 z"
340+ style="opacity:0.2;fill:url(#linearGradient3847);fill-opacity:1.0;stroke:none" />
341+ <path
342+ style="opacity:0.2;fill:url(#linearGradient3843);fill-opacity:1.0;stroke:none"
343+ d="m 392.57143,539.13133 4.61905,4.66667 13.38095,0 -4.86671,-6.9365 -7.13329,-0.0675 -2.23809,-2.42461 z"
344+ id="path3835"
345+ inkscape:connector-curvature="0"
346+ sodipodi:nodetypes="ccccccc" />
347+ <path
348+ style="fill:#d35400;fill-opacity:1;stroke:none"
349+ d="m 394.57143,533.798 c -1.662,0 -3,1.338 -3,3 0,1.662 1.338,3 3,3 1.30536,0 2.39817,-0.84052 2.8125,-2 l 8.375,0 c 0.41433,1.15948 1.50714,2 2.8125,2 1.662,0 3,-1.338 3,-3 0,-1.662 -1.338,-3 -3,-3 -1.30536,0 -2.39817,0.84052 -2.8125,2 l -8.375,0 c -0.41433,-1.15948 -1.50714,-2 -2.8125,-2 z"
350+ id="rect3812"
351+ inkscape:connector-curvature="0" />
352+ <rect
353+ ry="0"
354+ y="542.79797"
355+ x="388.57147"
356+ height="0.99997008"
357+ width="39.999954"
358+ id="rect3827"
359+ style="fill:#95a5a6;fill-opacity:1;stroke:none" />
360+ <rect
361+ style="fill:#eff0f1;fill-opacity:1;stroke:none"
362+ id="rect3855"
363+ width="39.999969"
364+ height="1.0000263"
365+ x="388.57147"
366+ y="529.79797"
367+ ry="0" />
368+ <path
369+ inkscape:connector-curvature="0"
370+ style="opacity:0.2;fill:url(#linearGradient3080);fill-opacity:1;fill-rule:evenodd;stroke:none"
371+ d="m 409.57143,513.798 0,1 -1,9 20.00001,19 0,0 0,0 -10e-6,-1 10e-6,-13 -19.00001,-19 z"
372+ id="path4184"
373+ sodipodi:nodetypes="cccccccccc" />
374+ <path
375+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#fcfcfc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
376+ d="m 407.57143,509.798 0,10 -4.5,-4.5 -1.5,1.5 7,7 7,-7 -1.5,-1.5 -4.5,4.5 0,-10 -2,0 z"
377+ id="path3938"
378+ inkscape:connector-curvature="0" />
379+ </g>
380+</svg>
381
382=== removed file 'data/icons/64x64/apps/ubiquity-kde.png'
383Binary files data/icons/64x64/apps/ubiquity-kde.png 2013-07-11 18:23:07 +0000 and data/icons/64x64/apps/ubiquity-kde.png 1970-01-01 00:00:00 +0000 differ
384=== added symlink 'data/icons/64x64/apps/ubiquity-kde.svg'
385=== target is u'../../48x48/apps/ubiquity-kde.svg'
386=== modified file 'data/icons/Makefile.am'
387--- data/icons/Makefile.am 2013-07-11 18:23:07 +0000
388+++ data/icons/Makefile.am 2015-09-09 14:58:25 +0000
389@@ -1,17 +1,17 @@
390 icon16dir = $(datadir)/icons/hicolor/16x16/apps
391-icon16_DATA = 16x16/apps/ubiquity.svg 16x16/apps/ubiquity-kde.png
392+icon16_DATA = 16x16/apps/ubiquity.svg 16x16/apps/ubiquity-kde.svg
393 icon22dir = $(datadir)/icons/hicolor/22x22/apps
394-icon22_DATA = 22x22/apps/ubiquity.svg 22x22/apps/ubiquity-kde.png
395+icon22_DATA = 22x22/apps/ubiquity.svg 22x22/apps/ubiquity-kde.svg
396 icon24dir = $(datadir)/icons/hicolor/24x24/apps
397 icon24_DATA = 24x24/apps/ubiquity.svg
398 icon32dir = $(datadir)/icons/hicolor/32x32/apps
399-icon32_DATA = 32x32/apps/ubiquity.svg 32x32/apps/ubiquity-kde.png
400+icon32_DATA = 32x32/apps/ubiquity.svg 32x32/apps/ubiquity-kde.svg
401 icon48dir = $(datadir)/icons/hicolor/48x48/apps
402-icon48_DATA = 48x48/apps/ubiquity.svg 48x48/apps/ubiquity-kde.png
403+icon48_DATA = 48x48/apps/ubiquity.svg 48x48/apps/ubiquity-kde.svg
404 icon64dir = $(datadir)/icons/hicolor/64x64/apps
405-icon64_DATA = 64x64/apps/ubiquity.svg 64x64/apps/ubiquity-kde.png
406+icon64_DATA = 64x64/apps/ubiquity.svg 64x64/apps/ubiquity-kde.svg
407 icon128dir = $(datadir)/icons/hicolor/128x128/apps
408-icon128_DATA = 128x128/apps/ubiquity-kde.png
409+icon128_DATA = 128x128/apps/ubiquity-kde.svg
410 icon_files = \
411 $(icon16_DATA) \
412 $(icon22_DATA) \
413
414=== modified file 'debian/changelog'
415--- debian/changelog 2015-09-08 16:15:03 +0000
416+++ debian/changelog 2015-09-09 14:58:25 +0000
417@@ -1,3 +1,10 @@
418+ubiquity (2.21.29) UNRELEASED; urgency=medium
419+
420+ * Refine KDE ui with slight changes to artwork and layout to improve visual
421+ integration with the overall desing of Breeze styled applications
422+
423+ -- Harald Sitter <sitter@kde.org> Wed, 09 Sep 2015 11:00:10 +0200
424+
425 ubiquity (2.21.28) wily; urgency=medium
426
427 [ Sean Davis ]
428
429=== modified file 'gui/qt/app.ui'
430--- gui/qt/app.ui 2014-04-17 16:13:47 +0000
431+++ gui/qt/app.ui 2015-09-09 14:58:25 +0000
432@@ -6,7 +6,7 @@
433 <rect>
434 <x>0</x>
435 <y>0</y>
436- <width>505</width>
437+ <width>573</width>
438 <height>534</height>
439 </rect>
440 </property>
441@@ -29,10 +29,7 @@
442 <verstretch>0</verstretch>
443 </sizepolicy>
444 </property>
445- <layout class="QHBoxLayout" name="horizontalLayout">
446- <property name="margin">
447- <number>0</number>
448- </property>
449+ <layout class="QHBoxLayout" name="horizontalLayout_8">
450 <item>
451 <widget class="QStackedWidget" name="progress_stack">
452 <property name="sizePolicy">
453@@ -47,6 +44,16 @@
454 <number>0</number>
455 </property>
456 <item>
457+ <widget class="QPushButton" name="quit">
458+ <property name="text">
459+ <string>Quit</string>
460+ </property>
461+ <property name="autoDefault">
462+ <bool>true</bool>
463+ </property>
464+ </widget>
465+ </item>
466+ <item>
467 <widget class="QProgressBar" name="progressBar">
468 <property name="value">
469 <number>24</number>
470@@ -224,29 +231,6 @@
471 <property name="margin">
472 <number>0</number>
473 </property>
474- <item>
475- <widget class="QPushButton" name="quit">
476- <property name="text">
477- <string>Quit</string>
478- </property>
479- <property name="autoDefault">
480- <bool>true</bool>
481- </property>
482- </widget>
483- </item>
484- <item>
485- <spacer name="horizontalSpacer">
486- <property name="orientation">
487- <enum>Qt::Horizontal</enum>
488- </property>
489- <property name="sizeHint" stdset="0">
490- <size>
491- <width>40</width>
492- <height>20</height>
493- </size>
494- </property>
495- </spacer>
496- </item>
497 </layout>
498 </widget>
499 </item>
500
501=== added file 'gui/qt/images/branding.svgz'
502Binary files gui/qt/images/branding.svgz 1970-01-01 00:00:00 +0000 and gui/qt/images/branding.svgz 2015-09-09 14:58:25 +0000 differ
503=== modified file 'gui/qt/images/breadcrumb_ltr.png'
504Binary files gui/qt/images/breadcrumb_ltr.png 2013-02-28 06:42:46 +0000 and gui/qt/images/breadcrumb_ltr.png 2015-09-09 14:58:25 +0000 differ
505=== modified file 'gui/qt/images/breadcrumb_rtl.png'
506Binary files gui/qt/images/breadcrumb_rtl.png 2013-02-28 06:42:46 +0000 and gui/qt/images/breadcrumb_rtl.png 2015-09-09 14:58:25 +0000 differ
507=== modified file 'gui/qt/images/install.png'
508Binary files gui/qt/images/install.png 2013-03-22 15:15:10 +0000 and gui/qt/images/install.png 2015-09-09 14:58:25 +0000 differ
509=== modified file 'gui/qt/images/main.png'
510Binary files gui/qt/images/main.png 2013-02-26 15:50:04 +0000 and gui/qt/images/main.png 2015-09-09 14:58:25 +0000 differ
511=== modified file 'gui/qt/images/sidebar.png'
512Binary files gui/qt/images/sidebar.png 2013-02-26 15:50:04 +0000 and gui/qt/images/sidebar.png 2015-09-09 14:58:25 +0000 differ
513=== modified file 'gui/qt/images/sidebar_shadow_ltr.png'
514Binary files gui/qt/images/sidebar_shadow_ltr.png 2013-02-28 06:42:46 +0000 and gui/qt/images/sidebar_shadow_ltr.png 2015-09-09 14:58:25 +0000 differ
515=== modified file 'gui/qt/images/sidebar_shadow_rtl.png'
516Binary files gui/qt/images/sidebar_shadow_rtl.png 2013-02-28 06:42:46 +0000 and gui/qt/images/sidebar_shadow_rtl.png 2015-09-09 14:58:25 +0000 differ
517=== added file 'gui/qt/images/source/breadcrumb_ltr.xcf'
518Binary files gui/qt/images/source/breadcrumb_ltr.xcf 1970-01-01 00:00:00 +0000 and gui/qt/images/source/breadcrumb_ltr.xcf 2015-09-09 14:58:25 +0000 differ
519=== added file 'gui/qt/images/source/kubuntu-install.svg'
520--- gui/qt/images/source/kubuntu-install.svg 1970-01-01 00:00:00 +0000
521+++ gui/qt/images/source/kubuntu-install.svg 2015-09-09 14:58:25 +0000
522@@ -0,0 +1,1016 @@
523+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
524+<!-- Created with Inkscape (http://www.inkscape.org/) -->
525+
526+<svg
527+ xmlns:dc="http://purl.org/dc/elements/1.1/"
528+ xmlns:cc="http://creativecommons.org/ns#"
529+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
530+ xmlns:svg="http://www.w3.org/2000/svg"
531+ xmlns="http://www.w3.org/2000/svg"
532+ xmlns:xlink="http://www.w3.org/1999/xlink"
533+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
534+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
535+ width="128"
536+ height="128"
537+ id="svg5453"
538+ version="1.1"
539+ inkscape:version="0.91 r13725"
540+ sodipodi:docname="kubuntu-install.svg">
541+ <defs
542+ id="defs5455">
543+ <linearGradient
544+ id="linearGradient4400"
545+ inkscape:collect="always">
546+ <stop
547+ id="stop4402"
548+ offset="0"
549+ style="stop-color:#020303;stop-opacity:1" />
550+ <stop
551+ id="stop4404"
552+ offset="1"
553+ style="stop-color:#424649;stop-opacity:0" />
554+ </linearGradient>
555+ <linearGradient
556+ inkscape:collect="always"
557+ id="linearGradient4303">
558+ <stop
559+ style="stop-color:#c6cdd1;stop-opacity:1"
560+ offset="0"
561+ id="stop4305" />
562+ <stop
563+ style="stop-color:#e0e5e7;stop-opacity:1"
564+ offset="1"
565+ id="stop4307" />
566+ </linearGradient>
567+ <linearGradient
568+ inkscape:collect="always"
569+ xlink:href="#linearGradient4400"
570+ id="linearGradient4388"
571+ x1="12.000004"
572+ y1="63.999996"
573+ x2="72"
574+ y2="123.99999"
575+ gradientUnits="userSpaceOnUse"
576+ gradientTransform="translate(12,0)" />
577+ <linearGradient
578+ id="linearGradient4159"
579+ inkscape:collect="always">
580+ <stop
581+ id="stop4161"
582+ offset="0"
583+ style="stop-color:#2a2c2f;stop-opacity:1" />
584+ <stop
585+ id="stop4163"
586+ offset="1"
587+ style="stop-color:#424649;stop-opacity:1" />
588+ </linearGradient>
589+ <linearGradient
590+ gradientTransform="matrix(2.1666662,0,0,2.1818184,-476.66648,-623.39782)"
591+ inkscape:collect="always"
592+ xlink:href="#linearGradient4159"
593+ id="linearGradient4250"
594+ x1="409.57144"
595+ y1="536.79797"
596+ x2="409.57144"
597+ y2="503.798"
598+ gradientUnits="userSpaceOnUse" />
599+ <linearGradient
600+ inkscape:collect="always"
601+ xlink:href="#linearGradient4303"
602+ id="linearGradient4272"
603+ x1="408.57144"
604+ y1="547.79797"
605+ x2="408.57144"
606+ y2="536.79797"
607+ gradientUnits="userSpaceOnUse"
608+ gradientTransform="matrix(2.3333348,0,0,2.1818184,-544.76245,-619.39781)" />
609+ <linearGradient
610+ inkscape:collect="always"
611+ id="linearGradient4591">
612+ <stop
613+ style="stop-color:#7e8f9e;stop-opacity:1"
614+ offset="0"
615+ id="stop4593" />
616+ <stop
617+ style="stop-color:#84ced5;stop-opacity:1"
618+ offset="1"
619+ id="stop4595" />
620+ </linearGradient>
621+ <linearGradient
622+ inkscape:collect="always"
623+ xlink:href="#linearGradient4591"
624+ id="linearGradient4597-5"
625+ x1="419.57144"
626+ y1="541.79797"
627+ x2="419.57144"
628+ y2="489.798"
629+ gradientUnits="userSpaceOnUse"
630+ gradientTransform="matrix(2.1742158,0,0,2.2000004,-509.31194,-615.75782)" />
631+ <linearGradient
632+ inkscape:collect="always"
633+ xlink:href="#linearGradient4675"
634+ id="linearGradient4681"
635+ x1="394.57144"
636+ y1="535.79797"
637+ x2="404.57144"
638+ y2="522.79797"
639+ gradientUnits="userSpaceOnUse"
640+ gradientTransform="matrix(2.1999994,0,0,2.2857128,-519.48547,-661.16809)" />
641+ <linearGradient
642+ inkscape:collect="always"
643+ id="linearGradient4675">
644+ <stop
645+ style="stop-color:#e4a56d;stop-opacity:1"
646+ offset="0"
647+ id="stop4677" />
648+ <stop
649+ style="stop-color:#a7bd78;stop-opacity:1"
650+ offset="1"
651+ id="stop4679" />
652+ </linearGradient>
653+ <linearGradient
654+ inkscape:collect="always"
655+ xlink:href="#linearGradient4683"
656+ id="linearGradient4689"
657+ x1="404.57144"
658+ y1="532.79797"
659+ x2="421.57144"
660+ y2="532.79797"
661+ gradientUnits="userSpaceOnUse"
662+ gradientTransform="matrix(2.1590488,0,0,2.2857134,-502.91801,-661.16832)" />
663+ <linearGradient
664+ inkscape:collect="always"
665+ id="linearGradient4683">
666+ <stop
667+ style="stop-color:#c3a278;stop-opacity:1"
668+ offset="0"
669+ id="stop4685" />
670+ <stop
671+ style="stop-color:#6688aa;stop-opacity:1"
672+ offset="1"
673+ id="stop4687" />
674+ </linearGradient>
675+ <linearGradient
676+ inkscape:collect="always"
677+ xlink:href="#linearGradient4722"
678+ id="linearGradient4728"
679+ x1="430.57144"
680+ y1="536.79797"
681+ x2="437.49963"
682+ y2="524.79797"
683+ gradientUnits="userSpaceOnUse"
684+ gradientTransform="matrix(2.215617,0,0,2.2857128,-527.46936,-661.16812)" />
685+ <linearGradient
686+ inkscape:collect="always"
687+ id="linearGradient4722">
688+ <stop
689+ style="stop-color:#6588af;stop-opacity:1"
690+ offset="0"
691+ id="stop4724" />
692+ <stop
693+ style="stop-color:#8ba8cd;stop-opacity:1"
694+ offset="1"
695+ id="stop4726" />
696+ </linearGradient>
697+ <linearGradient
698+ inkscape:collect="always"
699+ xlink:href="#linearGradient4834"
700+ id="linearGradient4840"
701+ x1="421.57144"
702+ y1="514.79797"
703+ x2="438.57144"
704+ y2="514.79797"
705+ gradientUnits="userSpaceOnUse"
706+ gradientTransform="matrix(2.0979714,0,0,2.2000004,-475.87336,-615.75782)" />
707+ <linearGradient
708+ inkscape:collect="always"
709+ id="linearGradient4834">
710+ <stop
711+ style="stop-color:#89ad8b;stop-opacity:1"
712+ offset="0"
713+ id="stop4836" />
714+ <stop
715+ style="stop-color:#82b3c7;stop-opacity:1"
716+ offset="1"
717+ id="stop4838" />
718+ </linearGradient>
719+ <linearGradient
720+ inkscape:collect="always"
721+ xlink:href="#linearGradient4778"
722+ id="linearGradient4784"
723+ x1="387.57144"
724+ y1="525.79797"
725+ x2="401.57144"
726+ y2="513.79797"
727+ gradientUnits="userSpaceOnUse"
728+ gradientTransform="matrix(2.1999994,0,0,2.5502852,-519.48547,-794.63394)" />
729+ <linearGradient
730+ inkscape:collect="always"
731+ id="linearGradient4778">
732+ <stop
733+ style="stop-color:#e1b16f;stop-opacity:1"
734+ offset="0"
735+ id="stop4780" />
736+ <stop
737+ style="stop-color:#99bf83;stop-opacity:1"
738+ offset="1"
739+ id="stop4782" />
740+ </linearGradient>
741+ <linearGradient
742+ inkscape:collect="always"
743+ xlink:href="#linearGradient4786"
744+ id="linearGradient4792"
745+ x1="404.57144"
746+ y1="510.798"
747+ x2="391.57144"
748+ y2="498.798"
749+ gradientUnits="userSpaceOnUse"
750+ gradientTransform="matrix(2.1999994,0,0,2.2000004,-519.48547,-615.75782)" />
751+ <linearGradient
752+ inkscape:collect="always"
753+ id="linearGradient4786">
754+ <stop
755+ style="stop-color:#99c487;stop-opacity:1"
756+ offset="0"
757+ id="stop4788" />
758+ <stop
759+ style="stop-color:#b4d99e;stop-opacity:1"
760+ offset="1"
761+ id="stop4790" />
762+ </linearGradient>
763+ <linearGradient
764+ inkscape:collect="always"
765+ xlink:href="#linearGradient4802"
766+ id="linearGradient4808"
767+ x1="404.57144"
768+ y1="501.798"
769+ x2="421.57144"
770+ y2="501.61618"
771+ gradientUnits="userSpaceOnUse"
772+ gradientTransform="matrix(2.2352938,0,0,2.2000004,-533.76462,-615.75782)" />
773+ <linearGradient
774+ inkscape:collect="always"
775+ id="linearGradient4802">
776+ <stop
777+ style="stop-color:#75d5c7;stop-opacity:1"
778+ offset="0"
779+ id="stop4804" />
780+ <stop
781+ style="stop-color:#66afb9;stop-opacity:1"
782+ offset="1"
783+ id="stop4806" />
784+ </linearGradient>
785+ <linearGradient
786+ inkscape:collect="always"
787+ xlink:href="#linearGradient4770"
788+ id="linearGradient4776"
789+ x1="428.57144"
790+ y1="495.798"
791+ x2="438.57144"
792+ y2="504.798"
793+ gradientUnits="userSpaceOnUse"
794+ gradientTransform="matrix(2.0979702,0,0,2.125002,-475.87285,-578.27377)" />
795+ <linearGradient
796+ inkscape:collect="always"
797+ id="linearGradient4770">
798+ <stop
799+ style="stop-color:#5c7b9e;stop-opacity:1"
800+ offset="0"
801+ id="stop4772" />
802+ <stop
803+ style="stop-color:#839dc0;stop-opacity:1"
804+ offset="1"
805+ id="stop4774" />
806+ </linearGradient>
807+ <linearGradient
808+ inkscape:collect="always"
809+ xlink:href="#linearGradient4591"
810+ id="linearGradient4473"
811+ gradientUnits="userSpaceOnUse"
812+ gradientTransform="matrix(2.1742158,0,0,2.2000004,-853.88338,-1137.5558)"
813+ x1="419.57144"
814+ y1="541.79797"
815+ x2="419.57144"
816+ y2="489.798" />
817+ <linearGradient
818+ inkscape:collect="always"
819+ xlink:href="#linearGradient4675"
820+ id="linearGradient4475"
821+ gradientUnits="userSpaceOnUse"
822+ gradientTransform="matrix(2.1999994,0,0,2.2857128,-864.05691,-1182.9661)"
823+ x1="394.57144"
824+ y1="535.79797"
825+ x2="404.57144"
826+ y2="522.79797" />
827+ <linearGradient
828+ inkscape:collect="always"
829+ xlink:href="#linearGradient4683"
830+ id="linearGradient4477"
831+ gradientUnits="userSpaceOnUse"
832+ gradientTransform="matrix(2.1590488,0,0,2.2857134,-847.48945,-1182.9663)"
833+ x1="404.57144"
834+ y1="532.79797"
835+ x2="421.57144"
836+ y2="532.79797" />
837+ <linearGradient
838+ inkscape:collect="always"
839+ xlink:href="#linearGradient4722"
840+ id="linearGradient4479"
841+ gradientUnits="userSpaceOnUse"
842+ gradientTransform="matrix(2.215617,0,0,2.2857128,-872.0408,-1182.9661)"
843+ x1="430.57144"
844+ y1="536.79797"
845+ x2="437.49963"
846+ y2="524.79797" />
847+ <linearGradient
848+ inkscape:collect="always"
849+ xlink:href="#linearGradient4834"
850+ id="linearGradient4481"
851+ gradientUnits="userSpaceOnUse"
852+ gradientTransform="matrix(2.0979714,0,0,2.2000004,-820.4448,-1137.5558)"
853+ x1="421.57144"
854+ y1="514.79797"
855+ x2="438.57144"
856+ y2="514.79797" />
857+ <linearGradient
858+ inkscape:collect="always"
859+ xlink:href="#linearGradient4778"
860+ id="linearGradient4483"
861+ gradientUnits="userSpaceOnUse"
862+ gradientTransform="matrix(2.1999994,0,0,2.5502852,-864.05691,-1316.4319)"
863+ x1="387.57144"
864+ y1="525.79797"
865+ x2="401.57144"
866+ y2="513.79797" />
867+ <linearGradient
868+ inkscape:collect="always"
869+ xlink:href="#linearGradient4591"
870+ id="linearGradient4549"
871+ gradientUnits="userSpaceOnUse"
872+ gradientTransform="matrix(2.1742158,0,0,2.2000004,-757.88338,-1083.5558)"
873+ x1="419.57144"
874+ y1="541.79797"
875+ x2="419.57144"
876+ y2="489.798" />
877+ <linearGradient
878+ inkscape:collect="always"
879+ xlink:href="#linearGradient4591"
880+ id="linearGradient4551"
881+ gradientUnits="userSpaceOnUse"
882+ gradientTransform="matrix(2.1999994,0,0,2.2857128,-423.48547,-669.16809)"
883+ x1="394.57144"
884+ y1="535.79797"
885+ x2="404.57144"
886+ y2="522.79797" />
887+ <linearGradient
888+ inkscape:collect="always"
889+ xlink:href="#linearGradient4834"
890+ id="linearGradient4553"
891+ gradientUnits="userSpaceOnUse"
892+ gradientTransform="matrix(2.1590488,0,0,2.2857134,-751.48945,-1128.9663)"
893+ x1="404.57144"
894+ y1="532.79797"
895+ x2="421.57144"
896+ y2="532.79797" />
897+ <linearGradient
898+ inkscape:collect="always"
899+ xlink:href="#linearGradient4802"
900+ id="linearGradient4559"
901+ gradientUnits="userSpaceOnUse"
902+ gradientTransform="matrix(2.1999994,0,0,2.5502852,-423.48547,-802.63394)"
903+ x1="387.57144"
904+ y1="525.79797"
905+ x2="401.57144"
906+ y2="513.79797" />
907+ <linearGradient
908+ inkscape:collect="always"
909+ xlink:href="#linearGradient4834"
910+ id="linearGradient4561"
911+ gradientUnits="userSpaceOnUse"
912+ gradientTransform="matrix(2.1999994,0,0,2.2000004,-423.48547,-623.75782)"
913+ x1="404.57144"
914+ y1="510.798"
915+ x2="391.57144"
916+ y2="498.798" />
917+ <linearGradient
918+ inkscape:collect="always"
919+ xlink:href="#linearGradient4834"
920+ id="linearGradient4563"
921+ gradientUnits="userSpaceOnUse"
922+ gradientTransform="matrix(2.2352938,0,0,2.2000004,-782.33606,-1083.5558)"
923+ x1="404.57144"
924+ y1="501.798"
925+ x2="421.57144"
926+ y2="501.61618" />
927+ <linearGradient
928+ inkscape:collect="always"
929+ id="linearGradient4903">
930+ <stop
931+ style="stop-color:#eef1f2;stop-opacity:1"
932+ offset="0"
933+ id="stop4905" />
934+ <stop
935+ style="stop-color:#f9fafb;stop-opacity:1"
936+ offset="1"
937+ id="stop4907" />
938+ </linearGradient>
939+ <linearGradient
940+ inkscape:collect="always"
941+ xlink:href="#linearGradient4303"
942+ id="linearGradient4158-9"
943+ x1="409.57144"
944+ y1="543.79797"
945+ x2="409.57144"
946+ y2="503.798"
947+ gradientUnits="userSpaceOnUse"
948+ gradientTransform="matrix(1.1250015,0,0,1,-59.071952,-8.0000193)" />
949+ <linearGradient
950+ gradientUnits="userSpaceOnUse"
951+ y2="8.0000267"
952+ x2="31.999989"
953+ y1="52.000027"
954+ x1="31.999989"
955+ id="linearGradient4659"
956+ xlink:href="#linearGradient4903"
957+ inkscape:collect="always" />
958+ <linearGradient
959+ gradientUnits="userSpaceOnUse"
960+ y2="1033.3622"
961+ x2="10.999989"
962+ y1="1050.3622"
963+ x1="10.999989"
964+ id="linearGradient4793"
965+ xlink:href="#linearGradient4159"
966+ inkscape:collect="always" />
967+ <linearGradient
968+ gradientUnits="userSpaceOnUse"
969+ y2="532.79797"
970+ x2="419.57144"
971+ y1="512.79797"
972+ x1="399.57144"
973+ id="linearGradient4881"
974+ xlink:href="#linearGradient4400"
975+ inkscape:collect="always" />
976+ <linearGradient
977+ gradientUnits="userSpaceOnUse"
978+ y2="41"
979+ x2="42.999985"
980+ y1="21"
981+ x1="22.999987"
982+ id="linearGradient4231-4"
983+ xlink:href="#linearGradient4400"
984+ inkscape:collect="always" />
985+ <linearGradient
986+ inkscape:collect="always"
987+ xlink:href="#linearGradient4159"
988+ id="linearGradient4823"
989+ gradientUnits="userSpaceOnUse"
990+ x1="10.999989"
991+ y1="1050.3622"
992+ x2="10.999989"
993+ y2="1033.3622" />
994+ </defs>
995+ <sodipodi:namedview
996+ id="base"
997+ pagecolor="#ffffff"
998+ bordercolor="#666666"
999+ borderopacity="1.0"
1000+ inkscape:pageopacity="0"
1001+ inkscape:pageshadow="2"
1002+ inkscape:zoom="2.3036213"
1003+ inkscape:cx="57.620425"
1004+ inkscape:cy="27.926259"
1005+ inkscape:document-units="px"
1006+ inkscape:current-layer="layer1"
1007+ showgrid="true"
1008+ fit-margin-top="0"
1009+ fit-margin-left="0"
1010+ fit-margin-right="0"
1011+ fit-margin-bottom="0"
1012+ inkscape:window-width="1024"
1013+ inkscape:window-height="600"
1014+ inkscape:window-x="0"
1015+ inkscape:window-y="0"
1016+ inkscape:window-maximized="1"
1017+ inkscape:showpageshadow="false"
1018+ borderlayer="true"
1019+ showguides="true">
1020+ <inkscape:grid
1021+ type="xygrid"
1022+ id="grid4063"
1023+ originx="39.999998"
1024+ originy="40.000004"
1025+ empspacing="2" />
1026+ <sodipodi:guide
1027+ position="1.6503906e-06,128"
1028+ orientation="128,0"
1029+ id="guide4211" />
1030+ <sodipodi:guide
1031+ position="1.6503906e-06,-3.6328124e-06"
1032+ orientation="0,128"
1033+ id="guide4213" />
1034+ <sodipodi:guide
1035+ position="128,-3.6328124e-06"
1036+ orientation="-128,0"
1037+ id="guide4215" />
1038+ <sodipodi:guide
1039+ position="128,128"
1040+ orientation="0,-128"
1041+ id="guide4217" />
1042+ <sodipodi:guide
1043+ position="12.000002,116"
1044+ orientation="104,0"
1045+ id="guide4219" />
1046+ <sodipodi:guide
1047+ position="12.000002,11.999996"
1048+ orientation="0,104"
1049+ id="guide4221" />
1050+ <sodipodi:guide
1051+ position="116,11.999996"
1052+ orientation="-104,0"
1053+ id="guide4223" />
1054+ <sodipodi:guide
1055+ position="116,116"
1056+ orientation="0,-104"
1057+ id="guide4225" />
1058+ </sodipodi:namedview>
1059+ <metadata
1060+ id="metadata5458">
1061+ <rdf:RDF>
1062+ <cc:Work
1063+ rdf:about="">
1064+ <dc:format>image/svg+xml</dc:format>
1065+ <dc:type
1066+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
1067+ <dc:title></dc:title>
1068+ </cc:Work>
1069+ </rdf:RDF>
1070+ </metadata>
1071+ <g
1072+ inkscape:label="Capa 1"
1073+ inkscape:groupmode="layer"
1074+ id="layer1"
1075+ transform="translate(-344.57144,-459.79797)">
1076+ <path
1077+ style="opacity:1;fill:url(#linearGradient4272);fill-opacity:1;stroke:none;stroke-width:2.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.55026455"
1078+ d="m 394.57143,551.79794 0,15.27272 0,4.36364 0,4.36364 28,0 0,-4.36364 0,-4.36364 0,-15.27272 z"
1079+ id="rect4254"
1080+ inkscape:connector-curvature="0"
1081+ sodipodi:nodetypes="ccccccccc" />
1082+ <rect
1083+ style="opacity:1;fill:url(#linearGradient4250);fill-opacity:1;stroke:none;stroke-width:2.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.55026455"
1084+ id="rect4173"
1085+ width="128.00003"
1086+ height="82"
1087+ x="344.57144"
1088+ y="471.79797" />
1089+ <path
1090+ style="opacity:1;fill:url(#linearGradient4597-5);fill-opacity:1;stroke:none"
1091+ d="m 348.57143,483.79796 0,66 95.66548,0 0,-66 -95.66548,0 z"
1092+ id="path4589-5"
1093+ inkscape:connector-curvature="0" />
1094+ <path
1095+ style="fill:url(#linearGradient4681);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
1096+ d="m 370.57143,517.79798 -22,18.82144 0,13.17854 22,0 0,-31.99998 z"
1097+ id="path4476-9"
1098+ inkscape:connector-curvature="0" />
1099+ <path
1100+ sodipodi:nodetypes="cccc"
1101+ style="fill:url(#linearGradient4689);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
1102+ d="m 370.57143,519.798 0,29.99996 36.70382,0 z"
1103+ id="path4478-4"
1104+ inkscape:connector-curvature="0" />
1105+ <path
1106+ style="fill:url(#linearGradient4728);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
1107+ d="m 444.57143,517.79798 -38,31.99998 38,2e-5 z"
1108+ id="path4488-0-8"
1109+ inkscape:connector-curvature="0"
1110+ sodipodi:nodetypes="cccc" />
1111+ <path
1112+ style="fill:url(#linearGradient4840);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
1113+ d="m 408.57143,536.59796 0,-48.79998 36,30 -36,31.99998 z"
1114+ id="path4188-3"
1115+ inkscape:connector-curvature="0"
1116+ sodipodi:nodetypes="ccccc" />
1117+ <path
1118+ sodipodi:nodetypes="cccc"
1119+ style="fill:url(#linearGradient4784);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
1120+ d="m 348.57143,499.79798 0,42.00002 22,-22 z"
1121+ id="path4192-6"
1122+ inkscape:connector-curvature="0" />
1123+ <path
1124+ sodipodi:nodetypes="cccccc"
1125+ style="fill:url(#linearGradient4792);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
1126+ d="m 348.57143,483.79796 0,17.08438 22,18.91566 0,-14.00004 0,-22 z"
1127+ id="path4198-3"
1128+ inkscape:connector-curvature="0" />
1129+ <path
1130+ sodipodi:nodetypes="cccccc"
1131+ style="fill:url(#linearGradient4808);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
1132+ d="m 370.57143,483.79796 0,22 0,14.00004 38,-32.00002 -6,-4 z"
1133+ id="path4200-1"
1134+ inkscape:connector-curvature="0" />
1135+ <path
1136+ style="fill:url(#linearGradient4776);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
1137+ d="m 413.66883,483.79796 -5.0974,4.00002 36,30 0,-12 0,-22 z"
1138+ id="path4202-1"
1139+ inkscape:connector-curvature="0"
1140+ sodipodi:nodetypes="cccccc" />
1141+ <rect
1142+ style="opacity:1;fill:#99a1a7;fill-opacity:1;stroke:none;stroke-width:2.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.55026455"
1143+ id="rect4295"
1144+ width="47.999939"
1145+ height="2.0000367"
1146+ x="384.57144"
1147+ y="573.79797" />
1148+ <g
1149+ id="g4420">
1150+ <rect
1151+ y="541.79797"
1152+ x="348.57144"
1153+ height="7.999939"
1154+ width="120"
1155+ id="rect4267"
1156+ style="opacity:1;fill:#ffffff;fill-opacity:0.78431373;stroke:none" />
1157+ <circle
1158+ r="2"
1159+ cy="545.79785"
1160+ cx="462.57144"
1161+ id="path4166"
1162+ style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-opacity:1" />
1163+ <path
1164+ sodipodi:nodetypes="cccccccccc"
1165+ id="rect4183"
1166+ d="m 352.57143,543.79798 0,2 2,0 0,-2 z m 2,2 0,2 2,0 0,-2 z"
1167+ style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-opacity:1"
1168+ inkscape:connector-curvature="0" />
1169+ </g>
1170+ <g
1171+ id="g4411">
1172+ <rect
1173+ y="487.798"
1174+ x="352.57144"
1175+ height="33.999989"
1176+ width="39.999973"
1177+ id="rect3432"
1178+ style="fill:#ffffff;fill-opacity:0.78431373;stroke:none" />
1179+ <path
1180+ sodipodi:nodetypes="cccccc"
1181+ inkscape:connector-curvature="0"
1182+ id="rect4235"
1183+ d="m 370.57143,489.79798 0,10 8,0 0,-6 -4,-4 z"
1184+ style="opacity:1;fill:#ff9955;fill-opacity:1;stroke:none" />
1185+ <path
1186+ inkscape:connector-curvature="0"
1187+ id="path4237"
1188+ d="m 374.57143,489.79798 4,4 -4,0 z"
1189+ style="fill:#d45500;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
1190+ <path
1191+ inkscape:connector-curvature="0"
1192+ id="path4409"
1193+ d="m 354.57144,489.79797 0,3 8,0 -3.4286,-3 z"
1194+ style="fill:#3580ca;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
1195+ <path
1196+ sodipodi:nodetypes="ccccc"
1197+ inkscape:connector-curvature="0"
1198+ id="rect4272"
1199+ d="m 354.57143,491.79798 11,0 0,8 -11,0 z"
1200+ style="fill:#7aabdc;fill-opacity:1;stroke:none" />
1201+ <path
1202+ style="opacity:1;fill:#71c837;fill-opacity:1;stroke:none"
1203+ d="m 382.57143,489.79798 0,10 8,0 0,-6 -4,-4 z"
1204+ id="path4275"
1205+ inkscape:connector-curvature="0"
1206+ sodipodi:nodetypes="cccccc" />
1207+ <path
1208+ style="fill:#447821;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
1209+ d="m 386.57143,489.79798 4,4 -4,0 z"
1210+ id="path4277"
1211+ inkscape:connector-curvature="0" />
1212+ </g>
1213+ <path
1214+ style="opacity:1;fill:url(#linearGradient4473);fill-opacity:1;stroke:none"
1215+ d="M 4 16 L 4 28 L 99.666016 28 L 99.666016 16 L 4 16 z "
1216+ transform="translate(344.57144,459.79797)"
1217+ id="path4425" />
1218+ <path
1219+ style="fill:url(#linearGradient4475);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
1220+ d="M 4 16 L 4 28 L 26 28 L 26 16 L 4 16 z "
1221+ transform="translate(344.57144,459.79797)"
1222+ id="path4427" />
1223+ <path
1224+ style="fill:url(#linearGradient4477);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
1225+ d="M 26 16 L 26 28 L 62.703125 28 L 48.021484 16 L 26 16 z "
1226+ transform="translate(344.57144,459.79797)"
1227+ id="path4429" />
1228+ <path
1229+ style="fill:url(#linearGradient4479);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
1230+ d="M 76.25 16 L 62 28 L 100 28 L 100 16 L 76.25 16 z "
1231+ transform="translate(344.57144,459.79797)"
1232+ id="path4431" />
1233+ <path
1234+ style="fill:url(#linearGradient4481);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
1235+ d="M 64 16 L 64 28 L 77.5 16 L 64 16 z "
1236+ transform="translate(344.57144,459.79797)"
1237+ id="path4433" />
1238+ <path
1239+ style="fill:url(#linearGradient4483);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
1240+ d="M 4 16 L 4 20 L 8 16 L 4 16 z "
1241+ transform="translate(344.57144,459.79797)"
1242+ id="path4435" />
1243+ <path
1244+ style="opacity:1;fill:url(#linearGradient4549);fill-opacity:1;stroke:none"
1245+ d="M 100 16 L 100 82 L 124 82 L 124 16 L 100 16 z "
1246+ transform="translate(344.57144,459.79797)"
1247+ id="path4501" />
1248+ <path
1249+ style="fill:url(#linearGradient4551);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
1250+ d="m 466.57143,509.79798 -22,18.82144 0,13.17854 22,0 0,-31.99998 z"
1251+ id="path4503"
1252+ inkscape:connector-curvature="0" />
1253+ <path
1254+ style="fill:url(#linearGradient4553);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
1255+ d="M 122 52 L 122 82 L 124 82 L 124 53.634766 L 122 52 z "
1256+ transform="translate(344.57144,459.79797)"
1257+ id="path4505" />
1258+ <path
1259+ sodipodi:nodetypes="cccc"
1260+ style="fill:url(#linearGradient4559);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
1261+ d="m 444.57143,491.79798 0,42.00002 22,-22 z"
1262+ id="path4511"
1263+ inkscape:connector-curvature="0" />
1264+ <path
1265+ sodipodi:nodetypes="cccccc"
1266+ style="fill:url(#linearGradient4561);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
1267+ d="m 444.57143,475.79796 0,17.08438 22,18.91566 0,-14.00004 0,-22 z"
1268+ id="path4513"
1269+ inkscape:connector-curvature="0" />
1270+ <path
1271+ style="fill:url(#linearGradient4563);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
1272+ d="M 122 16 L 122 38 L 122 52 L 124 50.316406 L 124 16 L 122 16 z "
1273+ transform="translate(344.57144,459.79797)"
1274+ id="path4515" />
1275+ <path
1276+ style="opacity:0.2;fill:url(#linearGradient4388);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
1277+ d="M 53 64 L 27 87 L 24 116 L 88 116 L 88 114 L 78 114 L 78 94 L 81.75 92.75 L 53 64 z "
1278+ transform="translate(344.57144,459.79797)"
1279+ id="path4377" />
1280+ <g
1281+ transform="translate(-34.000002,25.999935)"
1282+ id="layer1-1"
1283+ inkscape:label="Capa 1">
1284+ <rect
1285+ ry="0"
1286+ y="497.798"
1287+ x="385.57144"
1288+ height="51.999908"
1289+ width="45.999985"
1290+ id="rect4139-6"
1291+ style="opacity:1;fill:url(#linearGradient4158-9);fill-opacity:1;stroke:none" />
1292+ <path
1293+ inkscape:connector-curvature="0"
1294+ id="path4795"
1295+ d="m 387.57143,543.79799 6,6 37,0 1,-2e-5 0,-46.99998 0,-1 -2,-2 0,44 z"
1296+ style="opacity:0.2;fill:url(#linearGradient4881);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
1297+ <rect
1298+ y="548.79797"
1299+ x="385.57144"
1300+ height="1.0000228"
1301+ width="45.999985"
1302+ id="rect4492-9"
1303+ style="opacity:1;fill:#737b81;fill-opacity:1;stroke:none;stroke-width:2.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.55026455" />
1304+ <rect
1305+ y="545.7981"
1306+ x="393.57144"
1307+ height="3.999939"
1308+ width="30"
1309+ id="rect4671"
1310+ style="opacity:1;fill:#292c2e;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
1311+ <rect
1312+ style="opacity:1;fill:#abb9be;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
1313+ id="rect4963"
1314+ width="15.599988"
1315+ height="15.599988"
1316+ x="400.77151"
1317+ y="506.89804"
1318+ ry="7.7999926" />
1319+ <path
1320+ transform="translate(376.57144,491.79797)"
1321+ id="path4648"
1322+ d="m 11,8 0,44 21,0 21,0 L 53,8 32,8 11,8 Z"
1323+ style="fill:url(#linearGradient4659);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
1324+ inkscape:connector-curvature="0" />
1325+ <rect
1326+ y="532.79822"
1327+ x="390.57144"
1328+ height="5.0000229"
1329+ width="11.999987"
1330+ id="rect4985"
1331+ style="opacity:1;fill:#fdbc4a;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
1332+ <rect
1333+ y="533.79822"
1334+ x="391.57144"
1335+ height="1.0000228"
1336+ width="9.9999866"
1337+ id="rect5119"
1338+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
1339+ <rect
1340+ y="535.79846"
1341+ x="391.57144"
1342+ height="1.0000228"
1343+ width="7.9999866"
1344+ id="rect5121"
1345+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
1346+ <rect
1347+ y="548.79797"
1348+ x="393.57144"
1349+ height="1"
1350+ width="29.999987"
1351+ id="rect4194"
1352+ style="opacity:1;fill:#202324;fill-opacity:1;stroke:none;stroke-opacity:1" />
1353+ <rect
1354+ ry="9.6193602e-05"
1355+ y="546.79797"
1356+ x="395.5715"
1357+ height="1"
1358+ width="1.9999866"
1359+ id="rect4544"
1360+ style="opacity:1;fill:#f9cf8d;fill-opacity:1;stroke:none;stroke-opacity:1" />
1361+ <rect
1362+ ry="9.6193602e-05"
1363+ y="547.79797"
1364+ x="395.5715"
1365+ height="1"
1366+ width="1.9999866"
1367+ id="rect4546"
1368+ style="opacity:1;fill:#f6b44d;fill-opacity:1;stroke:none;stroke-opacity:1" />
1369+ <rect
1370+ ry="9.6193602e-05"
1371+ y="546.79797"
1372+ x="419.5715"
1373+ height="1"
1374+ width="1.9999866"
1375+ id="rect4544-0"
1376+ style="opacity:1;fill:#f9cf8d;fill-opacity:1;stroke:none;stroke-opacity:1" />
1377+ <rect
1378+ ry="9.6193602e-05"
1379+ y="547.79797"
1380+ x="419.5715"
1381+ height="1"
1382+ width="1.9999866"
1383+ id="rect4546-7"
1384+ style="opacity:1;fill:#f6b44d;fill-opacity:1;stroke:none;stroke-opacity:1" />
1385+ <rect
1386+ ry="9.6193602e-05"
1387+ y="546.79797"
1388+ x="398.5715"
1389+ height="1"
1390+ width="1.9999866"
1391+ id="rect4544-6"
1392+ style="opacity:1;fill:#f9cf8d;fill-opacity:1;stroke:none;stroke-opacity:1" />
1393+ <rect
1394+ ry="9.6193602e-05"
1395+ y="547.79797"
1396+ x="398.5715"
1397+ height="1"
1398+ width="1.9999866"
1399+ id="rect4546-5"
1400+ style="opacity:1;fill:#f6b44d;fill-opacity:1;stroke:none;stroke-opacity:1" />
1401+ <rect
1402+ ry="9.6193602e-05"
1403+ y="546.79797"
1404+ x="401.5715"
1405+ height="1"
1406+ width="1.9999866"
1407+ id="rect4544-1"
1408+ style="opacity:1;fill:#f9cf8d;fill-opacity:1;stroke:none;stroke-opacity:1" />
1409+ <rect
1410+ ry="9.6193602e-05"
1411+ y="547.79797"
1412+ x="401.5715"
1413+ height="1"
1414+ width="1.9999866"
1415+ id="rect4546-3"
1416+ style="opacity:1;fill:#f6b44d;fill-opacity:1;stroke:none;stroke-opacity:1" />
1417+ <rect
1418+ ry="9.6193602e-05"
1419+ y="546.79797"
1420+ x="407.57144"
1421+ height="1"
1422+ width="1.9999866"
1423+ id="rect4544-06"
1424+ style="opacity:1;fill:#f9cf8d;fill-opacity:1;stroke:none;stroke-opacity:1" />
1425+ <rect
1426+ ry="9.6193602e-05"
1427+ y="547.79797"
1428+ x="407.57144"
1429+ height="1"
1430+ width="1.9999866"
1431+ id="rect4546-6"
1432+ style="opacity:1;fill:#f6b44d;fill-opacity:1;stroke:none;stroke-opacity:1" />
1433+ <rect
1434+ ry="9.6193602e-05"
1435+ y="546.79797"
1436+ x="416.5715"
1437+ height="1"
1438+ width="1.9999866"
1439+ id="rect4544-9"
1440+ style="opacity:1;fill:#f9cf8d;fill-opacity:1;stroke:none;stroke-opacity:1" />
1441+ <rect
1442+ ry="9.6193602e-05"
1443+ y="547.79797"
1444+ x="416.5715"
1445+ height="1"
1446+ width="1.9999866"
1447+ id="rect4546-0"
1448+ style="opacity:1;fill:#f6b44d;fill-opacity:1;stroke:none;stroke-opacity:1" />
1449+ <rect
1450+ ry="9.6193602e-05"
1451+ y="546.79797"
1452+ x="413.5715"
1453+ height="1"
1454+ width="1.9999866"
1455+ id="rect4544-8"
1456+ style="opacity:1;fill:#f9cf8d;fill-opacity:1;stroke:none;stroke-opacity:1" />
1457+ <rect
1458+ ry="9.6193602e-05"
1459+ y="547.79797"
1460+ x="413.5715"
1461+ height="1"
1462+ width="1.9999866"
1463+ id="rect4546-55"
1464+ style="opacity:1;fill:#f6b44d;fill-opacity:1;stroke:none;stroke-opacity:1" />
1465+ <rect
1466+ ry="9.6193602e-05"
1467+ y="546.79797"
1468+ x="410.5715"
1469+ height="1"
1470+ width="1.9999866"
1471+ id="rect4544-8-8"
1472+ style="opacity:1;fill:#f9cf8d;fill-opacity:1;stroke:none;stroke-opacity:1" />
1473+ <rect
1474+ ry="9.6193602e-05"
1475+ y="547.79797"
1476+ x="410.5715"
1477+ height="1"
1478+ width="1.9999866"
1479+ id="rect4546-55-5"
1480+ style="opacity:1;fill:#f6b44d;fill-opacity:1;stroke:none;stroke-opacity:1" />
1481+ <rect
1482+ ry="9.6193602e-05"
1483+ y="546.79797"
1484+ x="404.5715"
1485+ height="1"
1486+ width="1.9999866"
1487+ id="rect4544-8-89"
1488+ style="opacity:1;fill:#f9cf8d;fill-opacity:1;stroke:none;stroke-opacity:1" />
1489+ <rect
1490+ ry="9.6193602e-05"
1491+ y="547.79797"
1492+ x="404.5715"
1493+ height="1"
1494+ width="1.9999866"
1495+ id="rect4546-55-7"
1496+ style="opacity:1;fill:#f6b44d;fill-opacity:1;stroke:none;stroke-opacity:1" />
1497+ <rect
1498+ y="532.79797"
1499+ x="414.57144"
1500+ height="0.99999231"
1501+ width="12.999987"
1502+ id="rect4979"
1503+ style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
1504+ <rect
1505+ y="534.79803"
1506+ x="414.57144"
1507+ height="1"
1508+ width="13.000044"
1509+ id="rect4981"
1510+ style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
1511+ <rect
1512+ y="536.79822"
1513+ x="414.57144"
1514+ height="1"
1515+ width="13.000013"
1516+ id="rect4983"
1517+ style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
1518+ <path
1519+ transform="translate(376.57144,491.79797)"
1520+ id="rect4200-7"
1521+ d="m 18.707031,14.292969 -1.414062,1.414062 8,8 L 25,24 55,54 55,44 30,19 l -3.292969,3.292969 -8,-8 z m -2.146484,6.146484 -2.121094,2.121094 5.5,5.5 -1.353515,1.353515 L 47.169922,58 l 6.953125,0 -37.5625,-37.560547 z"
1522+ style="opacity:0.2;fill:url(#linearGradient4231-4);fill-opacity:1;stroke:none;stroke-opacity:1"
1523+ inkscape:connector-curvature="0" />
1524+ <g
1525+ style="fill:url(#linearGradient4793);fill-opacity:1"
1526+ inkscape:label="Capa 1"
1527+ id="layer1-7"
1528+ transform="translate(387.57144,-527.56423)">
1529+ <path
1530+ inkscape:connector-curvature="0"
1531+ style="opacity:1;fill:url(#linearGradient4823);fill-opacity:1;stroke:none"
1532+ d="M 7,3 C 6.446,3 6,3.446 6,4 6,4.554 6.446,5 7,5 7.554,5 8,4.554 8,4 8,3.446 7.554,3 7,3 Z m 7,0 -2,2 3,3 -3,3 2,2 3,-3 2,-2 -5,-5 z M 4.5,9 C 3.669,9 3,9.669 3,10.5 3,11.331 3.669,12 4.5,12 5.331,12 6,11.331 6,10.5 6,9.669 5.331,9 4.5,9 Z M 9,15 c -1.108,0 -2,0.892 -2,2 0,1.108 0.892,2 2,2 1.108,0 2,-0.892 2,-2 0,-1.108 -0.892,-2 -2,-2 z"
1533+ transform="translate(0,1030.3622)"
1534+ id="rect4231" />
1535+ </g>
1536+ </g>
1537+ </g>
1538+</svg>
1539
1540=== added file 'gui/qt/images/source/kubuntu-live.svg'
1541--- gui/qt/images/source/kubuntu-live.svg 1970-01-01 00:00:00 +0000
1542+++ gui/qt/images/source/kubuntu-live.svg 2015-09-09 14:58:25 +0000
1543@@ -0,0 +1,849 @@
1544+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
1545+<!-- Created with Inkscape (http://www.inkscape.org/) -->
1546+
1547+<svg
1548+ xmlns:dc="http://purl.org/dc/elements/1.1/"
1549+ xmlns:cc="http://creativecommons.org/ns#"
1550+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
1551+ xmlns:svg="http://www.w3.org/2000/svg"
1552+ xmlns="http://www.w3.org/2000/svg"
1553+ xmlns:xlink="http://www.w3.org/1999/xlink"
1554+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
1555+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
1556+ width="128"
1557+ height="128"
1558+ id="svg5453"
1559+ version="1.1"
1560+ inkscape:version="0.91 r13725"
1561+ sodipodi:docname="kubuntu-live.svg">
1562+ <defs
1563+ id="defs5455">
1564+ <linearGradient
1565+ inkscape:collect="always"
1566+ xlink:href="#linearGradient4143"
1567+ id="linearGradient4158"
1568+ x1="415.68246"
1569+ y1="557.79803"
1570+ x2="415.68246"
1571+ y2="528.79803"
1572+ gradientUnits="userSpaceOnUse"
1573+ gradientTransform="matrix(0.78261,0,0,1,59.25419,17.999955)" />
1574+ <linearGradient
1575+ id="linearGradient4400"
1576+ inkscape:collect="always">
1577+ <stop
1578+ id="stop4402"
1579+ offset="0"
1580+ style="stop-color:#020303;stop-opacity:1" />
1581+ <stop
1582+ id="stop4404"
1583+ offset="1"
1584+ style="stop-color:#424649;stop-opacity:0" />
1585+ </linearGradient>
1586+ <linearGradient
1587+ gradientTransform="translate(362.57144,539.79794)"
1588+ gradientUnits="userSpaceOnUse"
1589+ y2="34.000023"
1590+ x2="33.999985"
1591+ y1="14.000023"
1592+ x1="13.999987"
1593+ id="linearGradient4231"
1594+ xlink:href="#linearGradient4400"
1595+ inkscape:collect="always" />
1596+ <linearGradient
1597+ id="linearGradient4143"
1598+ inkscape:collect="always">
1599+ <stop
1600+ id="stop4145"
1601+ offset="0"
1602+ style="stop-color:#197cf1;stop-opacity:1" />
1603+ <stop
1604+ id="stop4147"
1605+ offset="1"
1606+ style="stop-color:#20bcfa;stop-opacity:1" />
1607+ </linearGradient>
1608+ <linearGradient
1609+ gradientUnits="userSpaceOnUse"
1610+ y2="36.000023"
1611+ x2="31.999987"
1612+ y1="52.000023"
1613+ x1="31.999987"
1614+ id="linearGradient4301"
1615+ xlink:href="#linearGradient4290"
1616+ inkscape:collect="always"
1617+ gradientTransform="translate(352.57144,517.79794)" />
1618+ <linearGradient
1619+ inkscape:collect="always"
1620+ id="linearGradient4290">
1621+ <stop
1622+ style="stop-color:#7cbaf8;stop-opacity:1"
1623+ offset="0"
1624+ id="stop4292" />
1625+ <stop
1626+ style="stop-color:#f4fcff;stop-opacity:1"
1627+ offset="1"
1628+ id="stop4294" />
1629+ </linearGradient>
1630+ <linearGradient
1631+ y2="528.79791"
1632+ x2="416.96021"
1633+ y1="552.79791"
1634+ x1="417.2551"
1635+ gradientTransform="matrix(0.63587062,0,0,1,120.25118,-4.999956)"
1636+ gradientUnits="userSpaceOnUse"
1637+ id="linearGradient4319"
1638+ xlink:href="#linearGradient4303"
1639+ inkscape:collect="always" />
1640+ <linearGradient
1641+ inkscape:collect="always"
1642+ id="linearGradient4303">
1643+ <stop
1644+ style="stop-color:#c6cdd1;stop-opacity:1"
1645+ offset="0"
1646+ id="stop4305" />
1647+ <stop
1648+ style="stop-color:#e0e5e7;stop-opacity:1"
1649+ offset="1"
1650+ id="stop4307" />
1651+ </linearGradient>
1652+ <linearGradient
1653+ gradientTransform="matrix(2,0,0,2,-408.5714,-511.79805)"
1654+ y2="521.79797"
1655+ x2="400.57144"
1656+ y1="521.79797"
1657+ x1="398.57144"
1658+ gradientUnits="userSpaceOnUse"
1659+ id="linearGradient4375"
1660+ xlink:href="#linearGradient4143-8"
1661+ inkscape:collect="always" />
1662+ <linearGradient
1663+ inkscape:collect="always"
1664+ id="linearGradient4143-8">
1665+ <stop
1666+ style="stop-color:#faae2a;stop-opacity:1"
1667+ offset="0"
1668+ id="stop4145-7" />
1669+ <stop
1670+ style="stop-color:#ffc35a;stop-opacity:1"
1671+ offset="1"
1672+ id="stop4147-4" />
1673+ </linearGradient>
1674+ <linearGradient
1675+ gradientTransform="matrix(2,0,0,2,-420.57143,-511.79805)"
1676+ gradientUnits="userSpaceOnUse"
1677+ y2="521.79797"
1678+ x2="400.57144"
1679+ y1="521.79797"
1680+ x1="398.57144"
1681+ id="linearGradient4371"
1682+ xlink:href="#linearGradient4143-8"
1683+ inkscape:collect="always" />
1684+ <linearGradient
1685+ inkscape:collect="always"
1686+ xlink:href="#linearGradient4400"
1687+ id="linearGradient4388"
1688+ x1="12.000004"
1689+ y1="63.999996"
1690+ x2="72"
1691+ y2="123.99999"
1692+ gradientUnits="userSpaceOnUse"
1693+ gradientTransform="translate(12,0)" />
1694+ <linearGradient
1695+ id="linearGradient4159"
1696+ inkscape:collect="always">
1697+ <stop
1698+ id="stop4161"
1699+ offset="0"
1700+ style="stop-color:#2a2c2f;stop-opacity:1" />
1701+ <stop
1702+ id="stop4163"
1703+ offset="1"
1704+ style="stop-color:#424649;stop-opacity:1" />
1705+ </linearGradient>
1706+ <linearGradient
1707+ gradientTransform="matrix(2.1666662,0,0,2.1818184,-476.66648,-623.39782)"
1708+ inkscape:collect="always"
1709+ xlink:href="#linearGradient4159"
1710+ id="linearGradient4250"
1711+ x1="409.57144"
1712+ y1="536.79797"
1713+ x2="409.57144"
1714+ y2="503.798"
1715+ gradientUnits="userSpaceOnUse" />
1716+ <linearGradient
1717+ inkscape:collect="always"
1718+ xlink:href="#linearGradient4303"
1719+ id="linearGradient4272"
1720+ x1="408.57144"
1721+ y1="547.79797"
1722+ x2="408.57144"
1723+ y2="536.79797"
1724+ gradientUnits="userSpaceOnUse"
1725+ gradientTransform="matrix(2.3333348,0,0,2.1818184,-544.76245,-619.39781)" />
1726+ <linearGradient
1727+ inkscape:collect="always"
1728+ id="linearGradient4591">
1729+ <stop
1730+ style="stop-color:#7e8f9e;stop-opacity:1"
1731+ offset="0"
1732+ id="stop4593" />
1733+ <stop
1734+ style="stop-color:#84ced5;stop-opacity:1"
1735+ offset="1"
1736+ id="stop4595" />
1737+ </linearGradient>
1738+ <linearGradient
1739+ inkscape:collect="always"
1740+ xlink:href="#linearGradient4591"
1741+ id="linearGradient4597-5"
1742+ x1="419.57144"
1743+ y1="541.79797"
1744+ x2="419.57144"
1745+ y2="489.798"
1746+ gradientUnits="userSpaceOnUse"
1747+ gradientTransform="matrix(2.1742158,0,0,2.2000004,-509.31194,-615.75782)" />
1748+ <linearGradient
1749+ inkscape:collect="always"
1750+ xlink:href="#linearGradient4675"
1751+ id="linearGradient4681"
1752+ x1="394.57144"
1753+ y1="535.79797"
1754+ x2="404.57144"
1755+ y2="522.79797"
1756+ gradientUnits="userSpaceOnUse"
1757+ gradientTransform="matrix(2.1999994,0,0,2.2857128,-519.48547,-661.16809)" />
1758+ <linearGradient
1759+ inkscape:collect="always"
1760+ id="linearGradient4675">
1761+ <stop
1762+ style="stop-color:#e4a56d;stop-opacity:1"
1763+ offset="0"
1764+ id="stop4677" />
1765+ <stop
1766+ style="stop-color:#a7bd78;stop-opacity:1"
1767+ offset="1"
1768+ id="stop4679" />
1769+ </linearGradient>
1770+ <linearGradient
1771+ inkscape:collect="always"
1772+ xlink:href="#linearGradient4683"
1773+ id="linearGradient4689"
1774+ x1="404.57144"
1775+ y1="532.79797"
1776+ x2="421.57144"
1777+ y2="532.79797"
1778+ gradientUnits="userSpaceOnUse"
1779+ gradientTransform="matrix(2.1590488,0,0,2.2857134,-502.91801,-661.16832)" />
1780+ <linearGradient
1781+ inkscape:collect="always"
1782+ id="linearGradient4683">
1783+ <stop
1784+ style="stop-color:#c3a278;stop-opacity:1"
1785+ offset="0"
1786+ id="stop4685" />
1787+ <stop
1788+ style="stop-color:#6688aa;stop-opacity:1"
1789+ offset="1"
1790+ id="stop4687" />
1791+ </linearGradient>
1792+ <linearGradient
1793+ inkscape:collect="always"
1794+ xlink:href="#linearGradient4722"
1795+ id="linearGradient4728"
1796+ x1="430.57144"
1797+ y1="536.79797"
1798+ x2="437.49963"
1799+ y2="524.79797"
1800+ gradientUnits="userSpaceOnUse"
1801+ gradientTransform="matrix(2.215617,0,0,2.2857128,-527.46936,-661.16812)" />
1802+ <linearGradient
1803+ inkscape:collect="always"
1804+ id="linearGradient4722">
1805+ <stop
1806+ style="stop-color:#6588af;stop-opacity:1"
1807+ offset="0"
1808+ id="stop4724" />
1809+ <stop
1810+ style="stop-color:#8ba8cd;stop-opacity:1"
1811+ offset="1"
1812+ id="stop4726" />
1813+ </linearGradient>
1814+ <linearGradient
1815+ inkscape:collect="always"
1816+ xlink:href="#linearGradient4834"
1817+ id="linearGradient4840"
1818+ x1="421.57144"
1819+ y1="514.79797"
1820+ x2="438.57144"
1821+ y2="514.79797"
1822+ gradientUnits="userSpaceOnUse"
1823+ gradientTransform="matrix(2.0979714,0,0,2.2000004,-475.87336,-615.75782)" />
1824+ <linearGradient
1825+ inkscape:collect="always"
1826+ id="linearGradient4834">
1827+ <stop
1828+ style="stop-color:#89ad8b;stop-opacity:1"
1829+ offset="0"
1830+ id="stop4836" />
1831+ <stop
1832+ style="stop-color:#82b3c7;stop-opacity:1"
1833+ offset="1"
1834+ id="stop4838" />
1835+ </linearGradient>
1836+ <linearGradient
1837+ inkscape:collect="always"
1838+ xlink:href="#linearGradient4778"
1839+ id="linearGradient4784"
1840+ x1="387.57144"
1841+ y1="525.79797"
1842+ x2="401.57144"
1843+ y2="513.79797"
1844+ gradientUnits="userSpaceOnUse"
1845+ gradientTransform="matrix(2.1999994,0,0,2.5502852,-519.48547,-794.63394)" />
1846+ <linearGradient
1847+ inkscape:collect="always"
1848+ id="linearGradient4778">
1849+ <stop
1850+ style="stop-color:#e1b16f;stop-opacity:1"
1851+ offset="0"
1852+ id="stop4780" />
1853+ <stop
1854+ style="stop-color:#99bf83;stop-opacity:1"
1855+ offset="1"
1856+ id="stop4782" />
1857+ </linearGradient>
1858+ <linearGradient
1859+ inkscape:collect="always"
1860+ xlink:href="#linearGradient4786"
1861+ id="linearGradient4792"
1862+ x1="404.57144"
1863+ y1="510.798"
1864+ x2="391.57144"
1865+ y2="498.798"
1866+ gradientUnits="userSpaceOnUse"
1867+ gradientTransform="matrix(2.1999994,0,0,2.2000004,-519.48547,-615.75782)" />
1868+ <linearGradient
1869+ inkscape:collect="always"
1870+ id="linearGradient4786">
1871+ <stop
1872+ style="stop-color:#99c487;stop-opacity:1"
1873+ offset="0"
1874+ id="stop4788" />
1875+ <stop
1876+ style="stop-color:#b4d99e;stop-opacity:1"
1877+ offset="1"
1878+ id="stop4790" />
1879+ </linearGradient>
1880+ <linearGradient
1881+ inkscape:collect="always"
1882+ xlink:href="#linearGradient4802"
1883+ id="linearGradient4808"
1884+ x1="404.57144"
1885+ y1="501.798"
1886+ x2="421.57144"
1887+ y2="501.61618"
1888+ gradientUnits="userSpaceOnUse"
1889+ gradientTransform="matrix(2.2352938,0,0,2.2000004,-533.76462,-615.75782)" />
1890+ <linearGradient
1891+ inkscape:collect="always"
1892+ id="linearGradient4802">
1893+ <stop
1894+ style="stop-color:#75d5c7;stop-opacity:1"
1895+ offset="0"
1896+ id="stop4804" />
1897+ <stop
1898+ style="stop-color:#66afb9;stop-opacity:1"
1899+ offset="1"
1900+ id="stop4806" />
1901+ </linearGradient>
1902+ <linearGradient
1903+ inkscape:collect="always"
1904+ xlink:href="#linearGradient4770"
1905+ id="linearGradient4776"
1906+ x1="428.57144"
1907+ y1="495.798"
1908+ x2="438.57144"
1909+ y2="504.798"
1910+ gradientUnits="userSpaceOnUse"
1911+ gradientTransform="matrix(2.0979702,0,0,2.125002,-475.87285,-578.27377)" />
1912+ <linearGradient
1913+ inkscape:collect="always"
1914+ id="linearGradient4770">
1915+ <stop
1916+ style="stop-color:#5c7b9e;stop-opacity:1"
1917+ offset="0"
1918+ id="stop4772" />
1919+ <stop
1920+ style="stop-color:#839dc0;stop-opacity:1"
1921+ offset="1"
1922+ id="stop4774" />
1923+ </linearGradient>
1924+ <linearGradient
1925+ inkscape:collect="always"
1926+ xlink:href="#linearGradient4591"
1927+ id="linearGradient4473"
1928+ gradientUnits="userSpaceOnUse"
1929+ gradientTransform="matrix(2.1742158,0,0,2.2000004,-853.88338,-1137.5558)"
1930+ x1="419.57144"
1931+ y1="541.79797"
1932+ x2="419.57144"
1933+ y2="489.798" />
1934+ <linearGradient
1935+ inkscape:collect="always"
1936+ xlink:href="#linearGradient4675"
1937+ id="linearGradient4475"
1938+ gradientUnits="userSpaceOnUse"
1939+ gradientTransform="matrix(2.1999994,0,0,2.2857128,-864.05691,-1182.9661)"
1940+ x1="394.57144"
1941+ y1="535.79797"
1942+ x2="404.57144"
1943+ y2="522.79797" />
1944+ <linearGradient
1945+ inkscape:collect="always"
1946+ xlink:href="#linearGradient4683"
1947+ id="linearGradient4477"
1948+ gradientUnits="userSpaceOnUse"
1949+ gradientTransform="matrix(2.1590488,0,0,2.2857134,-847.48945,-1182.9663)"
1950+ x1="404.57144"
1951+ y1="532.79797"
1952+ x2="421.57144"
1953+ y2="532.79797" />
1954+ <linearGradient
1955+ inkscape:collect="always"
1956+ xlink:href="#linearGradient4722"
1957+ id="linearGradient4479"
1958+ gradientUnits="userSpaceOnUse"
1959+ gradientTransform="matrix(2.215617,0,0,2.2857128,-872.0408,-1182.9661)"
1960+ x1="430.57144"
1961+ y1="536.79797"
1962+ x2="437.49963"
1963+ y2="524.79797" />
1964+ <linearGradient
1965+ inkscape:collect="always"
1966+ xlink:href="#linearGradient4834"
1967+ id="linearGradient4481"
1968+ gradientUnits="userSpaceOnUse"
1969+ gradientTransform="matrix(2.0979714,0,0,2.2000004,-820.4448,-1137.5558)"
1970+ x1="421.57144"
1971+ y1="514.79797"
1972+ x2="438.57144"
1973+ y2="514.79797" />
1974+ <linearGradient
1975+ inkscape:collect="always"
1976+ xlink:href="#linearGradient4778"
1977+ id="linearGradient4483"
1978+ gradientUnits="userSpaceOnUse"
1979+ gradientTransform="matrix(2.1999994,0,0,2.5502852,-864.05691,-1316.4319)"
1980+ x1="387.57144"
1981+ y1="525.79797"
1982+ x2="401.57144"
1983+ y2="513.79797" />
1984+ <linearGradient
1985+ inkscape:collect="always"
1986+ xlink:href="#linearGradient4591"
1987+ id="linearGradient4549"
1988+ gradientUnits="userSpaceOnUse"
1989+ gradientTransform="matrix(2.1742158,0,0,2.2000004,-757.88338,-1083.5558)"
1990+ x1="419.57144"
1991+ y1="541.79797"
1992+ x2="419.57144"
1993+ y2="489.798" />
1994+ <linearGradient
1995+ inkscape:collect="always"
1996+ xlink:href="#linearGradient4591"
1997+ id="linearGradient4551"
1998+ gradientUnits="userSpaceOnUse"
1999+ gradientTransform="matrix(2.1999994,0,0,2.2857128,-423.48547,-669.16809)"
2000+ x1="394.57144"
2001+ y1="535.79797"
2002+ x2="404.57144"
2003+ y2="522.79797" />
2004+ <linearGradient
2005+ inkscape:collect="always"
2006+ xlink:href="#linearGradient4834"
2007+ id="linearGradient4553"
2008+ gradientUnits="userSpaceOnUse"
2009+ gradientTransform="matrix(2.1590488,0,0,2.2857134,-751.48945,-1128.9663)"
2010+ x1="404.57144"
2011+ y1="532.79797"
2012+ x2="421.57144"
2013+ y2="532.79797" />
2014+ <linearGradient
2015+ inkscape:collect="always"
2016+ xlink:href="#linearGradient4802"
2017+ id="linearGradient4559"
2018+ gradientUnits="userSpaceOnUse"
2019+ gradientTransform="matrix(2.1999994,0,0,2.5502852,-423.48547,-802.63394)"
2020+ x1="387.57144"
2021+ y1="525.79797"
2022+ x2="401.57144"
2023+ y2="513.79797" />
2024+ <linearGradient
2025+ inkscape:collect="always"
2026+ xlink:href="#linearGradient4834"
2027+ id="linearGradient4561"
2028+ gradientUnits="userSpaceOnUse"
2029+ gradientTransform="matrix(2.1999994,0,0,2.2000004,-423.48547,-623.75782)"
2030+ x1="404.57144"
2031+ y1="510.798"
2032+ x2="391.57144"
2033+ y2="498.798" />
2034+ <linearGradient
2035+ inkscape:collect="always"
2036+ xlink:href="#linearGradient4834"
2037+ id="linearGradient4563"
2038+ gradientUnits="userSpaceOnUse"
2039+ gradientTransform="matrix(2.2352938,0,0,2.2000004,-782.33606,-1083.5558)"
2040+ x1="404.57144"
2041+ y1="501.798"
2042+ x2="421.57144"
2043+ y2="501.61618" />
2044+ </defs>
2045+ <sodipodi:namedview
2046+ id="base"
2047+ pagecolor="#ffffff"
2048+ bordercolor="#666666"
2049+ borderopacity="1.0"
2050+ inkscape:pageopacity="0"
2051+ inkscape:pageshadow="2"
2052+ inkscape:zoom="2.3036213"
2053+ inkscape:cx="45.044469"
2054+ inkscape:cy="72.689679"
2055+ inkscape:document-units="px"
2056+ inkscape:current-layer="layer1"
2057+ showgrid="true"
2058+ fit-margin-top="0"
2059+ fit-margin-left="0"
2060+ fit-margin-right="0"
2061+ fit-margin-bottom="0"
2062+ inkscape:window-width="1024"
2063+ inkscape:window-height="600"
2064+ inkscape:window-x="0"
2065+ inkscape:window-y="0"
2066+ inkscape:window-maximized="1"
2067+ inkscape:showpageshadow="false"
2068+ borderlayer="true"
2069+ showguides="true">
2070+ <inkscape:grid
2071+ type="xygrid"
2072+ id="grid4063"
2073+ originx="39.999998"
2074+ originy="40.000004"
2075+ empspacing="2" />
2076+ <sodipodi:guide
2077+ position="1.6503906e-06,128"
2078+ orientation="128,0"
2079+ id="guide4211" />
2080+ <sodipodi:guide
2081+ position="1.6503906e-06,-3.6328124e-06"
2082+ orientation="0,128"
2083+ id="guide4213" />
2084+ <sodipodi:guide
2085+ position="128,-3.6328124e-06"
2086+ orientation="-128,0"
2087+ id="guide4215" />
2088+ <sodipodi:guide
2089+ position="128,128"
2090+ orientation="0,-128"
2091+ id="guide4217" />
2092+ <sodipodi:guide
2093+ position="12.000002,116"
2094+ orientation="104,0"
2095+ id="guide4219" />
2096+ <sodipodi:guide
2097+ position="12.000002,11.999996"
2098+ orientation="0,104"
2099+ id="guide4221" />
2100+ <sodipodi:guide
2101+ position="116,11.999996"
2102+ orientation="-104,0"
2103+ id="guide4223" />
2104+ <sodipodi:guide
2105+ position="116,116"
2106+ orientation="0,-104"
2107+ id="guide4225" />
2108+ </sodipodi:namedview>
2109+ <metadata
2110+ id="metadata5458">
2111+ <rdf:RDF>
2112+ <cc:Work
2113+ rdf:about="">
2114+ <dc:format>image/svg+xml</dc:format>
2115+ <dc:type
2116+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
2117+ <dc:title></dc:title>
2118+ </cc:Work>
2119+ </rdf:RDF>
2120+ </metadata>
2121+ <g
2122+ inkscape:label="Capa 1"
2123+ inkscape:groupmode="layer"
2124+ id="layer1"
2125+ transform="translate(-344.57144,-459.79797)">
2126+ <path
2127+ style="opacity:1;fill:url(#linearGradient4272);fill-opacity:1;stroke:none;stroke-width:2.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.55026455"
2128+ d="m 394.57143,551.79794 0,15.27272 0,4.36364 0,4.36364 28,0 0,-4.36364 0,-4.36364 0,-15.27272 z"
2129+ id="rect4254"
2130+ inkscape:connector-curvature="0"
2131+ sodipodi:nodetypes="ccccccccc" />
2132+ <rect
2133+ style="opacity:1;fill:url(#linearGradient4250);fill-opacity:1;stroke:none;stroke-width:2.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.55026455"
2134+ id="rect4173"
2135+ width="128.00003"
2136+ height="82"
2137+ x="344.57144"
2138+ y="471.79797" />
2139+ <path
2140+ style="opacity:1;fill:url(#linearGradient4597-5);fill-opacity:1;stroke:none"
2141+ d="m 348.57143,483.79796 0,66 95.66548,0 0,-66 -95.66548,0 z"
2142+ id="path4589-5"
2143+ inkscape:connector-curvature="0" />
2144+ <path
2145+ style="fill:url(#linearGradient4681);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
2146+ d="m 370.57143,517.79798 -22,18.82144 0,13.17854 22,0 0,-31.99998 z"
2147+ id="path4476-9"
2148+ inkscape:connector-curvature="0" />
2149+ <path
2150+ sodipodi:nodetypes="cccc"
2151+ style="fill:url(#linearGradient4689);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
2152+ d="m 370.57143,519.798 0,29.99996 36.70382,0 z"
2153+ id="path4478-4"
2154+ inkscape:connector-curvature="0" />
2155+ <path
2156+ style="fill:url(#linearGradient4728);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
2157+ d="m 444.57143,517.79798 -38,31.99998 38,2e-5 z"
2158+ id="path4488-0-8"
2159+ inkscape:connector-curvature="0"
2160+ sodipodi:nodetypes="cccc" />
2161+ <path
2162+ style="fill:url(#linearGradient4840);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
2163+ d="m 408.57143,536.59796 0,-48.79998 36,30 -36,31.99998 z"
2164+ id="path4188-3"
2165+ inkscape:connector-curvature="0"
2166+ sodipodi:nodetypes="ccccc" />
2167+ <path
2168+ sodipodi:nodetypes="cccc"
2169+ style="fill:url(#linearGradient4784);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
2170+ d="m 348.57143,499.79798 0,42.00002 22,-22 z"
2171+ id="path4192-6"
2172+ inkscape:connector-curvature="0" />
2173+ <path
2174+ sodipodi:nodetypes="cccccc"
2175+ style="fill:url(#linearGradient4792);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
2176+ d="m 348.57143,483.79796 0,17.08438 22,18.91566 0,-14.00004 0,-22 z"
2177+ id="path4198-3"
2178+ inkscape:connector-curvature="0" />
2179+ <path
2180+ sodipodi:nodetypes="cccccc"
2181+ style="fill:url(#linearGradient4808);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
2182+ d="m 370.57143,483.79796 0,22 0,14.00004 38,-32.00002 -6,-4 z"
2183+ id="path4200-1"
2184+ inkscape:connector-curvature="0" />
2185+ <path
2186+ style="fill:url(#linearGradient4776);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
2187+ d="m 413.66883,483.79796 -5.0974,4.00002 36,30 0,-12 0,-22 z"
2188+ id="path4202-1"
2189+ inkscape:connector-curvature="0"
2190+ sodipodi:nodetypes="cccccc" />
2191+ <rect
2192+ style="opacity:1;fill:#99a1a7;fill-opacity:1;stroke:none;stroke-width:2.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.55026455"
2193+ id="rect4295"
2194+ width="47.999939"
2195+ height="2.0000367"
2196+ x="384.57144"
2197+ y="573.79797" />
2198+ <g
2199+ id="g4420">
2200+ <rect
2201+ y="541.79797"
2202+ x="348.57144"
2203+ height="7.999939"
2204+ width="120"
2205+ id="rect4267"
2206+ style="opacity:1;fill:#ffffff;fill-opacity:0.78431373;stroke:none" />
2207+ <circle
2208+ r="2"
2209+ cy="545.79785"
2210+ cx="462.57144"
2211+ id="path4166"
2212+ style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-opacity:1" />
2213+ <path
2214+ sodipodi:nodetypes="cccccccccc"
2215+ id="rect4183"
2216+ d="m 352.57143,543.79798 0,2 2,0 0,-2 z m 2,2 0,2 2,0 0,-2 z"
2217+ style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-opacity:1"
2218+ inkscape:connector-curvature="0" />
2219+ </g>
2220+ <g
2221+ id="g4411">
2222+ <rect
2223+ y="487.798"
2224+ x="352.57144"
2225+ height="33.999989"
2226+ width="39.999973"
2227+ id="rect3432"
2228+ style="fill:#ffffff;fill-opacity:0.78431373;stroke:none" />
2229+ <path
2230+ sodipodi:nodetypes="cccccc"
2231+ inkscape:connector-curvature="0"
2232+ id="rect4235"
2233+ d="m 370.57143,489.79798 0,10 8,0 0,-6 -4,-4 z"
2234+ style="opacity:1;fill:#ff9955;fill-opacity:1;stroke:none" />
2235+ <path
2236+ inkscape:connector-curvature="0"
2237+ id="path4237"
2238+ d="m 374.57143,489.79798 4,4 -4,0 z"
2239+ style="fill:#d45500;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
2240+ <path
2241+ inkscape:connector-curvature="0"
2242+ id="path4409"
2243+ d="m 354.57144,489.79797 0,3 8,0 -3.4286,-3 z"
2244+ style="fill:#3580ca;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
2245+ <path
2246+ sodipodi:nodetypes="ccccc"
2247+ inkscape:connector-curvature="0"
2248+ id="rect4272"
2249+ d="m 354.57143,491.79798 11,0 0,8 -11,0 z"
2250+ style="fill:#7aabdc;fill-opacity:1;stroke:none" />
2251+ <path
2252+ style="opacity:1;fill:#71c837;fill-opacity:1;stroke:none"
2253+ d="m 382.57143,489.79798 0,10 8,0 0,-6 -4,-4 z"
2254+ id="path4275"
2255+ inkscape:connector-curvature="0"
2256+ sodipodi:nodetypes="cccccc" />
2257+ <path
2258+ style="fill:#447821;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
2259+ d="m 386.57143,489.79798 4,4 -4,0 z"
2260+ id="path4277"
2261+ inkscape:connector-curvature="0" />
2262+ </g>
2263+ <path
2264+ style="opacity:1;fill:url(#linearGradient4473);fill-opacity:1;stroke:none"
2265+ d="M 4 16 L 4 28 L 99.666016 28 L 99.666016 16 L 4 16 z "
2266+ transform="translate(344.57144,459.79797)"
2267+ id="path4425" />
2268+ <path
2269+ style="fill:url(#linearGradient4475);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
2270+ d="M 4 16 L 4 28 L 26 28 L 26 16 L 4 16 z "
2271+ transform="translate(344.57144,459.79797)"
2272+ id="path4427" />
2273+ <path
2274+ style="fill:url(#linearGradient4477);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
2275+ d="M 26 16 L 26 28 L 62.703125 28 L 48.021484 16 L 26 16 z "
2276+ transform="translate(344.57144,459.79797)"
2277+ id="path4429" />
2278+ <path
2279+ style="fill:url(#linearGradient4479);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
2280+ d="M 76.25 16 L 62 28 L 100 28 L 100 16 L 76.25 16 z "
2281+ transform="translate(344.57144,459.79797)"
2282+ id="path4431" />
2283+ <path
2284+ style="fill:url(#linearGradient4481);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
2285+ d="M 64 16 L 64 28 L 77.5 16 L 64 16 z "
2286+ transform="translate(344.57144,459.79797)"
2287+ id="path4433" />
2288+ <path
2289+ style="fill:url(#linearGradient4483);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
2290+ d="M 4 16 L 4 20 L 8 16 L 4 16 z "
2291+ transform="translate(344.57144,459.79797)"
2292+ id="path4435" />
2293+ <path
2294+ style="opacity:1;fill:url(#linearGradient4549);fill-opacity:1;stroke:none"
2295+ d="M 100 16 L 100 82 L 124 82 L 124 16 L 100 16 z "
2296+ transform="translate(344.57144,459.79797)"
2297+ id="path4501" />
2298+ <path
2299+ style="fill:url(#linearGradient4551);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
2300+ d="m 466.57143,509.79798 -22,18.82144 0,13.17854 22,0 0,-31.99998 z"
2301+ id="path4503"
2302+ inkscape:connector-curvature="0" />
2303+ <path
2304+ style="fill:url(#linearGradient4553);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
2305+ d="M 122 52 L 122 82 L 124 82 L 124 53.634766 L 122 52 z "
2306+ transform="translate(344.57144,459.79797)"
2307+ id="path4505" />
2308+ <path
2309+ sodipodi:nodetypes="cccc"
2310+ style="fill:url(#linearGradient4559);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
2311+ d="m 444.57143,491.79798 0,42.00002 22,-22 z"
2312+ id="path4511"
2313+ inkscape:connector-curvature="0" />
2314+ <path
2315+ sodipodi:nodetypes="cccccc"
2316+ style="fill:url(#linearGradient4561);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
2317+ d="m 444.57143,475.79796 0,17.08438 22,18.91566 0,-14.00004 0,-22 z"
2318+ id="path4513"
2319+ inkscape:connector-curvature="0" />
2320+ <path
2321+ style="fill:url(#linearGradient4563);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
2322+ d="M 122 16 L 122 38 L 122 52 L 124 50.316406 L 124 16 L 122 16 z "
2323+ transform="translate(344.57144,459.79797)"
2324+ id="path4515" />
2325+ <path
2326+ style="opacity:0.2;fill:url(#linearGradient4388);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
2327+ d="M 53 64 L 27 87 L 24 116 L 88 116 L 88 114 L 78 114 L 78 94 L 81.75 92.75 L 53 64 z "
2328+ transform="translate(344.57144,459.79797)"
2329+ id="path4377" />
2330+ <rect
2331+ ry="0"
2332+ y="523.7981"
2333+ x="371.57144"
2334+ height="23.999866"
2335+ width="26"
2336+ id="rect4317"
2337+ style="opacity:1;fill:url(#linearGradient4319);fill-opacity:1;stroke:none" />
2338+ <rect
2339+ style="opacity:1;fill:url(#linearGradient4158);fill-opacity:1;stroke:none"
2340+ id="rect4139"
2341+ width="32"
2342+ height="28.999859"
2343+ x="368.57144"
2344+ y="546.79797"
2345+ ry="0" />
2346+ <path
2347+ inkscape:connector-curvature="0"
2348+ style="opacity:0.2;fill:url(#linearGradient4231);fill-opacity:1;stroke:none;stroke-opacity:1"
2349+ d="m 381.27847,554.09091 -1.41406,1.41406 8,8 -0.29297,0.29297 12,12 1,0 0,-9 -8,-8 -3.29297,3.29297 -8,-8 z m -2.14648,6.14648 -2.1211,2.1211 5.5,5.5 -1.35351,1.35351 6.58593,6.58594 6.95118,0 -15.5625,-15.56055 z"
2350+ id="rect4200" />
2351+ <path
2352+ inkscape:connector-curvature="0"
2353+ style="opacity:1;fill:url(#linearGradient4301);fill-opacity:1;stroke:none"
2354+ d="m 380.57144,553.79794 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 7,0 -2,2 3,3 -3,3 2,2 3,-3 2,-2 -5,-5 z m -9.5,6 c -0.831,0 -1.5,0.669 -1.5,1.5 0,0.831 0.669,1.5 1.5,1.5 0.831,0 1.5,-0.669 1.5,-1.5 0,-0.831 -0.669,-1.5 -1.5,-1.5 z m 4.5,6 c -1.108,0 -2,0.892 -2,2 0,1.108 0.892,2 2,2 1.108,0 2,-0.892 2,-2 0,-1.108 -0.892,-2 -2,-2 z"
2355+ id="path4292" />
2356+ <rect
2357+ style="opacity:1;fill:#0c69cf;fill-opacity:1;stroke:none;stroke-width:2.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.55026455"
2358+ id="rect4492"
2359+ width="32"
2360+ height="1.0000228"
2361+ x="368.57144"
2362+ y="574.79797" />
2363+ <rect
2364+ style="opacity:1;fill:#23262c;fill-opacity:1;stroke:none"
2365+ id="rect4359"
2366+ width="8.0000525"
2367+ height="8.0000525"
2368+ x="374.57144"
2369+ y="527.79791" />
2370+ <rect
2371+ y="527.79791"
2372+ x="386.57153"
2373+ height="8.0000525"
2374+ width="8.0000525"
2375+ id="rect4361"
2376+ style="opacity:1;fill:#23262c;fill-opacity:1;stroke:none" />
2377+ <rect
2378+ style="opacity:1;fill:url(#linearGradient4371);fill-opacity:1;stroke:none"
2379+ id="rect4363"
2380+ width="4.0000238"
2381+ height="8"
2382+ x="376.57144"
2383+ y="527.79791" />
2384+ <rect
2385+ y="527.79791"
2386+ x="388.57153"
2387+ height="8"
2388+ width="4.0000238"
2389+ id="rect4373"
2390+ style="opacity:1;fill:url(#linearGradient4375);fill-opacity:1;stroke:none" />
2391+ </g>
2392+</svg>
2393
2394=== modified file 'gui/qt/images/try.png'
2395Binary files gui/qt/images/try.png 2013-03-22 15:15:10 +0000 and gui/qt/images/try.png 2015-09-09 14:58:25 +0000 differ
2396=== modified file 'gui/qt/stepKeyboardConf.ui'
2397--- gui/qt/stepKeyboardConf.ui 2011-09-19 12:12:29 +0000
2398+++ gui/qt/stepKeyboardConf.ui 2015-09-09 14:58:25 +0000
2399@@ -45,29 +45,60 @@
2400 </widget>
2401 </item>
2402 <item>
2403- <layout class="QFormLayout" name="formLayout">
2404- <property name="fieldGrowthPolicy">
2405- <enum>QFormLayout::ExpandingFieldsGrow</enum>
2406- </property>
2407- <item row="0" column="0">
2408- <widget class="QLabel" name="keyboard_layout_label">
2409- <property name="text">
2410- <string>Layout:</string>
2411- </property>
2412- </widget>
2413- </item>
2414- <item row="0" column="1">
2415- <widget class="QComboBox" name="keyboard_layout_combobox"/>
2416- </item>
2417- <item row="1" column="0">
2418- <widget class="QLabel" name="keyboard_variant_label">
2419- <property name="text">
2420- <string>Variant:</string>
2421- </property>
2422- </widget>
2423- </item>
2424- <item row="1" column="1">
2425- <widget class="QComboBox" name="keyboard_variant_combobox"/>
2426+ <layout class="QHBoxLayout" name="horizontalLayout">
2427+ <item>
2428+ <layout class="QFormLayout" name="formLayout">
2429+ <property name="fieldGrowthPolicy">
2430+ <enum>QFormLayout::ExpandingFieldsGrow</enum>
2431+ </property>
2432+ <item row="0" column="0">
2433+ <widget class="QLabel" name="keyboard_layout_label">
2434+ <property name="text">
2435+ <string>Layout:</string>
2436+ </property>
2437+ </widget>
2438+ </item>
2439+ <item row="0" column="1">
2440+ <widget class="QComboBox" name="keyboard_layout_combobox">
2441+ <property name="sizePolicy">
2442+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
2443+ <horstretch>0</horstretch>
2444+ <verstretch>0</verstretch>
2445+ </sizepolicy>
2446+ </property>
2447+ </widget>
2448+ </item>
2449+ <item row="1" column="0">
2450+ <widget class="QLabel" name="keyboard_variant_label">
2451+ <property name="text">
2452+ <string>Variant:</string>
2453+ </property>
2454+ </widget>
2455+ </item>
2456+ <item row="1" column="1">
2457+ <widget class="QComboBox" name="keyboard_variant_combobox">
2458+ <property name="sizePolicy">
2459+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
2460+ <horstretch>0</horstretch>
2461+ <verstretch>0</verstretch>
2462+ </sizepolicy>
2463+ </property>
2464+ </widget>
2465+ </item>
2466+ </layout>
2467+ </item>
2468+ <item>
2469+ <spacer name="horizontalSpacer">
2470+ <property name="orientation">
2471+ <enum>Qt::Horizontal</enum>
2472+ </property>
2473+ <property name="sizeHint" stdset="0">
2474+ <size>
2475+ <width>40</width>
2476+ <height>20</height>
2477+ </size>
2478+ </property>
2479+ </spacer>
2480 </item>
2481 </layout>
2482 </item>
2483
2484=== modified file 'gui/qt/stepUserSetup.ui'
2485--- gui/qt/stepUserSetup.ui 2013-01-31 13:55:30 +0000
2486+++ gui/qt/stepUserSetup.ui 2015-09-09 14:58:25 +0000
2487@@ -7,7 +7,7 @@
2488 <x>0</x>
2489 <y>0</y>
2490 <width>695</width>
2491- <height>475</height>
2492+ <height>479</height>
2493 </rect>
2494 </property>
2495 <property name="windowTitle">
2496@@ -105,9 +105,15 @@
2497 </item>
2498 <item row="0" column="0">
2499 <widget class="QLineEdit" name="fullname">
2500+ <property name="sizePolicy">
2501+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
2502+ <horstretch>0</horstretch>
2503+ <verstretch>0</verstretch>
2504+ </sizepolicy>
2505+ </property>
2506 <property name="minimumSize">
2507 <size>
2508- <width>300</width>
2509+ <width>200</width>
2510 <height>0</height>
2511 </size>
2512 </property>
2513
2514=== modified file 'gui/qt/style.qss'
2515--- gui/qt/style.qss 2013-07-30 13:55:02 +0000
2516+++ gui/qt/style.qss 2015-09-09 14:58:25 +0000
2517@@ -43,7 +43,7 @@
2518 }
2519
2520 #steps_widget QLabel {
2521- color: #ddd;
2522+ color: #fff;
2523 }
2524
2525 /*- Errors ----------------------------------*/
2526@@ -67,7 +67,7 @@
2527 #userinfo_heading_label,
2528 #reading_heading_label
2529 {
2530- color: #0088aa;
2531+ color: #3DAEE9;
2532 font-size: 10pt;
2533 qproperty-alignment: AlignCenter;
2534 }
2535
2536=== modified file 'ubiquity/frontend/kde_ui.py'
2537--- ubiquity/frontend/kde_ui.py 2015-08-31 16:30:49 +0000
2538+++ ubiquity/frontend/kde_ui.py 2015-09-09 14:58:25 +0000
2539@@ -49,6 +49,7 @@
2540 from ubiquity.frontend.kde_components.Breadcrumb import Breadcrumb
2541 from ubiquity.frontend.kde_components import qssutils
2542 from ubiquity.plugin import Plugin
2543+from ubiquity.qtwidgets import SquareSvgWidget
2544 import ubiquity.progressposition
2545
2546
2547@@ -164,6 +165,8 @@
2548 # might kick in such as in QIconLoader.cpp:QString fallbackTheme.
2549 # http://goo.gl/6LkM7X
2550 os.environ["KDE_SESSION_VERSION"] = "4"
2551+ # Pretty much all of the above but for Qt5
2552+ os.environ["QT_QPA_PLATFORMTHEME"] = "kde"
2553
2554 self.app = QtGui.QApplication([])
2555 # The "hicolor" icon theme gets picked when Ubiquity is running as a
2556@@ -179,6 +182,10 @@
2557
2558 self.ui = UbiquityUI()
2559
2560+ self.icon_widget = SquareSvgWidget(self.ui)
2561+ self.icon_widget.load("/usr/share/ubiquity/qt/images/branding.svgz")
2562+ self.ui.sidebar_widget.layout().addWidget(self.icon_widget)
2563+
2564 # initially the steps widget is not visible
2565 # it becomes visible once the first step becomes active
2566 self.ui.steps_widget.setVisible(False)
2567
2568=== modified file 'ubiquity/qtwidgets.py'
2569--- ubiquity/qtwidgets.py 2013-03-12 14:21:52 +0000
2570+++ ubiquity/qtwidgets.py 2015-09-09 14:58:25 +0000
2571@@ -1,8 +1,21 @@
2572 from __future__ import print_function
2573
2574 import sys
2575-
2576-from PyQt4.QtGui import QWidget, QHBoxLayout, QLabel, QPixmap
2577+import os.path
2578+
2579+from PyQt4.QtGui import QWidget, QHBoxLayout, QLabel, QSizePolicy
2580+from PyQt4.QtSvg import QSvgWidget
2581+
2582+
2583+class SquareSvgWidget(QSvgWidget):
2584+ def __init__(self, parent=None):
2585+ QSvgWidget.__init__(self, parent)
2586+ sizePolicy = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
2587+ sizePolicy.setHeightForWidth(True)
2588+ self.setSizePolicy(sizePolicy)
2589+
2590+ def heightForWidth(self, width):
2591+ return width
2592
2593
2594 class StateBox(QWidget):
2595@@ -10,7 +23,7 @@
2596 QWidget.__init__(self, parent)
2597
2598 self.label = QLabel(text, self)
2599- self.image = QLabel(self)
2600+ self.image = SquareSvgWidget(self)
2601
2602 layout = QHBoxLayout(self)
2603 layout.setContentsMargins(0, 0, 0, 0)
2604@@ -24,12 +37,14 @@
2605 self.status = state
2606 if state:
2607 # A tickmark
2608- name = "dialog-ok-apply.png"
2609+ name = "dialog-ok-apply.svg"
2610 else:
2611 # A cross
2612- name = "edit-delete.png"
2613- name = "/usr/share/icons/oxygen/22x22/actions/" + name
2614- self.image.setPixmap(QPixmap(name))
2615+ name = "edit-delete.svg"
2616+ icon = "/usr/share/icons/breeze/actions/22/" + name
2617+ if not os.path.isfile(icon):
2618+ icon = "/usr/share/icons/breeze/actions/toolbar/" + name
2619+ self.image.load(icon)
2620
2621 def get_state(self):
2622 return self.status

Subscribers

People subscribed via source and target branches

to status/vote changes: