PR: Initial reorganizations of IPython Console actions for the mainmenu

spyder/app/mainwindow.py

@@ -613,8 +613,6 @@ def signal_handler(signum, frame=None):
         self.run_menu_actions = []
         self.debug_menu = None
         self.debug_menu_actions = []
-        self.consoles_menu = None
-        self.consoles_menu_actions = []
         self.projects_menu = None
         self.projects_menu_actions = []
 
@@ -977,9 +975,6 @@ def setup(self):
         self.source_menu.aboutToShow.connect(self.update_source_menu)
         self.run_menu = mainmenu.get_application_menu("run_menu")
         self.debug_menu = mainmenu.get_application_menu("debug_menu")
-        self.consoles_menu = mainmenu.get_application_menu("consoles_menu")
-        self.consoles_menu.aboutToShow.connect(
-                self.update_execution_state_kernel)
         self.projects_menu = mainmenu.get_application_menu("projects_menu")
         self.projects_menu.aboutToShow.connect(self.valid_project)
 
@@ -1124,41 +1119,13 @@ def create_edit_action(text, tr_text, icon):
             menu_id=ApplicationMenus.Help,
             section=HelpMenuSections.Documentation)
 
-        # TODO: Move to plugin
-        # IPython documentation
-        if self.help is not None:
-            self.ipython_menu = SpyderMenu(
-                parent=self,
-                title=_("IPython documentation"))
-            intro_action = create_action(
-                self,
-                _("Intro to IPython"),
-                triggered=self.ipyconsole.show_intro)
-            quickref_action = create_action(
-                self,
-                _("Quick reference"),
-                triggered=self.ipyconsole.show_quickref)
-            guiref_action = create_action(
-                self,
-                _("Console help"),
-                triggered=self.ipyconsole.show_guiref)
-            add_actions(
-                self.ipython_menu,
-                (intro_action, guiref_action, quickref_action))
-            mainmenu.add_item_to_application_menu(
-                self.ipython_menu,
-                menu_id=ApplicationMenus.Help,
-                section=HelpMenuSections.ExternalDocumentation,
-                before_section=HelpMenuSections.About)
-
         # TODO: Migrate to use the MainMenu Plugin instead of list of actions
         # Filling out menu/toolbar entries:
         add_actions(self.edit_menu, self.edit_menu_actions)
         add_actions(self.search_menu, self.search_menu_actions)
         add_actions(self.source_menu, self.source_menu_actions)
         add_actions(self.run_menu, self.run_menu_actions)
         add_actions(self.debug_menu, self.debug_menu_actions)
-        add_actions(self.consoles_menu, self.consoles_menu_actions)
         add_actions(self.projects_menu, self.projects_menu_actions)
 
         # Emitting the signal notifying plugins that main window menu and
@@ -1430,13 +1397,6 @@ def register_shortcut(self, qaction_or_qshortcut, context, name,
         )
 
     # --- Other
-    def update_execution_state_kernel(self):
-        """Handle execution state of the current console."""
-        try:
-            self.ipyconsole.update_execution_state_kernel()
-        except AttributeError:
-            return
-
     def valid_project(self):
         """Handle an invalid active project."""
         try:

spyder/plugins/ipythonconsole/plugin.py

@@ -34,6 +34,7 @@
 
 # Local imports
 from spyder.api.plugins import Plugins, SpyderPluginWidget
+from spyder.api.widgets.menus import SpyderMenu
 from spyder.config.base import (_, get_conf_path, get_home_dir,
                                 running_under_pytest)
 from spyder.config.gui import get_font
@@ -46,6 +47,8 @@
 from spyder.plugins.ipythonconsole.widgets import (
     ClientWidget, ConsoleRestartDialog, KernelConnectionDialog,
     PageControlWidget)
+from spyder.plugins.mainmenu.api import (
+    ApplicationMenus, ConsolesMenuSections, HelpMenuSections)
 from spyder.py3compat import is_string, to_text_string, PY2, PY38_OR_MORE
 from spyder.utils import encoding
 from spyder.utils.icon_manager import ima
@@ -658,13 +661,50 @@ def get_plugin_actions(self):
                                        icon=ima.icon('rename'),
                                        triggered=self.tab_name_editor)
 
-        # Add the action to the 'Consoles' menu on the main window
-        main_consoles_menu = self.main.consoles_menu_actions
-        main_consoles_menu.insert(0, create_client_action)
-        main_consoles_menu += [special_console_menu, connect_to_kernel_action,
-                               MENU_SEPARATOR,
-                               self.interrupt_action, restart_action,
-                               reset_action]
+        # Add actions to the 'Consoles' menu on the main window
+        console_menu = self.main.mainmenu.get_application_menu("consoles_menu")
+        console_menu.aboutToShow.connect(
+                self.update_execution_state_kernel)
+        new_consoles_actions = [
+            create_client_action, special_console_menu,
+            connect_to_kernel_action]
+        restart_connect_consoles_actions = [
+            self.interrupt_action, restart_action, reset_action]
+        for console_new_action in new_consoles_actions:
+            self.main.mainmenu.add_item_to_application_menu(
+                console_new_action,
+                menu_id=ApplicationMenus.Consoles,
+                section=ConsolesMenuSections.New)
+        for console_restart_connect_action in restart_connect_consoles_actions:
+            self.main.mainmenu.add_item_to_application_menu(
+                console_restart_connect_action,
+                menu_id=ApplicationMenus.Consoles,
+                section=ConsolesMenuSections.New)
+
+        # IPython documentation
+        self.ipython_menu = SpyderMenu(
+            parent=self,
+            title=_("IPython documentation"))
+        intro_action = create_action(
+            self,
+            _("Intro to IPython"),
+            triggered=self.show_intro)
+        quickref_action = create_action(
+            self,
+            _("Quick reference"),
+            triggered=self.show_quickref)
+        guiref_action = create_action(
+            self,
+            _("Console help"),
+            triggered=self.show_guiref)
+        add_actions(
+            self.ipython_menu,
+            (intro_action, guiref_action, quickref_action))
+        self.main.mainmenu.add_item_to_application_menu(
+            self.ipython_menu,
+            menu_id=ApplicationMenus.Help,
+            section=HelpMenuSections.ExternalDocumentation,
+            before_section=HelpMenuSections.About)
 
         # Plugin actions
         self.menu_actions = [create_client_action, special_console_menu,

spyder/plugins/mainmenu/plugin.py

@@ -56,8 +56,7 @@ def register(self):
         create_app_menu(ApplicationMenus.Source, _("Sour&ce"), dynamic=False)
         create_app_menu(ApplicationMenus.Run, _("&Run"), dynamic=False)
         create_app_menu(ApplicationMenus.Debug, _("&Debug"), dynamic=False)
-        create_app_menu(
-            ApplicationMenus.Consoles, _("C&onsoles"), dynamic=False)
+        create_app_menu(ApplicationMenus.Consoles, _("C&onsoles"))
         create_app_menu(
             ApplicationMenus.Projects, _("&Projects"), dynamic=False)
         create_app_menu(ApplicationMenus.Tools, _("&Tools"))
@@ -224,7 +223,6 @@ def add_item_to_application_menu(self, item, menu=None, menu_id=None,
             ApplicationMenus.Source: self._main.source_menu_actions,
             ApplicationMenus.Run: self._main.run_menu_actions,
             ApplicationMenus.Debug: self._main.debug_menu_actions,
-            ApplicationMenus.Consoles: self._main.consoles_menu_actions,
             ApplicationMenus.Projects: self._main.projects_menu_actions,
         }