Merge from 4.x: PR spyder-ide#9554

Author: ccordoba12

binder/environment.yml

@@ -30,7 +30,7 @@ dependencies:
 - python-language-server >=0.31.2,<0.32.0
 - pyxdg >=0.26
 - pyzmq >=17
-- qdarkstyle >=2.7
+- qdarkstyle >=2.8
 - qtawesome >=0.5.7
 - qtconsole >=4.6.0
 - qtpy >=1.5.0

requirements/conda.txt

@@ -24,7 +24,7 @@ pyqt <5.13
 python-language-server >=0.31.2,<0.32.0
 pyxdg >=0.26
 pyzmq >=17
-qdarkstyle >=2.7
+qdarkstyle >=2.8
 qtawesome >=0.5.7
 qtconsole >=4.6.0
 qtpy >=1.5.0

setup.py

@@ -228,7 +228,7 @@ def run(self):
     'python-language-server[all]>=0.31.2,<0.32.0',
     'pyxdg>=0.26;platform_system=="Linux"',
     'pyzmq>=17',
-    'qdarkstyle>=2.7',
+    'qdarkstyle>=2.8',
     'qtawesome>=0.5.7',
     'qtconsole>=4.6.0',
     'qtpy>=1.5.0',

spyder/config/gui.py

@@ -34,6 +34,9 @@
 # preferences page)
 Shortcut = namedtuple('Shortcut', 'data')
 
+# Stylesheet to remove the indicator that appears on tool buttons with a menu.
+STYLE_BUTTON_CSS = "QToolButton::menu-indicator{image: none;}"
+
 
 def font_is_installed(font):
     """Check if font is installed"""

spyder/dependencies.py

@@ -50,7 +50,7 @@
 PYLS_REQVER = '>=0.31.2;<0.32.0'
 PYXDG_REQVER = '>=0.26'
 PYZMQ_REQVER = '>=17'
-QDARKSTYLE_REQVER = '>=2.7'
+QDARKSTYLE_REQVER = '>=2.8'
 QTAWESOME_REQVER = '>=0.5.7'
 QTCONSOLE_REQVER = '>=4.6.0'
 QTPY_REQVER = '>=1.5.0'

spyder/plugins/editor/widgets/editor.py

@@ -32,7 +32,7 @@
 
 # Local imports
 from spyder.config.base import _, running_under_pytest
-from spyder.config.gui import is_dark_interface
+from spyder.config.gui import is_dark_interface, STYLE_BUTTON_CSS
 from spyder.config.manager import CONF
 from spyder.config.utils import (get_edit_filetypes, get_edit_filters,
                                  get_filter, is_kde_desktop, is_anaconda)
@@ -867,14 +867,7 @@ def setup_editorstack(self, parent, layout):
 
         menu_btn = create_toolbutton(self, icon=ima.icon('tooloptions'),
                                      tip=_('Options'))
-        # Don't show menu arrow and remove padding
-        if is_dark_interface():
-            menu_btn.setStyleSheet(
-                ("QToolButton::menu-indicator{image: none;}\n"
-                 "QToolButton{margin: 1px; padding: 3px;}"))
-        else:
-            menu_btn.setStyleSheet(
-                "QToolButton::menu-indicator{image: none;}")
+        menu_btn.setStyleSheet(STYLE_BUTTON_CSS)
         self.menu = QMenu(self)
         menu_btn.setMenu(self.menu)
         menu_btn.setPopupMode(menu_btn.InstantPopup)

spyder/plugins/ipythonconsole/widgets/client.py

@@ -33,7 +33,6 @@
 # Local imports
 from spyder.config.base import (_, get_image_path, get_module_source_path,
                                 running_under_pytest)
-from spyder.config.gui import is_dark_interface
 from spyder.config.manager import CONF
 from spyder.utils import icon_manager as ima
 from spyder.utils import sourcecode
@@ -413,8 +412,6 @@ def get_toolbar_buttons(self):
             self.disable_stop_button()
             # set click event handler
             self.stop_button.clicked.connect(self.stop_button_click_handler)
-            if is_dark_interface():
-                self.stop_button.setStyleSheet("QToolButton{padding: 3px;}")
         if self.stop_button is not None:
             buttons.append(self.stop_button)
 
@@ -426,8 +423,6 @@ def get_toolbar_buttons(self):
                                     icon=ima.icon('editdelete'),
                                     tip=_("Remove all variables"),
                                     triggered=self.reset_namespace)
-            if is_dark_interface():
-                self.reset_button.setStyleSheet("QToolButton{padding: 3px;}")
         if self.reset_button is not None:
             buttons.append(self.reset_button)
 

spyder/widgets/tabs.py

@@ -23,6 +23,7 @@
 
 # Local imports
 from spyder.config.base import _
+from spyder.config.gui import STYLE_BUTTON_CSS
 from spyder.config.manager import CONF
 from spyder.py3compat import to_text_string
 from spyder.utils import icon_manager as ima
@@ -271,12 +272,9 @@ def __init__(self, parent, actions=None, menu=None,
         corner_widgets.setdefault(Qt.TopLeftCorner, [])
         corner_widgets.setdefault(Qt.TopRightCorner, [])
 
-        self.browse_button = create_toolbutton(self,
-                                          icon=ima.icon('browse_tab'),
-                                          tip=_("Browse tabs"))
-        self.browse_button.setStyleSheet(
-            ("QToolButton::menu-indicator{image: none;}\n"
-             "QToolButton{margin: 1px; padding: 3px;}"))
+        self.browse_button = create_toolbutton(
+            self, icon=ima.icon('browse_tab'), tip=_("Browse tabs"))
+        self.browse_button.setStyleSheet(STYLE_BUTTON_CSS)
 
         self.browse_tabs_menu = QMenu(self)
         self.browse_button.setMenu(self.browse_tabs_menu)