diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 8857125b..82f5a913 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -3672,6 +3672,10 @@ class App(QtCore.QObject): if event.key == 'R': self.on_rotate(silent=True, preset=-90) + # Run a Script + if event.key == 'S': + self.on_filerunscript() + # Toggle Workspace if event.key == 'W': self.on_workspace_menu() @@ -3781,6 +3785,7 @@ class App(QtCore.QObject): E: Edit Object (if selected)
G: Grid On/Off
J: Jump to Coordinates
+L: New Excellon
M: Move Obj
M: Move Geo Item (when in Edit Mode)
N: New Geometry
@@ -3812,6 +3817,7 @@ class App(QtCore.QObject): SHIFT+G: Toggle the axis
SHIFT+P: Open Preferences Window
SHIFT+R: Rotate by 90 degree CCW
+SHIFT+S: Run a Script
SHIFT+W: Toggle the workspace
SHIFT+X: Skew on X axis
SHIFT+Y: Skew on Y axis
diff --git a/FlatCAMGUI.py b/FlatCAMGUI.py index ae67133b..91e9cc89 100644 --- a/FlatCAMGUI.py +++ b/FlatCAMGUI.py @@ -72,7 +72,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.menufile.addSeparator() # Run Scripts - self.menufilerunscript = QtWidgets.QAction(QtGui.QIcon('share/script16.png'), 'Run Script ...', self) + self.menufilerunscript = QtWidgets.QAction(QtGui.QIcon('share/script16.png'), 'Run Script ...\tSHIFT+S', self) self.menufile.addAction(self.menufilerunscript) # Separator diff --git a/ObjectCollection.py b/ObjectCollection.py index 43a42625..2db3610b 100644 --- a/ObjectCollection.py +++ b/ObjectCollection.py @@ -304,6 +304,11 @@ class ObjectCollection(QtCore.QAbstractItemModel): self.app.on_rotate(silent=True, preset=-90) return + # Run a Script + if key == QtCore.Qt.Key_S: + self.app.on_filerunscript() + return + # Toggle Workspace if key == QtCore.Qt.Key_W: self.app.on_workspace_menu() @@ -331,7 +336,7 @@ class ObjectCollection(QtCore.QAbstractItemModel): # Transformation Tool if key == QtCore.Qt.Key_R: - self.app.measurement_tool.run() + self.app.transform_tool.run() return # Cutout Tool diff --git a/README.md b/README.md index bf3b6691..de19f390 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ CAD program, and create G-Code for Isolation routing. - redesigned the messagebox that is showed when quiting ot creating a New Project: now it has an option ('Cancel') to abort the process returning to the app - added options for trace segmentation that can be useful for auto-levelling (code snippet from Lei Zheng from a rejected pull request on FlatCAM https://bitbucket.org/realthunder/ ) - added shortcut key 'L' for creating 'New Excellon' +- added shortcut key combo 'SHIFT+S' for Running a Script. 26.01.2019