--- a/eric6/Debugger/StartDebugDialog.ui Wed Feb 12 20:04:31 2020 +0100 +++ b/eric6/Debugger/StartDebugDialog.ui Thu Feb 13 19:27:10 2020 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>550</width> - <height>333</height> + <height>332</height> </rect> </property> <property name="windowTitle"> @@ -158,56 +158,6 @@ </item> <item> <layout class="QGridLayout" name="gridLayout"> - <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> - </item> <item row="2" column="0"> <widget class="QCheckBox" name="tracePythonCheckBox"> <property name="toolTip"> @@ -237,22 +187,115 @@ </property> </widget> </item> - <item row="3" column="0"> - <widget class="QCheckBox" name="multiprocessEnableCheckBox"> + <item row="0" column="1"> + <widget class="QCheckBox" name="clearShellCheckBox"> <property name="toolTip"> - <string>Select this enable multi process debugging.</string> + <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="0" column="0"> + <widget class="QCheckBox" name="exceptionCheckBox"> + <property name="toolTip"> + <string>Uncheck to disable exception reporting</string> </property> <property name="whatsThis"> - <string><b>Enable Multi Process Debugging</b><p>This enables debugging capability for multi process programs. Each started Python program is started within a new debugger.</p></string> + <string><b>Report exceptions</b> +<p>Uncheck this in order to disable exception reporting.</p></string> </property> <property name="text"> - <string>Enable Multi Process Debugging</string> + <string>Report exceptions</string> + </property> + <property name="shortcut"> + <string>Alt+E</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> </item> </layout> </item> <item> + <widget class="QGroupBox" name="multiprocessGroup"> + <property name="toolTip"> + <string>Select this to enable multi process debugging.</string> + </property> + <property name="whatsThis"> + <string><b>Multi Process Debugging</b><p>This enables debugging capability for multi process programs. Each started Python program is started within a new debugger.</p></string> + </property> + <property name="title"> + <string>Multi Process Debugging</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QLabel" name="TextLabel1_2"> + <property name="text"> + <string>Don't Debug:</string> + </property> + <property name="buddy"> + <cstring>cmdlineCombo</cstring> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="multiprocessNoDebugCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter the list of programs not to be debugged separated by space</string> + </property> + <property name="whatsThis"> + <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> + </layout> + </widget> + </item> + <item> <widget class="QGroupBox" name="groupBox"> <property name="title"> <string>Forking</string> @@ -323,7 +366,8 @@ <tabstop>consoleCheckBox</tabstop> <tabstop>tracePythonCheckBox</tabstop> <tabstop>autoContinueCheckBox</tabstop> - <tabstop>multiprocessEnableCheckBox</tabstop> + <tabstop>multiprocessGroup</tabstop> + <tabstop>multiprocessNoDebugCombo</tabstop> <tabstop>forkModeCheckBox</tabstop> <tabstop>forkChildCheckBox</tabstop> </tabstops>