--- a/src/eric7/WebBrowser/History/HistoryModel.py Wed Jul 13 11:16:20 2022 +0200 +++ b/src/eric7/WebBrowser/History/HistoryModel.py Wed Jul 13 14:55:47 2022 +0200 @@ -18,6 +18,7 @@ """ Class implementing the history model. """ + DateRole = Qt.ItemDataRole.UserRole + 1 DateTimeRole = Qt.ItemDataRole.UserRole + 2 UrlRole = Qt.ItemDataRole.UserRole + 3 @@ -25,75 +26,70 @@ TitleRole = Qt.ItemDataRole.UserRole + 5 VisitCountRole = Qt.ItemDataRole.UserRole + 6 MaxRole = VisitCountRole - + def __init__(self, historyManager, parent=None): """ Constructor - + @param historyManager reference to the history manager object (HistoryManager) @param parent reference to the parent object (QObject) """ super().__init__(parent) - + self.__historyManager = historyManager - - self.__headers = [ - self.tr("Title"), - self.tr("Address"), - self.tr("Visit Count") - ] - + + self.__headers = [self.tr("Title"), self.tr("Address"), self.tr("Visit Count")] + self.__historyManager.historyReset.connect(self.historyReset) self.__historyManager.entryRemoved.connect(self.historyReset) self.__historyManager.entryAdded.connect(self.entryAdded) self.__historyManager.entryUpdated.connect(self.entryUpdated) - + def historyReset(self): """ Public slot to reset the model. """ self.beginResetModel() self.endResetModel() - + def entryAdded(self): """ Public slot to handle the addition of a history entry. """ self.beginInsertRows(QModelIndex(), 0, 0) self.endInsertRows() - + def entryUpdated(self, row): """ Public slot to handle the update of a history entry. - + @param row row number of the updated entry (integer) """ idx = self.index(row, 0) self.dataChanged.emit(idx, idx) - - def headerData(self, section, orientation, - role=Qt.ItemDataRole.DisplayRole): + + def headerData(self, section, orientation, role=Qt.ItemDataRole.DisplayRole): """ Public method to get the header data. - + @param section section number (integer) @param orientation header orientation (Qt.Orientation) @param role data role (Qt.ItemDataRole) @return header data """ if ( - orientation == Qt.Orientation.Horizontal and - role == Qt.ItemDataRole.DisplayRole + orientation == Qt.Orientation.Horizontal + and role == Qt.ItemDataRole.DisplayRole ): with contextlib.suppress(IndexError): return self.__headers[section] return QAbstractTableModel.headerData(self, section, orientation, role) - + def data(self, index, role=Qt.ItemDataRole.DisplayRole): """ Public method to get data from the model. - + @param index index of history entry to get data for (QModelIndex) @param role data role (integer) @return history entry data @@ -101,7 +97,7 @@ lst = self.__historyManager.history() if index.row() < 0 or index.row() > len(lst): return None - + itm = lst[index.row()] if role == self.DateTimeRole: return itm.dateTime @@ -122,49 +118,45 @@ return itm.url elif index.column() == 2: return itm.visitCount - elif ( - role == Qt.ItemDataRole.DecorationRole and - index.column() == 0 - ): - return WebBrowser.WebBrowserWindow.WebBrowserWindow.icon( - QUrl(itm.url)) - + elif role == Qt.ItemDataRole.DecorationRole and index.column() == 0: + return WebBrowser.WebBrowserWindow.WebBrowserWindow.icon(QUrl(itm.url)) + return None - + def columnCount(self, parent=None): """ Public method to get the number of columns. - + @param parent index of parent (QModelIndex) @return number of columns (integer) """ if parent is None: parent = QModelIndex() - + if parent.isValid(): return 0 else: return len(self.__headers) - + def rowCount(self, parent=None): """ Public method to determine the number of rows. - + @param parent index of parent (QModelIndex) @return number of rows (integer) """ if parent is None: parent = QModelIndex() - + if parent.isValid(): return 0 else: return len(self.__historyManager.history()) - + def removeRows(self, row, count, parent=None): """ Public method to remove history entries from the model. - + @param row row of the first history entry to remove (integer) @param count number of history entries to remove (integer) @param parent index of the parent entry (QModelIndex) @@ -172,10 +164,10 @@ """ if parent is None: parent = QModelIndex() - + if parent.isValid(): return False - + lastRow = row + count - 1 self.beginRemoveRows(parent, row, lastRow) lst = self.__historyManager.history()[:]