Tue, 22 Nov 2022 13:45:36 +0100
Reorganized the Debugger configuration page with respect to remote debugging.
--- a/src/eric7/Preferences/ConfigurationPages/DebuggerGeneralPage.py Thu Nov 17 18:11:42 2022 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/DebuggerGeneralPage.py Tue Nov 22 13:45:36 2022 +0100 @@ -101,7 +101,7 @@ self.execLineEdit.setText(Preferences.getDebugger("RemoteExecution")) if self.passiveDbgGroup.isEnabled(): - self.passiveDbgCheckBox.setChecked( + self.passiveDbgGroup.setChecked( Preferences.getDebugger("PassiveDbgEnabled") ) self.passiveDbgPortSpinBox.setValue( @@ -184,7 +184,7 @@ Preferences.setDebugger("RemoteExecution", self.execLineEdit.text()) Preferences.setDebugger( - "PassiveDbgEnabled", self.passiveDbgCheckBox.isChecked() + "PassiveDbgEnabled", self.passiveDbgGroup.isChecked() ) Preferences.setDebugger("PassiveDbgPort", self.passiveDbgPortSpinBox.value()) Preferences.setDebugger(
--- a/src/eric7/Preferences/ConfigurationPages/DebuggerGeneralPage.ui Thu Nov 17 18:11:42 2022 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/DebuggerGeneralPage.ui Tue Nov 22 13:45:36 2022 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>550</width> - <height>1655</height> + <height>1694</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_7"> @@ -42,6 +42,9 @@ <property name="text"> <string><font color="#FF0000"><b>Note:</b> These settings are activated at the next startup of the application.</font></string> </property> + <property name="wordWrap"> + <bool>true</bool> + </property> </widget> </item> <item row="1" column="0" colspan="2"> @@ -160,169 +163,200 @@ </widget> </item> <item> - <widget class="QGroupBox" name="passiveDbgGroup"> + <widget class="QGroupBox" name="groupBox_12"> <property name="title"> - <string>Passive Debugger</string> + <string>Remote Debugging</string> </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0" colspan="4"> - <widget class="QLabel" name="TextLabel1_2_2"> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QLabel" name="label_3"> <property name="text"> - <string><font color="#FF0000"><b>Note:</b> These settings are activated at the next startup of the application.</font></string> - </property> - </widget> - </item> - <item row="1" column="0" colspan="4"> - <widget class="QCheckBox" name="passiveDbgCheckBox"> - <property name="toolTip"> - <string>Enables the passive debug mode</string> - </property> - <property name="whatsThis"> - <string><b>Passive Debugger Enabled</b> -<p>This enables the passive debugging mode. In this mode the debug client (the script) connects to the debug server (the IDE). The script is started outside the IDE. This way mod_python or Zope scripts can be debugged.</p></string> - </property> - <property name="text"> - <string>Passive Debugger Enabled</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="passiveDbgPortLabel"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>Debug Server Port:</string> + <string><font color="#FF0000"><b>Note:</b> Only one or none of 'Passive' or 'Remote Debugger must be activated.</font></string> </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QSpinBox" name="passiveDbgPortSpinBox"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Enter the port the debugger should listen on</string> - </property> - <property name="whatsThis"> - <string><b>Debug Server Port</b> -<p>Enter the port the debugger should listen on.</p></string> - </property> - <property name="minimum"> - <number>1024</number> - </property> - <property name="maximum"> - <number>65535</number> - </property> - <property name="value"> - <number>42424</number> - </property> - </widget> - </item> - <item row="2" column="2" colspan="2"> - <spacer name="horizontalSpacer_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>91</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="label"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>Debugger Type:</string> + <property name="wordWrap"> + <bool>true</bool> </property> </widget> </item> - <item row="3" column="1" colspan="2"> - <widget class="QComboBox" name="passiveDbgBackendCombo"> - <property name="enabled"> + <item> + <widget class="QGroupBox" name="passiveDbgGroup"> + <property name="title"> + <string>Passive Debugger</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="checked"> <bool>false</bool> </property> - <property name="toolTip"> - <string>Select the debugger type of the backend</string> - </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0" colspan="4"> + <widget class="QLabel" name="TextLabel1_2_2"> + <property name="text"> + <string><font color="#FF0000"><b>Note:</b> These settings are activated at the next startup of the application.</font></string> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="1" column="0" colspan="4"> + <widget class="QCheckBox" name="passiveDbgCheckBox"> + <property name="toolTip"> + <string>Enables the passive debug mode</string> + </property> + <property name="whatsThis"> + <string><b>Passive Debugger Enabled</b> +<p>This enables the passive debugging mode. In this mode the debug client (the script) connects to the debug server (the IDE). The script is started outside the IDE. This way mod_python or Zope scripts can be debugged.</p></string> + </property> + <property name="text"> + <string>Passive Debugger Enabled</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="passiveDbgPortLabel"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Debug Server Port:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QSpinBox" name="passiveDbgPortSpinBox"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter the port the debugger should listen on</string> + </property> + <property name="whatsThis"> + <string><b>Debug Server Port</b> +<p>Enter the port the debugger should listen on.</p></string> + </property> + <property name="minimum"> + <number>1024</number> + </property> + <property name="maximum"> + <number>65535</number> + </property> + <property name="value"> + <number>42424</number> + </property> + </widget> + </item> + <item row="2" column="2" colspan="2"> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>91</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Debugger Type:</string> + </property> + </widget> + </item> + <item row="3" column="1" colspan="2"> + <widget class="QComboBox" name="passiveDbgBackendCombo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Select the debugger type of the backend</string> + </property> + </widget> + </item> + <item row="3" column="3"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>91</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> </widget> </item> - <item row="3" column="3"> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> + <item> + <widget class="QGroupBox" name="remoteDebuggerGroup"> + <property name="toolTip"> + <string>Select, if the debugger should be run remotely</string> </property> - <property name="sizeHint" stdset="0"> - <size> - <width>91</width> - <height>20</height> - </size> + <property name="title"> + <string>Remote Debugger</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="checked"> + <bool>false</bool> </property> - </spacer> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="remoteDebuggerGroup"> - <property name="toolTip"> - <string>Select, if the debugger should be run remotely</string> - </property> - <property name="title"> - <string>Remote Debugger</string> - </property> - <property name="checkable"> - <bool>true</bool> - </property> - <layout class="QGridLayout"> - <item row="0" column="1"> - <widget class="QLineEdit" name="hostLineEdit"> - <property name="toolTip"> - <string>Enter the hostname of the remote machine.</string> - </property> - <property name="whatsThis"> - <string><b>Remote Host</b> + <layout class="QGridLayout"> + <item row="1" column="0"> + <widget class="QLabel" name="execLabel"> + <property name="text"> + <string>Remote Execution:</string> + </property> + <property name="buddy"> + <cstring>execLineEdit</cstring> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="execLineEdit"> + <property name="toolTip"> + <string>Enter the remote execution command.</string> + </property> + <property name="whatsThis"> + <string><b>Remote Execution</b> +<p>Enter the remote execution command (e.g. ssh). This command is used to log into the remote host and execute the remote debugger.</p></string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="hostLineEdit"> + <property name="toolTip"> + <string>Enter the hostname of the remote machine.</string> + </property> + <property name="whatsThis"> + <string><b>Remote Host</b> <p>Enter the hostname of the remote machine.</p></string> - </property> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="hostLabel"> + <property name="text"> + <string>Remote Host:</string> + </property> + <property name="buddy"> + <cstring>hostLineEdit</cstring> + </property> + </widget> + </item> + </layout> </widget> </item> - <item row="0" column="0"> - <widget class="QLabel" name="hostLabel"> - <property name="text"> - <string>Remote Host:</string> - </property> - <property name="buddy"> - <cstring>hostLineEdit</cstring> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="execLabel"> - <property name="text"> - <string>Remote Execution:</string> - </property> - <property name="buddy"> - <cstring>execLineEdit</cstring> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QLineEdit" name="execLineEdit"> - <property name="toolTip"> - <string>Enter the remote execution command.</string> - </property> - <property name="whatsThis"> - <string><b>Remote Execution</b> -<p>Enter the remote execution command (e.g. ssh). This command is used to log into the remote host and execute the remote debugger.</p></string> - </property> - </widget> - </item> - <item row="2" column="0" colspan="2"> + <item> <widget class="QGroupBox" name="dbgPathTranslationGroup"> <property name="toolTip"> <string>Select, if path translation for remote debugging should be done</string> @@ -333,6 +367,9 @@ <property name="checkable"> <bool>true</bool> </property> + <property name="checked"> + <bool>false</bool> + </property> <layout class="QGridLayout" name="_2"> <item row="1" column="0"> <widget class="QLabel" name="textLabel2_9"> @@ -807,6 +844,7 @@ <tabstop>addAllowedHostButton</tabstop> <tabstop>editAllowedHostButton</tabstop> <tabstop>deleteAllowedHostButton</tabstop> + <tabstop>passiveDbgGroup</tabstop> <tabstop>passiveDbgCheckBox</tabstop> <tabstop>passiveDbgPortSpinBox</tabstop> <tabstop>passiveDbgBackendCombo</tabstop>