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
=== modified file 'debian/changelog'
--- debian/changelog 2012-03-08 14:31:17 +0000
+++ debian/changelog 2012-03-08 18:27:29 +0000
@@ -54,7 +54,8 @@
54 qt/frontend/qtfront.h, qt/frontend/treemodel.cpp, qt/frontend/treemodel.h:54 qt/frontend/qtfront.h, qt/frontend/treemodel.cpp, qt/frontend/treemodel.h:
55 Makes it possible for the job selection tree to have more than 2 levels of55 Makes it possible for the job selection tree to have more than 2 levels of
56 children nodes.56 children nodes.
57 57 * qt/frontend/qtfront.ui: If the test text is too long, then it is cut off (LP: #950111)
58
58 [Tim Chen]59 [Tim Chen]
59 * Modifications to removable_storage_test to handle cases where removable60 * Modifications to removable_storage_test to handle cases where removable
60 media is not mounted prior to test running. (LP: #944623)61 media is not mounted prior to test running. (LP: #944623)
6162
=== modified file 'qt/frontend/qtfront.ui'
--- qt/frontend/qtfront.ui 2012-02-21 08:54:26 +0000
+++ qt/frontend/qtfront.ui 2012-03-08 18:27:29 +0000
@@ -47,7 +47,7 @@
47 <enum>QTabWidget::Rounded</enum>47 <enum>QTabWidget::Rounded</enum>
48 </property>48 </property>
49 <property name="currentIndex">49 <property name="currentIndex">
50 <number>1</number>50 <number>0</number>
51 </property>51 </property>
52 <widget class="QWidget" name="tabWelcome">52 <widget class="QWidget" name="tabWelcome">
53 <attribute name="title">53 <attribute name="title">
@@ -780,37 +780,101 @@
780 <widget class="QFrame" name="testFrame">780 <widget class="QFrame" name="testFrame">
781 <layout class="QHBoxLayout" name="horizontalLayout_3">781 <layout class="QHBoxLayout" name="horizontalLayout_3">
782 <item>782 <item>
783 <widget class="QFrame" name="stepsFrame">783 <widget class="QFrame" name="frame">
784 <property name="sizePolicy">784 <property name="sizePolicy">
785 <sizepolicy hsizetype="Expanding" vsizetype="Expanding">785 <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
786 <horstretch>30</horstretch>786 <horstretch>30</horstretch>
787 <verstretch>30</verstretch>787 <verstretch>0</verstretch>
788 </sizepolicy>788 </sizepolicy>
789 </property>789 </property>
790 <property name="minimumSize">
791 <size>
792 <width>0</width>
793 <height>0</height>
794 </size>
795 </property>
796 <property name="sizeIncrement">
797 <size>
798 <width>0</width>
799 <height>0</height>
800 </size>
801 </property>
802 <property name="autoFillBackground">
803 <bool>false</bool>
804 </property>
805 <property name="frameShape">790 <property name="frameShape">
806 <enum>QFrame::Box</enum>791 <enum>QFrame::Box</enum>
807 </property>792 </property>
808 <property name="frameShadow">793 <property name="frameShadow">
809 <enum>QFrame::Plain</enum>794 <enum>QFrame::Plain</enum>
810 </property>795 </property>
811 <property name="lineWidth">796 <layout class="QVBoxLayout" name="verticalLayout_2">
812 <number>1</number>797 <property name="spacing">
813 </property>798 <number>0</number>
799 </property>
800 <property name="margin">
801 <number>0</number>
802 </property>
803 <item>
804 <widget class="QScrollArea" name="scrollArea">
805 <property name="sizePolicy">
806 <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
807 <horstretch>30</horstretch>
808 <verstretch>30</verstretch>
809 </sizepolicy>
810 </property>
811 <property name="frameShape">
812 <enum>QFrame::NoFrame</enum>
813 </property>
814 <property name="lineWidth">
815 <number>0</number>
816 </property>
817 <property name="widgetResizable">
818 <bool>true</bool>
819 </property>
820 <widget class="QWidget" name="scrollAreaWidgetContents">
821 <property name="geometry">
822 <rect>
823 <x>0</x>
824 <y>0</y>
825 <width>500</width>
826 <height>200</height>
827 </rect>
828 </property>
829 <layout class="QVBoxLayout" name="verticalLayout_4">
830 <property name="spacing">
831 <number>0</number>
832 </property>
833 <property name="margin">
834 <number>0</number>
835 </property>
836 <item>
837 <widget class="QFrame" name="stepsFrame">
838 <property name="sizePolicy">
839 <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
840 <horstretch>30</horstretch>
841 <verstretch>30</verstretch>
842 </sizepolicy>
843 </property>
844 <property name="minimumSize">
845 <size>
846 <width>0</width>
847 <height>0</height>
848 </size>
849 </property>
850 <property name="sizeIncrement">
851 <size>
852 <width>0</width>
853 <height>0</height>
854 </size>
855 </property>
856 <property name="autoFillBackground">
857 <bool>false</bool>
858 </property>
859 <property name="frameShape">
860 <enum>QFrame::NoFrame</enum>
861 </property>
862 <property name="frameShadow">
863 <enum>QFrame::Plain</enum>
864 </property>
865 <property name="lineWidth">
866 <number>1</number>
867 </property>
868 </widget>
869 </item>
870 </layout>
871 </widget>
872 </widget>
873 </item>
874 </layout>
875 <zorder>stepsFrame</zorder>
876 <zorder>stepsFrame</zorder>
877 <zorder>scrollArea</zorder>
814 </widget>878 </widget>
815 </item>879 </item>
816 <item>880 <item>

Subscribers

People subscribed via source and target branches