From 92722d491fcec1ec605ce1833357d0bc90e2bfe4 Mon Sep 17 00:00:00 2001 From: Ryan Holmes Date: Sun, 2 Apr 2017 11:46:17 -0500 Subject: [PATCH] Remove functionality related to auto HTML export (#1088) --- .../pyfaHTMLExportPreferences.py | 24 ++++--------------- gui/builtinViews/fittingView.py | 3 --- service/settings.py | 7 ------ 3 files changed, 4 insertions(+), 30 deletions(-) diff --git a/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py b/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py index 01f00409d..a60cc24df 100644 --- a/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py +++ b/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py @@ -14,12 +14,9 @@ class PFHTMLExportPref(PreferenceView): title = "HTML Export" desc = ("HTML Export (File > Export HTML) allows you to export your entire fitting " "database into an HTML file at the specified location. This file can be " - "used in the in-game browser to easily open and import your fits, or used " - "in a regular web browser to open them at NULL-SEC.com or Osmium.") - desc2 = ("Enabling automatic exporting will update the HTML file after any change " - "to a fit is made. Under certain circumstance, this may cause performance issues.") - desc4 = ("Export Fittings in a minmal HTML Version, just containing the Fittingslinks " - "without any visual styling or javscript features") + "used to easily open your fits in a web-based fitting program") + desc4 = ("Export Fittings in a minimal HTML Version, just containing the fittings links " + "without any visual styling") def populatePanel(self, panel): self.mainFrame = gui.mainFrame.MainFrame.getInstance() @@ -55,21 +52,11 @@ class PFHTMLExportPref(PreferenceView): self.fileSelectButton.Bind(wx.EVT_BUTTON, self.selectHTMLExportFilePath) mainSizer.Add(self.fileSelectButton, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5) - self.stDesc2 = wx.StaticText(panel, wx.ID_ANY, self.desc2, wx.DefaultPosition, wx.DefaultSize, 0) - self.stDesc2.Wrap(dlgWidth - 50) - mainSizer.Add(self.stDesc2, 0, wx.ALL, 5) - - self.exportEnabled = wx.CheckBox(panel, wx.ID_ANY, u"Enable automatic HTML export", wx.DefaultPosition, - wx.DefaultSize, 0) - self.exportEnabled.SetValue(self.HTMLExportSettings.getEnabled()) - self.exportEnabled.Bind(wx.EVT_CHECKBOX, self.OnExportEnabledChange) - mainSizer.Add(self.exportEnabled, 0, wx.ALL | wx.EXPAND, 5) - self.stDesc4 = wx.StaticText(panel, wx.ID_ANY, self.desc4, wx.DefaultPosition, wx.DefaultSize, 0) self.stDesc4.Wrap(dlgWidth - 50) mainSizer.Add(self.stDesc4, 0, wx.ALL, 5) - self.exportMinimal = wx.CheckBox(panel, wx.ID_ANY, u"Enable minimal export Format", wx.DefaultPosition, + self.exportMinimal = wx.CheckBox(panel, wx.ID_ANY, u"Enable minimal format", wx.DefaultPosition, wx.DefaultSize, 0) self.exportMinimal.SetValue(self.HTMLExportSettings.getMinimalEnabled()) self.exportMinimal.Bind(wx.EVT_CHECKBOX, self.OnMinimalEnabledChange) @@ -90,9 +77,6 @@ class PFHTMLExportPref(PreferenceView): self.dirtySettings = True self.setPathLinkCtrlValues(self.HTMLExportSettings.getPath()) - def OnExportEnabledChange(self, event): - self.HTMLExportSettings.setEnabled(self.exportEnabled.GetValue()) - def OnMinimalEnabledChange(self, event): self.HTMLExportSettings.setMinimalEnabled(self.exportMinimal.GetValue()) diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index 01eb3ff66..2c694289b 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -32,7 +32,6 @@ from eos.saveddata.module import Module, Slot, Rack from gui.builtinViewColumns.state import State from gui.bitmapLoader import BitmapLoader import gui.builtinViews.emptyView -from gui.utils.exportHtml import exportHtml from logbook import Logger from gui.chromeTabs import EVT_NOTEBOOK_PAGE_CHANGED @@ -483,8 +482,6 @@ class FittingView(d.Display): self.populate(self.mods) self.refresh(self.mods) - exportHtml.getInstance().refreshFittingHtml() - self.Show(self.activeFitID is not None and self.activeFitID == event.fitID) except wx._core.PyDeadObjectError: pyfalog.error("Caught dead object") diff --git a/service/settings.py b/service/settings.py index 3da94b084..895a9d297 100644 --- a/service/settings.py +++ b/service/settings.py @@ -263,7 +263,6 @@ class HTMLExportSettings(object): def __init__(self): serviceHTMLExportDefaultSettings = { - "enabled": False, "path" : config.pyfaPath + os.sep + 'pyfaFits.html', "minimal": False } @@ -272,12 +271,6 @@ class HTMLExportSettings(object): serviceHTMLExportDefaultSettings ) - def getEnabled(self): - return self.serviceHTMLExportSettings["enabled"] - - def setEnabled(self, enabled): - self.serviceHTMLExportSettings["enabled"] = enabled - def getMinimalEnabled(self): return self.serviceHTMLExportSettings["minimal"]