Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py
src/eric7/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py
- branch
- eric7
- changeset 9624
- b47dfa7a137d
- parent 9473
- 3f23dbf37dbe
- child 9653
- e67609152c5e
equal
deleted
inserted
replaced
| 9623:9c1f429cb56b | 9624:b47dfa7a137d |
|---|---|
| 12 | 12 |
| 13 from PyQt6.QtCore import pyqtSlot | 13 from PyQt6.QtCore import pyqtSlot |
| 14 from PyQt6.QtGui import QColor | 14 from PyQt6.QtGui import QColor |
| 15 from PyQt6.QtWidgets import QColorDialog, QDialog, QDialogButtonBox | 15 from PyQt6.QtWidgets import QColorDialog, QDialog, QDialogButtonBox |
| 16 | 16 |
| 17 from eric7 import Globals, Utilities | |
| 18 from eric7.DocumentationTools.Config import ( | 17 from eric7.DocumentationTools.Config import ( |
| 19 eric7docColorParameterNames, | 18 eric7docColorParameterNames, |
| 20 eric7docDefaultColors, | 19 eric7docDefaultColors, |
| 21 ) | 20 ) |
| 22 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes | 21 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes |
| 23 from eric7.Globals import getConfig | 22 from eric7.Globals import getConfig |
| 23 from eric7.SystemUtilities import FileSystemUtilities, PythonUtilities | |
| 24 | 24 |
| 25 from .Ui_EricdocConfigDialog import Ui_EricdocConfigDialog | 25 from .Ui_EricdocConfigDialog import Ui_EricdocConfigDialog |
| 26 | 26 |
| 27 | 27 |
| 28 class EricdocConfigDialog(QDialog, Ui_EricdocConfigDialog): | 28 class EricdocConfigDialog(QDialog, Ui_EricdocConfigDialog): |
| 92 for key in parms: | 92 for key in parms: |
| 93 if key.endswith("Color"): | 93 if key.endswith("Color"): |
| 94 self.colors[key] = parms[key] | 94 self.colors[key] = parms[key] |
| 95 else: | 95 else: |
| 96 self.parameters[key] = parms[key] | 96 self.parameters[key] = parms[key] |
| 97 self.parameters["startDirectory"] = Utilities.toNativeSeparators( | 97 self.parameters["startDirectory"] = FileSystemUtilities.toNativeSeparators( |
| 98 self.parameters["startDirectory"] | 98 self.parameters["startDirectory"] |
| 99 ) | 99 ) |
| 100 self.parameters["outputDirectory"] = Utilities.toNativeSeparators( | 100 self.parameters["outputDirectory"] = FileSystemUtilities.toNativeSeparators( |
| 101 self.parameters["outputDirectory"] | 101 self.parameters["outputDirectory"] |
| 102 ) | 102 ) |
| 103 self.parameters["qtHelpOutputDirectory"] = Utilities.toNativeSeparators( | 103 self.parameters[ |
| 104 "qtHelpOutputDirectory" | |
| 105 ] = FileSystemUtilities.toNativeSeparators( | |
| 104 self.parameters["qtHelpOutputDirectory"] | 106 self.parameters["qtHelpOutputDirectory"] |
| 105 ) | 107 ) |
| 106 self.parameters["cssFile"] = Utilities.toNativeSeparators( | 108 self.parameters["cssFile"] = FileSystemUtilities.toNativeSeparators( |
| 107 self.parameters["cssFile"] | 109 self.parameters["cssFile"] |
| 108 ) | 110 ) |
| 109 if self.parameters["cssFile"].startswith("%PYTHON%"): | 111 if self.parameters["cssFile"].startswith("%PYTHON%"): |
| 110 self.parameters["cssFile"] = self.parameters["cssFile"].replace( | 112 self.parameters["cssFile"] = self.parameters["cssFile"].replace( |
| 111 "%PYTHON%", Utilities.getPythonLibraryDirectory() | 113 "%PYTHON%", PythonUtilities.getPythonLibraryDirectory() |
| 112 ) | 114 ) |
| 113 | 115 |
| 114 self.ppath = project.getProjectPath() | 116 self.ppath = project.getProjectPath() |
| 115 self.project = project | 117 self.project = project |
| 116 | 118 |
| 183 """ | 185 """ |
| 184 parms = {} | 186 parms = {} |
| 185 args = [] | 187 args = [] |
| 186 | 188 |
| 187 # 1. the program name | 189 # 1. the program name |
| 188 args.append(Globals.getPythonExecutable()) | 190 args.append(PythonUtilities.getPythonExecutable()) |
| 189 args.append(Utilities.normabsjoinpath(getConfig("ericDir"), "eric7_doc.py")) | 191 args.append( |
| 192 FileSystemUtilities.normabsjoinpath(getConfig("ericDir"), "eric7_doc.py") | |
| 193 ) | |
| 190 | 194 |
| 191 # 2. the commandline options | 195 # 2. the commandline options |
| 192 # 2a. general commandline options | 196 # 2a. general commandline options |
| 193 if self.parameters["startDirectory"] != self.defaults["startDirectory"]: | 197 if self.parameters["startDirectory"] != self.defaults["startDirectory"]: |
| 194 parms["startDirectory"] = self.project.getRelativeUniversalPath( | 198 parms["startDirectory"] = self.project.getRelativeUniversalPath( |
| 234 args.append("--extension={0}".format(ext.strip())) | 238 args.append("--extension={0}".format(ext.strip())) |
| 235 | 239 |
| 236 # 2b. style commandline options | 240 # 2b. style commandline options |
| 237 if self.parameters["cssFile"] != self.defaults["cssFile"]: | 241 if self.parameters["cssFile"] != self.defaults["cssFile"]: |
| 238 cssFile = self.project.getRelativePath(self.parameters["cssFile"]) | 242 cssFile = self.project.getRelativePath(self.parameters["cssFile"]) |
| 239 if cssFile.startswith(Utilities.getPythonLibraryDirectory()): | 243 if cssFile.startswith(PythonUtilities.getPythonLibraryDirectory()): |
| 240 cssFile = cssFile.replace( | 244 cssFile = cssFile.replace( |
| 241 Utilities.getPythonLibraryDirectory(), "%PYTHON%" | 245 PythonUtilities.getPythonLibraryDirectory(), "%PYTHON%" |
| 242 ) | 246 ) |
| 243 parms["cssFile"] = Utilities.fromNativeSeparators(cssFile) | 247 parms["cssFile"] = FileSystemUtilities.fromNativeSeparators(cssFile) |
| 244 args.append("-c") | 248 args.append("-c") |
| 245 if os.path.isabs(self.parameters["cssFile"]): | 249 if os.path.isabs(self.parameters["cssFile"]): |
| 246 args.append(self.parameters["cssFile"]) | 250 args.append(self.parameters["cssFile"]) |
| 247 else: | 251 else: |
| 248 args.append(os.path.join(self.ppath, self.parameters["cssFile"])) | 252 args.append(os.path.join(self.ppath, self.parameters["cssFile"])) |
