Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Remove Spyder 2 icon set because it's incomplete #20997

Merged
merged 15 commits into from
Jul 6, 2023
Merged
4 changes: 1 addition & 3 deletions spyder/app/mainwindow.py
Original file line number Diff line number Diff line change
Expand Up @@ -1454,9 +1454,7 @@ def main(options, args):
QMessageBox.information(
None, "Spyder",
"Spyder was unable to load the <i>Spyder 3</i> "
"icon theme. That's why it's going to fallback to the "
"theme used in Spyder 2.<br><br>"
"For that, please close this window and start Spyder again."
"icon theme.Please close this window and start Spyder again."
)
CONF.set('appearance', 'icon_theme', 'spyder 2')
if mainwindow is None:
Expand Down
Binary file removed spyder/images/spyder2_icon_theme/advanced.png
Binary file not shown.
Binary file removed spyder/images/spyder2_icon_theme/code_fork.png
Binary file not shown.
Binary file removed spyder/images/spyder2_icon_theme/dictedit.png
Binary file not shown.
Binary file removed spyder/images/spyder2_icon_theme/eyedropper.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed spyder/images/spyder2_icon_theme/help.png
Binary file not shown.
Binary file removed spyder/images/spyder2_icon_theme/italic.png
Binary file not shown.
Binary file removed spyder/images/spyder2_icon_theme/keyboard.png
Binary file not shown.
Binary file removed spyder/images/spyder2_icon_theme/not_found.png
Binary file not shown.
Binary file removed spyder/images/spyder2_icon_theme/vcs_browse.png
Binary file not shown.
Binary file removed spyder/images/spyder2_icon_theme/vcs_commit.png
Binary file not shown.
Binary file removed spyder/images/spyder2_icon_theme/win_env.png
Binary file not shown.
6 changes: 0 additions & 6 deletions spyder/plugins/appearance/confpage.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,10 @@ def setup_page(self):
)
self.ui_combobox = ui_theme_combo.combobox

themes = ['Spyder 2', 'Spyder 3']
icon_choices = list(zip(themes, [theme.lower() for theme in themes]))
icons_combo = self.create_combobox(_('Icon theme'), icon_choices,
'icon_theme', restart=True)

theme_comboboxes_layout = QGridLayout()
theme_comboboxes_layout.addWidget(ui_theme_combo.label, 0, 0)
theme_comboboxes_layout.addWidget(ui_theme_combo.combobox, 0, 1)
theme_comboboxes_layout.addWidget(icons_combo.label, 1, 0)
theme_comboboxes_layout.addWidget(icons_combo.combobox, 1, 1)

theme_layout = QVBoxLayout()
theme_layout.addLayout(theme_comboboxes_layout)
Expand Down
3 changes: 0 additions & 3 deletions spyder/utils/icon_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -439,9 +439,6 @@ def icon(self, name, scale_factor=None, resample=False):
# Load custom icons
icon = QIcon(self.get_icon(name))
return icon if icon is not None else QIcon()
elif theme == 'spyder 2':
icon = self.get_icon(name, resample=resample)
return icon if icon is not None else QIcon()

def get_icon_by_extension_or_type(self, fname, scale_factor):
"""Return the icon depending on the file extension"""
Expand Down