Mercurial Repositories > eric / file diff

diff -r 9aea3575bd16 -r 72d9b5ea39b4 src/eric7/WebBrowser/Bookmarks/BookmarksManager.py
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksManager.py	Fri Jan 05 16:04:03 2024 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/BookmarksManager.py	Sat Jan 06 15:21:02 2024 +0100
@@ -29,7 +29,7 @@
 from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.Utilities.AutoSaver import AutoSaver
 
-from .BookmarkNode import BookmarkNode
+from .BookmarkNode import BookmarkNode, BookmarkNodeType, BookmarkTimestampType
 
 BOOKMARKBAR = QT_TRANSLATE_NOOP("BookmarksManager", "Bookmarks Bar")
 BOOKMARKMENU = QT_TRANSLATE_NOOP("BookmarksManager", "Bookmarks Menu")
@@ -164,7 +164,7 @@
         others = []
         for index in range(len(self.__bookmarkRootNode.children()) - 1, -1, -1):
             node = self.__bookmarkRootNode.children()[index]
-            if node.type() == BookmarkNode.Folder:
+            if node.type() == BookmarkNodeType.Folder:
                 if (
                     node.title == self.tr("Toolbar Bookmarks")
                     or node.title == BOOKMARKBAR
@@ -185,13 +185,15 @@
             raise RuntimeError("Error loading bookmarks.")
 
         if self.__toolbar is None:
-            self.__toolbar = BookmarkNode(BookmarkNode.Folder, self.__bookmarkRootNode)
+            self.__toolbar = BookmarkNode(
+                BookmarkNodeType.Folder, self.__bookmarkRootNode
+            )
             self.__toolbar.title = self.tr(BOOKMARKBAR)
         else:
             self.__bookmarkRootNode.add(self.__toolbar)
 
         if self.__menu is None:
-            self.__menu = BookmarkNode(BookmarkNode.Folder, self.__bookmarkRootNode)
+            self.__menu = BookmarkNode(BookmarkNodeType.Folder, self.__bookmarkRootNode)
             self.__menu.title = self.tr(BOOKMARKMENU)
         else:
             self.__bookmarkRootNode.add(self.__menu)
@@ -243,7 +245,9 @@
         if not self.__loaded:
             return
 
-        self.setTimestamp(node, BookmarkNode.TsAdded, QDateTime.currentDateTime())
+        self.setTimestamp(
+            node, BookmarkTimestampType.Added, QDateTime.currentDateTime()
+        )
 
         command = InsertBookmarksCommand(self, parent, node, row)
         self.__commands.push(command)
@@ -307,20 +311,18 @@
         @param node reference to the node to be changed
         @type BookmarkNode
         @param timestampType type of the timestamp to set
-            (BookmarkNode.TsAdded, BookmarkNode.TsModified,
-            BookmarkNode.TsVisited)
-        @type int
+        @type BookmarkTimestampType
         @param timestamp timestamp to set
         @type QDateTime
         """
         if not self.__loaded:
             return
 
-        if timestampType == BookmarkNode.TsAdded:
+        if timestampType == BookmarkTimestampType.Added:
             node.added = timestamp
-        elif timestampType == BookmarkNode.TsModified:
+        elif timestampType == BookmarkTimestampType.Modified:
             node.modified = timestamp
-        elif timestampType == BookmarkNode.TsVisited:
+        elif timestampType == BookmarkTimestampType.Visited:
             node.visited = timestamp
         self.__saveTimer.changeOccurred()
 
@@ -502,9 +504,9 @@
         """
         bm = None
         for node in startNode.children():
-            if node.type() == BookmarkNode.Folder:
+            if node.type() == BookmarkNodeType.Folder:
                 bm = self.__searchBookmark(url, node)
-            elif node.type() == BookmarkNode.Bookmark and node.url == url:
+            elif node.type() == BookmarkNodeType.Bookmark and node.url == url:
                 bm = node
             if bm is not None:
                 return bm
@@ -549,9 +551,9 @@
         """
         bm = []
         for node in startNode.children():
-            if node.type() == BookmarkNode.Folder:
+            if node.type() == BookmarkNodeType.Folder:
                 bm.extend(self.__searchBookmarks(url, node))
-            elif node.type() == BookmarkNode.Bookmark and node.url == url:
+            elif node.type() == BookmarkNodeType.Bookmark and node.url == url:
                 bm.append(node)
         return bm