diff -r 27f636beebad -r 2c730d5fd177 eric6/WebBrowser/Bookmarks/BookmarksMenu.py
--- a/eric6/WebBrowser/Bookmarks/BookmarksMenu.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/WebBrowser/Bookmarks/BookmarksMenu.py Tue Mar 02 17:17:09 2021 +0100
@@ -44,7 +44,7 @@
self.setStatusBarTextRole(BookmarksModel.UrlStringRole)
self.setSeparatorRole(BookmarksModel.SeparatorRole)
- self.setContextMenuPolicy(Qt.CustomContextMenu)
+ self.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
self.customContextMenuRequested.connect(self.__contextMenuRequested)
def createBaseMenu(self):
@@ -77,18 +77,18 @@
@param idx index of the activated item (QModelIndex)
"""
- if self._keyboardModifiers & Qt.ControlModifier:
+ if self._keyboardModifiers & Qt.KeyboardModifier.ControlModifier:
self.newTab.emit(
idx.data(BookmarksModel.UrlRole),
- idx.data(Qt.DisplayRole))
- elif self._keyboardModifiers & Qt.ShiftModifier:
+ idx.data(Qt.ItemDataRole.DisplayRole))
+ elif self._keyboardModifiers & Qt.KeyboardModifier.ShiftModifier:
self.newWindow.emit(
idx.data(BookmarksModel.UrlRole),
- idx.data(Qt.DisplayRole))
+ idx.data(Qt.ItemDataRole.DisplayRole))
else:
self.openUrl.emit(
idx.data(BookmarksModel.UrlRole),
- idx.data(Qt.DisplayRole))
+ idx.data(Qt.ItemDataRole.DisplayRole))
self.__updateVisitCount(idx)
def postPopulated(self):
@@ -140,11 +140,11 @@
if i == 0:
self.openUrl.emit(
child.data(BookmarksModel.UrlRole),
- child.data(Qt.DisplayRole))
+ child.data(Qt.ItemDataRole.DisplayRole))
else:
self.newTab.emit(
child.data(BookmarksModel.UrlRole),
- child.data(Qt.DisplayRole))
+ child.data(Qt.ItemDataRole.DisplayRole))
self.__updateVisitCount(child)
def __contextMenuRequested(self, pos):
@@ -209,7 +209,7 @@
self.openUrl.emit(
idx.data(BookmarksModel.UrlRole),
- idx.data(Qt.DisplayRole))
+ idx.data(Qt.ItemDataRole.DisplayRole))
self.__updateVisitCount(idx)
def __openBookmarkInNewTab(self, act):
@@ -223,7 +223,7 @@
self.newTab.emit(
idx.data(BookmarksModel.UrlRole),
- idx.data(Qt.DisplayRole))
+ idx.data(Qt.ItemDataRole.DisplayRole))
self.__updateVisitCount(idx)
def __openBookmarkInNewWindow(self, act):
