diff -r e9e7eca7efee -r bf71ee032bb4 src/eric7/WebBrowser/QtHelp/HelpSearchWidget.py
--- a/src/eric7/WebBrowser/QtHelp/HelpSearchWidget.py Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/WebBrowser/QtHelp/HelpSearchWidget.py Wed Jul 13 14:55:47 2022 +0200
@@ -9,15 +9,13 @@
from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QUrl
from PyQt6.QtGui import QGuiApplication, QClipboard
-from PyQt6.QtWidgets import (
- QWidget, QVBoxLayout, QTextBrowser, QApplication, QMenu
-)
+from PyQt6.QtWidgets import QWidget, QVBoxLayout, QTextBrowser, QApplication, QMenu
class HelpSearchWidget(QWidget):
"""
Class implementing a window for showing the QtHelp index.
-
+
@signal escapePressed() emitted when the ESC key was pressed
@signal openUrl(QUrl, str) emitted to open a search result entry in the
current tab
@@ -28,16 +26,17 @@
@signal newWindow(QUrl, str) emitted to open a search result entry in a
new window
"""
+
escapePressed = pyqtSignal()
openUrl = pyqtSignal(QUrl)
newTab = pyqtSignal(QUrl)
newBackgroundTab = pyqtSignal(QUrl)
newWindow = pyqtSignal(QUrl)
-
+
def __init__(self, engine, internal=False, parent=None):
"""
Constructor
-
+
@param engine reference to the help search engine
@type QHelpSearchEngine
@param internal flag indicating the internal help viewer
@@ -46,92 +45,90 @@
@type QWidget
"""
super().__init__(parent)
-
+
self.__engine = engine
self.__internal = internal
-
+
self.__layout = QVBoxLayout(self)
if internal:
# no margins for the internal variant
self.__layout.setContentsMargins(0, 0, 0, 0)
-
+
self.__result = self.__engine.resultWidget()
self.__query = self.__engine.queryWidget()
-
+
self.__layout.addWidget(self.__query)
self.__layout.addWidget(self.__result)
-
+
self.setFocusProxy(self.__query)
-
+
self.__query.search.connect(self.__search)
self.__result.requestShowLink.connect(self.__linkActivated)
-
+
self.__engine.searchingStarted.connect(self.__searchingStarted)
self.__engine.searchingFinished.connect(self.__searchingFinished)
-
+
self.__browser = self.__result.findChildren(QTextBrowser)[0]
-
+
def __search(self):
"""
Private slot to perform a search of the database.
"""
query = self.__query.searchInput()
self.__engine.search(query)
-
+
def __searchingStarted(self):
"""
Private slot to handle the start of a search.
"""
QApplication.setOverrideCursor(Qt.CursorShape.WaitCursor)
-
+
def __searchingFinished(self, hits):
"""
Private slot to handle the end of the search.
-
+
@param hits number of hits (unused)
@type int
"""
QApplication.restoreOverrideCursor()
-
+
@pyqtSlot(QUrl)
def __linkActivated(self, url):
"""
Private slot handling the activation of an entry.
-
+
@param url URL of the activated entry
@type QUrl
"""
if not url.isEmpty() and url.isValid():
buttons = QApplication.mouseButtons()
modifiers = QApplication.keyboardModifiers()
-
+
if buttons & Qt.MouseButton.MiddleButton:
self.newTab.emit(url)
else:
- if (
- modifiers & (
- Qt.KeyboardModifier.ControlModifier |
- Qt.KeyboardModifier.ShiftModifier
- ) == (
- Qt.KeyboardModifier.ControlModifier |
- Qt.KeyboardModifier.ShiftModifier
- )
+ if modifiers & (
+ Qt.KeyboardModifier.ControlModifier
+ | Qt.KeyboardModifier.ShiftModifier
+ ) == (
+ Qt.KeyboardModifier.ControlModifier
+ | Qt.KeyboardModifier.ShiftModifier
):
self.newBackgroundTab.emit(url)
elif modifiers & Qt.KeyboardModifier.ControlModifier:
self.newTab.emit(url)
elif (
- modifiers & Qt.KeyboardModifier.ShiftModifier and
- not self.__internal
+ modifiers & Qt.KeyboardModifier.ShiftModifier
+ and not self.__internal
):
self.newWindow.emit(url)
else:
self.openUrl.emit(url)
-
+
def keyPressEvent(self, evt):
"""
Protected method handling key press events.
-
+
@param evt reference to the key press event
@type QKeyEvent
"""
@@ -139,15 +136,15 @@
self.escapePressed.emit()
else:
evt.ignore()
-
+
def contextMenuEvent(self, evt):
"""
Protected method handling context menu events.
-
+
@param evt reference to the context menu event (QContextMenuEvent)
"""
point = evt.globalPos()
-
+
if self.__browser:
point = self.__browser.mapFromGlobal(point)
if not self.__browser.rect().contains(point, True):
@@ -156,25 +153,23 @@
else:
point = self.__result.mapFromGlobal(point)
link = self.__result.linkAt(point)
-
+
if link.isEmpty() or not link.isValid():
return
-
+
menu = QMenu()
curTab = menu.addAction(self.tr("Open Link"))
if self.__internal:
newTab = menu.addAction(self.tr("Open Link in New Page"))
- newBackgroundTab = menu.addAction(
- self.tr("Open Link in Background Page"))
+ newBackgroundTab = menu.addAction(self.tr("Open Link in Background Page"))
else:
newTab = menu.addAction(self.tr("Open Link in New Tab"))
- newBackgroundTab = menu.addAction(
- self.tr("Open Link in Background Tab"))
+ newBackgroundTab = menu.addAction(self.tr("Open Link in Background Tab"))
newWindow = menu.addAction(self.tr("Open Link in New Window"))
menu.addSeparator()
copyLink = menu.addAction(self.tr("Copy URL to Clipboard"))
menu.move(evt.globalPos())
-
+
act = menu.exec()
if act == curTab:
self.openUrl.emit(link)
@@ -187,6 +182,8 @@
elif act == copyLink:
# copy the URL to both clipboard areas
QGuiApplication.clipboard().setText(
- link.toString(), QClipboard.Mode.Clipboard)
+ link.toString(), QClipboard.Mode.Clipboard
+ )
QGuiApplication.clipboard().setText(
- link.toString(), QClipboard.Mode.Selection)
+ link.toString(), QClipboard.Mode.Selection
+ )
