diff -r 0b936ff1bbb9 -r a2bc06a54d9d src/eric7/WebBrowser/Bookmarks/BookmarksDialog.py
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksDialog.py Sun Nov 06 11:22:39 2022 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/BookmarksDialog.py Mon Nov 07 17:19:58 2022 +0100
@@ -12,6 +12,7 @@
from PyQt6.QtWidgets import QApplication, QDialog, QInputDialog, QLineEdit, QMenu
from eric7.EricCore.EricTreeSortFilterProxyModel import EricTreeSortFilterProxyModel
+from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
from .Ui_BookmarksDialog import Ui_BookmarksDialog
@@ -46,8 +47,6 @@
self.__bookmarksManager = manager
if self.__bookmarksManager is None:
- from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
-
self.__bookmarksManager = WebBrowserWindow.bookmarksManager()
self.__bookmarksModel = self.__bookmarksManager.bookmarksModel()
@@ -60,10 +59,7 @@
self.bookmarksTree.setModel(self.__proxyModel)
self.bookmarksTree.setExpanded(self.__proxyModel.index(0, 0), True)
fm = QFontMetrics(self.font())
- try:
- header = fm.horizontalAdvance("m") * 40
- except AttributeError:
- header = fm.width("m") * 40
+ header = fm.horizontalAdvance("m") * 40
self.bookmarksTree.header().resizeSection(0, header)
self.bookmarksTree.header().setStretchLastSection(True)
self.bookmarksTree.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
@@ -258,8 +254,6 @@
return
if newWindow:
- from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
-
url = idx.sibling(idx.row(), 1).data(BookmarksModel.UrlRole)
if privateWindow:
WebBrowserWindow.mainWindow().newPrivateWindow(url)
