Merge branch 'master' into py3EFFS

gui/mainFrame.py

@@ -34,7 +34,8 @@ from codecs import open
 
 import config
 
-from eos.config import gamedata_version
+from eos.config import gamedata_version, gamedata_date
+import datetime
 
 import gui.aboutData
 from gui.chrome_tabs import ChromeNotebook
@@ -369,7 +370,8 @@ class MainFrame(wx.Frame):
     def ShowAboutBox(self, evt):
         info = wx.adv.AboutDialogInfo()
         info.Name = "pyfa"
-        info.Version = config.getVersion()  # gui.aboutData.versionString
+        time = datetime.datetime.fromtimestamp(int(gamedata_date)).strftime('%Y-%m-%d %H:%M:%S')
+        info.Version = config.getVersion() + '\nEVE Data Version: {} ({})'.format(gamedata_version, time)  # gui.aboutData.versionString
         #
         # try:
         #     import matplotlib