qtplasmac: use new linuxcncicon_plasma.svg icon

Author: snowgoer540

lib/python/qtvcp/lib/qtplasmac/set_offsets.py

@@ -29,7 +29,7 @@
 
 def dialog_show(P, W, prefs, iniPath, STATUS, ACTION, TOOL):
     dlg = QDialog(W)
-    dlg.setWindowIcon(QIcon(os.path.join(P.IMAGES, 'Chips_Plasma.png')))
+    dlg.setWindowIcon(QIcon(os.path.join(P.iconBase, P.iconPath)))
     dlg.setWindowTitle(_translate('Offsets', 'Set Peripheral Offsets'))
     dlg.setModal(False)
     grid = QGridLayout()

share/qtvcp/images/qtplasmac/images/Chips_Plasma.png

@@ -21,6 +21,7 @@
 '''
 
 import os
+import sys
 import hal
 from subprocess import run as RUN
 from PyQt5 import QtCore
@@ -48,8 +49,10 @@ def __init__(self, halcomp, widgets, paths):
 
     def initialized__(self):
         self.w.setWindowTitle('QtPlasmaC Sim')
-        self.images = os.path.join(self.paths.IMAGEDIR, 'qtplasmac/images/')
-        self.w.setWindowIcon(QIcon(os.path.join(self.images, 'Chips_Plasma.png')))
+        self.iconPath = 'share/icons/hicolor/scalable/apps/linuxcnc_alt/linuxcncicon_plasma.svg'
+        appPath = os.path.realpath(os.path.dirname(sys.argv[0]))
+        self.iconBase = '/usr' if appPath == '/usr/bin' else appPath.replace('/bin', '/debian/extras/usr')
+        self.w.setWindowIcon(QIcon(os.path.join(self.iconBase, self.iconPath)))
         self.breakPin = self.hal.newpin('sensor_breakaway', hal.HAL_BIT, hal.HAL_OUT)
         self.floatPin = self.hal.newpin('sensor_float', hal.HAL_BIT, hal.HAL_OUT)
         self.ohmicPin = self.hal.newpin('sensor_ohmic', hal.HAL_BIT, hal.HAL_OUT)

share/qtvcp/panels/qtplasmac_sim/qtplasmac_sim_handler.py

@@ -1,4 +1,4 @@
-VERSION = '1.233.254'
+VERSION = '1.233.255'
 
 '''
 qtplasmac_handler.py
