--- a/Preferences/ConfigurationPages/DebuggerGeneralPage.ui Thu Oct 18 18:53:23 2018 +0200 +++ b/Preferences/ConfigurationPages/DebuggerGeneralPage.ui Sat Oct 20 14:46:01 2018 +0200 @@ -256,43 +256,19 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_2"> + <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="2" column="0"> - <widget class="QLabel" name="execLabel"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>Remote Execution:</string> - </property> - <property name="buddy"> - <cstring>execLineEdit</cstring> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QLineEdit" name="execLineEdit"> - <property name="enabled"> - <bool>false</bool> - </property> - <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="1" column="1"> + <item row="0" column="1"> <widget class="QLineEdit" name="hostLineEdit"> - <property name="enabled"> - <bool>false</bool> - </property> <property name="toolTip"> <string>Enter the hostname of the remote machine.</string> </property> @@ -302,11 +278,8 @@ </property> </widget> </item> - <item row="1" column="0"> + <item row="0" column="0"> <widget class="QLabel" name="hostLabel"> - <property name="enabled"> - <bool>false</bool> - </property> <property name="text"> <string>Remote Host:</string> </property> @@ -315,88 +288,86 @@ </property> </widget> </item> - <item row="0" column="0" colspan="2"> - <widget class="QCheckBox" name="remoteCheckBox"> + <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>Enable remote debugging</string> + <string>Enter the remote execution command.</string> </property> <property name="whatsThis"> - <string>This enables the remote debugger. Please enter the hostname of the remote machine and the command for the remote execution (e.g. ssh) below.</string> + <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"> + <widget class="QGroupBox" name="dbgPathTranslationGroup"> + <property name="toolTip"> + <string>Select, if path translation for remote debugging should be done</string> + </property> + <property name="title"> + <string>Perform Path Translation</string> + </property> + <property name="checkable"> + <bool>true</bool> </property> - <property name="text"> - <string>Remote Debugging Enabled</string> - </property> + <layout class="QGridLayout" name="_2"> + <item row="1" column="0"> + <widget class="QLabel" name="textLabel2_9"> + <property name="text"> + <string>Local Path:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="dbgTranslationLocalEdit"> + <property name="toolTip"> + <string>Enter the local path</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="dbgTranslationRemoteEdit"> + <property name="toolTip"> + <string>Enter the remote path</string> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="textLabel1_18"> + <property name="text"> + <string>Remote Path:</string> + </property> + </widget> + </item> + </layout> </widget> </item> </layout> </widget> </item> <item> - <widget class="QGroupBox" name="dbgPathTranslationGroup"> - <property name="title"> - <string>Path Translation</string> + <widget class="QGroupBox" name="consoleDebuggerGroup"> + <property name="toolTip"> + <string>Select, if the debugger should be executed in a console window</string> </property> - <layout class="QGridLayout" name="_2"> - <item row="0" column="0" colspan="2"> - <widget class="QCheckBox" name="dbgPathTranslationCheckBox"> - <property name="toolTip"> - <string>Select to perform path translation</string> - </property> - <property name="text"> - <string>Perform Path Translation</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="textLabel2_9"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>Local Path:</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QLineEdit" name="dbgTranslationLocalEdit"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Enter the local path</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QLineEdit" name="dbgTranslationRemoteEdit"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Enter the remote path</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="textLabel1_18"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>Remote Path:</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="groupBox_6"> <property name="title"> <string>Console Debugger</string> </property> + <property name="checkable"> + <bool>true</bool> + </property> <layout class="QGridLayout" name="_4"> - <item row="1" column="1"> + <item row="0" column="1"> <widget class="QLineEdit" name="consoleDbgEdit"> <property name="toolTip"> <string>Enter the console command (e.g. xterm -e)</string> @@ -407,30 +378,20 @@ </property> </widget> </item> - <item row="1" column="0"> + <item row="0" column="0"> <widget class="QLabel" name="textLabel1_17"> <property name="text"> <string>Console Command:</string> </property> </widget> </item> - <item row="0" column="0" colspan="2"> - <widget class="QCheckBox" name="consoleDbgCheckBox"> - <property name="toolTip"> - <string>Select to start the debugger in a console window (e.g. xterm)</string> - </property> - <property name="text"> - <string>Start debugger in console window</string> - </property> - </widget> - </item> </layout> </widget> </item> <item> <widget class="QGroupBox" name="groupBox_5"> <property name="title"> - <string>Environment for Debug Client</string> + <string>Environment Variables for Debug Client</string> </property> <layout class="QGridLayout" name="_3"> <item row="0" column="0" colspan="2"> @@ -443,14 +404,14 @@ <p>If this entry is checked, the environment of the debugger will be replaced by the entries of the environment variables field. If it is unchecked, the environment will be ammended by these settings.</p></string> </property> <property name="text"> - <string>Replace Environment</string> + <string>Replace Environment Variables</string> </property> </widget> </item> <item row="1" column="0"> <widget class="QLabel" name="textLabel1_16"> <property name="text"> - <string>Environment:</string> + <string>Environment Variables:</string> </property> </widget> </item> @@ -460,8 +421,8 @@ <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 debugger. The individual settings must be separate by whitespace and be given in the form 'var=value'.</p> + <string><b>Environment Variables</b> +<p>Enter the environment variables to be set for the debugger. The individual settings must be separated by whitespace and be given in the form 'var=value'.</p> <p>Example: var1=1 var2="hello world"</p></string> </property> </widget> @@ -709,13 +670,13 @@ <tabstop>passiveDbgCheckBox</tabstop> <tabstop>passiveDbgPortSpinBox</tabstop> <tabstop>passiveDbgBackendCombo</tabstop> - <tabstop>remoteCheckBox</tabstop> + <tabstop>remoteDebuggerGroup</tabstop> <tabstop>hostLineEdit</tabstop> <tabstop>execLineEdit</tabstop> - <tabstop>dbgPathTranslationCheckBox</tabstop> + <tabstop>dbgPathTranslationGroup</tabstop> <tabstop>dbgTranslationRemoteEdit</tabstop> <tabstop>dbgTranslationLocalEdit</tabstop> - <tabstop>consoleDbgCheckBox</tabstop> + <tabstop>consoleDebuggerGroup</tabstop> <tabstop>consoleDbgEdit</tabstop> <tabstop>debugEnvironReplaceCheckBox</tabstop> <tabstop>debugEnvironEdit</tabstop> @@ -764,70 +725,6 @@ </hints> </connection> <connection> - <sender>remoteCheckBox</sender> - <signal>toggled(bool)</signal> - <receiver>execLineEdit</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>294</x> - <y>568</y> - </hint> - <hint type="destinationlabel"> - <x>587</x> - <y>630</y> - </hint> - </hints> - </connection> - <connection> - <sender>remoteCheckBox</sender> - <signal>toggled(bool)</signal> - <receiver>execLabel</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>160</x> - <y>568</y> - </hint> - <hint type="destinationlabel"> - <x>128</x> - <y>630</y> - </hint> - </hints> - </connection> - <connection> - <sender>remoteCheckBox</sender> - <signal>toggled(bool)</signal> - <receiver>hostLabel</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>147</x> - <y>568</y> - </hint> - <hint type="destinationlabel"> - <x>86</x> - <y>599</y> - </hint> - </hints> - </connection> - <connection> - <sender>remoteCheckBox</sender> - <signal>toggled(bool)</signal> - <receiver>hostLineEdit</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>263</x> - <y>568</y> - </hint> - <hint type="destinationlabel"> - <x>587</x> - <y>599</y> - </hint> - </hints> - </connection> - <connection> <sender>selectedInterfaceButton</sender> <signal>toggled(bool)</signal> <receiver>interfacesCombo</receiver> @@ -875,69 +772,5 @@ </hint> </hints> </connection> - <connection> - <sender>dbgPathTranslationCheckBox</sender> - <signal>toggled(bool)</signal> - <receiver>dbgTranslationRemoteEdit</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>74</x> - <y>700</y> - </hint> - <hint type="destinationlabel"> - <x>241</x> - <y>731</y> - </hint> - </hints> - </connection> - <connection> - <sender>dbgPathTranslationCheckBox</sender> - <signal>toggled(bool)</signal> - <receiver>textLabel1_18</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>54</x> - <y>700</y> - </hint> - <hint type="destinationlabel"> - <x>56</x> - <y>731</y> - </hint> - </hints> - </connection> - <connection> - <sender>dbgPathTranslationCheckBox</sender> - <signal>toggled(bool)</signal> - <receiver>textLabel2_9</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>104</x> - <y>700</y> - </hint> - <hint type="destinationlabel"> - <x>89</x> - <y>762</y> - </hint> - </hints> - </connection> - <connection> - <sender>dbgPathTranslationCheckBox</sender> - <signal>toggled(bool)</signal> - <receiver>dbgTranslationLocalEdit</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>273</x> - <y>700</y> - </hint> - <hint type="destinationlabel"> - <x>353</x> - <y>762</y> - </hint> - </hints> - </connection> </connections> </ui>