PR: Remove icons from standard buttons in dialogs (UI/UX)

spyder/api/widgets/dialogs.py

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright © Spyder Project Contributors
+# Licensed under the terms of the MIT License
+# (see spyder/__init__.py for details)
+
+"""
+Spyder dialog widgets.
+"""
+
+# Third-party imports
+from qtpy.QtCore import Qt
+from qtpy.QtGui import QIcon
+from qtpy.QtWidgets import QDialogButtonBox
+
+
+class SpyderDialogButtonBox(QDialogButtonBox):
+    """
+    QDialogButtonBox widget for Spyder that doesn't display icons on its
+    standard buttons.
+    """
+
+    def __init__(self, buttons=None, orientation=Qt.Horizontal, parent=None):
+        if buttons:
+            super().__init__(buttons, orientation, parent)
+        elif orientation:
+            super().__init__(orientation=orientation, parent=parent)
+        else:
+            super().__init__(parent=parent)
+
+        button_constants = [
+            QDialogButtonBox.Ok,
+            QDialogButtonBox.Open,
+            QDialogButtonBox.Save,
+            QDialogButtonBox.Cancel,
+            QDialogButtonBox.Close,
+            QDialogButtonBox.Discard,
+            QDialogButtonBox.Apply,
+            QDialogButtonBox.Reset,
+            QDialogButtonBox.RestoreDefaults,
+            QDialogButtonBox.Help,
+            QDialogButtonBox.SaveAll,
+            QDialogButtonBox.Yes,
+            QDialogButtonBox.YesToAll,
+            QDialogButtonBox.No,
+            QDialogButtonBox.NoToAll,
+            QDialogButtonBox.Abort,
+            QDialogButtonBox.Retry,
+            QDialogButtonBox.Ignore,
+        ]
+
+        for constant in button_constants:
+            button = self.button(constant)
+            if button is not None:
+                button.setIcon(QIcon())

spyder/api/widgets/menus.py

@@ -466,14 +466,17 @@ def showEvent(self, event):
             self._is_shown = True
 
         # Reposition menus horizontally due to border
-        if QCursor().pos().x() - self.pos().x() < 40:
-            # If the difference between the current cursor x position and the
-            # menu one is small, it means the menu will be shown to the right,
-            # so we need to move it in that direction.
-            delta_x = 1
+        if self.APP_MENU:
+            delta_x = 0 if MAC else 3
         else:
-            # This happens when the menu is shown to the left.
-            delta_x = -1
+            if QCursor().pos().x() - self.pos().x() < 40:
+                # If the difference between the current cursor x position and
+                # the menu one is small, it means the menu will be shown to the
+                # right, so we need to move it in that direction.
+                delta_x = 1
+            else:
+                # This happens when the menu is shown to the left.
+                delta_x = -1
 
         self.move(self.pos().x() + delta_x, self.pos().y())
 

spyder/plugins/appearance/widgets.py

@@ -11,6 +11,7 @@
                             QHBoxLayout, QVBoxLayout, QWidget)
 
 from spyder.api.translations import _
+from spyder.api.widgets.dialogs import SpyderDialogButtonBox
 from spyder.utils import syntaxhighlighters
 
 
@@ -30,7 +31,9 @@ def __init__(self, parent=None, stack=None):
         self.last_used_scheme = None
 
         # Widgets
-        bbox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        bbox = SpyderDialogButtonBox(
+            QDialogButtonBox.Ok | QDialogButtonBox.Cancel
+        )
 
         # Layout
         layout = QVBoxLayout()

spyder/plugins/application/widgets/about.py

@@ -24,6 +24,7 @@
     __website_url__ as website_url,
     get_versions, get_versions_text
 )
+from spyder.api.widgets.dialogs import SpyderDialogButtonBox
 from spyder.api.widgets.mixins import SvgToScaledPixmap
 from spyder.config.base import _
 from spyder.utils.icon_manager import ima
@@ -230,7 +231,7 @@ def __init__(self, parent):
 
         # -- Buttons
         info_btn = QPushButton(_("Copy version info"))
-        ok_btn = QDialogButtonBox(QDialogButtonBox.Ok)
+        ok_btn = SpyderDialogButtonBox(QDialogButtonBox.Ok)
 
         # Apply style to buttons
         for button in [info_btn, ok_btn]:

spyder/plugins/completion/providers/languageserver/widgets/serversconfig.py

@@ -24,6 +24,7 @@
 # Local imports
 from spyder.api.config.fonts import SpyderFontsMixin, SpyderFontType
 from spyder.api.widgets.comboboxes import SpyderComboBox
+from spyder.api.widgets.dialogs import SpyderDialogButtonBox
 from spyder.config.base import _
 from spyder.plugins.completion.api import SUPPORTED_LANGUAGES
 from spyder.utils.misc import check_connection_port
@@ -165,8 +166,9 @@ def __init__(self, parent, language=None, cmd='', host='127.0.0.1',
         self.conf_label = QLabel(_('<b>Server Configuration:</b>'))
         self.conf_input = SimpleCodeEditor(None)
 
-        self.bbox = QDialogButtonBox(QDialogButtonBox.Ok |
-                                     QDialogButtonBox.Cancel)
+        self.bbox = SpyderDialogButtonBox(
+            QDialogButtonBox.Ok | QDialogButtonBox.Cancel
+        )
         self.button_ok = self.bbox.button(QDialogButtonBox.Ok)
         self.button_cancel = self.bbox.button(QDialogButtonBox.Cancel)
 

spyder/plugins/completion/providers/snippets/widgets/snippetsconfig.py

@@ -24,6 +24,7 @@
 # Local imports
 from spyder.api.config.fonts import SpyderFontsMixin, SpyderFontType
 from spyder.api.widgets.comboboxes import SpyderComboBox
+from spyder.api.widgets.dialogs import SpyderDialogButtonBox
 from spyder.config.base import _
 from spyder.plugins.completion.api import SUPPORTED_LANGUAGES
 from spyder.utils.snippets.ast import build_snippet_ast
@@ -275,8 +276,9 @@ def __init__(self, parent, language=None, trigger_text='', description='',
         self.snippet_input = SimpleCodeEditor(None)
 
         # Dialog buttons
-        self.bbox = QDialogButtonBox(QDialogButtonBox.Ok |
-                                     QDialogButtonBox.Cancel)
+        self.bbox = SpyderDialogButtonBox(
+            QDialogButtonBox.Ok | QDialogButtonBox.Cancel
+        )
         self.button_ok = self.bbox.button(QDialogButtonBox.Ok)
         self.button_cancel = self.bbox.button(QDialogButtonBox.Cancel)
 

spyder/plugins/editor/widgets/autosaveerror.py

@@ -14,6 +14,7 @@
                             QVBoxLayout)
 
 # Local imports
+from spyder.api.widgets.dialogs import SpyderDialogButtonBox
 from spyder.config.base import _
 
 
@@ -59,7 +60,7 @@ def __init__(self, action, error):
         layout.addWidget(self.dismiss_box)
         layout.addSpacing(15)
 
-        button_box = QDialogButtonBox(QDialogButtonBox.Ok)
+        button_box = SpyderDialogButtonBox(QDialogButtonBox.Ok)
         button_box.accepted.connect(self.accept)
         layout.addWidget(button_box)
 

spyder/plugins/editor/widgets/gotoline.py

@@ -10,6 +10,7 @@
                             QDialogButtonBox, QVBoxLayout, QHBoxLayout)
 
 from spyder.api.translations import _
+from spyder.api.widgets.dialogs import SpyderDialogButtonBox
 
 
 class GoToLineDialog(QDialog):
@@ -48,8 +49,9 @@ def __init__(self, editor):
         glayout.addWidget(last_label, 2, 0, Qt.AlignVCenter | Qt.AlignRight)
         glayout.addWidget(last_label_v, 2, 1, Qt.AlignVCenter)
 
-        bbox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel,
-                                Qt.Vertical, self)
+        bbox = SpyderDialogButtonBox(
+            QDialogButtonBox.Ok | QDialogButtonBox.Cancel, Qt.Vertical, self
+        )
         bbox.accepted.connect(self.accept)
         bbox.rejected.connect(self.reject)
         btnlayout = QVBoxLayout()

spyder/plugins/editor/widgets/recover.py

@@ -15,10 +15,20 @@
 # Third party imports
 from qtpy.compat import getsavefilename
 from qtpy.QtCore import Qt
