Merge branch '2.9'

Author: andypugh

debian/configure

@@ -71,6 +71,7 @@ if [ "$1" == "-h" ] || [ "$1" == "-help" ] || [ "$1" == "--help" ]; then
 fi
 
 EXTRA_BUILD=
+
 LIBREADLINE_DEV="libeditreadline-dev"
 
 ENABLE_BUILD_DOCUMENTATION=--enable-build-documentation=pdf
@@ -133,7 +134,7 @@ PYTHON_GST=python3-gst-1.0,gstreamer1.0-plugins-base
 TCLTK_VERSION=8.6
 PYTHON_IMAGING=python3-pil
 PYTHON_IMAGING_TK=python3-pil.imagetk
-QTVCP_DEPENDS="python3-qtpy,\n    python3-pyqt5,\n    python3-pyqt5.qsci,\n    python3-pyqt5.qtsvg,\n    python3-pyqt5.qtopengl,\n    python3-opencv,\n    python3-dbus,\n    python3-espeak,\n    python3-dbus.mainloop.pyqt5,\n    python3-pyqt5.qtwebengine,\n    espeak-ng,\n    pyqt5-dev-tools,\n    gstreamer1.0-tools,\n    espeak,\n    sound-theme-freedesktop,\n    python3-poppler-qt5"
+QTVCP_DEPENDS="python3-pyqt5,\n    python3-pyqt5.qsci,\n    python3-pyqt5.qtsvg,\n    python3-pyqt5.qtopengl,\n    python3-opencv,\n    python3-dbus,\n    python3-espeak,\n    python3-dbus.mainloop.pyqt5,\n    python3-pyqt5.qtwebengine | python3-pyqt5.qtwebkit,\n    espeak-ng,\n    pyqt5-dev-tools,\n    gstreamer1.0-tools,\n    espeak,\n    sound-theme-freedesktop"
 YAPPS_RUNTIME="python3-yapps"
 DEBHELPER="debhelper (>= 12)"
 COMPAT="12"

debian/control.main-pkg.in

@@ -40,6 +40,7 @@ Recommends:
     @PYTHON_IMAGING_TK@
 Suggests:
     mesaflash,
+    python3-poppler-qt5,
     onboard
 Description: motion controller for CNC machines and robots
  LinuxCNC is a fully-realised CNC machine controller that can interpret

tcl/bin/halshow.tcl

@@ -858,7 +858,7 @@ proc watchHAL {which} {
         # ptype (and getp) fail when the item clicked is not a leaf
         # e.g., clicking "Pins / axis / 0"
         if {[catch {hal ptype $varname} type]} { 
-            setStatusbar $type
+            setStatusbar "Watch: $type"
             return $type
         }
     }
@@ -1129,12 +1129,22 @@ proc setWatchInterval {} {
 
 proc refreshItem {cnum vartype varname} {
     if {$vartype == "sig" } {
-        set ret [hal gets $varname]
-        set varnumtype [hal stype $varname]
+        set getCmd gets
+        set typeCmd stype
     } else {
-        set ret [hal getp $varname]
-        set varnumtype [hal ptype $varname]
+        set getCmd getp
+        set typeCmd ptype
+    }
+
+    if {[catch { set ret [hal $getCmd $varname] } error]} {
+        setStatusbar $error
+        $::cisp itemconfigure text$cnum -text "----"
+        $::cisp itemconfigure oval$cnum -fill lightgray
+        return
     }
+
+    set varnumtype [hal $typeCmd $varname]
+
     if {$ret == "TRUE"} {
         $::cisp itemconfigure oval$cnum -fill yellow
     } elseif {$ret == "FALSE"} {