WIP

spyder/plugins/history/plugin.py

@@ -13,7 +13,8 @@
 
 # Local imports
 from spyder.api.plugins import Plugins, SpyderDockablePlugin
-from spyder.api.plugin_registration.decorators import on_plugin_available
+from spyder.api.plugin_registration.decorators import (
+    on_plugin_available, on_plugin_teardown)
 from spyder.api.translations import get_translation
 from spyder.plugins.history.confpage import HistoryConfigPage
 from spyder.plugins.history.widgets import HistoryWidget
@@ -68,6 +69,16 @@ def on_console_available(self):
         console = self.get_plugin(Plugins.Console)
         console.sig_refreshed.connect(self.refresh)
 
+    @on_plugin_teardown(plugin=Plugins.Preferences)
+    def on_preferences_teardown(self):
+        preferences = self.get_plugin(Plugins.Preferences)
+        preferences.deregister_plugin_preferences(self)
+
+    @on_plugin_teardown(plugin=Plugins.Console)
+    def on_console_available(self):
+        console = self.get_plugin(Plugins.Console)
+        console.sig_refreshed.disconnect(self.refresh)
+
     def update_font(self):
         color_scheme = self.get_color_scheme()
         font = self.get_font()

spyder/plugins/layout/plugin.py

@@ -18,7 +18,8 @@
 # Local imports
 from spyder.api.exceptions import SpyderAPIError
 from spyder.api.plugins import Plugins, SpyderPluginV2
-from spyder.api.plugin_registration.decorators import on_plugin_available
+from spyder.api.plugin_registration.decorators import (
+    on_plugin_available, on_plugin_teardown)
 from spyder.api.translations import get_translation
 from spyder.api.utils import get_class_values
 from spyder.plugins.mainmenu.api import ApplicationMenus, ViewMenuSections
@@ -150,6 +151,49 @@ def on_toolbar_available(self):
             before=before_action
         )
 
+    @on_plugin_teardown(plugin=Plugins.MainMenu)
+    def on_main_menu_teardown(self):
+        mainmenu = self.get_plugin(Plugins.MainMenu)
+        container = self.get_container()
+        # Remove Panes related actions from the View application menu
+        panes_items = [
+            container._plugins_menu,
+            container._lock_interface_action,
+            container._close_dockwidget_action,
+            container._maximize_dockwidget_action]
+        for panes_item in panes_items:
+            mainmenu.remove_item_from_application_menu(
+                panes_item,
+                menu_id=ApplicationMenus.View)
+        # Remove layouts menu from the View application menu
+        layout_items = [
+            container._layouts_menu,
+            container._toggle_next_layout_action,
+            container._toggle_previous_layout_action]
+        for layout_item in layout_items:
+            mainmenu.remove_item_from_application_menu(
+                layout_item,
+                menu_id=ApplicationMenus.View)
+        # Remove fullscreen action from the View application menu
+        mainmenu.remove_item_from_application_menu(
+            container._fullscreen_action,
+            menu_id=ApplicationMenus.View)
+
+    @on_plugin_teardown(plugin=Plugins.Toolbar)
+    def on_toolbar_teardown(self):
+        container = self.get_container()
+        toolbars = self.get_plugin(Plugins.Toolbar)
+        # Remove actions from the Main application toolbar
+        before_action = self.get_action(
+            PreferencesActions.Show,
+            plugin=Plugins.Preferences
+        )
+
+        toolbars.remove_item_from_application_toolbar(
+            container._maximize_dockwidget_action,
+            toolbar_id=ApplicationToolbars.Main
+        )
+
     def before_mainwindow_visible(self):
         # Update layout menu
         self.update_layout_menu_actions()