Merge branch 'test-3' into esi

# Conflicts:
#	eos/saveddata/character.py
#	service/character.py
#	service/eveapi.py
#	service/pycrest/eve.py

gui/mainFrame.py

@@ -49,7 +49,7 @@ from gui.multiSwitch import MultiSwitch
 from gui.statsPane import StatsPane
 from gui.shipBrowser import ShipBrowser
 from gui.builtinShipBrowser.events import FitSelected, ImportSelected, Stage3Selected
-from gui.characterEditor import CharacterEditor, SaveCharacterAs
+from gui.characterEditor import CharacterEditor
 from gui.characterSelection import CharacterSelection
 from gui.patternEditor import DmgPatternEditorDlg
 from gui.resistsEditor import ResistsEditorDlg
@@ -358,7 +358,7 @@ class MainFrame(wx.Frame):
     def ShowAboutBox(self, evt):
         info = wx.adv.AboutDialogInfo()
         info.Name = "pyfa"
-        info.Version = config.getGitVersion()  # gui.aboutData.versionString
+        info.Version = config.getVersion()  # gui.aboutData.versionString
         #
         # try:
         #     import matplotlib
@@ -683,8 +683,8 @@ class MainFrame(wx.Frame):
 
     def saveCharAs(self, event):
         charID = self.charSelection.getActiveCharacter()
-        dlg = SaveCharacterAs(self, charID)
-        dlg.ShowModal()
+        CharacterEditor.SaveCharacterAs(self, charID)
+        wx.PostEvent(self, GE.CharListUpdated())
 
     def revertChar(self, event):
         sChr = Character.getInstance()
@@ -960,7 +960,7 @@ class MainFrame(wx.Frame):
         if len(fits) > 0:
             if len(fits) == 1:
                 fit = fits[0]
-                wx.PostEvent(self, FitSelected(fitID=fit.ID))
+                wx.PostEvent(self, FitSelected(fitID=fit.ID, from_import=True))
                 wx.PostEvent(self.shipBrowser, Stage3Selected(shipID=fit.shipID, back=True))
             else:
                 fits.sort(key=lambda _fit: (_fit.ship.item.name, _fit.name))