From f42fd1de43d2d8e2c30bed51bba5fa0f0817ce9a Mon Sep 17 00:00:00 2001 From: blitzmann Date: Mon, 10 Mar 2014 18:49:25 -0400 Subject: [PATCH 1/2] Tweaks to about box, including adding my name as developer --- gui/aboutData.py | 13 ++++++++++--- gui/mainFrame.py | 10 +++++----- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/gui/aboutData.py b/gui/aboutData.py index 0d1b029b5..29ed93be6 100644 --- a/gui/aboutData.py +++ b/gui/aboutData.py @@ -21,6 +21,13 @@ import config versionString = "{0} {1} - {2} {3}".format(config.version, config.tag, config.expansionName, config.expansionVersion) license = "pyfa is released under GNU GPLv3" licenseLocation = "gpl.txt" -developers = ("\n cncfanatics \t(Sakari Orisi)\n" , " DarkPhoenix \t(Kadesh Priestess)\n", " Darriele \t(Darriele)") -credits = (("Entity (Entity) \t\tCapacitor calculations / EVEAPI python lib / Reverence"), ("Aurora \t\tMaths"), ("Corollax (Aamrr) \tVarious EOS/pyfa improvements")) -description = "Pyfa (the Python Fitting Assistant) is a standalone application able to create and simulate fittings for EVE-Online SciFi MMORPG with a very high degree of accuracy.\nPyfa can be virtually ran on all platforms where python and wxwidgets are supported.\n\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\n\nFat Cow Icons by fatcow.com released under Creative Commons Attribution 3.0 License" +developers = ("cncfanatics \t(Sakari Orisi)" , "DarkPhoenix \t(Kadesh Priestess)", "Darriele \t(Darriele)", "blitzmann \t(Sable Blitzmann)") +credits = ("Entity (Entity) \t\tCapacitor calculations / EVEAPI python lib / Reverence", "Aurora \t\t\tMaths", "Corollax (Aamrr) \tVarious EOS / pyfa improvements") +description = ( + "Pyfa (the Python Fitting Assistant) is an open-source standalone application able to " + "create and simulate fittings for EVE-Online SciFi MMORPG with a very high degree of " + "accuracy. Pyfa can run on all platforms where Python and wxWidgets are supported.\n\n" + "All EVE-Online related materials are property of CCP hf.\n" + "Silk Icons Set by famfamfam.com released under Creative Commons Attribution 2.5 License\n" + "Fat Cow Icons by fatcow.com released under Creative Commons Attribution 3.0 License" +) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 2d04cb94d..96f4e54e2 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -243,11 +243,11 @@ class MainFrame(wx.Frame): info = wx.AboutDialogInfo() info.Name = "pyfa" info.Version = gui.aboutData.versionString - info.Description = wordwrap(gui.aboutData.description + "\n\n\nDevelopers: " + - "".join(gui.aboutData.developers) + - "\n\nAdditional credits:\n " + - "\n ".join(gui.aboutData.credits) - + "\n\nLicense: " + + info.Description = wordwrap(gui.aboutData.description + "\n\nDevelopers:\n\t" + + "\n\t".join(gui.aboutData.developers) + + "\n\nAdditional credits:\n\t" + + "\n\t".join(gui.aboutData.credits) + + "\n\nLicense:\n\t" + gui.aboutData.license + " - see included " + gui.aboutData.licenseLocation + From 4bcb368d174b08770f7c4a6ee53f3f4fe285bb68 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Tue, 11 Mar 2014 21:49:50 -0400 Subject: [PATCH 2/2] More about box changes --- gui/aboutData.py | 15 ++++++++------- gui/mainFrame.py | 6 ++---- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/gui/aboutData.py b/gui/aboutData.py index 29ed93be6..69fa96d51 100644 --- a/gui/aboutData.py +++ b/gui/aboutData.py @@ -19,15 +19,16 @@ import config versionString = "{0} {1} - {2} {3}".format(config.version, config.tag, config.expansionName, config.expansionVersion) -license = "pyfa is released under GNU GPLv3" -licenseLocation = "gpl.txt" -developers = ("cncfanatics \t(Sakari Orisi)" , "DarkPhoenix \t(Kadesh Priestess)", "Darriele \t(Darriele)", "blitzmann \t(Sable Blitzmann)") +licenses = ( + "pyfa is released under GNU GPLv3 - see included gpl.txt", + "All EVE-Online related materials are property of CCP hf.", + "Silk Icons Set by famfamfam.com - Creative Commons Attribution 2.5 License", + "Fat Cow Icons by fatcow.com - Creative Commons Attribution 3.0 License" +) +developers = ("blitzmann \t(Sable Blitzmann)", "cncfanatics \t(Sakari Orisi)" , "DarkPhoenix \t(Kadesh Priestess) (Project Lead)", "Darriele \t(Darriele)") credits = ("Entity (Entity) \t\tCapacitor calculations / EVEAPI python lib / Reverence", "Aurora \t\t\tMaths", "Corollax (Aamrr) \tVarious EOS / pyfa improvements") description = ( "Pyfa (the Python Fitting Assistant) is an open-source standalone application able to " "create and simulate fittings for EVE-Online SciFi MMORPG with a very high degree of " - "accuracy. Pyfa can run on all platforms where Python and wxWidgets are supported.\n\n" - "All EVE-Online related materials are property of CCP hf.\n" - "Silk Icons Set by famfamfam.com released under Creative Commons Attribution 2.5 License\n" - "Fat Cow Icons by fatcow.com released under Creative Commons Attribution 3.0 License" + "accuracy. Pyfa can run on all platforms where Python and wxWidgets are supported." ) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 96f4e54e2..2e0d778c5 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -247,10 +247,8 @@ class MainFrame(wx.Frame): "\n\t".join(gui.aboutData.developers) + "\n\nAdditional credits:\n\t" + "\n\t".join(gui.aboutData.credits) + - "\n\nLicense:\n\t" + - gui.aboutData.license + - " - see included " + - gui.aboutData.licenseLocation + + "\n\nLicenses:\n\t" + + "\n\t".join(gui.aboutData.licenses) + "\n\nPython: \t" + sys.version + "\nwxPython: \t" + wx.__version__ + "\nSQLAlchemy: \t" + sqlalchemy.__version__,