diff --git a/FlatCAMObj.py b/FlatCAMObj.py index 6cf481b8..c4e83c76 100644 --- a/FlatCAMObj.py +++ b/FlatCAMObj.py @@ -122,11 +122,6 @@ class FlatCAMObj(QtCore.QObject): self.plot_single_object.connect(self.single_object_plot) - # assert isinstance(self.ui, ObjectUI) - # self.ui.name_entry.returnPressed.connect(self.on_name_activate) - # self.ui.offset_button.clicked.connect(self.on_offset_button_click) - # self.ui.scale_button.clicked.connect(self.on_scale_button_click) - def __del__(self): pass @@ -189,7 +184,7 @@ class FlatCAMObj(QtCore.QObject): except (TypeError, AttributeError): pass try: - self.ui.scale_entry.returnPressed.connect(self.on_scale_button_click) + self.ui.scale_entry.editingFinished.connect(self.on_scale_button_click) except (TypeError, AttributeError): pass # self.ui.skew_button.clicked.connect(self.on_skew_button_click) @@ -3801,7 +3796,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): self.ui.generate_cnc_button.clicked.connect(self.on_generatecnc_button_click) self.ui.paint_tool_button.clicked.connect(lambda: self.app.paint_tool.run(toggle=False)) self.ui.pp_geometry_name_cb.activated.connect(self.on_pp_changed) - self.ui.addtool_entry.returnPressed.connect(lambda: self.on_tool_add()) + self.ui.addtool_entry.editingFinished.connect(lambda: self.on_tool_add()) def set_tool_offset_visibility(self, current_row): if current_row is None: diff --git a/README.md b/README.md index d69cc0e7..9387e822 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ CAD program, and create G-Code for Isolation routing. - converted all ObjectUI entries to FCDoubleSpinner and FCSpinner - updated the translation files (~ 89% translation level) - changed the splash screen as it seems that FlatCAM beta will never be more than beta +- changed some of the signals from returnPressed to editingFinished due of now using the SpinBoxes 13.10.2019 diff --git a/flatcamEditors/FlatCAMExcEditor.py b/flatcamEditors/FlatCAMExcEditor.py index aa686dc4..ede5dc69 100644 --- a/flatcamEditors/FlatCAMExcEditor.py +++ b/flatcamEditors/FlatCAMExcEditor.py @@ -1984,7 +1984,7 @@ class FlatCAMExcEditor(QtCore.QObject): self.app.ui.delete_drill_btn.triggered.connect(self.on_delete_btn) self.name_entry.returnPressed.connect(self.on_name_activate) self.addtool_btn.clicked.connect(self.on_tool_add) - self.addtool_entry.returnPressed.connect(self.on_tool_add) + self.addtool_entry.editingFinished.connect(self.on_tool_add) self.deltool_btn.clicked.connect(self.on_tool_delete) # self.tools_table_exc.selectionModel().currentChanged.connect(self.on_row_selected) self.tools_table_exc.cellPressed.connect(self.on_row_selected) diff --git a/flatcamEditors/FlatCAMGeoEditor.py b/flatcamEditors/FlatCAMGeoEditor.py index 743d1a71..ce158e02 100644 --- a/flatcamEditors/FlatCAMGeoEditor.py +++ b/flatcamEditors/FlatCAMGeoEditor.py @@ -973,13 +973,13 @@ class TransformEditorTool(FlatCAMTool): self.flipy_button.clicked.connect(self.on_flipy) self.flip_ref_button.clicked.connect(self.on_flip_add_coords) - self.rotate_entry.returnPressed.connect(self.on_rotate) - self.skewx_entry.returnPressed.connect(self.on_skewx) - self.skewy_entry.returnPressed.connect(self.on_skewy) - self.scalex_entry.returnPressed.connect(self.on_scalex) - self.scaley_entry.returnPressed.connect(self.on_scaley) - self.offx_entry.returnPressed.connect(self.on_offx) - self.offy_entry.returnPressed.connect(self.on_offy) + self.rotate_entry.editingFinished.connect(self.on_rotate) + self.skewx_entry.editingFinished.connect(self.on_skewx) + self.skewy_entry.editingFinished.connect(self.on_skewy) + self.scalex_entry.editingFinished.connect(self.on_scalex) + self.scaley_entry.editingFinished.connect(self.on_scaley) + self.offx_entry.editingFinished.connect(self.on_offx) + self.offy_entry.editingFinished.connect(self.on_offy) self.set_tool_ui() diff --git a/flatcamEditors/FlatCAMGrbEditor.py b/flatcamEditors/FlatCAMGrbEditor.py index fcb6cbb5..75acce0f 100644 --- a/flatcamEditors/FlatCAMGrbEditor.py +++ b/flatcamEditors/FlatCAMGrbEditor.py @@ -2959,8 +2959,8 @@ class FlatCAMGrbEditor(QtCore.QObject): self.aptype_cb.currentIndexChanged[str].connect(self.on_aptype_changed) self.addaperture_btn.clicked.connect(self.on_aperture_add) - self.apsize_entry.returnPressed.connect(self.on_aperture_add) - self.apdim_entry.returnPressed.connect(self.on_aperture_add) + self.apsize_entry.editingFinished.connect(self.on_aperture_add) + self.apdim_entry.editingFinished.connect(self.on_aperture_add) self.delaperture_btn.clicked.connect(self.on_aperture_delete) self.apertures_table.cellPressed.connect(self.on_row_selected) @@ -5299,13 +5299,13 @@ class TransformEditorTool(FlatCAMTool): self.flipy_button.clicked.connect(self.on_flipy) self.flip_ref_button.clicked.connect(self.on_flip_add_coords) - self.rotate_entry.returnPressed.connect(self.on_rotate) - self.skewx_entry.returnPressed.connect(self.on_skewx) - self.skewy_entry.returnPressed.connect(self.on_skewy) - self.scalex_entry.returnPressed.connect(self.on_scalex) - self.scaley_entry.returnPressed.connect(self.on_scaley) - self.offx_entry.returnPressed.connect(self.on_offx) - self.offy_entry.returnPressed.connect(self.on_offy) + self.rotate_entry.editingFinished.connect(self.on_rotate) + self.skewx_entry.editingFinished.connect(self.on_skewx) + self.skewy_entry.editingFinished.connect(self.on_skewy) + self.scalex_entry.editingFinished.connect(self.on_scalex) + self.scaley_entry.editingFinished.connect(self.on_scaley) + self.offx_entry.editingFinished.connect(self.on_offx) + self.offy_entry.editingFinished.connect(self.on_offy) self.set_tool_ui() diff --git a/flatcamTools/ToolSolderPaste.py b/flatcamTools/ToolSolderPaste.py index 35adbbb7..91ea734b 100644 --- a/flatcamTools/ToolSolderPaste.py +++ b/flatcamTools/ToolSolderPaste.py @@ -416,7 +416,7 @@ class SolderPaste(FlatCAMTool): # ## Signals self.combo_context_del_action.triggered.connect(self.on_delete_object) self.addtool_btn.clicked.connect(self.on_tool_add) - self.addtool_entry.returnPressed.connect(self.on_tool_add) + self.addtool_entry.editingFinished.connect(self.on_tool_add) self.deltool_btn.clicked.connect(self.on_tool_delete) self.soldergeo_btn.clicked.connect(self.on_create_geo_click) self.solder_gcode_btn.clicked.connect(self.on_create_gcode_click)