Skip to content

Commit

Permalink
PR: Remove Spyder 2 icon set because it's incomplete (#20997)
Browse files Browse the repository at this point in the history
Co-authored-by: C.A.M. Gerlach <CAM.Gerlach@Gerlach.CAM>
Co-authored-by: Carlos Cordoba <ccordoba12@gmail.com>
  • Loading branch information
3 people committed Jul 6, 2023
1 parent 2ecf07e commit 5a31a0e
Show file tree
Hide file tree
Showing 153 changed files with 8 additions and 562 deletions.
4 changes: 0 additions & 4 deletions AUTHORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ authors or projects, including:

* The icons for the Spyder 3 theme are derived from Font Awesome, by
David Gandy <https://fontawesome.com/>
* Most Spyder 2 theme icons are sourced from the Crystal Project icon set, by
Everaldo Coelho <https://www.everaldo.com>
* Other Spyder 2 icons are from Yusuke Kamiyamane's icon sets, by
Yusuke Kamiyamane <http://p.yusukekamiyamane.com/>
* As well as the FamFamFam Silk icon set, by
Mark James <http://www.famfamfam.com/lab/icons/silk/>
* And the KDE Oxygen icons, by
Expand Down
319 changes: 0 additions & 319 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1320,273 +1320,7 @@ https://github.com/spyder-ide/spyder/blob/master/LICENSE.txt

Files covered:

spyder/images/actions/hist.png
spyder/images/actions/window_nofullscreen.png
spyder/images/console/ipython_console.png
spyder/images/editor/attribute.png
spyder/images/editor/blockcomment.png
spyder/images/editor/cell.png
spyder/images/editor/filelist.png
spyder/images/editor/function.png
spyder/images/editor/method.png
spyder/images/editor/module.png
spyder/images/editor/no_match.png
spyder/images/editor/private1.png
spyder/images/editor/private2.png
spyder/images/editor/refactor.png
spyder/images/old_svg/options.svg
spyder/images/spyder.svg
spyder/images/spyder2_icon_theme/dictedit.png
spyder/images/spyder2_icon_theme/not_found.png
spyder/images/spyder2_icon_theme/whole_words.png
spyder/images/spyder2_icon_theme/win_env.png


-------------------------------------------------------------------------------



Crystal Project Icons
---------------------


Copyright (c) 2006-2007 Everaldo Coelho


Author: Everaldo Coelho | everaldo@everaldo.com
Site: https://www.everaldo.com
Source: https://store.kde.org/p/1002590/
Download (mirror): https://github.com/thecodingmachine/crystal-project
License: GNU Lesser General Public License 2.1 or later
https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html

No modifications made.


All Icons are free software; you can redistribute it and/or modify it under the
terms of the GNU Lesser General Public License as published by the Free
Software Foundation; either version 2.1 of the License, or (at your option) any
later version. This library is distributed in the hope that it will be useful,
but without any warranty; without even the implied warranty of merchantability
or fitness for a particular purpose.


See below for full text of the GNU LGPL 2.1.

Later versions of the GNU LGPL may be found at:
https://www.gnu.org/licenses/lgpl.html


Files covered:

