Fri, 04 Apr 2014 22:57:07 +0200
Message selection buttons in code style checker dialog fixed.
Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py | file | annotate | diff | comparison | revisions |
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py Thu Apr 03 23:05:31 2014 +0200 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py Fri Apr 04 22:57:07 2014 +0200 @@ -9,13 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QCoreApplication from PyQt4.QtGui import QDialog, QTreeWidgetItem -from . import pep8 -from .NamingStyleChecker import NamingStyleChecker -from .DocStyleChecker import DocStyleChecker - from .Ui_CodeStyleCodeSelectionDialog import Ui_CodeStyleCodeSelectionDialog import UI.PixmapCache @@ -39,33 +34,19 @@ codeList = [code.strip() for code in codes.split(",") if code.strip()] + from .translations import _messages, _messages_sample_args + if showFixCodes: from .CodeStyleFixer import FixableCodeStyleIssues selectableCodes = FixableCodeStyleIssues else: - selectableCodes = list(pep8.pep8_messages.keys()) - selectableCodes.extend(NamingStyleChecker.Messages.keys()) - selectableCodes.extend(DocStyleChecker.Messages.keys()) + selectableCodes = [x for x in list(_messages.keys()) + if not x.startswith('F')] for code in sorted(selectableCodes): - if code in pep8.pep8_messages_sample_args: - message = QCoreApplication.translate( - "pep8", pep8.pep8_messages[code]).format( - *pep8.pep8_messages_sample_args[code]) - elif code in pep8.pep8_messages: - message = QCoreApplication.translate( - "pep8", pep8.pep8_messages[code]) - elif code in NamingStyleChecker.Messages: - message = QCoreApplication.translate( - "NamingStyleChecker", - NamingStyleChecker.Messages[code]) - elif code in DocStyleChecker.MessagesSampleArgs: - message = QCoreApplication.translate( - "DocStyleChecker", - DocStyleChecker.Messages[code].format( - *DocStyleChecker.MessagesSampleArgs[code])) - elif code in DocStyleChecker.Messages: - message = QCoreApplication.translate( - "DocStyleChecker", DocStyleChecker.Messages[code]) + if code in _messages_sample_args: + message = _messages[code].format(*_messages_sample_args[code]) + elif code in _messages: + message = _messages[code] else: continue itm = QTreeWidgetItem(self.codeTable, [code, message])