- added a method to gracefully exit from threaded tasks and implemented it for the NCC Tool and for the Paint Tool
- modified the on_about() function to reflect the reality in 2019 - FlatCAM it is an Open Source contributed software
This commit is contained in:
@@ -1253,7 +1253,15 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
||||
<tr height="20">
|
||||
<td height="20"><strong>ALT+F10</strong></td>
|
||||
<td> Toggle Full Screen</td>
|
||||
</tr>
|
||||
<tr height="20">
|
||||
<td height="20"> </td>
|
||||
<td> </td>
|
||||
</tr>
|
||||
<tr height="20">
|
||||
<td height="20"><strong>CTRL+ALT+X</strong></td>
|
||||
<td> Abort current task (gracefully)</td>
|
||||
</tr>
|
||||
<tr height="20">
|
||||
<td height="20"> </td>
|
||||
<td> </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()
|
||||
|
||||
|
||||
@@ -1743,7 +1743,7 @@ class _BrowserTextEdit(QTextEdit):
|
||||
|
||||
def clear(self):
|
||||
QTextEdit.clear(self)
|
||||
text = "FlatCAM %s - Type help to get started\n\n" % self.version
|
||||
text = "FlatCAM %s - Open Source Software - Type help to get started\n\n" % self.version
|
||||
text = html.escape(text)
|
||||
text = text.replace('\n', '<br/>')
|
||||
self.moveCursor(QTextCursor.End)
|
||||
|
||||
Reference in New Issue
Block a user