Skip to content

Commit

Permalink
Merge from 3.x: PR #7727
Browse files Browse the repository at this point in the history
Fixes #6535
  • Loading branch information
ccordoba12 committed Aug 21, 2018
2 parents 228214a + 22562a9 commit 7db4730
Showing 1 changed file with 14 additions and 7 deletions.
21 changes: 14 additions & 7 deletions spyder/app/mainwindow.py
Original file line number Diff line number Diff line change
Expand Up @@ -2391,8 +2391,8 @@ def about(self):
rev = versions['revision']
revlink = " (<a href='https://github.com/spyder-ide/spyder/"\
"commit/%s'>Commit: %s</a>)" % (rev, rev)
QMessageBox.about(self,
_("About %s") % "Spyder",
msgBox = QMessageBox(self)
msgBox.setText(
"""<b>Spyder %s</b> %s
<br>The Scientific Python Development Environment
<br>Copyright &copy; The Spyder Project Contributors
Expand All @@ -2412,17 +2412,24 @@ def about(self):
<a href="https://winpython.github.io/">WinPython</a>
also contribute to this plan.
<p>Python %s %dbits, Qt %s, %s %s on %s
<p><small>Most of the icons for the Spyder 2 theme come from the Crystal
Project (&copy; 2006-2007 Everaldo Coelho). Other icons for that
theme come from <a href="http://p.yusukekamiyamane.com/"> Yusuke
Kamiyamane</a> (all rights reserved) and from
<p><small>Most of the icons for the Spyder 2 theme come from the
Crystal Project (&copy; 2006-2007 Everaldo Coelho).
Other icons for that theme come from
<a href="http://p.yusukekamiyamane.com/">
Yusuke Kamiyamane</a> (all rights reserved) and from
<a href="http://www.oxygen-icons.org/">
The Oxygen icon theme</a></small>.
"""
% (versions['spyder'], revlink, __project_url__, __trouble_url__,
__project_url__, __forum_url__, versions['python'],
versions['bitness'], versions['qt'], versions['qt_api'],
versions['qt_api_ver'], versions['system']))
versions['qt_api_ver'], versions['system'])
)
msgBox.setWindowTitle(_("About %s") % "Spyder")
msgBox.setStandardButtons(QMessageBox.Ok)
msgBox.setIconPixmap(APP_ICON.pixmap(QSize(64, 64)))
msgBox.setTextInteractionFlags(Qt.TextSelectableByMouse)
msgBox.exec_()

@Slot()
def show_dependencies(self):
Expand Down

0 comments on commit 7db4730

Please sign in to comment.