bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- added a method to gracefully exit from threaded tasks and implemented it for the NCC Tool and for the Paint Tool

Browse Source 
- modified the on_about() function to reflect the reality in 2019 - FlatCAM it is an Open Source contributed software
This commit is contained in:
Marius Stanciu
2019-09-07 09:16:32 +03:00
committed by Marius
parent 9da1defe3e
commit 5d854a6f1b
8 changed files with 195 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
flatcamGUI/FlatCAMGUI.py
View File

@@ -1253,7 +1253,15 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
<tr height="20">
<td height="20"><strong>ALT+F10</strong></td>
<td>&nbsp;Toggle Full Screen</td>
</tr>
<tr height="20">
<td height="20">&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr height="20">
<td height="20"><strong>CTRL+ALT+X</strong></td>
<td>&nbsp;Abort current task (gracefully)</td>
</tr>
<tr height="20">
<td height="20">&nbsp;</td>
<td>&nbsp;</td>
@@ -2163,7 +2171,12 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
key = event.key
if self.app.call_source == 'app':
if modifiers == QtCore.Qt.ControlModifier:
if modifiers == QtCore.Qt.ControlModifier | QtCore.Qt.AltModifier:
if key == QtCore.Qt.Key_X:
self.app.abort_all_tasks()
return
elif modifiers == QtCore.Qt.ControlModifier:
if key == QtCore.Qt.Key_A:
self.app.on_selectall()