11 |
11 |
12 from PyQt5.QtCore import pyqtSlot |
12 from PyQt5.QtCore import pyqtSlot |
13 |
13 |
14 from E5Gui import E5FileDialog |
14 from E5Gui import E5FileDialog |
15 from E5Gui.E5Completers import E5DirCompleter, E5FileCompleter |
15 from E5Gui.E5Completers import E5DirCompleter, E5FileCompleter |
|
16 from E5Gui.E5Application import e5App |
16 |
17 |
17 from Preferences.ConfigurationPages.ConfigurationPageBase import \ |
18 from Preferences.ConfigurationPages.ConfigurationPageBase import \ |
18 ConfigurationPageBase |
19 ConfigurationPageBase |
19 from .Ui_DjangoPage import Ui_DjangoPage |
20 from .Ui_DjangoPage import Ui_DjangoPage |
20 |
21 |
85 |
86 |
86 self.py3ShellCombo.addItem(self.tr("Plain Python"), "python") |
87 self.py3ShellCombo.addItem(self.tr("Plain Python"), "python") |
87 self.py3ShellCombo.addItem(self.tr("IPython"), "ipython") |
88 self.py3ShellCombo.addItem(self.tr("IPython"), "ipython") |
88 self.py3ShellCombo.addItem(self.tr("bpython"), "bpython") |
89 self.py3ShellCombo.addItem(self.tr("bpython"), "bpython") |
89 |
90 |
|
91 try: |
|
92 venvManager = e5App().getObject("VirtualEnvManager") |
|
93 |
|
94 self.py2VenvNameComboBox.addItems( |
|
95 [""] + sorted(venvManager.getVirtualenvNamesForVariant(2))) |
|
96 self.py3VenvNameComboBox.addItems( |
|
97 [""] + sorted(venvManager.getVirtualenvNamesForVariant(3))) |
|
98 |
|
99 self.djangoVirtualEnvPy2Group.hide() |
|
100 self.djangoVirtualEnvPy3Group.hide() |
|
101 |
|
102 self.__hasVirtualEnvironmentManager = True |
|
103 except KeyError: |
|
104 venvManager = None |
|
105 |
|
106 self.djangoVirtualEnvironmentPy2Group.hide() |
|
107 self.djangoVirtualEnvironmentPy3Group.hide() |
|
108 |
|
109 self.__hasVirtualEnvironmentManager = False |
|
110 |
90 # set initial values |
111 # set initial values |
91 self.consoleCommandCombo.setEditText( |
112 self.consoleCommandCombo.setEditText( |
92 self.__plugin.getPreferences("ConsoleCommand")) |
113 self.__plugin.getPreferences("ConsoleCommand")) |
93 self.consoleCommandNoCloseCombo.setEditText( |
114 self.consoleCommandNoCloseCombo.setEditText( |
94 self.__plugin.getPreferences("ConsoleCommandNoClose")) |
115 self.__plugin.getPreferences("ConsoleCommandNoClose")) |
104 self.__plugin.getPreferences("UseExternalBrowser")) |
125 self.__plugin.getPreferences("UseExternalBrowser")) |
105 |
126 |
106 self.appsRecentSpinBox.setValue( |
127 self.appsRecentSpinBox.setValue( |
107 self.__plugin.getPreferences("RecentNumberApps")) |
128 self.__plugin.getPreferences("RecentNumberApps")) |
108 |
129 |
109 self.virtualEnvPy2Edit.setText( |
130 if venvManager: |
110 self.__plugin.getPreferences("VirtualEnvironmentPy2")) |
131 venvName = self.__plugin.getPreferences( |
|
132 "VirtualEnvironmentNamePy2") |
|
133 if venvName: |
|
134 index = self.py2VenvNameComboBox.findText(venvName) |
|
135 if index < 0: |
|
136 index = 0 |
|
137 self.py2VenvNameComboBox.setCurrentIndex(index) |
|
138 else: |
|
139 self.virtualEnvPy2Edit.setText( |
|
140 self.__plugin.getPreferences("VirtualEnvironmentPy2")) |
111 self.py2ShellCombo.setCurrentIndex(self.py2ShellCombo.findData( |
141 self.py2ShellCombo.setCurrentIndex(self.py2ShellCombo.findData( |
112 self.__plugin.getPreferences("Python2ConsoleType"))) |
142 self.__plugin.getPreferences("Python2ConsoleType"))) |
113 |
143 |
114 self.virtualEnvPy3Edit.setText( |
144 if venvManager: |
115 self.__plugin.getPreferences("VirtualEnvironmentPy3")) |
145 venvName = self.__plugin.getPreferences( |
|
146 "VirtualEnvironmentNamePy3") |
|
147 if venvName: |
|
148 index = self.py3VenvNameComboBox.findText(venvName) |
|
149 if index < 0: |
|
150 index = 0 |
|
151 self.py3VenvNameComboBox.setCurrentIndex(index) |
|
152 else: |
|
153 self.virtualEnvPy3Edit.setText( |
|
154 self.__plugin.getPreferences("VirtualEnvironmentPy3")) |
116 self.py3ShellCombo.setCurrentIndex(self.py3ShellCombo.findData( |
155 self.py3ShellCombo.setCurrentIndex(self.py3ShellCombo.findData( |
117 self.__plugin.getPreferences("Python3ConsoleType"))) |
156 self.__plugin.getPreferences("Python3ConsoleType"))) |
118 |
157 |
119 self.translationsEdit.setText( |
158 self.translationsEdit.setText( |
120 self.__plugin.getPreferences("TranslationsEditor")) |
159 self.__plugin.getPreferences("TranslationsEditor")) |
143 "UseExternalBrowser", self.externalBrowserCheckBox.isChecked()) |
182 "UseExternalBrowser", self.externalBrowserCheckBox.isChecked()) |
144 |
183 |
145 self.__plugin.setPreferences( |
184 self.__plugin.setPreferences( |
146 "RecentNumberApps", self.appsRecentSpinBox.value()) |
185 "RecentNumberApps", self.appsRecentSpinBox.value()) |
147 |
186 |
148 self.__plugin.setPreferences( |
187 if self.__hasVirtualEnvironmentManager: |
149 "VirtualEnvironmentPy2", self.virtualEnvPy2Edit.text()) |
188 self.__plugin.setPreferences( |
|
189 "VirtualEnvironmentNamePy2", |
|
190 self.py2VenvNameComboBox.currentText()) |
|
191 else: |
|
192 self.__plugin.setPreferences( |
|
193 "VirtualEnvironmentPy2", self.virtualEnvPy2Edit.text()) |
150 self.__plugin.setPreferences( |
194 self.__plugin.setPreferences( |
151 "Python2ConsoleType", |
195 "Python2ConsoleType", |
152 self.py2ShellCombo.itemData(self.py2ShellCombo.currentIndex())) |
196 self.py2ShellCombo.itemData(self.py2ShellCombo.currentIndex())) |
153 |
197 |
154 self.__plugin.setPreferences( |
198 if self.__hasVirtualEnvironmentManager: |
155 "VirtualEnvironmentPy3", self.virtualEnvPy3Edit.text()) |
199 self.__plugin.setPreferences( |
|
200 "VirtualEnvironmentNamePy3", |
|
201 self.py3VenvNameComboBox.currentText()) |
|
202 else: |
|
203 self.__plugin.setPreferences( |
|
204 "VirtualEnvironmentPy3", self.virtualEnvPy3Edit.text()) |
156 self.__plugin.setPreferences( |
205 self.__plugin.setPreferences( |
157 "Python3ConsoleType", |
206 "Python3ConsoleType", |
158 self.py3ShellCombo.itemData(self.py3ShellCombo.currentIndex())) |
207 self.py3ShellCombo.itemData(self.py3ShellCombo.currentIndex())) |
159 |
208 |
160 self.__plugin.setPreferences( |
209 self.__plugin.setPreferences( |