qtdragon/hd/lathe -fix setup page image display

webengine needs the path location of the image
LinuxCNC · Dec 1, 2024 · 1ed894e · 1ed894e
1 parent 7aeb79d
commit 1ed894e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/share/qtvcp/screens/qtdragon/qtdragon_handler.py b/share/qtvcp/screens/qtdragon/qtdragon_handler.py
@@ -65,6 +65,7 @@
 
 class HandlerClass:
     def __init__(self, halcomp, widgets, paths):
+        self.p = paths
         self.h = halcomp
         self.w = widgets
         self.gcodes = GCodes(widgets)
@@ -145,6 +146,9 @@ def __init__(self, halcomp, widgets, paths):
         STATUS.connect('graphics-gcode-properties', lambda w, d: self.update_gcode_properties(d))
         STATUS.connect('status-message', lambda w, d, o: self.add_external_status(d,o))
 
+        self.swoopPath = os.path.join(paths.IMAGEDIR,'lcnc_swoop.png')
+        self.swoopURL = QtCore.QUrl.fromLocalFile(self.swoopPath)
+
         txt1 = _translate("HandlerClass","Setup Tab")
         txt2 = _translate("HandlerClass","If you select a file with .html as a file ending, it will be shown here.")
         txt3 = _translate("HandlerClass","Documents online")
@@ -165,7 +169,7 @@ def __init__(self, halcomp, widgets, paths):
 </body>
 </html>
 """%( txt1, txt2, txt3, txt4, os.path.expanduser('~/linuxcnc'), txt5,
-        os.path.join(paths.IMAGEDIR,'lcnc_swoop.png'))
+        self.swoopPath)
 
     def class_patch__(self):
         # override file manager load button
@@ -264,7 +268,7 @@ def initialized__(self):
                 if os.path.exists(self.default_setup):
                     self.w.webwidget.load(QtCore.QUrl.fromLocalFile(self.default_setup))
                 else:
-                    self.w.webwidget.setHtml(self.html)
+                    self.w.webwidget.setHtml(self.html, self.swoopURL)
                 self.w.webwidget.page().urlChanged.connect(self.onLoadFinished)
 
         except Exception as e:
@@ -1395,7 +1399,7 @@ def load_code(self, fname):
                     self.w.webwidget.loadFile(fname)
                     self.add_status("{} : {}".format(_translate("HandlerClass","Loaded HTML file"), fname), CRITICAL)
                 else:
-                    self.w.webwidget.setHtml(self.html)
+                    self.w.webwidget.setHtml(self.html, self.swoopURL)
             except Exception as e:
                 self.add_status("{} {} : {}".format(_translate("HandlerClass","Error loading HTML file"), fname,e))
             # look for PDF setup files
@@ -1648,7 +1652,7 @@ def homeWeb(self):
             if os.path.exists(self.default_setup):
                 self.w.webwidget.load(QtCore.QUrl.fromLocalFile(self.default_setup))
             else:
-                self.w.webwidget.setHtml(self.html)
+                self.w.webwidget.setHtml(self.html, self.swoopURL)
         except:
             pass
     # setup tab's web page back button
@@ -1660,7 +1664,7 @@ def back(self):
                 if os.path.exists(self.default_setup):
                     self.w.webwidget.load(QtCore.QUrl.fromLocalFile(self.default_setup))
                 else:
-                    self.w.webwidget.setHtml(self.html)
+                    self.w.webwidget.setHtml(self.html, self.swoopURL)
         except:
             pass
 

diff --git a/share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py b/share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py
@@ -150,6 +150,10 @@ def __init__(self, halcomp, widgets, paths):
         txt3 = _translate("HandlerClass","Documents online")
         txt4 = _translate("HandlerClass","QtDragon online")
         txt5 = _translate("HandlerClass","Local files")
+
+        self.swoopPath = os.path.join(paths.IMAGEDIR,'lcnc_swoop.png')
+        self.swoopURL = QtCore.QUrl.fromLocalFile(self.swoopPath)
+
         self.html = """<html>
 <head>
 <title>Test page for the download:// scheme</title>
