Skip to content

Commit d701ba3

Browse files
committed
Merge from 2.3 (A couple of fixes to the main window)
2 parents 6a14c1d + 9107de5 commit d701ba3

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

spyderlib/images/ext_tools.png

-1.62 KB
Binary file not shown.

spyderlib/spyder.py

+9-12
Original file line numberDiff line numberDiff line change
@@ -1107,11 +1107,9 @@ def add_xydoc(text, pathlist):
11071107

11081108
# Adding external tools action to "Tools" menu
11091109
if self.external_tools_menu_actions:
1110-
external_tools_act = create_action(self, _("External Tools"),
1111-
icon="ext_tools.png")
1110+
external_tools_act = create_action(self, _("External Tools"))
11121111
external_tools_act.setMenu(self.external_tools_menu)
11131112
self.tools_menu_actions += [None, external_tools_act]
1114-
self.main_toolbar_actions.append(external_tools_act)
11151113

11161114
# Filling out menu/toolbar entries:
11171115
add_actions(self.file_menu, self.file_menu_actions)
@@ -2216,6 +2214,7 @@ def about(self):
22162214
"""<b>Spyder %s</b> %s
22172215
<br>The Scientific PYthon Development EnviRonment
22182216
<p>Copyright &copy; 2009-2012 Pierre Raybaut
2217+
<br>Copyright &copy; 2010-1015 The Spyder Development Team
22192218
<br>Licensed under the terms of the MIT License
22202219
<p>Created by Pierre Raybaut
22212220
<br>Developed and maintained by the
@@ -2224,20 +2223,18 @@ def about(self):
22242223
<p>Most of the icons come from the Crystal Project
22252224
(&copy; 2006-2007 Everaldo Coelho). Other icons by
22262225
<a href="http://p.yusukekamiyamane.com/"> Yusuke Kamiyamane</a>
2227-
(All rights reserved) and by
2226+
(all rights reserved) and by
22282227
<a href="http://www.oxygen-icons.org/">
22292228
The Oxygen icon theme</a>.
2230-
<p>Spyder's community:
2231-
<ul><li>Bug reports and feature requests:
2232-
<a href="%s">Github</a>
2233-
</li><li>Discussions around the project:
2234-
<a href="%s">Google Group</a>
2235-
</li></ul>
2229+
<p>For bug reports and feature requests, please go
2230+
to our <a href="%s">Github website</a>. For discussions around the
2231+
project, please go to our <a href="%s">Google Group</a>
22362232
<p>This project is part of a larger effort to promote and
22372233
facilitate the use of Python for scientific and engineering
22382234
software development. The popular Python distributions
2239-
<a href="http://code.google.com/p/pythonxy/">Python(x,y)</a> and
2240-
<a href="https://winpython.github.io/">WinPython</a>
2235+
<a href="http://continuum.io/downloads">Anaconda</a>,
2236+
<a href="https://winpython.github.io/">WinPython</a> and
2237+
<a href="http://code.google.com/p/pythonxy/">Python(x,y)</a>
22412238
also contribute to this plan.
22422239
<p>Python %s %dbits, Qt %s, %s %s on %s"""
22432240
% (versions['spyder'], revlink, __project_url__,

0 commit comments

Comments
 (0)