From b4694dcf03ed4a0b8947b5bd4a0ff0eb424fa0e9 Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Mon, 13 Jun 2016 14:13:38 -0700 Subject: [PATCH] Implemented menu option to import default database values Allows for existing databases to be updated with the current default profiles. Can also be used to inject other defaults (maybe 0 and V chars?) --- gui/mainFrame.py | 13 +++++++++++++ gui/mainMenuBar.py | 5 ++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 7557813db..91e16566a 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -38,6 +38,7 @@ import gui.aboutData import gui.chromeTabs import gui.utils.animUtils as animUtils import gui.globalEvents as GE +import eos.db.saveddata.loadDefaultDatabaseValues as loadDefaultDatabaseValues from gui.bitmapLoader import BitmapLoader from gui.mainMenuBar import MainMenuBar @@ -405,10 +406,22 @@ class MainFrame(wx.Frame): def goForums(self, event): webbrowser.open('https://forums.eveonline.com/default.aspx?g=posts&t=466425') + def loadDatabaseDefaults(self, event): + # Import default database values + importDBDefaults = loadDefaultDatabaseValues.defaultDatabaseValues() + # Import values that must exist otherwise Pyfa breaks + importDBDefaults.importRequiredDefaults() + # Import default values for damage profiles + importDBDefaults.importDamageProfileDefaults() + # Import default values for target resist profiles + importDBDefaults.importResistProfileDefaults() + def registerMenu(self): menuBar = self.GetMenuBar() # Quit self.Bind(wx.EVT_MENU, self.ExitApp, id=wx.ID_EXIT) + # Load Default Database values + self.Bind(wx.EVT_MENU, self.loadDatabaseDefaults, id=menuBar.importDatabaseDefaultsId) # Widgets Inspector if config.debug: self.Bind(wx.EVT_MENU, self.openWXInspectTool, id = self.widgetInspectMenuID) diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py index 291c4c947..169ed4e6c 100644 --- a/gui/mainMenuBar.py +++ b/gui/mainMenuBar.py @@ -49,6 +49,7 @@ class MainMenuBar(wx.MenuBar): self.ssoLoginId = wx.NewId() self.attrEditorId = wx.NewId() self.toggleOverridesId = wx.NewId() + self.importDatabaseDefaultsId = wx.NewId() if 'wxMac' in wx.PlatformInfo and wx.VERSION >= (3,0): wx.ID_COPY = wx.NewId() @@ -73,7 +74,7 @@ class MainMenuBar(wx.MenuBar): fileMenu.Append(self.exportSkillsNeededId, "Export &Skills Needed", "Export skills needed for this fitting") fileMenu.Append(self.importCharacterId, "Import C&haracter File", "Import characters into pyfa from file") fileMenu.AppendSeparator() - fileMenu.Append(self.importDatabaseDefaults, "Import D&atabase Defaults", "Imports missing database defaults") + fileMenu.Append(self.importDatabaseDefaultsId, "Import D&atabase Defaults", "Imports missing database defaults") fileMenu.AppendSeparator() fileMenu.Append(wx.ID_EXIT) @@ -173,5 +174,3 @@ class MainMenuBar(wx.MenuBar): self.Enable(self.revertCharId, char.isDirty) event.Skip() - -