--- a/Debugger/StartCoverageDialog.ui Sat Nov 28 19:47:23 2015 +0100 +++ b/Debugger/StartCoverageDialog.ui Sat Nov 28 19:48:11 2015 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>488</width> - <height>225</height> + <height>186</height> </rect> </property> <property name="windowTitle"> @@ -16,193 +16,192 @@ <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="TextLabel1"> - <property name="text"> - <string>Command&line:</string> - </property> - <property name="buddy"> - <cstring>cmdlineCombo</cstring> - </property> - </widget> - </item> - <item row="0" column="1" colspan="3"> - <widget class="QComboBox" name="cmdlineCombo"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Enter the commandline parameters</string> - </property> - <property name="whatsThis"> - <string><b>Commandline</b> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="TextLabel1"> + <property name="text"> + <string>Command&line:</string> + </property> + <property name="buddy"> + <cstring>cmdlineCombo</cstring> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QComboBox" name="cmdlineCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter the commandline parameters</string> + </property> + <property name="whatsThis"> + <string><b>Commandline</b> <p>Enter the commandline parameters in this field.</p></string> - </property> - <property name="editable"> - <bool>true</bool> - </property> - <property name="insertPolicy"> - <enum>QComboBox::InsertAtTop</enum> - </property> - <property name="sizeAdjustPolicy"> - <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum> - </property> - <property name="duplicatesEnabled"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="TextLabel2"> - <property name="text"> - <string>&Working directory:</string> - </property> - <property name="buddy"> - <cstring>workdirCombo</cstring> - </property> - </widget> - </item> - <item row="1" column="1" colspan="2"> - <widget class="QComboBox" name="workdirCombo"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Enter the working directory</string> - </property> - <property name="whatsThis"> - <string><b>Working directory</b> + </property> + <property name="editable"> + <bool>true</bool> + </property> + <property name="insertPolicy"> + <enum>QComboBox::InsertAtTop</enum> + </property> + <property name="sizeAdjustPolicy"> + <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum> + </property> + <property name="duplicatesEnabled"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="TextLabel2"> + <property name="text"> + <string>&Working directory:</string> + </property> + <property name="buddy"> + <cstring>workdirPicker</cstring> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="E5ComboPathPicker" name="workdirPicker" native="true"> + <property name="sizePolicy"> + <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 the working directory</string> + </property> + <property name="whatsThis"> + <string><b>Working directory</b> <p>Enter the working directory of the application to be debugged. Leave it empty to set the working directory to the executable directory.</p></string> - </property> - <property name="editable"> - <bool>true</bool> - </property> - <property name="insertPolicy"> - <enum>QComboBox::InsertAtTop</enum> - </property> - <property name="sizeAdjustPolicy"> - <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum> - </property> - <property name="duplicatesEnabled"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="textLabel1"> - <property name="text"> - <string>&Environment:</string> - </property> - <property name="buddy"> - <cstring>environmentCombo</cstring> - </property> - </widget> - </item> - <item row="2" column="1" colspan="3"> - <widget class="QComboBox" name="environmentCombo"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Enter the environment variables to be set.</string> - </property> - <property name="whatsThis"> - <string><b>Environment</b> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="textLabel1"> + <property name="text"> + <string>&Environment:</string> + </property> + <property name="buddy"> + <cstring>environmentCombo</cstring> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QComboBox" name="environmentCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter the environment variables to be set.</string> + </property> + <property name="whatsThis"> + <string><b>Environment</b> <p>Enter the environment variables to be set for the program. The individual settings must be separated by whitespace and be given in the form 'var=value'. In order to add to an environment variable, enter it in the form 'var+=value'.</p> <p>Example: var1=1 var2="hello world" var3+=":/tmp"</p></string> - </property> - <property name="editable"> - <bool>true</bool> - </property> - <property name="insertPolicy"> - <enum>QComboBox::InsertAtTop</enum> - </property> - <property name="sizeAdjustPolicy"> - <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum> - </property> - <property name="duplicatesEnabled"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="3" column="0" colspan="2"> - <widget class="QCheckBox" name="exceptionCheckBox"> - <property name="toolTip"> - <string>Uncheck to disable exception reporting</string> - </property> - <property name="whatsThis"> - <string><b>Report exceptions</b> -<p>Uncheck this in order to disable exception reporting.</p></string> - </property> - <property name="text"> - <string>Report &exceptions</string> - </property> - <property name="shortcut"> - <string>Alt+E</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> + </property> + <property name="editable"> + <bool>true</bool> + </property> + <property name="insertPolicy"> + <enum>QComboBox::InsertAtTop</enum> + </property> + <property name="sizeAdjustPolicy"> + <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum> + </property> + <property name="duplicatesEnabled"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> </item> - <item row="3" column="2"> - <widget class="QCheckBox" name="clearShellCheckBox"> - <property name="toolTip"> - <string>Select to clear the display of the interpreter window</string> - </property> - <property name="whatsThis"> - <string><b>Clear interpreter window</b><p>This clears the display of the interpreter window before starting the debug client.</p></string> - </property> - <property name="text"> - <string>Clear &interpreter window</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="4" column="0" colspan="2"> - <widget class="QCheckBox" name="consoleCheckBox"> - <property name="toolTip"> - <string>Select to start the debugger in a console window</string> - </property> - <property name="whatsThis"> - <string><b>Start in console</b> + <item> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <widget class="QCheckBox" name="exceptionCheckBox"> + <property name="toolTip"> + <string>Uncheck to disable exception reporting</string> + </property> + <property name="whatsThis"> + <string><b>Report exceptions</b> +<p>Uncheck this in order to disable exception reporting.</p></string> + </property> + <property name="text"> + <string>Report &exceptions</string> + </property> + <property name="shortcut"> + <string>Alt+E</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QCheckBox" name="clearShellCheckBox"> + <property name="toolTip"> + <string>Select to clear the display of the interpreter window</string> + </property> + <property name="whatsThis"> + <string><b>Clear interpreter window</b><p>This clears the display of the interpreter window before starting the debug client.</p></string> + </property> + <property name="text"> + <string>Clear &interpreter window</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="consoleCheckBox"> + <property name="toolTip"> + <string>Select to start the debugger in a console window</string> + </property> + <property name="whatsThis"> + <string><b>Start in console</b> <p>Select to start the debugger in a console window. The console command has to be configured on the Debugger-&gt;General page</p></string> - </property> - <property name="text"> - <string>Start in console</string> - </property> - </widget> + </property> + <property name="text"> + <string>Start in console</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QCheckBox" name="eraseCheckBox"> + <property name="toolTip"> + <string>Select this to erase the collected coverage information</string> + </property> + <property name="whatsThis"> + <string><b>Erase coverage information</b> +<p>Select this to erase the collected coverage information before the next coverage run.</p></string> + </property> + <property name="text"> + <string>Erase &coverage information</string> + </property> + <property name="shortcut"> + <string>Alt+C</string> + </property> + </widget> + </item> + </layout> </item> - <item row="5" column="0" colspan="4"> - <widget class="QCheckBox" name="eraseCheckBox"> - <property name="toolTip"> - <string>Select this to erase the collected coverage information</string> - </property> - <property name="whatsThis"> - <string><b>Erase coverage information</b> -<p>Select this to erase the collected coverage information before the next coverage run.</p></string> - </property> - <property name="text"> - <string>Erase &coverage information</string> - </property> - <property name="shortcut"> - <string>Alt+C</string> - </property> - </widget> - </item> - <item row="6" column="0" colspan="4"> + <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -212,31 +211,26 @@ </property> </widget> </item> - <item row="1" column="3"> - <widget class="QToolButton" name="dirButton"> - <property name="toolTip"> - <string>Select directory using a directory selection dialog</string> - </property> - <property name="whatsThis"> - <string><b>Select directory</b> -<p>Select the working directory via a directory selection dialog.</p></string> - </property> - </widget> - </item> </layout> </widget> <layoutdefault spacing="6" margin="6"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <customwidgets> + <customwidget> + <class>E5ComboPathPicker</class> + <extends>QWidget</extends> + <header>E5Gui/E5PathPicker.h</header> + <container>1</container> + </customwidget> + </customwidgets> <tabstops> <tabstop>cmdlineCombo</tabstop> - <tabstop>workdirCombo</tabstop> - <tabstop>dirButton</tabstop> + <tabstop>workdirPicker</tabstop> <tabstop>environmentCombo</tabstop> <tabstop>exceptionCheckBox</tabstop> <tabstop>clearShellCheckBox</tabstop> <tabstop>consoleCheckBox</tabstop> <tabstop>eraseCheckBox</tabstop> - <tabstop>buttonBox</tabstop> </tabstops> <resources/> <connections>