From cd1766dd51aba0225ca31ea626526d4b6e5b6374 Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Mon, 30 Aug 2010 01:48:52 +0200 Subject: [PATCH] Update eos to latest branch and update the about box with the names of Entity, Darriele and Aurora --- aboutData.py | 1 + eos | 2 +- gui/mainFrame.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/aboutData.py b/aboutData.py index ee7c4a65d..28baf9062 100644 --- a/aboutData.py +++ b/aboutData.py @@ -21,4 +21,5 @@ versionString = "0.0.1" license = "GNU GPL" licenseLocation = "gpl.txt" developers = ("cncfanatics" , "DarkPhoenix") +credits = (("Entity: capacitor calculations"), ("Darriele: gui"), ("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." diff --git a/eos b/eos index 5fba25fde..1cadf5172 160000 --- a/eos +++ b/eos @@ -1 +1 @@ -Subproject commit 5fba25fde12754e96f1b48d63d0d80bbf206bd08 +Subproject commit 1cadf5172ca61df8de5ec5a9cf1c376b07b31859 diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 169fc123b..646c2fe45 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -97,7 +97,7 @@ 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) + "\nLicense: " + aboutData.license + " see included " + aboutData.licenseLocation, + 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") wx.AboutBox(info)