eric: comparison eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py

-:27f636beebad
+:2c730d5fd177
 class CodeStyleCheckerDialog(QDialog, Ui_CodeStyleCheckerDialog):
 """
 Class implementing a dialog to show the results of the code style check.
 """
-filenameRole = Qt.UserRole + 1
+filenameRole = Qt.ItemDataRole.UserRole + 1
-lineRole = Qt.UserRole + 2
+lineRole = Qt.ItemDataRole.UserRole + 2
-positionRole = Qt.UserRole + 3
+positionRole = Qt.ItemDataRole.UserRole + 3
-messageRole = Qt.UserRole + 4
+messageRole = Qt.ItemDataRole.UserRole + 4
-fixableRole = Qt.UserRole + 5
+fixableRole = Qt.ItemDataRole.UserRole + 5
-codeRole = Qt.UserRole + 6
+codeRole = Qt.ItemDataRole.UserRole + 6
-ignoredRole = Qt.UserRole + 7
+ignoredRole = Qt.ItemDataRole.UserRole + 7
-argsRole = Qt.UserRole + 8
+argsRole = Qt.ItemDataRole.UserRole + 8
 availableFutures = [
 'division', 'absolute_import', 'with_statement',
 'print_function', 'unicode_literals', 'generator_stop',
 'annotations']
 @param parent reference to the parent widget
 @type QWidget
 """
 super(CodeStyleCheckerDialog, self).__init__(parent)
 self.setupUi(self)
-self.setWindowFlags(Qt.Window)
+self.setWindowFlags(Qt.WindowType.Window)
 self.__project = project
 self.optionsTabWidget.setCurrentIndex(0)
 self.docTypeComboBox.addItem(self.tr("PEP-257"), "pep257")
 self.docTypeComboBox.addItem(self.tr("Eric"), "eric")
 for category, text in CodeStyleCheckerDialog.checkCategories.items():
 itm = QListWidgetItem(text, self.categoriesList)
-itm.setData(Qt.UserRole, category)
+itm.setData(Qt.ItemDataRole.UserRole, category)
-itm.setFlags(itm.flags() | Qt.ItemIsUserCheckable)
+itm.setFlags(itm.flags() | Qt.ItemFlag.ItemIsUserCheckable)
-itm.setCheckState(Qt.Unchecked)
+itm.setCheckState(Qt.CheckState.Unchecked)
 for future in CodeStyleCheckerDialog.availableFutures:
 itm = QListWidgetItem(future, self.futuresList)
-itm.setFlags(itm.flags() | Qt.ItemIsUserCheckable)
+itm.setFlags(itm.flags() | Qt.ItemFlag.ItemIsUserCheckable)
-itm.setCheckState(Qt.Unchecked)
+itm.setCheckState(Qt.CheckState.Unchecked)
 self.dsaHighRiskCombo.addItems(
 CodeStyleCheckerDialog.cryptoBitSelectionsDsaRsa)
 self.dsaMediumRiskCombo.addItems(
 CodeStyleCheckerDialog.cryptoBitSelectionsDsaRsa)
 CodeStyleCheckerDialog.cryptoBitSelectionsEc)
 self.statisticsButton.setEnabled(False)
 self.showButton.setEnabled(False)
 self.cancelButton.setEnabled(True)
-self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
+self.buttonBox.button(
+QDialogButtonBox.StandardButton.Close).setEnabled(False)
 self.resultList.headerItem().setText(self.resultList.columnCount(), "")
-self.resultList.header().setSortIndicator(0, Qt.AscendingOrder)
+self.resultList.header().setSortIndicator(
+0, Qt.SortOrder.AscendingOrder)
 self.addBuiltinButton.setIcon(UI.PixmapCache.getIcon("plus"))
 self.deleteBuiltinButton.setIcon(UI.PixmapCache.getIcon("minus"))
 self.addWhitelistButton.setIcon(UI.PixmapCache.getIcon("plus"))
 self.deleteWhitelistButton.setIcon(UI.PixmapCache.getIcon("minus"))
 """
 if self.__errorItem is None:
 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 __createFileErrorItem(self, filename, message):
 """
 Private method to create an error entry for a given file.
 msgCode not in self.__noFixCodesList
 ):
 itm.setIcon(0, UI.PixmapCache.getIcon("issueFixable"))
 fixable = True
-itm.setTextAlignment(0, Qt.AlignRight)
+itm.setTextAlignment(0, Qt.AlignmentFlag.AlignRight)
-itm.setTextAlignment(1, Qt.AlignHCenter)
+itm.setTextAlignment(1, Qt.AlignmentFlag.AlignHCenter)
-itm.setTextAlignment(0, Qt.AlignVCenter)
+itm.setTextAlignment(0, Qt.AlignmentFlag.AlignVCenter)
-itm.setTextAlignment(1, Qt.AlignVCenter)
+itm.setTextAlignment(1, Qt.AlignmentFlag.AlignVCenter)
-itm.setTextAlignment(2, Qt.AlignVCenter)
+itm.setTextAlignment(2, Qt.AlignmentFlag.AlignVCenter)
 itm.setData(0, self.filenameRole, filename)
 itm.setData(0, self.lineRole, int(result["line"]))
 itm.setData(0, self.positionRole, int(result["offset"]))
 itm.setData(0, self.messageRole, result["display"])
 """
 self.__fileOrFileList = fileList[:]
 self.__project = project
 self.__forProject = True
