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
1=== modified file 'gui/qt/app.ui'
2--- gui/qt/app.ui 2010-09-22 13:08:34 +0000
3+++ gui/qt/app.ui 2013-02-27 17:37:28 +0000
4@@ -6,8 +6,8 @@
5 <rect>
6 <x>0</x>
7 <y>0</y>
8- <width>809</width>
9- <height>638</height>
10+ <width>505</width>
11+ <height>534</height>
12 </rect>
13 </property>
14 <property name="windowTitle">
15@@ -15,462 +15,322 @@
16 </property>
17 <widget class="QWidget" name="centralwidget">
18 <layout class="QGridLayout" name="gridLayout">
19- <item row="0" column="1">
20- <spacer name="verticalSpacer">
21- <property name="orientation">
22- <enum>Qt::Vertical</enum>
23- </property>
24- <property name="sizeHint" stdset="0">
25- <size>
26- <width>20</width>
27- <height>42</height>
28- </size>
29- </property>
30- </spacer>
31- </item>
32- <item row="1" column="0">
33- <spacer name="horizontalSpacer">
34- <property name="orientation">
35- <enum>Qt::Horizontal</enum>
36- </property>
37- <property name="sizeHint" stdset="0">
38- <size>
39- <width>98</width>
40- <height>20</height>
41- </size>
42- </property>
43- </spacer>
44- </item>
45- <item row="1" column="1">
46- <widget class="QFrame" name="main_frame">
47- <property name="sizePolicy">
48- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
49+ <property name="margin">
50+ <number>0</number>
51+ </property>
52+ <property name="spacing">
53+ <number>0</number>
54+ </property>
55+ <item row="1" column="2">
56+ <widget class="QStackedWidget" name="pageMode">
57+ <property name="sizePolicy">
58+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
59+ <horstretch>0</horstretch>
60+ <verstretch>0</verstretch>
61+ </sizepolicy>
62+ </property>
63+ <property name="currentIndex">
64+ <number>0</number>
65+ </property>
66+ <widget class="QWidget" name="page_7">
67+ <layout class="QVBoxLayout" name="verticalLayout_2">
68+ <property name="margin">
69+ <number>0</number>
70+ </property>
71+ <item>
72+ <widget class="QWidget" name="content_widget" native="true">
73+ <property name="sizePolicy">
74+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
75+ <horstretch>0</horstretch>
76+ <verstretch>0</verstretch>
77+ </sizepolicy>
78+ </property>
79+ <layout class="QVBoxLayout" name="verticalLayout">
80+ <property name="margin">
81+ <number>0</number>
82+ </property>
83+ <item>
84+ <widget class="QWidget" name="widgetStack" native="true">
85+ <property name="sizePolicy">
86+ <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
87+ <horstretch>0</horstretch>
88+ <verstretch>0</verstretch>
89+ </sizepolicy>
90+ </property>
91+ </widget>
92+ </item>
93+ </layout>
94+ </widget>
95+ </item>
96+ </layout>
97+ </widget>
98+ <widget class="QWidget" name="page_8">
99+ <layout class="QVBoxLayout" name="verticalLayout_8">
100+ <item>
101+ <widget class="QWidget" name="content_widget_2" native="true">
102+ <property name="sizePolicy">
103+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
104+ <horstretch>0</horstretch>
105+ <verstretch>0</verstretch>
106+ </sizepolicy>
107+ </property>
108+ <layout class="QVBoxLayout" name="verticalLayout_7">
109+ <property name="leftMargin">
110+ <number>0</number>
111+ </property>
112+ </layout>
113+ </widget>
114+ </item>
115+ </layout>
116+ </widget>
117+ </widget>
118+ </item>
119+ <item row="0" column="0" rowspan="3">
120+ <widget class="QWidget" name="sidebar_widget" native="true">
121+ <property name="sizePolicy">
122+ <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
123 <horstretch>0</horstretch>
124 <verstretch>0</verstretch>
125 </sizepolicy>
126 </property>
127 <property name="minimumSize">
128 <size>
129- <width>750</width>
130- <height>550</height>
131+ <width>150</width>
132+ <height>0</height>
133 </size>
134 </property>
135 <property name="maximumSize">
136 <size>
137- <width>750</width>
138- <height>550</height>
139+ <width>150</width>
140+ <height>16777215</height>
141 </size>
142 </property>
143- <property name="frameShape">
144- <enum>QFrame::StyledPanel</enum>
145- </property>
146- <property name="frameShadow">
147- <enum>QFrame::Raised</enum>
148- </property>
149- <layout class="QHBoxLayout" name="horizontalLayout_3">
150- <item>
151- <widget class="QWidget" name="main_widget" native="true">
152- <layout class="QGridLayout" name="gridLayout_4">
153- <property name="horizontalSpacing">
154+ <layout class="QVBoxLayout" name="verticalLayout_3">
155+ <property name="spacing">
156+ <number>0</number>
157+ </property>
158+ <property name="margin">
159+ <number>0</number>
160+ </property>
161+ <item>
162+ <widget class="QFrame" name="sidebar_header_frame">
163+ <property name="sizePolicy">
164+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
165+ <horstretch>0</horstretch>
166+ <verstretch>0</verstretch>
167+ </sizepolicy>
168+ </property>
169+ <layout class="QVBoxLayout" name="verticalLayout_4">
170+ <item>
171+ <widget class="QLabel" name="distro_name_label">
172+ <property name="text">
173+ <string>Kubuntu</string>
174+ </property>
175+ <property name="scaledContents">
176+ <bool>false</bool>
177+ </property>
178+ <property name="alignment">
179+ <set>Qt::AlignHCenter|Qt::AlignTop</set>
180+ </property>
181+ </widget>
182+ </item>
183+ <item>
184+ <widget class="QLabel" name="distro_release_label">
185+ <property name="text">
186+ <string>karmic</string>
187+ </property>
188+ <property name="alignment">
189+ <set>Qt::AlignHCenter|Qt::AlignTop</set>
190+ </property>
191+ </widget>
192+ </item>
193+ <item>
194+ <widget class="QLabel" name="install_process_label">
195+ <property name="text">
196+ <string>Installation Process</string>
197+ </property>
198+ <property name="alignment">
199+ <set>Qt::AlignHCenter|Qt::AlignTop</set>
200+ </property>
201+ </widget>
202+ </item>
203+ </layout>
204+ </widget>
205+ </item>
206+ <item>
207+ <widget class="QWidget" name="steps_widget" native="true">
208+ <property name="sizePolicy">
209+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
210+ <horstretch>0</horstretch>
211+ <verstretch>0</verstretch>
212+ </sizepolicy>
213+ </property>
214+ <layout class="QVBoxLayout" name="verticalLayout_5">
215+ <property name="spacing">
216 <number>0</number>
217 </property>
218 <property name="margin">
219 <number>0</number>
220 </property>
221- <item row="0" column="0" colspan="2">
222- <widget class="QWidget" name="widget_4" native="true">
223- <layout class="QGridLayout" name="gridLayout_5">
224- <property name="leftMargin">
225- <number>1</number>
226- </property>
227- <property name="topMargin">
228- <number>0</number>
229- </property>
230- <property name="rightMargin">
231- <number>0</number>
232- </property>
233- <property name="bottomMargin">
234- <number>0</number>
235- </property>
236- <property name="horizontalSpacing">
237- <number>3</number>
238- </property>
239- <item row="0" column="0">
240- <widget class="QWidget" name="title_widget" native="true">
241- <layout class="QHBoxLayout" name="horizontalLayout_4">
242- <property name="topMargin">
243- <number>0</number>
244- </property>
245- <property name="bottomMargin">
246- <number>0</number>
247- </property>
248- <item>
249- <widget class="QLabel" name="distro_name_label">
250- <property name="text">
251- <string>Kubuntu</string>
252- </property>
253- <property name="scaledContents">
254- <bool>false</bool>
255- </property>
256- <property name="alignment">
257- <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
258- </property>
259- <property name="indent">
260- <number>0</number>
261- </property>
262- </widget>
263- </item>
264- <item>
265- <widget class="QLabel" name="distro_release_label">
266- <property name="text">
267- <string>karmic</string>
268- </property>
269- <property name="alignment">
270- <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
271- </property>
272- <property name="indent">
273- <number>0</number>
274- </property>
275- </widget>
276- </item>
277- <item>
278- <spacer name="horizontalSpacer_13">
279- <property name="orientation">
280- <enum>Qt::Horizontal</enum>
281- </property>
282- <property name="sizeHint" stdset="0">
283- <size>
284- <width>0</width>
285- <height>0</height>
286- </size>
287- </property>
288- </spacer>
289- </item>
290- <item>
291- <widget class="QPushButton" name="minimize_button">
292- <property name="minimumSize">
293- <size>
294- <width>14</width>
295- <height>14</height>
296- </size>
297- </property>
298- <property name="maximumSize">
299- <size>
300- <width>14</width>
301- <height>14</height>
302- </size>
303- </property>
304- <property name="cursor">
305- <cursorShape>PointingHandCursor</cursorShape>
306- </property>
307- <property name="toolTip">
308- <string>minimize</string>
309- </property>
310- <property name="text">
311- <string/>
312- </property>
313- <property name="flat">
314- <bool>true</bool>
315- </property>
316- </widget>
317- </item>
318- </layout>
319- </widget>
320- </item>
321- <item row="1" column="0">
322- <widget class="QWidget" name="progress_widget" native="true">
323- <layout class="QHBoxLayout" name="horizontalLayout_5">
324- <property name="topMargin">
325- <number>0</number>
326- </property>
327- <property name="bottomMargin">
328- <number>0</number>
329- </property>
330- <item>
331- <widget class="QLabel" name="install_process_label">
332- <property name="minimumSize">
333- <size>
334- <width>0</width>
335- <height>20</height>
336- </size>
337- </property>
338- <property name="text">
339- <string>Installation Process</string>
340- </property>
341- <property name="alignment">
342- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
343- </property>
344- <property name="indent">
345- <number>0</number>
346- </property>
347- </widget>
348- </item>
349- <item>
350- <spacer name="horizontalSpacer_3">
351- <property name="orientation">
352- <enum>Qt::Horizontal</enum>
353- </property>
354- <property name="sizeType">
355- <enum>QSizePolicy::Maximum</enum>
356- </property>
357- <property name="sizeHint" stdset="0">
358- <size>
359- <width>20</width>
360- <height>16</height>
361- </size>
362- </property>
363- </spacer>
364- </item>
365- <item>
366- <widget class="QProgressBar" name="progressBar">
367- <property name="maximumSize">
368- <size>
369- <width>16777215</width>
370- <height>16</height>
371- </size>
372- </property>
373- <property name="value">
374- <number>24</number>
375- </property>
376- </widget>
377- </item>
378- <item>
379- <widget class="QPushButton" name="progressCancel">
380- <property name="sizePolicy">
381- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
382- <horstretch>0</horstretch>
383- <verstretch>0</verstretch>
384- </sizepolicy>
385- </property>
386- <property name="maximumSize">
387- <size>
388- <width>16777215</width>
389- <height>20</height>
390- </size>
391- </property>
392- <property name="text">
393- <string>X</string>
394- </property>
395- </widget>
396- </item>
397- </layout>
398- </widget>
399- </item>
400- </layout>
401- </widget>
402- </item>
403- <item row="1" column="0">
404- <widget class="QWidget" name="steps_widget" native="true">
405+ <item>
406+ <widget class="QWidget" name="steps_filler_widget" native="true">
407 <property name="sizePolicy">
408- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
409+ <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
410 <horstretch>0</horstretch>
411 <verstretch>0</verstretch>
412 </sizepolicy>
413 </property>
414- <property name="maximumSize">
415+ </widget>
416+ </item>
417+ </layout>
418+ </widget>
419+ </item>
420+ <item>
421+ <widget class="QFrame" name="sidebar_footer_frame">
422+ <property name="sizePolicy">
423+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
424+ <horstretch>0</horstretch>
425+ <verstretch>0</verstretch>
426+ </sizepolicy>
427+ </property>
428+ <layout class="QHBoxLayout" name="horizontalLayout_7">
429+ <property name="margin">
430+ <number>0</number>
431+ </property>
432+ <item>
433+ <widget class="QPushButton" name="quit">
434+ <property name="text">
435+ <string>Quit</string>
436+ </property>
437+ <property name="autoDefault">
438+ <bool>true</bool>
439+ </property>
440+ </widget>
441+ </item>
442+ <item>
443+ <spacer name="horizontalSpacer">
444+ <property name="orientation">
445+ <enum>Qt::Horizontal</enum>
446+ </property>
447+ <property name="sizeHint" stdset="0">
448 <size>
449- <width>150</width>
450- <height>16777215</height>
451+ <width>40</width>
452+ <height>20</height>
453 </size>
454 </property>
455- <layout class="QVBoxLayout" name="verticalLayout_5">
456- <property name="rightMargin">
457- <number>0</number>
458- </property>
459- <item>
460- <widget class="SqueezeLabel" name="breadcrumb_install">
461- <property name="text">
462- <string>Install</string>
463- </property>
464- </widget>
465- </item>
466- <item>
467- <spacer name="verticalSpacer_3">
468- <property name="orientation">
469- <enum>Qt::Vertical</enum>
470- </property>
471- <property name="sizeHint" stdset="0">
472- <size>
473- <width>20</width>
474- <height>40</height>
475- </size>
476- </property>
477- </spacer>
478- </item>
479- </layout>
480- </widget>
481- </item>
482- <item row="1" column="1">
483- <widget class="QStackedWidget" name="pageMode">
484- <property name="currentIndex">
485- <number>0</number>
486- </property>
487- <widget class="QWidget" name="page_7">
488- <layout class="QVBoxLayout" name="verticalLayout_2">
489- <property name="margin">
490- <number>0</number>
491- </property>
492- <item>
493- <widget class="QWidget" name="content_widget" native="true">
494- <property name="sizePolicy">
495- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
496- <horstretch>0</horstretch>
497- <verstretch>0</verstretch>
498- </sizepolicy>
499- </property>
500- <layout class="QVBoxLayout" name="verticalLayout">
501- <property name="margin">
502- <number>0</number>
503- </property>
504- <item>
505- <widget class="QWidget" name="widgetStack" native="true">
506- <property name="sizePolicy">
507- <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
508- <horstretch>0</horstretch>
509- <verstretch>0</verstretch>
510- </sizepolicy>
511- </property>
512- </widget>
513- </item>
514- <item>
515- <widget class="QWidget" name="navigation" native="true">
516- <layout class="QHBoxLayout" name="horizontalLayout_2">
517- <property name="topMargin">
518- <number>0</number>
519- </property>
520- <property name="bottomMargin">
521- <number>0</number>
522- </property>
523- <item>
524- <spacer name="horizontalSpacer_5">
525- <property name="orientation">
526- <enum>Qt::Horizontal</enum>
527- </property>
528- <property name="sizeHint" stdset="0">
529- <size>
530- <width>40</width>
531- <height>20</height>
532- </size>
533- </property>
534- </spacer>
535- </item>
536- <item>
537- <widget class="QPushButton" name="quit">
538- <property name="text">
539- <string>Quit</string>
540- </property>
541- <property name="autoDefault">
542- <bool>true</bool>
543- </property>
544- </widget>
545- </item>
546- <item>
547- <spacer name="horizontalSpacer_6">
548- <property name="orientation">
549- <enum>Qt::Horizontal</enum>
550- </property>
551- <property name="sizeType">
552- <enum>QSizePolicy::Fixed</enum>
553- </property>
554- <property name="sizeHint" stdset="0">
555- <size>
556- <width>20</width>
557- <height>20</height>
558- </size>
559- </property>
560- </spacer>
561- </item>
562- <item>
563- <widget class="QPushButton" name="back">
564- <property name="text">
565- <string>Back</string>
566- </property>
567- <property name="autoDefault">
568- <bool>true</bool>
569- </property>
570- </widget>
571- </item>
572- <item>
573- <widget class="QPushButton" name="next">
574- <property name="text">
575- <string>Next</string>
576- </property>
577- <property name="autoDefault">
578- <bool>true</bool>
579- </property>
580- </widget>
581- </item>
582- </layout>
583- </widget>
584- </item>
585- </layout>
586- </widget>
587- </item>
588- </layout>
589- </widget>
590- <widget class="QWidget" name="page_8">
591- <layout class="QVBoxLayout" name="verticalLayout_8">
592- <item>
593- <widget class="QWidget" name="content_widget_2" native="true">
594- <property name="sizePolicy">
595- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
596- <horstretch>0</horstretch>
597- <verstretch>0</verstretch>
598- </sizepolicy>
599- </property>
600- <layout class="QVBoxLayout" name="verticalLayout_7">
601- <property name="leftMargin">
602- <number>0</number>
603- </property>
604- </layout>
605- </widget>
606- </item>
607- </layout>
608- </widget>
609- </widget>
610- </item>
611- </layout>
612- </widget>
613- </item>
614- </layout>
615- </widget>
616- </item>
617- <item row="1" column="2">
618- <spacer name="horizontalSpacer_2">
619- <property name="orientation">
620- <enum>Qt::Horizontal</enum>
621- </property>
622- <property name="sizeHint" stdset="0">
623- <size>
624- <width>98</width>
625- <height>20</height>
626- </size>
627- </property>
628- </spacer>
629- </item>
630- <item row="2" column="1">
631- <spacer name="verticalSpacer_2">
632- <property name="orientation">
633- <enum>Qt::Vertical</enum>
634- </property>
635- <property name="sizeHint" stdset="0">
636- <size>
637- <width>20</width>
638- <height>42</height>
639- </size>
640- </property>
641- </spacer>
642+ </spacer>
643+ </item>
644+ </layout>
645+ </widget>
646+ </item>
647+ </layout>
648+ </widget>
649+ </item>
650+ <item row="2" column="1" colspan="2">
651+ <widget class="QFrame" name="footer_frame">
652+ <property name="sizePolicy">
653+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
654+ <horstretch>0</horstretch>
655+ <verstretch>0</verstretch>
656+ </sizepolicy>
657+ </property>
658+ <layout class="QHBoxLayout" name="horizontalLayout">
659+ <property name="margin">
660+ <number>0</number>
661+ </property>
662+ <item>
663+ <widget class="QStackedWidget" name="progress_stack">
664+ <property name="sizePolicy">
665+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
666+ <horstretch>0</horstretch>
667+ <verstretch>0</verstretch>
668+ </sizepolicy>
669+ </property>
670+ <widget class="QWidget" name="progress_widget">
671+ <layout class="QHBoxLayout" name="horizontalLayout_5">
672+ <property name="margin">
673+ <number>0</number>
674+ </property>
675+ <item>
676+ <widget class="QProgressBar" name="progressBar">
677+ <property name="value">
678+ <number>24</number>
679+ </property>
680+ </widget>
681+ </item>
682+ <item>
683+ <widget class="QPushButton" name="progressCancel">
684+ <property name="text">
685+ <string/>
686+ </property>
687+ <property name="icon">
688+ <iconset theme="dialog-close">
689+ <normaloff/>
690+ </iconset>
691+ </property>
692+ </widget>
693+ </item>
694+ </layout>
695+ </widget>
696+ <widget class="QWidget" name="progress_placeholder">
697+ <layout class="QHBoxLayout" name="horizontalLayout_6">
698+ <item>
699+ <spacer name="horizontalSpacer_5">
700+ <property name="orientation">
701+ <enum>Qt::Horizontal</enum>
702+ </property>
703+ <property name="sizeHint" stdset="0">
704+ <size>
705+ <width>12</width>
706+ <height>20</height>
707+ </size>
708+ </property>
709+ </spacer>
710+ </item>
711+ </layout>
712+ </widget>
713+ </widget>
714+ </item>
715+ <item>
716+ <widget class="QWidget" name="navigation" native="true">
717+ <layout class="QHBoxLayout" name="horizontalLayout_2">
718+ <property name="margin">
719+ <number>0</number>
720+ </property>
721+ <item>
722+ <widget class="QPushButton" name="back">
723+ <property name="text">
724+ <string>Back</string>
725+ </property>
726+ <property name="autoDefault">
727+ <bool>true</bool>
728+ </property>
729+ </widget>
730+ </item>
731+ <item>
732+ <widget class="QPushButton" name="next">
733+ <property name="text">
734+ <string>Next</string>
735+ </property>
736+ <property name="autoDefault">
737+ <bool>true</bool>
738+ </property>
739+ </widget>
740+ </item>
741+ </layout>
742+ </widget>
743+ </item>
744+ </layout>
745+ </widget>
746 </item>
747 </layout>
748 </widget>
749 </widget>
750- <customwidgets>
751- <customwidget>
752- <class>SqueezeLabel</class>
753- <extends>QLabel</extends>
754- <header>ubiquity.frontend.kde_components.SqueezeLabel</header>
755- </customwidget>
756- </customwidgets>
757+ <tabstops>
758+ <tabstop>next</tabstop>
759+ <tabstop>back</tabstop>
760+ <tabstop>progressCancel</tabstop>
761+ </tabstops>
762 <resources/>
763 <connections/>
764 </ui>
765
766=== added file 'gui/qt/images/background.xcf'
767Binary 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
768=== added file 'gui/qt/images/breadcrumb.png'
769Binary 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
770=== removed file 'gui/qt/images/content_border.png'
771Binary 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
772=== removed file 'gui/qt/images/label_border.png'
773Binary 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
774=== added file 'gui/qt/images/main.png'
775Binary 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
776=== removed file 'gui/qt/images/main_frame_border.png'
777Binary 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
778=== removed file 'gui/qt/images/minimize.png'
779Binary 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
780=== added file 'gui/qt/images/sidebar.png'
781Binary 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
782=== added file 'gui/qt/images/sidebar_shadow.png'
783Binary 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
784=== removed file 'gui/qt/images/single_pixel.png'
785Binary 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
786=== modified file 'gui/qt/stepLanguage.ui'
787--- gui/qt/stepLanguage.ui 2011-06-18 23:15:08 +0000
788+++ gui/qt/stepLanguage.ui 2013-02-27 17:37:28 +0000
789@@ -6,7 +6,7 @@
790 <rect>
791 <x>0</x>
792 <y>0</y>
793- <width>873</width>
794+ <width>681</width>
795 <height>513</height>
796 </rect>
797 </property>
798@@ -20,23 +20,36 @@
799 <string>Form</string>
800 </property>
801 <layout class="QGridLayout" name="gridLayout">
802- <item row="0" column="0" colspan="2">
803+ <item row="0" column="0" colspan="5">
804 <widget class="QLabel" name="welcome_heading_label">
805 <property name="text">
806 <string>Welcome</string>
807 </property>
808 </widget>
809 </item>
810- <item row="1" column="0" colspan="5">
811- <widget class="Line" name="line_2">
812- <property name="orientation">
813- <enum>Qt::Horizontal</enum>
814+ <item row="11" column="0" colspan="5">
815+ <widget class="QLabel" name="oem_id_label">
816+ <property name="text">
817+ <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>
818+ </property>
819+ <property name="wordWrap">
820+ <bool>true</bool>
821+ </property>
822+ </widget>
823+ </item>
824+ <item row="8" column="0" colspan="5">
825+ <widget class="QLabel" name="try_install_text_label">
826+ <property name="text">
827+ <string>You can try ${RELEASE} without making any changes to your system, or install alongside or instead of your current operating system.</string>
828+ </property>
829+ <property name="wordWrap">
830+ <bool>true</bool>
831 </property>
832 </widget>
833 </item>
834 <item row="2" column="0" rowspan="2" colspan="5">
835 <widget class="QLabel" name="select_language_label">
836- <property name="sizePolicy">
837+ <property name="sizePolicy">
838 <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
839 <horstretch>0</horstretch>
840 <verstretch>0</verstretch>
841@@ -63,6 +76,22 @@
842 </property>
843 </spacer>
844 </item>
845+ <item row="12" column="0" colspan="2">
846+ <widget class="QLineEdit" name="oem_id_entry"/>
847+ </item>
848+ <item row="4" column="3" colspan="2">
849+ <spacer name="horizontalSpacer_3">
850+ <property name="orientation">
851+ <enum>Qt::Horizontal</enum>
852+ </property>
853+ <property name="sizeHint" stdset="0">
854+ <size>
855+ <width>293</width>
856+ <height>20</height>
857+ </size>
858+ </property>
859+ </spacer>
860+ </item>
861 <item row="4" column="2">
862 <widget class="QComboBox" name="language_combobox">
863 <property name="editable">
864@@ -90,32 +119,45 @@
865 </item>
866 </widget>
867 </item>
868- <item row="4" column="3" colspan="2">
869- <spacer name="horizontalSpacer_3">
870- <property name="orientation">
871- <enum>Qt::Horizontal</enum>
872- </property>
873- <property name="sizeHint" stdset="0">
874- <size>
875- <width>293</width>
876- <height>20</height>
877- </size>
878- </property>
879- </spacer>
880- </item>
881 <item row="5" column="2">
882 <spacer name="verticalSpacer_11">
883 <property name="orientation">
884 <enum>Qt::Vertical</enum>
885 </property>
886+ <property name="sizeType">
887+ <enum>QSizePolicy::Fixed</enum>
888+ </property>
889+ <property name="sizeHint" stdset="0">
890+ <size>
891+ <width>0</width>
892+ <height>60</height>
893+ </size>
894+ </property>
895+ </spacer>
896+ </item>
897+ <item row="13" column="2">
898+ <spacer name="verticalSpacer">
899+ <property name="orientation">
900+ <enum>Qt::Vertical</enum>
901+ </property>
902 <property name="sizeHint" stdset="0">
903 <size>
904 <width>20</width>
905- <height>238</height>
906+ <height>40</height>
907 </size>
908 </property>
909 </spacer>
910 </item>
911+ <item row="10" column="0" colspan="5">
912+ <widget class="QLabel" name="release_notes_label">
913+ <property name="text">
914+ <string>If you have Internet access, read the release notes for information on problems that may affect you.</string>
915+ </property>
916+ <property name="wordWrap">
917+ <bool>true</bool>
918+ </property>
919+ </widget>
920+ </item>
921 <item row="6" column="0" colspan="5">
922 <layout class="QHBoxLayout" name="horizontalLayout">
923 <item>
924@@ -145,10 +187,7 @@
925 <string/>
926 </property>
927 <property name="alignment">
928- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
929- </property>
930- <property name="wordWrap">
931- <bool>false</bool>
932+ <set>Qt::AlignCenter</set>
933 </property>
934 </widget>
935 </item>
936@@ -173,9 +212,12 @@
937 <property name="orientation">
938 <enum>Qt::Horizontal</enum>
939 </property>
940+ <property name="sizeType">
941+ <enum>QSizePolicy::Fixed</enum>
942+ </property>
943 <property name="sizeHint" stdset="0">
944 <size>
945- <width>100</width>
946+ <width>80</width>
947 <height>20</height>
948 </size>
949 </property>
950@@ -186,7 +228,7 @@
951 <item>
952 <widget class="QLabel" name="image2">
953 <property name="sizePolicy">
954- <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
955+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
956 <horstretch>2</horstretch>
957 <verstretch>2</verstretch>
958 </sizepolicy>
959@@ -194,8 +236,8 @@
960 <property name="text">
961 <string/>
962 </property>
963- <property name="wordWrap">
964- <bool>true</bool>
965+ <property name="alignment">
966+ <set>Qt::AlignCenter</set>
967 </property>
968 </widget>
969 </item>
970@@ -230,17 +272,14 @@
971 </item>
972 </layout>
973 </item>
974- <item row="7" column="0" colspan="5">
975- <widget class="QLabel" name="try_install_text_label">
976- <property name="text">
977- <string>You can try ${RELEASE} without making any changes to your system, or install alongside or instead of your current operating system.</string>
978- </property>
979- <property name="wordWrap">
980- <bool>true</bool>
981+ <item row="1" column="0" colspan="5">
982+ <widget class="Line" name="line_2">
983+ <property name="orientation">
984+ <enum>Qt::Horizontal</enum>
985 </property>
986 </widget>
987 </item>
988- <item row="8" column="0" colspan="5">
989+ <item row="9" column="0" colspan="5">
990 <widget class="QLabel" name="alpha_warning_label">
991 <property name="text">
992 <string>alpha_warning_label</string>
993@@ -250,28 +289,21 @@
994 </property>
995 </widget>
996 </item>
997- <item row="9" column="0" colspan="5">
998- <widget class="QLabel" name="release_notes_label">
999- <property name="text">
1000- <string>If you have Internet access, read the release notes for information on problems that may affect you.</string>
1001- </property>
1002- <property name="wordWrap">
1003- <bool>true</bool>
1004- </property>
1005- </widget>
1006- </item>
1007- <item row="10" column="0" colspan="5">
1008- <widget class="QLabel" name="oem_id_label">
1009- <property name="text">
1010- <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>
1011- </property>
1012- <property name="wordWrap">
1013- <bool>true</bool>
1014- </property>
1015- </widget>
1016- </item>
1017- <item row="11" column="0" colspan="2">
1018- <widget class="QLineEdit" name="oem_id_entry"/>
1019+ <item row="7" column="2">
1020+ <spacer name="verticalSpacer_3">
1021+ <property name="orientation">
1022+ <enum>Qt::Vertical</enum>
1023+ </property>
1024+ <property name="sizeType">
1025+ <enum>QSizePolicy::Fixed</enum>
1026+ </property>
1027+ <property name="sizeHint" stdset="0">
1028+ <size>
1029+ <width>20</width>
1030+ <height>60</height>
1031+ </size>
1032+ </property>
1033+ </spacer>
1034 </item>
1035 </layout>
1036 </widget>
1037
1038=== modified file 'gui/qt/stepLocation.ui'
1039--- gui/qt/stepLocation.ui 2009-12-30 23:08:51 +0000
1040+++ gui/qt/stepLocation.ui 2013-02-27 17:37:28 +0000
1041@@ -7,7 +7,7 @@
1042 <x>0</x>
1043 <y>0</y>
1044 <width>579</width>
1045- <height>462</height>
1046+ <height>170</height>
1047 </rect>
1048 </property>
1049 <property name="windowTitle">
1050@@ -39,38 +39,63 @@
1051 </widget>
1052 </item>
1053 <item>
1054- <widget class="QFrame" name="map_frame">
1055- <property name="sizePolicy">
1056- <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
1057- <horstretch>0</horstretch>
1058- <verstretch>2</verstretch>
1059- </sizepolicy>
1060- </property>
1061- <property name="minimumSize">
1062- <size>
1063- <width>0</width>
1064- <height>280</height>
1065- </size>
1066- </property>
1067- <property name="maximumSize">
1068- <size>
1069- <width>16777215</width>
1070- <height>280</height>
1071- </size>
1072- </property>
1073- <property name="frameShape">
1074- <enum>QFrame::StyledPanel</enum>
1075- </property>
1076- <layout class="QVBoxLayout" name="verticalLayout_10">
1077- <property name="margin">
1078- <number>2</number>
1079- </property>
1080- </layout>
1081- </widget>
1082+ <layout class="QHBoxLayout" name="horizontalLayout">
1083+ <item>
1084+ <spacer name="horizontalSpacer_4">
1085+ <property name="orientation">
1086+ <enum>Qt::Horizontal</enum>
1087+ </property>
1088+ <property name="sizeHint" stdset="0">
1089+ <size>
1090+ <width>40</width>
1091+ <height>20</height>
1092+ </size>
1093+ </property>
1094+ </spacer>
1095+ </item>
1096+ <item>
1097+ <widget class="QFrame" name="map_frame">
1098+ <property name="frameShape">
1099+ <enum>QFrame::StyledPanel</enum>
1100+ </property>
1101+ <layout class="QVBoxLayout" name="verticalLayout_10">
1102+ <property name="margin">
1103+ <number>2</number>
1104+ </property>
1105+ </layout>
1106+ </widget>
1107+ </item>
1108+ <item>
1109+ <spacer name="horizontalSpacer_3">
1110+ <property name="orientation">
1111+ <enum>Qt::Horizontal</enum>
1112+ </property>
1113+ <property name="sizeHint" stdset="0">
1114+ <size>
1115+ <width>40</width>
1116+ <height>20</height>
1117+ </size>
1118+ </property>
1119+ </spacer>
1120+ </item>
1121+ </layout>
1122 </item>
1123 <item>
1124 <layout class="QHBoxLayout" name="horizontalLayout_4">
1125 <item>
1126+ <spacer name="horizontalSpacer">
1127+ <property name="orientation">
1128+ <enum>Qt::Horizontal</enum>
1129+ </property>
1130+ <property name="sizeHint" stdset="0">
1131+ <size>
1132+ <width>40</width>
1133+ <height>20</height>
1134+ </size>
1135+ </property>
1136+ </spacer>
1137+ </item>
1138+ <item>
1139 <widget class="QLabel" name="timezone_zone_label">
1140 <property name="text">
1141 <string>Region:</string>
1142@@ -120,6 +145,19 @@
1143 </property>
1144 </widget>
1145 </item>
1146+ <item>
1147+ <spacer name="horizontalSpacer_2">
1148+ <property name="orientation">
1149+ <enum>Qt::Horizontal</enum>
1150+ </property>
1151+ <property name="sizeHint" stdset="0">
1152+ <size>
1153+ <width>40</width>
1154+ <height>20</height>
1155+ </size>
1156+ </property>
1157+ </spacer>
1158+ </item>
1159 </layout>
1160 </item>
1161 <item>
1162
1163=== modified file 'gui/qt/stepPartMan.ui'
1164--- gui/qt/stepPartMan.ui 2011-01-31 12:05:44 +0000
1165+++ gui/qt/stepPartMan.ui 2013-02-27 17:37:28 +0000
1166@@ -74,7 +74,7 @@
1167 <item>
1168 <widget class="QTreeView" name="partition_list_treeview">
1169 <property name="sizePolicy">
1170- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
1171+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
1172 <horstretch>0</horstretch>
1173 <verstretch>0</verstretch>
1174 </sizepolicy>
1175@@ -164,60 +164,61 @@
1176 </widget>
1177 </item>
1178 <item>
1179- <widget class="QScrollArea" name="scrollArea">
1180- <property name="widgetResizable">
1181- <bool>true</bool>
1182- </property>
1183- <widget class="QWidget" name="scrollAreaWidgetContents">
1184- <property name="geometry">
1185- <rect>
1186- <x>0</x>
1187- <y>0</y>
1188- <width>825</width>
1189- <height>103</height>
1190- </rect>
1191- </property>
1192- <layout class="QGridLayout" name="gridLayout">
1193- <item row="0" column="0">
1194- <widget class="QWidget" name="part_advanced_bootloader_frame" native="true">
1195- <layout class="QVBoxLayout" name="verticalLayout_3">
1196- <item>
1197- <widget class="QLabel" name="bootloader_group_label">
1198- <property name="sizePolicy">
1199- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Maximum">
1200- <horstretch>0</horstretch>
1201- <verstretch>0</verstretch>
1202- </sizepolicy>
1203- </property>
1204- <property name="text">
1205- <string>&lt;strong&gt;Boot loader&lt;/strong&gt;</string>
1206- </property>
1207- </widget>
1208- </item>
1209- <item>
1210- <widget class="QLabel" name="grub_device_label">
1211- <property name="sizePolicy">
1212- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
1213- <horstretch>0</horstretch>
1214- <verstretch>0</verstretch>
1215- </sizepolicy>
1216- </property>
1217- <property name="text">
1218- <string>Help for GRUB device selection goes here.</string>
1219- </property>
1220- <property name="wordWrap">
1221- <bool>true</bool>
1222- </property>
1223- </widget>
1224- </item>
1225- <item>
1226- <widget class="QComboBox" name="grub_device_entry"/>
1227- </item>
1228- </layout>
1229- </widget>
1230- </item>
1231- </layout>
1232- </widget>
1233+ <spacer name="verticalSpacer">
1234+ <property name="orientation">
1235+ <enum>Qt::Vertical</enum>
1236+ </property>
1237+ <property name="sizeType">
1238+ <enum>QSizePolicy::Fixed</enum>
1239+ </property>
1240+ <property name="sizeHint" stdset="0">
1241+ <size>
1242+ <width>20</width>
1243+ <height>12</height>
1244+ </size>
1245+ </property>
1246+ </spacer>
1247+ </item>
1248+ <item>
1249+ <widget class="QFrame" name="part_advanced_bootloader_frame">
1250+ <layout class="QGridLayout" name="gridLayout">
1251+ <item row="1" column="2">
1252+ <spacer name="horizontalSpacer">
1253+ <property name="orientation">
1254+ <enum>Qt::Horizontal</enum>
1255+ </property>
1256+ <property name="sizeHint" stdset="0">
1257+ <size>
1258+ <width>40</width>
1259+ <height>20</height>
1260+ </size>
1261+ </property>
1262+ </spacer>
1263+ </item>
1264+ <item row="1" column="1">
1265+ <widget class="QComboBox" name="grub_device_entry"/>
1266+ </item>
1267+ <item row="1" column="0">
1268+ <widget class="QLabel" name="grub_device_label">
1269+ <property name="text">
1270+ <string>Help for GRUB device selection goes here.</string>
1271+ </property>
1272+ </widget>
1273+ </item>
1274+ <item row="0" column="0" colspan="3">
1275+ <widget class="QLabel" name="part_advanced_bootloader_label">
1276+ <property name="font">
1277+ <font>
1278+ <weight>75</weight>
1279+ <bold>true</bold>
1280+ </font>
1281+ </property>
1282+ <property name="text">
1283+ <string>Boot loader</string>
1284+ </property>
1285+ </widget>
1286+ </item>
1287+ </layout>
1288 </widget>
1289 </item>
1290 </layout>
1291
1292=== modified file 'gui/qt/style.qss'
1293--- gui/qt/style.qss 2012-03-19 17:04:20 +0000
1294+++ gui/qt/style.qss 2013-02-27 17:37:28 +0000
1295@@ -1,87 +1,52 @@
1296-/** main stylesheet */
1297-
1298-#centralwidget {
1299-}
1300-
1301-#minimize_button {
1302- background-image: url(/usr/share/ubiquity/qt/images/minimize.png);
1303- background-position: center center;
1304- background-repeat: no-repeat;
1305-
1306- border: none;
1307-}
1308-
1309-#main_frame {
1310- border-width: 13px;
1311- border-image: url(/usr/share/ubiquity/qt/images/main_frame_border.png) 13px;
1312-
1313- background-image: url(/usr/share/ubiquity/qt/images/single_pixel.png);
1314- background-repeat: no-repeat;
1315- background-position: bottom left;
1316- background-origin: border;
1317-
1318- padding: 0px;
1319- padding-bottom: 0px;
1320-}
1321-
1322-#main_widget {
1323-}
1324-
1325+/*- Backgrounds -----------------------------*/
1326+QMainWindow {
1327+ /* repeat horizontally, stretch vertically */
1328+ border-image: url(/usr/share/ubiquity/qt/images/sidebar.png) 0 repeat stretch;
1329+}
1330+
1331+#pageMode,
1332+#footer_frame {
1333+ background-image: url(/usr/share/ubiquity/qt/images/main.png);
1334+}
1335+
1336+#sidebar_header_frame,
1337+#steps_filler_widget,
1338+QFrame[isBreadcrumb="true"],
1339+#sidebar_footer_frame {
1340+ background-image: url(/usr/share/ubiquity/qt/images/sidebar_shadow.png);
1341+}
1342+
1343+#sidebar_header_frame {
1344+ padding-bottom: 24px;
1345+}
1346+
1347+/*- Footer ----------------------------------*/
1348+#footer_frame,
1349+#sidebar_footer_frame {
1350+ padding: 6px;
1351+}
1352+
1353+/*- Sidebar header --------------------------*/
1354 #distro_name_label,
1355-#distro_release_label,
1356-#install_process_label {
1357- font-family: sans-serif;
1358-}
1359-
1360-#distro_name_label {
1361- color: #00aad4;
1362- font-size: 12pt;
1363-}
1364-
1365 #distro_release_label {
1366- color: #00ccff;
1367+ color: #fff;
1368 font-size: 12pt;
1369 }
1370
1371 #install_process_label {
1372- color: #006680;
1373+ color: #fff;
1374 font-size: 8pt;
1375- padding-left: 1px;
1376 }
1377
1378+/*- Sidebar steps ---------------------------*/
1379 #steps_widget {
1380 }
1381
1382 #steps_widget QLabel {
1383- qproperty-alignment: AlignLeft;
1384- font-family: sans-serif;
1385- font-size: 12pt;
1386- color: #666666;
1387- margin: 5px;
1388- margin-left: 0px;
1389- margin-right: 0px;
1390-}
1391-
1392-/*
1393-#steps_widget #dummy_active_step {
1394- color: #666666;
1395-}
1396-
1397-#steps_widget #dummy_inactive_step {
1398- color: #b3b3b3;
1399-}
1400-
1401-#steps_widget #dummy_current_step {
1402- color: #0088aa;
1403-}
1404-*/
1405-
1406-#widgetStack QLabel, QRadioButton {
1407- font-size: 10pt;
1408- color: #4d4d4d;
1409- margin: 1px;
1410-}
1411-
1412+ color: #ddd;
1413+}
1414+
1415+/*- Errors ----------------------------------*/
1416 #widgetStack #fullname_error_reason,
1417 #widgetStack #username_error_reason,
1418 #widgetStack #password_error_reason,
1419@@ -91,6 +56,7 @@
1420 color: #ff5555;
1421 }
1422
1423+/*- Headings --------------------------------*/
1424 #widgetStack #welcome_heading_label,
1425 #widgetStack #prepare_heading_label,
1426 #widgetStack #timezone_heading_label,
1427@@ -105,42 +71,28 @@
1428 qproperty-alignment: AlignCenter;
1429 }
1430
1431-#content_widget
1432-{
1433-}
1434-
1435-#widgetStack QWidget
1436-{
1437+/*- Content ---------------------------------*/
1438+#widgetStack QLabel, QRadioButton {
1439+ font-size: 10pt;
1440+ color: #4d4d4d;
1441+ margin: 1px;
1442+}
1443+
1444+#content_widget {
1445+}
1446+
1447+#widgetStack QWidget {
1448 font-size: 10pt;
1449 }
1450
1451-#widgetStack {
1452- padding: 5px;
1453- padding-top: 0px;
1454- padding-bottom: 0px;
1455-
1456- border-width: 6px;
1457- border-image: url(/usr/share/ubiquity/qt/images/content_border.png) 6px;
1458-}
1459-
1460-#content_frame QLabel {
1461+#content_frame QLabel {
1462 }
1463
1464 #map_frame,
1465-#keyboard_frame
1466+#keyboard_frame
1467 {
1468 border-radius: 5px;
1469 border: 1px solid #bac8d1;
1470 }
1471
1472-#progressBar {
1473- background-color: #b0bfc2;
1474- border-radius: 3px;
1475- border: 1px solid grey;
1476- text-align: center;
1477-}
1478-
1479-#progressBar::chunk {
1480- border-radius: 3px;
1481- background-color: #94a7ac;
1482-}
1483+/* vim: set ft=css: */
1484
1485=== removed file 'gui/qt/style_small.qss'
1486--- gui/qt/style_small.qss 2010-02-21 16:37:12 +0000
1487+++ gui/qt/style_small.qss 1970-01-01 00:00:00 +0000
1488@@ -1,18 +0,0 @@
1489-/* stylesheet for smaller screens
1490- apply after main stylesheet */
1491-
1492-#widgetStack QWidget
1493-{
1494- font-size: 9pt;
1495-}
1496-
1497-#widgetStack #welcome_heading_label,
1498-#widgetStack #timezone_heading_label,
1499-#widgetStack #keyboard_heading_label,
1500-#widgetStack #part_auto_heading_label,
1501-#widgetStack #part_advanced_heading_label,
1502-#widgetStack #userinfo_heading_label,
1503-#widgetStack #reading_heading_label
1504-{
1505- font-size: 8pt;
1506-}
1507\ No newline at end of file
1508
1509=== added file 'ubiquity/frontend/kde_components/Breadcrumb.py'
1510--- ubiquity/frontend/kde_components/Breadcrumb.py 1970-01-01 00:00:00 +0000
1511+++ ubiquity/frontend/kde_components/Breadcrumb.py 2013-02-27 17:37:28 +0000
1512@@ -0,0 +1,88 @@
1513+# -*- coding: utf-8; Mode: Python; indent-tabs-mode: nil; tab-width: 4 -*-
1514+#
1515+# Copyright (C) 2013 Canonical Ltd.
1516+#
1517+# Author:
1518+# Aurélien Gâteau <agateau@kde.org>
1519+#
1520+# This file is part of Ubiquity.
1521+#
1522+# Ubiquity is free software; you can redistribute it and/or modify it under
1523+# the terms of the GNU General Public License as published by the Free
1524+# Software Foundation; either version 2 of the License, or at your option)
1525+# any later version.
1526+#
1527+# Ubiquity is distributed in the hope that it will be useful, but WITHOUT
1528+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
1529+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
1530+# more details.
1531+#
1532+# You should have received a copy of the GNU General Public License along
1533+# with Ubiquity; if not, write to the Free Software Foundation, Inc., 51
1534+# Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1535+
1536+from PyQt4 import QtCore, QtGui
1537+from PyQt4.QtCore import Qt
1538+
1539+__all__ = ["Breadcrumb"]
1540+
1541+
1542+class Breadcrumb(QtGui.QFrame):
1543+ TODO = 0
1544+ CURRENT = 1
1545+ DONE = 2
1546+
1547+ def __init__(self, parent=None):
1548+ QtGui.QFrame.__init__(self, parent)
1549+ self.setProperty("isBreadcrumb", True)
1550+
1551+ self._tickLabel = QtGui.QLabel()
1552+ fm = self._tickLabel.fontMetrics()
1553+ self._tickLabel.setFixedWidth(fm.width(" M "))
1554+ self._tickLabel.setAlignment(Qt.AlignTop | Qt.AlignRight)
1555+
1556+ self._mainLabel = QtGui.QLabel()
1557+ self._mainLabel.setAlignment(Qt.AlignTop | Qt.AlignLeft)
1558+ self._mainLabel.setWordWrap(True)
1559+
1560+ layout = QtGui.QHBoxLayout(self)
1561+ layout.addWidget(self._tickLabel)
1562+ layout.addWidget(self._mainLabel)
1563+
1564+ self.setState(Breadcrumb.TODO)
1565+
1566+ def setState(self, state):
1567+ self._tickLabel.setText(_TICK_DICT[state])
1568+ self.setStyleSheet(_CSS_DICT[state])
1569+
1570+ def setText(self, text):
1571+ self._mainLabel.setText(text)
1572+
1573+ def text(self):
1574+ return self._mainLabel.text()
1575+
1576+
1577+_TICK_DICT = {
1578+ Breadcrumb.TODO: "•",
1579+ Breadcrumb.CURRENT: "‣",
1580+ Breadcrumb.DONE: "✓",
1581+}
1582+
1583+
1584+_CSS_DICT = {
1585+ Breadcrumb.TODO: "",
1586+ Breadcrumb.CURRENT: """
1587+ QFrame {
1588+ border-top-width: 10px;
1589+ border-bottom-width: 10px;
1590+ background-image: none;
1591+ border-image: url(/usr/share/ubiquity/qt/images/breadcrumb.png) 10px;
1592+ }
1593+ .QLabel {
1594+ color: #333;
1595+ border-width: 0px;
1596+ border-image: none;
1597+ }
1598+ """,
1599+ Breadcrumb.DONE: "",
1600+}
1601
1602=== removed file 'ubiquity/frontend/kde_components/SqueezeLabel.py'
1603--- ubiquity/frontend/kde_components/SqueezeLabel.py 2012-07-16 14:29:13 +0000
1604+++ ubiquity/frontend/kde_components/SqueezeLabel.py 1970-01-01 00:00:00 +0000
1605@@ -1,22 +0,0 @@
1606-# -*- coding: utf-8 -*-
1607-
1608-from PyQt4 import QtGui, QtCore
1609-
1610-
1611-# idea from
1612-# http://trac.transmissionbt.com/browser/trunk/qt/squeezelabel.cc
1613-class SqueezeLabel(QtGui.QLabel):
1614- def __init__(self, parent=None):
1615- QtGui.QLabel.__init__(self, parent)
1616-
1617- def paintEvent(self, pe):
1618- fm = self.fontMetrics()
1619- if fm.width(self.text()) > self.contentsRect().width():
1620- oldText = self.text()
1621- elided = fm.elidedText(oldText, QtCore.Qt.ElideRight, self.width())
1622- self.setText(elided)
1623- self.setToolTip(oldText)
1624- QtGui.QLabel.paintEvent(self, pe)
1625- self.setText(oldText)
1626- else:
1627- QtGui.QLabel.paintEvent(self, pe)
1628
1629=== modified file 'ubiquity/frontend/kde_components/Timezone.py'
1630--- ubiquity/frontend/kde_components/Timezone.py 2012-11-22 16:27:21 +0000
1631+++ ubiquity/frontend/kde_components/Timezone.py 2013-02-27 17:37:28 +0000
1632@@ -34,6 +34,13 @@
1633 # load background pixmap
1634 self.imagePath = "/usr/share/ubiquity/pixmaps/timezone"
1635 self.pixmap = QtGui.QPixmap("%s/bg.png" % self.imagePath)
1636+ self.setMinimumSize(self.pixmap.size() / 2)
1637+ self.setMaximumSize(self.pixmap.size())
1638+ policy = QtGui.QSizePolicy(
1639+ QtGui.QSizePolicy.Preferred,
1640+ QtGui.QSizePolicy.Preferred)
1641+ policy.setHeightForWidth(True)
1642+ self.setSizePolicy(policy)
1643
1644 # redraw timer for selected city time
1645 self.timer = QtCore.QTimer(self)
1646@@ -116,6 +123,15 @@
1647 y = y * (self.height() * 1.2)
1648 return y
1649
1650+ def sizeHint(self):
1651+ return self.pixmap.size()
1652+
1653+ def heightForWidth(self, w):
1654+ size = self.pixmap.size()
1655+ if w > size.width():
1656+ w = size.width()
1657+ return w * size.height() / size.width()
1658+
1659 def paintEvent(self, unused_paintEvent):
1660 painter = QtGui.QPainter(self)
1661 painter.setRenderHint(QtGui.QPainter.Antialiasing)
1662@@ -186,6 +202,8 @@
1663 # @return pixel coordinate of a latitude and longitude for self
1664 # map uses Miller Projection, but is also clipped
1665 def getPosition(self, la, lo):
1666+ width = min(self.width(), self.pixmap.width())
1667+ height = min(self.height(), self.pixmap.height())
1668 # need to add/sub magic numbers because the map doesn't actually go
1669 # from -180...180, -90...90 thus the upper corner is not -180, -90
1670 # and we have to compensate
1671@@ -195,9 +213,9 @@
1672 # the 180 - 360 accounts for the fact that the map does not span the
1673 # entire -90 to 90 the map does span the entire 360 though, just
1674 # offset
1675- x = ((self.width() * (180.0 + lo) / 360.0) +
1676- (self.width() * xdeg_offset / 180.0))
1677- x = x % self.width()
1678+ x = ((width * (180.0 + lo) / 360.0) +
1679+ (width * xdeg_offset / 180.0))
1680+ x = x % width
1681
1682 # top and bottom clipping latitudes
1683 topLat = 81
1684@@ -223,7 +241,7 @@
1685 y = y / mapRange
1686
1687 # this then becomes the percentage of the height
1688- y = y * self.height()
1689+ y = y * height
1690
1691 return QtCore.QPoint(int(x), int(y))
1692
1693
1694=== added file 'ubiquity/frontend/kde_components/testing/timezonemap.py'
1695--- ubiquity/frontend/kde_components/testing/timezonemap.py 1970-01-01 00:00:00 +0000
1696+++ ubiquity/frontend/kde_components/testing/timezonemap.py 2013-02-27 17:37:28 +0000
1697@@ -0,0 +1,20 @@
1698+# -*- coding: utf-8 -*-
1699+
1700+import sys
1701+
1702+from PyQt4 import QtGui, uic
1703+from ubiquity.frontend.kde_components.Timezone import TimezoneMap
1704+
1705+
1706+if __name__ == "__main__":
1707+ app = QtGui.QApplication(sys.argv)
1708+ QtGui.QApplication.setStyle("Oxygen")
1709+ qss = open("/usr/share/ubiquity/qt/style.qss").read()
1710+ app.setStyleSheet(qss)
1711+
1712+ page = uic.loadUi('/usr/share/ubiquity/qt/stepLocation.ui')
1713+ tzmap = TimezoneMap(page.map_frame)
1714+ page.map_frame.layout().addWidget(tzmap)
1715+ page.show()
1716+
1717+ sys.exit(app.exec_())
1718
1719=== modified file 'ubiquity/frontend/kde_ui.py'
1720--- ubiquity/frontend/kde_ui.py 2013-02-19 11:33:07 +0000
1721+++ ubiquity/frontend/kde_ui.py 2013-02-27 17:37:28 +0000
1722@@ -45,7 +45,8 @@
1723 from ubiquity.components import partman_commit, install, plugininstall
1724 import ubiquity.frontend.base
1725 from ubiquity.frontend.base import BaseFrontend
1726-from ubiquity.frontend.kde_components import ProgressDialog, SqueezeLabel
1727+from ubiquity.frontend.kde_components import ProgressDialog
1728+from ubiquity.frontend.kde_components.Breadcrumb import Breadcrumb
1729 from ubiquity.plugin import Plugin
1730 import ubiquity.progressposition
1731
1732@@ -87,25 +88,8 @@
1733 self.distro_name_label.setText(distro_name)
1734 self.distro_release_label.setText(distro_release)
1735
1736- self.minimize_button.clicked.connect(self.showMinimized)
1737-
1738 self.setWindowTitle("%s %s" % (distro_name, distro_release))
1739
1740- # don't use stylesheet cause we want to scale the wallpaper for various
1741- # screen sizes as well as support larger screens
1742- self.bgImage = QtGui.QImage("/usr/share/wallpapers/kde-default.png")
1743- self.scaledBgImage = self.bgImage
1744-
1745- def paintEvent(self, pe):
1746- p = QtGui.QPainter(self)
1747- p.drawImage(0, 0, self.scaledBgImage)
1748-
1749- def resizeEvent(self, re):
1750- self.scaledBgImage = self.bgImage.scaled(
1751- self.width(), self.height(),
1752- QtCore.Qt.KeepAspectRatioByExpanding,
1753- QtCore.Qt.SmoothTransformation)
1754-
1755 def setWizard(self, wizardRef):
1756 self.wizard = wizardRef
1757
1758@@ -180,31 +164,16 @@
1759
1760 self.ui = UbiquityUI()
1761
1762- # handle smaller screens (old school eee pc
1763- if (QtGui.QApplication.desktop().screenGeometry().height() < 560):
1764- self.ui.main_frame.setFixedHeight(470)
1765- with open(os.path.join(UIDIR, "style_small.qss")) as style:
1766- self.ui.main_frame.setStyleSheet(style.read())
1767-
1768 # initially the steps widget is not visible
1769 # it becomes visible once the first step becomes active
1770 self.ui.steps_widget.setVisible(False)
1771 self.ui.content_widget.setVisible(False)
1772
1773 if 'UBIQUITY_GREETER' in os.environ:
1774- self.ui.minimize_button.hide()
1775-
1776- self.ui.setWindowState(
1777- self.ui.windowState() ^ QtCore.Qt.WindowFullScreen)
1778+ self.ui.setWindowState(
1779+ self.ui.windowState() ^ QtCore.Qt.WindowFullScreen)
1780
1781 self.ui.setWizard(self)
1782- # self.ui.setWindowFlags(QtCore.Qt.Window |
1783- # QtCore.Qt.CustomizeWindowHint | QtCore.Qt.WindowTitleHint |
1784- # QtCore.Qt.WindowMinMaxButtonsHint)
1785-
1786- #hide the minimize button if in "install only" mode
1787- if 'UBIQUITY_ONLY' in os.environ or 'UBIQUITY_GREETER' in os.environ:
1788- self.ui.minimize_button.setVisible(False)
1789
1790 self.stackLayout = QtGui.QStackedLayout(self.ui.widgetStack)
1791
1792@@ -218,7 +187,8 @@
1793 mod.ui = mod.ui_class(mod.controller)
1794 widgets = mod.ui.get('plugin_widgets')
1795 optional_widgets = mod.ui.get('plugin_optional_widgets')
1796- breadcrumb = mod.ui.get('plugin_breadcrumb')
1797+ # Use a placeholder for breadcrumb if none defined
1798+ breadcrumb = mod.ui.get('plugin_breadcrumb') or '------'
1799 if widgets or optional_widgets:
1800 def fill_out(widget_list):
1801 rv = []
1802@@ -237,24 +207,16 @@
1803 return rv
1804 mod.widgets = fill_out(widgets)
1805 mod.optional_widgets = fill_out(optional_widgets)
1806- if not hasattr(mod.ui, 'plugin_breadcrumb'):
1807- breadcrumb = '------' # just a placeholder
1808- if breadcrumb:
1809- mod.breadcrumb_question = breadcrumb
1810- mod.breadcrumb = SqueezeLabel.SqueezeLabel()
1811- mod.breadcrumb.setObjectName(mod.breadcrumb_question)
1812- # Room for install crumb.
1813- label_index = self.ui.steps_widget.layout().count() - 2
1814- self.ui.steps_widget.layout().insertWidget(
1815- label_index, mod.breadcrumb)
1816- else:
1817- mod.breadcrumb_question = None
1818- # Page intentionally didn't want a label (intro).
1819- mod.breadcrumb = None
1820+
1821+ mod.breadcrumb_question = breadcrumb
1822+ mod.breadcrumb = self._create_breadcrumb(breadcrumb)
1823+
1824 self.pageslen += 1
1825 self.pages.append(mod)
1826 self.user_pageslen = self.pageslen
1827
1828+ self.breadcrumb_install = self._create_breadcrumb('breadcrumb_install')
1829+
1830 # declare attributes
1831 self.language_questions = (
1832 'live_installer',
1833@@ -305,9 +267,6 @@
1834 "/usr/share/icons/hicolor/128x128/apps/ubiquity.png"))
1835 self.allow_go_backward(False)
1836
1837- if not 'UBIQUITY_AUTOMATIC' in os.environ:
1838- self.ui.show()
1839-
1840 self.stop_debconf()
1841 self.translate_widgets(reget=True)
1842
1843@@ -327,7 +286,7 @@
1844 self.ui.quit.hide()
1845 # TODO cjwatson 2010-04-07: provide alternative strings instead
1846 self.ui.install_process_label.hide()
1847- self.ui.breadcrumb_install.hide()
1848+ self.breadcrumb_install.hide()
1849
1850 self.forwardIcon = QtGui.QIcon(
1851 "/usr/share/icons/oxygen/128x128/actions/go-next.png")
1852@@ -345,11 +304,25 @@
1853 "/usr/share/icons/oxygen/48x48/actions/dialog-close.png")
1854 self.ui.quit.setIcon(quitIcon)
1855
1856- self.ui.progressBar.hide()
1857- self.ui.progressCancel.hide()
1858+ self._show_progress_bar(False)
1859
1860 misc.add_connection_watch(self.network_change)
1861
1862+ def _show_progress_bar(self, show):
1863+ if show:
1864+ widget = self.ui.progress_widget
1865+ else:
1866+ widget = self.ui.progress_placeholder
1867+ self.ui.progress_stack.setCurrentWidget(widget)
1868+
1869+ def _create_breadcrumb(self, name):
1870+ widget = Breadcrumb()
1871+ widget.setObjectName(name)
1872+ layout = self.ui.steps_widget.layout()
1873+ # "- 1" to insert before the bottom spacer
1874+ layout.insertWidget(layout.count() - 1, widget)
1875+ return widget
1876+
1877 def excepthook(self, exctype, excvalue, exctb):
1878 """Crash handler."""
1879
1880@@ -438,6 +411,11 @@
1881 # Start the interface
1882 self.set_current_page(0)
1883
1884+ if not 'UBIQUITY_AUTOMATIC' in os.environ:
1885+ # Only show now so that the window does not show empty, then resize
1886+ # itself and show content
1887+ self.ui.show()
1888+
1889 while(self.pagesindex < self.pageslen):
1890 if self.current_page is None:
1891 break
1892@@ -491,15 +469,7 @@
1893 self.app.processEvents()
1894
1895 if self.current_page is not None:
1896- borderCSS = (
1897- "border-width: 6px; border-image: "
1898- "url(/usr/share/ubiquity/qt/images/label_border.png) 6px;")
1899- currentSS = "%s color: %s; " % (borderCSS, "#0088aa")
1900- inactiveSS = "color: %s; " % "#b3b3b3"
1901- for page in self.pages:
1902- if page.breadcrumb:
1903- page.breadcrumb.setStyleSheet(inactiveSS)
1904- self.ui.breadcrumb_install.setStyleSheet(currentSS)
1905+ self._update_breadcrumbs('__install')
1906 self.start_slideshow()
1907 self.run_main_loop()
1908
1909@@ -545,6 +515,25 @@
1910
1911 return self.returncode
1912
1913+ def _update_breadcrumbs(self, active_page_name):
1914+ done = True
1915+ for page in self.pages:
1916+ if not page.breadcrumb:
1917+ continue
1918+ if page.module.NAME == active_page_name:
1919+ page.breadcrumb.setState(Breadcrumb.CURRENT)
1920+ done = False
1921+ else:
1922+ if done:
1923+ page.breadcrumb.setState(Breadcrumb.DONE)
1924+ else:
1925+ page.breadcrumb.setState(Breadcrumb.TODO)
1926+
1927+ if active_page_name == '__install':
1928+ page.breadcrumb.setState(Breadcrumb.CURRENT)
1929+ else:
1930+ page.breadcrumb.setState(Breadcrumb.TODO)
1931+
1932 def start_slideshow(self):
1933 slideshow_dir = '/usr/share/ubiquity-slideshow'
1934 slideshow_locale = self.slideshow_get_available_locale(slideshow_dir,
1935@@ -581,6 +570,7 @@
1936 webView.setFixedSize(700, 420)
1937 webView.load(QtCore.QUrl(slides))
1938
1939+ self.ui.navigation.hide()
1940 self.ui.pageMode.setCurrentIndex(1)
1941 self.ui.pageMode.widget(1).layout().addWidget(webView)
1942 webView.show()
1943@@ -718,7 +708,7 @@
1944 if text is None:
1945 return
1946
1947- if isinstance(widget, QtGui.QLabel):
1948+ if isinstance(widget, (QtGui.QLabel, Breadcrumb)):
1949 if name == 'select_language_label' and self.oem_user_config:
1950 text = self.get_string(
1951 'select_language_oem_user_label', lang, prefix)
1952@@ -828,18 +818,10 @@
1953 self.run_automation_error_cmd()
1954 self.ui.show()
1955
1956- borderCSS = (
1957- "border-width: 6px; border-image: "
1958- "url(/usr/share/ubiquity/qt/images/label_border.png) 6px;")
1959- activeSS = "color: %s; " % "#666666"
1960- inactiveSS = "color: %s; " % "#b3b3b3"
1961- currentSS = "%s color: %s; " % (borderCSS, "#0088aa")
1962-
1963 #set all the steps active
1964 #each step will set its previous ones as inactive
1965 #this handles the ability to go back
1966
1967- found = False
1968 is_install = False
1969 for page in self.pages:
1970 if page.module.NAME == n:
1971@@ -855,16 +837,8 @@
1972 index = self.stackLayout.indexOf(cur)
1973 self.add_history(page, cur)
1974 self.set_current_page(index)
1975- if page.breadcrumb:
1976- page.breadcrumb.setStyleSheet(currentSS)
1977- found = True
1978 is_install = page.ui.get('plugin_is_install')
1979- elif page.breadcrumb:
1980- if found:
1981- page.breadcrumb.setStyleSheet(activeSS)
1982- else:
1983- page.breadcrumb.setStyleSheet(inactiveSS)
1984- self.ui.breadcrumb_install.setStyleSheet(activeSS)
1985+ self._update_breadcrumbs(n)
1986
1987 if is_install:
1988 self.ui.next.setText(
1989@@ -1210,7 +1184,7 @@
1990 self.finished_pages = True
1991 if self.finished_installing or self.oem_user_config:
1992 self.debconf_progress_info('')
1993- self.ui.progressBar.show()
1994+ self._show_progress_bar(True)
1995 dbfilter = plugininstall.Install(self)
1996 dbfilter.start(auto_process=True)
1997
1998@@ -1219,7 +1193,7 @@
1999 # starts, it does so with the most recent changes.
2000 self.stop_debconf()
2001 self.start_debconf()
2002- self.ui.progressBar.show()
2003+ self._show_progress_bar(True)
2004 self.installing = True
2005 from ubiquity.debconfcommunicator import DebconfCommunicator
2006 if self.parallel_db is not None:
2007@@ -1245,7 +1219,7 @@
2008 dbfilter = plugininstall.Install(self)
2009 dbfilter.start(auto_process=True)
2010 else:
2011- self.ui.progressBar.hide()
2012+ self._show_progress_bar(False)
2013
2014 elif finished_step == 'ubiquity.components.plugininstall':
2015 self.installing = False
2016@@ -1281,7 +1255,7 @@
2017 self.ui.next.setIcon(self.forwardIcon)
2018 self.translate_widget(self.ui.next)
2019 self.installing = False
2020- self.ui.progressBar.hide()
2021+ self._show_progress_bar(False)
2022 self.ui.quit.show()
2023
2024 def error_dialog(self, title, msg, fatal=True):

Subscribers

People subscribed via source and target branches

to status/vote changes: