From bb4fe63a7cb197bbaf04972e1ebcb281718f367f Mon Sep 17 00:00:00 2001
From: blitzmann <ryan.xgamer99@gmail.com>
Date: Sat, 31 Oct 2015 14:10:41 -0400
Subject: [PATCH] Add CREST preference icon (basic EVE icon), and fix menus
 when changing modes and whatnot

---
 .../pyfaCrestPreferences.py                      |   2 +-
 gui/mainMenuBar.py                               |  11 +++++++++++
 imgs/gui/eve.png                                 | Bin 0 -> 2680 bytes
 service/crest.py                                 |   7 +++++--
 4 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 imgs/gui/eve.png

diff --git a/gui/builtinPreferenceViews/pyfaCrestPreferences.py b/gui/builtinPreferenceViews/pyfaCrestPreferences.py
index 1cd5b05ba..308999953 100644
--- a/gui/builtinPreferenceViews/pyfaCrestPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaCrestPreferences.py
@@ -115,6 +115,6 @@ class PFCrestPref ( PreferenceView):
             self.inputClientSecret.Disable()
 
     def getImage(self):
-        return BitmapLoader.getBitmap("prefs_proxy", "gui")
+        return BitmapLoader.getBitmap("eve", "gui")
 
 PFCrestPref.register()
diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py
index 7c6bd0396..95772fdbc 100644
--- a/gui/mainMenuBar.py
+++ b/gui/mainMenuBar.py
@@ -139,6 +139,7 @@ class MainMenuBar(wx.MenuBar):
         self.mainFrame.Bind(GE.FIT_CHANGED, self.fitChanged)
         pub.subscribe(self.ssoLogin, 'login_success')
         pub.subscribe(self.ssoLogout, 'logout_success')
+        pub.subscribe(self.updateCrest, 'crest_changed')
 
     def fitChanged(self, event):
         enable = event.fitID is not None
@@ -168,3 +169,13 @@ class MainMenuBar(wx.MenuBar):
             self.SetLabel(self.ssoLoginId, "Login to EVE")
             self.Enable(self.eveFittingsId, 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")
+
diff --git a/imgs/gui/eve.png b/imgs/gui/eve.png
new file mode 100644
index 0000000000000000000000000000000000000000..07bb383634a021aa467e44419d33bf2f00038541
GIT binary patch
literal 2680
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

literal 0
HcmV?d00001

diff --git a/service/crest.py b/service/crest.py
index 01b2aab53..a6d95ca15 100644
--- a/service/crest.py
+++ b/service/crest.py
@@ -45,11 +45,13 @@ class Crest():
 
     @classmethod
     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
         # instance doesn't do this.
-        cls._instance.stopServer()
+        if cls._instance.httpd:
+            cls._instance.stopServer()
         cls._instance = Crest()
+        wx.CallAfter(pub.sendMessage, 'crest_changed', message=None)
         return cls._instance
 
     def __init__(self):
@@ -121,6 +123,7 @@ class Crest():
         return char.eve.get('https://api-sisi.testeveonline.com/characters/%d/fittings/'%char.ID)
 
     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)
         return char.eve.post('https://api-sisi.testeveonline.com/characters/%d/fittings/'%char.ID, data=json)