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

Add CREST preference icon (basic EVE icon), and fix menus when changing modes and whatnot

Browse Source
This commit is contained in:
blitzmann
2015-10-31 14:10:41 -04:00
parent ccb9e085b2
commit bb4fe63a7c
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/builtinPreferenceViews/pyfaCrestPreferences.py
View File

@@ -115,6 +115,6 @@ class PFCrestPref ( PreferenceView):
self.inputClientSecret.Disable() self.inputClientSecret.Disable()
def getImage(self): def getImage(self):
return BitmapLoader.getBitmap("prefs_proxy", "gui") return BitmapLoader.getBitmap("eve", "gui")
PFCrestPref.register() PFCrestPref.register()

11
gui/mainMenuBar.py
View File

@@ -139,6 +139,7 @@ class MainMenuBar(wx.MenuBar):
self.mainFrame.Bind(GE.FIT_CHANGED, self.fitChanged) self.mainFrame.Bind(GE.FIT_CHANGED, self.fitChanged)
pub.subscribe(self.ssoLogin, 'login_success') pub.subscribe(self.ssoLogin, 'login_success')
pub.subscribe(self.ssoLogout, 'logout_success') pub.subscribe(self.ssoLogout, 'logout_success')
pub.subscribe(self.updateCrest, 'crest_changed')
def fitChanged(self, event): def fitChanged(self, event):
enable = event.fitID is not None enable = event.fitID is not None
@@ -168,3 +169,13 @@ class MainMenuBar(wx.MenuBar):
self.SetLabel(self.ssoLoginId, "Login to EVE") self.SetLabel(self.ssoLoginId, "Login to EVE")
self.Enable(self.eveFittingsId, False) self.Enable(self.eveFittingsId, False)
self.Enable(self.exportToEveId, False) self.Enable(self.exportToEveId, False)
def updateCrest(self, message):
bool = self.sCrest.settings.get('mode') == CrestModes.IMPLICIT or len(self.sCrest.getCrestCharacters()) == 0
self.Enable(self.eveFittingsId, not bool)
self.Enable(self.exportToEveId, not bool)
if self.sCrest.settings.get('mode') == CrestModes.IMPLICIT:
self.SetLabel(self.ssoLoginId, "Login to EVE")
else:
self.SetLabel(self.ssoLoginId, "Manage Characters")

BIN
imgs/gui/eve.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

7
service/crest.py
View File

@@ -45,11 +45,13 @@ class Crest():
@classmethod @classmethod
def restartService(cls): def restartService(cls):
# This is hear to reseed pycrest values when changing preferences # This is here to reseed pycrest values when changing preferences
# We first stop the server n case one is running, as creating a new # We first stop the server n case one is running, as creating a new
# instance doesn't do this. # instance doesn't do this.
cls._instance.stopServer() if cls._instance.httpd:
cls._instance.stopServer()
cls._instance = Crest() cls._instance = Crest()
wx.CallAfter(pub.sendMessage, 'crest_changed', message=None)
return cls._instance return cls._instance
def __init__(self): def __init__(self):
@@ -121,6 +123,7 @@ class Crest():
return char.eve.get('https://api-sisi.testeveonline.com/characters/%d/fittings/'%char.ID) return char.eve.get('https://api-sisi.testeveonline.com/characters/%d/fittings/'%char.ID)
def postFitting(self, charID, json): def postFitting(self, charID, json):
#@todo: new fitting ID can be recovered from Location header, ie: Location -> https://api-sisi.testeveonline.com/characters/1611853631/fittings/37486494/
char = self.getCrestCharacter(charID) char = self.getCrestCharacter(charID)
return char.eve.post('https://api-sisi.testeveonline.com/characters/%d/fittings/'%char.ID, data=json) return char.eve.post('https://api-sisi.testeveonline.com/characters/%d/fittings/'%char.ID, data=json)