spyder/images/actions/1downarrow.png
spyder/images/actions/1uparrow.png
spyder/images/actions/2downarrow.png
spyder/images/actions/2uparrow.png
spyder/images/actions/browse_tab.png
spyder/images/actions/check.png
spyder/images/actions/configure.png
spyder/images/actions/copywop.png
spyder/images/actions/delete.png
spyder/images/actions/edit.png
spyder/images/actions/edit24.png
spyder/images/actions/edit_add.png
spyder/images/actions/edit_remove.png
spyder/images/actions/editcopy.png
spyder/images/actions/editcut.png
spyder/images/actions/editpaste.png
spyder/images/actions/eraser.png
spyder/images/actions/exit.png
spyder/images/actions/filter.png
spyder/images/actions/find.png
spyder/images/actions/findf.png
spyder/images/actions/folder_new.png
spyder/images/actions/hide.png
spyder/images/actions/home.png
spyder/images/actions/imshow.png
spyder/images/actions/insert.png
spyder/images/actions/lock.png
spyder/images/actions/lock_open.png
spyder/images/actions/magnifier.png
spyder/images/actions/next.png
spyder/images/actions/options_less.png
spyder/images/actions/options_more.png
spyder/images/actions/plot.png
spyder/images/actions/previous.png
spyder/images/actions/redo.png
spyder/images/actions/rename.png
spyder/images/actions/replace.png
spyder/images/actions/show.png
spyder/images/actions/special_paste.png
spyder/images/actions/synchronize.png
spyder/images/actions/tooloptions.png
spyder/images/actions/undo.png
spyder/images/actions/up.png
spyder/images/console/console.png
spyder/images/console/history.png
spyder/images/console/kill.png
spyder/images/console/prompt.png
spyder/images/console/restart.png
spyder/images/editor/bug.png
spyder/images/editor/close_panel.png
spyder/images/editor/comment.png
spyder/images/editor/error.png
spyder/images/editor/file.png
spyder/images/editor/fromcursor.png
spyder/images/editor/gotoline.png
spyder/images/editor/highlight.png
spyder/images/editor/indent.png
spyder/images/editor/newwindow.png
spyder/images/editor/next_cursor.png
spyder/images/editor/next_wng.png
spyder/images/editor/outline_explorer.png
spyder/images/editor/outline_explorer_vis.png
spyder/images/editor/prev_cursor.png
spyder/images/editor/prev_wng.png
spyder/images/editor/select.png
spyder/images/editor/selectall.png
spyder/images/editor/todo_list.png
spyder/images/editor/uncomment.png
spyder/images/editor/unindent.png
spyder/images/editor/wng_list.png
spyder/images/file/fileclose.png
spyder/images/file/fileimport.png
spyder/images/file/filenew.png
spyder/images/file/fileopen.png
spyder/images/file/filesave.png
spyder/images/file/filesaveas.png
spyder/images/file/print.png
spyder/images/file/save_all.png
spyder/images/projects/add_to_path.png
spyder/images/projects/folder.png
spyder/images/projects/package.png
spyder/images/projects/pp_folder.png
spyder/images/projects/pp_package.png
spyder/images/projects/pp_project.png
spyder/images/projects/project.png
spyder/images/projects/project_closed.png
spyder/images/projects/pythonpath.png
spyder/images/projects/remove_from_path.png
spyder/images/projects/show_all.png
spyder/images/spyder2_icon_theme/advanced.png
spyder/images/spyder2_icon_theme/help.png
spyder/images/spyder2_icon_theme/italic.png
spyder/images/spyder2_icon_theme/vcs_browse.png
spyder/images/spyder2_icon_theme/vcs_commit.png


-------------------------------------------------------------------------------



Yusuke Kamiyamane Icons
-----------------------


Copyright (C) 2013 Yusuke Kamiyamane


Author: Yusuke Kamiyamane | p@yusukekamiyamane.com
Source/Download: http://p.yusukekamiyamane.com/
License: Creative Commons Attribution 3.0 International
https://creativecommons.org/licenses/by/3.0/

No modifications made.


These icons are licensed under a Creative Commons
Attribution 3.0 License.
<https://creativecommons.org/licenses/by/3.0/>

If you can't or don't want to provide attribution, please
purchase a royalty-free license.
<http://p.yusukekamiyamane.com/>

I'm unavailable for custom icon design work. But your
suggestions are always welcome!
<mailto:p@yusukekamiyamane.com>


See below for the full text of the CC-BY 3.0 International license.

The license summary and text can be found online at:
https://creativecommons.org/licenses/by/3.0/


Files covered:

spyder/images/actions/arrow-continue.png
spyder/images/actions/arrow-step-in.png
spyder/images/actions/arrow-step-out.png
spyder/images/actions/arrow-step-over.png
spyder/images/actions/stop.png
spyder/images/actions/stop_debug.png
spyder/images/actions/unmaximize.png
spyder/images/actions/window_fullscreen.png
spyder/images/editor/breakpoint_big.png
spyder/images/editor/breakpoint_cond_big.png
spyder/images/editor/breakpoint_cond_small.png
spyder/images/editor/breakpoint_small.png
spyder/images/editor/debug.png


-------------------------------------------------------------------------------



FamFamFam Silk Icons 1.3
------------------------


Copyright 2006 Mark James


