- made sure that some menu entries in the canvas popup menu are hidden when entering into an Editor and restored on exit

This commit is contained in:
Marius Stanciu
2022-04-14 23:39:51 +03:00
committed by Marius
parent 6bab9be25a
commit f4e800244e
4 changed files with 25 additions and 0 deletions

View File

@@ -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

View File

@@ -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)

View File

@@ -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