From f4e800244e1f4030ef369c2c4625e72d2fa8b873 Mon Sep 17 00:00:00 2001
From: Marius Stanciu <marius.adrian@gmail.com>
Date: Thu, 14 Apr 2022 23:39:51 +0300
Subject: [PATCH] - made sure that some menu entries in the canvas popup menu
 are hidden when entering into an Editor and restored on exit

---
 CHANGELOG.md                  | 1 +
 appEditors/AppExcEditor.py    | 8 ++++++++
 appEditors/AppGeoEditor.py    | 8 ++++++++
 appEditors/AppGerberEditor.py | 8 ++++++++
 4 files changed, 25 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 933167bc..83edc0b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ CHANGELOG for FlatCAM Evo beta
 - in Geometry Editor, for Path tool, added the ability to differentiate between creating a multidigit number for the projection and starting a new number (for a new segment)
 - added ability to control the color of the project items for the dark theme too
 - in Geometry Editor, for the Polygon Tool added the UI, the length projection and the cursor data, just like for the Path Tool
+- made sure that some menu entries in the canvas popup menu are hidden when entering into an Editor and restored on exit
 
 13.04.2022
 
diff --git a/appEditors/AppExcEditor.py b/appEditors/AppExcEditor.py
index e818d20a..5d701f71 100644
--- a/appEditors/AppExcEditor.py
+++ b/appEditors/AppExcEditor.py
@@ -2580,6 +2580,10 @@ class AppExcEditor(QtCore.QObject):
         self.app.ui.g_editor_cmenu.menuAction().setVisible(False)
         self.app.ui.grb_editor_cmenu.menuAction().setVisible(False)
 
+        self.app.ui.pop_menucolor.menuAction().setVisible(False)
+        self.app.ui.popmenu_numeric_move.setVisible(False)
+        self.app.ui.popmenu_move2origin.setVisible(False)
+
         # show the UI
         self.ui.drills_frame.show()
 
@@ -2625,6 +2629,10 @@ class AppExcEditor(QtCore.QObject):
         self.app.ui.e_editor_cmenu.menuAction().setVisible(False)
         self.app.ui.grb_editor_cmenu.menuAction().setVisible(False)
 
+        self.app.ui.pop_menucolor.menuAction().setVisible(True)
+        self.app.ui.popmenu_numeric_move.setVisible(True)
+        self.app.ui.popmenu_move2origin.setVisible(True)
+
         # Show original geometry
         if self.edited_obj:
             self.edited_obj.visible = True
diff --git a/appEditors/AppGeoEditor.py b/appEditors/AppGeoEditor.py
index 24e7231e..49c18d21 100644
--- a/appEditors/AppGeoEditor.py
+++ b/appEditors/AppGeoEditor.py
@@ -2917,6 +2917,10 @@ class AppGeoEditor(QtCore.QObject):
 
         self.app.ui.status_toolbar.setDisabled(False)
 
+        self.app.ui.pop_menucolor.menuAction().setVisible(False)
+        self.app.ui.popmenu_numeric_move.setVisible(False)
+        self.app.ui.popmenu_move2origin.setVisible(False)
+
         self.app.ui.popmenu_disable.setVisible(False)
         self.app.ui.cmenu_newmenu.menuAction().setVisible(False)
         self.app.ui.popmenu_properties.setVisible(False)
@@ -2981,6 +2985,10 @@ class AppGeoEditor(QtCore.QObject):
         self.app.ui.g_editor_cmenu.setEnabled(False)
         self.app.ui.e_editor_cmenu.setEnabled(False)
 
+        self.app.ui.pop_menucolor.menuAction().setVisible(True)
+        self.app.ui.popmenu_numeric_move.setVisible(True)
+        self.app.ui.popmenu_move2origin.setVisible(True)
+
         self.app.ui.popmenu_disable.setVisible(True)
         self.app.ui.cmenu_newmenu.menuAction().setVisible(True)
         self.app.ui.popmenu_properties.setVisible(True)
diff --git a/appEditors/AppGerberEditor.py b/appEditors/AppGerberEditor.py
index b34fb812..6613ecc5 100644
--- a/appEditors/AppGerberEditor.py
+++ b/appEditors/AppGerberEditor.py
@@ -4358,6 +4358,10 @@ class AppGerberEditor(QtCore.QObject):
         self.app.ui.popmenu_edit.setVisible(False)
         self.app.ui.popmenu_save.setVisible(True)
 
+        self.app.ui.pop_menucolor.menuAction().setVisible(False)
+        self.app.ui.popmenu_numeric_move.setVisible(False)
+        self.app.ui.popmenu_move2origin.setVisible(False)
+
         self.app.ui.popmenu_disable.setVisible(False)
         self.app.ui.cmenu_newmenu.menuAction().setVisible(False)
         self.app.ui.popmenu_properties.setVisible(False)
@@ -4410,6 +4414,10 @@ class AppGerberEditor(QtCore.QObject):
         self.app.ui.e_editor_cmenu.menuAction().setVisible(False)
         self.app.ui.grb_editor_cmenu.menuAction().setVisible(False)
 
+        self.app.ui.pop_menucolor.menuAction().setVisible(True)
+        self.app.ui.popmenu_numeric_move.setVisible(True)
+        self.app.ui.popmenu_move2origin.setVisible(True)
+
         # Show original geometry
         if self.gerber_obj:
             self.gerber_obj.visible = True