--- a/eric6/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Tue Mar 02 17:17:09 2021 +0100
@@ -27,11 +27,11 @@
"""
Class implementing a dialog to display the results of a syntax check run.
"""
- filenameRole = Qt.UserRole + 1
- lineRole = Qt.UserRole + 2
- indexRole = Qt.UserRole + 3
- errorRole = Qt.UserRole + 4
- warningRole = Qt.UserRole + 5
+ filenameRole = Qt.ItemDataRole.UserRole + 1
+ lineRole = Qt.ItemDataRole.UserRole + 2
+ indexRole = Qt.ItemDataRole.UserRole + 3
+ errorRole = Qt.ItemDataRole.UserRole + 4
+ warningRole = Qt.ItemDataRole.UserRole + 5
def __init__(self, parent=None):
"""
@@ -41,17 +41,20 @@
"""
super(SyntaxCheckerDialog, self).__init__(parent)
self.setupUi(self)
- self.setWindowFlags(Qt.Window)
+ self.setWindowFlags(Qt.WindowType.Window)
self.showButton = self.buttonBox.addButton(
- self.tr("Show"), QDialogButtonBox.ActionRole)
+ self.tr("Show"), QDialogButtonBox.ButtonRole.ActionRole)
self.showButton.setToolTip(
self.tr("Press to show all files containing an issue"))
- self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
- self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
+ self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Close).setEnabled(False)
+ self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Cancel).setDefault(True)
self.resultList.headerItem().setText(self.resultList.columnCount(), "")
- self.resultList.header().setSortIndicator(0, Qt.AscendingOrder)
+ self.resultList.header().setSortIndicator(
+ 0, Qt.SortOrder.AscendingOrder)
self.noResults = True
self.cancelled = False
@@ -98,13 +101,13 @@
self.__errorItem = QTreeWidgetItem(self.resultList, [
self.tr("Errors")])
self.__errorItem.setExpanded(True)
- self.__errorItem.setForeground(0, Qt.red)
+ self.__errorItem.setForeground(0, Qt.GlobalColor.red)
msg = "{0} ({1})".format(self.__project.getRelativePath(filename),
message)
- if not self.resultList.findItems(msg, Qt.MatchExactly):
+ if not self.resultList.findItems(msg, Qt.MatchFlag.MatchExactly):
itm = QTreeWidgetItem(self.__errorItem, [msg])
- itm.setForeground(0, Qt.red)
+ itm.setForeground(0, Qt.GlobalColor.red)
itm.setFirstColumnSpanned(True)
def __createResultItem(self, filename, line, index, error, sourcecode,
@@ -135,9 +138,9 @@
itm.setIcon(0, UI.PixmapCache.getIcon("warning"))
else:
itm.setIcon(0, UI.PixmapCache.getIcon("syntaxError"))
- itm.setData(0, Qt.DisplayRole, line)
- itm.setData(1, Qt.DisplayRole, error)
- itm.setData(2, Qt.DisplayRole, sourcecode)
+ itm.setData(0, Qt.ItemDataRole.DisplayRole, line)
+ itm.setData(1, Qt.ItemDataRole.DisplayRole, error)
+ itm.setData(2, Qt.ItemDataRole.DisplayRole, sourcecode)
itm.setData(0, self.filenameRole, filename)
itm.setData(0, self.lineRole, int(line))
itm.setData(0, self.indexRole, index)
@@ -154,9 +157,12 @@
self.__fileList = fileList[:]
self.__project = project
- self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
- self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False)
- self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
+ self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Close).setEnabled(True)
+ self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Cancel).setEnabled(False)
+ self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Close).setDefault(True)
self.filterFrame.setVisible(True)
@@ -181,9 +187,12 @@
self.__project = e5App().getObject("Project")
self.cancelled = False
- self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
- self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True)
- self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
+ self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Close).setEnabled(False)
+ self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Cancel).setEnabled(True)
+ self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Cancel).setDefault(True)
self.showButton.setEnabled(False)
self.checkProgress.setVisible(True)
QApplication.processEvents()
@@ -389,9 +398,12 @@
self.__finished = True
self.cancelled = True
- self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
- self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False)
- self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
+ self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Close).setEnabled(True)
+ self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Cancel).setEnabled(False)
+ self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Close).setDefault(True)
if self.noResults:
QTreeWidgetItem(self.resultList, [self.tr('No issues found.')])
@@ -400,7 +412,7 @@
else:
self.showButton.setEnabled(True)
self.resultList.header().resizeSections(
- QHeaderView.ResizeToContents)
+ QHeaderView.ResizeMode.ResizeToContents)
self.resultList.header().setStretchLastSection(True)
self.checkProgress.setVisible(False)
@@ -412,9 +424,13 @@
@param button button that was clicked (QAbstractButton)
"""
- if button == self.buttonBox.button(QDialogButtonBox.Close):
+ if button == self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Close
+ ):
self.close()
- elif button == self.buttonBox.button(QDialogButtonBox.Cancel):
+ elif button == self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Cancel
+ ):
if self.__batch:
self.syntaxCheckService.cancelSyntaxBatchCheck()
QTimer.singleShot(1000, self.__finish)
