PR: Unify UI of editors in Variable Explorer and simplify code

spyder/api/widgets/main_widget.py

@@ -279,7 +279,7 @@ def __init__(self, name, plugin, parent=None):
             parent=self,
             title=_("Main widget corner toolbar"),
         )
-        self._corner_toolbar.ID = 'corner_toolbar',
+        self._corner_toolbar.ID = 'corner_toolbar'
 
         TOOLBAR_REGISTRY.register_reference(
             self._corner_toolbar, self._corner_toolbar.ID,

spyder/api/widgets/mixins.py

@@ -30,12 +30,14 @@
 )
 from spyder.api.exceptions import SpyderAPIError
 from spyder.api.widgets.menus import SpyderMenu
+from spyder.api.widgets.toolbars import SpyderToolbar
 from spyder.config.manager import CONF
 from spyder.utils.icon_manager import ima
 from spyder.utils.image_path_manager import get_image_path
 from spyder.utils.qthelpers import create_action, create_toolbutton
 from spyder.utils.registries import (
     ACTION_REGISTRY, MENU_REGISTRY, TOOLBAR_REGISTRY, TOOLBUTTON_REGISTRY)
+from spyder.utils.stylesheet import PANES_TOOLBAR_STYLESHEET
 
 
 class SpyderToolButtonMixin:
@@ -46,7 +48,7 @@ class SpyderToolButtonMixin:
     def create_toolbutton(self, name, text=None, icon=None,
                           tip=None, toggled=None, triggered=None,
                           autoraise=True, text_beside_icon=False,
-                          section=None, option=None):
+                          section=None, option=None, register=True):
         """
         Create a Spyder toolbutton.
         """
@@ -72,7 +74,7 @@ def create_toolbutton(self, name, text=None, icon=None,
             id_=name,
             plugin=self.PLUGIN_NAME,
             context_name=self.CONTEXT_NAME,
-            register_toolbutton=True
+            register_toolbutton=register
         )
         toolbutton.name = name
 
@@ -166,13 +168,23 @@ def create_stretcher(self, id_=None):
             stretcher.ID = id_
         return stretcher
 
-    def create_toolbar(self, name: str) -> QToolBar:
+    def create_toolbar(self, name: str,
+                       register: bool = True) -> SpyderToolbar:
         """
         Create a Spyder toolbar.
-        """
-        toolbar = QToolBar(self)
-        TOOLBAR_REGISTRY.register_reference(
-            toolbar, name, self.PLUGIN_NAME, self.CONTEXT_NAME)
+
+        Parameters
+        ----------
+        name: str
+            Name of the toolbar to create.
+        register: bool
+            Whether to register the toolbar in the global registry.
+        """
+        toolbar = SpyderToolbar(self, name)
+        toolbar.setStyleSheet(str(PANES_TOOLBAR_STYLESHEET))
+        if register:
+            TOOLBAR_REGISTRY.register_reference(
+                toolbar, name, self.PLUGIN_NAME, self.CONTEXT_NAME)
         return toolbar
 
     def get_toolbar(self, name: str, context: Optional[str] = None,
@@ -255,6 +267,7 @@ def _create_menu(
         title: Optional[str] = None,
         icon: Optional[QIcon] = None,
         reposition: Optional[bool] = True,
+        register: bool = True,
         MenuClass=SpyderMenu
     ) -> SpyderMenu:
         """
@@ -266,14 +279,15 @@ def _create_menu(
           subclass of SpyderMenu.
         * Refer to the documentation for `create_menu` to learn about its args.
         """
-        menus = getattr(self, '_menus', None)
-        if menus is None:
-            self._menus = OrderedDict()
+        if register:
+            menus = getattr(self, '_menus', None)
+            if menus is None:
+                self._menus = OrderedDict()
 
-        if menu_id in self._menus:
-            raise SpyderAPIError(
-                'Menu name "{}" already in use!'.format(menu_id)
-            )
+            if menu_id in self._menus:
+                raise SpyderAPIError(
+                    'Menu name "{}" already in use!'.format(menu_id)
+                )
 
         menu = MenuClass(
             parent=self,
@@ -286,11 +300,12 @@ def _create_menu(
             menu.menuAction().setIconVisibleInMenu(True)
             menu.setIcon(icon)
 
-        MENU_REGISTRY.register_reference(
-            menu, menu_id, self.PLUGIN_NAME, self.CONTEXT_NAME
-        )
+        if register:
+            MENU_REGISTRY.register_reference(
+                menu, menu_id, self.PLUGIN_NAME, self.CONTEXT_NAME
+            )
+            self._menus[menu_id] = menu
 
-        self._menus[menu_id] = menu
         return menu
 
     def create_menu(
@@ -299,6 +314,7 @@ def create_menu(
         title: Optional[str] = None,
         icon: Optional[QIcon] = None,
         reposition: Optional[bool] = True,
+        register: bool = True
     ) -> SpyderMenu:
         """
         Create a menu for Spyder.
@@ -312,7 +328,9 @@ def create_menu(
         icon: QIcon or None
             Icon to use for the menu.
         reposition: bool, optional (default True)
-            Whether to vertically reposition the menu due to it's padding.
+            Whether to vertically reposition the menu due to its padding.
+        register: bool
+            Whether to register the menu in the global registry.
 
         Returns
         -------
@@ -323,7 +341,8 @@ def create_menu(
             menu_id=menu_id,
             title=title,
             icon=icon,
-            reposition=reposition
+            reposition=reposition,
+            register=register
         )
 
     def get_menu(
@@ -620,15 +639,12 @@ def update_actions(self, options):
         raise NotImplementedError('')
 
 
-class SpyderWidgetMixin(SpyderActionMixin, SpyderMenuMixin,
-                        SpyderConfigurationObserver, SpyderToolButtonMixin):
+class SpyderWidgetMixin(SpyderActionMixin, SpyderConfigurationObserver,
+                        SpyderMenuMixin, SpyderToolbarMixin,
+                        SpyderToolButtonMixin):
     """
     Basic functionality for all Spyder widgets and Qt items.
 
-    This mixin does not include toolbar handling as that is limited to the
-    application with the coreui plugin or the PluginMainWidget for dockable
-    plugins.
-
     This provides a simple management of widget options, as well as Qt helpers
     for defining the actions a widget provides.
     """