--- a/src/eric7/Preferences/ConfigurationPages/DebuggerGeneralPage.ui Tue Nov 22 16:33:30 2022 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/DebuggerGeneralPage.ui Wed Nov 23 10:48:46 2022 +0100 @@ -7,10 +7,10 @@ <x>0</x> <y>0</y> <width>550</width> - <height>1694</height> + <height>1804</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout_7"> + <layout class="QVBoxLayout" name="verticalLayout_9"> <item> <widget class="QLabel" name="headerLabel"> <property name="text"> @@ -36,8 +36,8 @@ <property name="title"> <string>Network Interface</string> </property> - <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0" colspan="4"> + <layout class="QVBoxLayout" name="verticalLayout_7"> + <item> <widget class="QLabel" name="TextLabel1_2_3"> <property name="text"> <string><font color="#FF0000"><b>Note:</b> These settings are activated at the next startup of the application.</font></string> @@ -47,50 +47,14 @@ </property> </widget> </item> - <item row="1" column="0" colspan="2"> - <widget class="QRadioButton" name="allInterfacesButton"> + <item> + <widget class="QComboBox" name="interfaceSelectorComboBox"> <property name="toolTip"> - <string>Select to listen on all available network interfaces (IPv4 mode)</string> - </property> - <property name="text"> - <string>All network interfaces (IPv4)</string> - </property> - </widget> - </item> - <item row="1" column="2"> - <widget class="QRadioButton" name="all6InterfacesButton"> - <property name="toolTip"> - <string>Select to listen on all available network interfaces (IPv6 mode)</string> - </property> - <property name="text"> - <string>All network interfaces (IPv6)</string> + <string>Select the interface(s) to listen on</string> </property> </widget> </item> - <item row="1" column="3"> - <spacer name="horizontalSpacer_5"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>103</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="2" column="0"> - <widget class="QRadioButton" name="selectedInterfaceButton"> - <property name="toolTip"> - <string>Select to listen on the configured interface</string> - </property> - <property name="text"> - <string>Only selected interface</string> - </property> - </widget> - </item> - <item row="2" column="1" colspan="3"> + <item> <widget class="QComboBox" name="interfacesCombo"> <property name="enabled"> <bool>false</bool> @@ -100,6 +64,73 @@ </property> </widget> </item> + <item> + <widget class="QGroupBox" name="serverPortStaticGroup"> + <property name="toolTip"> + <string>Select to listen on a fixed network port</string> + </property> + <property name="title"> + <string>Static Server Port</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="checked"> + <bool>false</bool> + </property> + <layout class="QGridLayout" name="gridLayout_5"> + <item row="0" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>Server Port:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QSpinBox" name="serverPortSpinBox"> + <property name="toolTip"> + <string>Enter the port number to listen on</string> + </property> + <property name="minimum"> + <number>1025</number> + </property> + <property name="maximum"> + <number>65535</number> + </property> + <property name="singleStep"> + <number>1</number> + </property> + <property name="value"> + <number>35000</number> + </property> + </widget> + </item> + <item row="0" column="2"> + <spacer name="horizontalSpacer_6"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>333</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0" colspan="3"> + <widget class="QCheckBox" name="serverPortIncrementCheckBox"> + <property name="toolTip"> + <string>Select to increment the server port to listen on if the configured one is unavailable</string> + </property> + <property name="text"> + <string>Increment server port if unavailable</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> </layout> </widget> </item> @@ -836,10 +867,11 @@ </layout> </widget> <tabstops> - <tabstop>allInterfacesButton</tabstop> - <tabstop>all6InterfacesButton</tabstop> - <tabstop>selectedInterfaceButton</tabstop> + <tabstop>interfaceSelectorComboBox</tabstop> <tabstop>interfacesCombo</tabstop> + <tabstop>serverPortStaticGroup</tabstop> + <tabstop>serverPortSpinBox</tabstop> + <tabstop>serverPortIncrementCheckBox</tabstop> <tabstop>allowedHostsList</tabstop> <tabstop>addAllowedHostButton</tabstop> <tabstop>editAllowedHostButton</tabstop> @@ -880,12 +912,12 @@ <slot>setEnabled(bool)</slot> <hints> <hint type="sourcelabel"> - <x>121</x> - <y>467</y> + <x>154</x> + <y>730</y> </hint> <hint type="destinationlabel"> - <x>107</x> - <y>498</y> + <x>140</x> + <y>763</y> </hint> </hints> </connection> @@ -896,28 +928,12 @@ <slot>setEnabled(bool)</slot> <hints> <hint type="sourcelabel"> - <x>219</x> - <y>467</y> + <x>252</x> + <y>730</y> </hint> <hint type="destinationlabel"> - <x>205</x> - <y>498</y> - </hint> - </hints> - </connection> - <connection> - <sender>selectedInterfaceButton</sender> - <signal>toggled(bool)</signal> - <receiver>interfacesCombo</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>587</x> - <y>107</y> - </hint> - <hint type="destinationlabel"> - <x>307</x> - <y>137</y> + <x>218</x> + <y>763</y> </hint> </hints> </connection> @@ -928,12 +944,12 @@ <slot>setEnabled(bool)</slot> <hints> <hint type="sourcelabel"> - <x>78</x> - <y>467</y> + <x>111</x> + <y>730</y> </hint> <hint type="destinationlabel"> - <x>410</x> - <y>498</y> + <x>148</x> + <y>795</y> </hint> </hints> </connection> @@ -944,12 +960,12 @@ <slot>setEnabled(bool)</slot> <hints> <hint type="sourcelabel"> - <x>257</x> - <y>467</y> + <x>290</x> + <y>730</y> </hint> <hint type="destinationlabel"> - <x>484</x> - <y>497</y> + <x>233</x> + <y>795</y> </hint> </hints> </connection>