Mercurial Repositories > eric / changeset
changeset
Remove obsolete threaded option from preferences.
Sun, 16 Oct 2016 22:35:11 +0200
- author
- T.Rzepka <Tobias.Rzepka@gmail.com>
- date
- Sun, 16 Oct 2016 22:35:11 +0200
- changeset 5247
- 1fb624677956
- parent 5246
- c32769201bbe
- child 5248
- 7675ecd58263
Remove obsolete threaded option from preferences.
--- a/Debugger/DebuggerInterfacePython2.py Sun Oct 16 14:45:00 2016 +0200 +++ b/Debugger/DebuggerInterfacePython2.py Sun Oct 16 22:35:11 2016 +0200 @@ -151,10 +151,6 @@ debugClient = os.path.join(getConfig('ericDir'), "DebugClients", "Python", "DebugClient.py") - elif debugClientType == "threaded": - debugClient = os.path.join(getConfig('ericDir'), - "DebugClients", "Python", - "DebugClientThreads.py") else: debugClient = Preferences.getDebugger("DebugClient") if debugClient == "":
--- a/Debugger/DebuggerInterfacePython3.py Sun Oct 16 14:45:00 2016 +0200 +++ b/Debugger/DebuggerInterfacePython3.py Sun Oct 16 22:35:11 2016 +0200 @@ -151,10 +151,6 @@ debugClient = os.path.join(getConfig('ericDir'), "DebugClients", "Python", "DebugClient.py") - elif debugClientType == "threaded": - debugClient = os.path.join(getConfig('ericDir'), - "DebugClients", "Python", - "DebugClientThreads.py") else: debugClient = Preferences.getDebugger("DebugClient3") if debugClient == "":
--- a/Preferences/ConfigurationPages/DebuggerPython3Page.py Sun Oct 16 14:45:00 2016 +0200 +++ b/Preferences/ConfigurationPages/DebuggerPython3Page.py Sun Oct 16 22:35:11 2016 +0200 @@ -45,8 +45,6 @@ dct = Preferences.getDebugger("DebugClientType3") if dct == "standard": self.standardButton.setChecked(True) - elif dct == "threaded": - self.threadedButton.setChecked(True) else: self.customButton.setChecked(True) self.debugClientPicker.setText( @@ -67,8 +65,6 @@ self.interpreterPicker.text(toNative=False)) if self.standardButton.isChecked(): dct = "standard" - elif self.threadedButton.isChecked(): - dct = "threaded" else: dct = "custom" Preferences.setDebugger("DebugClientType3", dct)
--- a/Preferences/ConfigurationPages/DebuggerPython3Page.ui Sun Oct 16 14:45:00 2016 +0200 +++ b/Preferences/ConfigurationPages/DebuggerPython3Page.ui Sun Oct 16 22:35:11 2016 +0200 @@ -56,6 +56,19 @@ <string>Debug Client Type</string> </property> <layout class="QGridLayout" name="gridLayout"> + <item row="1" column="0" colspan="2"> + <widget class="E5PathPicker" name="debugClientPicker" native="true"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <property name="toolTip"> + <string>Enter the path of the Debug Client to be used. Leave empty to use the default.</string> + </property> + </widget> + </item> <item row="0" column="0"> <widget class="QRadioButton" name="standardButton"> <property name="toolTip"> @@ -67,16 +80,6 @@ </widget> </item> <item row="0" column="1"> - <widget class="QRadioButton" name="threadedButton"> - <property name="toolTip"> - <string>Select the multi threaded debug client</string> - </property> - <property name="text"> - <string>Multi Threaded</string> - </property> - </widget> - </item> - <item row="0" column="2"> <widget class="QRadioButton" name="customButton"> <property name="toolTip"> <string>Select the custom selected debug client</string> @@ -86,19 +89,6 @@ </property> </widget> </item> - <item row="1" column="0" colspan="3"> - <widget class="E5PathPicker" name="debugClientPicker" native="true"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="focusPolicy"> - <enum>Qt::StrongFocus</enum> - </property> - <property name="toolTip"> - <string>Enter the path of the Debug Client to be used. Leave empty to use the default.</string> - </property> - </widget> - </item> </layout> </widget> </item> @@ -170,7 +160,6 @@ <tabstops> <tabstop>interpreterPicker</tabstop> <tabstop>standardButton</tabstop> - <tabstop>threadedButton</tabstop> <tabstop>customButton</tabstop> <tabstop>debugClientPicker</tabstop> <tabstop>sourceExtensionsEdit</tabstop>
--- a/Preferences/ConfigurationPages/DebuggerPythonPage.py Sun Oct 16 14:45:00 2016 +0200 +++ b/Preferences/ConfigurationPages/DebuggerPythonPage.py Sun Oct 16 22:35:11 2016 +0200 @@ -45,8 +45,6 @@ dct = Preferences.getDebugger("DebugClientType") if dct == "standard": self.standardButton.setChecked(True) - elif dct == "threaded": - self.threadedButton.setChecked(True) else: self.customButton.setChecked(True) self.debugClientPicker.setText( @@ -67,8 +65,6 @@ self.interpreterPicker.text(toNative=False)) if self.standardButton.isChecked(): dct = "standard" - elif self.threadedButton.isChecked(): - dct = "threaded" else: dct = "custom" Preferences.setDebugger("DebugClientType", dct)
--- a/Preferences/ConfigurationPages/DebuggerPythonPage.ui Sun Oct 16 14:45:00 2016 +0200 +++ b/Preferences/ConfigurationPages/DebuggerPythonPage.ui Sun Oct 16 22:35:11 2016 +0200 @@ -56,6 +56,19 @@ <string>Debug Client Type</string> </property> <layout class="QGridLayout" name="gridLayout"> + <item row="1" column="0" colspan="2"> + <widget class="E5PathPicker" name="debugClientPicker" native="true"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <property name="toolTip"> + <string>Enter the path of the Debug Client to be used. Leave empty to use the default.</string> + </property> + </widget> + </item> <item row="0" column="0"> <widget class="QRadioButton" name="standardButton"> <property name="toolTip"> @@ -67,16 +80,6 @@ </widget> </item> <item row="0" column="1"> - <widget class="QRadioButton" name="threadedButton"> - <property name="toolTip"> - <string>Select the multi threaded debug client</string> - </property> - <property name="text"> - <string>Multi Threaded</string> - </property> - </widget> - </item> - <item row="0" column="2"> <widget class="QRadioButton" name="customButton"> <property name="toolTip"> <string>Select the custom selected debug client</string> @@ -86,19 +89,6 @@ </property> </widget> </item> - <item row="1" column="0" colspan="3"> - <widget class="E5PathPicker" name="debugClientPicker" native="true"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="focusPolicy"> - <enum>Qt::StrongFocus</enum> - </property> - <property name="toolTip"> - <string>Enter the path of the Debug Client to be used. Leave empty to use the default.</string> - </property> - </widget> - </item> </layout> </widget> </item> @@ -170,7 +160,6 @@ <tabstops> <tabstop>interpreterPicker</tabstop> <tabstop>standardButton</tabstop> - <tabstop>threadedButton</tabstop> <tabstop>customButton</tabstop> <tabstop>debugClientPicker</tabstop> <tabstop>sourceExtensionsEdit</tabstop>
--- a/Preferences/__init__.py Sun Oct 16 14:45:00 2016 +0200 +++ b/Preferences/__init__.py Sun Oct 16 22:35:11 2016 +0200 @@ -91,10 +91,10 @@ "Python3Interpreter": "", "RubyInterpreter": "", "DebugClientType": "standard", - # supported "standard", "threaded", "custom" + # supported "standard", "custom" "DebugClient": "", "DebugClientType3": "standard", - # supported "standard", "threaded", "custom" + # supported "standard", "custom" "DebugClient3": "", "DebugEnvironmentReplace": False, "DebugEnvironment": "", @@ -1665,6 +1665,14 @@ if interpreter: setDebugger(key, interpreter) return interpreter + elif key in ["DebugClientType", "DebugClientType3"]: + debugClientType = prefClass.settings.value( + "Debugger/" + key, prefClass.debuggerDefaults[key]) + # Correct obsolete entry "threaded" + if debugClientType == 'threaded': + return "standard" + else: + return debugClientType else: return prefClass.settings.value( "Debugger/" + key, prefClass.debuggerDefaults[key])
