From d7ab709d52b6feaac1ba7294e6c3f63d398edea5 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Tue, 2 Dec 2014 01:35:30 -0500 Subject: [PATCH] Add EVE version to about box --- eos/db/__init__.py | 5 +++++ gui/mainFrame.py | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/eos/db/__init__.py b/eos/db/__init__.py index 9113c9121..f3951d1bd 100644 --- a/eos/db/__init__.py +++ b/eos/db/__init__.py @@ -40,6 +40,10 @@ gamedata_meta = MetaData() gamedata_meta.bind = gamedata_engine gamedata_session = sessionmaker(bind=gamedata_engine, autoflush=False, expire_on_commit=False)() +config.gamedata_version = gamedata_session.execute( + "SELECT `field_value` FROM `metadata` WHERE `field_name` LIKE 'client_build'" + ).fetchone()[0] + saveddata_connectionstring = config.saveddata_connectionstring if saveddata_connectionstring is not None: if callable(saveddata_connectionstring): @@ -75,3 +79,4 @@ if config.saveddata_connectionstring == "sqlite:///:memory:": def rollback(): with sd_lock: saveddata_session.rollback() + diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 0f5760b86..2d71da48a 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -290,6 +290,7 @@ class MainFrame(wx.Frame): event.Skip() def ShowAboutBox(self, evt): + import eos.config info = wx.AboutDialogInfo() info.Name = "pyfa" info.Version = gui.aboutData.versionString @@ -299,7 +300,8 @@ class MainFrame(wx.Frame): "\n\t".join(gui.aboutData.credits) + "\n\nLicenses:\n\t" + "\n\t".join(gui.aboutData.licenses) + - "\n\nPython: \t" + sys.version + + "\n\nEVE Data: \t" + eos.config.gamedata_version + + "\nPython: \t" + sys.version + "\nwxPython: \t" + wx.__version__ + "\nSQLAlchemy: \t" + sqlalchemy.__version__, 700, wx.ClientDC(self))