ubiquity

Merge lp:~agateau/ubiquity/layout-refresh into lp:ubiquity

  1. layout-refresh
  2. Merge into trunk
Proposed by Aurélien Gâteau
Status: Superseded
Proposed branch: lp:~agateau/ubiquity/layout-refresh
Merge into: lp:ubiquity
Diff against target: 2024 lines (+745/-802)
11 files modified
gui/qt/app.ui (+289/-429)
gui/qt/stepLanguage.ui (+91/-59)
gui/qt/stepLocation.ui (+67/-29)
gui/qt/stepPartMan.ui (+56/-55)
gui/qt/style.qss (+51/-99)
gui/qt/style_small.qss (+0/-18)
ubiquity/frontend/kde_components/Breadcrumb.py (+88/-0)
ubiquity/frontend/kde_components/SqueezeLabel.py (+0/-22)
ubiquity/frontend/kde_components/Timezone.py (+22/-4)
ubiquity/frontend/kde_components/testing/timezonemap.py (+20/-0)
ubiquity/frontend/kde_ui.py (+61/-87)
To merge this branch: bzr merge lp:~agateau/ubiquity/layout-refresh
Reviewer Review Type Date Requested Status
Jonathan Riddell Pending
Review via email: mp+150861@code.launchpad.net

This proposal supersedes a proposal from 2013-02-22.

This proposal has been superseded by a proposal from 2013-02-27.

Description of the change

This branch turns the Ubiquity KDE window into a regular window and rework the layout of widgets to provide more space to the main content. The labels on the left now wrap to the next line if they are too long, ensuring they are never truncated.

