Mercurial Repositories > eric / file diff

--- a/src/eric7/WebBrowser/Bookmarks/BookmarksDialog.py	Fri Jan 05 16:04:03 2024 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/BookmarksDialog.py	Sat Jan 06 15:21:02 2024 +0100
@@ -143,14 +143,14 @@
         @param pos position the context menu was requested
         @type QPoint
         """
-        from .BookmarkNode import BookmarkNode
+        from .BookmarkNode import BookmarkNodeType
 
         menu = QMenu()
         idx = self.bookmarksTree.indexAt(pos)
         idx = idx.sibling(idx.row(), 0)
         sourceIndex = self.__proxyModel.mapToSource(idx)
         node = self.__bookmarksModel.node(sourceIndex)
-        if idx.isValid() and node.type() != BookmarkNode.Folder:
+        if idx.isValid() and node.type() != BookmarkNodeType.Folder:
             menu.addAction(self.tr("&Open"), self.__openBookmarkInCurrentTab)
             menu.addAction(self.tr("Open in New &Tab"), self.__openBookmarkInNewTab)
             menu.addAction(
@@ -169,7 +169,7 @@
         act.setEnabled(
             idx.flags() & Qt.ItemFlag.ItemIsEditable == Qt.ItemFlag.ItemIsEditable
         )
-        if idx.isValid() and node.type() != BookmarkNode.Folder:
+        if idx.isValid() and node.type() != BookmarkNodeType.Folder:
             menu.addAction(self.tr("Edit &Address"), self.__editAddress)
         menu.addSeparator()
         act = menu.addAction(self.tr("&Delete"), self.bookmarksTree.removeSelected)
@@ -181,7 +181,7 @@
         act.setEnabled(
             idx.flags() & Qt.ItemFlag.ItemIsEditable == Qt.ItemFlag.ItemIsEditable
         )
-        if idx.isValid() and node.type() == BookmarkNode.Folder:
+        if idx.isValid() and node.type() == BookmarkNodeType.Folder:
             menu.addSeparator()
             menu.addAction(self.tr("New &Folder..."), self.__newFolder)
         menu.exec(QCursor.pos())
@@ -248,7 +248,7 @@
             background tab
         @type bool
         """
-        from .BookmarkNode import BookmarkNode
+        from .BookmarkNode import BookmarkNodeType
         from .BookmarksModel import BookmarksModel
 
         idx = self.bookmarksTree.currentIndex()
@@ -257,7 +257,7 @@
         if (
             not idx.parent().isValid()
             or node is None
-            or node.type() == BookmarkNode.Folder
+            or node.type() == BookmarkNodeType.Folder
         ):
             return
 
@@ -318,7 +318,7 @@
         """
         Private slot to add a new bookmarks folder.
         """
-        from .BookmarkNode import BookmarkNode
+        from .BookmarkNode import BookmarkNode, BookmarkNodeType
 
         currentIndex = self.bookmarksTree.currentIndex()
         idx = QModelIndex(currentIndex)
@@ -326,7 +326,7 @@
         sourceNode = self.__bookmarksModel.node(sourceIndex)
         row = -1  # append new folder as the last item per default
 
-        if sourceNode is not None and sourceNode.type() != BookmarkNode.Folder:
+        if sourceNode is not None and sourceNode.type() != BookmarkNodeType.Folder:
             # If the selected item is not a folder, add a new folder to the
             # parent folder, but directly below the selected item.
             idx = idx.parent()
@@ -348,6 +348,6 @@
         if ok:
             if not title:
                 title = self.tr("New Folder")
-            node = BookmarkNode(BookmarkNode.Folder)
+            node = BookmarkNode(BookmarkNodeType.Folder)
             node.title = title
             self.__bookmarksManager.addBookmark(parent, node, row)