Mercurial Repositories > eric / file diff

--- a/eric7/HelpViewer/HelpViewerImpl_qtb.py	Sat Oct 16 20:37:32 2021 +0200
+++ b/eric7/HelpViewer/HelpViewerImpl_qtb.py	Sat Oct 16 20:38:23 2021 +0200
@@ -82,7 +82,19 @@
         @return page title
         @rtype str
         """
-        return self.documentTitle()
+        titleStr = self.documentTitle()
+        if not titleStr:
+            url = self.url()
+            
+            titleStr = url.host()
+            if not titleStr:
+                titleStr = url.toString(
+                    QUrl.UrlFormattingOption.RemoveFragment)
+        
+        if not titleStr or titleStr == "about:blank":
+            titleStr = self.tr("Empty Page")
+        
+        return titleStr
     
     def loadResource(self, type_,  name):
         """
@@ -137,6 +149,20 @@
             for ind in range(index):
                 self.forward()
     
+    def isBackwardAvailable(self):
+        """
+        Public method to check, if stepping backward through the history is
+        available.
+        """
+        return QTextBrowser.isBackwardAvailable(self)
+    
+    def isForwardAvailable(self):
+        """
+        Public method to check, if stepping forward through the history is
+        available.
+        """
+        return QTextBrowser.isForwardAvailable(self)
+    
     def scaleUp(self):
         """
         Public method to zoom in.
@@ -210,12 +236,21 @@
         @param evt reference to the event object
         @type QWheelEvent
         """
+        delta = evt.angleDelta().y()
         if evt.modifiers() == Qt.KeyboardModifier.ControlModifier:
-            if evt.angleDelta().y() > 0:
+            if delta > 0:
                 self.scaleUp()
             else:
                 self.scaleDown()
             evt.accept()
+        
+        elif evt.modifiers() & Qt.KeyboardModifier.ShiftModifier:
+            if delta < 0:
+                self.backward()
+            elif delta > 0:
+                self.forward()
+            evt.accept()
+        
         else:
             QTextBrowser.wheelEvent(self, evt)
     
@@ -287,10 +322,13 @@
             evt.accept()
     
     # TODO: implement context menu
+    #       - Backward
+    #       - Forward
+    #       - Reload
     #       - Open Link
     #       - Open Link in New Page
     #       - Open Link in Background Page
     #       - Copy
-    #       - Copy Link LOcation
+    #       - Copy Link Location
     #       - Select All
     # TODO: add Ctrl+LMB action (open link in new page)