diff -r e9e7eca7efee -r bf71ee032bb4 src/eric7/WebBrowser/Bookmarks/BookmarksDialog.py
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksDialog.py Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/WebBrowser/Bookmarks/BookmarksDialog.py Wed Jul 13 14:55:47 2022 +0200
@@ -9,9 +9,7 @@
from PyQt6.QtCore import pyqtSignal, Qt, QUrl, QModelIndex
from PyQt6.QtGui import QFontMetrics, QCursor
-from PyQt6.QtWidgets import (
- QDialog, QMenu, QApplication, QInputDialog, QLineEdit
-)
+from PyQt6.QtWidgets import QDialog, QMenu, QApplication, QInputDialog, QLineEdit
from EricCore.EricTreeSortFilterProxyModel import EricTreeSortFilterProxyModel
@@ -21,22 +19,23 @@
class BookmarksDialog(QDialog, Ui_BookmarksDialog):
"""
Class implementing a dialog to manage bookmarks.
-
+
@signal openUrl(QUrl, str) emitted to open a URL in the current tab
@signal newTab(QUrl, str) emitted to open a URL in a new tab
@signal newBackgroundTab(QUrl, str) emitted to open a URL in a new
background tab
@signal newWindow(QUrl, str) emitted to open a URL in a new window
"""
+
openUrl = pyqtSignal(QUrl, str)
newTab = pyqtSignal(QUrl, str)
newBackgroundTab = pyqtSignal(QUrl, str)
newWindow = pyqtSignal(QUrl, str)
-
+
def __init__(self, parent=None, manager=None):
"""
Constructor
-
+
@param parent reference to the parent widget (QWidget
@param manager reference to the bookmarks manager object
(BookmarksManager)
@@ -44,22 +43,22 @@
super().__init__(parent)
self.setupUi(self)
self.setWindowFlags(Qt.WindowType.Window)
-
+
self.__bookmarksManager = manager
if self.__bookmarksManager is None:
import WebBrowser.WebBrowserWindow
+
self.__bookmarksManager = (
WebBrowser.WebBrowserWindow.WebBrowserWindow.bookmarksManager()
)
-
+
self.__bookmarksModel = self.__bookmarksManager.bookmarksModel()
self.__proxyModel = EricTreeSortFilterProxyModel(self)
self.__proxyModel.setFilterKeyColumn(-1)
self.__proxyModel.setSourceModel(self.__bookmarksModel)
-
- self.searchEdit.textChanged.connect(
- self.__proxyModel.setFilterFixedString)
-
+
+ self.searchEdit.textChanged.connect(self.__proxyModel.setFilterFixedString)
+
self.bookmarksTree.setModel(self.__proxyModel)
self.bookmarksTree.setExpanded(self.__proxyModel.index(0, 0), True)
fm = QFontMetrics(self.font())
@@ -69,45 +68,44 @@
header = fm.width("m") * 40
self.bookmarksTree.header().resizeSection(0, header)
self.bookmarksTree.header().setStretchLastSection(True)
- self.bookmarksTree.setContextMenuPolicy(
- Qt.ContextMenuPolicy.CustomContextMenu)
-
+ self.bookmarksTree.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
+
self.bookmarksTree.activated.connect(self.__activated)
self.bookmarksTree.customContextMenuRequested.connect(
- self.__customContextMenuRequested)
-
- self.removeButton.clicked.connect(
- self.bookmarksTree.removeSelected)
+ self.__customContextMenuRequested
+ )
+
+ self.removeButton.clicked.connect(self.bookmarksTree.removeSelected)
self.addFolderButton.clicked.connect(self.__newFolder)
-
+
self.__expandNodes(self.__bookmarksManager.bookmarks())
-
+
def closeEvent(self, evt):
"""
Protected method to handle the closing of the dialog.
-
+
@param evt reference to the event object (QCloseEvent) (ignored)
"""
self.__shutdown()
-
+
def reject(self):
"""
Public method called when the dialog is rejected.
"""
self.__shutdown()
super().reject()
-
+
def __shutdown(self):
"""
Private method to perform shutdown actions for the dialog.
"""
if self.__saveExpandedNodes(self.bookmarksTree.rootIndex()):
self.__bookmarksManager.changeExpanded()
-
+
def __saveExpandedNodes(self, parent):
"""
Private method to save the child nodes of an expanded node.
-
+
@param parent index of the parent node (QModelIndex)
@return flag indicating a change (boolean)
"""
@@ -122,14 +120,14 @@
changed |= self.__saveExpandedNodes(child)
else:
childNode.expanded = False
- changed |= (wasExpanded != childNode.expanded)
-
+ changed |= wasExpanded != childNode.expanded
+
return changed
-
+
def __expandNodes(self, node):
"""
Private method to expand all child nodes of a node.
-
+
@param node reference to the bookmark node to expand (BookmarkNode)
"""
for childNode in node.children():
@@ -138,107 +136,105 @@
idx = self.__proxyModel.mapFromSource(idx)
self.bookmarksTree.setExpanded(idx, True)
self.__expandNodes(childNode)
-
+
def __customContextMenuRequested(self, pos):
"""
Private slot to handle the context menu request for the bookmarks tree.
-
+
@param pos position the context menu was requested (QPoint)
"""
from .BookmarkNode import BookmarkNode
-
+
menu = QMenu()
idx = self.bookmarksTree.indexAt(pos)
idx = idx.sibling(idx.row(), 0)
sourceIndex = self.__proxyModel.mapToSource(idx)
node = self.__bookmarksModel.node(sourceIndex)
if idx.isValid() and node.type() != BookmarkNode.Folder:
- menu.addAction(
- self.tr("&Open"), self.__openBookmarkInCurrentTab)
- menu.addAction(
- self.tr("Open in New &Tab"), self.__openBookmarkInNewTab)
+ menu.addAction(self.tr("&Open"), self.__openBookmarkInCurrentTab)
+ menu.addAction(self.tr("Open in New &Tab"), self.__openBookmarkInNewTab)
menu.addAction(
self.tr("Open in New &Background Tab"),
- self.__openBookmarkInNewBackgroundTab)
+ self.__openBookmarkInNewBackgroundTab,
+ )
menu.addAction(
- self.tr("Open in New &Window"), self.__openBookmarkInNewWindow)
+ self.tr("Open in New &Window"), self.__openBookmarkInNewWindow
+ )
menu.addAction(
self.tr("Open in New Pri&vate Window"),
- self.__openBookmarkInPrivateWindow)
+ self.__openBookmarkInPrivateWindow,
+ )
menu.addSeparator()
act = menu.addAction(self.tr("Edit &Name"), self.__editName)
- act.setEnabled(idx.flags() & Qt.ItemFlag.ItemIsEditable ==
- Qt.ItemFlag.ItemIsEditable)
+ act.setEnabled(
+ idx.flags() & Qt.ItemFlag.ItemIsEditable == Qt.ItemFlag.ItemIsEditable
+ )
if idx.isValid() and node.type() != BookmarkNode.Folder:
menu.addAction(self.tr("Edit &Address"), self.__editAddress)
menu.addSeparator()
- act = menu.addAction(
- self.tr("&Delete"), self.bookmarksTree.removeSelected)
- act.setEnabled(idx.flags() & Qt.ItemFlag.ItemIsDragEnabled ==
- Qt.ItemFlag.ItemIsDragEnabled)
+ act = menu.addAction(self.tr("&Delete"), self.bookmarksTree.removeSelected)
+ act.setEnabled(
+ idx.flags() & Qt.ItemFlag.ItemIsDragEnabled == Qt.ItemFlag.ItemIsDragEnabled
+ )
menu.addSeparator()
act = menu.addAction(self.tr("&Properties..."), self.__edit)
- act.setEnabled(idx.flags() & Qt.ItemFlag.ItemIsEditable ==
- Qt.ItemFlag.ItemIsEditable)
+ act.setEnabled(
+ idx.flags() & Qt.ItemFlag.ItemIsEditable == Qt.ItemFlag.ItemIsEditable
+ )
if idx.isValid() and node.type() == BookmarkNode.Folder:
menu.addSeparator()
menu.addAction(self.tr("New &Folder..."), self.__newFolder)
menu.exec(QCursor.pos())
-
+
def __activated(self, idx):
"""
Private slot to handle the activation of an entry.
-
+
@param idx reference to the entry index (QModelIndex)
"""
- if (
- QApplication.keyboardModifiers() &
- Qt.KeyboardModifier.ControlModifier
- ):
+ if QApplication.keyboardModifiers() & Qt.KeyboardModifier.ControlModifier:
self.__openBookmarkInNewTab()
- elif (
- QApplication.keyboardModifiers() &
- Qt.KeyboardModifier.ShiftModifier
- ):
+ elif QApplication.keyboardModifiers() & Qt.KeyboardModifier.ShiftModifier:
self.__openBookmarkInNewWindow()
else:
self.__openBookmarkInCurrentTab()
-
+
def __openBookmarkInCurrentTab(self):
"""
Private slot to open a bookmark in the current browser tab.
"""
self.__openBookmark()
-
+
def __openBookmarkInNewTab(self):
"""
Private slot to open a bookmark in a new browser tab.
"""
self.__openBookmark(newTab=True)
-
+
def __openBookmarkInNewBackgroundTab(self):
"""
Private slot to open a bookmark in a new browser tab.
"""
self.__openBookmark(newTab=True, background=True)
-
+
def __openBookmarkInNewWindow(self):
"""
Private slot to open a bookmark in a new browser window.
"""
self.__openBookmark(newWindow=True)
-
+
def __openBookmarkInPrivateWindow(self):
"""
Private slot to open a bookmark in a new private browser window.
"""
self.__openBookmark(newWindow=True, privateWindow=True)
-
- def __openBookmark(self, newTab=False, newWindow=False,
- privateWindow=False, background=False):
+
+ def __openBookmark(
+ self, newTab=False, newWindow=False, privateWindow=False, background=False
+ ):
"""
Private method to open a bookmark.
-
+
@param newTab flag indicating to open the bookmark in a new tab
@type bool
@param newWindow flag indicating to open the bookmark in a new window
@@ -252,19 +248,20 @@
"""
from .BookmarkNode import BookmarkNode
from .BookmarksModel import BookmarksModel
-
+
idx = self.bookmarksTree.currentIndex()
sourceIndex = self.__proxyModel.mapToSource(idx)
node = self.__bookmarksModel.node(sourceIndex)
if (
- not idx.parent().isValid() or
- node is None or
- node.type() == BookmarkNode.Folder
+ not idx.parent().isValid()
+ or node is None
+ or node.type() == BookmarkNode.Folder
):
return
-
+
if newWindow:
from WebBrowser.WebBrowserWindow import WebBrowserWindow
+
url = idx.sibling(idx.row(), 1).data(BookmarksModel.UrlRole)
if privateWindow:
WebBrowserWindow.mainWindow().newPrivateWindow(url)
@@ -274,24 +271,21 @@
if newTab:
if background:
self.newBackgroundTab.emit(
- idx.sibling(idx.row(), 1).data(
- BookmarksModel.UrlRole),
- idx.sibling(idx.row(), 0).data(
- Qt.ItemDataRole.DisplayRole))
+ idx.sibling(idx.row(), 1).data(BookmarksModel.UrlRole),
+ idx.sibling(idx.row(), 0).data(Qt.ItemDataRole.DisplayRole),
+ )
else:
self.newTab.emit(
- idx.sibling(idx.row(), 1).data(
- BookmarksModel.UrlRole),
- idx.sibling(idx.row(), 0).data(
- Qt.ItemDataRole.DisplayRole))
+ idx.sibling(idx.row(), 1).data(BookmarksModel.UrlRole),
+ idx.sibling(idx.row(), 0).data(Qt.ItemDataRole.DisplayRole),
+ )
else:
self.openUrl.emit(
- idx.sibling(idx.row(), 1).data(
- BookmarksModel.UrlRole),
- idx.sibling(idx.row(), 0).data(
- Qt.ItemDataRole.DisplayRole))
+ idx.sibling(idx.row(), 1).data(BookmarksModel.UrlRole),
+ idx.sibling(idx.row(), 0).data(Qt.ItemDataRole.DisplayRole),
+ )
self.__bookmarksManager.incVisitCount(node)
-
+
def __editName(self):
"""
Private slot to edit the name part of a bookmark.
@@ -299,7 +293,7 @@
idx = self.bookmarksTree.currentIndex()
idx = idx.sibling(idx.row(), 0)
self.bookmarksTree.edit(idx)
-
+
def __editAddress(self):
"""
Private slot to edit the address part of a bookmark.
@@ -307,52 +301,50 @@
idx = self.bookmarksTree.currentIndex()
idx = idx.sibling(idx.row(), 1)
self.bookmarksTree.edit(idx)
-
+
def __edit(self):
"""
Private slot to edit a bookmarks properties.
"""
from .BookmarkPropertiesDialog import BookmarkPropertiesDialog
-
+
idx = self.bookmarksTree.currentIndex()
sourceIndex = self.__proxyModel.mapToSource(idx)
node = self.__bookmarksModel.node(sourceIndex)
dlg = BookmarkPropertiesDialog(node)
dlg.exec()
-
+
def __newFolder(self):
"""
Private slot to add a new bookmarks folder.
"""
from .BookmarkNode import BookmarkNode
-
+
currentIndex = self.bookmarksTree.currentIndex()
idx = QModelIndex(currentIndex)
sourceIndex = self.__proxyModel.mapToSource(idx)
sourceNode = self.__bookmarksModel.node(sourceIndex)
- row = -1 # append new folder as the last item per default
-
- if (
- sourceNode is not None and
- sourceNode.type() != BookmarkNode.Folder
- ):
+ row = -1 # append new folder as the last item per default
+
+ if sourceNode is not None and sourceNode.type() != BookmarkNode.Folder:
# If the selected item is not a folder, add a new folder to the
# parent folder, but directly below the selected item.
idx = idx.parent()
row = currentIndex.row() + 1
-
+
if not idx.isValid():
# Select bookmarks menu as default.
idx = self.__proxyModel.index(1, 0)
-
+
idx = self.__proxyModel.mapToSource(idx)
parent = self.__bookmarksModel.node(idx)
title, ok = QInputDialog.getText(
self,
self.tr("New Bookmark Folder"),
self.tr("Enter title for new bookmark folder:"),
- QLineEdit.EchoMode.Normal)
-
+ QLineEdit.EchoMode.Normal,
+ )
+
if ok:
if not title:
title = self.tr("New Folder")