To post a comment you must log in.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'gui/qt/app.ui'
--- gui/qt/app.ui 2010-09-22 13:08:34 +0000
+++ gui/qt/app.ui 2013-02-27 17:37:28 +0000
@@ -6,8 +6,8 @@
6 <rect>6 <rect>
7 <x>0</x>7 <x>0</x>
8 <y>0</y>8 <y>0</y>
9 <width>809</width>9 <width>505</width>
10 <height>638</height>10 <height>534</height>
11 </rect>11 </rect>
12 </property>12 </property>
13 <property name="windowTitle">13 <property name="windowTitle">
@@ -15,462 +15,322 @@
15 </property>15 </property>
16 <widget class="QWidget" name="centralwidget">16 <widget class="QWidget" name="centralwidget">
17 <layout class="QGridLayout" name="gridLayout">17 <layout class="QGridLayout" name="gridLayout">
18 <item row="0" column="1">18 <property name="margin">
19 <spacer name="verticalSpacer">19 <number>0</number>
20 <property name="orientation">20 </property>
21 <enum>Qt::Vertical</enum>21 <property name="spacing">
22 </property>22 <number>0</number>
23 <property name="sizeHint" stdset="0">23 </property>
24 <size>24 <item row="1" column="2">
25 <width>20</width>25 <widget class="QStackedWidget" name="pageMode">
26 <height>42</height>26 <property name="sizePolicy">
27 </size>27 <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
28 </property>28 <horstretch>0</horstretch>
29 </spacer>29 <verstretch>0</verstretch>
30 </item>30 </sizepolicy>
31 <item row="1" column="0">31 </property>
32 <spacer name="horizontalSpacer">32 <property name="currentIndex">
33 <property name="orientation">33 <number>0</number>
34 <enum>Qt::Horizontal</enum>34 </property>
35 </property>35 <widget class="QWidget" name="page_7">
36 <property name="sizeHint" stdset="0">36 <layout class="QVBoxLayout" name="verticalLayout_2">
37 <size>37 <property name="margin">
38 <width>98</width>38 <number>0</number>
39 <height>20</height>39 </property>
40 </size>40 <item>
41 </property>41 <widget class="QWidget" name="content_widget" native="true">
42 </spacer>42 <property name="sizePolicy">
43 </item>43 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
44 <item row="1" column="1">44 <horstretch>0</horstretch>
45 <widget class="QFrame" name="main_frame">45 <verstretch>0</verstretch>
46 <property name="sizePolicy">46 </sizepolicy>
47 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">47 </property>
48 <layout class="QVBoxLayout" name="verticalLayout">
49 <property name="margin">
50 <number>0</number>
51 </property>
52 <item>
53 <widget class="QWidget" name="widgetStack" native="true">
54 <property name="sizePolicy">
55 <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
56 <horstretch>0</horstretch>
57 <verstretch>0</verstretch>
58 </sizepolicy>
59 </property>
60 </widget>
61 </item>
62 </layout>
63 </widget>
64 </item>
65 </layout>
66 </widget>
67 <widget class="QWidget" name="page_8">
68 <layout class="QVBoxLayout" name="verticalLayout_8">
69 <item>
70 <widget class="QWidget" name="content_widget_2" native="true">
71 <property name="sizePolicy">
72 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
73 <horstretch>0</horstretch>
74 <verstretch>0</verstretch>
75 </sizepolicy>
76 </property>
77 <layout class="QVBoxLayout" name="verticalLayout_7">
78 <property name="leftMargin">
79 <number>0</number>
80 </property>
81 </layout>
82 </widget>
83 </item>
84 </layout>
85 </widget>
86 </widget>
87 </item>
88 <item row="0" column="0" rowspan="3">
89 <widget class="QWidget" name="sidebar_widget" native="true">
90 <property name="sizePolicy">
91 <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
48 <horstretch>0</horstretch>92 <horstretch>0</horstretch>
49 <verstretch>0</verstretch>93 <verstretch>0</verstretch>
50 </sizepolicy>94 </sizepolicy>
51 </property>95 </property>
52 <property name="minimumSize">96 <property name="minimumSize">
53 <size>97 <size>
54 <width>750</width>98 <width>150</width>
55 <height>550</height>99 <height>0</height>
56 </size>100 </size>
57 </property>101 </property>
58 <property name="maximumSize">102 <property name="maximumSize">
59 <size>103 <size>
60 <width>750</width>104 <width>150</width>
61 <height>550</height>105 <height>16777215</height>
62 </size>106 </size>
63 </property>107 </property>
64 <property name="frameShape">108 <layout class="QVBoxLayout" name="verticalLayout_3">
65 <enum>QFrame::StyledPanel</enum>109 <property name="spacing">
66 </property>110 <number>0</number>
67 <property name="frameShadow">111 </property>
68 <enum>QFrame::Raised</enum>112 <property name="margin">
69 </property>113 <number>0</number>
70 <layout class="QHBoxLayout" name="horizontalLayout_3">114 </property>
71 <item>115 <item>
72 <widget class="QWidget" name="main_widget" native="true">116 <widget class="QFrame" name="sidebar_header_frame">
73 <layout class="QGridLayout" name="gridLayout_4">117 <property name="sizePolicy">
74 <property name="horizontalSpacing">118 <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
119 <horstretch>0</horstretch>
120 <verstretch>0</verstretch>
121 </sizepolicy>
122 </property>
123 <layout class="QVBoxLayout" name="verticalLayout_4">
124 <item>
125 <widget class="QLabel" name="distro_name_label">
126 <property name="text">
127 <string>Kubuntu</string>
128 </property>
129 <property name="scaledContents">
130 <bool>false</bool>
131 </property>
132 <property name="alignment">
133 <set>Qt::AlignHCenter|Qt::AlignTop</set>
134 </property>
135 </widget>
136 </item>
137 <item>
138 <widget class="QLabel" name="distro_release_label">
139 <property name="text">
140 <string>karmic</string>
141 </property>
142 <property name="alignment">
143 <set>Qt::AlignHCenter|Qt::AlignTop</set>
144 </property>
145 </widget>
146 </item>
147 <item>
148 <widget class="QLabel" name="install_process_label">
149 <property name="text">
150 <string>Installation Process</string>
151 </property>
152 <property name="alignment">
153 <set>Qt::AlignHCenter|Qt::AlignTop</set>
154 </property>
155 </widget>
156 </item>
157 </layout>
158 </widget>
159 </item>
160 <item>
161 <widget class="QWidget" name="steps_widget" native="true">
162 <property name="sizePolicy">
163 <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
164 <horstretch>0</horstretch>
165 <verstretch>0</verstretch>
166 </sizepolicy>
167 </property>
168 <layout class="QVBoxLayout" name="verticalLayout_5">
169 <property name="spacing">
75 <number>0</number>170 <number>0</number>
76 </property>171 </property>
77 <property name="margin">172 <property name="margin">
78 <number>0</number>173 <number>0</number>
79 </property>174 </property>
80 <item row="0" column="0" colspan="2">175 <item>
81 <widget class="QWidget" name="widget_4" native="true">176 <widget class="QWidget" name="steps_filler_widget" native="true">
82 <layout class="QGridLayout" name="gridLayout_5">
83 <property name="leftMargin">
84 <number>1</number>
85 </property>
86 <property name="topMargin">
87 <number>0</number>
88 </property>
89 <property name="rightMargin">
90 <number>0</number>
91 </property>
92 <property name="bottomMargin">
93 <number>0</number>
94 </property>
95 <property name="horizontalSpacing">
96 <number>3</number>
97 </property>
98 <item row="0" column="0">
99 <widget class="QWidget" name="title_widget" native="true">
100 <layout class="QHBoxLayout" name="horizontalLayout_4">
101 <property name="topMargin">
102 <number>0</number>
103 </property>
104 <property name="bottomMargin">
105 <number>0</number>
106 </property>
107 <item>
108 <widget class="QLabel" name="distro_name_label">
109 <property name="text">
110 <string>Kubuntu</string>
111 </property>
112 <property name="scaledContents">
113 <bool>false</bool>
114 </property>
115 <property name="alignment">
116 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
117 </property>
118 <property name="indent">
119 <number>0</number>
120 </property>
121 </widget>
122 </item>
123 <item>
124 <widget class="QLabel" name="distro_release_label">
125 <property name="text">
126 <string>karmic</string>
127 </property>
128 <property name="alignment">
129 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
130 </property>
131 <property name="indent">
132 <number>0</number>
133 </property>
134 </widget>
135 </item>
136 <item>
137 <spacer name="horizontalSpacer_13">
138 <property name="orientation">
139 <enum>Qt::Horizontal</enum>
140 </property>
141 <property name="sizeHint" stdset="0">
142 <size>
143 <width>0</width>
144 <height>0</height>
145 </size>
146 </property>
147 </spacer>
148 </item>
149 <item>
150 <widget class="QPushButton" name="minimize_button">
151 <property name="minimumSize">
152 <size>
153 <width>14</width>
154 <height>14</height>
155 </size>
156 </property>
157 <property name="maximumSize">
158 <size>
159 <width>14</width>
160 <height>14</height>
161 </size>
162 </property>
163 <property name="cursor">
164 <cursorShape>PointingHandCursor</cursorShape>
165 </property>
166 <property name="toolTip">
167 <string>minimize</string>
168 </property>
169 <property name="text">
170 <string/>
171 </property>
172 <property name="flat">
173 <bool>true</bool>
174 </property>
175 </widget>
176 </item>
177 </layout>
178 </widget>
179 </item>
180 <item row="1" column="0">
181 <widget class="QWidget" name="progress_widget" native="true">
182 <layout class="QHBoxLayout" name="horizontalLayout_5">
183 <property name="topMargin">
184 <number>0</number>
185 </property>
186 <property name="bottomMargin">
187 <number>0</number>
188 </property>
189 <item>
190 <widget class="QLabel" name="install_process_label">
191 <property name="minimumSize">
192 <size>
193 <width>0</width>
194 <height>20</height>
195 </size>
196 </property>
197 <property name="text">
198 <string>Installation Process</string>
199 </property>
200 <property name="alignment">
201 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
202 </property>
203 <property name="indent">
204 <number>0</number>
205 </property>
206 </widget>
207 </item>
208 <item>
209 <spacer name="horizontalSpacer_3">
210 <property name="orientation">
211 <enum>Qt::Horizontal</enum>
212 </property>
213 <property name="sizeType">
214 <enum>QSizePolicy::Maximum</enum>
215 </property>
216 <property name="sizeHint" stdset="0">
217 <size>
218 <width>20</width>
219 <height>16</height>
220 </size>
221 </property>
222 </spacer>
223 </item>
224 <item>
225 <widget class="QProgressBar" name="progressBar">
226 <property name="maximumSize">
227 <size>
228 <width>16777215</width>
229 <height>16</height>
230 </size>
231 </property>
232 <property name="value">
233 <number>24</number>
234 </property>
235 </widget>
236 </item>
237 <item>
238 <widget class="QPushButton" name="progressCancel">
239 <property name="sizePolicy">
240 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
241 <horstretch>0</horstretch>
242 <verstretch>0</verstretch>
243 </sizepolicy>
244 </property>
245 <property name="maximumSize">
246 <size>
247 <width>16777215</width>
248 <height>20</height>
249 </size>
250 </property>
251 <property name="text">
252 <string>X</string>
253 </property>
254 </widget>
255 </item>
256 </layout>
257 </widget>
258 </item>
259 </layout>
260 </widget>
261 </item>
262 <item row="1" column="0">
263 <widget class="QWidget" name="steps_widget" native="true">
264 <property name="sizePolicy">177 <property name="sizePolicy">
265 <sizepolicy hsizetype="Minimum" vsizetype="Preferred">178 <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
266 <horstretch>0</horstretch>179 <horstretch>0</horstretch>
267 <verstretch>0</verstretch>180 <verstretch>0</verstretch>
268 </sizepolicy>181 </sizepolicy>
269 </property>182 </property>
270 <property name="maximumSize">183 </widget>
184 </item>
185 </layout>
186 </widget>
187 </item>
188 <item>
189 <widget class="QFrame" name="sidebar_footer_frame">
190 <property name="sizePolicy">
191 <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
192 <horstretch>0</horstretch>
193 <verstretch>0</verstretch>
194 </sizepolicy>
195 </property>
196 <layout class="QHBoxLayout" name="horizontalLayout_7">
197 <property name="margin">
198 <number>0</number>
199 </property>
200 <item>
201 <widget class="QPushButton" name="quit">
202 <property name="text">
203 <string>Quit</string>
204 </property>
205 <property name="autoDefault">
206 <bool>true</bool>
207 </property>
208 </widget>
209 </item>
210 <item>
211 <spacer name="horizontalSpacer">
212 <property name="orientation">
213 <enum>Qt::Horizontal</enum>
214 </property>
215 <property name="sizeHint" stdset="0">
271 <size>216 <size>
272 <width>150</width>217 <width>40</width>
273 <height>16777215</height>218 <height>20</height>
274 </size>219 </size>
275 </property>220 </property>
276 <layout class="QVBoxLayout" name="verticalLayout_5">221 </spacer>
277 <property name="rightMargin">222 </item>
278 <number>0</number>223 </layout>
279 </property>224 </widget>
280 <item>225 </item>
281 <widget class="SqueezeLabel" name="breadcrumb_install">226 </layout>
282 <property name="text">227 </widget>
283 <string>Install</string>228 </item>
284 </property>229 <item row="2" column="1" colspan="2">
285 </widget>230 <widget class="QFrame" name="footer_frame">
286 </item>231 <property name="sizePolicy">
287 <item>232 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
288 <spacer name="verticalSpacer_3">233 <horstretch>0</horstretch>
289 <property name="orientation">234 <verstretch>0</verstretch>
290 <enum>Qt::Vertical</enum>235 </sizepolicy>
291 </property>236 </property>
292 <property name="sizeHint" stdset="0">237 <layout class="QHBoxLayout" name="horizontalLayout">
293 <size>238 <property name="margin">
294 <width>20</width>239 <number>0</number>
295 <height>40</height>240 </property>
296 </size>241 <item>
297 </property>242 <widget class="QStackedWidget" name="progress_stack">
298 </spacer>243 <property name="sizePolicy">
299 </item>244 <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
300 </layout>245 <horstretch>0</horstretch>
301 </widget>246 <verstretch>0</verstretch>
302 </item>247 </sizepolicy>
303 <item row="1" column="1">248 </property>
304 <widget class="QStackedWidget" name="pageMode">249 <widget class="QWidget" name="progress_widget">
305 <property name="currentIndex">250 <layout class="QHBoxLayout" name="horizontalLayout_5">
306 <number>0</number>251 <property name="margin">
307 </property>252 <number>0</number>
308 <widget class="QWidget" name="page_7">253 </property>
309 <layout class="QVBoxLayout" name="verticalLayout_2">254 <item>
310 <property name="margin">255 <widget class="QProgressBar" name="progressBar">
311 <number>0</number>256 <property name="value">
312 </property>257 <number>24</number>
313 <item>258 </property>
314 <widget class="QWidget" name="content_widget" native="true">259 </widget>
315 <property name="sizePolicy">260 </item>
316 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">261 <item>
317 <horstretch>0</horstretch>262 <widget class="QPushButton" name="progressCancel">
318 <verstretch>0</verstretch>263 <property name="text">
319 </sizepolicy>264 <string/>
320 </property>265 </property>
321 <layout class="QVBoxLayout" name="verticalLayout">266 <property name="icon">
322 <property name="margin">267 <iconset theme="dialog-close">
323 <number>0</number>268 <normaloff/>
324 </property>269 </iconset>
325 <item>270 </property>
326 <widget class="QWidget" name="widgetStack" native="true">271 </widget>
327 <property name="sizePolicy">272 </item>
328 <sizepolicy hsizetype="Preferred" vsizetype="Expanding">273 </layout>
329 <horstretch>0</horstretch>274 </widget>
330 <verstretch>0</verstretch>275 <widget class="QWidget" name="progress_placeholder">
331 </sizepolicy>276 <layout class="QHBoxLayout" name="horizontalLayout_6">
332 </property>277 <item>
333 </widget>278 <spacer name="horizontalSpacer_5">
334 </item>279 <property name="orientation">
335 <item>280 <enum>Qt::Horizontal</enum>
336 <widget class="QWidget" name="navigation" native="true">281 </property>
337 <layout class="QHBoxLayout" name="horizontalLayout_2">282 <property name="sizeHint" stdset="0">
338 <property name="topMargin">283 <size>
339 <number>0</number>284 <width>12</width>
340 </property>285 <height>20</height>
341 <property name="bottomMargin">286 </size>
342 <number>0</number>287 </property>
343 </property>288 </spacer>
344 <item>289 </item>
345 <spacer name="horizontalSpacer_5">290 </layout>
346 <property name="orientation">291 </widget>
347 <enum>Qt::Horizontal</enum>292 </widget>
348 </property>293 </item>
349 <property name="sizeHint" stdset="0">294 <item>
350 <size>295 <widget class="QWidget" name="navigation" native="true">
351 <width>40</width>296 <layout class="QHBoxLayout" name="horizontalLayout_2">
352 <height>20</height>297 <property name="margin">
353 </size>298 <number>0</number>
354 </property>299 </property>
355 </spacer>300 <item>
356 </item>301 <widget class="QPushButton" name="back">
357 <item>302 <property name="text">
358 <widget class="QPushButton" name="quit">303 <string>Back</string>
359 <property name="text">304 </property>
360 <string>Quit</string>305 <property name="autoDefault">
361 </property>306 <bool>true</bool>
362 <property name="autoDefault">307 </property>
363 <bool>true</bool>308 </widget>
364 </property>309 </item>
365 </widget>310 <item>
366 </item>311 <widget class="QPushButton" name="next">
367 <item>312 <property name="text">
368 <spacer name="horizontalSpacer_6">313 <string>Next</string>
369 <property name="orientation">314 </property>
370 <enum>Qt::Horizontal</enum>315 <property name="autoDefault">
371 </property>316 <bool>true</bool>
372 <property name="sizeType">317 </property>
373 <enum>QSizePolicy::Fixed</enum>318 </widget>
374 </property>319 </item>
375 <property name="sizeHint" stdset="0">320 </layout>
376 <size>321 </widget>
377 <width>20</width>322 </item>
378 <height>20</height>323 </layout>
379 </size>324 </widget>
380 </property>
381 </spacer>
382 </item>
383 <item>
384 <widget class="QPushButton" name="back">
385 <property name="text">
386 <string>Back</string>
387 </property>
388 <property name="autoDefault">
389 <bool>true</bool>
390 </property>
391 </widget>
392 </item>
393 <item>
394 <widget class="QPushButton" name="next">
395 <property name="text">
396 <string>Next</string>
397 </property>
398 <property name="autoDefault">
399 <bool>true</bool>
400 </property>
401 </widget>
402 </item>
403 </layout>
404 </widget>
405 </item>
406 </layout>
407 </widget>
408 </item>
409 </layout>
410 </widget>
411 <widget class="QWidget" name="page_8">
412 <layout class="QVBoxLayout" name="verticalLayout_8">
413 <item>
414 <widget class="QWidget" name="content_widget_2" native="true">
415 <property name="sizePolicy">
416 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
417 <horstretch>0</horstretch>
418 <verstretch>0</verstretch>
419 </sizepolicy>
420 </property>
421 <layout class="QVBoxLayout" name="verticalLayout_7">
422 <property name="leftMargin">
423 <number>0</number>
424 </property>
425 </layout>
426 </widget>
427 </item>
428 </layout>
429 </widget>
430 </widget>
431 </item>
432 </layout>
433 </widget>
434 </item>
435 </layout>
436 </widget>
437 </item>
438 <item row="1" column="2">
439 <spacer name="horizontalSpacer_2">
440 <property name="orientation">
441 <enum>Qt::Horizontal</enum>
442 </property>
443 <property name="sizeHint" stdset="0">
444 <size>
445 <width>98</width>
446 <height>20</height>
447 </size>
448 </property>
449 </spacer>
450 </item>
451 <item row="2" column="1">
452 <spacer name="verticalSpacer_2">
453 <property name="orientation">
454 <enum>Qt::Vertical</enum>
455 </property>
456 <property name="sizeHint" stdset="0">
457 <size>
458 <width>20</width>
459 <height>42</height>
460 </size>
461 </property>
462 </spacer>
463 </item>325 </item>
464 </layout>326 </layout>
465 </widget>327 </widget>
466 </widget>328 </widget>
467 <customwidgets>329 <tabstops>
468 <customwidget>330 <tabstop>next</tabstop>
469 <class>SqueezeLabel</class>331 <tabstop>back</tabstop>
470 <extends>QLabel</extends>332 <tabstop>progressCancel</tabstop>
471 <header>ubiquity.frontend.kde_components.SqueezeLabel</header>333 </tabstops>
472 </customwidget>
473 </customwidgets>
474 <resources/>334 <resources/>
475 <connections/>335 <connections/>
476</ui>336</ui>
477337
=== added file 'gui/qt/images/background.xcf'
478Binary files gui/qt/images/background.xcf 1970-01-01 00:00:00 +0000 and gui/qt/images/background.xcf 2013-02-27 17:37:28 +0000 differ338Binary files gui/qt/images/background.xcf 1970-01-01 00:00:00 +0000 and gui/qt/images/background.xcf 2013-02-27 17:37:28 +0000 differ
=== added file 'gui/qt/images/breadcrumb.png'
479Binary files gui/qt/images/breadcrumb.png 1970-01-01 00:00:00 +0000 and gui/qt/images/breadcrumb.png 2013-02-27 17:37:28 +0000 differ339Binary files gui/qt/images/breadcrumb.png 1970-01-01 00:00:00 +0000 and gui/qt/images/breadcrumb.png 2013-02-27 17:37:28 +0000 differ
=== removed file 'gui/qt/images/content_border.png'
480Binary files gui/qt/images/content_border.png 2010-02-22 17:06:06 +0000 and gui/qt/images/content_border.png 1970-01-01 00:00:00 +0000 differ340Binary files gui/qt/images/content_border.png 2010-02-22 17:06:06 +0000 and gui/qt/images/content_border.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'gui/qt/images/label_border.png'
481Binary files gui/qt/images/label_border.png 2010-02-22 17:06:06 +0000 and gui/qt/images/label_border.png 1970-01-01 00:00:00 +0000 differ341Binary files gui/qt/images/label_border.png 2010-02-22 17:06:06 +0000 and gui/qt/images/label_border.png 1970-01-01 00:00:00 +0000 differ
=== added file 'gui/qt/images/main.png'
482Binary files gui/qt/images/main.png 1970-01-01 00:00:00 +0000 and gui/qt/images/main.png 2013-02-27 17:37:28 +0000 differ342Binary files gui/qt/images/main.png 1970-01-01 00:00:00 +0000 and gui/qt/images/main.png 2013-02-27 17:37:28 +0000 differ
=== removed file 'gui/qt/images/main_frame_border.png'
483Binary files gui/qt/images/main_frame_border.png 2010-02-22 17:06:06 +0000 and gui/qt/images/main_frame_border.png 1970-01-01 00:00:00 +0000 differ343Binary files gui/qt/images/main_frame_border.png 2010-02-22 17:06:06 +0000 and gui/qt/images/main_frame_border.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'gui/qt/images/minimize.png'
484Binary files gui/qt/images/minimize.png 2012-12-05 13:40:37 +0000 and gui/qt/images/minimize.png 1970-01-01 00:00:00 +0000 differ344Binary files gui/qt/images/minimize.png 2012-12-05 13:40:37 +0000 and gui/qt/images/minimize.png 1970-01-01 00:00:00 +0000 differ
=== added file 'gui/qt/images/sidebar.png'
485Binary files gui/qt/images/sidebar.png 1970-01-01 00:00:00 +0000 and gui/qt/images/sidebar.png 2013-02-27 17:37:28 +0000 differ345Binary files gui/qt/images/sidebar.png 1970-01-01 00:00:00 +0000 and gui/qt/images/sidebar.png 2013-02-27 17:37:28 +0000 differ
=== added file 'gui/qt/images/sidebar_shadow.png'
486Binary files gui/qt/images/sidebar_shadow.png 1970-01-01 00:00:00 +0000 and gui/qt/images/sidebar_shadow.png 2013-02-27 17:37:28 +0000 differ346Binary files gui/qt/images/sidebar_shadow.png 1970-01-01 00:00:00 +0000 and gui/qt/images/sidebar_shadow.png 2013-02-27 17:37:28 +0000 differ
=== removed file 'gui/qt/images/single_pixel.png'
487Binary files gui/qt/images/single_pixel.png 2012-03-19 17:04:20 +0000 and gui/qt/images/single_pixel.png 1970-01-01 00:00:00 +0000 differ347Binary files gui/qt/images/single_pixel.png 2012-03-19 17:04:20 +0000 and gui/qt/images/single_pixel.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'gui/qt/stepLanguage.ui'
--- gui/qt/stepLanguage.ui 2011-06-18 23:15:08 +0000
+++ gui/qt/stepLanguage.ui 2013-02-27 17:37:28 +0000
@@ -6,7 +6,7 @@
6 <rect>6 <rect>
7 <x>0</x>7 <x>0</x>
8 <y>0</y>8 <y>0</y>
9 <width>873</width>9 <width>681</width>
10 <height>513</height>10 <height>513</height>
11 </rect>11 </rect>
12 </property>12 </property>
@@ -20,23 +20,36 @@
20 <string>Form</string>20 <string>Form</string>
21 </property>21 </property>
22 <layout class="QGridLayout" name="gridLayout">22 <layout class="QGridLayout" name="gridLayout">
23 <item row="0" column="0" colspan="2">23 <item row="0" column="0" colspan="5">
24 <widget class="QLabel" name="welcome_heading_label">24 <widget class="QLabel" name="welcome_heading_label">
25 <property name="text">25 <property name="text">
26 <string>Welcome</string>26 <string>Welcome</string>
27 </property>27 </property>
28 </widget>28 </widget>
29 </item>29 </item>
30 <item row="1" column="0" colspan="5">30 <item row="11" column="0" colspan="5">
31 <widget class="Line" name="line_2">31 <widget class="QLabel" name="oem_id_label">
32 <property name="orientation">32 <property name="text">
33 <enum>Qt::Horizontal</enum>33 <string>You are installing in system manufacturer mode. Please enter a unique name for this batch of systems. This name will be saved on the installed system and can be used to help with bug reports.</string>
34 </property>
35 <property name="wordWrap">
36 <bool>true</bool>
37 </property>
38 </widget>
39 </item>
40 <item row="8" column="0" colspan="5">
41 <widget class="QLabel" name="try_install_text_label">
42 <property name="text">
43 <string>You can try ${RELEASE} without making any changes to your system, or install alongside or instead of your current operating system.</string>
44 </property>
45 <property name="wordWrap">
46 <bool>true</bool>
34 </property>47 </property>
35 </widget>48 </widget>
36 </item>49 </item>
37 <item row="2" column="0" rowspan="2" colspan="5">50 <item row="2" column="0" rowspan="2" colspan="5">
38 <widget class="QLabel" name="select_language_label">51 <widget class="QLabel" name="select_language_label">
39 <property name="sizePolicy">52 <property name="sizePolicy">
40 <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">53 <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
41 <horstretch>0</horstretch>54 <horstretch>0</horstretch>
42 <verstretch>0</verstretch>55 <verstretch>0</verstretch>
@@ -63,6 +76,22 @@
63 </property>76 </property>
64 </spacer>77 </spacer>
65 </item>78 </item>
79 <item row="12" column="0" colspan="2">
80 <widget class="QLineEdit" name="oem_id_entry"/>
81 </item>
82 <item row="4" column="3" colspan="2">
83 <spacer name="horizontalSpacer_3">
84 <property name="orientation">
85 <enum>Qt::Horizontal</enum>
86 </property>
87 <property name="sizeHint" stdset="0">
88 <size>
89 <width>293</width>
90 <height>20</height>
91 </size>
92 </property>
93 </spacer>
94 </item>
66 <item row="4" column="2">95 <item row="4" column="2">
67 <widget class="QComboBox" name="language_combobox">96 <widget class="QComboBox" name="language_combobox">
68 <property name="editable">97 <property name="editable">
@@ -90,32 +119,45 @@
90 </item>119 </item>
91 </widget>120 </widget>
92 </item>121 </item>
93 <item row="4" column="3" colspan="2">
94 <spacer name="horizontalSpacer_3">
95 <property name="orientation">
96 <enum>Qt::Horizontal</enum>
97 </property>
98 <property name="sizeHint" stdset="0">
99 <size>
100 <width>293</width>
101 <height>20</height>
102 </size>
103 </property>
104 </spacer>
105 </item>
106 <item row="5" column="2">122 <item row="5" column="2">
107 <spacer name="verticalSpacer_11">123 <spacer name="verticalSpacer_11">
108 <property name="orientation">124 <property name="orientation">
109 <enum>Qt::Vertical</enum>125 <enum>Qt::Vertical</enum>
110 </property>126 </property>
127 <property name="sizeType">
128 <enum>QSizePolicy::Fixed</enum>
129 </property>
130 <property name="sizeHint" stdset="0">
131 <size>
132 <width>0</width>
133 <height>60</height>
134 </size>
135 </property>
136 </spacer>
137 </item>
138 <item row="13" column="2">
139 <spacer name="verticalSpacer">
140 <property name="orientation">
141 <enum>Qt::Vertical</enum>
142 </property>
111 <property name="sizeHint" stdset="0">143 <property name="sizeHint" stdset="0">
112 <size>144 <size>
113 <width>20</width>145 <width>20</width>
114 <height>238</height>146 <height>40</height>
115 </size>147 </size>
116 </property>148 </property>
117 </spacer>149 </spacer>
118 </item>150 </item>
151 <item row="10" column="0" colspan="5">
152 <widget class="QLabel" name="release_notes_label">
153 <property name="text">
154 <string>If you have Internet access, read the release notes for information on problems that may affect you.</string>
155 </property>
156 <property name="wordWrap">
157 <bool>true</bool>
158 </property>
159 </widget>
160 </item>
119 <item row="6" column="0" colspan="5">161 <item row="6" column="0" colspan="5">
120 <layout class="QHBoxLayout" name="horizontalLayout">162 <layout class="QHBoxLayout" name="horizontalLayout">
121 <item>163 <item>
@@ -145,10 +187,7 @@
145 <string/>187 <string/>
146 </property>188 </property>
147 <property name="alignment">189 <property name="alignment">
148 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>190 <set>Qt::AlignCenter</set>
149 </property>
150 <property name="wordWrap">
151 <bool>false</bool>
152 </property>191 </property>
153 </widget>192 </widget>
154 </item>193 </item>
@@ -173,9 +212,12 @@
173 <property name="orientation">212 <property name="orientation">
174 <enum>Qt::Horizontal</enum>213 <enum>Qt::Horizontal</enum>
175 </property>214 </property>
215 <property name="sizeType">
216 <enum>QSizePolicy::Fixed</enum>
217 </property>
176 <property name="sizeHint" stdset="0">218 <property name="sizeHint" stdset="0">
177 <size>219 <size>
178 <width>100</width>220 <width>80</width>
179 <height>20</height>221 <height>20</height>
180 </size>222 </size>
181 </property>223 </property>
@@ -186,7 +228,7 @@
186 <item>228 <item>
187 <widget class="QLabel" name="image2">229 <widget class="QLabel" name="image2">
188 <property name="sizePolicy">230 <property name="sizePolicy">
189 <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">231 <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
190 <horstretch>2</horstretch>232 <horstretch>2</horstretch>
191 <verstretch>2</verstretch>233 <verstretch>2</verstretch>
192 </sizepolicy>234 </sizepolicy>
@@ -194,8 +236,8 @@
194 <property name="text">236 <property name="text">
195 <string/>237 <string/>
196 </property>238 </property>
197 <property name="wordWrap">239 <property name="alignment">
198 <bool>true</bool>240 <set>Qt::AlignCenter</set>
199 </property>241 </property>
200 </widget>242 </widget>
201 </item>243 </item>
@@ -230,17 +272,14 @@
230 </item>272 </item>
231 </layout>273 </layout>
232 </item>274 </item>
233 <item row="7" column="0" colspan="5">275 <item row="1" column="0" colspan="5">
234 <widget class="QLabel" name="try_install_text_label">276 <widget class="Line" name="line_2">
235 <property name="text">277 <property name="orientation">
236 <string>You can try ${RELEASE} without making any changes to your system, or install alongside or instead of your current operating system.</string>278 <enum>Qt::Horizontal</enum>
237 </property>
238 <property name="wordWrap">
239 <bool>true</bool>
240 </property>279 </property>
241 </widget>280 </widget>
242 </item>281 </item>
243 <item row="8" column="0" colspan="5">282 <item row="9" column="0" colspan="5">
244 <widget class="QLabel" name="alpha_warning_label">283 <widget class="QLabel" name="alpha_warning_label">
245 <property name="text">284 <property name="text">
246 <string>alpha_warning_label</string>285 <string>alpha_warning_label</string>
@@ -250,28 +289,21 @@
250 </property>289 </property>
251 </widget>290 </widget>
252 </item>291 </item>
253 <item row="9" column="0" colspan="5">292 <item row="7" column="2">
254 <widget class="QLabel" name="release_notes_label">293 <spacer name="verticalSpacer_3">
255 <property name="text">294 <property name="orientation">
256 <string>If you have Internet access, read the release notes for information on problems that may affect you.</string>295 <enum>Qt::Vertical</enum>
257 </property>296 </property>
258 <property name="wordWrap">297 <property name="sizeType">
259 <bool>true</bool>298 <enum>QSizePolicy::Fixed</enum>
260 </property>299 </property>
261 </widget>300 <property name="sizeHint" stdset="0">
262 </item>301 <size>
263 <item row="10" column="0" colspan="5">302 <width>20</width>
264 <widget class="QLabel" name="oem_id_label">303 <height>60</height>
265 <property name="text">304 </size>
266 <string>You are installing in system manufacturer mode. Please enter a unique name for this batch of systems. This name will be saved on the installed system and can be used to help with bug reports.</string>305 </property>
267 </property>306 </spacer>
268 <property name="wordWrap">
269 <bool>true</bool>
270 </property>
271 </widget>
272 </item>
273 <item row="11" column="0" colspan="2">
274 <widget class="QLineEdit" name="oem_id_entry"/>
275 </item>307 </item>
276 </layout>308 </layout>
277 </widget>309 </widget>
278310
=== modified file 'gui/qt/stepLocation.ui'
--- gui/qt/stepLocation.ui 2009-12-30 23:08:51 +0000
+++ gui/qt/stepLocation.ui 2013-02-27 17:37:28 +0000
@@ -7,7 +7,7 @@
7 <x>0</x>7 <x>0</x>
8 <y>0</y>8 <y>0</y>
9 <width>579</width>9 <width>579</width>
10 <height>462</height>10 <height>170</height>
11 </rect>11 </rect>
12 </property>12 </property>
13 <property name="windowTitle">13 <property name="windowTitle">
@@ -39,38 +39,63 @@
39 </widget>39 </widget>
40 </item>40 </item>
41 <item>41 <item>
42 <widget class="QFrame" name="map_frame">42 <layout class="QHBoxLayout" name="horizontalLayout">
43 <property name="sizePolicy">43 <item>
44 <sizepolicy hsizetype="Preferred" vsizetype="Expanding">44 <spacer name="horizontalSpacer_4">
45 <horstretch>0</horstretch>45 <property name="orientation">
46 <verstretch>2</verstretch>46 <enum>Qt::Horizontal</enum>
47 </sizepolicy>47 </property>
48 </property>48 <property name="sizeHint" stdset="0">
49 <property name="minimumSize">49 <size>
50 <size>50 <width>40</width>
51 <width>0</width>51 <height>20</height>
52 <height>280</height>52 </size>
53 </size>53 </property>
54 </property>54 </spacer>
55 <property name="maximumSize">55 </item>
56 <size>56 <item>
57 <width>16777215</width>57 <widget class="QFrame" name="map_frame">
58 <height>280</height>58 <property name="frameShape">
59 </size>59 <enum>QFrame::StyledPanel</enum>
60 </property>60 </property>
61 <property name="frameShape">61 <layout class="QVBoxLayout" name="verticalLayout_10">
62 <enum>QFrame::StyledPanel</enum>62 <property name="margin">
63 </property>63 <number>2</number>
64 <layout class="QVBoxLayout" name="verticalLayout_10">64 </property>
65 <property name="margin">65 </layout>
66 <number>2</number>66 </widget>
67 </property>67 </item>
68 </layout>68 <item>
69 </widget>69 <spacer name="horizontalSpacer_3">
70 <property name="orientation">
71 <enum>Qt::Horizontal</enum>
72 </property>
73 <property name="sizeHint" stdset="0">
74 <size>
75 <width>40</width>
76 <height>20</height>
77 </size>
78 </property>
79 </spacer>
80 </item>
81 </layout>
70 </item>82 </item>
71 <item>83 <item>
72 <layout class="QHBoxLayout" name="horizontalLayout_4">84 <layout class="QHBoxLayout" name="horizontalLayout_4">
73 <item>85 <item>
86 <spacer name="horizontalSpacer">
87 <property name="orientation">
88 <enum>Qt::Horizontal</enum>
89 </property>
90 <property name="sizeHint" stdset="0">
91 <size>
92 <width>40</width>
93 <height>20</height>
94 </size>
95 </property>
96 </spacer>
97 </item>
98 <item>
74 <widget class="QLabel" name="timezone_zone_label">99 <widget class="QLabel" name="timezone_zone_label">
75 <property name="text">100 <property name="text">
76 <string>Region:</string>101 <string>Region:</string>
@@ -120,6 +145,19 @@
120 </property>145 </property>
121 </widget>146 </widget>
122 </item>147 </item>
148 <item>
149 <spacer name="horizontalSpacer_2">
150 <property name="orientation">
151 <enum>Qt::Horizontal</enum>
152 </property>
153 <property name="sizeHint" stdset="0">
154 <size>
155 <width>40</width>
156 <height>20</height>
157 </size>
158 </property>
159 </spacer>
160 </item>
123 </layout>161 </layout>
124 </item>162 </item>
125 <item>163 <item>
126164
=== modified file 'gui/qt/stepPartMan.ui'
--- gui/qt/stepPartMan.ui 2011-01-31 12:05:44 +0000
+++ gui/qt/stepPartMan.ui 2013-02-27 17:37:28 +0000
@@ -74,7 +74,7 @@
74 <item>74 <item>
75 <widget class="QTreeView" name="partition_list_treeview">75 <widget class="QTreeView" name="partition_list_treeview">
76 <property name="sizePolicy">76 <property name="sizePolicy">
77 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">77 <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
78 <horstretch>0</horstretch>78 <horstretch>0</horstretch>
79 <verstretch>0</verstretch>79 <verstretch>0</verstretch>
80 </sizepolicy>80 </sizepolicy>
@@ -164,60 +164,61 @@
164 </widget>164 </widget>
165 </item>165 </item>
166 <item>166 <item>
167 <widget class="QScrollArea" name="scrollArea">167 <spacer name="verticalSpacer">
168 <property name="widgetResizable">168 <property name="orientation">
169 <bool>true</bool>169 <enum>Qt::Vertical</enum>
170 </property>170 </property>
171 <widget class="QWidget" name="scrollAreaWidgetContents">171 <property name="sizeType">
172 <property name="geometry">172 <enum>QSizePolicy::Fixed</enum>
173 <rect>173 </property>
174 <x>0</x>174 <property name="sizeHint" stdset="0">
175 <y>0</y>175 <size>
176 <width>825</width>176 <width>20</width>
177 <height>103</height>177 <height>12</height>
178 </rect>178 </size>
179 </property>179 </property>
180 <layout class="QGridLayout" name="gridLayout">180 </spacer>
181 <item row="0" column="0">181 </item>
182 <widget class="QWidget" name="part_advanced_bootloader_frame" native="true">182 <item>
183 <layout class="QVBoxLayout" name="verticalLayout_3">183 <widget class="QFrame" name="part_advanced_bootloader_frame">
184 <item>184 <layout class="QGridLayout" name="gridLayout">
185 <widget class="QLabel" name="bootloader_group_label">185 <item row="1" column="2">
186 <property name="sizePolicy">186 <spacer name="horizontalSpacer">
187 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Maximum">187 <property name="orientation">
188 <horstretch>0</horstretch>188 <enum>Qt::Horizontal</enum>
189 <verstretch>0</verstretch>189 </property>
190 </sizepolicy>190 <property name="sizeHint" stdset="0">
191 </property>191 <size>
192 <property name="text">192 <width>40</width>
193 <string>&lt;strong&gt;Boot loader&lt;/strong&gt;</string>193 <height>20</height>
194 </property>194 </size>
195 </widget>195 </property>
196 </item>196 </spacer>
197 <item>197 </item>
198 <widget class="QLabel" name="grub_device_label">198 <item row="1" column="1">
199 <property name="sizePolicy">199 <widget class="QComboBox" name="grub_device_entry"/>
200 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">200 </item>
201 <horstretch>0</horstretch>201 <item row="1" column="0">
202 <verstretch>0</verstretch>202 <widget class="QLabel" name="grub_device_label">
203 </sizepolicy>203 <property name="text">
204 </property>204 <string>Help for GRUB device selection goes here.</string>
205 <property name="text">205 </property>
206 <string>Help for GRUB device selection goes here.</string>206 </widget>
207 </property>207 </item>
208 <property name="wordWrap">208 <item row="0" column="0" colspan="3">
209 <bool>true</bool>209 <widget class="QLabel" name="part_advanced_bootloader_label">
210 </property>210 <property name="font">
211 </widget>211 <font>
212 </item>212 <weight>75</weight>
213 <item>213 <bold>true</bold>
214 <widget class="QComboBox" name="grub_device_entry"/>214 </font>
215 </item>215 </property>
216 </layout>216 <property name="text">
217 </widget>217 <string>Boot loader</string>
218 </item>218 </property>
219 </layout>219 </widget>
220 </widget>220 </item>
221 </layout>
221 </widget>222 </widget>
222 </item>223 </item>
223 </layout>224 </layout>
224225
=== modified file 'gui/qt/style.qss'
--- gui/qt/style.qss 2012-03-19 17:04:20 +0000
+++ gui/qt/style.qss 2013-02-27 17:37:28 +0000
@@ -1,87 +1,52 @@
1/** main stylesheet */1/*- Backgrounds -----------------------------*/
22QMainWindow {
3#centralwidget {3 /* repeat horizontally, stretch vertically */
4}4 border-image: url(/usr/share/ubiquity/qt/images/sidebar.png) 0 repeat stretch;
55}
6#minimize_button {6
7 background-image: url(/usr/share/ubiquity/qt/images/minimize.png);7#pageMode,
8 background-position: center center;8#footer_frame {
9 background-repeat: no-repeat;9 background-image: url(/usr/share/ubiquity/qt/images/main.png);
10 10}
11 border: none;11
12}12#sidebar_header_frame,
1313#steps_filler_widget,
14#main_frame {14QFrame[isBreadcrumb="true"],
15 border-width: 13px;15#sidebar_footer_frame {
16 border-image: url(/usr/share/ubiquity/qt/images/main_frame_border.png) 13px;16 background-image: url(/usr/share/ubiquity/qt/images/sidebar_shadow.png);
17 17}
18 background-image: url(/usr/share/ubiquity/qt/images/single_pixel.png);18
19 background-repeat: no-repeat;19#sidebar_header_frame {
20 background-position: bottom left;20 padding-bottom: 24px;
21 background-origin: border;21}
22 22
23 padding: 0px;23/*- Footer ----------------------------------*/
24 padding-bottom: 0px;24#footer_frame,
25}25#sidebar_footer_frame {
2626 padding: 6px;
27#main_widget {27}
28}28
2929/*- Sidebar header --------------------------*/
30#distro_name_label,30#distro_name_label,
31#distro_release_label,
32#install_process_label {
33 font-family: sans-serif;
34}
35
36#distro_name_label {
37 color: #00aad4;
38 font-size: 12pt;
39}
40
41#distro_release_label {31#distro_release_label {
42 color: #00ccff;32 color: #fff;
43 font-size: 12pt;33 font-size: 12pt;
44}34}
4535
46#install_process_label {36#install_process_label {
47 color: #006680;37 color: #fff;
48 font-size: 8pt;38 font-size: 8pt;
49 padding-left: 1px;
50}39}
5140
41/*- Sidebar steps ---------------------------*/
52#steps_widget {42#steps_widget {
53}43}
5444
55#steps_widget QLabel {45#steps_widget QLabel {
56 qproperty-alignment: AlignLeft;46 color: #ddd;
57 font-family: sans-serif;47}
58 font-size: 12pt;48
59 color: #666666;49/*- Errors ----------------------------------*/
60 margin: 5px;
61 margin-left: 0px;
62 margin-right: 0px;
63}
64
65/*
66#steps_widget #dummy_active_step {
67 color: #666666;
68}
69
70#steps_widget #dummy_inactive_step {
71 color: #b3b3b3;
72}
73
74#steps_widget #dummy_current_step {
75 color: #0088aa;
76}
77*/
78
79#widgetStack QLabel, QRadioButton {
80 font-size: 10pt;
81 color: #4d4d4d;
82 margin: 1px;
83}
84
85#widgetStack #fullname_error_reason,50#widgetStack #fullname_error_reason,
86#widgetStack #username_error_reason,51#widgetStack #username_error_reason,
87#widgetStack #password_error_reason,52#widgetStack #password_error_reason,
@@ -91,6 +56,7 @@
91 color: #ff5555;56 color: #ff5555;
92}57}
9358
59/*- Headings --------------------------------*/
94#widgetStack #welcome_heading_label, 60#widgetStack #welcome_heading_label,
95#widgetStack #prepare_heading_label, 61#widgetStack #prepare_heading_label,
96#widgetStack #timezone_heading_label,62#widgetStack #timezone_heading_label,
@@ -105,42 +71,28 @@
105 qproperty-alignment: AlignCenter;71 qproperty-alignment: AlignCenter;
106}72}
10773
108#content_widget74/*- Content ---------------------------------*/
109{75#widgetStack QLabel, QRadioButton {
110}76 font-size: 10pt;
11177 color: #4d4d4d;
112#widgetStack QWidget78 margin: 1px;
113{79}
80
81#content_widget {
82}
83
84#widgetStack QWidget {
114 font-size: 10pt;85 font-size: 10pt;
115}86}
11687
117#widgetStack {88#content_frame QLabel {
118 padding: 5px;
119 padding-top: 0px;
120 padding-bottom: 0px;
121
122 border-width: 6px;
123 border-image: url(/usr/share/ubiquity/qt/images/content_border.png) 6px;
124}
125
126#content_frame QLabel {
127}89}
12890
129#map_frame,91#map_frame,
130#keyboard_frame 92#keyboard_frame
131{93{
132 border-radius: 5px;94 border-radius: 5px;
133 border: 1px solid #bac8d1;95 border: 1px solid #bac8d1;
134}96}
13597
136#progressBar {98/* vim: set ft=css: */
137 background-color: #b0bfc2;
138 border-radius: 3px;
139 border: 1px solid grey;
140 text-align: center;
141}
142
143#progressBar::chunk {
144 border-radius: 3px;
145 background-color: #94a7ac;
146}
14799
=== removed file 'gui/qt/style_small.qss'
--- gui/qt/style_small.qss 2010-02-21 16:37:12 +0000
+++ gui/qt/style_small.qss 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
1/* stylesheet for smaller screens
2 apply after main stylesheet */
3
4#widgetStack QWidget
5{
6 font-size: 9pt;
7}
8
9#widgetStack #welcome_heading_label,
10#widgetStack #timezone_heading_label,
11#widgetStack #keyboard_heading_label,
12#widgetStack #part_auto_heading_label,
13#widgetStack #part_advanced_heading_label,
14#widgetStack #userinfo_heading_label,
15#widgetStack #reading_heading_label
16{
17 font-size: 8pt;
18}
19\ No newline at end of file0\ No newline at end of file
201
=== added file 'ubiquity/frontend/kde_components/Breadcrumb.py'
--- ubiquity/frontend/kde_components/Breadcrumb.py 1970-01-01 00:00:00 +0000
+++ ubiquity/frontend/kde_components/Breadcrumb.py 2013-02-27 17:37:28 +0000
@@ -0,0 +1,88 @@
1# -*- coding: utf-8; Mode: Python; indent-tabs-mode: nil; tab-width: 4 -*-
2#
3# Copyright (C) 2013 Canonical Ltd.
4#
5# Author:
6# Aurélien Gâteau <agateau@kde.org>
7#
8# This file is part of Ubiquity.
9#
10# Ubiquity is free software; you can redistribute it and/or modify it under
11# the terms of the GNU General Public License as published by the Free
12# Software Foundation; either version 2 of the License, or at your option)
13# any later version.
14#
15# Ubiquity is distributed in the hope that it will be useful, but WITHOUT
16# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
17# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
18# more details.
19#
20# You should have received a copy of the GNU General Public License along
21# with Ubiquity; if not, write to the Free Software Foundation, Inc., 51
22# Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
23
24from PyQt4 import QtCore, QtGui
25from PyQt4.QtCore import Qt
26
27__all__ = ["Breadcrumb"]
28
29
30class Breadcrumb(QtGui.QFrame):
31 TODO = 0
32 CURRENT = 1
33 DONE = 2
34
35 def __init__(self, parent=None):
36 QtGui.QFrame.__init__(self, parent)
37 self.setProperty("isBreadcrumb", True)
38
39 self._tickLabel = QtGui.QLabel()
40 fm = self._tickLabel.fontMetrics()
41 self._tickLabel.setFixedWidth(fm.width(" M "))
42 self._tickLabel.setAlignment(Qt.AlignTop | Qt.AlignRight)
43
44 self._mainLabel = QtGui.QLabel()
45 self._mainLabel.setAlignment(Qt.AlignTop | Qt.AlignLeft)
46 self._mainLabel.setWordWrap(True)
47
48 layout = QtGui.QHBoxLayout(self)
49 layout.addWidget(self._tickLabel)
50 layout.addWidget(self._mainLabel)
51
52 self.setState(Breadcrumb.TODO)
53
54 def setState(self, state):
55 self._tickLabel.setText(_TICK_DICT[state])
56 self.setStyleSheet(_CSS_DICT[state])
57
58 def setText(self, text):
59 self._mainLabel.setText(text)
60
61 def text(self):
62 return self._mainLabel.text()
63
64
65_TICK_DICT = {
66 Breadcrumb.TODO: "•",
67 Breadcrumb.CURRENT: "‣",
68 Breadcrumb.DONE: "✓",
69}
70
71
72_CSS_DICT = {
73 Breadcrumb.TODO: "",
74 Breadcrumb.CURRENT: """
75 QFrame {
76 border-top-width: 10px;
77 border-bottom-width: 10px;
78 background-image: none;
79 border-image: url(/usr/share/ubiquity/qt/images/breadcrumb.png) 10px;
80 }
81 .QLabel {
82 color: #333;
83 border-width: 0px;
84 border-image: none;
85 }
86 """,
87 Breadcrumb.DONE: "",
88}
089
=== removed file 'ubiquity/frontend/kde_components/SqueezeLabel.py'
--- ubiquity/frontend/kde_components/SqueezeLabel.py 2012-07-16 14:29:13 +0000
+++ ubiquity/frontend/kde_components/SqueezeLabel.py 1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
1# -*- coding: utf-8 -*-
2
3from PyQt4 import QtGui, QtCore
4
5
6# idea from
7# http://trac.transmissionbt.com/browser/trunk/qt/squeezelabel.cc
8class SqueezeLabel(QtGui.QLabel):
9 def __init__(self, parent=None):
10 QtGui.QLabel.__init__(self, parent)
11
12 def paintEvent(self, pe):
13 fm = self.fontMetrics()
14 if fm.width(self.text()) > self.contentsRect().width():
15 oldText = self.text()
16 elided = fm.elidedText(oldText, QtCore.Qt.ElideRight, self.width())
17 self.setText(elided)
18 self.setToolTip(oldText)
19 QtGui.QLabel.paintEvent(self, pe)
20 self.setText(oldText)
21 else:
22 QtGui.QLabel.paintEvent(self, pe)
230
=== modified file 'ubiquity/frontend/kde_components/Timezone.py'
--- ubiquity/frontend/kde_components/Timezone.py 2012-11-22 16:27:21 +0000
+++ ubiquity/frontend/kde_components/Timezone.py 2013-02-27 17:37:28 +0000
@@ -34,6 +34,13 @@
34 # load background pixmap34 # load background pixmap
35 self.imagePath = "/usr/share/ubiquity/pixmaps/timezone"35 self.imagePath = "/usr/share/ubiquity/pixmaps/timezone"
36 self.pixmap = QtGui.QPixmap("%s/bg.png" % self.imagePath)36 self.pixmap = QtGui.QPixmap("%s/bg.png" % self.imagePath)
37 self.setMinimumSize(self.pixmap.size() / 2)
38 self.setMaximumSize(self.pixmap.size())
39 policy = QtGui.QSizePolicy(
40 QtGui.QSizePolicy.Preferred,
41 QtGui.QSizePolicy.Preferred)
42 policy.setHeightForWidth(True)
43 self.setSizePolicy(policy)
3744
38 # redraw timer for selected city time45 # redraw timer for selected city time
39 self.timer = QtCore.QTimer(self)46 self.timer = QtCore.QTimer(self)
@@ -116,6 +123,15 @@
116 y = y * (self.height() * 1.2)123 y = y * (self.height() * 1.2)
117 return y124 return y
118125
126 def sizeHint(self):
127 return self.pixmap.size()
128
129 def heightForWidth(self, w):
130 size = self.pixmap.size()
131 if w > size.width():
132 w = size.width()
133 return w * size.height() / size.width()
134
119 def paintEvent(self, unused_paintEvent):135 def paintEvent(self, unused_paintEvent):
120 painter = QtGui.QPainter(self)136 painter = QtGui.QPainter(self)
121 painter.setRenderHint(QtGui.QPainter.Antialiasing)137 painter.setRenderHint(QtGui.QPainter.Antialiasing)
@@ -186,6 +202,8 @@
186 # @return pixel coordinate of a latitude and longitude for self202 # @return pixel coordinate of a latitude and longitude for self
187 # map uses Miller Projection, but is also clipped203 # map uses Miller Projection, but is also clipped
188 def getPosition(self, la, lo):204 def getPosition(self, la, lo):
205 width = min(self.width(), self.pixmap.width())
206 height = min(self.height(), self.pixmap.height())
189 # need to add/sub magic numbers because the map doesn't actually go207 # need to add/sub magic numbers because the map doesn't actually go
190 # from -180...180, -90...90 thus the upper corner is not -180, -90208 # from -180...180, -90...90 thus the upper corner is not -180, -90
191 # and we have to compensate209 # and we have to compensate
@@ -195,9 +213,9 @@
195 # the 180 - 360 accounts for the fact that the map does not span the213 # the 180 - 360 accounts for the fact that the map does not span the
196 # entire -90 to 90 the map does span the entire 360 though, just214 # entire -90 to 90 the map does span the entire 360 though, just
197 # offset215 # offset
198 x = ((self.width() * (180.0 + lo) / 360.0) +216 x = ((width * (180.0 + lo) / 360.0) +
199 (self.width() * xdeg_offset / 180.0))217 (width * xdeg_offset / 180.0))
200 x = x % self.width()218 x = x % width
201219
202 # top and bottom clipping latitudes220 # top and bottom clipping latitudes
203 topLat = 81221 topLat = 81
@@ -223,7 +241,7 @@
223 y = y / mapRange241 y = y / mapRange
224242
225 # this then becomes the percentage of the height243 # this then becomes the percentage of the height
226 y = y * self.height()244 y = y * height
227245
228 return QtCore.QPoint(int(x), int(y))246 return QtCore.QPoint(int(x), int(y))
229247
230248
=== added file 'ubiquity/frontend/kde_components/testing/timezonemap.py'
--- ubiquity/frontend/kde_components/testing/timezonemap.py 1970-01-01 00:00:00 +0000
+++ ubiquity/frontend/kde_components/testing/timezonemap.py 2013-02-27 17:37:28 +0000
@@ -0,0 +1,20 @@
1# -*- coding: utf-8 -*-
2
3import sys
4
5from PyQt4 import QtGui, uic
6from ubiquity.frontend.kde_components.Timezone import TimezoneMap
7
8
9if __name__ == "__main__":
10 app = QtGui.QApplication(sys.argv)
11 QtGui.QApplication.setStyle("Oxygen")
12 qss = open("/usr/share/ubiquity/qt/style.qss").read()
13 app.setStyleSheet(qss)
14
15 page = uic.loadUi('/usr/share/ubiquity/qt/stepLocation.ui')
16 tzmap = TimezoneMap(page.map_frame)
17 page.map_frame.layout().addWidget(tzmap)
18 page.show()
19
20 sys.exit(app.exec_())
021
=== modified file 'ubiquity/frontend/kde_ui.py'
--- ubiquity/frontend/kde_ui.py 2013-02-19 11:33:07 +0000
+++ ubiquity/frontend/kde_ui.py 2013-02-27 17:37:28 +0000
@@ -45,7 +45,8 @@
45from ubiquity.components import partman_commit, install, plugininstall45from ubiquity.components import partman_commit, install, plugininstall
46import ubiquity.frontend.base46import ubiquity.frontend.base
47from ubiquity.frontend.base import BaseFrontend47from ubiquity.frontend.base import BaseFrontend
48from ubiquity.frontend.kde_components import ProgressDialog, SqueezeLabel48from ubiquity.frontend.kde_components import ProgressDialog
49from ubiquity.frontend.kde_components.Breadcrumb import Breadcrumb
49from ubiquity.plugin import Plugin50from ubiquity.plugin import Plugin
50import ubiquity.progressposition51import ubiquity.progressposition
5152
@@ -87,25 +88,8 @@
87 self.distro_name_label.setText(distro_name)88 self.distro_name_label.setText(distro_name)
88 self.distro_release_label.setText(distro_release)89 self.distro_release_label.setText(distro_release)
8990
90 self.minimize_button.clicked.connect(self.showMinimized)
91
92 self.setWindowTitle("%s %s" % (distro_name, distro_release))91 self.setWindowTitle("%s %s" % (distro_name, distro_release))
9392
94 # don't use stylesheet cause we want to scale the wallpaper for various
95 # screen sizes as well as support larger screens
96 self.bgImage = QtGui.QImage("/usr/share/wallpapers/kde-default.png")
97 self.scaledBgImage = self.bgImage
98
99 def paintEvent(self, pe):
100 p = QtGui.QPainter(self)
101 p.drawImage(0, 0, self.scaledBgImage)
102
103 def resizeEvent(self, re):
104 self.scaledBgImage = self.bgImage.scaled(
105 self.width(), self.height(),
106 QtCore.Qt.KeepAspectRatioByExpanding,
107 QtCore.Qt.SmoothTransformation)
108
109 def setWizard(self, wizardRef):93 def setWizard(self, wizardRef):
110 self.wizard = wizardRef94 self.wizard = wizardRef
11195
@@ -180,31 +164,16 @@
180164
181 self.ui = UbiquityUI()165 self.ui = UbiquityUI()
182166
183 # handle smaller screens (old school eee pc
184 if (QtGui.QApplication.desktop().screenGeometry().height() < 560):
185 self.ui.main_frame.setFixedHeight(470)
186 with open(os.path.join(UIDIR, "style_small.qss")) as style:
187 self.ui.main_frame.setStyleSheet(style.read())
188
189 # initially the steps widget is not visible167 # initially the steps widget is not visible
190 # it becomes visible once the first step becomes active168 # it becomes visible once the first step becomes active
191 self.ui.steps_widget.setVisible(False)169 self.ui.steps_widget.setVisible(False)
192 self.ui.content_widget.setVisible(False)170 self.ui.content_widget.setVisible(False)
193171
194 if 'UBIQUITY_GREETER' in os.environ:172 if 'UBIQUITY_GREETER' in os.environ:
195 self.ui.minimize_button.hide()173 self.ui.setWindowState(
196174 self.ui.windowState() ^ QtCore.Qt.WindowFullScreen)
197 self.ui.setWindowState(
198 self.ui.windowState() ^ QtCore.Qt.WindowFullScreen)
199175
200 self.ui.setWizard(self)176 self.ui.setWizard(self)
201 # self.ui.setWindowFlags(QtCore.Qt.Window |
202 # QtCore.Qt.CustomizeWindowHint | QtCore.Qt.WindowTitleHint |
203 # QtCore.Qt.WindowMinMaxButtonsHint)
204
205 #hide the minimize button if in "install only" mode
206 if 'UBIQUITY_ONLY' in os.environ or 'UBIQUITY_GREETER' in os.environ:
207 self.ui.minimize_button.setVisible(False)
208177
209 self.stackLayout = QtGui.QStackedLayout(self.ui.widgetStack)178 self.stackLayout = QtGui.QStackedLayout(self.ui.widgetStack)
210179
@@ -218,7 +187,8 @@
218 mod.ui = mod.ui_class(mod.controller)187 mod.ui = mod.ui_class(mod.controller)
219 widgets = mod.ui.get('plugin_widgets')188 widgets = mod.ui.get('plugin_widgets')
220 optional_widgets = mod.ui.get('plugin_optional_widgets')189 optional_widgets = mod.ui.get('plugin_optional_widgets')
221 breadcrumb = mod.ui.get('plugin_breadcrumb')190 # Use a placeholder for breadcrumb if none defined
191 breadcrumb = mod.ui.get('plugin_breadcrumb') or '------'
222 if widgets or optional_widgets:192 if widgets or optional_widgets:
223 def fill_out(widget_list):193 def fill_out(widget_list):
224 rv = []194 rv = []
@@ -237,24 +207,16 @@
237 return rv207 return rv
238 mod.widgets = fill_out(widgets)208 mod.widgets = fill_out(widgets)
239 mod.optional_widgets = fill_out(optional_widgets)209 mod.optional_widgets = fill_out(optional_widgets)
240 if not hasattr(mod.ui, 'plugin_breadcrumb'):210
241 breadcrumb = '------' # just a placeholder211 mod.breadcrumb_question = breadcrumb
242 if breadcrumb:212 mod.breadcrumb = self._create_breadcrumb(breadcrumb)
243 mod.breadcrumb_question = breadcrumb213
244 mod.breadcrumb = SqueezeLabel.SqueezeLabel()
245 mod.breadcrumb.setObjectName(mod.breadcrumb_question)
246 # Room for install crumb.
247 label_index = self.ui.steps_widget.layout().count() - 2
248 self.ui.steps_widget.layout().insertWidget(
249 label_index, mod.breadcrumb)
250 else:
251 mod.breadcrumb_question = None
252 # Page intentionally didn't want a label (intro).
253 mod.breadcrumb = None
254 self.pageslen += 1214 self.pageslen += 1
255 self.pages.append(mod)215 self.pages.append(mod)
256 self.user_pageslen = self.pageslen216 self.user_pageslen = self.pageslen
257217
218 self.breadcrumb_install = self._create_breadcrumb('breadcrumb_install')
219
258 # declare attributes220 # declare attributes
259 self.language_questions = (221 self.language_questions = (
260 'live_installer',222 'live_installer',
@@ -305,9 +267,6 @@
305 "/usr/share/icons/hicolor/128x128/apps/ubiquity.png"))267 "/usr/share/icons/hicolor/128x128/apps/ubiquity.png"))
306 self.allow_go_backward(False)268 self.allow_go_backward(False)
307269
308 if not 'UBIQUITY_AUTOMATIC' in os.environ:
309 self.ui.show()
310
311 self.stop_debconf()270 self.stop_debconf()
312 self.translate_widgets(reget=True)271 self.translate_widgets(reget=True)
313272
@@ -327,7 +286,7 @@
327 self.ui.quit.hide()286 self.ui.quit.hide()
328 # TODO cjwatson 2010-04-07: provide alternative strings instead287 # TODO cjwatson 2010-04-07: provide alternative strings instead
329 self.ui.install_process_label.hide()288 self.ui.install_process_label.hide()
330 self.ui.breadcrumb_install.hide()289 self.breadcrumb_install.hide()
331290
332 self.forwardIcon = QtGui.QIcon(291 self.forwardIcon = QtGui.QIcon(
333 "/usr/share/icons/oxygen/128x128/actions/go-next.png")292 "/usr/share/icons/oxygen/128x128/actions/go-next.png")
@@ -345,11 +304,25 @@
345 "/usr/share/icons/oxygen/48x48/actions/dialog-close.png")304 "/usr/share/icons/oxygen/48x48/actions/dialog-close.png")
346 self.ui.quit.setIcon(quitIcon)305 self.ui.quit.setIcon(quitIcon)
347306
348 self.ui.progressBar.hide()307 self._show_progress_bar(False)
349 self.ui.progressCancel.hide()
350308
351 misc.add_connection_watch(self.network_change)309 misc.add_connection_watch(self.network_change)
352310
311 def _show_progress_bar(self, show):
312 if show:
313 widget = self.ui.progress_widget
314 else:
315 widget = self.ui.progress_placeholder
316 self.ui.progress_stack.setCurrentWidget(widget)
317
318 def _create_breadcrumb(self, name):
319 widget = Breadcrumb()
320 widget.setObjectName(name)
321 layout = self.ui.steps_widget.layout()
322 # "- 1" to insert before the bottom spacer
323 layout.insertWidget(layout.count() - 1, widget)
324 return widget
325
353 def excepthook(self, exctype, excvalue, exctb):326 def excepthook(self, exctype, excvalue, exctb):
354 """Crash handler."""327 """Crash handler."""
355328
@@ -438,6 +411,11 @@
438 # Start the interface411 # Start the interface
439 self.set_current_page(0)412 self.set_current_page(0)
440413
414 if not 'UBIQUITY_AUTOMATIC' in os.environ:
415 # Only show now so that the window does not show empty, then resize
416 # itself and show content
417 self.ui.show()
418
441 while(self.pagesindex < self.pageslen):419 while(self.pagesindex < self.pageslen):
442 if self.current_page is None:420 if self.current_page is None:
443 break421 break
@@ -491,15 +469,7 @@
491 self.app.processEvents()469 self.app.processEvents()
492470
493 if self.current_page is not None:471 if self.current_page is not None:
494 borderCSS = (472 self._update_breadcrumbs('__install')
495 "border-width: 6px; border-image: "
496 "url(/usr/share/ubiquity/qt/images/label_border.png) 6px;")
497 currentSS = "%s color: %s; " % (borderCSS, "#0088aa")
498 inactiveSS = "color: %s; " % "#b3b3b3"
499 for page in self.pages:
500 if page.breadcrumb:
501 page.breadcrumb.setStyleSheet(inactiveSS)
502 self.ui.breadcrumb_install.setStyleSheet(currentSS)
503 self.start_slideshow()473 self.start_slideshow()
504 self.run_main_loop()474 self.run_main_loop()
505475
@@ -545,6 +515,25 @@
545515
546 return self.returncode516 return self.returncode
547517
518 def _update_breadcrumbs(self, active_page_name):
519 done = True
520 for page in self.pages:
521 if not page.breadcrumb:
522 continue
523 if page.module.NAME == active_page_name:
524 page.breadcrumb.setState(Breadcrumb.CURRENT)
525 done = False
526 else:
527 if done:
528 page.breadcrumb.setState(Breadcrumb.DONE)
529 else:
530 page.breadcrumb.setState(Breadcrumb.TODO)
531
532 if active_page_name == '__install':
533 page.breadcrumb.setState(Breadcrumb.CURRENT)
534 else:
535 page.breadcrumb.setState(Breadcrumb.TODO)
536
548 def start_slideshow(self):537 def start_slideshow(self):
549 slideshow_dir = '/usr/share/ubiquity-slideshow'538 slideshow_dir = '/usr/share/ubiquity-slideshow'
550 slideshow_locale = self.slideshow_get_available_locale(slideshow_dir,539 slideshow_locale = self.slideshow_get_available_locale(slideshow_dir,
@@ -581,6 +570,7 @@
581 webView.setFixedSize(700, 420)570 webView.setFixedSize(700, 420)
582 webView.load(QtCore.QUrl(slides))571 webView.load(QtCore.QUrl(slides))
583572
573 self.ui.navigation.hide()
584 self.ui.pageMode.setCurrentIndex(1)574 self.ui.pageMode.setCurrentIndex(1)
585 self.ui.pageMode.widget(1).layout().addWidget(webView)575 self.ui.pageMode.widget(1).layout().addWidget(webView)
586 webView.show()576 webView.show()
@@ -718,7 +708,7 @@
718 if text is None:708 if text is None:
719 return709 return
720710
721 if isinstance(widget, QtGui.QLabel):711 if isinstance(widget, (QtGui.QLabel, Breadcrumb)):
722 if name == 'select_language_label' and self.oem_user_config:712 if name == 'select_language_label' and self.oem_user_config:
723 text = self.get_string(713 text = self.get_string(
724 'select_language_oem_user_label', lang, prefix)714 'select_language_oem_user_label', lang, prefix)
@@ -828,18 +818,10 @@
828 self.run_automation_error_cmd()818 self.run_automation_error_cmd()
829 self.ui.show()819 self.ui.show()
830820
831 borderCSS = (
832 "border-width: 6px; border-image: "
833 "url(/usr/share/ubiquity/qt/images/label_border.png) 6px;")
834 activeSS = "color: %s; " % "#666666"
835 inactiveSS = "color: %s; " % "#b3b3b3"
836 currentSS = "%s color: %s; " % (borderCSS, "#0088aa")
837
838 #set all the steps active821 #set all the steps active
839 #each step will set its previous ones as inactive822 #each step will set its previous ones as inactive
840 #this handles the ability to go back823 #this handles the ability to go back
841824
842 found = False
843 is_install = False825 is_install = False
844 for page in self.pages:826 for page in self.pages:
845 if page.module.NAME == n:827 if page.module.NAME == n:
@@ -855,16 +837,8 @@
855 index = self.stackLayout.indexOf(cur)837 index = self.stackLayout.indexOf(cur)
856 self.add_history(page, cur)838 self.add_history(page, cur)
857 self.set_current_page(index)839 self.set_current_page(index)
858 if page.breadcrumb:
859 page.breadcrumb.setStyleSheet(currentSS)
860 found = True
861 is_install = page.ui.get('plugin_is_install')840 is_install = page.ui.get('plugin_is_install')
862 elif page.breadcrumb:841 self._update_breadcrumbs(n)
863 if found:
864 page.breadcrumb.setStyleSheet(activeSS)
865 else:
866 page.breadcrumb.setStyleSheet(inactiveSS)
867 self.ui.breadcrumb_install.setStyleSheet(activeSS)
868842
869 if is_install:843 if is_install:
870 self.ui.next.setText(844 self.ui.next.setText(
@@ -1210,7 +1184,7 @@
1210 self.finished_pages = True1184 self.finished_pages = True
1211 if self.finished_installing or self.oem_user_config:1185 if self.finished_installing or self.oem_user_config:
1212 self.debconf_progress_info('')1186 self.debconf_progress_info('')
1213 self.ui.progressBar.show()1187 self._show_progress_bar(True)
1214 dbfilter = plugininstall.Install(self)1188 dbfilter = plugininstall.Install(self)
1215 dbfilter.start(auto_process=True)1189 dbfilter.start(auto_process=True)
12161190
@@ -1219,7 +1193,7 @@
1219 # starts, it does so with the most recent changes.1193 # starts, it does so with the most recent changes.
1220 self.stop_debconf()1194 self.stop_debconf()
1221 self.start_debconf()1195 self.start_debconf()
1222 self.ui.progressBar.show()1196 self._show_progress_bar(True)
1223 self.installing = True1197 self.installing = True
1224 from ubiquity.debconfcommunicator import DebconfCommunicator1198 from ubiquity.debconfcommunicator import DebconfCommunicator
1225 if self.parallel_db is not None:1199 if self.parallel_db is not None:
@@ -1245,7 +1219,7 @@
1245 dbfilter = plugininstall.Install(self)1219 dbfilter = plugininstall.Install(self)
1246 dbfilter.start(auto_process=True)1220 dbfilter.start(auto_process=True)
1247 else:1221 else:
1248 self.ui.progressBar.hide()1222 self._show_progress_bar(False)
12491223
1250 elif finished_step == 'ubiquity.components.plugininstall':1224 elif finished_step == 'ubiquity.components.plugininstall':
1251 self.installing = False1225 self.installing = False
@@ -1281,7 +1255,7 @@
1281 self.ui.next.setIcon(self.forwardIcon)1255 self.ui.next.setIcon(self.forwardIcon)
1282 self.translate_widget(self.ui.next)1256 self.translate_widget(self.ui.next)
1283 self.installing = False1257 self.installing = False
1284 self.ui.progressBar.hide()1258 self._show_progress_bar(False)
1285 self.ui.quit.show()1259 self.ui.quit.show()
12861260
1287 def error_dialog(self, title, msg, fatal=True):1261 def error_dialog(self, title, msg, fatal=True):

Subscribers

People subscribed via source and target branches

to status/vote changes: