|
1 | | -VERSION = '1.236.294' |
| 1 | +VERSION = '1.236.295' |
2 | 2 |
|
3 | 3 | ''' |
4 | 4 | qtplasmac_handler.py |
@@ -330,6 +330,9 @@ def __init__(self, halcomp, widgets, paths): |
330 | 330 |
|
331 | 331 | # called by qtvcp.py |
332 | 332 | def initialized__(self): |
| 333 | + ucFile = os.path.join(self.PATHS.CONFIGPATH, 'qtplasmac_custom.py') |
| 334 | + if os.path.isfile(ucFile): |
| 335 | + exec(compile(open(ucFile, 'rb').read(), ucFile, 'exec')) |
333 | 336 | # ensure we get all startup errors |
334 | 337 | STATUS.connect('error', self.error_update) |
335 | 338 | STATUS.connect('graphics-gcode-error', lambda o, e:self.error_update(o, linuxcnc.OPERATOR_ERROR, e)) |
@@ -1326,20 +1329,12 @@ def buttons_show(self, first, last): |
1326 | 1329 | def estop_state(self, state): |
1327 | 1330 | if state: |
1328 | 1331 | self.w.power.setChecked(False) |
1329 | | - self.w.power.setStyleSheet(' \ |
1330 | | - QPushButton {{ color: {2}; background: {1}; border-color: {2} }} \ |
1331 | | - QPushButton:pressed {{ color: {2}; background: {1}; border-color: {0} }}' \ |
1332 | | - .format(self.foreColor, self.backColor, self.disabledColor)) |
| 1332 | + self.w.power.setEnabled(False) |
1333 | 1333 | if not self.firstRun: |
1334 | 1334 | log = _translate('HandlerClass', 'Emergency stop pressed') |
1335 | 1335 | STATUS.emit('update-machine-log', log, 'TIME') |
1336 | 1336 | else: |
1337 | | - self.w.power.setStyleSheet(' \ |
1338 | | - QPushButton {{ color: {0}; background: {1}; border-color: {0} }} \ |
1339 | | - QPushButton:pressed {{ color: {1}; background: {3}; border-color: {0} }} \ |
1340 | | - QPushButton:checked {{ color: {1}; background: {3}; border-color: {0} }} \ |
1341 | | - QPushButton:checked:pressed {{ color: {0}; background: {1}; border-color: {0} }}' \ |
1342 | | - .format(self.foreColor, self.backColor, self.disabledColor, self.fore1Color)) |
| 1337 | + self.w.power.setEnabled(True) |
1343 | 1338 | if not self.firstRun: |
1344 | 1339 | log = _translate('HandlerClass', 'Emergency stop cleared') |
1345 | 1340 | STATUS.emit('update-machine-log', log, 'TIME') |
|
0 commit comments