@@ -22,6 +22,7 @@
 '''
 
 import os
+import sys
 from shutil import copy as COPY
 from shutil import move as MOVE
 from subprocess import Popen, PIPE
@@ -393,7 +394,10 @@ def initialized__(self):
 # called by qtvcp.py, can override qtvcp settings or qtvcp allowed user options (via INI)
     def before_loop__(self):
         self.w.setWindowTitle('{} - QtPlasmaC v{}, powered by QtVCP on LinuxCNC v{}'.format(self.machineName, VERSION, linuxcnc.version.split(':')[0]))
-        self.w.setWindowIcon(QIcon(os.path.join(self.IMAGES, 'Chips_Plasma.png')))
+        self.iconPath = 'share/icons/hicolor/scalable/apps/linuxcnc_alt/linuxcncicon_plasma.svg'
+        appPath = os.path.realpath(os.path.dirname(sys.argv[0]))
+        self.iconBase = '/usr' if appPath == '/usr/bin' else appPath.replace('/bin', '/debian/extras/usr')
+        self.w.setWindowIcon(QIcon(os.path.join(self.iconBase, self.iconPath)))
 
 
 #########################################################################################################################

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

@@ -30,6 +30,12 @@ <h2>QtPlasmaC Version History</h2>
 </table>
 <br>
 <!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
+<br><b><u>v1.233.255 2022 Dec 18</u></b>
+<ul style="margin:0;">
+  <li>use new linuxcncicon_plasma.svg icon</li>
+</ul>
+<i>Changes submitted by snowgoer540 (Greg Carl)</i><br>
+
 <br><b><u>v1.233.254 2022 Dec 14</u></b>
 <ul style="margin:0;">
   <li>Change default retry delay to 1 to match spinbox min</li>

share/qtvcp/screens/qtplasmac/versions.html

@@ -59,9 +59,9 @@ def __init__(self):
             response.setText(msg)
             response.exec_()
             raise SystemExit
-        self.iconPath = 'share/qtvcp/images/qtplasmac/images/Chips_Plasma.png'
+        self.iconPath = 'share/icons/hicolor/scalable/apps/linuxcnc_alt/linuxcncicon_plasma.svg'
         appPath = os.path.realpath(os.path.dirname(sys.argv[0]))
-        self.iconBase = '/usr' if appPath == '/bin' else appPath.replace('/bin', '')
+        self.iconBase = '/usr' if appPath == '/usr/bin' else appPath.replace('/bin', '/debian/extras/usr')
         self.setWindowIcon(QIcon(os.path.join(self.iconBase, self.iconPath)))
         self.setWindowTitle('Powermax Communicator')
         qtRectangle = self.frameGeometry()

src/emc/usr_intf/qtplasmac/pmx485-test.py

@@ -46,9 +46,9 @@ def __init__(self, parent=None):
         self.setCentralWidget(wid)
         layout = QHBoxLayout()
         wid.setLayout(layout)
-        iconPath = 'share/qtvcp/images/qtplasmac/images/Chips_Plasma.png'
+        iconPath = 'share/icons/hicolor/scalable/apps/linuxcnc_alt/linuxcncicon_plasma.svg'
         appPath = os.path.realpath(os.path.dirname(sys.argv[0]))
-        iconBase = '/usr' if appPath == '/bin' else appPath.replace('/bin', '')
+        iconBase = '/usr' if appPath == '/usr/bin' else appPath.replace('/bin', '/debian/extras/usr')
         self.setWindowIcon(QIcon(os.path.join(iconBase, iconPath)))
         self.setWindowTitle('QtPlasmaC Cfg2Prefs')
         vBox = QVBoxLayout()

src/emc/usr_intf/qtplasmac/qtplasmac-cfg2prefs.py

@@ -34,9 +34,9 @@ def __init__(self, parent=None):
         self.setCentralWidget(wid)
         self.layout = QHBoxLayout()
         wid.setLayout(self.layout)
-        self.iconPath = 'share/qtvcp/images/qtplasmac/images/Chips_Plasma.png'
+        self.iconPath = 'share/icons/hicolor/scalable/apps/linuxcnc_alt/linuxcncicon_plasma.svg'
         appPath = os.path.realpath(os.path.dirname(sys.argv[0]))
-        self.iconBase = '/usr' if appPath == '/bin' else appPath.replace('/bin', '')
+        self.iconBase = '/usr' if appPath == '/usr/bin' else appPath.replace('/bin', '/debian/extras/usr')
         self.setWindowIcon(QIcon(os.path.join(self.iconBase, self.iconPath)))
         self.setWindowTitle('QtPlasmaC Material File Creator')
         self.create_widgets()

src/emc/usr_intf/qtplasmac/qtplasmac-materials.py

@@ -61,9 +61,9 @@ def __init__(self, parent=None):
         self.setCentralWidget(wid)
         layout = QHBoxLayout()
         wid.setLayout(layout)
-        iconPath = 'share/qtvcp/images/qtplasmac/images/Chips_Plasma.png'
+        iconPath = 'share/icons/hicolor/scalable/apps/linuxcnc_alt/linuxcncicon_plasma.svg'
         appPath = os.path.realpath(os.path.dirname(sys.argv[0]))
-        iconBase = '/usr' if appPath == '/bin' else appPath.replace('/bin', '')
+        iconBase = '/usr' if appPath == '/usr/bin' else appPath.replace('/bin', '/debian/extras/usr')
         self.setWindowIcon(QIcon(os.path.join(iconBase, iconPath)))
         self.setWindowTitle('PlasmaC2Qt')
         vBox = QVBoxLayout()