51 |
51 |
52 # combine it with the values of parms |
52 # combine it with the values of parms |
53 if parms is not None: |
53 if parms is not None: |
54 for key, value in list(parms.items()): |
54 for key, value in list(parms.items()): |
55 self.parameters[key] = parms[key] |
55 self.parameters[key] = parms[key] |
|
56 self.parameters['outputFile'] = \ |
|
57 Utilities.toNativeSeparators(self.parameters['outputFile']) |
56 |
58 |
57 self.outputFileCompleter = E5FileCompleter(self.outputFileEdit) |
59 self.outputFileCompleter = E5FileCompleter(self.outputFileEdit) |
58 self.ignoreDirCompleter = E5DirCompleter(self.ignoreDirEdit) |
60 self.ignoreDirCompleter = E5DirCompleter(self.ignoreDirEdit) |
59 |
61 |
60 self.recursionCheckBox.setChecked(self.parameters['useRecursion']) |
62 self.recursionCheckBox.setChecked(self.parameters['useRecursion']) |
61 self.oldStyleCheckBox.setChecked(not self.parameters['newStyle']) |
|
62 self.includePrivateCheckBox.setChecked(self.parameters['includePrivate']) |
63 self.includePrivateCheckBox.setChecked(self.parameters['includePrivate']) |
63 self.outputFileEdit.setText(self.parameters['outputFile']) |
64 self.outputFileEdit.setText(self.parameters['outputFile']) |
64 self.baseEdit.setText(self.parameters['basePackage']) |
65 self.baseEdit.setText(self.parameters['basePackage']) |
65 self.ignoreDirsList.clear() |
66 self.ignoreDirsList.clear() |
66 for d in self.parameters['ignoreDirectories']: |
67 for d in self.parameters['ignoreDirectories']: |
78 These are needed later on to generate the commandline |
79 These are needed later on to generate the commandline |
79 parameters. |
80 parameters. |
80 """ |
81 """ |
81 self.defaults = { |
82 self.defaults = { |
82 'useRecursion' : False, |
83 'useRecursion' : False, |
83 'newStyle' : True, |
|
84 'includePrivate' : False, |
84 'includePrivate' : False, |
85 'outputFile' : '', |
85 'outputFile' : '', |
86 'basePackage' : '', |
86 'basePackage' : '', |
87 'ignoreDirectories' : [], |
87 'ignoreDirectories' : [], |
88 'ignoreFilePatterns' : [], |
88 'ignoreFilePatterns' : [], |
115 args.append(sys.executable) |
115 args.append(sys.executable) |
116 args.append(Utilities.normabsjoinpath(getConfig('ericDir'), "eric5-api.py")) |
116 args.append(Utilities.normabsjoinpath(getConfig('ericDir'), "eric5-api.py")) |
117 |
117 |
118 # 2. the commandline options |
118 # 2. the commandline options |
119 if self.parameters['outputFile'] != self.defaults['outputFile']: |
119 if self.parameters['outputFile'] != self.defaults['outputFile']: |
120 parms['outputFile'] = self.parameters['outputFile'] |
120 parms['outputFile'] = Utilities.fromNativeSeparators( |
|
121 self.project.getRelativePath(self.parameters['outputFile'])) |
121 args.append('-o') |
122 args.append('-o') |
122 if os.path.isabs(self.parameters['outputFile']): |
123 if os.path.isabs(self.parameters['outputFile']): |
123 args.append(self.parameters['outputFile']) |
124 args.append(self.parameters['outputFile']) |
124 else: |
125 else: |
125 args.append(os.path.join(self.ppath, self.parameters['outputFile'])) |
126 args.append(os.path.join(self.ppath, self.parameters['outputFile'])) |
142 if self.parameters['sourceExtensions'] != self.defaults['sourceExtensions']: |
143 if self.parameters['sourceExtensions'] != self.defaults['sourceExtensions']: |
143 parms['sourceExtensions'] = self.parameters['sourceExtensions'][:] |
144 parms['sourceExtensions'] = self.parameters['sourceExtensions'][:] |
144 for ext in self.parameters['sourceExtensions']: |
145 for ext in self.parameters['sourceExtensions']: |
145 args.append('-t') |
146 args.append('-t') |
146 args.append(ext) |
147 args.append(ext) |
147 if self.parameters['newStyle'] != self.defaults['newStyle']: |
|
148 parms['newStyle'] = self.parameters['newStyle'] |
|
149 args.append('--oldstyle') |
|
150 if self.parameters['includePrivate'] != self.defaults['includePrivate']: |
148 if self.parameters['includePrivate'] != self.defaults['includePrivate']: |
151 parms['includePrivate'] = self.parameters['includePrivate'] |
149 parms['includePrivate'] = self.parameters['includePrivate'] |
152 args.append('-p') |
150 args.append('-p') |
153 parms['languages'] = self.parameters['languages'][:] |
151 parms['languages'] = self.parameters['languages'][:] |
154 for lang in self.parameters['languages']: |
152 for lang in self.parameters['languages']: |
233 Protected slot called by the Ok button. |
231 Protected slot called by the Ok button. |
234 |
232 |
235 It saves the values in the parameters dictionary. |
233 It saves the values in the parameters dictionary. |
236 """ |
234 """ |
237 self.parameters['useRecursion'] = self.recursionCheckBox.isChecked() |
235 self.parameters['useRecursion'] = self.recursionCheckBox.isChecked() |
238 self.parameters['newStyle'] = not self.oldStyleCheckBox.isChecked() |
|
239 self.parameters['includePrivate'] = self.includePrivateCheckBox.isChecked() |
236 self.parameters['includePrivate'] = self.includePrivateCheckBox.isChecked() |
240 outfile = self.outputFileEdit.text() |
237 outfile = self.outputFileEdit.text() |
241 if outfile != '': |
238 if outfile != '': |
242 outfile = os.path.normpath(outfile) |
239 outfile = os.path.normpath(outfile) |
243 self.parameters['outputFile'] = outfile |
240 self.parameters['outputFile'] = outfile |