11 import os |
11 import os |
12 |
12 |
13 from PyQt6.QtCore import Qt, pyqtSlot |
13 from PyQt6.QtCore import Qt, pyqtSlot |
14 from PyQt6.QtWidgets import QDialog, QDialogButtonBox |
14 from PyQt6.QtWidgets import QDialog, QDialogButtonBox |
15 |
15 |
16 from eric7 import DocumentationTools, Globals, Utilities |
16 from eric7 import DocumentationTools |
17 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes |
17 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes |
18 from eric7.Globals import getConfig |
18 from eric7.Globals import getConfig |
|
19 from eric7.SystemUtilities import FileSystemUtilities, PythonUtilities |
19 |
20 |
20 from .Ui_EricapiConfigDialog import Ui_EricapiConfigDialog |
21 from .Ui_EricapiConfigDialog import Ui_EricapiConfigDialog |
21 |
22 |
22 |
23 |
23 class EricapiConfigDialog(QDialog, Ui_EricapiConfigDialog): |
24 class EricapiConfigDialog(QDialog, Ui_EricapiConfigDialog): |
61 self.parameters = copy.deepcopy(self.defaults) |
62 self.parameters = copy.deepcopy(self.defaults) |
62 |
63 |
63 # combine it with the values of parms |
64 # combine it with the values of parms |
64 if parms is not None: |
65 if parms is not None: |
65 self.parameters.update(parms) |
66 self.parameters.update(parms) |
66 self.parameters["startDirectory"] = Utilities.toNativeSeparators( |
67 self.parameters["startDirectory"] = FileSystemUtilities.toNativeSeparators( |
67 self.parameters["startDirectory"] |
68 self.parameters["startDirectory"] |
68 ) |
69 ) |
69 self.parameters["outputFile"] = Utilities.toNativeSeparators( |
70 self.parameters["outputFile"] = FileSystemUtilities.toNativeSeparators( |
70 self.parameters["outputFile"] |
71 self.parameters["outputFile"] |
71 ) |
72 ) |
72 |
73 |
73 self.recursionCheckBox.setChecked(self.parameters["useRecursion"]) |
74 self.recursionCheckBox.setChecked(self.parameters["useRecursion"]) |
74 self.includePrivateCheckBox.setChecked(self.parameters["includePrivate"]) |
75 self.includePrivateCheckBox.setChecked(self.parameters["includePrivate"]) |
127 """ |
128 """ |
128 parms = {} |
129 parms = {} |
129 args = [] |
130 args = [] |
130 |
131 |
131 # 1. the program name |
132 # 1. the program name |
132 args.append(Globals.getPythonExecutable()) |
133 args.append(PythonUtilities.getPythonExecutable()) |
133 args.append(Utilities.normabsjoinpath(getConfig("ericDir"), "eric7_api.py")) |
134 args.append( |
|
135 FileSystemUtilities.normabsjoinpath(getConfig("ericDir"), "eric7_api.py") |
|
136 ) |
134 |
137 |
135 # 2. the commandline options |
138 # 2. the commandline options |
136 if self.parameters["startDirectory"] != self.defaults["startDirectory"]: |
139 if self.parameters["startDirectory"] != self.defaults["startDirectory"]: |
137 parms["startDirectory"] = self.project.getRelativeUniversalPath( |
140 parms["startDirectory"] = self.project.getRelativeUniversalPath( |
138 self.parameters["startDirectory"] |
141 self.parameters["startDirectory"] |