- added a strong focus to the object_name entry in the Selected tab

- the keypad keyPressed are now detected correctly
This commit is contained in:
Marius Stanciu
2019-02-10 22:55:51 +02:00
committed by Marius S
parent 258f877865
commit e8b9555a94
4 changed files with 8 additions and 5 deletions

View File

@@ -1680,7 +1680,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
if key == QtCore.Qt.Key_F10 or key == 'F10':
self.app.on_fullscreen()
return
else:
elif modifiers == QtCore.Qt.NoModifier:
# Open Manual
if key == QtCore.Qt.Key_F1 or key == 'F1':
webbrowser.open(self.app.manual_url)
@@ -1824,7 +1824,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
pass
elif modifiers == QtCore.Qt.AltModifier:
pass
else:
elif modifiers == QtCore.Qt.NoModifier:
# toggle display of Notebook area
if key == QtCore.Qt.Key_QuoteLeft or key == '`':
self.app.on_toggle_notebook()
@@ -2036,7 +2036,6 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
# Show Shortcut list
if key == 'F3':
self.app.on_shortcut_list()
elif self.app.call_source == 'exc_editor':
if modifiers == QtCore.Qt.ControlModifier:
# save (update) the current geometry and return to the App
@@ -2053,7 +2052,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
pass
elif modifiers == QtCore.Qt.AltModifier:
pass
else:
elif modifiers == QtCore.Qt.NoModifier:
# Abort the current action
if key == QtCore.Qt.Key_Escape or key == 'Escape':
# TODO: ...?