Checkbox

Merge lp:~brendan-donegan/checkbox/bug937113_test_selection_views into lp:checkbox

  1. bug937113_test_selection_views
  2. Merge into trunk
Proposed by Brendan Donegan
Status: Merged
Merged at revision: 1278
Proposed branch: lp:~brendan-donegan/checkbox/bug937113_test_selection_views
Merge into: lp:checkbox
Diff against target: 665 lines (+256/-209)
2 files modified
debian/changelog (+1/-0)
qt/frontend/qtfront.ui (+255/-209)
To merge this branch: bzr merge lp:~brendan-donegan/checkbox/bug937113_test_selection_views
Reviewer Review Type Date Requested Status
Marc Tardif (community) Approve
Review via email: mp+93939@code.launchpad.net

Description of the change

This branch increases the size of some of the views in Checkbox Qt. It also changes the color of the title pane to try and match the color used by the windows title bar.

To post a comment you must log in.
Revision history for this message
Marc Tardif (cr3) wrote :

The grey area at the top of the window seems to be darker in this branch:

http://people.canonical.com/~cr3/checkbox-937113-before.png
http://people.canonical.com/~cr3/checkbox-937113-after.png

Is this intentional?

review: Needs Information
Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

Yes, the intention is for the title bar to be a dark grey. This is supposed to be part of the design. I haven't really gotten the color right so if you want I can revert that particular aspect of the change.

Revision history for this message
Marc Tardif (cr3) wrote :

