diff -r 3d5dc11c8d8c -r 6d16eddede1e PyLint/PyLintExecDialog.py
--- a/PyLint/PyLintExecDialog.py Sun Jul 06 16:27:51 2014 +0200
+++ b/PyLint/PyLintExecDialog.py Sun Jul 06 17:01:48 2014 +0200
@@ -37,15 +37,18 @@
"""
filenameRole = Qt.UserRole + 1
- def __init__(self, parent=None):
+ def __init__(self, ui, parent=None):
"""
Constructor
+ @param ui reference to the main window (UI.UserInterface)
@param parent parent widget of this dialog (QWidget)
"""
QWidget.__init__(self, parent)
self.setupUi(self)
+ self.__ui = ui
+
self.saveButton = self.buttonBox.addButton(
self.trUtf8("Save Report..."), QDialogButtonBox.ActionRole)
self.saveButton.setToolTip(
@@ -343,9 +346,14 @@
vm = e5App().getObject("ViewManager")
vm.openSourceFile(fn, lineno)
editor = vm.getOpenEditor(fn)
- editor.toggleWarning(
- lineno, True,
- "{0} | {1}".format(itm.text(1), itm.text(2)))
+ if self.__ui.versionIsNewer("5.4.99", "20140101"):
+ editor.toggleWarning(
+ lineno, 0, True,
+ "{0} | {1}".format(itm.text(1), itm.text(2)))
+ else:
+ editor.toggleWarning(
+ lineno, True,
+ "{0} | {1}".format(itm.text(1), itm.text(2)))
else:
fn = os.path.join(self.pathname, itm.data(0, self.filenameRole))
vm = e5App().getObject("ViewManager")
@@ -354,9 +362,14 @@
for index in range(itm.childCount()):
citm = itm.child(index)
lineno = int(citm.text(0))
- editor.toggleWarning(
- lineno, True,
- "{0} | {1}".format(citm.text(1), citm.text(2)))
+ if self.__ui.versionIsNewer("5.4.99", "20140101"):
+ editor.toggleWarning(
+ lineno, 0, True,
+ "{0} | {1}".format(citm.text(1), citm.text(2)))
+ else:
+ editor.toggleWarning(
+ lineno, True,
+ "{0} | {1}".format(citm.text(1), citm.text(2)))
def __writeReport(self):
"""