Author: Mark James | mjames@gmail.com
Site: http://www.famfamfam.com/
Source/Download: http://www.famfamfam.com/lab/icons/silk/
License: Creative Commons Attribution 2.5 Generic
https://creativecommons.org/licenses/by/2.5/
or
Creative Commons Attribution 3.0 International
https://creativecommons.org/licenses/by/3.0/

No modifications made.


I also love to hear of my work being used, feel encouraged to send an email
with a link or screenshot of the icons in their new home to mjames@gmail.com.
This work is licensed under a Creative Commons Attribution 2.5 License.
This means you may use it for any purpose, and make any changes you like.
All I ask is that you include a link back to this page in your credits
(although a giant link on every page of your website really isn't needed,
contact me to discuss specifics).

The icons can also be used under Creative Commons Attribution 3.0 License
(Hi Debian folks!) with the following requirements:

As an author, I would appreciate a reference to my authorship of the Silk
icon set contents within a readme file or equivalent documentation for the
software which includes the set or a subset of the icons contained within.


See below for the full text of the CC-BY-3.0 license.

The license summaries and text can be found online at:
https://creativecommons.org/licenses/by/2.5/
https://creativecommons.org/licenses/by/3.0/


Files covered:

spyder/images/actions/collapse.png
spyder/images/actions/collapse_selection.png
spyder/images/actions/expand.png
spyder/images/actions/expand_selection.png
spyder/images/actions/restore.png
spyder/images/editor/class.png
spyder/images/editor/convention.png
spyder/images/editor/todo.png
spyder/images/editor/warning.png


-------------------------------------------------------------------------------
Expand Down Expand Up @@ -1670,59 +1404,6 @@ img_src/configure.svgz
img_src/edit-undo.svgz


Files covered:

spyder/images/console/run_small.png
spyder/images/editor/run.png


-------------------------------------------------------------------------------



Python Logo
-----------


Copyright (c) 2008 Python Software Foundation


Author: Python Software Foundation | https://www.python.org/
Source/Download: https://www.python.org/community/logos/
License: Python Software Foundation License Version 2
https://docs.python.org/3/license.html
Trademark: Python Software Foundation Trademark Usage Policy
https://www.python.org/psf/trademarks/

No modifications made.


The Python logo is a trademark of the Python Software Foundation,
which is responsible for defending against
any damaging or confusing uses of the trademark.

See the PSF Trademark Usage Policy: https://www.python.org/psf/trademarks/

In general, we want the logo to be used as widely as possible to indicate
use of Python or suitability for Python. However, please ask first when using
a derived version of the logo or when in doubt.

Projects and companies that use Python are encouraged to incorporate the
Python logo on their websites, brochures, packaging, and elsewhere to indicate
suitability for use with Python or implementation in Python. Use of the
"two snakes" logo element alone, without the accompanying wordmark is permitted
on the same terms as the combined logo.


See below for the full text of the PSF License Version 2.

The license history and text can be found online at:
https://docs.python.org/3/license.html


Files covered:

spyder/images/console/python.png


-------------------------------------------------------------------------------
Expand Down
25 changes: 0 additions & 25 deletions img_src/oxygen_icon_set/LICENSE.txt

This file was deleted.

