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

Cleaned up. Supports txt, xml and emp (gzipped xml)

Browse Source
This commit is contained in:
Martin Falatic
2013-06-15 17:50:53 -07:00
parent 961fbaef69
commit 67ed8818d8
3 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gui/characterSelection.py
View File

@@ -138,19 +138,24 @@ class CharacterSelection(wx.Panel):
event.Skip()
def _buildSkillsTooltip(self, reqs, tabulationLevel = 0):
def _buildSkillsTooltip(self, reqs, currItem = "", tabulationLevel = 0):
tip = ""
sCharacter = service.Character.getInstance()
if tabulationLevel == 0:
for item, subReqs in reqs.iteritems():
tip += " %s:\n" % item.name
tip += self._buildSkillsTooltip(subReqs, 1)
tip += self._buildSkillsTooltip(subReqs, item.name, 1)
else:
for name, info in reqs.iteritems():
level, ID, more = info
sCharacter.skillReqsDict['skills'].append(
{'skillID' : ID, 'skill' : name, 'level' : int(level)})
sCharacter.skillReqsDict['skills'].append({
'item' : currItem,
'skillID' : ID,
'skill' : name,
'level' : level,
'indent' : tabulationLevel
})
tip += " %s%s: %d\n" % (" " * tabulationLevel, name, level)
tip += self._buildSkillsTooltip(more, tabulationLevel + 1)
tip += self._buildSkillsTooltip(more, currItem, tabulationLevel + 1)
return tip

10
gui/mainFrame.py
View File

@@ -263,7 +263,9 @@ class MainFrame(wx.Frame):
dlg=wx.FileDialog(
self,
"Open One Or More Fitting Files",
wildcard = "EFT text fitting files (*.cfg)|*.cfg|EvE XML fitting files (*.xml)|*.xml|All Files (*)|*",
wildcard = "EFT text fitting files (*.cfg)|*.cfg|" \
"EvE XML fitting files (*.xml)|*.xml|" \
"All Files (*)|*",
style = wx.FD_OPEN | wx.FD_FILE_MUST_EXIST | wx.FD_MULTIPLE)
if (dlg.ShowModal() == wx.ID_OK):
self.waitDialog = animUtils.WaitDialog(self, title = "Importing")
@@ -482,12 +484,16 @@ class MainFrame(wx.Frame):
saveDialog = wx.FileDialog(
self,
"Export Skills Needed As...",
wildcard = "EVEMon skills training file (*.xml)|*.xml|Text skills training file (*.txt)|*.txt",
wildcard = "EVEMon skills training file (*.emp)|*.emp|" \
"EVEMon skills training XML file (*.xml)|*.xml|" \
"Text skills training file (*.txt)|*.txt",
style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
if (saveDialog.ShowModal() == wx.ID_OK):
saveFmtInt = saveDialog.GetFilterIndex()
saveFmt = ""
if saveFmtInt == 0: # Per ordering of wildcards above
saveFmt = "emp"
elif saveFmtInt == 1:
saveFmt = "xml"
else:
saveFmt = "txt"