Mercurial Repositories > eric / file comparison
comparison: Helpviewer/Bookmarks/BookmarksManager.py
Helpviewer/Bookmarks/BookmarksManager.py
- changeset 7
- c679fb30c8f3
- parent 0
- de9c2efb9d02
- child 12
- 1d8dd9706f46
equal
deleted
inserted
replaced
| 6:52e8c820d0dd | 7:c679fb30c8f3 |
|---|---|
| 347 .format(fileName)) | 347 .format(fileName)) |
| 348 return | 348 return |
| 349 | 349 |
| 350 webpage = QWebPage() | 350 webpage = QWebPage() |
| 351 webpage.mainFrame().setHtml(unicode(inFile.readAll())) | 351 webpage.mainFrame().setHtml(unicode(inFile.readAll())) |
| 352 result = webpage.mainFrame().evaluateJavaScript(extract_js).toByteArray() | 352 result = webpage.mainFrame().evaluateJavaScript(extract_js) |
| 353 buffer_ = QBuffer(result) | 353 buffer_ = QBuffer(result) |
| 354 buffer_.open(QIODevice.ReadOnly) | 354 buffer_.open(QIODevice.ReadOnly) |
| 355 importRootNode = reader.read(buffer_) | 355 importRootNode = reader.read(buffer_) |
| 356 else: | 356 else: |
| 357 importRootNode = reader.read(fileName) | 357 importRootNode = reader.read(fileName) |
| 395 Private method to convert the old bookmarks into the new ones. | 395 Private method to convert the old bookmarks into the new ones. |
| 396 """ | 396 """ |
| 397 bmNames = Preferences.Prefs.settings.value('Bookmarks/Names') | 397 bmNames = Preferences.Prefs.settings.value('Bookmarks/Names') |
| 398 bmFiles = Preferences.Prefs.settings.value('Bookmarks/Files') | 398 bmFiles = Preferences.Prefs.settings.value('Bookmarks/Files') |
| 399 | 399 |
| 400 if bmNames.isValid() and bmFiles.isValid(): | 400 if bmNames is not None and bmFiles is not None: |
| 401 bmNames = bmNames.toStringList() | |
| 402 bmFiles = bmFiles.toStringList() | |
| 403 if len(bmNames) == len(bmFiles): | 401 if len(bmNames) == len(bmFiles): |
| 404 convertedRootNode = BookmarkNode(BookmarkNode.Folder) | 402 convertedRootNode = BookmarkNode(BookmarkNode.Folder) |
| 405 convertedRootNode.title = self.trUtf8("Converted {0}")\ | 403 convertedRootNode.title = self.trUtf8("Converted {0}")\ |
| 406 .format(QDate.currentDate().toString(Qt.SystemLocaleShortDate)) | 404 .format(QDate.currentDate().toString(Qt.SystemLocaleShortDate)) |
| 407 for i in range(len(bmNames)): | 405 for i in range(len(bmNames)): |
