qtdragon -add a PDF setup tab

avoid using the system viewer fir now. Later a button to load in the system viwer may be convient
ElectronicsArchiver · May 4, 2022 · f826bc6 · f826bc6
1 parent 12ce437
commit f826bc6
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 9 deletions.
diff --git a/share/qtvcp/screens/qtdragon/qtdragon.ui b/share/qtvcp/screens/qtdragon/qtdragon.ui
@@ -2915,7 +2915,7 @@ RESET</string>
                     <enum>QFrame::Raised</enum>
                    </property>
                    <property name="currentIndex">
-                    <number>0</number>
+                    <number>8</number>
                    </property>
                    <widget class="QWidget" name="main_tab_widgetPage1">
                     <layout class="QHBoxLayout" name="horizontalLayout_3">
@@ -5787,7 +5787,53 @@ TO FILE</string>
                       <number>0</number>
                      </property>
                      <item>
-                      <layout class="QVBoxLayout" name="layout_setup"/>
+                      <layout class="QVBoxLayout" name="layout_setup">
+                       <item>
+                        <widget class="QTabWidget" name="tabWidget_setup">
+                         <property name="currentIndex">
+                          <number>1</number>
+                         </property>
+                         <widget class="QWidget" name="tabHTML">
+                          <attribute name="title">
+                           <string>HTML</string>
+                          </attribute>
+                          <layout class="QVBoxLayout" name="layout_HTML">
+                           <property name="leftMargin">
+                            <number>0</number>
+                           </property>
+                           <property name="topMargin">
+                            <number>0</number>
+                           </property>
+                           <property name="rightMargin">
+                            <number>0</number>
+                           </property>
+                           <property name="bottomMargin">
+                            <number>0</number>
+                           </property>
+                          </layout>
+                         </widget>
+                         <widget class="QWidget" name="tabPDF">
+                          <attribute name="title">
+                           <string>PDF</string>
+                          </attribute>
+                          <layout class="QHBoxLayout" name="layout_PDF">
+                           <property name="leftMargin">
+                            <number>0</number>
+                           </property>
+                           <property name="topMargin">
+                            <number>0</number>
+                           </property>
+                           <property name="rightMargin">
+                            <number>0</number>
+                           </property>
+                           <property name="bottomMargin">
+                            <number>0</number>
+                           </property>
+                          </layout>
+                         </widget>
+                        </widget>
+                       </item>
+                      </layout>
                      </item>
                     </layout>
                    </widget>
@@ -14654,7 +14700,7 @@ ZERO</string>
             <number>2</number>
            </property>
            <property name="text">
-            <string>08:56:54 PM</string>
+            <string>10:07:20 PM</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignCenter</set>

diff --git a/share/qtvcp/screens/qtdragon/qtdragon_handler.py b/share/qtvcp/screens/qtdragon/qtdragon_handler.py
@@ -9,6 +9,7 @@
 from qtvcp.lib.writer import writer
 from qtvcp.lib.keybindings import Keylookup
 from qtvcp.lib.gcodes import GCodes
+from qtvcp.lib.qt_pdf import PDFViewer 
 from qtvcp.core import Status, Action, Info, Path, Qhal
 from qtvcp import logger
 from shutil import copyfile
@@ -141,7 +142,7 @@ def initialized__(self):
             # web view widget for SETUP page
             if self.w.web_view:
                 self.toolBar = QtWidgets.QToolBar(self.w)
-                self.w.layout_setup.addWidget(self.toolBar)
+                self.w.layout_HTML.addWidget(self.toolBar)
 
                 self.backBtn = QtWidgets.QPushButton(self.w)
                 self.backBtn.setEnabled(True)
@@ -164,14 +165,18 @@ def initialized__(self):
                 self.writeBtn.clicked.connect(self.writer)
                 self.toolBar.addWidget(self.writeBtn)
 
-                self.w.layout_setup.addWidget(self.w.web_view)
+                self.w.layout_HTML.addWidget(self.w.web_view)
                 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)
         except Exception as e:
             print("No default setup file found - {}".format(e))
 
+        # PDF setup page
+        self.PDFView = PDFViewer.PDFView()
+        self.w.layout_PDF.addWidget(self.PDFView)
+
         # Show assigned macrobuttons define in INI under [MDI_COMMAND_LIST]
         flag = True
         for b in range(0,10):
@@ -838,6 +843,9 @@ def tab_utilities_changed(self, num):
     def load_code(self, fname):
         if fname is None: return
         filename, file_extension = os.path.splitext(fname)
+
+        # loading ngc then HTML/PDF
+
         if not file_extension in (".html", '.pdf'):
             if not (INFO.program_extension_valid(fname)):
                 self.add_status("Unknown or invalid filename extension {}".format(file_extension))
@@ -862,11 +870,14 @@ def load_code(self, fname):
             # load it with system program
             fname = filename+'.pdf'
             if os.path.exists(fname):
-                url = QtCore.QUrl.fromLocalFile(fname)
-                QtGui.QDesktopServices.openUrl(url)
+                self.PDFView.loadView(fname)
+                #url = QtCore.QUrl.fromLocalFile(fname)
+                #QtGui.QDesktopServices.openUrl(url)
                 self.add_status("Loaded PDF file : {}".format(fname))
             return
 
+        # loading HTML/PDF directly
+
         if file_extension == ".html":
             try:
                 self.w.web_view.load(QtCore.QUrl.fromLocalFile(fname))
@@ -879,8 +890,9 @@ def load_code(self, fname):
                 print("Error loading HTML file : {}".format(e))
         else:
             if os.path.exists(fname):
-                url = QtCore.QUrl.fromLocalFile(fname)
-                QtGui.QDesktopServices.openUrl(url)
+                self.PDFView.loadView(fname)
+                #url = QtCore.QUrl.fromLocalFile(fname)
+                #QtGui.QDesktopServices.openUrl(url)
                 self.add_status("Loaded PDF file : {}".format(fname))
 
     def disable_spindle_pause(self):