-self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
+self.buttonBox.button(
-self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
+QDialogButtonBox.StandardButton.Close).setEnabled(True)
+self.buttonBox.button(
+QDialogButtonBox.StandardButton.Close).setDefault(True)
 self.cancelButton.setEnabled(False)
 self.__data = self.__project.getData("CHECKERSPARMS", "Pep8Checker")
 if (
 self.__data is None or
 self.__project = e5App().getObject("Project")
 self.mainWidget.setCurrentWidget(self.progressTab)
 self.cancelled = False
-self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
+self.buttonBox.button(
+QDialogButtonBox.StandardButton.Close).setEnabled(False)
 self.cancelButton.setEnabled(True)
 self.cancelButton.setDefault(True)
 self.statisticsButton.setEnabled(False)
 self.showButton.setEnabled(False)
 self.fixButton.setEnabled(False)
 self.checkProgress.setValue(self.progress)
 self.checkProgressLabel.setPath(fn)
 # remove file from the list of jobs to do
-fileItems = self.progressList.findItems(fn, Qt.MatchExactly)
+fileItems = self.progressList.findItems(fn, Qt.MatchFlag.MatchExactly)
 if fileItems:
 row = self.progressList.row(fileItems[0])
 self.progressList.takeItem(row)
 QApplication.processEvents()
 """
 if not self.__finished:
 self.__finished = True
 self.cancelled = True
-self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
+self.buttonBox.button(
-self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
+QDialogButtonBox.StandardButton.Close).setEnabled(True)
+self.buttonBox.button(
+QDialogButtonBox.StandardButton.Close).setDefault(True)
 self.cancelButton.setEnabled(False)
 self.statisticsButton.setEnabled(True)
 self.showButton.setEnabled(True)
 self.startButton.setEnabled(True)
 self.restartButton.setEnabled(True)
 QApplication.processEvents()
 self.showButton.setEnabled(False)
 else:
 self.showButton.setEnabled(True)
 self.resultList.header().resizeSections(
-QHeaderView.ResizeToContents)
+QHeaderView.ResizeMode.ResizeToContents)
 self.resultList.header().setStretchLastSection(True)
 self.checkProgress.setVisible(False)
 self.checkProgressLabel.setVisible(False)
 @type bool
 """
 from .CodeStyleCodeSelectionDialog import CodeStyleCodeSelectionDialog
 dlg = CodeStyleCodeSelectionDialog(edit.text(), categories,
 showFixCodes, self)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 edit.setText(dlg.getSelectedCodes())
 @pyqtSlot()
 def on_excludeMessagesSelectButton_clicked(self):
 """
 Private slot called by a button of the button box clicked.
 @param button button that was clicked
 @type QAbstractButton
 """
-if button == self.buttonBox.button(QDialogButtonBox.Close):
+if button == self.buttonBox.button(
+QDialogButtonBox.StandardButton.Close
+):
 self.close()
 def __clearErrors(self, files):
 """
 Private method to clear all warning markers of open editors to be
 else:
 expectedImports = []
 for row in range(self.futuresList.count()):
 itm = self.futuresList.item(row)
 if itm.text() in expectedImports:
-itm.setCheckState(Qt.Checked)
+itm.setCheckState(Qt.CheckState.Checked)
 else:
-itm.setCheckState(Qt.Unchecked)
+itm.setCheckState(Qt.CheckState.Unchecked)
 def __getSelectedFutureImports(self):
 """
 Private method to get the expected future imports.
 @rtype str
 """
 selectedFutures = []
 for row in range(self.futuresList.count()):
 itm = self.futuresList.item(row)
-if itm.checkState() == Qt.Checked:
+if itm.checkState() == Qt.CheckState.Checked:
 selectedFutures.append(itm.text())
 return ", ".join(selectedFutures)
 def __initBuiltinsIgnoreList(self, builtinsIgnoreDict):
 """
 """
 from .CodeStyleAddBuiltinIgnoreDialog import (
 CodeStyleAddBuiltinIgnoreDialog
 )
 dlg = CodeStyleAddBuiltinIgnoreDialog(self)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 left, right = dlg.getData()
 QTreeWidgetItem(self.builtinsAssignmentList, [left, right])
 @pyqtSlot()
 def on_deleteBuiltinButton_clicked(self):
 else:
 enabledCategoriesList = list(
 CodeStyleCheckerDialog.checkCategories.keys())
 for row in range(self.categoriesList.count()):
 itm = self.categoriesList.item(row)
-if itm.data(Qt.UserRole) in enabledCategoriesList:
+if itm.data(Qt.ItemDataRole.UserRole) in enabledCategoriesList:
-itm.setCheckState(Qt.Checked)
+itm.setCheckState(Qt.CheckState.Checked)
 else:
-itm.setCheckState(Qt.Unchecked)
+itm.setCheckState(Qt.CheckState.Unchecked)
 def __getCategories(self, enabled, asList=False):
 """
 Private method to get the enabled or disabled checker categories.
 Python list
 @type bool
 @return checker categories as a list or comma separated string
 @rtype str or list of str
 """
-state = Qt.Checked if enabled else Qt.Unchecked
+state = Qt.CheckState.Checked if enabled else Qt.CheckState.Unchecked
 checkerList = []
 for row in range(self.categoriesList.count()):
 itm = self.categoriesList.item(row)
 if itm.checkState() == state:
-checkerList.append(itm.data(Qt.UserRole))
+checkerList.append(itm.data(Qt.ItemDataRole.UserRole))
 if asList:
 return checkerList
 else:
 return ", ".join(checkerList)
 """
 pattern, ok = QInputDialog.getText(
 self,
 self.tr("Commented Code Whitelist Pattern"),
 self.tr("Enter a Commented Code Whitelist Pattern"),
-QLineEdit.Normal)
+QLineEdit.EchoMode.Normal)
 if ok and pattern:
 QListWidgetItem(pattern, self.whitelistWidget)
 @pyqtSlot()
 def on_deleteWhitelistButton_clicked(self):

Mercurial Repositories > eric / file comparison

comparison: eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py

eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py