diff -r 76999ca7bbf1 -r 3a1d1d4c6f4f PyUnit/UnittestDialog.ui --- a/PyUnit/UnittestDialog.ui Sat Nov 28 19:47:23 2015 +0100 +++ b/PyUnit/UnittestDialog.ui Sat Nov 28 19:48:11 2015 +0100 @@ -17,30 +17,30 @@ <item> <widget class="QGroupBox" name="groupBox"> <property name="title"> - <string/> + <string>Test Parameters</string> </property> - <layout class="QGridLayout" name="_4"> - <item row="1" column="1" colspan="2"> - <widget class="QComboBox" name="testComboBox"> - <property name="toolTip"> - <string>Enter the test name. Leave empty to use the default name "suite".</string> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="testsuiteLabel"> + <property name="text"> + <string>Enter test &filename:</string> </property> - <property name="whatsThis"> - <string><b>Testname</b><p>Enter the name of the test to be performed. This name must follow the rules given by Python's unittest module. If this field is empty, the default name of "suite" will be used.</p></string> - </property> - <property name="editable"> - <bool>true</bool> + <property name="buddy"> + <cstring>testsuitePicker</cstring> </property> </widget> </item> <item row="0" column="1"> - <widget class="QComboBox" name="testsuiteComboBox"> + <widget class="E5ComboPathPicker" name="testsuitePicker" native="true"> <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="focusPolicy"> + <enum>Qt::WheelFocus</enum> + </property> <property name="toolTip"> <string>Enter name of file defining the testsuite</string> </property> @@ -51,15 +51,6 @@ found, the module will be inspected for proper test cases.</p></string> </property> - <property name="editable"> - <bool>true</bool> - </property> - <property name="insertPolicy"> - <enum>QComboBox::InsertAtTop</enum> - </property> - <property name="duplicatesEnabled"> - <bool>false</bool> - </property> </widget> </item> <item row="1" column="0"> @@ -72,20 +63,16 @@ </property> </widget> </item> - <item row="0" column="0"> - <widget class="QLabel" name="testsuiteLabel"> - <property name="text"> - <string>Enter test &filename:</string> + <item row="1" column="1"> + <widget class="QComboBox" name="testComboBox"> + <property name="toolTip"> + <string>Enter the test name. Leave empty to use the default name "suite".</string> </property> - <property name="buddy"> - <cstring>testsuiteComboBox</cstring> + <property name="whatsThis"> + <string><b>Testname</b><p>Enter the name of the test to be performed. This name must follow the rules given by Python's unittest module. If this field is empty, the default name of "suite" will be used.</p></string> </property> - </widget> - </item> - <item row="0" column="2"> - <widget class="QToolButton" name="fileDialogButton"> - <property name="toolTip"> - <string>Open a file selection dialog</string> + <property name="editable"> + <bool>true</bool> </property> </widget> </item> @@ -95,7 +82,7 @@ <item> <widget class="QGroupBox" name="optionsGroup"> <property name="title"> - <string/> + <string>Run Parameters</string> </property> <layout class="QHBoxLayout" name="_5"> <item> @@ -137,7 +124,7 @@ <item> <widget class="QGroupBox" name="progressGroupBox"> <property name="title"> - <string/> + <string>Progress</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> <item> @@ -415,6 +402,12 @@ </widget> <customwidgets> <customwidget> + <class>E5ComboPathPicker</class> + <extends>QWidget</extends> + <header>E5Gui/E5PathPicker.h</header> + <container>1</container> + </customwidget> + <customwidget> <class>E5Led</class> <extends>QFrame</extends> <header>E5Gui/E5Led.h</header> @@ -422,8 +415,7 @@ </customwidget> </customwidgets> <tabstops> - <tabstop>testsuiteComboBox</tabstop> - <tabstop>fileDialogButton</tabstop> + <tabstop>testsuitePicker</tabstop> <tabstop>testComboBox</tabstop> <tabstop>localCheckBox</tabstop> <tabstop>coverageCheckBox</tabstop>