qtvcp -versa/basic probe: add scroll buttons to help dialog

Author: c-morley

lib/python/qtvcp/widgets/basic_probe.py

@@ -20,7 +20,7 @@
 import json
 from PyQt5.QtCore import QProcess, QRegExp, QFile, Qt
 from PyQt5 import QtGui, QtWidgets, uic, QtCore
-from PyQt5.QtWidgets import QDialogButtonBox
+from PyQt5.QtWidgets import QDialogButtonBox, QAbstractSlider
 from qtvcp.widgets.widget_baseclass import _HalWidgetBase
 from qtvcp.core import Action, Status, Info, Path
 from qtvcp.widgets.dialogMixin import GeometryMixin
@@ -353,11 +353,6 @@ def buildWidget(self):
         l = QtWidgets.QVBoxLayout()
         t = QtWidgets.QTextEdit('Basic Probe Help')
         t.setReadOnly(True)
-        try:
-            self.next(t)
-        except Exception as e:
-                t.setText('Basic Probe Help file Unavailable:\n\n{}'.format(e))
-
         l.addWidget(t)
 
         buttons = QDialogButtonBox()
@@ -377,7 +372,19 @@ def buildWidget(self):
         previousbutton.setIcon(QtGui.QIcon(':/qt-project.org/styles/commonstyle/images/left-32.png'))
         previousbutton.clicked.connect(lambda : self.next(t,False))
 
+        self.pageStepUpbutton = QtWidgets.QPushButton()
+        self.pageStepUpbutton.setIconSize(QtCore.QSize(38, 38))
+        self.pageStepUpbutton.setIcon(QtGui.QIcon(':/qt-project.org/styles/commonstyle/images/up-32.png'))
+        self.pageStepUpbutton.clicked.connect(lambda : self.pageStep(t,False))
+
+        self.pageStepDwnbutton = QtWidgets.QPushButton()
+        self.pageStepDwnbutton.setIconSize(QtCore.QSize(38, 38))
+        self.pageStepDwnbutton.setIcon(QtGui.QIcon(':/qt-project.org/styles/commonstyle/images/down-32.png'))
+        self.pageStepDwnbutton.clicked.connect(lambda : self.pageStep(t,True))
+
         bBox = QDialogButtonBox(buttons)
+        bBox.addButton(self.pageStepUpbutton, QDialogButtonBox.ActionRole)
+        bBox.addButton(self.pageStepDwnbutton, QDialogButtonBox.ActionRole)
         bBox.addButton(previousbutton, QDialogButtonBox.ActionRole)
         bBox.addButton(nextbutton, QDialogButtonBox.ActionRole)
         bBox.addButton(closebutton, QDialogButtonBox.DestructiveRole)
@@ -386,6 +393,11 @@ def buildWidget(self):
         l.addWidget(bBox)
         self.setLayout(l)
 
+        try:
+            self.next(t)
+        except Exception as e:
+                t.setText('Basic Probe Help file Unavailable:\n\n{}'.format(e))
+
     def next(self,t,direction=None):
             if direction is None:
                 self.currentHelpPage = 0
@@ -405,6 +417,14 @@ def next(self,t,direction=None):
                 html = str(html, encoding='utf8')
                 html = html.replace("../images/widgets/","{}/widgets/".format(INFO.IMAGE_PATH))
                 t.setHtml(html)
