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

Get fitting browser to show up with proper characters (still not functional). Start testing ways to store the esipy app on the service (it can take a few seconds to initialize due to network calls)

Browse Source
This commit is contained in:
blitzmann
2018-02-07 01:21:22 -05:00
parent c7360c8cc3
commit eea8019593
5 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gui/crestFittings.py
View File

@@ -34,16 +34,9 @@ class CrestFittings(wx.Frame):
characterSelectSizer = wx.BoxSizer(wx.HORIZONTAL)
if sCrest.settings.get('mode') == CrestModes.IMPLICIT:
self.stLogged = wx.StaticText(self, wx.ID_ANY, "Currently logged in as %s" % sCrest.implicitCharacter.name,
wx.DefaultPosition, wx.DefaultSize)
self.stLogged.Wrap(-1)
characterSelectSizer.Add(self.stLogged, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
else:
self.charChoice = wx.Choice(self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, [])
characterSelectSizer.Add(self.charChoice, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
self.updateCharList()
self.charChoice = wx.Choice(self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, [])
characterSelectSizer.Add(self.charChoice, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
self.updateCharList()
self.fetchBtn = wx.Button(self, wx.ID_ANY, "Fetch Fits", wx.DefaultPosition, wx.DefaultSize, 5)
characterSelectSizer.Add(self.fetchBtn, 0, wx.ALL, 5)
@@ -99,14 +92,14 @@ class CrestFittings(wx.Frame):
def updateCharList(self):
sCrest = Crest.getInstance()
chars = sCrest.getCrestCharacters()
chars = sCrest.getSsoCharacters()
if len(chars) == 0:
self.Close()
self.charChoice.Clear()
for char in chars:
self.charChoice.Append(char.name, char.ID)
self.charChoice.Append(char.characterName, char.characterID)
self.charChoice.SetSelection(0)
@@ -232,7 +225,7 @@ class ExportToEve(wx.Frame):
def updateCharList(self):
sCrest = Crest.getInstance()
chars = sCrest.getCrestCharacters()
chars = sCrest.getSsoCharacters()
if len(chars) == 0:
self.Close()
@@ -344,7 +337,7 @@ class CrestMgmt(wx.Dialog):
def popCharList(self):
sCrest = Crest.getInstance()
chars = sCrest.getCrestCharacters()
chars = sCrest.getSsoCharacters()
self.lcCharacters.DeleteAllItems()

2
gui/mainFrame.py
View File

@@ -657,7 +657,7 @@ class MainFrame(wx.Frame):
menu.Enable(menu.exportToEveId, False)
else:
menu.SetLabel(menu.ssoLoginId, "Manage Characters")
enable = len(sCrest.getCrestCharacters()) == 0
enable = len(sCrest.getSsoCharacters()) == 0
menu.Enable(menu.eveFittingsId, not enable)
menu.Enable(menu.exportToEveId, not enable)

4
gui/mainMenuBar.py
View File

@@ -145,8 +145,8 @@ class MainMenuBar(wx.MenuBar):
crestMenu.Append(self.exportToEveId, "Export To EVE")
# if self.sCrest.settings.get('mode') == CrestModes.IMPLICIT or len(self.sCrest.getCrestCharacters()) == 0:
self.Enable(self.eveFittingsId, False)
self.Enable(self.exportToEveId, False)
self.Enable(self.eveFittingsId, True)
self.Enable(self.exportToEveId, True)
if not self.mainFrame.disableOverrideEditor:
windowMenu.AppendSeparator()