Mercurial Repositories > eric / changeset

--- a/Helpviewer/Bookmarks/BookmarksImporters/ChromeImporter.py	Sun Mar 18 19:30:29 2012 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/ChromeImporter.py	Mon Mar 19 19:24:12 2012 +0100
@@ -152,7 +152,7 @@
         @param rootNode node to add the bookmarks to (BookmarkNode)
         """
         folder = BookmarkNode(BookmarkNode.Folder, rootNode)
-        folder.title = data["name"]
+        folder.title = data["name"].replace("&", "&&")
         for node in data["children"]:
             if node["type"] == "folder":
                 self.__generateFolderNode(node, folder)
@@ -168,4 +168,4 @@
         """
         bookmark = BookmarkNode(BookmarkNode.Bookmark, rootNode)
         bookmark.url = data["url"]
-        bookmark.title = data["name"]
+        bookmark.title = data["name"].replace("&", "&&")

--- a/Helpviewer/Bookmarks/BookmarksImporters/FirefoxImporter.py	Sun Mar 18 19:30:29 2012 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/FirefoxImporter.py	Mon Mar 19 19:24:12 2012 +0100
@@ -118,7 +118,7 @@
                 folder = BookmarkNode(BookmarkNode.Folder, folders[parent])
             else:
                 folder = BookmarkNode(BookmarkNode.Folder, importRootNode)
-            folder.title = title
+            folder.title = title.replace("&", "&&")
             folders[id_] = folder
         
         query = QSqlQuery(self.__db)
@@ -144,7 +144,7 @@
             else:
                 bookmark = BookmarkNode(BookmarkNode.Bookmark, importRootNode)
             bookmark.url = url.toString()
-            bookmark.title = title
+            bookmark.title = title.replace("&", "&&")
         
         if query.lastError().isValid():
             self._error = True

--- a/Helpviewer/Bookmarks/BookmarksImporters/OperaImporter.py	Sun Mar 18 19:30:29 2012 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/OperaImporter.py	Mon Mar 19 19:24:12 2012 +0100
@@ -114,7 +114,7 @@
             elif line == "-":
                 folderStack.pop()
             elif line.startswith("NAME="):
-                node.title = line.replace("NAME=", "")
+                node.title = line.replace("NAME=", "").replace("&", "&&")
             elif line.startswith("URL="):
                 node.url = line.replace("URL=", "")
         

--- a/Helpviewer/Bookmarks/BookmarksImporters/__init__.py	Sun Mar 18 19:30:29 2012 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/__init__.py	Mon Mar 19 19:24:12 2012 +0100
@@ -44,7 +44,7 @@
          QCoreApplication.translate("BookmarksImporters", "HTML File"),
          "html"))
     return importers
-    # TODO: importers for Safari, IE
+    # TODO: importers for Safari
 
 
 def getImporterInfo(id):