Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py
eric6/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py
- changeset 7256
- 4ef3b78ebb4e
- parent 7229
- 53054eb5b15a
- child 7360
- 9190402e4505
equal
deleted
inserted
replaced
| 7255:d595f6f9cbf8 | 7256:4ef3b78ebb4e |
|---|---|
| 17 from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QColorDialog | 17 from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QColorDialog |
| 18 | 18 |
| 19 from E5Gui.E5PathPicker import E5PathPickerModes | 19 from E5Gui.E5PathPicker import E5PathPickerModes |
| 20 | 20 |
| 21 from .Ui_EricdocConfigDialog import Ui_EricdocConfigDialog | 21 from .Ui_EricdocConfigDialog import Ui_EricdocConfigDialog |
| 22 from DocumentationTools.Config import eric6docDefaultColors, \ | 22 from DocumentationTools.Config import ( |
| 23 eric6docColorParameterNames | 23 eric6docDefaultColors, eric6docColorParameterNames |
| 24 ) | |
| 24 import Utilities | 25 import Utilities |
| 25 | 26 |
| 26 from eric6config import getConfig | 27 from eric6config import getConfig |
| 27 | 28 |
| 28 | 29 |
| 90 for key in parms: | 91 for key in parms: |
| 91 if key.endswith("Color"): | 92 if key.endswith("Color"): |
| 92 self.colors[key] = parms[key] | 93 self.colors[key] = parms[key] |
| 93 else: | 94 else: |
| 94 self.parameters[key] = parms[key] | 95 self.parameters[key] = parms[key] |
| 95 self.parameters['outputDirectory'] = \ | 96 self.parameters['outputDirectory'] = Utilities.toNativeSeparators( |
| 96 Utilities.toNativeSeparators(self.parameters['outputDirectory']) | 97 self.parameters['outputDirectory'] |
| 97 self.parameters['qtHelpOutputDirectory'] = \ | 98 ) |
| 99 self.parameters['qtHelpOutputDirectory'] = ( | |
| 98 Utilities.toNativeSeparators( | 100 Utilities.toNativeSeparators( |
| 99 self.parameters['qtHelpOutputDirectory']) | 101 self.parameters['qtHelpOutputDirectory']) |
| 100 self.parameters['cssFile'] = \ | 102 ) |
| 101 Utilities.toNativeSeparators(self.parameters['cssFile']) | 103 self.parameters['cssFile'] = Utilities.toNativeSeparators( |
| 104 self.parameters['cssFile'] | |
| 105 ) | |
| 102 if self.parameters['cssFile'].startswith("%PYTHON%"): | 106 if self.parameters['cssFile'].startswith("%PYTHON%"): |
| 103 self.parameters['cssFile'] = self.parameters['cssFile'].replace( | 107 self.parameters['cssFile'] = self.parameters['cssFile'].replace( |
| 104 "%PYTHON%", Utilities.getPythonModulesDirectory()) | 108 "%PYTHON%", Utilities.getPythonModulesDirectory()) |
| 105 | 109 |
| 106 self.ppath = project.getProjectPath() | 110 self.ppath = project.getProjectPath() |
| 179 args.append( | 183 args.append( |
| 180 Utilities.normabsjoinpath(getConfig('ericDir'), "eric6_doc.py")) | 184 Utilities.normabsjoinpath(getConfig('ericDir'), "eric6_doc.py")) |
| 181 | 185 |
| 182 # 2. the commandline options | 186 # 2. the commandline options |
| 183 # 2a. general commandline options | 187 # 2a. general commandline options |
| 184 if self.parameters['outputDirectory'] != \ | 188 if ( |
| 185 self.defaults['outputDirectory']: | 189 self.parameters['outputDirectory'] != |
| 190 self.defaults['outputDirectory'] | |
| 191 ): | |
| 186 parms['outputDirectory'] = Utilities.fromNativeSeparators( | 192 parms['outputDirectory'] = Utilities.fromNativeSeparators( |
| 187 self.project.getRelativePath( | 193 self.project.getRelativePath( |
| 188 self.parameters['outputDirectory'])) | 194 self.parameters['outputDirectory'])) |
| 189 args.append('-o') | 195 args.append('-o') |
| 190 if os.path.isabs(self.parameters['outputDirectory']): | 196 if os.path.isabs(self.parameters['outputDirectory']): |
| 191 args.append(self.parameters['outputDirectory']) | 197 args.append(self.parameters['outputDirectory']) |
| 192 else: | 198 else: |
| 193 args.append(os.path.join( | 199 args.append(os.path.join( |
| 194 self.ppath, self.parameters['outputDirectory'])) | 200 self.ppath, self.parameters['outputDirectory'])) |
| 195 else: | 201 else: |
| 196 self.parameters['outputDirectory'] = \ | 202 self.parameters['outputDirectory'] = ( |
| 197 self.defaults['outputDirectory'] | 203 self.defaults['outputDirectory'] |
| 204 ) | |
| 198 parms['outputDirectory'] = self.parameters['outputDirectory'] | 205 parms['outputDirectory'] = self.parameters['outputDirectory'] |
| 199 if self.parameters['ignoreDirectories'] != \ | 206 if ( |
| 200 self.defaults['ignoreDirectories']: | 207 self.parameters['ignoreDirectories'] != |
| 201 parms['ignoreDirectories'] = \ | 208 self.defaults['ignoreDirectories'] |
| 209 ): | |
| 210 parms['ignoreDirectories'] = ( | |
| 202 self.parameters['ignoreDirectories'][:] | 211 self.parameters['ignoreDirectories'][:] |
| 212 ) | |
| 203 for d in self.parameters['ignoreDirectories']: | 213 for d in self.parameters['ignoreDirectories']: |
| 204 args.append('-x') | 214 args.append('-x') |
| 205 args.append(d) | 215 args.append(d) |
| 206 if self.parameters['ignoreFilePatterns'] != \ | 216 if ( |
| 207 self.defaults['ignoreFilePatterns']: | 217 self.parameters['ignoreFilePatterns'] != |
| 208 parms['ignoreFilePatterns'] = \ | 218 self.defaults['ignoreFilePatterns'] |
| 219 ): | |
| 220 parms['ignoreFilePatterns'] = ( | |
| 209 self.parameters['ignoreFilePatterns'][:] | 221 self.parameters['ignoreFilePatterns'][:] |
| 222 ) | |
| 210 for pattern in self.parameters['ignoreFilePatterns']: | 223 for pattern in self.parameters['ignoreFilePatterns']: |
| 211 if pattern.strip(): | 224 if pattern.strip(): |
| 212 args.append("--exclude-file={0}".format(pattern.strip())) | 225 args.append("--exclude-file={0}".format(pattern.strip())) |
| 213 if self.parameters['useRecursion'] != self.defaults['useRecursion']: | 226 if self.parameters['useRecursion'] != self.defaults['useRecursion']: |
| 214 parms['useRecursion'] = self.parameters['useRecursion'] | 227 parms['useRecursion'] = self.parameters['useRecursion'] |
| 217 parms['noindex'] = self.parameters['noindex'] | 230 parms['noindex'] = self.parameters['noindex'] |
| 218 args.append('-i') | 231 args.append('-i') |
| 219 if self.parameters['noempty'] != self.defaults['noempty']: | 232 if self.parameters['noempty'] != self.defaults['noempty']: |
| 220 parms['noempty'] = self.parameters['noempty'] | 233 parms['noempty'] = self.parameters['noempty'] |
| 221 args.append('-e') | 234 args.append('-e') |
| 222 if self.parameters['sourceExtensions'] != \ | 235 if ( |
| 223 self.defaults['sourceExtensions']: | 236 self.parameters['sourceExtensions'] != |
| 237 self.defaults['sourceExtensions'] | |
| 238 ): | |
| 224 parms['sourceExtensions'] = self.parameters['sourceExtensions'][:] | 239 parms['sourceExtensions'] = self.parameters['sourceExtensions'][:] |
| 225 for ext in self.parameters['sourceExtensions']: | 240 for ext in self.parameters['sourceExtensions']: |
| 226 if ext.strip(): | 241 if ext.strip(): |
| 227 args.append("--extension={0}".format(ext.strip())) | 242 args.append("--extension={0}".format(ext.strip())) |
| 228 | 243 |
| 247 | 262 |
| 248 # 2c. QtHelp commandline options | 263 # 2c. QtHelp commandline options |
| 249 parms['qtHelpEnabled'] = self.parameters['qtHelpEnabled'] | 264 parms['qtHelpEnabled'] = self.parameters['qtHelpEnabled'] |
| 250 if self.parameters['qtHelpEnabled']: | 265 if self.parameters['qtHelpEnabled']: |
| 251 args.append('--create-qhp') | 266 args.append('--create-qhp') |
| 252 if self.parameters['qtHelpOutputDirectory'] != \ | 267 if ( |
| 253 self.defaults['qtHelpOutputDirectory']: | 268 self.parameters['qtHelpOutputDirectory'] != |
| 269 self.defaults['qtHelpOutputDirectory'] | |
| 270 ): | |
| 254 parms['qtHelpOutputDirectory'] = Utilities.fromNativeSeparators( | 271 parms['qtHelpOutputDirectory'] = Utilities.fromNativeSeparators( |
| 255 self.project.getRelativePath( | 272 self.project.getRelativePath( |
| 256 self.parameters['qtHelpOutputDirectory'])) | 273 self.parameters['qtHelpOutputDirectory'])) |
| 257 if os.path.isabs(self.parameters['outputDirectory']): | 274 if os.path.isabs(self.parameters['outputDirectory']): |
| 258 args.append("--qhp-outdir={0}".format( | 275 args.append("--qhp-outdir={0}".format( |
| 259 self.parameters['qtHelpOutputDirectory'])) | 276 self.parameters['qtHelpOutputDirectory'])) |
| 260 else: | 277 else: |
| 261 args.append("--qhp-outdir={0}".format( | 278 args.append("--qhp-outdir={0}".format( |
| 262 os.path.join(self.ppath, | 279 os.path.join(self.ppath, |
| 263 self.parameters['qtHelpOutputDirectory']))) | 280 self.parameters['qtHelpOutputDirectory']))) |
| 264 if self.parameters['qtHelpNamespace'] != \ | 281 if ( |
| 265 self.defaults['qtHelpNamespace']: | 282 self.parameters['qtHelpNamespace'] != |
| 283 self.defaults['qtHelpNamespace'] | |
| 284 ): | |
| 266 parms['qtHelpNamespace'] = self.parameters['qtHelpNamespace'] | 285 parms['qtHelpNamespace'] = self.parameters['qtHelpNamespace'] |
| 267 args.append("--qhp-namespace={0}".format( | 286 args.append("--qhp-namespace={0}".format( |
| 268 self.parameters['qtHelpNamespace'])) | 287 self.parameters['qtHelpNamespace'])) |
| 269 if self.parameters['qtHelpVirtualFolder'] != \ | 288 if ( |
| 270 self.defaults['qtHelpVirtualFolder']: | 289 self.parameters['qtHelpVirtualFolder'] != |
| 271 parms['qtHelpVirtualFolder'] = \ | 290 self.defaults['qtHelpVirtualFolder'] |
| 291 ): | |
| 292 parms['qtHelpVirtualFolder'] = ( | |
| 272 self.parameters['qtHelpVirtualFolder'] | 293 self.parameters['qtHelpVirtualFolder'] |
| 294 ) | |
| 273 args.append("--qhp-virtualfolder={0}".format( | 295 args.append("--qhp-virtualfolder={0}".format( |
| 274 self.parameters['qtHelpVirtualFolder'])) | 296 self.parameters['qtHelpVirtualFolder'])) |
| 275 if self.parameters['qtHelpFilterName'] != \ | 297 if ( |
| 276 self.defaults['qtHelpFilterName']: | 298 self.parameters['qtHelpFilterName'] != |
| 299 self.defaults['qtHelpFilterName'] | |
| 300 ): | |
| 277 parms['qtHelpFilterName'] = self.parameters['qtHelpFilterName'] | 301 parms['qtHelpFilterName'] = self.parameters['qtHelpFilterName'] |
| 278 args.append("--qhp-filtername={0}".format( | 302 args.append("--qhp-filtername={0}".format( |
| 279 self.parameters['qtHelpFilterName'])) | 303 self.parameters['qtHelpFilterName'])) |
| 280 if self.parameters['qtHelpFilterAttributes'] != \ | 304 if ( |
| 281 self.defaults['qtHelpFilterAttributes']: | 305 self.parameters['qtHelpFilterAttributes'] != |
| 282 parms['qtHelpFilterAttributes'] = \ | 306 self.defaults['qtHelpFilterAttributes'] |
| 307 ): | |
| 308 parms['qtHelpFilterAttributes'] = ( | |
| 283 self.parameters['qtHelpFilterAttributes'] | 309 self.parameters['qtHelpFilterAttributes'] |
| 310 ) | |
| 284 args.append("--qhp-filterattribs={0}".format( | 311 args.append("--qhp-filterattribs={0}".format( |
| 285 self.parameters['qtHelpFilterAttributes'])) | 312 self.parameters['qtHelpFilterAttributes'])) |
| 286 if self.parameters['qtHelpTitle'] != self.defaults['qtHelpTitle']: | 313 if self.parameters['qtHelpTitle'] != self.defaults['qtHelpTitle']: |
| 287 parms['qtHelpTitle'] = self.parameters['qtHelpTitle'] | 314 parms['qtHelpTitle'] = self.parameters['qtHelpTitle'] |
| 288 args.append("--qhp-title={0}".format( | 315 args.append("--qhp-title={0}".format( |
| 289 self.parameters['qtHelpTitle'])) | 316 self.parameters['qtHelpTitle'])) |
| 290 if self.parameters['qtHelpCreateCollection'] != \ | 317 if ( |
| 291 self.defaults['qtHelpCreateCollection']: | 318 self.parameters['qtHelpCreateCollection'] != |
| 292 parms['qtHelpCreateCollection'] = \ | 319 self.defaults['qtHelpCreateCollection'] |
| 320 ): | |
| 321 parms['qtHelpCreateCollection'] = ( | |
| 293 self.parameters['qtHelpCreateCollection'] | 322 self.parameters['qtHelpCreateCollection'] |
| 323 ) | |
| 294 args.append('--create-qhc') | 324 args.append('--create-qhc') |
| 295 | 325 |
| 296 return (args, parms) | 326 return (args, parms) |
| 297 | 327 |
| 298 @pyqtSlot(str) | 328 @pyqtSlot(str) |
| 523 cssFile = self.cssPicker.text() | 553 cssFile = self.cssPicker.text() |
| 524 if cssFile != '': | 554 if cssFile != '': |
| 525 cssFile = os.path.normpath(cssFile) | 555 cssFile = os.path.normpath(cssFile) |
| 526 self.parameters['cssFile'] = cssFile | 556 self.parameters['cssFile'] = cssFile |
| 527 extensions = self.sourceExtEdit.text().split(',') | 557 extensions = self.sourceExtEdit.text().split(',') |
| 528 self.parameters['sourceExtensions'] = \ | 558 self.parameters['sourceExtensions'] = [ |
| 529 [ext.strip() for ext in extensions if ext.strip()] | 559 ext.strip() for ext in extensions if ext.strip() |
| 560 ] | |
| 530 patterns = self.excludeFilesEdit.text().split(',') | 561 patterns = self.excludeFilesEdit.text().split(',') |
| 531 self.parameters['ignoreFilePatterns'] = \ | 562 self.parameters['ignoreFilePatterns'] = [ |
| 532 [pattern.strip() for pattern in patterns if pattern.strip()] | 563 pattern.strip() for pattern in patterns if pattern.strip() |
| 564 ] | |
| 533 | 565 |
| 534 self.parameters['qtHelpEnabled'] = self.qtHelpGroup.isChecked() | 566 self.parameters['qtHelpEnabled'] = self.qtHelpGroup.isChecked() |
| 535 self.parameters['qtHelpOutputDirectory'] = self.qtHelpDirPicker.text() | 567 self.parameters['qtHelpOutputDirectory'] = self.qtHelpDirPicker.text() |
| 536 self.parameters['qtHelpNamespace'] = self.qtHelpNamespaceEdit.text() | 568 self.parameters['qtHelpNamespace'] = self.qtHelpNamespaceEdit.text() |
| 537 self.parameters['qtHelpVirtualFolder'] = self.qtHelpFolderEdit.text() | 569 self.parameters['qtHelpVirtualFolder'] = self.qtHelpFolderEdit.text() |
| 538 self.parameters['qtHelpFilterName'] = self.qtHelpFilterNameEdit.text() | 570 self.parameters['qtHelpFilterName'] = self.qtHelpFilterNameEdit.text() |
| 539 self.parameters['qtHelpFilterAttributes'] = \ | 571 self.parameters['qtHelpFilterAttributes'] = ( |
| 540 self.qtHelpFilterAttributesEdit.text() | 572 self.qtHelpFilterAttributesEdit.text() |
| 573 ) | |
| 541 self.parameters['qtHelpTitle'] = self.qtHelpTitleEdit.text() | 574 self.parameters['qtHelpTitle'] = self.qtHelpTitleEdit.text() |
| 542 self.parameters['qtHelpCreateCollection'] = \ | 575 self.parameters['qtHelpCreateCollection'] = ( |
| 543 self.qtHelpGenerateCollectionCheckBox.isChecked() | 576 self.qtHelpGenerateCollectionCheckBox.isChecked() |
| 577 ) | |
| 544 | 578 |
| 545 # call the accept slot of the base class | 579 # call the accept slot of the base class |
| 546 super(EricdocConfigDialog, self).accept() | 580 super(EricdocConfigDialog, self).accept() |
