--- a/Helpviewer/Bookmarks/BookmarksManager.py Sun Feb 10 15:26:21 2013 +0100 +++ b/Helpviewer/Bookmarks/BookmarksManager.py Sun Feb 10 18:31:31 2013 +0100 @@ -16,12 +16,6 @@ from E5Gui import E5MessageBox, E5FileDialog from .BookmarkNode import BookmarkNode -from .BookmarksModel import BookmarksModel -from .DefaultBookmarks import DefaultBookmarks -from .XbelReader import XbelReader -from .XbelWriter import XbelWriter -from .NsHtmlWriter import NsHtmlWriter -from .BookmarksImportDialog import BookmarksImportDialog from Utilities.AutoSaver import AutoSaver import Utilities @@ -126,10 +120,12 @@ bookmarkFile = self.getFileName() if not QFile.exists(bookmarkFile): + from .DefaultBookmarks import DefaultBookmarks ba = QByteArray(DefaultBookmarks) bookmarkFile = QBuffer(ba) bookmarkFile.open(QIODevice.ReadOnly) + from .XbelReader import XbelReader reader = XbelReader() self.__bookmarkRootNode = reader.read(bookmarkFile) if reader.error() != QXmlStreamReader.NoError: @@ -187,6 +183,7 @@ if not self.__loaded: return + from .XbelWriter import XbelWriter writer = XbelWriter() bookmarkFile = self.getFileName() @@ -331,6 +328,7 @@ @return reference to the bookmarks model (BookmarksModel) """ if self.__bookmarksModel is None: + from .BookmarksModel import BookmarksModel self.__bookmarksModel = BookmarksModel(self, self) return self.__bookmarksModel @@ -338,6 +336,7 @@ """ Public method to import bookmarks. """ + from .BookmarksImportDialog import BookmarksImportDialog dlg = BookmarksImportDialog() if dlg.exec_() == QDialog.Accepted: importRootNode = dlg.getImportedBookmarks() @@ -366,8 +365,10 @@ ext = QFileInfo(fileName).suffix() if ext == "html": + from .NsHtmlWriter import NsHtmlWriter writer = NsHtmlWriter() else: + from .XbelWriter import XbelWriter writer = XbelWriter() if not writer.write(fileName, self.__bookmarkRootNode): E5MessageBox.critical(None,