Skip to content

Commit 1d52396

Browse files
committed
qtvcp -fix spelling mistake 'TEMPARAY_MESSAGE'
1 parent 77b8939 commit 1d52396

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

lib/python/qtvcp/qt_action.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,10 @@ def TOGGLE_LIMITS_OVERRIDE(self):
153153
# let calling function know we didn't release the limit override
154154
return False
155155
elif not STATUS.is_limits_override_set() and STATUS.is_hard_limits_tripped():
156-
STATUS.emit('error', STATUS.TEMPARARY_MESSAGE, 'Hard Limits Are Overridden!')
156+
STATUS.emit('error', STATUS.TEMPORARY_MESSAGE, 'Hard Limits Are Overridden!')
157157
self.cmd.override_limits()
158158
else:
159-
STATUS.emit('error', STATUS.TEMPARARY_MESSAGE, 'Hard Limits Are Reset To Active!')
159+
STATUS.emit('error', STATUS.TEMPORARY_MESSAGE, 'Hard Limits Are Reset To Active!')
160160
self.cmd.override_limits()
161161

162162
def SET_MDI_MODE(self):
@@ -822,8 +822,12 @@ def SET_DISPLAY_MESSAGE(self, msg):
822822
def SET_ERROR_MESSAGE(self, msg):
823823
self.cmd.error_msg(msg)
824824

825+
# TODO remove in future
825826
def SET_TEMPARARY_MESSAGE(self, msg):
826-
STATUS.emit('error', STATUS.TEMPARARY_MESSAGE, msg)
827+
STATUS.emit('error', STATUS.TEMPORARY_MESSAGE, msg)
828+
829+
def SET_TEMPORARY_MESSAGE(self, msg):
830+
STATUS.emit('error', STATUS.TEMPORARY_MESSAGE, msg)
827831

828832
def TOUCHPLATE_TOUCHOFF(self, search_vel, probe_vel, max_probe,
829833
z_offset, retract_distance, z_safe_travel, rtn_method=None, error_rtn=None):

lib/python/qtvcp/widgets/file_manager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ def updateDirectoryView(self, path, quiet = False):
392392
else:
393393
LOG.debug("Set directory view error - no such path {}".format(path))
394394
if not quiet:
395-
STATUS.emit('error', STATUS.TEMPARARY_MESSAGE, "File Manager error - No such path: {}".format(path))
395+
STATUS.emit('error', STATUS.TEMPORARY_MESSAGE, "File Manager error - No such path: {}".format(path))
396396

397397
# retrieve selected filter (it's held as QT.userData)
398398
def filterChanged(self, index):

lib/python/qtvcp/widgets/screen_options.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ def process_error(self, w, kind, text):
369369
if self.desktop_notify:
370370
NOTICE.update(self.notify_critical, title='Internal NML Display:', message=text, msgs=self.notify_max_msgs)
371371

372-
elif kind == STATUS.TEMPARARY_MESSAGE: # temporary info
372+
elif kind == STATUS.TEMPORARY_MESSAGE: # temporary info
373373
if self.desktop_notify:
374374
NOTICE.update(self.notify_normal,
375375
title='Operator Info:',
@@ -385,7 +385,7 @@ def process_error(self, w, kind, text):
385385
STATUS.emit('play-sound', 'SPEAK %s ' % text)
386386
if self.mchnMsg_speak_text:
387387
if kind in (linuxcnc.OPERATOR_TEXT, linuxcnc.NML_TEXT,
388-
linuxcnc.OPERATOR_DISPLAY, STATUS.TEMPARARY_MESSAGE):
388+
linuxcnc.OPERATOR_DISPLAY, STATUS.TEMPORARY_MESSAGE):
389389
STATUS.emit('play-sound', 'SPEAK %s ' % text)
390390

391391
STATUS.emit('update-machine-log', text, 'TIME,ERROR')

0 commit comments

Comments
 (0)