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

Merge branch 'master' into development

Browse Source
This commit is contained in:
blitzman
2017-01-27 19:39:10 -05:00
parent 968d633d46 4111d670a7
commit cbf7f7d320
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gui/builtinContextMenus/amount.py
View File

@@ -51,11 +51,11 @@ class AmountChanger(wx.Dialog):
fitID = mainFrame.getActiveFit()
if isinstance(self.thing, eos.types.Cargo):
sFit.addCargo(fitID, self.thing.item.ID, int(self.input.GetLineText(0)), replace=True)
sFit.addCargo(fitID, self.thing.item.ID, int(float(self.input.GetLineText(0))), replace=True)
elif isinstance(self.thing, eos.types.Fit):
sFit.changeAmount(fitID, self.thing, int(self.input.GetLineText(0)))
sFit.changeAmount(fitID, self.thing, int(float(self.input.GetLineText(0))))
elif isinstance(self.thing, eos.types.Fighter):
sFit.changeActiveFighters(fitID, self.thing, int(self.input.GetLineText(0)))
sFit.changeActiveFighters(fitID, self.thing, int(float(self.input.GetLineText(0))))
wx.PostEvent(mainFrame, GE.FitChanged(fitID=fitID))

2
gui/characterEditor.py
View File

@@ -158,6 +158,8 @@ class CharacterEditor(wx.Frame):
self.Bind(GE.CHAR_LIST_UPDATED, self.refreshCharacterList)
self.entityEditor.Bind(wx.EVT_CHOICE, self.charChanged)
self.charChanged(None)
def btnRestrict(self):
char = self.entityEditor.getActiveEntity()