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

Start ripping CREST stuff out, add new SSOCharacter stuff in. Long process ahead.

Browse Source
This commit is contained in:
blitzmann
2018-02-02 02:05:49 -05:00
parent 9e8166c13d
commit 2376148380
9 changed files with 101 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gui/mainFrame.py
View File

@@ -662,16 +662,8 @@ class MainFrame(wx.Frame):
menu.Enable(menu.exportToEveId, not enable)
def ssoHandler(self, event):
sCrest = Crest.getInstance()
if sCrest.settings.get('mode') == CrestModes.IMPLICIT:
if sCrest.implicitCharacter is not None:
sCrest.logout()
else:
uri = sCrest.startServer()
webbrowser.open(uri)
else:
dlg = CrestMgmt(self)
dlg.Show()
dlg = CrestMgmt(self)
dlg.Show()
def exportToEve(self, event):
dlg = ExportToEve(self)

18
gui/mainMenuBar.py
View File

@@ -28,8 +28,8 @@ import gui.globalEvents as GE
from gui.bitmap_loader import BitmapLoader
from logbook import Logger
from service.crest import Crest
from service.crest import CrestModes
# from service.crest import Crest
# from service.crest import CrestModes
pyfalog = Logger(__name__)
@@ -134,21 +134,19 @@ class MainMenuBar(wx.MenuBar):
preferencesItem.SetBitmap(BitmapLoader.getBitmap("preferences_small", "gui"))
windowMenu.Append(preferencesItem)
self.sCrest = Crest.getInstance()
# self.sCrest = Crest.getInstance()
# CREST Menu
crestMenu = wx.Menu()
self.Append(crestMenu, "&CREST")
if self.sCrest.settings.get('mode') != CrestModes.IMPLICIT:
crestMenu.Append(self.ssoLoginId, "Manage Characters")
else:
crestMenu.Append(self.ssoLoginId, "Login to EVE")
crestMenu.Append(self.ssoLoginId, "Manage Characters")
crestMenu.Append(self.eveFittingsId, "Browse EVE Fittings")
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)
# if self.sCrest.settings.get('mode') == CrestModes.IMPLICIT or len(self.sCrest.getCrestCharacters()) == 0:
self.Enable(self.eveFittingsId, False)
self.Enable(self.exportToEveId, False)
if not self.mainFrame.disableOverrideEditor:
windowMenu.AppendSeparator()