-from qtpy.QtWidgets import (QApplication, QDialog, QDialogButtonBox,
-                            QHBoxLayout, QLabel, QMessageBox, QPushButton,
-                            QTableWidget, QVBoxLayout, QWidget)
+from qtpy.QtWidgets import (
+    QDialog,
+    QDialogButtonBox,
+    QHBoxLayout,
+    QLabel,
+    QMessageBox,
+    QPushButton,
+    QTableWidget,
+    QVBoxLayout,
+    QWidget,
+)
+
 # Local imports
+from spyder.api.widgets.dialogs import SpyderDialogButtonBox
 from spyder.config.base import _, running_under_pytest
 
 
@@ -217,7 +227,9 @@ def file_data_to_str(self, data):
 
     def add_cancel_button(self):
         """Add a cancel button at the bottom of the dialog window."""
-        button_box = QDialogButtonBox(QDialogButtonBox.Cancel, self)
+        button_box = SpyderDialogButtonBox(
+            QDialogButtonBox.Cancel, parent=self
+        )
         button_box.rejected.connect(self.reject)
         self.layout.addWidget(button_box)
 
@@ -352,7 +364,7 @@ def test():  # pragma: no cover
     import tempfile
     from spyder.utils.qthelpers import qapplication
 
-    app = qapplication()
+    app = qapplication()  # noqa
     tempdir = tempfile.mkdtemp()
     unused, unused, autosave_mapping = make_temporary_files(tempdir)
     dialog = RecoveryDialog(autosave_mapping)

spyder/plugins/explorer/widgets/explorer.py

@@ -55,6 +55,7 @@
 # Local imports
 from spyder.api.config.decorators import on_conf_change
 from spyder.api.translations import _
+from spyder.api.widgets.dialogs import SpyderDialogButtonBox
 from spyder.api.widgets.mixins import SpyderWidgetMixin
 from spyder.config.base import get_home_dir
 from spyder.config.main import NAME_FILTERS
@@ -1076,9 +1077,11 @@ def handle_reset():
             filters.setPlainText(", ".join(self.get_conf('name_filters')))
 
         # Dialog buttons
-        button_box = QDialogButtonBox(QDialogButtonBox.Reset |
-                                      QDialogButtonBox.Ok |
-                                      QDialogButtonBox.Cancel)
+        button_box = SpyderDialogButtonBox(
+            QDialogButtonBox.Reset
+            | QDialogButtonBox.Ok
+            | QDialogButtonBox.Cancel
+        )
         button_box.accepted.connect(handle_ok)
         button_box.rejected.connect(dialog.reject)
         button_box.button(QDialogButtonBox.Reset).clicked.connect(handle_reset)

spyder/plugins/explorer/widgets/fileassociations.py

@@ -22,6 +22,7 @@
                             QListWidget, QListWidgetItem, QPushButton,
                             QVBoxLayout, QWidget)
 # Local imports
+from spyder.api.widgets.dialogs import SpyderDialogButtonBox
 from spyder.config.base import _
 from spyder.utils.encoding import is_text_file
 from spyder.utils.programs import (get_application_icon,
@@ -41,8 +42,9 @@ def __init__(self, parent=None, title='', label=''):
         # Widgets
         self.label = QLabel()
         self.lineedit = QLineEdit()
-        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok
-                                           | QDialogButtonBox.Cancel)
+        self.button_box = SpyderDialogButtonBox(
+            QDialogButtonBox.Ok | QDialogButtonBox.Cancel
+        )
         self.button_ok = self.button_box.button(QDialogButtonBox.Ok)
         self.button_cancel = self.button_box.button(QDialogButtonBox.Cancel)
 
@@ -109,8 +111,9 @@ def __init__(self, parent=None):
         self.edit_filter = QLineEdit()
         self.list = QListWidget()
         self.button_browse = QPushButton(_('Browse...'))
-        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok
-                                           | QDialogButtonBox.Cancel)
+        self.button_box = SpyderDialogButtonBox(
+            QDialogButtonBox.Ok | QDialogButtonBox.Cancel
+        )
         self.button_ok = self.button_box.button(QDialogButtonBox.Ok)
         self.button_cancel = self.button_box.button(QDialogButtonBox.Cancel)
 

spyder/plugins/ipythonconsole/widgets/kernelconnect.py

