qtvcp -use Path for library path instead of INFO

Author: c-morley

lib/python/qtvcp/lib/writer/writer.py

@@ -11,11 +11,11 @@
 from PyQt5.QtCore import Qt
 
 from .ext import *
-from qtvcp.core import Info
+from qtvcp.core import Path
 
-INFO = Info()
-ICONPATH = os.path.join(INFO.LIB_PATH, 'images/widgets/writer')
-IMAGEPATH = os.path.join(INFO.LIB_PATH, 'images')
+PATH = Path()
+ICONPATH = os.path.join(PATH.SHAREDIR, 'images/widgets/writer')
+IMAGEPATH = os.path.join(PATH.SHAREDIR, 'images')
 
 
 class Main(QtWidgets.QMainWindow):

lib/python/qtvcp/widgets/dialog_widget.py

@@ -38,7 +38,7 @@
 from qtvcp.widgets.machine_log import MachineLog
 from qtvcp.lib.notify import Notify
 from qtvcp.widgets.dialogMixin import GeometryMixin
-from qtvcp.core import Status, Action, Info, Tool
+from qtvcp.core import Status, Action, Info, Tool, Path
 from qtvcp import logger
 
 # Instantiate the libraries with global reference
@@ -52,6 +52,7 @@
 ACTION = Action()
 INFO = Info()
 TOOL = Tool()
+PATH = Path()
 NOTICE = Notify()
 LOG = logger.getLogger(__name__)
 
@@ -2019,7 +2020,7 @@ class RunFromLineDialog(QDialog, GeometryMixin):
     def __init__(self, parent=None):
         super(RunFromLineDialog, self).__init__(parent)
         # Load the widgets UI file:
-        self.filename = os.path.join(INFO.LIB_PATH,'widgets_ui', 'runFromLine_dialog.ui')
+        self.filename = os.path.join(PATH.SHAREDIR,'widgets_ui', 'runFromLine_dialog.ui')
         try:
             self.instance = uic.loadUi(self.filename, self)
         except AttributeError as e:

lib/python/qtvcp/widgets/mdi_touchy.py

@@ -20,7 +20,7 @@
 from PyQt5 import QtCore, QtWidgets, uic
 
 from qtvcp.widgets.widget_baseclass import _HalWidgetBase
-from qtvcp.core import Status, Action, Info
+from qtvcp.core import Status, Action, Info, Path
 from qtvcp import logger
 
 # Instiniate the libraries with global reference
@@ -29,6 +29,7 @@
 STATUS = Status()
 ACTION = Action()
 INFO = Info()
+PATH = Path()
 LOG = logger.getLogger(__name__)
 
 class mdi:
@@ -172,7 +173,7 @@ def __init__(self, parent=None):
         super(MDITouchy, self).__init__(parent)
         self.setMinimumSize(265, 325)
         # Load the widgets UI file:
-        self.filename = os.path.join(INFO.LIB_PATH,'widgets_ui', 'mdi_touchy.ui')
+        self.filename = os.path.join(PATH.SHAREDIR,'widgets_ui', 'mdi_touchy.ui')
         try:
             self.instance = uic.loadUi(self.filename, self)
         except AttributeError as e:

lib/python/qtvcp/widgets/nurbs_editor.py

@@ -66,7 +66,7 @@ def __init__(self, parent=None, path=None):
         self.bluck_update = True
 
         # Load the widgets UI file:
-        self.filename = os.path.join(INFO.LIB_PATH,'widgets_ui', 'nurbs_editor.ui')
+        self.filename = os.path.join(PATH.SHAREDIR,'widgets_ui', 'nurbs_editor.ui')
         try:
             self.instance = uic.loadUi(self.filename, self)
         except AttributeError as e:

lib/python/qtvcp/widgets/richtext_selector.py

@@ -4,13 +4,13 @@
 from PyQt5.QtCore import *
 from PyQt5.QtPrintSupport import *
 
-from qtvcp.core import Info
+from qtvcp.core import Info, Path
 
 import os
 import sys
 import uuid
 
-INFO = Info()
+PATH = Path()
 
 FONT_SIZES = [7, 8, 9, 10, 11, 12, 13, 14, 18, 24, 36, 48, 64, 72, 96, 144, 288]
 IMAGE_EXTENSIONS = ['.jpg','.png','.bmp']
@@ -70,7 +70,7 @@ class MainWindow(QMainWindow):
     def __init__(self, *args, **kwargs):
         super(MainWindow, self).__init__(*args, **kwargs)
 