Following confirmation from Victor, looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-02-20 08:22:59 +0000
3+++ debian/changelog 2012-02-21 09:14:17 +0000
4@@ -8,6 +8,7 @@
5
6 [Brendan Donegan]
7 * Typo in command for for miscellanea/virtualization-check (LP: #934243)
8+ * Resized test selection views in checkbox-qt (LP: #937113)
9
10 -- Marc Tardif <marc@ubuntu.com> Thu, 16 Feb 2012 10:31:18 -0500
11
12
13=== modified file 'qt/frontend/qtfront.ui'
14--- qt/frontend/qtfront.ui 2012-02-15 19:52:52 +0000
15+++ qt/frontend/qtfront.ui 2012-02-21 09:14:17 +0000
16@@ -47,7 +47,7 @@
17 <enum>QTabWidget::Rounded</enum>
18 </property>
19 <property name="currentIndex">
20- <number>0</number>
21+ <number>1</number>
22 </property>
23 <widget class="QWidget" name="tabWelcome">
24 <attribute name="title">
25@@ -159,9 +159,9 @@
26 <property name="geometry">
27 <rect>
28 <x>30</x>
29- <y>40</y>
30+ <y>10</y>
31 <width>571</width>
32- <height>181</height>
33+ <height>261</height>
34 </rect>
35 </property>
36 <property name="frameShape">
37@@ -178,7 +178,7 @@
38 <property name="geometry">
39 <rect>
40 <x>30</x>
41- <y>230</y>
42+ <y>280</y>
43 <width>571</width>
44 <height>31</height>
45 </rect>
46@@ -189,14 +189,14 @@
47 </font>
48 </property>
49 <property name="text">
50- <string>Ok</string>
51+ <string>OK</string>
52 </property>
53 </widget>
54 <widget class="QCheckBox" name="checkBox">
55 <property name="geometry">
56 <rect>
57 <x>310</x>
58- <y>280</y>
59+ <y>320</y>
60 <width>321</width>
61 <height>20</height>
62 </rect>
63@@ -246,8 +246,99 @@
64 <height>89</height>
65 </size>
66 </property>
67+ <property name="palette">
68+ <palette>
69+ <active>
70+ <colorrole role="Button">
71+ <brush brushstyle="SolidPattern">
72+ <color alpha="255">
73+ <red>73</red>
74+ <green>73</green>
75+ <blue>80</blue>
76+ </color>
77+ </brush>
78+ </colorrole>
79+ <colorrole role="Base">
80+ <brush brushstyle="SolidPattern">
81+ <color alpha="255">
82+ <red>73</red>
83+ <green>73</green>
84+ <blue>80</blue>
85+ </color>
86+ </brush>
87+ </colorrole>
88+ <colorrole role="Window">
89+ <brush brushstyle="SolidPattern">
90+ <color alpha="255">
91+ <red>73</red>
92+ <green>73</green>
93+ <blue>80</blue>
94+ </color>
95+ </brush>
96+ </colorrole>
97+ </active>
98+ <inactive>
99+ <colorrole role="Button">
100+ <brush brushstyle="SolidPattern">
101+ <color alpha="255">
102+ <red>73</red>
103+ <green>73</green>
104+ <blue>80</blue>
105+ </color>
106+ </brush>
107+ </colorrole>
108+ <colorrole role="Base">
109+ <brush brushstyle="SolidPattern">
110+ <color alpha="255">
111+ <red>73</red>
112+ <green>73</green>
113+ <blue>80</blue>
114+ </color>
115+ </brush>
116+ </colorrole>
117+ <colorrole role="Window">
118+ <brush brushstyle="SolidPattern">
119+ <color alpha="255">
120+ <red>73</red>
121+ <green>73</green>
122+ <blue>80</blue>
123+ </color>
124+ </brush>
125+ </colorrole>
126+ </inactive>
127+ <disabled>
128+ <colorrole role="Button">
129+ <brush brushstyle="SolidPattern">
130+ <color alpha="255">
131+ <red>73</red>
132+ <green>73</green>
133+ <blue>80</blue>
134+ </color>
135+ </brush>
136+ </colorrole>
137+ <colorrole role="Base">
138+ <brush brushstyle="SolidPattern">
139+ <color alpha="255">
140+ <red>73</red>
141+ <green>73</green>
142+ <blue>80</blue>
143+ </color>
144+ </brush>
145+ </colorrole>
146+ <colorrole role="Window">
147+ <brush brushstyle="SolidPattern">
148+ <color alpha="255">
149+ <red>73</red>
150+ <green>73</green>
151+ <blue>80</blue>
152+ </color>
153+ </brush>
154+ </colorrole>
155+ </disabled>
156+ </palette>
157+ </property>
158 <property name="styleSheet">
159- <string notr="true">background-color: #C2C7CB;</string>
160+ <string notr="true">background: #494950;</string>
161 </property>
162 <widget class="QLabel" name="progressLabel">
163 <property name="geometry">
164@@ -270,6 +361,13 @@
165 <pointsize>11</pointsize>
166 </font>
167 </property>
168+ <property name="autoFillBackground">
169+ <bool>false</bool>
170+ </property>
171+ <property name="styleSheet">
172+ <string notr="true">color: &quot;white&quot;;
173+background: transparent;</string>
174+ </property>
175 <property name="text">
176 <string>10 tests completed out of 30 (30%)</string>
177 </property>
178@@ -279,10 +377,13 @@
179 <rect>
180 <x>50</x>
181 <y>40</y>
182- <width>118</width>
183+ <width>241</width>
184 <height>16</height>
185 </rect>
186 </property>
187+ <property name="styleSheet">
188+ <string notr="true"/>
189+ </property>
190 <property name="minimum">
191 <number>0</number>
192 </property>
193@@ -326,7 +427,7 @@
194 </property>
195 <property name="styleSheet">
196 <string notr="true"> QTabWidget::pane#testsTab { /* The tab widget frame */
197- border-top: 15 solid #C2C7CB;
198+ border-top: 15 solid #494950;
199 position: absolute;
200 top: -1.7em;
201 }
202@@ -342,14 +443,12 @@
203 min-width: 10ex;
204 min-height: 3ex;
205 padding: 0px;
206- border-top-left-radius: 4px;
207- border-top-right-radius: 4px;
208- border-bottom-left-radius: 4px;
209- border-bottom-right-radius: 4px;
210+ border-radius: 4px;
211 }
212
213 QTabBar::tab:selected {
214- background: #C2C7CB;
215+ color: #FFFFFF;
216+ background: #494950;
217 border-color: #000000;
218 border-bottom-color: #000000;
219 }</string>
220@@ -358,7 +457,7 @@
221 <enum>QTabWidget::Rounded</enum>
222 </property>
223 <property name="currentIndex">
224- <number>1</number>
225+ <number>2</number>
226 </property>
227 <widget class="QWidget" name="welcome">
228 <property name="font">
229@@ -395,10 +494,10 @@
230 <widget class="Line" name="line">
231 <property name="geometry">
232 <rect>
233- <x>40</x>
234+ <x>10</x>
235 <y>60</y>
236- <width>571</width>
237- <height>16</height>
238+ <width>601</width>
239+ <height>20</height>
240 </rect>
241 </property>
242 <property name="orientation">
243@@ -408,10 +507,10 @@
244 <widget class="Line" name="line_2">
245 <property name="geometry">
246 <rect>
247- <x>410</x>
248+ <x>390</x>
249 <y>40</y>
250 <width>20</width>
251- <height>211</height>
252+ <height>271</height>
253 </rect>
254 </property>
255 <property name="orientation">
256@@ -421,7 +520,7 @@
257 <widget class="QLabel" name="label_2">
258 <property name="geometry">
259 <rect>
260- <x>50</x>
261+ <x>10</x>
262 <y>50</y>
263 <width>101</width>
264 <height>17</height>
265@@ -434,7 +533,7 @@
266 <widget class="QLabel" name="label_3">
267 <property name="geometry">
268 <rect>
269- <x>430</x>
270+ <x>410</x>
271 <y>50</y>
272 <width>67</width>
273 <height>17</height>
274@@ -450,10 +549,10 @@
275 </property>
276 <property name="geometry">
277 <rect>
278- <x>430</x>
279+ <x>410</x>
280 <y>80</y>
281- <width>181</width>
282- <height>171</height>
283+ <width>201</width>
284+ <height>231</height>
285 </rect>
286 </property>
287 <property name="palette">
288@@ -515,10 +614,10 @@
289 <widget class="QTreeView" name="treeView">
290 <property name="geometry">
291 <rect>
292- <x>50</x>
293+ <x>10</x>
294 <y>80</y>
295- <width>361</width>
296- <height>171</height>
297+ <width>381</width>
298+ <height>231</height>
299 </rect>
300 </property>
301 <property name="frameShape">
302@@ -543,9 +642,9 @@
303 </property>
304 <property name="geometry">
305 <rect>
306- <x>430</x>
307- <y>260</y>
308- <width>181</width>
309+ <x>410</x>
310+ <y>320</y>
311+ <width>201</width>
312 <height>27</height>
313 </rect>
314 </property>
315@@ -592,12 +691,12 @@
316 <number>0</number>
317 </property>
318 <item>
319- <layout class="QVBoxLayout" name="verticalLayout_2">
320+ <layout class="QVBoxLayout" name="testVLayout">
321 <property name="spacing">
322 <number>0</number>
323 </property>
324 <item>
325- <widget class="QWidget" name="widget_2" native="true">
326+ <widget class="QFrame" name="titleFrame">
327 <property name="sizePolicy">
328 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
329 <horstretch>0</horstretch>
330@@ -613,31 +712,49 @@
331 <widget class="QLabel" name="testTypeLabel">
332 <property name="geometry">
333 <rect>
334- <x>20</x>
335- <y>6</y>
336- <width>291</width>
337- <height>31</height>
338+ <x>10</x>
339+ <y>0</y>
340+ <width>611</width>
341+ <height>25</height>
342 </rect>
343 </property>
344+ <property name="sizePolicy">
345+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
346+ <horstretch>0</horstretch>
347+ <verstretch>0</verstretch>
348+ </sizepolicy>
349+ </property>
350 <property name="font">
351 <font>
352 <family>Ubuntu</family>
353- <pointsize>17</pointsize>
354+ <pointsize>16</pointsize>
355 </font>
356 </property>
357 <property name="text">
358 <string>TextLabel</string>
359 </property>
360+ <property name="alignment">
361+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
362+ </property>
363+ <property name="wordWrap">
364+ <bool>true</bool>
365+ </property>
366 </widget>
367 <widget class="QLabel" name="purposeLabel">
368 <property name="geometry">
369 <rect>
370- <x>30</x>
371- <y>35</y>
372- <width>591</width>
373+ <x>10</x>
374+ <y>30</y>
375+ <width>611</width>
376 <height>21</height>
377 </rect>
378 </property>
379+ <property name="sizePolicy">
380+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
381+ <horstretch>0</horstretch>
382+ <verstretch>0</verstretch>
383+ </sizepolicy>
384+ </property>
385 <property name="font">
386 <font>
387 <family>Ubuntu</family>
388@@ -650,180 +767,109 @@
389 <property name="text">
390 <string>TextLabel</string>
391 </property>
392+ <property name="alignment">
393+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
394+ </property>
395+ <property name="wordWrap">
396+ <bool>true</bool>
397+ </property>
398 </widget>
399 </widget>
400 </item>
401 <item>
402- <widget class="QWidget" name="widget_3" native="true">
403- <layout class="QHBoxLayout" name="horizontalLayout_6">
404- <property name="spacing">
405- <number>0</number>
406- </property>
407- <property name="margin">
408- <number>0</number>
409- </property>
410- <item>
411- <layout class="QHBoxLayout" name="horizontalLayout_3">
412- <property name="spacing">
413+ <widget class="QFrame" name="testFrame">
414+ <layout class="QHBoxLayout" name="horizontalLayout_3">
415+ <item>
416+ <widget class="QFrame" name="stepsFrame">
417+ <property name="sizePolicy">
418+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
419+ <horstretch>30</horstretch>
420+ <verstretch>30</verstretch>
421+ </sizepolicy>
422+ </property>
423+ <property name="minimumSize">
424+ <size>
425+ <width>0</width>
426+ <height>0</height>
427+ </size>
428+ </property>
429+ <property name="sizeIncrement">
430+ <size>
431+ <width>0</width>
432+ <height>0</height>
433+ </size>
434+ </property>
435+ <property name="autoFillBackground">
436+ <bool>false</bool>
437+ </property>
438+ <property name="frameShape">
439+ <enum>QFrame::Box</enum>
440+ </property>
441+ <property name="frameShadow">
442+ <enum>QFrame::Plain</enum>
443+ </property>
444+ <property name="lineWidth">
445+ <number>1</number>
446+ </property>
447+ </widget>
448+ </item>
449+ <item>
450+ <widget class="QFrame" name="testButtonsFrame">
451+ <property name="sizePolicy">
452+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
453+ <horstretch>6</horstretch>
454+ <verstretch>0</verstretch>
455+ </sizepolicy>
456+ </property>
457+ <property name="frameShape">
458+ <enum>QFrame::NoFrame</enum>
459+ </property>
460+ <property name="frameShadow">
461+ <enum>QFrame::Plain</enum>
462+ </property>
463+ <property name="lineWidth">
464 <number>0</number>
465 </property>
466- <item>
467- <widget class="QWidget" name="widget_5" native="true">
468- <property name="sizePolicy">
469- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
470- <horstretch>0</horstretch>
471- <verstretch>0</verstretch>
472- </sizepolicy>
473- </property>
474- <layout class="QHBoxLayout" name="horizontalLayout_8">
475- <property name="spacing">
476- <number>0</number>
477- </property>
478- <property name="margin">
479- <number>0</number>
480- </property>
481- <item>
482- <widget class="QScrollArea" name="scrollArea">
483- <property name="sizePolicy">
484- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
485- <horstretch>0</horstretch>
486- <verstretch>0</verstretch>
487- </sizepolicy>
488- </property>
489- <property name="frameShape">
490- <enum>QFrame::NoFrame</enum>
491- </property>
492- <property name="frameShadow">
493- <enum>QFrame::Plain</enum>
494- </property>
495- <property name="lineWidth">
496- <number>0</number>
497- </property>
498- <property name="verticalScrollBarPolicy">
499- <enum>Qt::ScrollBarAsNeeded</enum>
500- </property>
501- <property name="horizontalScrollBarPolicy">
502- <enum>Qt::ScrollBarAsNeeded</enum>
503- </property>
504- <property name="widgetResizable">
505- <bool>true</bool>
506- </property>
507- <widget class="QWidget" name="scrollAreaWidgetContents">
508- <property name="geometry">
509- <rect>
510- <x>0</x>
511- <y>0</y>
512- <width>85</width>
513- <height>178</height>
514- </rect>
515- </property>
516- <layout class="QVBoxLayout" name="verticalLayout_9">
517- <property name="spacing">
518- <number>0</number>
519- </property>
520- <property name="sizeConstraint">
521- <enum>QLayout::SetDefaultConstraint</enum>
522- </property>
523- <property name="margin">
524- <number>0</number>
525- </property>
526- <item>
527- <widget class="QFrame" name="stepsFrame">
528- <property name="sizePolicy">
529- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
530- <horstretch>0</horstretch>
531- <verstretch>0</verstretch>
532- </sizepolicy>
533- </property>
534- <property name="minimumSize">
535- <size>
536- <width>0</width>
537- <height>178</height>
538- </size>
539- </property>
540- <property name="sizeIncrement">
541- <size>
542- <width>0</width>
543- <height>0</height>
544- </size>
545- </property>
546- <property name="autoFillBackground">
547- <bool>false</bool>
548- </property>
549- <property name="frameShape">
550- <enum>QFrame::Box</enum>
551- </property>
552- <property name="frameShadow">
553- <enum>QFrame::Plain</enum>
554- </property>
555- <property name="lineWidth">
556- <number>1</number>
557- </property>
558- </widget>
559- </item>
560- </layout>
561- </widget>
562- </widget>
563- </item>
564- </layout>
565- </widget>
566- </item>
567- <item>
568- <widget class="QWidget" name="widget_4" native="true">
569- <property name="sizePolicy">
570- <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
571- <horstretch>0</horstretch>
572- <verstretch>0</verstretch>
573- </sizepolicy>
574- </property>
575- <property name="minimumSize">
576- <size>
577- <width>150</width>
578- <height>0</height>
579- </size>
580- </property>
581- <widget class="QPushButton" name="testTestButton">
582- <property name="geometry">
583- <rect>
584- <x>30</x>
585- <y>70</y>
586- <width>80</width>
587- <height>25</height>
588- </rect>
589- </property>
590- <property name="text">
591- <string>Test</string>
592- </property>
593- </widget>
594- <widget class="QPushButton" name="yesTestButton">
595- <property name="geometry">
596- <rect>
597- <x>30</x>
598- <y>110</y>
599- <width>80</width>
600- <height>25</height>
601- </rect>
602- </property>
603- <property name="text">
604- <string>Yes</string>
605- </property>
606- </widget>
607- <widget class="QPushButton" name="noTestButton">
608- <property name="geometry">
609- <rect>
610- <x>30</x>
611- <y>150</y>
612- <width>80</width>
613- <height>25</height>
614- </rect>
615- </property>
616- <property name="text">
617- <string>No</string>
618- </property>
619- </widget>
620- </widget>
621- </item>
622- </layout>
623+ <widget class="QPushButton" name="yesTestButton">
624+ <property name="geometry">
625+ <rect>
626+ <x>10</x>
627+ <y>0</y>
628+ <width>85</width>
629+ <height>27</height>
630+ </rect>
631+ </property>
632+ <property name="text">
633+ <string>Yes</string>
634+ </property>
635+ </widget>
636+ <widget class="QPushButton" name="testTestButton">
637+ <property name="geometry">
638+ <rect>
639+ <x>10</x>
640+ <y>40</y>
641+ <width>85</width>
642+ <height>27</height>
643+ </rect>
644+ </property>
645+ <property name="text">
646+ <string>Test</string>
647+ </property>
648+ </widget>
649+ <widget class="QPushButton" name="noTestButton">
650+ <property name="geometry">
651+ <rect>
652+ <x>10</x>
653+ <y>80</y>
654+ <width>85</width>
655+ <height>27</height>
656+ </rect>
657+ </property>
658+ <property name="text">
659+ <string>No</string>
660+ </property>
661+ </widget>
662+ </widget>
663 </item>
664 </layout>
665 </widget>

Subscribers

People subscribed via source and target branches