Mercurial Repositories > eric / file diff

diff -r e8a907801549 -r b0669ce1066d eric7/WebBrowser/QtHelp/HelpSearchWidget.py
--- a/eric7/WebBrowser/QtHelp/HelpSearchWidget.py	Wed Oct 13 18:15:30 2021 +0200
+++ b/eric7/WebBrowser/QtHelp/HelpSearchWidget.py	Thu Oct 14 20:15:58 2021 +0200
@@ -33,18 +33,26 @@
     newBackgroundTab = pyqtSignal(QUrl)
     newWindow = pyqtSignal(QUrl)
     
-    def __init__(self, engine, parent=None):
+    def __init__(self, engine, internal=False, parent=None):
         """
         Constructor
         
-        @param engine reference to the help search engine (QHelpSearchEngine)
-        @param parent reference to the parent widget (QWidget)
+        @param engine reference to the help search engine
+        @type QHelpSearchEngine
+        @param internal flag indicating the internal help viewer
+        @type bool
+        @param parent reference to the parent widget
+        @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()
@@ -79,7 +87,8 @@
         """
         Private slot to handle the end of the search.
         
-        @param hits number of hits (integer) (unused)
+        @param hits number of hits (unused)
+        @type int
         """
         QApplication.restoreOverrideCursor()
     
@@ -110,7 +119,10 @@
                     self.newBackgroundTab.emit(url)
                 elif modifiers & Qt.KeyboardModifier.ControlModifier:
                     self.newTab.emit(url)
-                elif modifiers & Qt.KeyboardModifier.ShiftModifier:
+                elif (
+                    modifiers & Qt.KeyboardModifier.ShiftModifier and
+                    not self.__internal
+                ):
                     self.newWindow.emit(url)
                 else:
                     self.openUrl.emit(url)
@@ -119,7 +131,8 @@
         """
         Protected method handling key press events.
         
-        @param evt reference to the key press event (QKeyEvent)
+        @param evt reference to the key press event
+        @type QKeyEvent
         """
         if evt.key() == Qt.Key.Key_Escape:
             self.escapePressed.emit()
@@ -148,11 +161,17 @@
         
         menu = QMenu()
         curTab = menu.addAction(self.tr("Open Link"))
-        newTab = menu.addAction(self.tr("Open Link in New Tab"))
-        newBackgroundTab = menu.addAction(
-            self.tr("Open Link in Background Tab"))
-        newWindow = menu.addAction(self.tr("Open Link in New Window"))
+        if self.__internal:
+            newTab = menu.addAction(self.tr("Open Link in New 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"))
+            newWindow = menu.addAction(self.tr("Open Link in New Window"))
         menu.move(evt.globalPos())
+        
         act = menu.exec()
         if act == curTab:
             self.openUrl.emit(link)
@@ -160,5 +179,5 @@
             self.newTab.emit(link)
         elif act == newBackgroundTab:
             self.newBackgroundTab.emit(link)
-        elif act == newWindow:
+        elif not self.__internal and act == newWindow:
             self.newWindow.emit(link)