-        filepath = os.path.join(INFO.LIB_PATH, 'images/widgets/RichTextEditor')
+        filepath = os.path.join(PATH.SHAREDIR, 'images/widgets/RichTextEditor')
 
         layout = QVBoxLayout()
         self.editor = TextEdit()

lib/python/qtvcp/widgets/runFromLine_dialog.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Qtvcp versa probe
+#
 #
 # Copyright (c) 2018  Chris Morley <chrisinnanaimo@hotmail.com>
 #
@@ -31,15 +31,11 @@
 INFO = Info()
 LOG = logger.getLogger(__name__)
 
-current_dir =  os.path.dirname(__file__)
-SUBPROGRAM = os.path.abspath(os.path.join(current_dir, 'versa_probe_subprog.py'))
-HELP = os.path.join(INFO.LIB_PATH,'widgets_ui', 'versa_usage.html')
-
 class RunFromLineDialog(QtWidgets.QDialog, _HalWidgetBase):
     def __init__(self, parent=None):
         super(RunFromLineDialog, self).__init__(parent)
         # Load the widgets UI file:
-        self.filename = os.path.join(INFO.LIB_PATH,'widgets_ui', 'runFromLine_dialog.ui')
+        self.filename = os.path.join(PATH.SHAREDIR,'widgets_ui', 'runFromLine_dialog.ui')
         try:
             self.instance = uic.loadUi(self.filename, self)
         except AttributeError as e:

lib/python/qtvcp/widgets/stylesheeteditor.py

@@ -46,11 +46,10 @@
         QColorDialog)
 from PyQt5 import QtGui, QtCore
 
-from qtvcp.core import Info, Path
+from qtvcp.core import Path
 from qtvcp.qt_makegui import VCPWindow
 from qtvcp import logger
 LOG = logger.getLogger(__name__)
-INFO = Info()
 PATH = Path()
 WIDGETS = VCPWindow()
 
@@ -61,7 +60,7 @@ def __init__(self, parent=WIDGETS, path=None, addBuiltinStyles = True):
         super(StyleSheetEditor, self).__init__(parent)
         self.setMinimumSize(600, 400)
         # Load the widgets UI file:
-        self.filename = os.path.join(INFO.LIB_PATH,'widgets_ui', 'style_dialog.ui')
+        self.filename = os.path.join(PATH.SHAREDIR,'widgets_ui', 'style_dialog.ui')
         try:
             self.instance = uic.loadUi(self.filename, self)
         except AttributeError as e:

lib/python/qtvcp/widgets/tool_offsetview.py

@@ -23,7 +23,7 @@
 from PyQt5.QtWidgets import (QTableView, QAbstractItemView, QCheckBox,
 QItemEditorFactory,QDoubleSpinBox,QSpinBox,QStyledItemDelegate, qApp)
 from qtvcp.widgets.widget_baseclass import _HalWidgetBase
-from qtvcp.core import Status, Action, Info, Tool
+from qtvcp.core import Status, Action, Info, Tool, Path
 from qtvcp import logger
 
 #BASE = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), ".."))
@@ -39,12 +39,13 @@
 ACTION = Action()
 INFO = Info()
 TOOL = Tool()
+PATH = Path()
 LOG = logger.getLogger(__name__)
 
 # Force the log level for this module
 #LOG.setLevel(logger.DEBUG) # One of DEBUG, INFO, WARNING, ERROR, CRITICAL
 
-ICONPATH = os.path.join(INFO.LIB_PATH, 'images/widgets/tool_offsetview')
+ICONPATH = os.path.join(PATH.SHAREDIR, 'images/widgets/tool_offsetview')
 
 # custom spinbox controls for editing
 class ItemEditorFactory(QItemEditorFactory):

lib/python/qtvcp/widgets/virtualkeyboard.py

@@ -4,17 +4,17 @@
 from PyQt5 import QtGui, QtWidgets, uic
 from PyQt5.QtCore import Qt, QEvent
 
-from qtvcp.core import Info
+from qtvcp.core import Info, Path
 from qtvcp import logger
 LOG = logger.getLogger(__name__)
 
-INFO = Info()
+PATH = Path()
 
 class VirtualKeyboard(QtWidgets.QWidget):
     def __init__(self, parent=None):
         super(VirtualKeyboard, self).__init__(parent)
         # Load the widgets UI file:
-        self.filename = os.path.join(INFO.LIB_PATH,'widgets_ui', 'virtual_keyboard.ui')
+        self.filename = os.path.join(PATH.SHAREDIR,'widgets_ui', 'virtual_keyboard.ui')
         try:
             self.instance = uic.loadUi(self.filename, self)
         except AttributeError as e: