diff -r fcab21c80811 -r 127d0fe00c77 Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py Sat Apr 09 16:34:05 2016 +0200
+++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py Sat Apr 09 18:48:11 2016 +0200
@@ -140,9 +140,9 @@
parameters.
"""
self.defaults = {
- 'useRecursion': 0,
- 'noindex': 0,
- 'noempty': 0,
+ 'useRecursion': False,
+ 'noindex': False,
+ 'noempty': False,
'outputDirectory': '',
'ignoreDirectories': [],
'ignoreFilePatterns': [],
@@ -209,7 +209,8 @@
parms['ignoreFilePatterns'] = \
self.parameters['ignoreFilePatterns'][:]
for pattern in self.parameters['ignoreFilePatterns']:
- args.append("--exclude-file={0}".format(pattern))
+ if pattern.strip():
+ args.append("--exclude-file={0}".format(pattern.strip()))
if self.parameters['useRecursion'] != self.defaults['useRecursion']:
parms['useRecursion'] = self.parameters['useRecursion']
args.append('-r')
@@ -223,8 +224,8 @@
self.defaults['sourceExtensions']:
parms['sourceExtensions'] = self.parameters['sourceExtensions'][:]
for ext in self.parameters['sourceExtensions']:
- args.append('-t')
- args.append(ext)
+ if ext.strip():
+ args.append("--extension={0}".format(ext.strip()))
# 2b. style commandline options
if self.parameters['cssFile'] != self.defaults['cssFile']:
@@ -526,10 +527,10 @@
self.parameters['cssFile'] = cssFile
extensions = self.sourceExtEdit.text().split(',')
self.parameters['sourceExtensions'] = \
- [ext.strip() for ext in extensions]
+ [ext.strip() for ext in extensions if ext.strip()]
patterns = self.excludeFilesEdit.text().split(',')
self.parameters['ignoreFilePatterns'] = \
- [pattern.strip() for pattern in patterns]
+ [pattern.strip() for pattern in patterns if pattern.strip()]
self.parameters['qtHelpEnabled'] = self.qtHelpGroup.isChecked()
self.parameters['qtHelpOutputDirectory'] = self.qtHelpDirPicker.text()