@@ -165,7 +169,7 @@ def __init__(self, halcomp, widgets, paths):
 </body>
 </html>
 """%( txt1, txt2, txt3, txt4, os.path.expanduser('~/linuxcnc'), txt5,
-        os.path.join(paths.IMAGEDIR,'lcnc_swoop.png'))
+        self.swoopPath)
 
     def class_patch__(self):
         # override file manager load button
@@ -453,7 +457,7 @@ def init_widgets(self):
                 if os.path.exists(self.default_setup):
                     self.w.web_view.load(QtCore.QUrl.fromLocalFile(self.default_setup))
                 else:
-                    self.w.web_view.setHtml(self.html)
+                    self.w.web_view.setHtml(self.html, self.swoopURL)
                 self.w.web_view.page().urlChanged.connect(self.onLoadFinished)
         except Exception as e:
             print("No default setup file found - {}".format(e))
@@ -1461,7 +1465,7 @@ def load_code(self, fname):
                     self.w.web_view.load(QtCore.QUrl.fromLocalFile(fname))
                     self.add_status("{} : {}".format(_translate("HandlerClass","Loaded HTML file"), fname))
                 else:
-                    self.w.web_view.setHtml(self.html)
+                    self.w.web_view.setHtml(self.html, self.swoopURL)
             except Exception as e:
                 self.add_status("{} {} :()".format(_translate("HandlerClass","Can not Load HTML file"), fname,e))
             # look for PDF setup files
@@ -1697,7 +1701,7 @@ def homeWeb(self):
             if os.path.exists(self.default_setup):
                 self.w.web_view.load(QtCore.QUrl.fromLocalFile(self.default_setup))
             else:
-                self.w.web_view.setHtml(self.html)
+                self.w.web_view.setHtml(self.html, self.swoopURL)
         except:
             pass
     # setup tab's web page back button
@@ -1709,7 +1713,7 @@ def back(self):
                 if os.path.exists(self.default_setup):
                     self.w.web_view.load(QtCore.QUrl.fromLocalFile(self.default_setup))
                 else:
-                    self.w.web_view.setHtml(self.html)
+                    self.w.web_view.setHtml(self.html, self.swoopURL)
         except:
             pass
 

diff --git a/share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe_handler.py b/share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe_handler.py
@@ -155,6 +155,10 @@ def __init__(self, halcomp, widgets, paths):
         txt3 = _translate("HandlerClass","Documents online")
         txt4 = _translate("HandlerClass","QtDragon online")
         txt5 = _translate("HandlerClass","Local files")
+
+        self.swoopPath = os.path.join(paths.IMAGEDIR,'lcnc_swoop.png')
+        self.swoopURL = QtCore.QUrl.fromLocalFile(self.swoopPath)
+
         self.html = """<html>
 <head>
 <title>Test page for the download:// scheme</title>
@@ -170,7 +174,7 @@ def __init__(self, halcomp, widgets, paths):
 </body>
 </html>
 """%( txt1, txt2, txt3, txt4, os.path.expanduser('~/linuxcnc'), txt5,
-        os.path.join(paths.IMAGEDIR,'lcnc_swoop.png'))
+        self.swoopPath)
 
     def class_patch__(self):
         # override file manager load button
@@ -269,7 +273,7 @@ def initialized__(self):
                 if os.path.exists(self.default_setup):
                     self.w.webwidget.load(QtCore.QUrl.fromLocalFile(self.default_setup))
                 else:
-                    self.w.webwidget.setHtml(self.html)
+                    self.w.webwidget.setHtml(self.html, self.swoopURL)
                 self.w.webwidget.page().urlChanged.connect(self.onLoadFinished)
 
         except Exception as e:
@@ -1403,7 +1407,7 @@ def load_code(self, fname):
                     self.w.webwidget.loadFile(fname)
                     self.add_status("{} : {}".format(_translate("HandlerClass","Loaded HTML file"), fname), CRITICAL)
                 else:
-                    self.w.webwidget.setHtml(self.html)
+                    self.w.webwidget.setHtml(self.html, self.swoopURL)
             except Exception as e:
                 self.add_status("{} {} : {}".format(_translate("HandlerClass","Error loading HTML file"), fname,e))
             # look for PDF setup files
@@ -1656,7 +1660,7 @@ def homeWeb(self):
             if os.path.exists(self.default_setup):
                 self.w.webwidget.load(QtCore.QUrl.fromLocalFile(self.default_setup))
             else:
-                self.w.webwidget.setHtml(self.html)
+                self.w.webwidget.setHtml(self.html, self.swoopURL)
         except:
             pass
     # setup tab's web page back button
@@ -1668,7 +1672,7 @@ def back(self):
                 if os.path.exists(self.default_setup):
                     self.w.webwidget.load(QtCore.QUrl.fromLocalFile(self.default_setup))
                 else:
-                    self.w.webwidget.setHtml(self.html)
+                    self.w.webwidget.setHtml(self.html, self.swoopURL)
         except:
             pass