diff -r 27f636beebad -r 2c730d5fd177 eric6/WebBrowser/Bookmarks/BookmarksToolBar.py
--- a/eric6/WebBrowser/Bookmarks/BookmarksToolBar.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/WebBrowser/Bookmarks/BookmarksToolBar.py Tue Mar 02 17:17:09 2021 +0100
@@ -50,11 +50,11 @@
self.setRootIndex(model.nodeIndex(
self.__mw.bookmarksManager().toolbar()))
- self.setContextMenuPolicy(Qt.CustomContextMenu)
+ self.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
self.customContextMenuRequested.connect(self.__contextMenuRequested)
self.activated.connect(self.__bookmarkActivated)
- self.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
+ self.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
self._build()
@@ -135,25 +135,31 @@
@param idx index of the activated bookmark (QModelIndex)
"""
if idx.isValid():
- if self._mouseButton == Qt.XButton1:
+ if self._mouseButton == Qt.MouseButton.XButton1:
+ self.__mw.currentBrowser().triggerPageAction(
+ QWebEnginePage.WebAction.Back)
+ elif self._mouseButton == Qt.MouseButton.XButton2:
self.__mw.currentBrowser().triggerPageAction(
- QWebEnginePage.Back)
- elif self._mouseButton == Qt.XButton2:
- self.__mw.currentBrowser().triggerPageAction(
- QWebEnginePage.Forward)
- elif self._mouseButton == Qt.LeftButton:
- if self._keyboardModifiers & Qt.ControlModifier:
+ QWebEnginePage.WebAction.Forward)
+ elif self._mouseButton == Qt.MouseButton.LeftButton:
+ 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 __openBookmark(self, act):
@@ -167,7 +173,7 @@
self.openUrl.emit(
idx.data(BookmarksModel.UrlRole),
- idx.data(Qt.DisplayRole))
+ idx.data(Qt.ItemDataRole.DisplayRole))
self.__updateVisitCount(idx)
def __openBookmarkInNewTab(self, act):
@@ -181,7 +187,7 @@
self.newTab.emit(
idx.data(BookmarksModel.UrlRole),
- idx.data(Qt.DisplayRole))
+ idx.data(Qt.ItemDataRole.DisplayRole))
self.__updateVisitCount(idx)
def __openBookmarkInNewWindow(self, act):
@@ -195,7 +201,7 @@
self.newWindow.emit(
idx.data(BookmarksModel.UrlRole),
- idx.data(Qt.DisplayRole))
+ idx.data(Qt.ItemDataRole.DisplayRole))
self.__updateVisitCount(idx)
def __openBookmarkInPrivateWindow(self, act):