@@ -22,6 +22,7 @@
 
 # Local imports
 from spyder.api.config.mixins import SpyderConfigurationAccessor
+from spyder.api.widgets.dialogs import SpyderDialogButtonBox
 from spyder.config.base import _, get_home_dir
 
 
@@ -136,9 +137,11 @@ def __init__(self, parent=None):
         self.rm_group.toggled.connect(self.pw_radio.setChecked)
 
         # Ok and Cancel buttons
-        self.accept_btns = QDialogButtonBox(
+        self.accept_btns = SpyderDialogButtonBox(
             QDialogButtonBox.Ok | QDialogButtonBox.Cancel,
-            Qt.Horizontal, self)
+            Qt.Horizontal,
+            self,
+        )
 
         self.accept_btns.accepted.connect(self.save_connection_settings)
         self.accept_btns.accepted.connect(self.accept)

spyder/plugins/layout/widgets/dialog.py

@@ -18,6 +18,7 @@
 
 # Local imports
 from spyder.api.widgets.comboboxes import SpyderComboBox
+from spyder.api.widgets.dialogs import SpyderDialogButtonBox
 from spyder.config.base import _
 from spyder.py3compat import to_text_string
 
@@ -146,9 +147,9 @@ def __init__(self, parent, order):
         self.combo_box.addItems(order)
         self.combo_box.setEditable(True)
         self.combo_box.clearEditText()
-        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok |
-                                           QDialogButtonBox.Cancel,
-                                           Qt.Horizontal, self)
+        self.button_box = SpyderDialogButtonBox(
+            QDialogButtonBox.Ok | QDialogButtonBox.Cancel, Qt.Horizontal, self
+        )
         self.button_ok = self.button_box.button(QDialogButtonBox.Ok)
         self.button_cancel = self.button_box.button(QDialogButtonBox.Cancel)
 
@@ -196,9 +197,9 @@ def __init__(self, parent, names, ui_names, order, active, read_only):
         self.button_move_up = QPushButton(_('Move Up'))
         self.button_move_down = QPushButton(_('Move Down'))
         self.button_delete = QPushButton(_('Delete Layout'))
-        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok |
-                                           QDialogButtonBox.Cancel,
-                                           Qt.Horizontal, self)
+        self.button_box = SpyderDialogButtonBox(
+            QDialogButtonBox.Ok | QDialogButtonBox.Cancel, Qt.Horizontal, self
+        )
         self.group_box = QGroupBox(_("Layout Display and Order"))
         self.table = QTableView(self)
         self.ok_button = self.button_box.button(QDialogButtonBox.Ok)

spyder/plugins/mainmenu/plugin.py

@@ -106,7 +106,7 @@ def _hide_options_menus(self):
             plugin_instance = PLUGIN_REGISTRY.get_plugin(plugin_name)
             if isinstance(plugin_instance, SpyderDockablePlugin):
                 if plugin_instance.CONF_SECTION == 'editor':
-                    editorstack = self.editor.get_current_editorstack()
+                    editorstack = self._main.editor.get_current_editorstack()
                     editorstack.menu.hide()
                 else:
                     try:

spyder/plugins/preferences/widgets/configdialog.py

@@ -10,14 +10,12 @@
 from superqt.utils import qdebounced
 
 # Local imports
+from spyder.api.widgets.dialogs import SpyderDialogButtonBox
 from spyder.config.base import _, load_lang_conf
 from spyder.config.manager import CONF
 from spyder.utils.icon_manager import ima
 from spyder.utils.stylesheet import MAC, WIN
 from spyder.widgets.sidebardialog import SidebarDialog
-from spyder.utils.palette import SpyderPalette
-from spyder.utils.stylesheet import (
-    AppStyle, MAC, PREFERENCES_TABBAR_STYLESHEET, WIN)
 
 
 class ConfigDialog(SidebarDialog):
@@ -94,8 +92,11 @@ def add_page(self, page):
         super().add_page(page)
 
     def create_buttons(self):
-        bbox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Apply |
-                                QDialogButtonBox.Cancel)
+        bbox = SpyderDialogButtonBox(
+            QDialogButtonBox.Ok
+            | QDialogButtonBox.Apply
+            | QDialogButtonBox.Cancel
+        )
         self.apply_btn = bbox.button(QDialogButtonBox.Apply)
 
         # This is needed for our tests