From 8a10f0a766547a6d075187290cf98317ea5c543f Mon Sep 17 00:00:00 2001 From: Ryan Holmes Date: Fri, 16 Mar 2018 18:06:33 -0400 Subject: [PATCH] sCrest > sEsi --- .../pyfaCrestPreferences.py | 4 +-- gui/characterEditor.py | 4 +-- gui/crestFittings.py | 36 +++++++++---------- gui/mainFrame.py | 4 +-- gui/mainMenuBar.py | 4 +-- service/port.py | 2 +- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/gui/builtinPreferenceViews/pyfaCrestPreferences.py b/gui/builtinPreferenceViews/pyfaCrestPreferences.py index c94cc1328..598019dab 100644 --- a/gui/builtinPreferenceViews/pyfaCrestPreferences.py +++ b/gui/builtinPreferenceViews/pyfaCrestPreferences.py @@ -126,8 +126,8 @@ class PFCrestPref(PreferenceView): def OnBtnApply(self, event): self.settings.set('clientID', self.inputClientID.GetValue().strip()) self.settings.set('clientSecret', self.inputClientSecret.GetValue().strip()) - sCrest = Esi.getInstance() - sCrest.delAllCharacters() + sEsi = Esi.getInstance() + sEsi.delAllCharacters() def ToggleProxySettings(self, mode): if mode: diff --git a/gui/characterEditor.py b/gui/characterEditor.py index acac41dc2..65dcb408f 100644 --- a/gui/characterEditor.py +++ b/gui/characterEditor.py @@ -780,8 +780,8 @@ class APIView(wx.Panel): event.Skip() def addCharacter(self, event): - sCrest = Esi.getInstance() - uri = sCrest.startServer() + sEsi = Esi.getInstance() + uri = sEsi.startServer() webbrowser.open(uri) def getActiveCharacter(self): diff --git a/gui/crestFittings.py b/gui/crestFittings.py index c5ee71029..2984aa647 100644 --- a/gui/crestFittings.py +++ b/gui/crestFittings.py @@ -32,7 +32,7 @@ class CrestFittings(wx.Frame): self.mainFrame = parent mainSizer = wx.BoxSizer(wx.VERTICAL) - sCrest = Esi.getInstance() + sEsi = Esi.getInstance() characterSelectSizer = wx.BoxSizer(wx.HORIZONTAL) @@ -90,8 +90,8 @@ class CrestFittings(wx.Frame): event.Skip() def updateCharList(self): - sCrest = Esi.getInstance() - chars = sCrest.getSsoCharacters() + sEsi = Esi.getInstance() + chars = sEsi.getSsoCharacters() if len(chars) == 0: self.Close() @@ -117,11 +117,11 @@ class CrestFittings(wx.Frame): return self.charChoice.GetClientData(selection) if selection is not None else None def fetchFittings(self, event): - sCrest = Esi.getInstance() + sEsi = Esi.getInstance() waitDialog = wx.BusyInfo("Fetching fits, please wait...", parent=self) try: - fittings = sCrest.getFittings(self.getActiveCharacter()) + fittings = sEsi.getFittings(self.getActiveCharacter()) # self.cacheTime = fittings.get('cached_until') # self.updateCacheStatus(None) # self.cacheTimer.Start(1000) @@ -147,7 +147,7 @@ class CrestFittings(wx.Frame): self.mainFrame._openAfterImport(fits) def deleteFitting(self, event): - sCrest = Esi.getInstance() + sEsi = Esi.getInstance() selection = self.fitView.fitSelection if not selection: return @@ -159,7 +159,7 @@ class CrestFittings(wx.Frame): if dlg.ShowModal() == wx.ID_YES: try: - sCrest.delFitting(self.getActiveCharacter(), data['fitting_id']) + sEsi.delFitting(self.getActiveCharacter(), data['fitting_id']) except requests.exceptions.ConnectionError: msg = "Connection error, please check your internet connection" pyfalog.error(msg) @@ -188,7 +188,7 @@ class ExportToEve(wx.Frame): self.mainFrame = parent self.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_BTNFACE)) - sCrest = Esi.getInstance() + sEsi = Esi.getInstance() mainSizer = wx.BoxSizer(wx.VERTICAL) hSizer = wx.BoxSizer(wx.HORIZONTAL) @@ -219,8 +219,8 @@ class ExportToEve(wx.Frame): self.Centre(wx.BOTH) def updateCharList(self): - sCrest = Esi.getInstance() - chars = sCrest.getSsoCharacters() + sEsi = Esi.getInstance() + chars = sEsi.getSsoCharacters() if len(chars) == 0: self.Close() @@ -260,12 +260,12 @@ class ExportToEve(wx.Frame): return self.statusbar.SetStatusText("Sending request and awaiting response", 1) - sCrest = Esi.getInstance() + sEsi = Esi.getInstance() try: sFit = Fit.getInstance() data = sPort.exportESI(sFit.getFit(fitID)) - res = sCrest.postFitting(self.getActiveCharacter(), data) + res = sEsi.postFitting(self.getActiveCharacter(), data) self.statusbar.SetStatusText("", 0) self.statusbar.SetStatusText("", 1) @@ -328,8 +328,8 @@ class CrestMgmt(wx.Dialog): event.Skip() def popCharList(self): - sCrest = Esi.getInstance() - chars = sCrest.getSsoCharacters() + sEsi = Esi.getInstance() + chars = sEsi.getSsoCharacters() self.lcCharacters.DeleteAllItems() @@ -343,16 +343,16 @@ class CrestMgmt(wx.Dialog): @staticmethod def addChar(event): - sCrest = Esi.getInstance() - uri = sCrest.startServer() + sEsi = Esi.getInstance() + uri = sEsi.startServer() webbrowser.open(uri) def delChar(self, event): item = self.lcCharacters.GetFirstSelected() if item > -1: charID = self.lcCharacters.GetItemData(item) - sCrest = Esi.getInstance() - sCrest.delSsoCharacter(charID) + sEsi = Esi.getInstance() + sEsi.delSsoCharacter(charID) self.popCharList() diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 44523ae5a..7824ea4b1 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -615,10 +615,10 @@ class MainFrame(wx.Frame): def updateCrestMenus(self, type): menu = self.GetMenuBar() - sCrest = Esi.getInstance() + sEsi = Esi.getInstance() menu.SetLabel(menu.ssoLoginId, "Manage Characters") - enable = len(sCrest.getSsoCharacters()) == 0 + enable = len(sEsi.getSsoCharacters()) == 0 menu.Enable(menu.eveFittingsId, not enable) menu.Enable(menu.exportToEveId, not enable) diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py index c2c5e3ed9..c34091c03 100644 --- a/gui/mainMenuBar.py +++ b/gui/mainMenuBar.py @@ -134,7 +134,7 @@ class MainMenuBar(wx.MenuBar): preferencesItem.SetBitmap(BitmapLoader.getBitmap("preferences_small", "gui")) windowMenu.Append(preferencesItem) - # self.sCrest = Crest.getInstance() + # self.sEsi = Crest.getInstance() # CREST Menu crestMenu = wx.Menu() @@ -144,7 +144,7 @@ class MainMenuBar(wx.MenuBar): 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: + # if self.sEsi.settings.get('mode') == CrestModes.IMPLICIT or len(self.sEsi.getCrestCharacters()) == 0: self.Enable(self.eveFittingsId, True) self.Enable(self.exportToEveId, True) diff --git a/service/port.py b/service/port.py index ec15fdf34..5ea30d0a8 100644 --- a/service/port.py +++ b/service/port.py @@ -349,7 +349,7 @@ class Port(object): nested_dict = lambda: collections.defaultdict(nested_dict) fit = nested_dict() - sCrest = Esi.getInstance() + sEsi = Esi.getInstance() sFit = svcFit.getInstance() # max length is 50 characters