Mercurial Repositories > eric / changeset
changeset
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Sat, 31 Aug 2013 15:21:28 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 31 Aug 2013 15:21:28 +0200
- changeset 2876
- bfa39cf40277
- parent 2875
- 1267f0663801
- child 2878
- 61042247f793
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
--- a/APIs/Python3/eric5.api Wed Aug 28 19:53:35 2013 +0200 +++ b/APIs/Python3/eric5.api Sat Aug 31 15:21:28 2013 +0200 @@ -3719,22 +3719,26 @@ eric5.Plugins.CheckerPlugins.Pep8.Pep8Checker.Pep8Py2Checker?1(filename, lines, repeat=False, select="", ignore="", max_line_length=79, hang_closing=False) eric5.Plugins.CheckerPlugins.Pep8.Pep8CodeSelectionDialog.Pep8CodeSelectionDialog.getSelectedCodes?4() eric5.Plugins.CheckerPlugins.Pep8.Pep8CodeSelectionDialog.Pep8CodeSelectionDialog?1(codes, showFixCodes, parent=None) +eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.codeRole?7 eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.filenameRole?7 +eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.fixableRole?7 eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.lineRole?7 eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.messageRole?7 eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.on_buttonBox_clicked?4(button) eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.on_excludeMessagesSelectButton_clicked?4() +eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.on_fixButton_clicked?4() eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.on_fixIssuesSelectButton_clicked?4() eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.on_includeMessagesSelectButton_clicked?4() eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.on_loadDefaultButton_clicked?4() +eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.on_noFixIssuesSelectButton_clicked?4() eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.on_resultList_itemActivated?4(item, column) +eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.on_resultList_itemSelectionChanged?4() eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.on_showButton_clicked?4() eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.on_startButton_clicked?4() eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.on_statisticsButton_clicked?4() eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.on_storeDefaultButton_clicked?4() eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.positionRole?7 eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.prepare?4(fileList, project) -eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.settingsKey?7 eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.start?4(fn, save=False, repeat=None) eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog?1(parent=None) eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Report.error_args?4(line_number, offset, code, check, *args) @@ -3742,7 +3746,10 @@ eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.Pep8FixableIssues?7 eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.Pep8Fixer.fixIssue?4(line, pos, message) eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.Pep8Fixer.saveFile?4(encoding) -eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.Pep8Fixer?1(project, filename, sourceLines, fixCodes, inPlace) +eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.Pep8Fixer?1(project, filename, sourceLines, fixCodes, noFixCodes, maxLineLength, inPlace) +eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.Pep8IndentationWrapper.SKIP_TOKENS?7 +eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.Pep8IndentationWrapper.pep8Expected?4() +eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.Pep8IndentationWrapper?1(physical_lines) eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.Pep8Reindenter.fixedLine?4(line) eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.Pep8Reindenter.getline?4() eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.Pep8Reindenter.run?4()
--- a/Documentation/Help/source.qhp Wed Aug 28 19:53:35 2013 +0200 +++ b/Documentation/Help/source.qhp Sat Aug 31 15:21:28 2013 +0200 @@ -7983,15 +7983,23 @@ <keyword name="Pep8Dialog.__clearErrors" id="Pep8Dialog.__clearErrors" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html#Pep8Dialog.__clearErrors" /> <keyword name="Pep8Dialog.__createResultItem" id="Pep8Dialog.__createResultItem" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html#Pep8Dialog.__createResultItem" /> <keyword name="Pep8Dialog.__finish" id="Pep8Dialog.__finish" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html#Pep8Dialog.__finish" /> + <keyword name="Pep8Dialog.__getSelectedFixableItems" id="Pep8Dialog.__getSelectedFixableItems" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html#Pep8Dialog.__getSelectedFixableItems" /> + <keyword name="Pep8Dialog.__itemFixable" id="Pep8Dialog.__itemFixable" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html#Pep8Dialog.__itemFixable" /> + <keyword name="Pep8Dialog.__modifyFixedResultItem" id="Pep8Dialog.__modifyFixedResultItem" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html#Pep8Dialog.__modifyFixedResultItem" /> <keyword name="Pep8Dialog.__resetStatistics" id="Pep8Dialog.__resetStatistics" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html#Pep8Dialog.__resetStatistics" /> <keyword name="Pep8Dialog.__resort" id="Pep8Dialog.__resort" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html#Pep8Dialog.__resort" /> + <keyword name="Pep8Dialog.__selectCodes" id="Pep8Dialog.__selectCodes" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html#Pep8Dialog.__selectCodes" /> + <keyword name="Pep8Dialog.__updateFixerStatistics" id="Pep8Dialog.__updateFixerStatistics" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html#Pep8Dialog.__updateFixerStatistics" /> <keyword name="Pep8Dialog.__updateStatistics" id="Pep8Dialog.__updateStatistics" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html#Pep8Dialog.__updateStatistics" /> <keyword name="Pep8Dialog.on_buttonBox_clicked" id="Pep8Dialog.on_buttonBox_clicked" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html#Pep8Dialog.on_buttonBox_clicked" /> <keyword name="Pep8Dialog.on_excludeMessagesSelectButton_clicked" id="Pep8Dialog.on_excludeMessagesSelectButton_clicked" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html#Pep8Dialog.on_excludeMessagesSelectButton_clicked" /> + <keyword name="Pep8Dialog.on_fixButton_clicked" id="Pep8Dialog.on_fixButton_clicked" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html#Pep8Dialog.on_fixButton_clicked" /> <keyword name="Pep8Dialog.on_fixIssuesSelectButton_clicked" id="Pep8Dialog.on_fixIssuesSelectButton_clicked" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html#Pep8Dialog.on_fixIssuesSelectButton_clicked" /> <keyword name="Pep8Dialog.on_includeMessagesSelectButton_clicked" id="Pep8Dialog.on_includeMessagesSelectButton_clicked" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html#Pep8Dialog.on_includeMessagesSelectButton_clicked" /> <keyword name="Pep8Dialog.on_loadDefaultButton_clicked" id="Pep8Dialog.on_loadDefaultButton_clicked" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html#Pep8Dialog.on_loadDefaultButton_clicked" /> + <keyword name="Pep8Dialog.on_noFixIssuesSelectButton_clicked" id="Pep8Dialog.on_noFixIssuesSelectButton_clicked" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html#Pep8Dialog.on_noFixIssuesSelectButton_clicked" /> <keyword name="Pep8Dialog.on_resultList_itemActivated" id="Pep8Dialog.on_resultList_itemActivated" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html#Pep8Dialog.on_resultList_itemActivated" /> + <keyword name="Pep8Dialog.on_resultList_itemSelectionChanged" id="Pep8Dialog.on_resultList_itemSelectionChanged" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html#Pep8Dialog.on_resultList_itemSelectionChanged" /> <keyword name="Pep8Dialog.on_showButton_clicked" id="Pep8Dialog.on_showButton_clicked" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html#Pep8Dialog.on_showButton_clicked" /> <keyword name="Pep8Dialog.on_startButton_clicked" id="Pep8Dialog.on_startButton_clicked" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html#Pep8Dialog.on_startButton_clicked" /> <keyword name="Pep8Dialog.on_statisticsButton_clicked" id="Pep8Dialog.on_statisticsButton_clicked" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html#Pep8Dialog.on_statisticsButton_clicked" /> @@ -8002,7 +8010,14 @@ <keyword name="Pep8Fixer (Constructor)" id="Pep8Fixer (Constructor)" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__init__" /> <keyword name="Pep8Fixer (Module)" id="Pep8Fixer (Module)" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html" /> <keyword name="Pep8Fixer.__finalize" id="Pep8Fixer.__finalize" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__finalize" /> + <keyword name="Pep8Fixer.__findLogical" id="Pep8Fixer.__findLogical" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__findLogical" /> <keyword name="Pep8Fixer.__fixE101" id="Pep8Fixer.__fixE101" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__fixE101" /> + <keyword name="Pep8Fixer.__fixE121" id="Pep8Fixer.__fixE121" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__fixE121" /> + <keyword name="Pep8Fixer.__fixE122" id="Pep8Fixer.__fixE122" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__fixE122" /> + <keyword name="Pep8Fixer.__fixE123" id="Pep8Fixer.__fixE123" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__fixE123" /> + <keyword name="Pep8Fixer.__fixE125" id="Pep8Fixer.__fixE125" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__fixE125" /> + <keyword name="Pep8Fixer.__fixE126" id="Pep8Fixer.__fixE126" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__fixE126" /> + <keyword name="Pep8Fixer.__fixE127" id="Pep8Fixer.__fixE127" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__fixE127" /> <keyword name="Pep8Fixer.__fixE201" id="Pep8Fixer.__fixE201" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__fixE201" /> <keyword name="Pep8Fixer.__fixE221" id="Pep8Fixer.__fixE221" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__fixE221" /> <keyword name="Pep8Fixer.__fixE231" id="Pep8Fixer.__fixE231" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__fixE231" /> @@ -8017,6 +8032,7 @@ <keyword name="Pep8Fixer.__fixE701" id="Pep8Fixer.__fixE701" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__fixE701" /> <keyword name="Pep8Fixer.__fixE702" id="Pep8Fixer.__fixE702" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__fixE702" /> <keyword name="Pep8Fixer.__fixE711" id="Pep8Fixer.__fixE711" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__fixE711" /> + <keyword name="Pep8Fixer.__fixReindent" id="Pep8Fixer.__fixReindent" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__fixReindent" /> <keyword name="Pep8Fixer.__fixW291" id="Pep8Fixer.__fixW291" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__fixW291" /> <keyword name="Pep8Fixer.__fixW292" id="Pep8Fixer.__fixW292" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__fixW292" /> <keyword name="Pep8Fixer.__fixW391" id="Pep8Fixer.__fixW391" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__fixW391" /> @@ -8025,8 +8041,13 @@ <keyword name="Pep8Fixer.__getEol" id="Pep8Fixer.__getEol" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__getEol" /> <keyword name="Pep8Fixer.__getIndent" id="Pep8Fixer.__getIndent" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__getIndent" /> <keyword name="Pep8Fixer.__getIndentWord" id="Pep8Fixer.__getIndentWord" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__getIndentWord" /> + <keyword name="Pep8Fixer.__getLogical" id="Pep8Fixer.__getLogical" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.__getLogical" /> <keyword name="Pep8Fixer.fixIssue" id="Pep8Fixer.fixIssue" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.fixIssue" /> <keyword name="Pep8Fixer.saveFile" id="Pep8Fixer.saveFile" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Fixer.saveFile" /> + <keyword name="Pep8IndentationWrapper" id="Pep8IndentationWrapper" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8IndentationWrapper" /> + <keyword name="Pep8IndentationWrapper (Constructor)" id="Pep8IndentationWrapper (Constructor)" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8IndentationWrapper.__init__" /> + <keyword name="Pep8IndentationWrapper.__buildTokensLogical" id="Pep8IndentationWrapper.__buildTokensLogical" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8IndentationWrapper.__buildTokensLogical" /> + <keyword name="Pep8IndentationWrapper.pep8Expected" id="Pep8IndentationWrapper.pep8Expected" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8IndentationWrapper.pep8Expected" /> <keyword name="Pep8Py2Checker" id="Pep8Py2Checker" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Checker.html#Pep8Py2Checker" /> <keyword name="Pep8Py2Checker (Constructor)" id="Pep8Py2Checker (Constructor)" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Checker.html#Pep8Py2Checker.__init__" /> <keyword name="Pep8Reindenter" id="Pep8Reindenter" ref="eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html#Pep8Reindenter" />
--- a/Documentation/Source/eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html Wed Aug 28 19:53:35 2013 +0200 +++ b/Documentation/Source/eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html Sat Aug 31 15:21:28 2013 +0200 @@ -51,7 +51,7 @@ QDialog, Ui_Pep8Dialog <h3>Class Attributes</h3> <table> -<tr><td>filenameRole</td></tr><tr><td>lineRole</td></tr><tr><td>messageRole</td></tr><tr><td>positionRole</td></tr><tr><td>settingsKey</td></tr> +<tr><td>codeRole</td></tr><tr><td>filenameRole</td></tr><tr><td>fixableRole</td></tr><tr><td>lineRole</td></tr><tr><td>messageRole</td></tr><tr><td>positionRole</td></tr> </table> <h3>Class Methods</h3> <table> @@ -72,12 +72,27 @@ <td><a href="#Pep8Dialog.__finish">__finish</a></td> <td>Private slot called when the PEP 8 check finished or the user pressed the cancel button.</td> </tr><tr> +<td><a href="#Pep8Dialog.__getSelectedFixableItems">__getSelectedFixableItems</a></td> +<td>Private method to extract all selected items for fixable issues.</td> +</tr><tr> +<td><a href="#Pep8Dialog.__itemFixable">__itemFixable</a></td> +<td>Private method to check, if an item has a fixable issue.</td> +</tr><tr> +<td><a href="#Pep8Dialog.__modifyFixedResultItem">__modifyFixedResultItem</a></td> +<td>Private method to modify a result list entry to show its positive fixed state.</td> +</tr><tr> <td><a href="#Pep8Dialog.__resetStatistics">__resetStatistics</a></td> <td>Private slot to reset the statistics data.</td> </tr><tr> <td><a href="#Pep8Dialog.__resort">__resort</a></td> <td>Private method to resort the tree.</td> </tr><tr> +<td><a href="#Pep8Dialog.__selectCodes">__selectCodes</a></td> +<td>Private method to select message codes via a selection dialog.</td> +</tr><tr> +<td><a href="#Pep8Dialog.__updateFixerStatistics">__updateFixerStatistics</a></td> +<td>Private method to update the collected fixer related statistics.</td> +</tr><tr> <td><a href="#Pep8Dialog.__updateStatistics">__updateStatistics</a></td> <td>Private method to update the collected statistics.</td> </tr><tr> @@ -87,6 +102,9 @@ <td><a href="#Pep8Dialog.on_excludeMessagesSelectButton_clicked">on_excludeMessagesSelectButton_clicked</a></td> <td>Private slot to select the message codes to be excluded via a selection dialog.</td> </tr><tr> +<td><a href="#Pep8Dialog.on_fixButton_clicked">on_fixButton_clicked</a></td> +<td>Private slot to fix selected issues.</td> +</tr><tr> <td><a href="#Pep8Dialog.on_fixIssuesSelectButton_clicked">on_fixIssuesSelectButton_clicked</a></td> <td>Private slot to select the issue codes to be fixed via a selection dialog.</td> </tr><tr> @@ -96,9 +114,15 @@ <td><a href="#Pep8Dialog.on_loadDefaultButton_clicked">on_loadDefaultButton_clicked</a></td> <td>Private slot to load the default configuration values.</td> </tr><tr> +<td><a href="#Pep8Dialog.on_noFixIssuesSelectButton_clicked">on_noFixIssuesSelectButton_clicked</a></td> +<td>Private slot to select the issue codes not to be fixed via a selection dialog.</td> +</tr><tr> <td><a href="#Pep8Dialog.on_resultList_itemActivated">on_resultList_itemActivated</a></td> <td>Private slot to handle the activation of an item.</td> </tr><tr> +<td><a href="#Pep8Dialog.on_resultList_itemSelectionChanged">on_resultList_itemSelectionChanged</a></td> +<td>Private slot to change the dialog state depending on the selection.</td> +</tr><tr> <td><a href="#Pep8Dialog.on_showButton_clicked">on_showButton_clicked</a></td> <td>Private slot to handle the "Show" button press.</td> </tr><tr> @@ -165,7 +189,46 @@ <p> Private slot called when the PEP 8 check finished or the user pressed the cancel button. -</p><a NAME="Pep8Dialog.__resetStatistics" ID="Pep8Dialog.__resetStatistics"></a> +</p><a NAME="Pep8Dialog.__getSelectedFixableItems" ID="Pep8Dialog.__getSelectedFixableItems"></a> +<h4>Pep8Dialog.__getSelectedFixableItems</h4> +<b>__getSelectedFixableItems</b>(<i></i>) +<p> + Private method to extract all selected items for fixable issues. +</p><dl> +<dt>Returns:</dt> +<dd> +selected items for fixable issues (list of QTreeWidgetItem) +</dd> +</dl><a NAME="Pep8Dialog.__itemFixable" ID="Pep8Dialog.__itemFixable"></a> +<h4>Pep8Dialog.__itemFixable</h4> +<b>__itemFixable</b>(<i>itm</i>) +<p> + Private method to check, if an item has a fixable issue. +</p><dl> +<dt><i>itm</i></dt> +<dd> +item to be checked (QTreeWidgetItem) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating a fixable issue (boolean) +</dd> +</dl><a NAME="Pep8Dialog.__modifyFixedResultItem" ID="Pep8Dialog.__modifyFixedResultItem"></a> +<h4>Pep8Dialog.__modifyFixedResultItem</h4> +<b>__modifyFixedResultItem</b>(<i>itm, text</i>) +<p> + Private method to modify a result list entry to show its + positive fixed state. +</p><dl> +<dt><i>itm</i></dt> +<dd> +reference to the item to modify (QTreeWidgetItem) +</dd><dt><i>text</i></dt> +<dd> +text to be appended (string) +</dd> +</dl><a NAME="Pep8Dialog.__resetStatistics" ID="Pep8Dialog.__resetStatistics"></a> <h4>Pep8Dialog.__resetStatistics</h4> <b>__resetStatistics</b>(<i></i>) <p> @@ -175,7 +238,31 @@ <b>__resort</b>(<i></i>) <p> Private method to resort the tree. -</p><a NAME="Pep8Dialog.__updateStatistics" ID="Pep8Dialog.__updateStatistics"></a> +</p><a NAME="Pep8Dialog.__selectCodes" ID="Pep8Dialog.__selectCodes"></a> +<h4>Pep8Dialog.__selectCodes</h4> +<b>__selectCodes</b>(<i>edit, showFixCodes</i>) +<p> + Private method to select message codes via a selection dialog. +</p><dl> +<dt><i>edit</i></dt> +<dd> +reference of the line edit to be populated (QLineEdit) +</dd><dt><i>showFixCodes</i></dt> +<dd> +flag indicating to show a list of fixable + issues (boolean) +</dd> +</dl><a NAME="Pep8Dialog.__updateFixerStatistics" ID="Pep8Dialog.__updateFixerStatistics"></a> +<h4>Pep8Dialog.__updateFixerStatistics</h4> +<b>__updateFixerStatistics</b>(<i>fixer</i>) +<p> + Private method to update the collected fixer related statistics. +</p><dl> +<dt><i>fixer</i></dt> +<dd> +reference to the PEP 8 fixer (Pep8Fixer) +</dd> +</dl><a NAME="Pep8Dialog.__updateStatistics" ID="Pep8Dialog.__updateStatistics"></a> <h4>Pep8Dialog.__updateStatistics</h4> <b>__updateStatistics</b>(<i>statistics, fixer</i>) <p> @@ -205,6 +292,11 @@ <p> Private slot to select the message codes to be excluded via a selection dialog. +</p><a NAME="Pep8Dialog.on_fixButton_clicked" ID="Pep8Dialog.on_fixButton_clicked"></a> +<h4>Pep8Dialog.on_fixButton_clicked</h4> +<b>on_fixButton_clicked</b>(<i></i>) +<p> + Private slot to fix selected issues. </p><a NAME="Pep8Dialog.on_fixIssuesSelectButton_clicked" ID="Pep8Dialog.on_fixIssuesSelectButton_clicked"></a> <h4>Pep8Dialog.on_fixIssuesSelectButton_clicked</h4> <b>on_fixIssuesSelectButton_clicked</b>(<i></i>) @@ -222,6 +314,12 @@ <b>on_loadDefaultButton_clicked</b>(<i></i>) <p> Private slot to load the default configuration values. +</p><a NAME="Pep8Dialog.on_noFixIssuesSelectButton_clicked" ID="Pep8Dialog.on_noFixIssuesSelectButton_clicked"></a> +<h4>Pep8Dialog.on_noFixIssuesSelectButton_clicked</h4> +<b>on_noFixIssuesSelectButton_clicked</b>(<i></i>) +<p> + Private slot to select the issue codes not to be fixed via a + selection dialog. </p><a NAME="Pep8Dialog.on_resultList_itemActivated" ID="Pep8Dialog.on_resultList_itemActivated"></a> <h4>Pep8Dialog.on_resultList_itemActivated</h4> <b>on_resultList_itemActivated</b>(<i>item, column</i>) @@ -235,7 +333,12 @@ <dd> column the item was activated in (integer) </dd> -</dl><a NAME="Pep8Dialog.on_showButton_clicked" ID="Pep8Dialog.on_showButton_clicked"></a> +</dl><a NAME="Pep8Dialog.on_resultList_itemSelectionChanged" ID="Pep8Dialog.on_resultList_itemSelectionChanged"></a> +<h4>Pep8Dialog.on_resultList_itemSelectionChanged</h4> +<b>on_resultList_itemSelectionChanged</b>(<i></i>) +<p> + Private slot to change the dialog state depending on the selection. +</p><a NAME="Pep8Dialog.on_showButton_clicked" ID="Pep8Dialog.on_showButton_clicked"></a> <h4>Pep8Dialog.on_showButton_clicked</h4> <b>on_showButton_clicked</b>(<i></i>) <p>
--- a/Documentation/Source/eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html Wed Aug 28 19:53:35 2013 +0200 +++ b/Documentation/Source/eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.html Sat Aug 31 15:21:28 2013 +0200 @@ -33,6 +33,9 @@ <td><a href="#Pep8Fixer">Pep8Fixer</a></td> <td>Class implementing a fixer for certain PEP 8 issues.</td> </tr><tr> +<td><a href="#Pep8IndentationWrapper">Pep8IndentationWrapper</a></td> +<td>Class used by fixers dealing with indentation.</td> +</tr><tr> <td><a href="#Pep8Reindenter">Pep8Reindenter</a></td> <td>Class to reindent badly-indented code to uniformly use four-space indentation.</td> </tr> @@ -66,9 +69,30 @@ <td><a href="#Pep8Fixer.__finalize">__finalize</a></td> <td>Private method to apply all deferred fixes.</td> </tr><tr> +<td><a href="#Pep8Fixer.__findLogical">__findLogical</a></td> +<td>Private method to extract the index of all the starts and ends of lines.</td> +</tr><tr> <td><a href="#Pep8Fixer.__fixE101">__fixE101</a></td> <td>Private method to fix obsolete tab usage and indentation errors (E101, E111, W191).</td> </tr><tr> +<td><a href="#Pep8Fixer.__fixE121">__fixE121</a></td> +<td>Private method to fix the indentation of continuation lines and closing brackets (E121,E124).</td> +</tr><tr> +<td><a href="#Pep8Fixer.__fixE122">__fixE122</a></td> +<td>Private method to fix a missing indentation of continuation lines (E122).</td> +</tr><tr> +<td><a href="#Pep8Fixer.__fixE123">__fixE123</a></td> +<td>Private method to fix the indentation of a closing bracket lines (E123).</td> +</tr><tr> +<td><a href="#Pep8Fixer.__fixE125">__fixE125</a></td> +<td>Private method to fix the indentation of continuation lines not distinguishable from next logical line (E125).</td> +</tr><tr> +<td><a href="#Pep8Fixer.__fixE126">__fixE126</a></td> +<td>Private method to fix over-indented/under-indented hanging indentation (E126, E133).</td> +</tr><tr> +<td><a href="#Pep8Fixer.__fixE127">__fixE127</a></td> +<td>Private method to fix over/under indented lines (E127, E128).</td> +</tr><tr> <td><a href="#Pep8Fixer.__fixE201">__fixE201</a></td> <td>Private method to fix extraneous whitespace (E201, E202, E203, E211).</td> </tr><tr> @@ -111,6 +135,9 @@ <td><a href="#Pep8Fixer.__fixE711">__fixE711</a></td> <td>Private method to fix comparison with None (E711, E712).</td> </tr><tr> +<td><a href="#Pep8Fixer.__fixReindent">__fixReindent</a></td> +<td>Private method to fix a badly indented line.</td> +</tr><tr> <td><a href="#Pep8Fixer.__fixW291">__fixW291</a></td> <td>Private method to fix trailing whitespace (W291, W293).</td> </tr><tr> @@ -135,6 +162,9 @@ <td><a href="#Pep8Fixer.__getIndentWord">__getIndentWord</a></td> <td>Private method to determine the indentation type.</td> </tr><tr> +<td><a href="#Pep8Fixer.__getLogical">__getLogical</a></td> +<td>Private method to get the logical line corresponding to the given position.</td> +</tr><tr> <td><a href="#Pep8Fixer.fixIssue">fixIssue</a></td> <td>Public method to fix the fixable issues.</td> </tr><tr> @@ -148,7 +178,7 @@ </table> <a NAME="Pep8Fixer.__init__" ID="Pep8Fixer.__init__"></a> <h4>Pep8Fixer (Constructor)</h4> -<b>Pep8Fixer</b>(<i>project, filename, sourceLines, fixCodes, inPlace</i>) +<b>Pep8Fixer</b>(<i>project, filename, sourceLines, fixCodes, noFixCodes, maxLineLength, inPlace</i>) <p> Constructor </p><dl> @@ -166,6 +196,13 @@ <dd> list of codes to be fixed as a comma separated string (string) +</dd><dt><i>noFixCodes</i></dt> +<dd> +list of codes not to be fixed as a comma + separated string (string) +</dd><dt><i>maxLineLength</i></dt> +<dd> +maximum allowed line length (integer) </dd><dt><i>inPlace</i></dt> <dd> flag indicating to modify the file in place (boolean) @@ -175,7 +212,18 @@ <b>__finalize</b>(<i></i>) <p> Private method to apply all deferred fixes. -</p><a NAME="Pep8Fixer.__fixE101" ID="Pep8Fixer.__fixE101"></a> +</p><a NAME="Pep8Fixer.__findLogical" ID="Pep8Fixer.__findLogical"></a> +<h4>Pep8Fixer.__findLogical</h4> +<b>__findLogical</b>(<i></i>) +<p> + Private method to extract the index of all the starts and ends of lines. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple containing two lists of integer with start and end tuples + of lines +</dd> +</dl><a NAME="Pep8Fixer.__fixE101" ID="Pep8Fixer.__fixE101"></a> <h4>Pep8Fixer.__fixE101</h4> <b>__fixE101</b>(<i>code, line, pos</i>) <p> @@ -198,6 +246,165 @@ flag indicating an applied fix (boolean) and a message for the fix (string) </dd> +</dl><a NAME="Pep8Fixer.__fixE121" ID="Pep8Fixer.__fixE121"></a> +<h4>Pep8Fixer.__fixE121</h4> +<b>__fixE121</b>(<i>code, line, pos, apply=False</i>) +<p> + Private method to fix the indentation of continuation lines and + closing brackets (E121,E124). +</p><dl> +<dt><i>code</i></dt> +<dd> +code of the issue (string) +</dd><dt><i>line</i></dt> +<dd> +line number of the issue (integer) +</dd><dt><i>pos</i></dt> +<dd> +position inside line (integer) +</dd><dt><i>apply=</i></dt> +<dd> +flag indicating, that the fix should be applied + (boolean) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating an applied fix (boolean) and a message for + the fix (string) +</dd> +</dl><a NAME="Pep8Fixer.__fixE122" ID="Pep8Fixer.__fixE122"></a> +<h4>Pep8Fixer.__fixE122</h4> +<b>__fixE122</b>(<i>code, line, pos, apply=False</i>) +<p> + Private method to fix a missing indentation of continuation lines (E122). +</p><dl> +<dt><i>code</i></dt> +<dd> +code of the issue (string) +</dd><dt><i>line</i></dt> +<dd> +line number of the issue (integer) +</dd><dt><i>pos</i></dt> +<dd> +position inside line (integer) +</dd><dt><i>apply=</i></dt> +<dd> +flag indicating, that the fix should be applied + (boolean) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating an applied fix (boolean) and a message for + the fix (string) +</dd> +</dl><a NAME="Pep8Fixer.__fixE123" ID="Pep8Fixer.__fixE123"></a> +<h4>Pep8Fixer.__fixE123</h4> +<b>__fixE123</b>(<i>code, line, pos, apply=False</i>) +<p> + Private method to fix the indentation of a closing bracket lines (E123). +</p><dl> +<dt><i>code</i></dt> +<dd> +code of the issue (string) +</dd><dt><i>line</i></dt> +<dd> +line number of the issue (integer) +</dd><dt><i>pos</i></dt> +<dd> +position inside line (integer) +</dd><dt><i>apply=</i></dt> +<dd> +flag indicating, that the fix should be applied + (boolean) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating an applied fix (boolean) and a message for + the fix (string) +</dd> +</dl><a NAME="Pep8Fixer.__fixE125" ID="Pep8Fixer.__fixE125"></a> +<h4>Pep8Fixer.__fixE125</h4> +<b>__fixE125</b>(<i>code, line, pos, apply=False</i>) +<p> + Private method to fix the indentation of continuation lines not + distinguishable from next logical line (E125). +</p><dl> +<dt><i>code</i></dt> +<dd> +code of the issue (string) +</dd><dt><i>line</i></dt> +<dd> +line number of the issue (integer) +</dd><dt><i>pos</i></dt> +<dd> +position inside line (integer) +</dd><dt><i>apply=</i></dt> +<dd> +flag indicating, that the fix should be applied + (boolean) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating an applied fix (boolean) and a message for + the fix (string) +</dd> +</dl><a NAME="Pep8Fixer.__fixE126" ID="Pep8Fixer.__fixE126"></a> +<h4>Pep8Fixer.__fixE126</h4> +<b>__fixE126</b>(<i>code, line, pos, apply=False</i>) +<p> + Private method to fix over-indented/under-indented hanging + indentation (E126, E133). +</p><dl> +<dt><i>code</i></dt> +<dd> +code of the issue (string) +</dd><dt><i>line</i></dt> +<dd> +line number of the issue (integer) +</dd><dt><i>pos</i></dt> +<dd> +position inside line (integer) +</dd><dt><i>apply=</i></dt> +<dd> +flag indicating, that the fix should be applied + (boolean) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating an applied fix (boolean) and a message for + the fix (string) +</dd> +</dl><a NAME="Pep8Fixer.__fixE127" ID="Pep8Fixer.__fixE127"></a> +<h4>Pep8Fixer.__fixE127</h4> +<b>__fixE127</b>(<i>code, line, pos, apply=False</i>) +<p> + Private method to fix over/under indented lines (E127, E128). +</p><dl> +<dt><i>code</i></dt> +<dd> +code of the issue (string) +</dd><dt><i>line</i></dt> +<dd> +line number of the issue (integer) +</dd><dt><i>pos</i></dt> +<dd> +position inside line (integer) +</dd><dt><i>apply=</i></dt> +<dd> +flag indicating, that the fix should be applied + (boolean) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating an applied fix (boolean) and a message for + the fix (string) +</dd> </dl><a NAME="Pep8Fixer.__fixE201" ID="Pep8Fixer.__fixE201"></a> <h4>Pep8Fixer.__fixE201</h4> <b>__fixE201</b>(<i>code, line, pos</i>) @@ -344,7 +551,28 @@ <b>__fixE302</b>(<i>code, line, pos, apply=False</i>) <p> Private method to fix the need for two blank lines (E302). -</p><a NAME="Pep8Fixer.__fixE303" ID="Pep8Fixer.__fixE303"></a> +</p><dl> +<dt><i>code</i></dt> +<dd> +code of the issue (string) +</dd><dt><i>line</i></dt> +<dd> +line number of the issue (integer) +</dd><dt><i>pos</i></dt> +<dd> +position inside line (integer) +</dd><dt><i>apply=</i></dt> +<dd> +flag indicating, that the fix should be applied + (boolean) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating an applied fix (boolean) and a message for + the fix (string) +</dd> +</dl><a NAME="Pep8Fixer.__fixE303" ID="Pep8Fixer.__fixE303"></a> <h4>Pep8Fixer.__fixE303</h4> <b>__fixE303</b>(<i>code, line, pos, apply=False</i>) <p> @@ -520,6 +748,26 @@ flag indicating an applied fix (boolean) and a message for the fix (string) </dd> +</dl><a NAME="Pep8Fixer.__fixReindent" ID="Pep8Fixer.__fixReindent"></a> +<h4>Pep8Fixer.__fixReindent</h4> +<b>__fixReindent</b>(<i>line, pos, logical</i>) +<p> + Private method to fix a badly indented line. +</p><p> + This is done by adding or removing from its initial indent only. +</p><dl> +<dt><i>line</i></dt> +<dd> +line number of the issue (integer) +</dd><dt><i>pos</i></dt> +<dd> +position inside line (integer) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating a change was done (boolean) +</dd> </dl><a NAME="Pep8Fixer.__fixW291" ID="Pep8Fixer.__fixW291"></a> <h4>Pep8Fixer.__fixW291</h4> <b>__fixW291</b>(<i>code, line, pos</i>) @@ -664,6 +912,28 @@ <dd> string to be used for an indentation (string) </dd> +</dl><a NAME="Pep8Fixer.__getLogical" ID="Pep8Fixer.__getLogical"></a> +<h4>Pep8Fixer.__getLogical</h4> +<b>__getLogical</b>(<i>line, pos</i>) +<p> + Private method to get the logical line corresponding to the given + position. +</p><dl> +<dt><i>line</i></dt> +<dd> +line number of the issue (integer) +</dd><dt><i>pos</i></dt> +<dd> +position inside line (integer) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +tuple of a tuple of two integers giving the start of the + logical line, another tuple of two integers giving the end + of the logical line and a list of strings with the original + source lines +</dd> </dl><a NAME="Pep8Fixer.fixIssue" ID="Pep8Fixer.fixIssue"></a> <h4>Pep8Fixer.fixIssue</h4> <b>fixIssue</b>(<i>line, pos, message</i>) @@ -704,6 +974,82 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="Pep8IndentationWrapper" ID="Pep8IndentationWrapper"></a> +<h2>Pep8IndentationWrapper</h2> +<p> + Class used by fixers dealing with indentation. +</p><p> + Each instance operates on a single logical line. +</p> +<h3>Derived from</h3> +object +<h3>Class Attributes</h3> +<table> +<tr><td>SKIP_TOKENS</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#Pep8IndentationWrapper.__init__">Pep8IndentationWrapper</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#Pep8IndentationWrapper.__buildTokensLogical">__buildTokensLogical</a></td> +<td>Private method to build a logical line from a list of tokens.</td> +</tr><tr> +<td><a href="#Pep8IndentationWrapper.pep8Expected">pep8Expected</a></td> +<td>Public method to replicate logic in pep8.py, to know what level to indent things to.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="Pep8IndentationWrapper.__init__" ID="Pep8IndentationWrapper.__init__"></a> +<h4>Pep8IndentationWrapper (Constructor)</h4> +<b>Pep8IndentationWrapper</b>(<i>physical_lines</i>) +<p> + Constructor +</p><dl> +<dt><i>physical_lines</i></dt> +<dd> +list of physical lines to operate on + (list of strings) +</dd> +</dl><a NAME="Pep8IndentationWrapper.__buildTokensLogical" ID="Pep8IndentationWrapper.__buildTokensLogical"></a> +<h4>Pep8IndentationWrapper.__buildTokensLogical</h4> +<b>__buildTokensLogical</b>(<i>tokens</i>) +<p> + Private method to build a logical line from a list of tokens. +</p><dl> +<dt><i>tokens</i></dt> +<dd> +list of tokens as generated by tokenize.generate_tokens +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +logical line (string) +</dd> +</dl><a NAME="Pep8IndentationWrapper.pep8Expected" ID="Pep8IndentationWrapper.pep8Expected"></a> +<h4>Pep8IndentationWrapper.pep8Expected</h4> +<b>pep8Expected</b>(<i></i>) +<p> + Public method to replicate logic in pep8.py, to know what level to + indent things to. +</p><dl> +<dt>Returns:</dt> +<dd> +list of lists, where each list represents valid indent levels for + the line in question, relative from the initial indent. However, the + first entry is the indent level which was expected. +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="Pep8Reindenter" ID="Pep8Reindenter"></a> <h2>Pep8Reindenter</h2> <p>
--- a/Plugins/CheckerPlugins/Pep8/Pep8Dialog.py Wed Aug 28 19:53:35 2013 +0200 +++ b/Plugins/CheckerPlugins/Pep8/Pep8Dialog.py Sat Aug 31 15:21:28 2013 +0200 @@ -67,8 +67,8 @@ lineRole = Qt.UserRole + 2 positionRole = Qt.UserRole + 3 messageRole = Qt.UserRole + 4 - - settingsKey = "PEP8/" + fixableRole = Qt.UserRole + 5 + codeRole = Qt.UserRole + 6 def __init__(self, parent=None): """ @@ -134,6 +134,7 @@ self.__lastFileItem.setExpanded(True) self.__lastFileItem.setData(0, self.filenameRole, file) + fixable = False code, message = message.split(None, 1) itm = QTreeWidgetItem(self.__lastFileItem, ["{0:6}".format(line), code, message]) @@ -145,6 +146,7 @@ itm.setIcon(0, UI.PixmapCache.getIcon("issueFixed.png")) elif code in Pep8FixableIssues: itm.setIcon(0, UI.PixmapCache.getIcon("issueFixable.png")) + fixable = True itm.setTextAlignment(0, Qt.AlignRight) itm.setTextAlignment(1, Qt.AlignHCenter) @@ -157,6 +159,23 @@ itm.setData(0, self.lineRole, int(line)) itm.setData(0, self.positionRole, int(pos)) itm.setData(0, self.messageRole, message) + itm.setData(0, self.fixableRole, fixable) + itm.setData(0, self.codeRole, code) + + def __modifyFixedResultItem(self, itm, text): + """ + Private method to modify a result list entry to show its + positive fixed state. + + @param itm reference to the item to modify (QTreeWidgetItem) + @param text text to be appended (string) + """ + message = itm.data(0, self.messageRole) + text + itm.setText(2, message) + itm.setIcon(0, UI.PixmapCache.getIcon("issueFixed.png")) + + itm.setData(0, self.messageRole, message) + itm.setData(0, self.fixableRole, False) def __updateStatistics(self, statistics, fixer): """ @@ -177,6 +196,14 @@ if fixer: self.__statistics["_IssuesFixed"] += fixer.fixed + def __updateFixerStatistics(self, fixer): + """ + Private method to update the collected fixer related statistics. + + @param fixer reference to the PEP 8 fixer (Pep8Fixer) + """ + self.__statistics["_IssuesFixed"] += fixer.fixed + def __resetStatistics(self): """ Private slot to reset the statistics data. @@ -217,12 +244,15 @@ self.__data["MaxLineLength"] = pep8.MAX_LINE_LENGTH, if "HangClosing" not in self.__data: self.__data["HangClosing"] = False + if "NoFixCodes" not in self.__data: + self.__data["NoFixCodes"] = "E501" self.excludeFilesEdit.setText(self.__data["ExcludeFiles"]) self.excludeMessagesEdit.setText(self.__data["ExcludeMessages"]) self.includeMessagesEdit.setText(self.__data["IncludeMessages"]) self.repeatCheckBox.setChecked(self.__data["RepeatMessages"]) self.fixIssuesEdit.setText(self.__data["FixCodes"]) + self.noFixIssuesEdit.setText(self.__data["NoFixCodes"]) self.fixIssuesCheckBox.setChecked(self.__data["FixIssues"]) self.lineLengthSpinBox.setValue(self.__data["MaxLineLength"]) self.hangClosingCheckBox.setChecked(self.__data["HangClosing"]) @@ -247,6 +277,7 @@ self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) self.statisticsButton.setEnabled(False) self.showButton.setEnabled(False) + self.fixButton.setEnabled(False) if repeat is not None: self.repeatCheckBox.setChecked(repeat) QApplication.processEvents() @@ -295,6 +326,7 @@ includeMessages = self.includeMessagesEdit.text() repeatMessages = self.repeatCheckBox.isChecked() fixCodes = self.fixIssuesEdit.text() + noFixCodes = self.noFixIssuesEdit.text() fixIssues = self.fixIssuesCheckBox.isChecked() and repeatMessages maxLineLength = self.lineLengthSpinBox.value() hangClosing = self.hangClosingCheckBox.isChecked() @@ -332,7 +364,8 @@ if fixIssues: from .Pep8Fixer import Pep8Fixer fixer = Pep8Fixer(self.__project, file, source, - fixCodes, True) # always fix in place + fixCodes, noFixCodes, maxLineLength, + True) # always fix in place else: fixer = None if ("FileType" in flags and @@ -440,6 +473,7 @@ "IncludeMessages": self.includeMessagesEdit.text(), "RepeatMessages": self.repeatCheckBox.isChecked(), "FixCodes": self.fixIssuesEdit.text(), + "NoFixCodes": self.noFixIssuesEdit.text(), "FixIssues": self.fixIssuesCheckBox.isChecked(), "MaxLineLength": self.lineLengthSpinBox.value(), "HangClosing": self.hangClosingCheckBox.isChecked(), @@ -454,17 +488,26 @@ self.cancelled = False self.start(self.__fileOrFileList) + def __selectCodes(self, edit, showFixCodes): + """ + Private method to select message codes via a selection dialog. + + @param edit reference of the line edit to be populated (QLineEdit) + @param showFixCodes flag indicating to show a list of fixable + issues (boolean) + """ + from .Pep8CodeSelectionDialog import Pep8CodeSelectionDialog + dlg = Pep8CodeSelectionDialog(edit.text(), showFixCodes, self) + if dlg.exec_() == QDialog.Accepted: + edit.setText(dlg.getSelectedCodes()) + @pyqtSlot() def on_excludeMessagesSelectButton_clicked(self): """ Private slot to select the message codes to be excluded via a selection dialog. """ - from .Pep8CodeSelectionDialog import Pep8CodeSelectionDialog - dlg = Pep8CodeSelectionDialog( - self.excludeMessagesEdit.text(), False, self) - if dlg.exec_() == QDialog.Accepted: - self.excludeMessagesEdit.setText(dlg.getSelectedCodes()) + self.__selectCodes(self.excludeMessagesEdit, False) @pyqtSlot() def on_includeMessagesSelectButton_clicked(self): @@ -472,11 +515,7 @@ Private slot to select the message codes to be included via a selection dialog. """ - from .Pep8CodeSelectionDialog import Pep8CodeSelectionDialog - dlg = Pep8CodeSelectionDialog( - self.includeMessagesEdit.text(), False, self) - if dlg.exec_() == QDialog.Accepted: - self.includeMessagesEdit.setText(dlg.getSelectedCodes()) + self.__selectCodes(self.includeMessagesEdit, False) @pyqtSlot() def on_fixIssuesSelectButton_clicked(self): @@ -484,11 +523,15 @@ Private slot to select the issue codes to be fixed via a selection dialog. """ - from .Pep8CodeSelectionDialog import Pep8CodeSelectionDialog - dlg = Pep8CodeSelectionDialog( - self.fixIssuesEdit.text(), True, self) - if dlg.exec_() == QDialog.Accepted: - self.fixIssuesEdit.setText(dlg.getSelectedCodes()) + self.__selectCodes(self.fixIssuesEdit, True) + + @pyqtSlot() + def on_noFixIssuesSelectButton_clicked(self): + """ + Private slot to select the issue codes not to be fixed via a + selection dialog. + """ + self.__selectCodes(self.noFixIssuesEdit, True) @pyqtSlot(QTreeWidgetItem, int) def on_resultList_itemActivated(self, item, column): @@ -514,6 +557,13 @@ editor.toggleFlakesWarning(lineno, True, message) @pyqtSlot() + def on_resultList_itemSelectionChanged(self): + """ + Private slot to change the dialog state depending on the selection. + """ + self.fixButton.setEnabled(len(self.__getSelectedFixableItems()) > 0) + + @pyqtSlot() def on_showButton_clicked(self): """ Private slot to handle the "Show" button press. @@ -573,6 +623,8 @@ "PEP8/IncludeMessages")) self.fixIssuesEdit.setText(Preferences.Prefs.settings.value( "PEP8/FixCodes")) + self.noFixIssuesEdit.setText(Preferences.Prefs.settings.value( + "PEP8/NoFixCodes")) self.fixIssuesCheckBox.setChecked(Preferences.toBool( Preferences.Prefs.settings.value("PEP8/FixIssues"))) self.lineLengthSpinBox.setValue(int(Preferences.Prefs.settings.value( @@ -594,6 +646,8 @@ self.includeMessagesEdit.text()) Preferences.Prefs.settings.setValue("PEP8/FixCodes", self.fixIssuesEdit.text()) + Preferences.Prefs.settings.setValue("PEP8/NoFixCodes", + self.noFixIssuesEdit.text()) Preferences.Prefs.settings.setValue("PEP8/FixIssues", self.fixIssuesCheckBox.isChecked()) Preferences.Prefs.settings.setValue("PEP8/MaxLineLength", @@ -626,3 +680,96 @@ for file in openFiles: editor = vm.getOpenEditor(file) editor.clearFlakesWarnings() + + @pyqtSlot() + def on_fixButton_clicked(self): + """ + Private slot to fix selected issues. + """ + # TODO: test this + from .Pep8Fixer import Pep8Fixer + + # build a dictionary of issues to fix + fixableItems = self.__getSelectedFixableItems() + fixesDict = {} # dictionary of lists of tuples containing + # the issue and the item + for itm in fixableItems: + filename = itm.data(0, self.filenameRole) + if filename not in fixesDict: + fixesDict[filename] = [] + fixesDict[filename].append(( + (itm.data(0, self.lineRole), + itm.data(0, self.positionRole), + "{0} {1}".format(itm.data(0, self.codeRole), + itm.data(0, self.messageRole))), + itm + )) + + # extract the configuration values + fixCodes = self.fixIssuesEdit.text() + noFixCodes = self.noFixIssuesEdit.text() + maxLineLength = self.lineLengthSpinBox.value() + + # now go through all the files + if fixesDict: + self.checkProgress.setMaximum(len(fixesDict)) + progress = 0 + for file in fixesDict: + self.checkProgress.setValue(progress) + QApplication.processEvents() + + try: + source, encoding = Utilities.readEncodedFile(file) + source = source.splitlines(True) + except (UnicodeError, IOError) as msg: + # skip silently because that should not happen + progress += 1 + continue + + fixer = Pep8Fixer(self.__project, file, source, + fixCodes, noFixCodes, maxLineLength, + True) # always fix in place + errors = fixesDict[file] + errors.sort(key=lambda a: a[0][0]) + for error in errors: + (lineno, position, text), itm = error + if lineno > len(source): + lineno = len(source) + fixed, msg = fixer.fixIssue(lineno, position, text) + if fixed: + text = "\n" + self.trUtf8("Fix: {0}").format(msg) + self.__modifyFixedResultItem(itm, text) + fixer.saveFile(encoding) + + self.__updateFixerStatistics(fixer) + progress += 1 + + self.checkProgress.setValue(progress) + QApplication.processEvents() + + def __getSelectedFixableItems(self): + """ + Private method to extract all selected items for fixable issues. + + @return selected items for fixable issues (list of QTreeWidgetItem) + """ + fixableItems = [] + for itm in self.resultList.selectedItems(): + if itm.childCount() > 0: + for index in range(itm.childCount()): + citm = itm.child(index) + if self.__itemFixable(citm) and not citm in fixableItems: + fixableItems.append(citm) + elif self.__itemFixable(itm) and not itm in fixableItems: + fixableItems.append(itm) + + return fixableItems + + def __itemFixable(self, itm): + """ + Private method to check, if an item has a fixable issue. + + @param itm item to be checked (QTreeWidgetItem) + @return flag indicating a fixable issue (boolean) + """ + return itm.data(0, self.fixableRole)
--- a/Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui Wed Aug 28 19:53:35 2013 +0200 +++ b/Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui Sat Aug 31 15:21:28 2013 +0200 @@ -21,7 +21,7 @@ <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout" name="verticalLayout"> + <layout class="QVBoxLayout" name="verticalLayout_2"> <item> <widget class="QFrame" name="filterFrame"> <property name="frameShape"> @@ -42,7 +42,7 @@ </property> </widget> </item> - <item row="0" column="3" rowspan="7"> + <item row="0" column="3" rowspan="8"> <widget class="Line" name="line"> <property name="lineWidth"> <number>2</number> @@ -52,8 +52,8 @@ </property> </widget> </item> - <item row="0" column="4" rowspan="7"> - <layout class="QVBoxLayout" name="verticalLayout_2"> + <item row="0" column="4" rowspan="8"> + <layout class="QVBoxLayout" name="verticalLayout"> <item> <widget class="QPushButton" name="startButton"> <property name="toolTip"> @@ -65,6 +65,16 @@ </widget> </item> <item> + <widget class="QPushButton" name="fixButton"> + <property name="toolTip"> + <string>Press to fix the selected issues</string> + </property> + <property name="text"> + <string>Fix Selected</string> + </property> + </widget> + </item> + <item> <spacer name="verticalSpacer"> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -172,13 +182,37 @@ </widget> </item> <item row="4" column="0"> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>Don't Fix Issues:</string> + </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="E5ClearableLineEdit" name="noFixIssuesEdit"> + <property name="toolTip"> + <string>Enter message codes of issues not to be fixed automatically</string> + </property> + </widget> + </item> + <item row="4" column="2"> + <widget class="QToolButton" name="noFixIssuesSelectButton"> + <property name="toolTip"> + <string>Press to select the message codes from a list</string> + </property> + <property name="text"> + <string>...</string> + </property> + </widget> + </item> + <item row="5" column="0"> <widget class="QLabel" name="label_5"> <property name="text"> <string>Max. Line Length:</string> </property> </widget> </item> - <item row="4" column="1"> + <item row="5" column="1" colspan="2"> <layout class="QHBoxLayout" name="horizontalLayout_3"> <item> <widget class="QSpinBox" name="lineLengthSpinBox"> @@ -214,7 +248,34 @@ </item> </layout> </item> - <item row="5" column="0" colspan="3"> + <item row="6" column="0" colspan="3"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QCheckBox" name="hangClosingCheckBox"> + <property name="toolTip"> + <string>Select to allow hanging closing brackets</string> + </property> + <property name="text"> + <string>Allow hanging closing brackets</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item row="7" column="0" colspan="3"> <layout class="QHBoxLayout" name="horizontalLayout"> <item> <widget class="QCheckBox" name="repeatCheckBox"> @@ -254,33 +315,6 @@ </item> </layout> </item> - <item row="6" column="0" colspan="3"> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <widget class="QCheckBox" name="hangClosingCheckBox"> - <property name="toolTip"> - <string>Select to allow hanging closing brackets</string> - </property> - <property name="text"> - <string>Allow hanging closing brackets</string> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> </layout> </widget> </item> @@ -362,12 +396,15 @@ <tabstop>includeMessagesSelectButton</tabstop> <tabstop>fixIssuesEdit</tabstop> <tabstop>fixIssuesSelectButton</tabstop> + <tabstop>noFixIssuesEdit</tabstop> + <tabstop>noFixIssuesSelectButton</tabstop> <tabstop>lineLengthSpinBox</tabstop> + <tabstop>hangClosingCheckBox</tabstop> <tabstop>repeatCheckBox</tabstop> <tabstop>fixIssuesCheckBox</tabstop> - <tabstop>hangClosingCheckBox</tabstop> <tabstop>storeDefaultButton</tabstop> <tabstop>resultList</tabstop> + <tabstop>fixButton</tabstop> <tabstop>buttonBox</tabstop> </tabstops> <resources/>
--- a/Plugins/CheckerPlugins/Pep8/Pep8Fixer.py Wed Aug 28 19:53:35 2013 +0200 +++ b/Plugins/CheckerPlugins/Pep8/Pep8Fixer.py Sat Aug 31 15:21:28 2013 +0200 @@ -21,13 +21,14 @@ import Utilities Pep8FixableIssues = ["E101", "E111", "E121", "E122", "E123", "E124", - "E125", "E126", "E127", "E128", "E133", "W191", "E201", "E202", "E203", - "E211", "E221", "E222", "E223", "E224", "E225", - "E226", "E227", "E228", "E231", "E241", "E242", - "E251", "E261", "E262", "E271", "E272", "E273", - "E274", "W291", "W292", "W293", "E301", "E302", - "E303", "E304", "W391", "E401", "E502", "W603", - "E701", "E702", "E703", "E711", "E712" + "E125", "E126", "E127", "E128", "E133", "W191", + "E201", "E202", "E203", "E211", "E221", "E222", + "E223", "E224", "E225", "E226", "E227", "E228", + "E231", "E241", "E242", "E251", "E261", "E262", + "E271", "E272", "E273", "E274", "W291", "W292", + "W293", "E301", "E302", "E303", "E304", "W391", + "E401", "E502", "W603", "E701", "E702", "E703", + "E711", "E712" ] @@ -35,7 +36,8 @@ """ Class implementing a fixer for certain PEP 8 issues. """ - def __init__(self, project, filename, sourceLines, fixCodes, inPlace): + def __init__(self, project, filename, sourceLines, fixCodes, noFixCodes, + maxLineLength, inPlace): """ Constructor @@ -45,6 +47,9 @@ (list of string) @param fixCodes list of codes to be fixed as a comma separated string (string) + @param noFixCodes list of codes not to be fixed as a comma + separated string (string) + @param maxLineLength maximum allowed line length (integer) @param inPlace flag indicating to modify the file in place (boolean) """ super().__init__() @@ -54,6 +59,8 @@ self.__origName = "" self.__source = sourceLines[:] # save a copy self.__fixCodes = [c.strip() for c in fixCodes.split(",") if c.strip()] + self.__noFixCodes = [c.strip() for c in noFixCodes.split(",") if c.strip()] + self.__maxLineLength = maxLineLength self.fixed = 0 self.__reindenter = None @@ -146,7 +153,7 @@ self.trUtf8("Fix PEP 8 issues"), self.trUtf8( """<p>Could not save the file <b>{0}</b>.""" - """ Skipping it.</p><p>Reason: {1}</p>""")\ + """ Skipping it.</p><p>Reason: {1}</p>""") .format(self.__filename, str(err)) ) return False @@ -166,6 +173,7 @@ code = message.split(None, 1)[0].strip() if line <= len(self.__source) and \ + code not in self.__noFixCodes and \ (code in self.__fixCodes or len(self.__fixCodes) == 0) and \ code in self.__fixes: res = self.__fixes[code](code, line, pos) @@ -1053,9 +1061,9 @@ # we see a line with *something* on it. i = stats[0][0] after.extend(lines[1:i]) - for i in range(len(stats)-1): + for i in range(len(stats) - 1): thisstmt, thislevel = stats[i] - nextstmt = stats[i+1][0] + nextstmt = stats[i + 1][0] have = self.__getlspace(lines[thisstmt]) want = thislevel * 4 if want < 0: @@ -1080,7 +1088,7 @@ for j in range(i - 1, -1, -1): jline, jlevel = stats[j] if jlevel >= 0: - want = have + self.__getlspace(after[jline-1]) - \ + want = have + self.__getlspace(after[jline - 1]) - \ self.__getlspace(lines[jline]) break if want < 0:
--- a/i18n/eric5_cs.ts Wed Aug 28 19:53:35 2013 +0200 +++ b/i18n/eric5_cs.ts Sat Aug 31 15:21:28 2013 +0200 @@ -33128,27 +33128,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="105"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="115"/> <source>Exclude Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="170"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="204"/> <source>...</source> <translation type="unfinished">...</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="222"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="283"/> <source>Select to repeat each message type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="225"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="286"/> <source>Repeat messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="290"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="324"/> <source><b>Result List</b> <p>This list shows the results of the PEP 8 check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -33156,22 +33156,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="306"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="340"/> <source>File/Line</source> <translation type="unfinished">Soubor/Řádek</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="311"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="345"/> <source>Code</source> <translation type="unfinished">Kód</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="316"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="350"/> <source>Message</source> <translation type="unfinished">Zpráva</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="358"/> <source>Shows the progress of the PEP 8 check action</source> <translation type="unfinished"></translation> </message> @@ -33186,47 +33186,47 @@ <translation type="unfinished">Stisknout pro zobrazení všech souborů, které obsahují problém</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="356"/> <source>Error: {0}</source> <translation type="unfinished">Chyby: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="420"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="453"/> <source>No issues found.</source> <translation type="unfinished">Žádné problémy nenalezeny.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="112"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="122"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="136"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="146"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="83"/> - <source>Press to load the default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="86"/> - <source>Load Defaults</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="93"/> - <source>Press to store the current values as defaults</source> + <source>Press to load the default values</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="96"/> + <source>Load Defaults</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="103"/> + <source>Press to store the current values as defaults</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="106"/> <source>Store Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="129"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="139"/> <source>Included Messages:</source> <translation type="unfinished"></translation> </message> @@ -33241,110 +33241,130 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="167"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="201"/> <source>Press to select the message codes from a list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="153"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="163"/> <source>Fix Issues:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="160"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="170"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="235"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="296"/> <source>Select to fix some issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="238"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="299"/> <source>Fix issues automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="389"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="740"/> <source>Fix: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="177"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="211"/> <source>Max. Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="186"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="220"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="262"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="256"/> <source>Select to allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="265"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="259"/> <source>Allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="70"/> + <source>Press to fix the selected issues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="73"/> + <source>Fix Selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="187"/> + <source>Don't Fix Issues:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="194"/> + <source>Enter message codes of issues not to be fixed automatically</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Pep8Fixer</name> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="130"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="152"/> <source>Fix PEP 8 issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="130"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="152"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"><p>Nelze uložit do souboru <b>{0}</b>. Přeskočeno.</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="250"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="383"/> <source>Tab converted to 4 spaces.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="633"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="961"/> <source>Whitespace stripped from end of line.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="646"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="974"/> <source>newline added to end of file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="665"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="993"/> <source>Superfluous trailing blank lines removed from end of file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="679"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="1007"/> <source>'<>' replaced by '!='.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="483"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="811"/> <source>Superfluous blank lines after function decorator removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="458"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="786"/> <source>Superfluous blank lines removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="395"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="715"/> <source>One blank line inserted.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="429"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="757"/> <source>%n blank line(s) inserted.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -33353,7 +33373,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="431"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="759"/> <source>%n superfluous lines removed</source> <translation type="unfinished"> <numerusform></numerusform> @@ -33362,53 +33382,88 @@ </translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="644"/> <source>Missing whitespace added.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="358"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="678"/> <source>Extraneous whitespace removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="252"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="385"/> <source>Indentation adjusted to be a multiple of four.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="255"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="388"/> <source>Fix for {0} failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="297"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="617"/> <source>Extraneous whitespace cannot be removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="377"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="697"/> <source>Whitespace around comment sign corrected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="515"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="843"/> <source>Imports were put on separate lines.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="857"/> + <source>Redundant backslash in brackets removed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="913"/> + <source>Compound statement corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="947"/> + <source>Comparison to None/True/False corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="411"/> + <source>Indentation of continuation line corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="413"/> + <source>Indentation of closing bracket corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="442"/> + <source>Missing indentation of continuation line corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="471"/> + <source>Closing bracket aligned to opening bracket.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="498"/> + <source>Indentation level changed.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="529"/> - <source>Redundant backslash in brackets removed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="585"/> - <source>Compound statement corrected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="619"/> - <source>Comparison to None/True/False corrected.</source> + <source>Indentation level of hanging indentation changed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="575"/> + <source>Visual indentation corrected.</source> <translation type="unfinished"></translation> </message> </context>
--- a/i18n/eric5_de.ts Wed Aug 28 19:53:35 2013 +0200 +++ b/i18n/eric5_de.ts Sat Aug 31 15:21:28 2013 +0200 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> +<!DOCTYPE TS> +<TS version="2.0" language="de"> <context> <name>AboutDialog</name> <message> @@ -1943,8 +1944,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="139"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open in New &Tab Ctrl+LMB</source> + <translation>In neuem &Register öffnen Strg+LMK</translation> </message> </context> <context> @@ -2180,8 +2181,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="87"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open in New &Tab Ctrl+LMB</source> + <translation>In neuem &Register öffnen Strg+LMK</translation> </message> </context> <context> @@ -14860,8 +14861,8 @@ </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1025"/> - <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open Link in New Tab Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen Strg+LMK</translation> </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1083"/> @@ -31771,27 +31772,27 @@ <translation>Starten</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="105"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="115"/> <source>Exclude Messages:</source> <translation>Ignorierte Nachrichten:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="170"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="204"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="222"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="283"/> <source>Select to repeat each message type</source> <translation>Auswählen, um Wiederholungen eines Nachrichtentyps zuzulassen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="225"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="286"/> <source>Repeat messages</source> <translation>Nachrichten wiederholen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="290"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="324"/> <source><b>Result List</b> <p>This list shows the results of the PEP 8 check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -31802,22 +31803,22 @@ Zeile und Position.</p></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="306"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="340"/> <source>File/Line</source> <translation>Datei/Zeile</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="311"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="345"/> <source>Code</source> <translation>Schlüssel</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="316"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="350"/> <source>Message</source> <translation>Nachricht</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="358"/> <source>Shows the progress of the PEP 8 check action</source> <translation>Zeigt den Fortschritt der PEP 8-Prüfung an</translation> </message> @@ -31832,47 +31833,47 @@ <translation>Drücken, um alle Dateien mit Problemen anzuzeigen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="356"/> <source>Error: {0}</source> <translation>Fehler: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="420"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="453"/> <source>No issues found.</source> <translation>Keine Probleme gefunden.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="112"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="122"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation>Gib die Nachrichtenschlüssel oder -kategorien für auszuschließende Nachrichten durch Kommata getrennt ein</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="136"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="146"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation>Gib die Nachrichtenschlüssel oder -kategorien für ausgewählte Nachrichten durch Kommata getrennt ein</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="83"/> - <source>Press to load the default values</source> - <translation>Drücken, um Standarwerte zu laden</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="86"/> - <source>Load Defaults</source> - <translation>Standards laden</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="93"/> - <source>Press to store the current values as defaults</source> - <translation>Drücken, um die aktuellen Werte als Standard zu speichern</translation> + <source>Press to load the default values</source> + <translation>Drücken, um Standarwerte zu laden</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="96"/> + <source>Load Defaults</source> + <translation>Standards laden</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="103"/> + <source>Press to store the current values as defaults</source> + <translation>Drücken, um die aktuellen Werte als Standard zu speichern</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="106"/> <source>Store Defaults</source> <translation>Standards speichern</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="129"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="139"/> <source>Included Messages:</source> <translation>Ausgewählte Nachrichten:</translation> </message> @@ -31887,110 +31888,130 @@ <translation>Drücken, um eine Statistik für den letzten Lauf zu zeigen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="167"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="201"/> <source>Press to select the message codes from a list</source> <translation>Drücken, um die Nachrichtenschlüssel aus einer Liste zu wählen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="153"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="163"/> <source>Fix Issues:</source> <translation>Zu behebende Probleme:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="160"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="170"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation>Geben Sie die Nachrichtenschlüssel für automatisch zu behebende Probleme ein (leer lassen, um alle zu beheben)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="235"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="296"/> <source>Select to fix some issues</source> <translation>Auswählen, um ausgewählte Probleme zu beheben</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="238"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="299"/> <source>Fix issues automatically</source> <translation>Probleme automatisch beheben</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="389"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="740"/> <source>Fix: {0}</source> <translation>Lösung: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="177"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="211"/> <source>Max. Line Length:</source> <translation>Max. Zeilenlänge:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="186"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="220"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation>Gib die maximal zulässige Zeilenlänge ein (PEP-8: 79 Zeichen)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="262"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="256"/> <source>Select to allow hanging closing brackets</source> <translation>Auswählen, um hängende schließende Klammern zuzulassen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="265"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="259"/> <source>Allow hanging closing brackets</source> <translation>Hängende schließende Klammern zulassen</translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="70"/> + <source>Press to fix the selected issues</source> + <translation>Drücken, um die ausgewählten Probleme zu beheben</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="73"/> + <source>Fix Selected</source> + <translation>Ausgewählte beheben</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="187"/> + <source>Don't Fix Issues:</source> + <translation>Nicht zu behebende Probleme:</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="194"/> + <source>Enter message codes of issues not to be fixed automatically</source> + <translation>Geben Sie die Nachrichtenschlüssel für nicht automatisch zu behebende Probleme ein</translation> + </message> </context> <context> <name>Pep8Fixer</name> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="130"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="152"/> <source>Fix PEP 8 issues</source> <translation>PEP 8-Probleme beheben</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="130"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="152"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gespeichert werden. Überspringe sie.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="250"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="383"/> <source>Tab converted to 4 spaces.</source> <translation>Tabulator in 4 Leerzeichen gewandelt.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="633"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="961"/> <source>Whitespace stripped from end of line.</source> <translation>Leerzeichen am Zeilenende entfernt.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="646"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="974"/> <source>newline added to end of file.</source> <translation>Zeilenvorschub am Dateiende angefügt.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="665"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="993"/> <source>Superfluous trailing blank lines removed from end of file.</source> <translation>Überflüssige Leerzeilen am Dateiende gelöscht.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="679"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="1007"/> <source>'<>' replaced by '!='.</source> <translation>„<>“ durch „!=“ ersetzt.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="483"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="811"/> <source>Superfluous blank lines after function decorator removed.</source> <translation>Überflüssige Leerzeilen nach Funktionsdekorator gelöscht.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="458"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="786"/> <source>Superfluous blank lines removed.</source> <translation>Überflüssige Leerzeilen gelöscht.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="395"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="715"/> <source>One blank line inserted.</source> <translation>Eine Leerzeile eingefügt.</translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="429"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="757"/> <source>%n blank line(s) inserted.</source> <translation> <numerusform>%n Leerzeile eingefügt.</numerusform> @@ -31998,7 +32019,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="431"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="759"/> <source>%n superfluous lines removed</source> <translation> <numerusform>%n überflüssige Zeile gelöscht</numerusform> @@ -32006,54 +32027,89 @@ </translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="644"/> <source>Missing whitespace added.</source> <translation>Fehlende Leerzeichen eingefügt.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="358"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="678"/> <source>Extraneous whitespace removed.</source> <translation>Überzählige Leerzeichen gelöscht.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="252"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="385"/> <source>Indentation adjusted to be a multiple of four.</source> <translation>Einrückung auf ein Vielfaches von vier korrigiert.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="255"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="388"/> <source>Fix for {0} failed.</source> <translation>Fix für {0} ist fehlgeschlagen.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="297"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="617"/> <source>Extraneous whitespace cannot be removed.</source> <translation>Irrelevante Leerzeichen können nicht entfernt werden.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="377"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="697"/> <source>Whitespace around comment sign corrected.</source> <translation>Leerzeichen um Kommentarzeichen korrigiert.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="515"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="843"/> <source>Imports were put on separate lines.</source> <translation>Imports wurden auf separate Zeilen verteilt.</translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="857"/> + <source>Redundant backslash in brackets removed.</source> + <translation>Redundante Backslashes in Klammern entfernt.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="913"/> + <source>Compound statement corrected.</source> + <translation>Compund Statement korrigiert.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="947"/> + <source>Comparison to None/True/False corrected.</source> + <translation>Vergleich mit None/True/False korrigiert.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="411"/> + <source>Indentation of continuation line corrected.</source> + <translation>Einrückung der Fortsetzungszeile korrigiert.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="413"/> + <source>Indentation of closing bracket corrected.</source> + <translation>Einrückung der schließenden Klammer korrigiert.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="442"/> + <source>Missing indentation of continuation line corrected.</source> + <translation>Fehlende Einrückung der Fortsetzungszeile korrigiert.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="471"/> + <source>Closing bracket aligned to opening bracket.</source> + <translation>Schließende Klammer an öffnender Klammer ausgerichtet.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="498"/> + <source>Indentation level changed.</source> + <translation>Einrückungsebene geändert.</translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="529"/> - <source>Redundant backslash in brackets removed.</source> - <translation>Redundante Backslashes in Klammern entfernt.</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="585"/> - <source>Compound statement corrected.</source> - <translation>Compund Statement korrigiert.</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="619"/> - <source>Comparison to None/True/False corrected.</source> - <translation>Vergleich mit None/True/False korrigiert.</translation> + <source>Indentation level of hanging indentation changed.</source> + <translation>Einrückungsebene der hängenden Einrückung geändert.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="575"/> + <source>Visual indentation corrected.</source> + <translation>Visuelle Einrückung korrigiert.</translation> </message> </context> <context>
--- a/i18n/eric5_en.ts Wed Aug 28 19:53:35 2013 +0200 +++ b/i18n/eric5_en.ts Sat Aug 31 15:21:28 2013 +0200 @@ -31613,27 +31613,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="105"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="115"/> <source>Exclude Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="170"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="204"/> <source>...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="222"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="283"/> <source>Select to repeat each message type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="225"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="286"/> <source>Repeat messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="290"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="324"/> <source><b>Result List</b> <p>This list shows the results of the PEP 8 check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -31641,22 +31641,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="306"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="340"/> <source>File/Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="311"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="345"/> <source>Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="316"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="350"/> <source>Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="358"/> <source>Shows the progress of the PEP 8 check action</source> <translation type="unfinished"></translation> </message> @@ -31671,47 +31671,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="356"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="420"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="453"/> <source>No issues found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="112"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="122"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="136"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="146"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="83"/> - <source>Press to load the default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="86"/> - <source>Load Defaults</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="93"/> - <source>Press to store the current values as defaults</source> + <source>Press to load the default values</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="96"/> + <source>Load Defaults</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="103"/> + <source>Press to store the current values as defaults</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="106"/> <source>Store Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="129"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="139"/> <source>Included Messages:</source> <translation type="unfinished"></translation> </message> @@ -31726,110 +31726,130 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="167"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="201"/> <source>Press to select the message codes from a list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="153"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="163"/> <source>Fix Issues:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="160"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="170"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="235"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="296"/> <source>Select to fix some issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="238"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="299"/> <source>Fix issues automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="389"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="740"/> <source>Fix: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="177"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="211"/> <source>Max. Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="186"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="220"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="262"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="256"/> <source>Select to allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="265"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="259"/> <source>Allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="70"/> + <source>Press to fix the selected issues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="73"/> + <source>Fix Selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="187"/> + <source>Don't Fix Issues:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="194"/> + <source>Enter message codes of issues not to be fixed automatically</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Pep8Fixer</name> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="130"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="152"/> <source>Fix PEP 8 issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="130"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="152"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="250"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="383"/> <source>Tab converted to 4 spaces.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="633"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="961"/> <source>Whitespace stripped from end of line.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="646"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="974"/> <source>newline added to end of file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="665"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="993"/> <source>Superfluous trailing blank lines removed from end of file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="679"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="1007"/> <source>'<>' replaced by '!='.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="483"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="811"/> <source>Superfluous blank lines after function decorator removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="458"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="786"/> <source>Superfluous blank lines removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="395"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="715"/> <source>One blank line inserted.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="429"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="757"/> <source>%n blank line(s) inserted.</source> <translation> <numerusform>%n blank line inserted.</numerusform> @@ -31837,7 +31857,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="431"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="759"/> <source>%n superfluous lines removed</source> <translation> <numerusform>%n superfluous line removed</numerusform> @@ -31845,53 +31865,88 @@ </translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="644"/> <source>Missing whitespace added.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="358"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="678"/> <source>Extraneous whitespace removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="252"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="385"/> <source>Indentation adjusted to be a multiple of four.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="255"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="388"/> <source>Fix for {0} failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="297"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="617"/> <source>Extraneous whitespace cannot be removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="377"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="697"/> <source>Whitespace around comment sign corrected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="515"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="843"/> <source>Imports were put on separate lines.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="857"/> + <source>Redundant backslash in brackets removed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="913"/> + <source>Compound statement corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="947"/> + <source>Comparison to None/True/False corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="411"/> + <source>Indentation of continuation line corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="413"/> + <source>Indentation of closing bracket corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="442"/> + <source>Missing indentation of continuation line corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="471"/> + <source>Closing bracket aligned to opening bracket.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="498"/> + <source>Indentation level changed.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="529"/> - <source>Redundant backslash in brackets removed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="585"/> - <source>Compound statement corrected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="619"/> - <source>Comparison to None/True/False corrected.</source> + <source>Indentation level of hanging indentation changed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="575"/> + <source>Visual indentation corrected.</source> <translation type="unfinished"></translation> </message> </context>
--- a/i18n/eric5_es.ts Wed Aug 28 19:53:35 2013 +0200 +++ b/i18n/eric5_es.ts Sat Aug 31 15:21:28 2013 +0200 @@ -31774,62 +31774,62 @@ <translation>Iniciar</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="105"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="115"/> <source>Exclude Messages:</source> <translation>Excluir Mensajes:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="112"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="122"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation>Introduzca códigos de mensaje o categorías a excluir separados por comas</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="170"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="204"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="129"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="139"/> <source>Included Messages:</source> <translation>Mensajes Incluidos:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="136"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="146"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation>Introduzca códigos de mensaje o categorías a incluir separados por comas</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="222"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="283"/> <source>Select to repeat each message type</source> <translation>Seleccione para repetir cada tipo de mensaje</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="225"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="286"/> <source>Repeat messages</source> <translation>Repetir mensajes</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="83"/> - <source>Press to load the default values</source> - <translation>Pulse para cargar los valores por defecto</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="86"/> - <source>Load Defaults</source> - <translation>Cargar Valores por Defecto</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="93"/> - <source>Press to store the current values as defaults</source> - <translation>Pulse para almacenar los valores actuales como valores por defecto</translation> + <source>Press to load the default values</source> + <translation>Pulse para cargar los valores por defecto</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="96"/> + <source>Load Defaults</source> + <translation>Cargar Valores por Defecto</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="103"/> + <source>Press to store the current values as defaults</source> + <translation>Pulse para almacenar los valores actuales como valores por defecto</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="106"/> <source>Store Defaults</source> <translation>Almacenar valores por defecto</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="290"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="324"/> <source><b>Result List</b> <p>This list shows the results of the PEP 8 check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -31839,22 +31839,22 @@ y se posicionará el cursor en la línea y posición adecuadas.</p></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="306"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="340"/> <source>File/Line</source> <translation>Archivo/Línea</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="311"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="345"/> <source>Code</source> <translation>Código</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="316"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="350"/> <source>Message</source> <translation>Mensaje</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="358"/> <source>Shows the progress of the PEP 8 check action</source> <translation>Muestra el progreso de la acción de validacion de PEP 8</translation> </message> @@ -31869,12 +31869,12 @@ <translation>Pulsar para mostrar todos los archivos con algún problema</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="356"/> <source>Error: {0}</source> <translation>Error: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="420"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="453"/> <source>No issues found.</source> <translation>No se han encontrado problemas.</translation> </message> @@ -31889,110 +31889,130 @@ <translation>Pulse para mostrar algunas estadísticas de la última ejecución</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="167"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="201"/> <source>Press to select the message codes from a list</source> <translation>Pulse para seleccionar los códigos de mensaje de una lista</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="153"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="163"/> <source>Fix Issues:</source> <translation>Arreglar Problemas:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="160"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="170"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation>Introduzca los códigos de mensaje de los problemas que se desea arreglar automáticamente (dejar en blanco para arreglar todos)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="235"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="296"/> <source>Select to fix some issues</source> <translation>Seleccionar para arreglar algunos problemas</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="238"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="299"/> <source>Fix issues automatically</source> <translation>Arreglar problemas automaticamente</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="389"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="740"/> <source>Fix: {0}</source> <translation>Arreglar: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="177"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="211"/> <source>Max. Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="186"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="220"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="262"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="256"/> <source>Select to allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="265"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="259"/> <source>Allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="70"/> + <source>Press to fix the selected issues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="73"/> + <source>Fix Selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="187"/> + <source>Don't Fix Issues:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="194"/> + <source>Enter message codes of issues not to be fixed automatically</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Pep8Fixer</name> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="130"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="152"/> <source>Fix PEP 8 issues</source> <translation>Arreglar problemas de PEP 8</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="130"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="152"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>No se pudo guardar el archivo <b>{0}</b>. Omitiéndolo.</p><p>Razón: {1}</p></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="250"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="383"/> <source>Tab converted to 4 spaces.</source> <translation>Tabulador convertido a 4 espacios.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="633"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="961"/> <source>Whitespace stripped from end of line.</source> <translation>Espacio eliminado del final de la línea.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="646"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="974"/> <source>newline added to end of file.</source> <translation>Carácter de nueva línea añadido al final del archivo.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="665"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="993"/> <source>Superfluous trailing blank lines removed from end of file.</source> <translation>Eliminadas líneas en blanco sobrantes despues de final de archivo.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="679"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="1007"/> <source>'<>' replaced by '!='.</source> <translation>'<>' reemplazado por '!='.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="483"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="811"/> <source>Superfluous blank lines after function decorator removed.</source> <translation>Eliminadas líneas en blanco sobrantes después de decorador de función.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="458"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="786"/> <source>Superfluous blank lines removed.</source> <translation>Eliminadas líneas en blanco sobrantes.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="395"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="715"/> <source>One blank line inserted.</source> <translation>Insertada una línea en blanco.</translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="429"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="757"/> <source>%n blank line(s) inserted.</source> <translation> <numerusform>Insertada %n línea en blanco.</numerusform> @@ -32000,7 +32020,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="431"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="759"/> <source>%n superfluous lines removed</source> <translation> <numerusform>Eliminada %n línea en blanco sobrante</numerusform> @@ -32013,12 +32033,12 @@ <translation type="obsolete">Eliminadas espacio en blanco sobrante.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="644"/> <source>Missing whitespace added.</source> <translation>Añadido espacio en blanco que faltaba.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="358"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="678"/> <source>Extraneous whitespace removed.</source> <translation>Eliminado espacio en blanco extraño.</translation> </message> @@ -32028,43 +32048,78 @@ <translation type="obsolete">Corregido espacio en blanco despues de signo de comentario inline.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="252"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="385"/> <source>Indentation adjusted to be a multiple of four.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="255"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="388"/> <source>Fix for {0} failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="297"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="617"/> <source>Extraneous whitespace cannot be removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="377"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="697"/> <source>Whitespace around comment sign corrected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="515"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="843"/> <source>Imports were put on separate lines.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="857"/> + <source>Redundant backslash in brackets removed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="913"/> + <source>Compound statement corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="947"/> + <source>Comparison to None/True/False corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="411"/> + <source>Indentation of continuation line corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="413"/> + <source>Indentation of closing bracket corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="442"/> + <source>Missing indentation of continuation line corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="471"/> + <source>Closing bracket aligned to opening bracket.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="498"/> + <source>Indentation level changed.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="529"/> - <source>Redundant backslash in brackets removed.</source> + <source>Indentation level of hanging indentation changed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="585"/> - <source>Compound statement corrected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="619"/> - <source>Comparison to None/True/False corrected.</source> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="575"/> + <source>Visual indentation corrected.</source> <translation type="unfinished"></translation> </message> </context>
--- a/i18n/eric5_fr.ts Wed Aug 28 19:53:35 2013 +0200 +++ b/i18n/eric5_fr.ts Sat Aug 31 15:21:28 2013 +0200 @@ -34365,27 +34365,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="105"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="115"/> <source>Exclude Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="170"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="204"/> <source>...</source> <translation type="unfinished">...</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="222"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="283"/> <source>Select to repeat each message type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="225"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="286"/> <source>Repeat messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="290"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="324"/> <source><b>Result List</b> <p>This list shows the results of the PEP 8 check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -34393,22 +34393,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="306"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="340"/> <source>File/Line</source> <translation type="unfinished">Fichier/ligne</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="311"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="345"/> <source>Code</source> <translation type="unfinished">Code</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="316"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="350"/> <source>Message</source> <translation type="unfinished">Message</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="358"/> <source>Shows the progress of the PEP 8 check action</source> <translation type="unfinished"></translation> </message> @@ -34423,47 +34423,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="356"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="420"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="453"/> <source>No issues found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="112"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="122"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="136"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="146"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="83"/> - <source>Press to load the default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="86"/> - <source>Load Defaults</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="93"/> - <source>Press to store the current values as defaults</source> + <source>Press to load the default values</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="96"/> + <source>Load Defaults</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="103"/> + <source>Press to store the current values as defaults</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="106"/> <source>Store Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="129"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="139"/> <source>Included Messages:</source> <translation type="unfinished"></translation> </message> @@ -34478,110 +34478,130 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="167"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="201"/> <source>Press to select the message codes from a list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="153"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="163"/> <source>Fix Issues:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="160"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="170"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="235"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="296"/> <source>Select to fix some issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="238"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="299"/> <source>Fix issues automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="389"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="740"/> <source>Fix: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="177"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="211"/> <source>Max. Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="186"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="220"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="262"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="256"/> <source>Select to allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="265"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="259"/> <source>Allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="70"/> + <source>Press to fix the selected issues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="73"/> + <source>Fix Selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="187"/> + <source>Don't Fix Issues:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="194"/> + <source>Enter message codes of issues not to be fixed automatically</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Pep8Fixer</name> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="130"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="152"/> <source>Fix PEP 8 issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="130"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="152"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="250"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="383"/> <source>Tab converted to 4 spaces.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="633"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="961"/> <source>Whitespace stripped from end of line.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="646"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="974"/> <source>newline added to end of file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="665"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="993"/> <source>Superfluous trailing blank lines removed from end of file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="679"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="1007"/> <source>'<>' replaced by '!='.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="483"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="811"/> <source>Superfluous blank lines after function decorator removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="458"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="786"/> <source>Superfluous blank lines removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="395"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="715"/> <source>One blank line inserted.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="429"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="757"/> <source>%n blank line(s) inserted.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -34589,7 +34609,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="431"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="759"/> <source>%n superfluous lines removed</source> <translation type="unfinished"> <numerusform></numerusform> @@ -34597,53 +34617,88 @@ </translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="644"/> <source>Missing whitespace added.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="358"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="678"/> <source>Extraneous whitespace removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="252"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="385"/> <source>Indentation adjusted to be a multiple of four.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="255"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="388"/> <source>Fix for {0} failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="297"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="617"/> <source>Extraneous whitespace cannot be removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="377"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="697"/> <source>Whitespace around comment sign corrected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="515"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="843"/> <source>Imports were put on separate lines.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="857"/> + <source>Redundant backslash in brackets removed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="913"/> + <source>Compound statement corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="947"/> + <source>Comparison to None/True/False corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="411"/> + <source>Indentation of continuation line corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="413"/> + <source>Indentation of closing bracket corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="442"/> + <source>Missing indentation of continuation line corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="471"/> + <source>Closing bracket aligned to opening bracket.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="498"/> + <source>Indentation level changed.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="529"/> - <source>Redundant backslash in brackets removed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="585"/> - <source>Compound statement corrected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="619"/> - <source>Comparison to None/True/False corrected.</source> + <source>Indentation level of hanging indentation changed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="575"/> + <source>Visual indentation corrected.</source> <translation type="unfinished"></translation> </message> </context>
--- a/i18n/eric5_it.ts Wed Aug 28 19:53:35 2013 +0200 +++ b/i18n/eric5_it.ts Sat Aug 31 15:21:28 2013 +0200 @@ -32889,32 +32889,32 @@ <translation>Inizia</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="83"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="93"/> <source>Press to load the default values</source> <translation>Premi per caricare i valori di default</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="86"/> - <source>Load Defaults</source> - <translation>Carica default</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="93"/> - <source>Press to store the current values as defaults</source> - <translation>Premi per salvare i valori corrente come default</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="96"/> + <source>Load Defaults</source> + <translation>Carica default</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="103"/> + <source>Press to store the current values as defaults</source> + <translation>Premi per salvare i valori corrente come default</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="106"/> <source>Store Defaults</source> <translation>Salva default</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="105"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="115"/> <source>Exclude Messages:</source> <translation>Escludi messaggi:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="112"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="122"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation>Inserici il codice del messaggio o le categorie da escludere separate da una virgola</translation> </message> @@ -32924,22 +32924,22 @@ <translation type="obsolete">Prmei per pulire la lista dei messaggi da escludere</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="167"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="201"/> <source>Press to select the message codes from a list</source> <translation>Premi per selezionare il codice messaggi da una lista</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="170"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="204"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="129"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="139"/> <source>Included Messages:</source> <translation>Includi Messaggi:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="136"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="146"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation>Inserisci i codici messaggio o le categorie da includere separati da una virgola</translation> </message> @@ -32949,12 +32949,12 @@ <translation type="obsolete">Prmei per pulire la lista dei messaggi da includere</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="153"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="163"/> <source>Fix Issues:</source> <translation>Problemi risolti:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="160"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="170"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation>Inserisci i codici messaggio dei problemi da correggere automaticamente (lascia vuote per correggerli tutti)</translation> </message> @@ -32964,27 +32964,27 @@ <translation type="obsolete">Premi per pulire i problemi corretti</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="222"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="283"/> <source>Select to repeat each message type</source> <translation>Seleziona per ripetere ogni tipo di messaggio</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="225"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="286"/> <source>Repeat messages</source> <translation>Ripetti messaggio</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="235"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="296"/> <source>Select to fix some issues</source> <translation>Seleziona per correggere alcuni problemi</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="238"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="299"/> <source>Fix issues automatically</source> <translation>Correggi automanticamente i problemi</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="290"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="324"/> <source><b>Result List</b> <p>This list shows the results of the PEP 8 check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -32995,22 +32995,22 @@ alla riga e colonna corretta.</p></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="306"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="340"/> <source>File/Line</source> <translation>File/Linea</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="311"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="345"/> <source>Code</source> <translation>Codice</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="316"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="350"/> <source>Message</source> <translation>Messaggio</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="358"/> <source>Shows the progress of the PEP 8 check action</source> <translation>Mostra l'avanzamenteo del controllo PEP 8</translation> </message> @@ -33035,95 +33035,115 @@ <translation>Premi per mostrare tutti i file che contengono errori di sintassi</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="356"/> <source>Error: {0}</source> <translation>Errore: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="389"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="740"/> <source>Fix: {0}</source> <translation>Corregge:{0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="420"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="453"/> <source>No issues found.</source> <translation>Nessun problema trovato.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="177"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="211"/> <source>Max. Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="186"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="220"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="262"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="256"/> <source>Select to allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="265"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="259"/> <source>Allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="70"/> + <source>Press to fix the selected issues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="73"/> + <source>Fix Selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="187"/> + <source>Don't Fix Issues:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="194"/> + <source>Enter message codes of issues not to be fixed automatically</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Pep8Fixer</name> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="130"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="152"/> <source>Fix PEP 8 issues</source> <translation>Correggi problemi PEP 8</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="130"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="152"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Non posso salvare il file<b>{0}</b>. Lo salto.</p><p>Motivo:{1}</p></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="250"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="383"/> <source>Tab converted to 4 spaces.</source> <translation>Converti Tab a 4 spazi.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="633"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="961"/> <source>Whitespace stripped from end of line.</source> <translation>Elimina gli spazi alla fine della linea.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="646"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="974"/> <source>newline added to end of file.</source> <translation>aggiungi a capo alla fine del file.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="665"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="993"/> <source>Superfluous trailing blank lines removed from end of file.</source> <translation>Linee bianche superflue eliminate dalla fine del file.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="679"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="1007"/> <source>'<>' replaced by '!='.</source> <translation>'<>' sostituito da '!='.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="483"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="811"/> <source>Superfluous blank lines after function decorator removed.</source> <translation>Linee bianche superflue eliminate dopo a dichiarazione della funzione.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="458"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="786"/> <source>Superfluous blank lines removed.</source> <translation>Linee bianche superflue eliminate.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="395"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="715"/> <source>One blank line inserted.</source> <translation>Una linea vuota inserita.</translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="429"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="757"/> <source>%n blank line(s) inserted.</source> <translation> <numerusform>%n linea vuota inserita.</numerusform> @@ -33131,7 +33151,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="431"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="759"/> <source>%n superfluous lines removed</source> <translation> <numerusform>%n linea superflua eliminata</numerusform> @@ -33144,12 +33164,12 @@ <translation type="obsolete">Spazi superflui eliminati.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="644"/> <source>Missing whitespace added.</source> <translation>Spazi mancanti aggiunti.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="358"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="678"/> <source>Extraneous whitespace removed.</source> <translation>Spazio non pertinente eliminato.</translation> </message> @@ -33159,43 +33179,78 @@ <translation type="obsolete">Spazi dopo il carattere di commento inline corretti.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="252"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="385"/> <source>Indentation adjusted to be a multiple of four.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="255"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="388"/> <source>Fix for {0} failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="297"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="617"/> <source>Extraneous whitespace cannot be removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="377"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="697"/> <source>Whitespace around comment sign corrected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="515"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="843"/> <source>Imports were put on separate lines.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="857"/> + <source>Redundant backslash in brackets removed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="913"/> + <source>Compound statement corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="947"/> + <source>Comparison to None/True/False corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="411"/> + <source>Indentation of continuation line corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="413"/> + <source>Indentation of closing bracket corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="442"/> + <source>Missing indentation of continuation line corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="471"/> + <source>Closing bracket aligned to opening bracket.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="498"/> + <source>Indentation level changed.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="529"/> - <source>Redundant backslash in brackets removed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="585"/> - <source>Compound statement corrected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="619"/> - <source>Comparison to None/True/False corrected.</source> + <source>Indentation level of hanging indentation changed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="575"/> + <source>Visual indentation corrected.</source> <translation type="unfinished"></translation> </message> </context>
--- a/i18n/eric5_ru.ts Wed Aug 28 19:53:35 2013 +0200 +++ b/i18n/eric5_ru.ts Sat Aug 31 15:21:28 2013 +0200 @@ -33042,7 +33042,7 @@ <translation>Начать</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="105"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="115"/> <source>Exclude Messages:</source> <translation>Не включать сообщения:</translation> </message> @@ -33052,7 +33052,7 @@ <translation type="obsolete">Очистить</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="170"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="204"/> <source>...</source> <translation>...</translation> </message> @@ -33062,17 +33062,17 @@ <translation type="obsolete">Очистить</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="222"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="283"/> <source>Select to repeat each message type</source> <translation>Повторять однотипные сообщения</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="225"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="286"/> <source>Repeat messages</source> <translation>Повторять сообщения</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="290"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="324"/> <source><b>Result List</b> <p>This list shows the results of the PEP 8 check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -33083,22 +33083,22 @@ на сообветствующую строчку.</p></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="306"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="340"/> <source>File/Line</source> <translation>Файл/Строка</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="311"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="345"/> <source>Code</source> <translation>Код</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="316"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="350"/> <source>Message</source> <translation>Сообщение</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="358"/> <source>Shows the progress of the PEP 8 check action</source> <translation>Отображает прогресс проверки синтаксиса на соответствие PEP 8</translation> </message> @@ -33113,47 +33113,47 @@ <translation>Показать все файлы, содержащие синтаксические ошибки</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="356"/> <source>Error: {0}</source> <translation>Ошибка: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="420"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="453"/> <source>No issues found.</source> <translation>Синтаксисические ошибки не найдены.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="112"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="122"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation>Задайте коды сообщений или категорий через запятую которые не включать в проверку</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="136"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="146"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation>Задайте коды сообщений или категорий через запятую которые включать в проверку</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="83"/> - <source>Press to load the default values</source> - <translation>Восстановить значения по умолчанию</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="86"/> - <source>Load Defaults</source> - <translation>Восстановить значения по умолчанию</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="93"/> - <source>Press to store the current values as defaults</source> - <translation>Сохранить текущие значения как значения по умолчанию</translation> + <source>Press to load the default values</source> + <translation>Восстановить значения по умолчанию</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="96"/> + <source>Load Defaults</source> + <translation>Восстановить значения по умолчанию</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="103"/> + <source>Press to store the current values as defaults</source> + <translation>Сохранить текущие значения как значения по умолчанию</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="106"/> <source>Store Defaults</source> <translation>Сохранить значения по умолчанию</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="129"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="139"/> <source>Included Messages:</source> <translation>Включить сообщения:</translation> </message> @@ -33168,17 +33168,17 @@ <translation>Показать результаты последней проверки</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="167"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="201"/> <source>Press to select the message codes from a list</source> <translation>Выберите коды сообщений из списка</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="153"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="163"/> <source>Fix Issues:</source> <translation>Исправлять автоматически:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="160"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="170"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation>Задайте коды сообщений через запятую которые исправлять автоматически (если пусто, то исправлять всё)</translation> </message> @@ -33188,95 +33188,115 @@ <translation type="obsolete">Очистить</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="235"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="296"/> <source>Select to fix some issues</source> <translation>Исправлять автоматически</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="238"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="299"/> <source>Fix issues automatically</source> <translation>Исправлять автоматически</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="389"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="740"/> <source>Fix: {0}</source> <translation>Исправлено: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="177"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="211"/> <source>Max. Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="186"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="220"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="262"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="256"/> <source>Select to allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="265"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="259"/> <source>Allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="70"/> + <source>Press to fix the selected issues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="73"/> + <source>Fix Selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="187"/> + <source>Don't Fix Issues:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="194"/> + <source>Enter message codes of issues not to be fixed automatically</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Pep8Fixer</name> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="130"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="152"/> <source>Fix PEP 8 issues</source> <translation>Проверка PEP 8</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="130"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="152"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Не могу сохранить файл <b>{0}</b>. Пропускаю.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="250"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="383"/> <source>Tab converted to 4 spaces.</source> <translation>Символы табуляции заменены на 4 пробела.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="633"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="961"/> <source>Whitespace stripped from end of line.</source> <translation>Завершающие пробелы обрезаны.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="646"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="974"/> <source>newline added to end of file.</source> <translation>Перевод строки добавлен в конец файла.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="665"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="993"/> <source>Superfluous trailing blank lines removed from end of file.</source> <translation>Удалены пустые строчки в конце файла.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="679"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="1007"/> <source>'<>' replaced by '!='.</source> <translation>'<>' заменен на '!='.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="483"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="811"/> <source>Superfluous blank lines after function decorator removed.</source> <translation>Удалены пустые строчки после декоратора функции.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="458"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="786"/> <source>Superfluous blank lines removed.</source> <translation>Удалены излишние пустые строчки.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="395"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="715"/> <source>One blank line inserted.</source> <translation>Добавлена одна пустая строка.</translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="429"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="757"/> <source>%n blank line(s) inserted.</source> <translation> <numerusform>Добавлена %n пустая строка.</numerusform> @@ -33285,7 +33305,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="431"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="759"/> <source>%n superfluous lines removed</source> <translation> <numerusform>Удалена %n излишняя пустая строчка</numerusform> @@ -33299,12 +33319,12 @@ <translation type="obsolete">Удалены излишние пробелы.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="644"/> <source>Missing whitespace added.</source> <translation>Добавлены недостающие пробелы.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="358"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="678"/> <source>Extraneous whitespace removed.</source> <translation>Удалены излишние пробелы.</translation> </message> @@ -33314,43 +33334,78 @@ <translation type="obsolete">Исправлено количество пробелов после символа комментариев.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="252"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="385"/> <source>Indentation adjusted to be a multiple of four.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="255"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="388"/> <source>Fix for {0} failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="297"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="617"/> <source>Extraneous whitespace cannot be removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="377"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="697"/> <source>Whitespace around comment sign corrected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="515"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="843"/> <source>Imports were put on separate lines.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="857"/> + <source>Redundant backslash in brackets removed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="913"/> + <source>Compound statement corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="947"/> + <source>Comparison to None/True/False corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="411"/> + <source>Indentation of continuation line corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="413"/> + <source>Indentation of closing bracket corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="442"/> + <source>Missing indentation of continuation line corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="471"/> + <source>Closing bracket aligned to opening bracket.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="498"/> + <source>Indentation level changed.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="529"/> - <source>Redundant backslash in brackets removed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="585"/> - <source>Compound statement corrected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="619"/> - <source>Comparison to None/True/False corrected.</source> + <source>Indentation level of hanging indentation changed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="575"/> + <source>Visual indentation corrected.</source> <translation type="unfinished"></translation> </message> </context>
--- a/i18n/eric5_tr.ts Wed Aug 28 19:53:35 2013 +0200 +++ b/i18n/eric5_tr.ts Sat Aug 31 15:21:28 2013 +0200 @@ -32963,87 +32963,87 @@ <translation>Başla</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="83"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="93"/> <source>Press to load the default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="86"/> - <source>Load Defaults</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="93"/> - <source>Press to store the current values as defaults</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="96"/> + <source>Load Defaults</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="103"/> + <source>Press to store the current values as defaults</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="106"/> <source>Store Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="105"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="115"/> <source>Exclude Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="112"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="122"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="167"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="201"/> <source>Press to select the message codes from a list</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="204"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="139"/> + <source>Included Messages:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="146"/> + <source>Enter message codes or categories to be included separated by a comma</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="163"/> + <source>Fix Issues:</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="170"/> - <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="129"/> - <source>Included Messages:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="136"/> - <source>Enter message codes or categories to be included separated by a comma</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="153"/> - <source>Fix Issues:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="160"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="222"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="283"/> <source>Select to repeat each message type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="225"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="286"/> <source>Repeat messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="235"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="296"/> <source>Select to fix some issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="238"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="299"/> <source>Fix issues automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="290"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="324"/> <source><b>Result List</b> <p>This list shows the results of the PEP 8 check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -33051,22 +33051,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="306"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="340"/> <source>File/Line</source> <translation>Dosya/Satır</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="311"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="345"/> <source>Code</source> <translation>Kod</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="316"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="350"/> <source>Message</source> <translation>Mesaj</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="358"/> <source>Shows the progress of the PEP 8 check action</source> <translation type="unfinished"></translation> </message> @@ -33091,95 +33091,115 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="356"/> <source>Error: {0}</source> <translation>Hata: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="389"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="740"/> <source>Fix: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="420"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="453"/> <source>No issues found.</source> <translation>Sorun bulunamadı.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="177"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="211"/> <source>Max. Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="186"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="220"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="262"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="256"/> <source>Select to allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="265"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="259"/> <source>Allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="70"/> + <source>Press to fix the selected issues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="73"/> + <source>Fix Selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="187"/> + <source>Don't Fix Issues:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="194"/> + <source>Enter message codes of issues not to be fixed automatically</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Pep8Fixer</name> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="130"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="152"/> <source>Fix PEP 8 issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="130"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="152"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="250"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="383"/> <source>Tab converted to 4 spaces.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="633"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="961"/> <source>Whitespace stripped from end of line.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="646"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="974"/> <source>newline added to end of file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="665"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="993"/> <source>Superfluous trailing blank lines removed from end of file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="679"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="1007"/> <source>'<>' replaced by '!='.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="483"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="811"/> <source>Superfluous blank lines after function decorator removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="458"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="786"/> <source>Superfluous blank lines removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="395"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="715"/> <source>One blank line inserted.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="429"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="757"/> <source>%n blank line(s) inserted.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -33187,7 +33207,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="431"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="759"/> <source>%n superfluous lines removed</source> <translation type="unfinished"> <numerusform></numerusform> @@ -33195,53 +33215,88 @@ </translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="644"/> <source>Missing whitespace added.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="358"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="678"/> <source>Extraneous whitespace removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="252"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="385"/> <source>Indentation adjusted to be a multiple of four.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="255"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="388"/> <source>Fix for {0} failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="297"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="617"/> <source>Extraneous whitespace cannot be removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="377"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="697"/> <source>Whitespace around comment sign corrected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="515"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="843"/> <source>Imports were put on separate lines.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="857"/> + <source>Redundant backslash in brackets removed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="913"/> + <source>Compound statement corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="947"/> + <source>Comparison to None/True/False corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="411"/> + <source>Indentation of continuation line corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="413"/> + <source>Indentation of closing bracket corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="442"/> + <source>Missing indentation of continuation line corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="471"/> + <source>Closing bracket aligned to opening bracket.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="498"/> + <source>Indentation level changed.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="529"/> - <source>Redundant backslash in brackets removed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="585"/> - <source>Compound statement corrected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="619"/> - <source>Comparison to None/True/False corrected.</source> + <source>Indentation level of hanging indentation changed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="575"/> + <source>Visual indentation corrected.</source> <translation type="unfinished"></translation> </message> </context>
--- a/i18n/eric5_zh_CN.GB2312.ts Wed Aug 28 19:53:35 2013 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Sat Aug 31 15:21:28 2013 +0200 @@ -34298,27 +34298,27 @@ <translation type="unfinished">开始</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="105"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="115"/> <source>Exclude Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="170"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="204"/> <source>...</source> <translation type="unfinished">……</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="222"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="283"/> <source>Select to repeat each message type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="225"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="286"/> <source>Repeat messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="290"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="324"/> <source><b>Result List</b> <p>This list shows the results of the PEP 8 check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -34326,22 +34326,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="306"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="340"/> <source>File/Line</source> <translation type="unfinished">文件/行</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="311"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="345"/> <source>Code</source> <translation type="unfinished">代码</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="316"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="350"/> <source>Message</source> <translation type="unfinished">消息</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="358"/> <source>Shows the progress of the PEP 8 check action</source> <translation type="unfinished"></translation> </message> @@ -34356,47 +34356,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="356"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="420"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="453"/> <source>No issues found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="112"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="122"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="136"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="146"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="83"/> - <source>Press to load the default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="86"/> - <source>Load Defaults</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="93"/> - <source>Press to store the current values as defaults</source> + <source>Press to load the default values</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="96"/> + <source>Load Defaults</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="103"/> + <source>Press to store the current values as defaults</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="106"/> <source>Store Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="129"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="139"/> <source>Included Messages:</source> <translation type="unfinished"></translation> </message> @@ -34411,170 +34411,225 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="167"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="201"/> <source>Press to select the message codes from a list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="153"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="163"/> <source>Fix Issues:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="160"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="170"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="235"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="296"/> <source>Select to fix some issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="238"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="299"/> <source>Fix issues automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="389"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="740"/> <source>Fix: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="177"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="211"/> <source>Max. Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="186"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="220"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="262"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="256"/> <source>Select to allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="265"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="259"/> <source>Allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="70"/> + <source>Press to fix the selected issues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="73"/> + <source>Fix Selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="187"/> + <source>Don't Fix Issues:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="194"/> + <source>Enter message codes of issues not to be fixed automatically</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Pep8Fixer</name> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="130"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="152"/> <source>Fix PEP 8 issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="130"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="152"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="250"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="383"/> <source>Tab converted to 4 spaces.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="633"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="961"/> <source>Whitespace stripped from end of line.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="646"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="974"/> <source>newline added to end of file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="665"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="993"/> <source>Superfluous trailing blank lines removed from end of file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="679"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="1007"/> <source>'<>' replaced by '!='.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="483"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="811"/> <source>Superfluous blank lines after function decorator removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="458"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="786"/> <source>Superfluous blank lines removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="395"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="715"/> <source>One blank line inserted.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="429"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="757"/> <source>%n blank line(s) inserted.</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="431"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="759"/> <source>%n superfluous lines removed</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="644"/> <source>Missing whitespace added.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="358"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="678"/> <source>Extraneous whitespace removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="252"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="385"/> <source>Indentation adjusted to be a multiple of four.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="255"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="388"/> <source>Fix for {0} failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="297"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="617"/> <source>Extraneous whitespace cannot be removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="377"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="697"/> <source>Whitespace around comment sign corrected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="515"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="843"/> <source>Imports were put on separate lines.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="857"/> + <source>Redundant backslash in brackets removed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="913"/> + <source>Compound statement corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="947"/> + <source>Comparison to None/True/False corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="411"/> + <source>Indentation of continuation line corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="413"/> + <source>Indentation of closing bracket corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="442"/> + <source>Missing indentation of continuation line corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="471"/> + <source>Closing bracket aligned to opening bracket.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="498"/> + <source>Indentation level changed.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="529"/> - <source>Redundant backslash in brackets removed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="585"/> - <source>Compound statement corrected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="619"/> - <source>Comparison to None/True/False corrected.</source> + <source>Indentation level of hanging indentation changed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="575"/> + <source>Visual indentation corrected.</source> <translation type="unfinished"></translation> </message> </context>