Binary file removed img_src/oxygen_icon_set/arrow-right.svgz
Binary file not shown.
Binary file removed img_src/oxygen_icon_set/configure.svgz
Binary file not shown.
Binary file removed img_src/oxygen_icon_set/edit-undo.svgz
Binary file not shown.
13 changes: 8 additions & 5 deletions spyder/app/mainwindow.py
Original file line number Diff line number Diff line change
Expand Up @@ -1459,12 +1459,15 @@ def main(options, args):
except FontError:
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."
"It was not possible to load Spyder's icon theme, so Spyder "
"cannot start on your system. The most probable causes for this "
"are either that you are using a Windows version earlier than "
"Windows 10 1803/Windows Server 2019, which is no longer "
"supported by Spyder or Microsoft, or your system administrator "
"has disabled font installation for non-admin users. Please "
"upgrade Windows or ask your system administrator for help to "
"allow Spyder to start."
)
CONF.set('appearance', 'icon_theme', 'spyder 2')
if mainwindow is None:
# An exception occurred
if splash is not None:
Expand Down
Binary file removed spyder/images/actions/1downarrow.png
Binary file not shown.
Binary file removed spyder/images/actions/1uparrow.png
Binary file not shown.
Binary file removed spyder/images/actions/2downarrow.png
Binary file not shown.
Binary file removed spyder/images/actions/2uparrow.png
Binary file not shown.
Binary file removed spyder/images/actions/arrow-continue.png
Binary file not shown.
Binary file removed spyder/images/actions/arrow-step-in.png
Binary file not shown.
Binary file removed spyder/images/actions/arrow-step-out.png
Binary file not shown.
Binary file removed spyder/images/actions/arrow-step-over.png
Binary file not shown.
Binary file removed spyder/images/actions/browse_tab.png
Binary file not shown.
Binary file removed spyder/images/actions/check.png
Binary file not shown.
Binary file removed spyder/images/actions/collapse.png
Binary file not shown.
Binary file removed spyder/images/actions/collapse_selection.png
Binary file not shown.
Binary file removed spyder/images/actions/configure.png
Binary file not shown.
Binary file removed spyder/images/actions/copywop.png
Binary file not shown.
Binary file removed spyder/images/actions/delete.png
Binary file not shown.
Binary file removed spyder/images/actions/edit.png
Binary file not shown.
Binary file removed spyder/images/actions/edit24.png
Binary file not shown.
Binary file removed spyder/images/actions/edit_add.png
Binary file not shown.
Binary file removed spyder/images/actions/edit_remove.png
Binary file not shown.
Binary file removed spyder/images/actions/editcopy.png
Binary file not shown.
Binary file removed spyder/images/actions/editcut.png
Binary file not shown.
Binary file removed spyder/images/actions/editpaste.png
Binary file not shown.
Binary file removed spyder/images/actions/eraser.png
Binary file not shown.
Binary file removed spyder/images/actions/exit.png
Binary file not shown.
Binary file removed spyder/images/actions/expand.png
Binary file not shown.
Binary file removed spyder/images/actions/expand_selection.png
Diff not rendered.
Binary file removed spyder/images/actions/filter.png
Diff not rendered.
Binary file removed spyder/images/actions/find.png
Diff not rendered.
Binary file removed spyder/images/actions/findf.png
Diff not rendered.
Binary file removed spyder/images/actions/folder_new.png
Diff not rendered.
Binary file removed spyder/images/actions/hist.png
Diff not rendered.
Binary file removed spyder/images/actions/home.png
Diff not rendered.
Binary file removed spyder/images/actions/imshow.png
Diff not rendered.
Binary file removed spyder/images/actions/insert.png
Diff not rendered.
Binary file removed spyder/images/actions/lock.png
Diff not rendered.
Binary file removed spyder/images/actions/lock_open.png
Diff not rendered.
Binary file removed spyder/images/actions/magnifier.png
Diff not rendered.
Binary file removed spyder/images/actions/next.png
Diff not rendered.
File renamed without changes
Binary file removed spyder/images/actions/options_less.png
Diff not rendered.
Binary file removed spyder/images/actions/options_more.png
Diff not rendered.
Binary file removed spyder/images/actions/plot.png
Diff not rendered.
Binary file removed spyder/images/actions/previous.png
Diff not rendered.
Binary file removed spyder/images/actions/redo.png
Diff not rendered.
Binary file removed spyder/images/actions/rename.png
Diff not rendered.
Binary file removed spyder/images/actions/replace.png
Diff not rendered.
Binary file removed spyder/images/actions/restore.png
Diff not rendered.
Binary file removed spyder/images/actions/show.png
Diff not rendered.
Binary file removed spyder/images/actions/special_paste.png
Diff not rendered.
Binary file removed spyder/images/actions/stop.png
Diff not rendered.
Binary file removed spyder/images/actions/stop_debug.png
Diff not rendered.
Binary file removed spyder/images/actions/synchronize.png
Diff not rendered.
Binary file removed spyder/images/actions/tooloptions.png
Diff not rendered.
Binary file removed spyder/images/actions/undo.png
Diff not rendered.
Binary file removed spyder/images/actions/unmaximize.png
Diff not rendered.
Binary file removed spyder/images/actions/up.png
Diff not rendered.
Binary file removed spyder/images/actions/window_fullscreen.png
Diff not rendered.
Binary file removed spyder/images/actions/window_nofullscreen.png
Diff not rendered.
Binary file removed spyder/images/console/console.png
Diff not rendered.
Binary file removed spyder/images/console/editclear.png
Diff not rendered.
Binary file removed spyder/images/console/history.png
Diff not rendered.
Binary file removed spyder/images/console/ipython_console.png
Diff not rendered.
Binary file removed spyder/images/console/kill.png
Diff not rendered.
Binary file removed spyder/images/console/prompt.png
Diff not rendered.
Binary file removed spyder/images/console/python.png
Diff not rendered.
Binary file removed spyder/images/console/restart.png
Diff not rendered.
Binary file removed spyder/images/console/run_small.png
Diff not rendered.
Binary file removed spyder/images/editor/attribute.png
Diff not rendered.
Binary file removed spyder/images/editor/blockcomment.png
Diff not rendered.
Binary file removed spyder/images/editor/breakpoint_big.png
Diff not rendered.
Binary file removed spyder/images/editor/breakpoint_cond_big.png
Diff not rendered.
Binary file removed spyder/images/editor/breakpoint_cond_small.png
Diff not rendered.
Binary file removed spyder/images/editor/breakpoint_small.png
Diff not rendered.
Binary file removed spyder/images/editor/bug.png
Diff not rendered.
Binary file removed spyder/images/editor/class.png
Diff not rendered.
Binary file removed spyder/images/editor/close_panel.png
Diff not rendered.
Binary file removed spyder/images/editor/comment.png
Diff not rendered.
Binary file removed spyder/images/editor/convention.png
Diff not rendered.
Binary file removed spyder/images/editor/error.png
Diff not rendered.
Binary file removed spyder/images/editor/file.png
Diff not rendered.
Binary file removed spyder/images/editor/filelist.png
Diff not rendered.
Binary file removed spyder/images/editor/fromcursor.png
Diff not rendered.
Binary file removed spyder/images/editor/function.png
Diff not rendered.
Binary file removed spyder/images/editor/gotoline.png
Diff not rendered.
Binary file removed spyder/images/editor/highlight.png
Diff not rendered.
Binary file removed spyder/images/editor/indent.png
Diff not rendered.
Binary file removed spyder/images/editor/method.png
Diff not rendered.
Binary file removed spyder/images/editor/module.png
Diff not rendered.
Binary file removed spyder/images/editor/newwindow.png
Diff not rendered.
Binary file removed spyder/images/editor/next_cursor.png
Diff not rendered.
Binary file removed spyder/images/editor/next_wng.png
Diff not rendered.
Binary file removed spyder/images/editor/no_match.png
Diff not rendered.
Binary file removed spyder/images/editor/outline_explorer.png
Diff not rendered.
Binary file removed spyder/images/editor/outline_explorer_vis.png
Diff not rendered.
Binary file removed spyder/images/editor/prev_cursor.png
Diff not rendered.
Binary file removed spyder/images/editor/prev_wng.png
Diff not rendered.
Binary file removed spyder/images/editor/private1.png
Diff not rendered.
Binary file removed spyder/images/editor/private2.png
Diff not rendered.
Binary file removed spyder/images/editor/refactor.png
Diff not rendered.
Binary file removed spyder/images/editor/run.png
Diff not rendered.
Binary file removed spyder/images/editor/select.png
Diff not rendered.
Binary file removed spyder/images/editor/selectall.png
Diff not rendered.
Binary file removed spyder/images/editor/todo.png
Diff not rendered.
Binary file removed spyder/images/editor/todo_list.png
Diff not rendered.
Binary file removed spyder/images/editor/uncomment.png
Diff not rendered.
Binary file removed spyder/images/editor/unindent.png
Diff not rendered.
Binary file removed spyder/images/editor/warning.png
Diff not rendered.
Binary file removed spyder/images/editor/wng_list.png
Diff not rendered.
Binary file removed spyder/images/file/fileclose.png
Diff not rendered.
Binary file removed spyder/images/file/fileimport.png
Diff not rendered.
Binary file removed spyder/images/file/filenew.png
Diff not rendered.
Binary file removed spyder/images/file/fileopen.png
Diff not rendered.
Binary file removed spyder/images/file/filesave.png
Diff not rendered.
Binary file removed spyder/images/file/filesaveas.png
Diff not rendered.
Binary file removed spyder/images/file/print.png
Diff not rendered.
Binary file removed spyder/images/file/save_all.png
Diff not rendered.
Loading

0 comments on commit 5a31a0e

Please sign in to comment.