Skip to content

Commit 914dcc1

Browse files
committed
qtplasmac: update icon image to Chips Plasma version
Thank you to AlexMagToast from the forum for the work and for contributing the logo files - https://forum.linuxcnc.org/show-your-stuff/32672-linuxcnc-logo?start=50#248058
1 parent 9571b37 commit 914dcc1

9 files changed

Lines changed: 20 additions & 9 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
def dialog_show(P, W, prefs, iniPath, STATUS, ACTION, TOOL, foreColor, backColor):
3131
msg = QMessageBox()
32-
msg.setWindowIcon(QIcon(os.path.join(P.IMAGES, 'linuxcncicon.png')))
32+
msg.setWindowIcon(QIcon(os.path.join(P.IMAGES, 'Chips_Plasma.png')))
3333
msg.setWindowTitle(_translate('Offsets', 'SET PERIPHERAL OFFSET'))
3434
msg0 = _translate('Offsets', 'Usage is as follows')
3535
msg1 = _translate('Offsets', 'Touchoff the torch to X0 Y0')
3.51 KB
Loading
-4.1 KB
Binary file not shown.

share/qtvcp/panels/qtplasmac_sim/qtplasmac_sim_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def __init__(self, halcomp, widgets, paths):
5151
def initialized__(self):
5252
self.w.setWindowTitle('QtPlasmaC Sim')
5353
self.images = os.path.join(self.paths.IMAGEDIR, 'qtplasmac/images/')
54-
self.w.setWindowIcon(QIcon(os.path.join(self.images, 'linuxcncicon.png')))
54+
self.w.setWindowIcon(QIcon(os.path.join(self.images, 'Chips_Plasma.png')))
5555
self.breakPin = self.hal.newpin('sensor_breakaway', hal.HAL_BIT, hal.HAL_OUT)
5656
self.floatPin = self.hal.newpin('sensor_float', hal.HAL_BIT, hal.HAL_OUT)
5757
self.ohmicPin = self.hal.newpin('sensor_ohmic', hal.HAL_BIT, hal.HAL_OUT)

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ def __init__(self, halcomp, widgets, paths):
149149
self.GCODES = GCodes(widgets)
150150
self.valid = QDoubleValidator(0.0, 999.999, 3)
151151
self.IMAGES = os.path.join(self.PATHS.IMAGEDIR, 'qtplasmac/images/')
152-
self.w.setWindowIcon(QIcon(os.path.join(self.IMAGES, 'linuxcncicon.png')))
153152
self.landscape = True
154153
if os.path.basename(self.PATHS.XML) == 'qtplasmac_9x16.ui':
155154
self.landscape = False
@@ -313,6 +312,8 @@ def __init__(self, halcomp, widgets, paths):
313312
self.DEBUG = 27
314313

315314
def initialized__(self):
315+
self.w.setWindowTitle('{} - QtPlasmaC v{}, powered by QtVCP on LinuxCNC v{}'.format(self.machineName, VERSION, linuxcnc.version.split(':')[0]))
316+
self.w.setWindowIcon(QIcon(os.path.join(self.IMAGES, 'Chips_Plasma.png')))
316317
# ensure we get all startup errors
317318
STATUS.connect('error', self.error_update)
318319
STATUS.connect('graphics-gcode-error', lambda o, e:self.error_update(o, linuxcnc.OPERATOR_ERROR, e))
@@ -364,7 +365,6 @@ def initialized__(self):
364365
STATUS.connect('tool-in-spindle-changed', self.tool_changed)
365366
STATUS.connect('periodic', lambda w: self.update_periodic())
366367
STATUS.connect('metric-mode-changed', self.metric_mode_changed)
367-
self.w.setWindowTitle('{} - QtPlasmaC v{}, powered by QtVCP on LinuxCNC v{}'.format(self.machineName, VERSION, linuxcnc.version.split(':')[0]))
368368
self.startupTimer = QTimer()
369369
self.startupTimer.timeout.connect(self.startup_timeout)
370370
self.startupTimer.setSingleShot(True)

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,10 @@ def __init__(self):
6060
response.setText(msg)
6161
response.exec_()
6262
raise SystemExit
63-
if os.path.isfile('/usr/share/linuxcnc/linuxcncicon.png'):
64-
self.windowIcon = QIcon('/usr/share/linuxcnc/linuxcncicon.png')
65-
self.setWindowIcon(self.windowIcon)
66-
else:
67-
self.windowIcon = None
63+
iconPath = 'share/qtvcp/images/qtplasmac/images/Chips_Plasma.png'
64+
appPath = os.path.realpath(os.path.dirname(sys.argv[0]))
65+
iconBase = '/usr' if appPath == '/bin' else appPath.replace('/bin', '')
66+
self.setWindowIcon(QIcon(os.path.join(iconBase, iconPath)))
6867
self.setWindowTitle('Powermax Communicator')
6968
qtRectangle = self.frameGeometry()
7069
centerPoint = QDesktopWidget().availableGeometry().center()

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ def __init__(self, parent=None):
4646
self.setCentralWidget(wid)
4747
layout = QHBoxLayout()
4848
wid.setLayout(layout)
49+
iconPath = 'share/qtvcp/images/qtplasmac/images/Chips_Plasma.png'
50+
appPath = os.path.realpath(os.path.dirname(sys.argv[0]))
51+
iconBase = '/usr' if appPath == '/bin' else appPath.replace('/bin', '')
52+
self.setWindowIcon(QIcon(os.path.join(iconBase, iconPath)))
4953
self.setWindowTitle('QtPlasmaC Cfg2Prefs')
5054
vBox = QVBoxLayout()
5155
heading = 'Convert Existing PlasmaC .cfg Files To A New QtPlasmaC .prefs File\n'

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ def __init__(self, parent=None):
3434
self.setCentralWidget(wid)
3535
self.layout = QHBoxLayout()
3636
wid.setLayout(self.layout)
37+
iconPath = 'share/qtvcp/images/qtplasmac/images/Chips_Plasma.png'
38+
appPath = os.path.realpath(os.path.dirname(sys.argv[0]))
39+
iconBase = '/usr' if appPath == '/bin' else appPath.replace('/bin', '')
40+
self.setWindowIcon(QIcon(os.path.join(iconBase, iconPath)))
3741
self.setWindowTitle('QtPlasmaC Material File Creator')
3842
self.create_widgets()
3943
self.inButton.setEnabled(False)

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ def __init__(self, parent=None):
6161
self.setCentralWidget(wid)
6262
layout = QHBoxLayout()
6363
wid.setLayout(layout)
64+
iconPath = 'share/qtvcp/images/qtplasmac/images/Chips_Plasma.png'
65+
appPath = os.path.realpath(os.path.dirname(sys.argv[0]))
66+
iconBase = '/usr' if appPath == '/bin' else appPath.replace('/bin', '')
67+
self.setWindowIcon(QIcon(os.path.join(iconBase, iconPath)))
6468
self.setWindowTitle('PLASMAC2QT')
6569
vBox = QVBoxLayout()
6670
if self.mode == 'auto':

0 commit comments

Comments
 (0)