dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Merge branch 'master' of evefit.org:pyfa

Browse Source
This commit is contained in:
Corollax
2011-01-14 05:14:29 -06:00
parent 3ec02d39f4 be9c66b42e
commit 83ad6058d0
3 changed files with 51 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/aboutData.py
View File

@@ -22,4 +22,4 @@ license = "pyfa is released under GNU GPL"
licenseLocation = "gpl.txt"
developers = ("\n cncfanatics \t(Sakari Orisi)\n" , " DarkPhoenix \t(Kadesh Priestess)\n", " Darriele \t(Darriele)")
credits = (("EVE SERVICE CORP \twww.evsco.net - host of EVEFIT project ( pyfa / EOS/ Aurora)"), ("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, and, in order to make things effortless for you, we maintain daily builds for OSX/WIN32(64) and LINUX (http://www.evefit.org/Pyfa/Installation). The layout of pyfa is somewhat similar to EFT ( EVE fitting tool ), but , it goes way beyond EFT in terms of functionality, accuracy and usefulness. While Pyfa is a completely new application unrelated to EFT, it is able to import/export EFT style fits without any hassle.\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"
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, and, in order to make things effortless for you, we maintain daily builds for OSX/WIN32(64) and LINUX (http://www.evefit.org/Pyfa/Installation).\nThe layout of pyfa is somewhat similar to EFT ( EVE fitting tool ), but , it goes way beyond EFT in terms of functionality, accuracy and usefulness.\nWhile Pyfa is a completely new application unrelated to EFT, it is able to import/export EFT style fits without any hassle.\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"

21
gui/chromeTabs.py
View File

@@ -151,6 +151,27 @@ class PFNotebook(wx.Panel):
def GetPageCount(self):
return len(self.pages)
def NextPage(self):
cpage = self.GetSelection()
if cpage is None:
return
if cpage < self.GetPageCount() - 1:
self.SetSelection(cpage + 1)
else:
self.SetSelection(0)
def PrevPage(self):
cpage = self.GetSelection()
if cpage is None:
return
if cpage > 0:
self.SetSelection(cpage - 1)
else:
self.SetSelection(self.GetPageCount() - 1)
def AddPage(self, tabWnd = None, tabTitle ="Empty Tab", tabImage = None, showClose = True):
if self.activePage:
self.activePage.Hide()

31
gui/mainFrame.py
View File

@@ -17,7 +17,10 @@
# along with pyfa. If not, see <http://www.gnu.org/licenses/>.
#===============================================================================
import sys
import sqlalchemy
import wx
import service
import config
from gui import bitmapLoader
@@ -211,7 +214,17 @@ 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: " + gui.aboutData.license + " - see included " + gui.aboutData.licenseLocation,
info.Description = wordwrap(gui.aboutData.description + "\n\n\nDevelopers: " +
"".join(gui.aboutData.developers) +
"\n\nAdditional credits:\n " +
"\n ".join(gui.aboutData.credits)
+ "\n\nLicense: " +
gui.aboutData.license +
" - see included " +
gui.aboutData.licenseLocation +
"\n\nPython: \t" + sys.version +
"\nwxPython: \t" + wx.__version__ +
"\nSQLAlchemy: \t" + sqlalchemy.__version__,
700, wx.ClientDC(self))
info.WebSite = ("http://www.evefit.org/Pyfa", "pyfa home page")
wx.AboutBox(info)
@@ -313,20 +326,34 @@ class MainFrame(wx.Frame):
self.Bind(wx.EVT_MENU, self.openGraphFrame, id=menuBar.graphFrameId)
toggleShipMarketId = wx.NewId()
ctabnext = wx.NewId()
ctabprev = wx.NewId()
# Close Page
self.Bind(wx.EVT_MENU, self.CloseCurrentPage, id=self.closePageId)
self.Bind(wx.EVT_MENU, self.HAddPage, id = self.addPageId)
self.Bind(wx.EVT_MENU, self.toggleShipMarket, id = toggleShipMarketId)
self.Bind(wx.EVT_MENU, self.CTabNext, id = ctabnext)
self.Bind(wx.EVT_MENU, self.CTabPrev, id = ctabprev)
actb = [(wx.ACCEL_CTRL, ord('T'), self.addPageId),
(wx.ACCEL_CMD, ord('T'), self.addPageId),
(wx.ACCEL_CTRL, ord("W"), self.closePageId),
(wx.ACCEL_CMD, ord("W"), self.closePageId),
(wx.ACCEL_CTRL, ord(" "), toggleShipMarketId),
(wx.ACCEL_CMD, ord(" "), toggleShipMarketId)]
(wx.ACCEL_CMD, ord(" "), toggleShipMarketId),
(wx.ACCEL_CTRL, wx.WXK_TAB, ctabnext),
(wx.ACCEL_CTRL | wx.ACCEL_SHIFT, wx.WXK_TAB, ctabprev),
(wx.ACCEL_CMD, wx.WXK_TAB, ctabnext),
(wx.ACCEL_CMD | wx.ACCEL_SHIFT, wx.WXK_TAB, ctabprev)
]
atable = wx.AcceleratorTable(actb)
self.SetAcceleratorTable(atable)
def CTabNext(self, event):
self.fitMultiSwitch.NextPage()
def CTabPrev(self, event):
self.fitMultiSwitch.PrevPage()
def HAddPage(self,event):
self.fitMultiSwitch.AddPage(wx.Panel(self, size = (0,0)), "Empty Tab")