diff -r 27f636beebad -r 2c730d5fd177 eric6/WebBrowser/Bookmarks/BookmarksDialog.py
--- a/eric6/WebBrowser/Bookmarks/BookmarksDialog.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/WebBrowser/Bookmarks/BookmarksDialog.py Tue Mar 02 17:17:09 2021 +0100
@@ -43,7 +43,7 @@
"""
super(BookmarksDialog, self).__init__(parent)
self.setupUi(self)
- self.setWindowFlags(Qt.Window)
+ self.setWindowFlags(Qt.WindowType.Window)
self.__bookmarksManager = manager
if self.__bookmarksManager is None:
@@ -69,7 +69,8 @@
header = fm.width("m") * 40
self.bookmarksTree.header().resizeSection(0, header)
self.bookmarksTree.header().setStretchLastSection(True)
- self.bookmarksTree.setContextMenuPolicy(Qt.CustomContextMenu)
+ self.bookmarksTree.setContextMenuPolicy(
+ Qt.ContextMenuPolicy.CustomContextMenu)
self.bookmarksTree.activated.connect(self.__activated)
self.bookmarksTree.customContextMenuRequested.connect(
@@ -166,16 +167,16 @@
self.__openBookmarkInPrivateWindow)
menu.addSeparator()
act = menu.addAction(self.tr("Edit &Name"), self.__editName)
- act.setEnabled(idx.flags() & Qt.ItemIsEditable)
+ act.setEnabled(idx.flags() & Qt.ItemFlag.ItemIsEditable)
if idx.isValid() and node.type() != BookmarkNode.Folder:
menu.addAction(self.tr("Edit &Address"), self.__editAddress)
menu.addSeparator()
act = menu.addAction(
self.tr("&Delete"), self.bookmarksTree.removeSelected)
- act.setEnabled(idx.flags() & Qt.ItemIsDragEnabled)
+ act.setEnabled(idx.flags() & Qt.ItemFlag.ItemIsDragEnabled)
menu.addSeparator()
act = menu.addAction(self.tr("&Properties..."), self.__edit)
- act.setEnabled(idx.flags() & Qt.ItemIsEditable)
+ act.setEnabled(idx.flags() & Qt.ItemFlag.ItemIsEditable)
if idx.isValid() and node.type() == BookmarkNode.Folder:
menu.addSeparator()
menu.addAction(self.tr("New &Folder..."), self.__newFolder)
@@ -187,9 +188,15 @@
@param idx reference to the entry index (QModelIndex)
"""
- if QApplication.keyboardModifiers() & Qt.ControlModifier:
+ if (
+ QApplication.keyboardModifiers() &
+ Qt.KeyboardModifier.ControlModifier
+ ):
self.__openBookmarkInNewTab()
- elif QApplication.keyboardModifiers() & Qt.ShiftModifier:
+ elif (
+ QApplication.keyboardModifiers() &
+ Qt.KeyboardModifier.ShiftModifier
+ ):
self.__openBookmarkInNewWindow()
else:
self.__openBookmarkInCurrentTab()
@@ -264,16 +271,22 @@
if newTab:
if background:
self.newBackgroundTab.emit(
- idx.sibling(idx.row(), 1).data(BookmarksModel.UrlRole),
- idx.sibling(idx.row(), 0).data(Qt.DisplayRole))
+ idx.sibling(idx.row(), 1).data(
+ BookmarksModel.UrlRole),
+ idx.sibling(idx.row(), 0).data(
+ Qt.ItemDataRole.DisplayRole))
else:
self.newTab.emit(
- idx.sibling(idx.row(), 1).data(BookmarksModel.UrlRole),
- idx.sibling(idx.row(), 0).data(Qt.DisplayRole))
+ idx.sibling(idx.row(), 1).data(
+ BookmarksModel.UrlRole),
+ idx.sibling(idx.row(), 0).data(
+ Qt.ItemDataRole.DisplayRole))
else:
self.openUrl.emit(
- idx.sibling(idx.row(), 1).data(BookmarksModel.UrlRole),
- idx.sibling(idx.row(), 0).data(Qt.DisplayRole))
+ idx.sibling(idx.row(), 1).data(
+ BookmarksModel.UrlRole),
+ idx.sibling(idx.row(), 0).data(
+ Qt.ItemDataRole.DisplayRole))
self.__bookmarksManager.incVisitCount(node)
def __editName(self):
@@ -335,7 +348,7 @@
self,
self.tr("New Bookmark Folder"),
self.tr("Enter title for new bookmark folder:"),
- QLineEdit.Normal)
+ QLineEdit.EchoMode.Normal)
if ok:
if not title:
