- updated the new shortcut list with the shortcuts added lately

- now the special messages in the Shell are color coded according to the level. Before they all were RED. Now the WARNINGS are yellow, ERRORS are red and SUCCESS is a dark green. Also the level is in CAPS LOCK to make them more obvious
- some more changes to GUI interface (solved issues)
- added some status bar messages in the Geometry Editor to guide the user when using the Geometry Tools
- now the '`' shortcut key that shows the 'shortcut key list' in Editors points to the same window which is created in a tab no longer as a pop-up window. This tab can be detached if needed.
This commit is contained in:
Marius Stanciu
2019-02-03 15:13:09 +02:00
committed by Marius S
parent e5ebfac3ce
commit 6ea3499d39
22 changed files with 428 additions and 409 deletions

View File

@@ -68,7 +68,7 @@ class ToolMove(FlatCAMTool):
self.setVisible(False)
# signal that there is no command active
self.app.command_active = None
self.app.inform.emit("[warning_notcl]MOVE action cancelled. No object(s) to move.")
self.app.inform.emit("[WARNING_NOTCL]MOVE action cancelled. No object(s) to move.")
def on_left_click(self, event):
# mouse click will be accepted only if the left button is clicked
@@ -115,7 +115,7 @@ class ToolMove(FlatCAMTool):
try:
if not obj_list:
self.app.inform.emit("[warning_notcl] No object(s) selected.")
self.app.inform.emit("[WARNING_NOTCL] No object(s) selected.")
return "fail"
else:
for sel_obj in obj_list:
@@ -131,7 +131,7 @@ class ToolMove(FlatCAMTool):
# self.app.collection.set_active(sel_obj.options['name'])
except Exception as e:
proc.done()
self.app.inform.emit('[error_notcl] '
self.app.inform.emit('[ERROR_NOTCL] '
'ToolMove.on_left_click() --> %s' % str(e))
return "fail"
proc.done()
@@ -146,7 +146,7 @@ class ToolMove(FlatCAMTool):
return
except TypeError:
self.app.inform.emit('[error_notcl] '
self.app.inform.emit('[ERROR_NOTCL] '
'ToolMove.on_left_click() --> Error when mouse left click.')
return
@@ -174,7 +174,7 @@ class ToolMove(FlatCAMTool):
def on_key_press(self, event):
if event.key == 'escape':
# abort the move action
self.app.inform.emit("[warning_notcl]Move action cancelled.")
self.app.inform.emit("[WARNING_NOTCL]Move action cancelled.")
self.toggle()
return
@@ -186,7 +186,7 @@ class ToolMove(FlatCAMTool):
obj_list = self.app.collection.get_selected()
if not obj_list:
self.app.inform.emit("[warning_notcl]Object(s) not selected")
self.app.inform.emit("[WARNING_NOTCL]Object(s) not selected")
self.toggle()
else:
# if we have an object selected then we can safely activate the mouse events