From 5a1ea25cef875525b1144fbd4ea5228857fe3d66 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Mon, 16 Nov 2020 02:40:21 +0200 Subject: [PATCH] - fixed the menu entries for the Properties Tool, Transform Tool - fixed the Tools menu actions --- CHANGELOG.md | 2 ++ appGUI/MainGUI.py | 2 +- appObjects/FlatCAMObj.py | 2 +- appTool.py | 2 +- app_Main.py | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f368bb23..761594fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ CHANGELOG for FlatCAM beta - fixed the App Tools buttons in the Tools section of the Properties Tab for Excellon, Gerber and Geometry objects - made the Tool Tab closable - fixed a small typo in the Gerber Properties Tab that made the icon for the Cutout Tool not to show up +- fixed the menu entries for the Properties Tool, Transform Tool +- fixed the Tools menu actions 15.11.2020 diff --git a/appGUI/MainGUI.py b/appGUI/MainGUI.py index 1acae224..19929b43 100644 --- a/appGUI/MainGUI.py +++ b/appGUI/MainGUI.py @@ -2893,7 +2893,7 @@ class MainGUI(QtWidgets.QMainWindow): # Properties Tool if key == QtCore.Qt.Key_P: - self.app.properties_tool.run() + self.app.properties_tool.run(toggle=True) return # Change Units diff --git a/appObjects/FlatCAMObj.py b/appObjects/FlatCAMObj.py index ab5d89e0..0ce96dd3 100644 --- a/appObjects/FlatCAMObj.py +++ b/appObjects/FlatCAMObj.py @@ -198,7 +198,7 @@ class FlatCAMObj(QtCore.QObject): pass try: - self.ui.transformations_button.clicked.connect(self.app.transform_tool.run) + self.ui.transformations_button.clicked.connect(lambda: self.app.transform_tool.run(toggle=True)) except (TypeError, AttributeError): pass diff --git a/appTool.py b/appTool.py index 0df3976f..a61a1439 100644 --- a/appTool.py +++ b/appTool.py @@ -81,7 +81,7 @@ class AppTool(QtWidgets.QWidget): if separator is True: pos.addSeparator() - self.menuAction.triggered.connect(self.run) + self.menuAction.triggered.connect(lambda: self.run(toggle=True)) def run(self): diff --git a/app_Main.py b/app_Main.py index c554f6b5..dc3a4b10 100644 --- a/app_Main.py +++ b/app_Main.py @@ -7121,7 +7121,7 @@ class App(QtCore.QObject): """ self.defaults.report_usage("obj_properties()") - self.properties_tool.run(toggle=False) + self.properties_tool.run(toggle=True) def on_project_context_save(self): """