diff --git a/gui/builtinPreferenceViews/pyfaDatabasePreferences.py b/gui/builtinPreferenceViews/pyfaDatabasePreferences.py index 5ecdf9570..a55009f52 100644 --- a/gui/builtinPreferenceViews/pyfaDatabasePreferences.py +++ b/gui/builtinPreferenceViews/pyfaDatabasePreferences.py @@ -1,14 +1,11 @@ import wx -from gui.preferenceView import PreferenceView -from gui.bitmap_loader import BitmapLoader -from gui.utils import helpers_wxPython as wxHelpers import config +from eos.db.saveddata.loadDefaultDatabaseValues import DefaultDatabaseValues from eos.db.saveddata.queries import clearPrices, clearDamagePatterns, clearTargetResists - -import logging - -logger = logging.getLogger(__name__) +from gui.bitmap_loader import BitmapLoader +from gui.preferenceView import PreferenceView +from gui.utils import helpers_wxPython as wxHelpers class PFGeneralPref(PreferenceView): @@ -78,24 +75,36 @@ class PFGeneralPref(PreferenceView): btnSizer = wx.BoxSizer(wx.VERTICAL) btnSizer.AddStretchSpacer() + self.btnImportDefaults = wx.Button(panel, wx.ID_ANY, "Reimport Database Defaults", wx.DefaultPosition, wx.DefaultSize, 0) + btnSizer.Add(self.btnImportDefaults, 0, wx.ALL, 5) + self.btnImportDefaults.Bind(wx.EVT_BUTTON, self.loadDatabaseDefaults) + self.btnDeleteDamagePatterns = wx.Button(panel, wx.ID_ANY, "Delete All Damage Pattern Profiles", wx.DefaultPosition, wx.DefaultSize, 0) btnSizer.Add(self.btnDeleteDamagePatterns, 0, wx.ALL, 5) + self.btnDeleteDamagePatterns.Bind(wx.EVT_BUTTON, self.DeleteDamagePatterns) self.btnDeleteTargetResists = wx.Button(panel, wx.ID_ANY, "Delete All Target Resist Profiles", wx.DefaultPosition, wx.DefaultSize, 0) btnSizer.Add(self.btnDeleteTargetResists, 0, wx.ALL, 5) + self.btnDeleteTargetResists.Bind(wx.EVT_BUTTON, self.DeleteTargetResists) self.btnPrices = wx.Button(panel, wx.ID_ANY, "Delete All Prices", wx.DefaultPosition, wx.DefaultSize, 0) btnSizer.Add(self.btnPrices, 0, wx.ALL, 5) + self.btnPrices.Bind(wx.EVT_BUTTON, self.DeletePrices) mainSizer.Add(btnSizer, 0, wx.EXPAND, 5) - self.btnDeleteDamagePatterns.Bind(wx.EVT_BUTTON, self.DeleteDamagePatterns) - self.btnDeleteTargetResists.Bind(wx.EVT_BUTTON, self.DeleteTargetResists) - self.btnPrices.Bind(wx.EVT_BUTTON, self.DeletePrices) panel.SetSizer(mainSizer) panel.Layout() + def loadDatabaseDefaults(self, event): + # Import values that must exist otherwise Pyfa breaks + DefaultDatabaseValues.importRequiredDefaults() + # Import default values for damage profiles + DefaultDatabaseValues.importDamageProfileDefaults() + # Import default values for target resist profiles + DefaultDatabaseValues.importResistProfileDefaults() + def DeleteDamagePatterns(self, event): question = "This is a destructive action that will delete all damage pattern profiles.\nAre you sure you want to do this?" if wxHelpers.YesNoDialog(question, "Confirm"): diff --git a/gui/mainFrame.py b/gui/mainFrame.py index a185bc96a..a2701f7cc 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -36,7 +36,6 @@ from wx.lib.inspection import InspectionTool import config import gui.globalEvents as GE from eos.config import gamedata_date, gamedata_version -from eos.db.saveddata.loadDefaultDatabaseValues import DefaultDatabaseValues # import this to access override setting from eos.modifiedAttributeDict import ModifiedAttributeDict from gui import graphFrame @@ -450,21 +449,10 @@ class MainFrame(wx.Frame): def goForums(event): webbrowser.open('https://forums.eveonline.com/t/27156') - @staticmethod - def loadDatabaseDefaults(event): - # Import values that must exist otherwise Pyfa breaks - DefaultDatabaseValues.importRequiredDefaults() - # Import default values for damage profiles - DefaultDatabaseValues.importDamageProfileDefaults() - # Import default values for target resist profiles - DefaultDatabaseValues.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 deef10b22..a3b89d757 100644 --- a/gui/mainMenuBar.py +++ b/gui/mainMenuBar.py @@ -54,7 +54,6 @@ class MainMenuBar(wx.MenuBar): self.ssoLoginId = wx.NewId() self.attrEditorId = wx.NewId() self.toggleOverridesId = wx.NewId() - self.importDatabaseDefaultsId = wx.NewId() self.toggleIgnoreRestrictionID = wx.NewId() self.devToolsId = wx.NewId() self.optimizeFitPrice = wx.NewId() @@ -165,8 +164,6 @@ class MainMenuBar(wx.MenuBar): helpMenu.Append(self.wikiId, "Wiki", "Go to wiki on GitHub") helpMenu.Append(self.forumId, "Forums", "Go to EVE Online Forum thread") helpMenu.AppendSeparator() - helpMenu.Append(self.importDatabaseDefaultsId, "Import D&atabase Defaults", "Imports missing database defaults") - helpMenu.AppendSeparator() helpMenu.Append(wx.ID_ABOUT) if config.debug: