Checkbox

Merge lp:~tiagosh/checkbox/test-screen into lp:checkbox

  1. test-screen
  2. Merge into trunk
Proposed by Tiago Salem Herrmann
Status: Merged
Merged at revision: 1314
Proposed branch: lp:~tiagosh/checkbox/test-screen
Merge into: lp:checkbox
Diff against target: 148 lines (+87/-22)
2 files modified
debian/changelog (+2/-1)
qt/frontend/qtfront.ui (+85/-21)
To merge this branch: bzr merge lp:~tiagosh/checkbox/test-screen
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Marc Tardif (community) Needs Information
Review via email: mp+96251@code.launchpad.net

Description of the change

This MR makes the test screen border fixed and the contents scrollable when necessary

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

Should this change make it into Precise? If so, it would need a bug number and a changelog entry. Otherwise, please let me know and I'll approve as a [FEATURE].

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

Actually, even if this change shouldn't make it in Precise, it seems significant enough to warrant a changelog entry.

Revision history for this message
Ara Pulido (ara) wrote :

I think that this should make it to Precise. I guess the bug should go along the lines: "If the test text is too long, then it is cut off"

lp:~tiagosh/checkbox/test-screen updated
1306. By Tiago Salem Herrmann

update changelog

Revision history for this message
Tiago Salem Herrmann (tiagosh) wrote :

linked a bug report and added a changelog entry.

Revision history for this message
Daniel Manrique (roadmr) wrote :

Thanks, the bug report looks OK and the fix does too. I just rearranged the changelog a bit.

Merging..

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-03-08 14:31:17 +0000
3+++ debian/changelog 2012-03-08 18:27:29 +0000
4@@ -54,7 +54,8 @@
5 qt/frontend/qtfront.h, qt/frontend/treemodel.cpp, qt/frontend/treemodel.h:
6 Makes it possible for the job selection tree to have more than 2 levels of
7 children nodes.
8-
9+ * qt/frontend/qtfront.ui: If the test text is too long, then it is cut off (LP: #950111)
10+
11 [Tim Chen]
12 * Modifications to removable_storage_test to handle cases where removable
13 media is not mounted prior to test running. (LP: #944623)
14
15=== modified file 'qt/frontend/qtfront.ui'
16--- qt/frontend/qtfront.ui 2012-02-21 08:54:26 +0000
17+++ qt/frontend/qtfront.ui 2012-03-08 18:27:29 +0000
18@@ -47,7 +47,7 @@
19 <enum>QTabWidget::Rounded</enum>
20 </property>
21 <property name="currentIndex">
22- <number>1</number>
23+ <number>0</number>
24 </property>
25 <widget class="QWidget" name="tabWelcome">
26 <attribute name="title">
27@@ -780,37 +780,101 @@
28 <widget class="QFrame" name="testFrame">
29 <layout class="QHBoxLayout" name="horizontalLayout_3">
30 <item>
31- <widget class="QFrame" name="stepsFrame">
32+ <widget class="QFrame" name="frame">
33 <property name="sizePolicy">
34 <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
35 <horstretch>30</horstretch>
36- <verstretch>30</verstretch>
37+ <verstretch>0</verstretch>
38 </sizepolicy>
39 </property>
40- <property name="minimumSize">
41- <size>
42- <width>0</width>
43- <height>0</height>
44- </size>
45- </property>
46- <property name="sizeIncrement">
47- <size>
48- <width>0</width>
49- <height>0</height>
50- </size>
51- </property>
52- <property name="autoFillBackground">
53- <bool>false</bool>
54- </property>
55 <property name="frameShape">
56 <enum>QFrame::Box</enum>
57 </property>
58 <property name="frameShadow">
59 <enum>QFrame::Plain</enum>
60 </property>
61- <property name="lineWidth">
62- <number>1</number>
63- </property>
64+ <layout class="QVBoxLayout" name="verticalLayout_2">
65+ <property name="spacing">
66+ <number>0</number>
67+ </property>
68+ <property name="margin">
69+ <number>0</number>
70+ </property>
71+ <item>
72+ <widget class="QScrollArea" name="scrollArea">
73+ <property name="sizePolicy">
74+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
75+ <horstretch>30</horstretch>
76+ <verstretch>30</verstretch>
77+ </sizepolicy>
78+ </property>
79+ <property name="frameShape">
80+ <enum>QFrame::NoFrame</enum>
81+ </property>
82+ <property name="lineWidth">
83+ <number>0</number>
84+ </property>
85+ <property name="widgetResizable">
86+ <bool>true</bool>
87+ </property>
88+ <widget class="QWidget" name="scrollAreaWidgetContents">
89+ <property name="geometry">
90+ <rect>
91+ <x>0</x>
92+ <y>0</y>
93+ <width>500</width>
94+ <height>200</height>
95+ </rect>
96+ </property>
97+ <layout class="QVBoxLayout" name="verticalLayout_4">
98+ <property name="spacing">
99+ <number>0</number>
100+ </property>
101+ <property name="margin">
102+ <number>0</number>
103+ </property>
104+ <item>
105+ <widget class="QFrame" name="stepsFrame">
106+ <property name="sizePolicy">
107+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
108+ <horstretch>30</horstretch>
109+ <verstretch>30</verstretch>
110+ </sizepolicy>
111+ </property>
112+ <property name="minimumSize">
113+ <size>
114+ <width>0</width>
115+ <height>0</height>
116+ </size>
117+ </property>
118+ <property name="sizeIncrement">
119+ <size>
120+ <width>0</width>
121+ <height>0</height>
122+ </size>
123+ </property>
124+ <property name="autoFillBackground">
125+ <bool>false</bool>
126+ </property>
127+ <property name="frameShape">
128+ <enum>QFrame::NoFrame</enum>
129+ </property>
130+ <property name="frameShadow">
131+ <enum>QFrame::Plain</enum>
132+ </property>
133+ <property name="lineWidth">
134+ <number>1</number>
135+ </property>
136+ </widget>
137+ </item>
138+ </layout>
139+ </widget>
140+ </widget>
141+ </item>
142+ </layout>
143+ <zorder>stepsFrame</zorder>
144+ <zorder>stepsFrame</zorder>
145+ <zorder>scrollArea</zorder>
146 </widget>
147 </item>
148 <item>

Subscribers

People subscribed via source and target branches