+                if t.verticalScrollBar().isVisible():
+                    t.verticalScrollBar().setPageStep(100)
+                    self.pageStepDwnbutton.show()
+                    self.pageStepUpbutton.show()
+                else:
+                    self.pageStepDwnbutton.hide()
+                    self.pageStepUpbutton.hide()
+
             except Exception as e:
                 t.setHtml('''
 <h1 style=" margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:xx-large; font-weight:600;">Basic Probe Help not available</span> </h1>
@@ -414,6 +434,12 @@ def next(self,t,direction=None):
                 return
             self.show()
 
+    def pageStep(self, t, state):
+        if state:
+            t.verticalScrollBar().triggerAction (QAbstractSlider.SliderPageStepAdd)
+        else:
+            t.verticalScrollBar().triggerAction (QAbstractSlider.SliderPageStepSub)
+
     # accept button applies presets and if line number given starts linuxcnc
     def close(self):
         self.record_geometry()

lib/python/qtvcp/widgets/versa_probe.py

@@ -22,7 +22,7 @@
 
 from PyQt5 import QtGui, QtCore, QtWidgets, uic
 from PyQt5.QtCore import QProcess, QEvent, Qt
-from PyQt5.QtWidgets import QDialogButtonBox
+from PyQt5.QtWidgets import QDialogButtonBox, QAbstractSlider
 
 from qtvcp.widgets.widget_baseclass import _HalWidgetBase
 from qtvcp.core import Status, Action, Info, Path
@@ -491,11 +491,6 @@ def buildWidget(self):
         l = QtWidgets.QVBoxLayout()
         t = QtWidgets.QTextEdit('Versa Probe Help')
         t.setReadOnly(True)
-        try:
-            self.next(t)
-        except Exception as e:
-                t.setText('Versa Probe Help file Unavailable:\n\n{}'.format(e))
-
         l.addWidget(t)
 
         buttons = QDialogButtonBox()
@@ -515,7 +510,19 @@ def buildWidget(self):
         previousbutton.setIcon(QtGui.QIcon(':/qt-project.org/styles/commonstyle/images/left-32.png'))
         previousbutton.clicked.connect(lambda : self.next(t,False))
 
+        self.pageStepUpbutton = QtWidgets.QPushButton()
+        self.pageStepUpbutton.setIconSize(QtCore.QSize(38, 38))
+        self.pageStepUpbutton.setIcon(QtGui.QIcon(':/qt-project.org/styles/commonstyle/images/up-32.png'))
+        self.pageStepUpbutton.clicked.connect(lambda : self.pageStep(t,False))
+
+        self.pageStepDwnbutton = QtWidgets.QPushButton()
+        self.pageStepDwnbutton.setIconSize(QtCore.QSize(38, 38))
+        self.pageStepDwnbutton.setIcon(QtGui.QIcon(':/qt-project.org/styles/commonstyle/images/down-32.png'))
+        self.pageStepDwnbutton.clicked.connect(lambda : self.pageStep(t,True))
+
         bBox = QDialogButtonBox(buttons)
+        bBox.addButton(self.pageStepUpbutton, QDialogButtonBox.ActionRole)
+        bBox.addButton(self.pageStepDwnbutton, QDialogButtonBox.ActionRole)
         bBox.addButton(previousbutton, QDialogButtonBox.ActionRole)
         bBox.addButton(nextbutton, QDialogButtonBox.ActionRole)
         bBox.addButton(closebutton, QDialogButtonBox.DestructiveRole)
@@ -524,6 +531,11 @@ def buildWidget(self):
         l.addWidget(bBox)
         self.setLayout(l)
 
+        try:
+            self.next(t)
+        except Exception as e:
+                t.setText('Versa Probe Help file Unavailable:\n\n{}'.format(e))
+
     def next(self,t,direction=None):
             if direction is None:
                 self.currentHelpPage = 0
@@ -543,12 +555,26 @@ def next(self,t,direction=None):
                 html = str(html, encoding='utf8')
                 html = html.replace("../images/probe_icons/","{}/probe_icons/".format(INFO.IMAGE_PATH))
                 t.setHtml(html)
+                if t.verticalScrollBar().isVisible():
+                    t.verticalScrollBar().setPageStep(20)
+                    self.pageStepDwnbutton.show()
+                    self.pageStepUpbutton.show()
+                else:
+                    self.pageStepDwnbutton.hide()
+                    self.pageStepUpbutton.hide()
+
             except Exception as e:
                 t.setText('Versa Probe Help file Unavailable:\n\n{}'.format(e))
             if direction is None:
                 return
             self.show()
 
+    def pageStep(self, t, state):
+        if state:
+            t.verticalScrollBar().triggerAction (QAbstractSlider.SliderPageStepAdd)
+        else:
+            t.verticalScrollBar().triggerAction (QAbstractSlider.SliderPageStepSub)
+
     # accept button applies presets and if line number given starts linuxcnc
     def close(self):
         self.record_geometry()