Mercurial Repositories > eric / file comparison
comparison: Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py
Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py
- changeset 253
- 3ccdf551bde7
- parent 248
- f4561c24989a
- child 416
- 9ca4a5979826
- child 792
- a13346916170
equal
deleted
inserted
replaced
| 252:05692e3d37bf | 253:3ccdf551bde7 |
|---|---|
| 69 for key, value in list(parms.items()): | 69 for key, value in list(parms.items()): |
| 70 if key.endswith("Color"): | 70 if key.endswith("Color"): |
| 71 self.colors[key] = parms[key] | 71 self.colors[key] = parms[key] |
| 72 else: | 72 else: |
| 73 self.parameters[key] = parms[key] | 73 self.parameters[key] = parms[key] |
| 74 self.parameters['outputDirectory'] = \ | |
| 75 Utilities.toNativeSeparators(self.parameters['outputDirectory']) | |
| 76 self.parameters['qtHelpOutputDirectory'] = \ | |
| 77 Utilities.toNativeSeparators(self.parameters['qtHelpOutputDirectory']) | |
| 78 self.parameters['cssFile'] = \ | |
| 79 Utilities.toNativeSeparators(self.parameters['cssFile']) | |
| 80 if self.parameters['cssFile'].startswith("%PYTHON%"): | |
| 81 self.parameters['cssFile'] = self.parameters['cssFile'].replace( | |
| 82 "%PYTHON%", Utilities.getPythonModulesDirectory()) | |
| 74 | 83 |
| 75 self.ppath = project.getProjectPath() | 84 self.ppath = project.getProjectPath() |
| 76 self.project = project | 85 self.project = project |
| 77 | 86 |
| 78 self.outputDirCompleter = E5DirCompleter(self.outputDirEdit) | 87 self.outputDirCompleter = E5DirCompleter(self.outputDirEdit) |
| 149 args.append(Utilities.normabsjoinpath(getConfig('ericDir'), "eric5-doc.py")) | 158 args.append(Utilities.normabsjoinpath(getConfig('ericDir'), "eric5-doc.py")) |
| 150 | 159 |
| 151 # 2. the commandline options | 160 # 2. the commandline options |
| 152 # 2a. general commandline options | 161 # 2a. general commandline options |
| 153 if self.parameters['outputDirectory'] != self.defaults['outputDirectory']: | 162 if self.parameters['outputDirectory'] != self.defaults['outputDirectory']: |
| 154 parms['outputDirectory'] = self.parameters['outputDirectory'] | 163 parms['outputDirectory'] = Utilities.fromNativeSeparators( |
| 164 self.project.getRelativePath(self.parameters['outputDirectory'])) | |
| 155 args.append('-o') | 165 args.append('-o') |
| 156 if os.path.isabs(self.parameters['outputDirectory']): | 166 if os.path.isabs(self.parameters['outputDirectory']): |
| 157 args.append(self.parameters['outputDirectory']) | 167 args.append(self.parameters['outputDirectory']) |
| 158 else: | 168 else: |
| 159 args.append(os.path.join(self.ppath, self.parameters['outputDirectory'])) | 169 args.append(os.path.join(self.ppath, self.parameters['outputDirectory'])) |
| 181 args.append('-t') | 191 args.append('-t') |
| 182 args.append(ext) | 192 args.append(ext) |
| 183 | 193 |
| 184 # 2b. style commandline options | 194 # 2b. style commandline options |
| 185 if self.parameters['cssFile'] != self.defaults['cssFile']: | 195 if self.parameters['cssFile'] != self.defaults['cssFile']: |
| 186 parms['cssFile'] = self.parameters['cssFile'] | 196 cssFile = self.project.getRelativePath(self.parameters['cssFile']) |
| 197 if cssFile.startswith(Utilities.getPythonModulesDirectory()): | |
| 198 cssFile = cssFile.replace( | |
| 199 Utilities.getPythonModulesDirectory(), "%PYTHON%") | |
| 200 parms['cssFile'] = Utilities.fromNativeSeparators(cssFile) | |
| 187 args.append('-c') | 201 args.append('-c') |
| 188 if os.path.isabs(self.parameters['cssFile']): | 202 if os.path.isabs(self.parameters['cssFile']): |
| 189 args.append(self.parameters['cssFile']) | 203 args.append(self.parameters['cssFile']) |
| 190 else: | 204 else: |
| 191 args.append(os.path.join(self.ppath, self.parameters['cssFile'])) | 205 args.append(os.path.join(self.ppath, self.parameters['cssFile'])) |
| 199 parms['qtHelpEnabled'] = self.parameters['qtHelpEnabled'] | 213 parms['qtHelpEnabled'] = self.parameters['qtHelpEnabled'] |
| 200 if self.parameters['qtHelpEnabled']: | 214 if self.parameters['qtHelpEnabled']: |
| 201 args.append('--create-qhp') | 215 args.append('--create-qhp') |
| 202 if self.parameters['qtHelpOutputDirectory'] != \ | 216 if self.parameters['qtHelpOutputDirectory'] != \ |
| 203 self.defaults['qtHelpOutputDirectory']: | 217 self.defaults['qtHelpOutputDirectory']: |
| 204 parms['qtHelpOutputDirectory'] = self.parameters['qtHelpOutputDirectory'] | 218 parms['qtHelpOutputDirectory'] = Utilities.fromNativeSeparators( |
| 219 self.project.getRelativePath(self.parameters['qtHelpOutputDirectory'])) | |
| 205 if os.path.isabs(self.parameters['outputDirectory']): | 220 if os.path.isabs(self.parameters['outputDirectory']): |
| 206 args.append("--qhp-outdir=%s" % self.parameters['qtHelpOutputDirectory']) | 221 args.append("--qhp-outdir=%s" % self.parameters['qtHelpOutputDirectory']) |
| 207 else: | 222 else: |
| 208 args.append("--qhp-outdir=%s" % \ | 223 args.append("--qhp-outdir=%s" % \ |
| 209 os.path.join(self.ppath, self.parameters['qtHelpOutputDirectory'])) | 224 os.path.join(self.ppath, self.parameters['qtHelpOutputDirectory'])) |
