Mercurial Repositories > eric / file diff

--- a/Helpviewer/Bookmarks/BookmarksManager.py	Fri Oct 18 23:00:41 2013 +0200
+++ b/Helpviewer/Bookmarks/BookmarksManager.py	Fri Nov 01 15:48:48 2013 +0100
@@ -12,8 +12,7 @@
 import os
 
 from PyQt4.QtCore import pyqtSignal, Qt, QT_TRANSLATE_NOOP, QObject, QFile, \
-    QByteArray, QBuffer, QIODevice, QXmlStreamReader, QDate, QDateTime, \
-    QFileInfo, QUrl
+    QIODevice, QXmlStreamReader, QDate, QDateTime, QFileInfo, QUrl
 from PyQt4.QtGui import QUndoStack, QUndoCommand, QApplication, QDialog
 
 from E5Gui import E5MessageBox, E5FileDialog
@@ -129,16 +128,16 @@
         
         bookmarkFile = self.getFileName()
         if not QFile.exists(bookmarkFile):
-            from .DefaultBookmarks import DefaultBookmarks
-            ba = QByteArray(DefaultBookmarks)
-            bookmarkFile = QBuffer(ba)
+            from . import DefaultBookmarks_rc       # __IGNORE_WARNING__
+            bookmarkFile = QFile(":/DefaultBookmarks.xbel")
             bookmarkFile.open(QIODevice.ReadOnly)
         
         from .XbelReader import XbelReader
         reader = XbelReader()
         self.__bookmarkRootNode = reader.read(bookmarkFile)
         if reader.error() != QXmlStreamReader.NoError:
-            E5MessageBox.warning(None,
+            E5MessageBox.warning(
+                None,
                 self.trUtf8("Loading Bookmarks"),
                 self.trUtf8(
                     """Error when loading bookmarks on line {0},"""
@@ -204,7 +203,8 @@
         self.__menu.title = BOOKMARKMENU
         self.__toolbar.title = BOOKMARKBAR
         if not writer.write(bookmarkFile, self.__bookmarkRootNode):
-            E5MessageBox.warning(None,
+            E5MessageBox.warning(
+                None,
                 self.trUtf8("Saving Bookmarks"),
                 self.trUtf8("""Error saving bookmarks to <b>{0}</b>.""")\
                     .format(bookmarkFile))
@@ -389,7 +389,8 @@
             from .XbelWriter import XbelWriter
             writer = XbelWriter()
         if not writer.write(fileName, self.__bookmarkRootNode):
-            E5MessageBox.critical(None,
+            E5MessageBox.critical(
+                None,
                 self.trUtf8("Exporting Bookmarks"),
                 self.trUtf8("""Error exporting bookmarks to <b>{0}</b>.""")\
                     .format(fileName))