- fixed minor issue with not having the Cancel option on exiting the GCode Editor through the Toolbar button

This commit is contained in:
Marius Stanciu
2021-01-22 14:26:04 +02:00
committed by Marius
parent bd64a34ab8
commit 1c9fcbfd20
3 changed files with 3 additions and 2 deletions

View File

@@ -11,6 +11,7 @@ CHANGELOG for FlatCAM beta
- added ability to see the verbose log when importing SVG's (if set in preferences)
- added some more logs to the SVG import
- fixed minor issue with not having the Cancel option on exiting the GCode Editor through the Toolbar button
19.01.2021

View File

@@ -3773,7 +3773,7 @@ class MainGUI(QtWidgets.QMainWindow):
if modifiers == QtCore.Qt.ControlModifier:
# save (update) the current geometry and return to the App
if key == QtCore.Qt.Key_S or key == 'S':
self.app.editor2object()
self.app.editor2object(force_cancel=True)
return
# SHIFT
elif modifiers == QtCore.Qt.ShiftModifier:

View File

@@ -2271,7 +2271,7 @@ class App(QtCore.QObject):
# Edit Toolbar Signals
self.ui.editor_start_btn.triggered.connect(self.object2editor)
self.ui.editor_exit_btn.clicked.connect(lambda: self.editor2object())
self.ui.editor_exit_btn.clicked.connect(lambda: self.editor2object(force_cancel=True))
self.ui.copy_btn.triggered.connect(self.on_copy_command)
self.ui.delete_btn.triggered.connect(self.on_delete)