From 94d6611e29eac4cfed3660c12929163ce9bf79fd Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Mon, 1 Nov 2010 01:25:24 +0200 Subject: [PATCH] More updates to aboutbox --- aboutData.py | 4 ++-- gui/mainFrame.py | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/aboutData.py b/aboutData.py index 766561a76..96de4af47 100644 --- a/aboutData.py +++ b/aboutData.py @@ -18,8 +18,8 @@ #=============================================================================== versionString = "1.0 pre-beta" -license = "GNU GPL" +license = "pyfa is released under GNU GPL" licenseLocation = "gpl.txt" developers = ("cncfanatics" , "DarkPhoenix", "Darriele") -credits = (("Entity: capacitor calculations"), ("Darriele: gui"), ("Aurora: maths")) +credits = ((" Entity: capacitor calculations"), (" Aurora: maths")) description = "pyfa is the Python Fitting Assistant, a standalone application to create fittings for the EVE-Online SciFi MMORPG.\nThe application is available for many platforms, see the download page for further details. The layout of pyfa is heavily based on EFT, the EVE fitting tool. Although it is a complete rewrite and replacement for EFT, the fittings are still compatible with EFT.\n\nAll EVE-Online related materials are property of CCP hf.\n\nSilk Icons Set by famfamfam.com released under Creative Commons Attribution 2.5 License" diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 2dd062fbf..3ee31b015 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -149,11 +149,12 @@ class MainFrame(wx.Frame): info = wx.AboutDialogInfo() info.Name = "pyfa" info.Version = aboutData.versionString - info.Description = wordwrap(aboutData.description + "\n\n\nDevelopers: " + ", ".join(aboutData.developers) + "\n\nAdditional credits\n" + "\n".join(aboutData.credits) + "\n\nLicense: " + aboutData.license + " see included " + aboutData.licenseLocation, - 350, wx.ClientDC(self)) - info.WebSite = ("http://pyfa.sourceforge.net/", "pyfa home page") + info.Description = wordwrap(aboutData.description + "\n\n\nDevelopers: " + ", ".join(aboutData.developers) + "\n\nAdditional credits:\n" + "\n".join(aboutData.credits) + "\n\nLicense: " + aboutData.license + " - see included " + aboutData.licenseLocation, + 550, wx.ClientDC(self)) + info.WebSite = ("http://www.evefit.org/Pyfa", "pyfa home page") wx.AboutBox(info) + def showCharacterEditor(self, event): dlg=CharacterEditor(self) dlg.Show()