--- a/RefactoringRope/MatchesDialog.py Sat Jun 25 18:06:56 2022 +0200 +++ b/RefactoringRope/MatchesDialog.py Wed Sep 21 15:30:34 2022 +0200 @@ -8,9 +8,7 @@ """ from PyQt6.QtCore import pyqtSlot, Qt -from PyQt6.QtWidgets import ( - QDialog, QTreeWidgetItem, QDialogButtonBox, QHeaderView -) +from PyQt6.QtWidgets import QDialog, QTreeWidgetItem, QDialogButtonBox, QHeaderView from EricWidgets.EricApplication import ericApp @@ -21,12 +19,13 @@ """ Class implementing a dialog to show matching references/definitions. """ + FilePathRole = Qt.ItemDataRole.UserRole - + def __init__(self, ui, showConfidence, parent=None, name=None): """ Constructor - + @param ui reference to the UI object @type UI.UserInterface @param showConfidence flag indicating the display of the @@ -41,40 +40,40 @@ if name: self.setObjectName(name) self.setupUi(self) - - self.buttonBox.button( - QDialogButtonBox.StandardButton.Close).setDefault(True) - + + self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setDefault(True) + self.ui = ui self.__showConfidence = showConfidence self.__e5project = ericApp().getObject("Project") - + if not self.__showConfidence: self.matchesList.setColumnHidden(2, True) - self.matchesList.header().setSortIndicator( - 0, Qt.SortOrder.AscendingOrder) - + self.matchesList.header().setSortIndicator(0, Qt.SortOrder.AscendingOrder) + def __resort(self): """ Private method to resort the tree. """ self.matchesList.sortItems( self.matchesList.sortColumn(), - self.matchesList.header().sortIndicatorOrder()) - + self.matchesList.header().sortIndicatorOrder(), + ) + def __resizeColumns(self): """ Private method to resize the list columns. """ self.matchesList.header().resizeSections( - QHeaderView.ResizeMode.ResizeToContents) + QHeaderView.ResizeMode.ResizeToContents + ) self.matchesList.header().setStretchLastSection(True) - + @pyqtSlot(QTreeWidgetItem, int) def on_matchesList_itemActivated(self, item, column): """ Private slot to handle the itemActivated signal of the list. - + @param item reference to the activated item @type QTreeWidgetItem @param column column the item was activated in @@ -83,11 +82,11 @@ lineno = int(item.text(1)) fn = item.data(0, MatchesDialog.FilePathRole) ericApp().getObject("ViewManager").openSourceFile(fn, lineno) - + def addEntry(self, filename, lineno, unsure=False): """ Public slot to add an entry to the list. - + @param filename full path of the matched file @type str @param lineno line number of the match @@ -98,9 +97,12 @@ conf = 50 if unsure else 100 itm = QTreeWidgetItem( self.matchesList, - [self.__e5project.getRelativePath(filename), - " {0:5d}".format(lineno), - " {0:5d}%".format(conf)]) + [ + self.__e5project.getRelativePath(filename), + " {0:5d}".format(lineno), + " {0:5d}%".format(conf), + ], + ) itm.setData(0, MatchesDialog.FilePathRole, filename) itm.setTextAlignment(1, Qt.AlignmentFlag.AlignRight) itm.setTextAlignment(2, Qt.AlignmentFlag.AlignRight)