Move useStaticAdaptiveArmorHardener to the EOSSettings. Not moving force reload for now

eos/config.py

@@ -22,7 +22,7 @@ else:
 pyfalog.debug("Saveddata connection string: {0}", saveddata_connectionstring)
 
 settings = {
-    "setting1": True
+    "useStaticAdaptiveArmorHardener": False
 }
 
 # Autodetect path, only change if the autodetection bugs out.

eos/effects/adaptivearmorhardener.py

@@ -3,7 +3,7 @@
 # Used by:
 # Module: Reactive Armor Hardener
 from logbook import Logger
-from service.fit import Fit
+import eos.config
 
 pyfalog = Logger(__name__)
 
@@ -14,8 +14,7 @@ type = "active"
 def handler(fit, module, context):
     damagePattern = fit.damagePattern
 
-    sFit = Fit.getInstance()
-    static_adaptive_behavior = sFit.serviceFittingOptions["useStaticAdaptiveArmorHardener"]
+    static_adaptive_behavior = eos.config.settings['useStaticAdaptiveArmorHardener']
 
     if (damagePattern.emAmount == damagePattern.thermalAmount == damagePattern.kineticAmount == damagePattern.explosiveAmount) and static_adaptive_behavior:
         pyfalog.debug("Setting adaptivearmorhardener resists to uniform profile.")

eos/effects/tractorbeamcan.py

@@ -7,5 +7,4 @@ type = "active"
 
 
 def handler(fit, module, context):
-    print settings['setting1']
     pass

gui/builtinPreferenceViews/pyfaDatabasePreferences.py

@@ -14,7 +14,6 @@ class PFGeneralPref(PreferenceView):
 
     def populatePanel(self, panel):
         self.dirtySettings = False
-        # self.openFitsSettings = service.SettingsProvider.getInstance().getSettings("pyfaPrevOpenFits", {"enabled": False, "pyfaOpenFits": []})
 
         mainSizer = wx.BoxSizer(wx.VERTICAL)
 

gui/builtinPreferenceViews/pyfaEnginePreferences.py

@@ -5,6 +5,7 @@ import wx
 from service.fit import Fit
 from gui.bitmapLoader import BitmapLoader
 from gui.preferenceView import PreferenceView
+from service.settings import EOSSettings
 
 logger = logging.getLogger(__name__)
 
@@ -20,10 +21,11 @@ class PFFittingEnginePref(PreferenceView):
 
     # noinspection PyAttributeOutsideInit
     def populatePanel(self, panel):
-        # self.openFitsSettings = service.SettingsProvider.getInstance().getSettings("pyfaPrevOpenFits", {"enabled": False, "pyfaOpenFits": []})
 
         mainSizer = wx.BoxSizer(wx.VERTICAL)
 
+        self.engine_settings = EOSSettings.getInstance()
+
         self.stTitle = wx.StaticText(panel, wx.ID_ANY, self.title, wx.DefaultPosition, wx.DefaultSize, 0)
         self.stTitle.Wrap(-1)
         self.stTitle.SetFont(wx.Font(12, 70, 90, 90, False, wx.EmptyString))
@@ -36,7 +38,7 @@ class PFFittingEnginePref(PreferenceView):
                                                wx.DefaultPosition, wx.DefaultSize, 0)
         mainSizer.Add(self.cbGlobalForceReload, 0, wx.ALL | wx.EXPAND, 5)
 
-        self.cbUniversalAdaptiveArmorHardener = wx.CheckBox(panel, wx.ID_ANY, u"When damage profile is even, set Reactive Armor Hardener to match (old behavior).",
+        self.cbUniversalAdaptiveArmorHardener = wx.CheckBox(panel, wx.ID_ANY, u"When damage profile is Uniform, set Reactive Armor Hardener to match (old behavior).",
                                                wx.DefaultPosition, wx.DefaultSize, 0)
         mainSizer.Add(self.cbUniversalAdaptiveArmorHardener, 0, wx.ALL | wx.EXPAND, 5)
 
@@ -69,7 +71,7 @@ class PFFittingEnginePref(PreferenceView):
         self.cbGlobalForceReload.SetValue(self.sFit.serviceFittingOptions["useGlobalForceReload"])
         self.cbGlobalForceReload.Bind(wx.EVT_CHECKBOX, self.OnCBGlobalForceReloadStateChange)
 
-        self.cbUniversalAdaptiveArmorHardener.SetValue(self.sFit.serviceFittingOptions["useStaticAdaptiveArmorHardener"])
+        self.cbUniversalAdaptiveArmorHardener.SetValue(self.engine_settings.get("useStaticAdaptiveArmorHardener"))
         self.cbUniversalAdaptiveArmorHardener.Bind(wx.EVT_CHECKBOX, self.OnCBUniversalAdaptiveArmorHardenerChange)
 
         panel.SetSizer(mainSizer)
@@ -79,7 +81,7 @@ class PFFittingEnginePref(PreferenceView):
         self.sFit.serviceFittingOptions["useGlobalForceReload"] = self.cbGlobalForceReload.GetValue()
 
     def OnCBUniversalAdaptiveArmorHardenerChange(self, event):
-        self.sFit.serviceFittingOptions["useStaticAdaptiveArmorHardener"] = self.cbUniversalAdaptiveArmorHardener.GetValue()
+        self.engine_settings.set("useStaticAdaptiveArmorHardener", self.cbUniversalAdaptiveArmorHardener.GetValue())
 
     def getImage(self):
         return BitmapLoader.getBitmap("settings_fitting", "gui")

gui/builtinPreferenceViews/pyfaLoggingPreferences.py

@@ -17,7 +17,6 @@ class PFGeneralPref(PreferenceView):
 
     def populatePanel(self, panel):
         self.dirtySettings = False
-        # self.openFitsSettings = service.SettingsProvider.getInstance().getSettings("pyfaPrevOpenFits", {"enabled": False, "pyfaOpenFits": []})
 
         mainSizer = wx.BoxSizer(wx.VERTICAL)
 

service/fit.py

@@ -73,7 +73,6 @@ class Fit(object):
             "exportCharges": True,
             "openFitInNew": False,
             "priceSystem": "Jita",
-            "useStaticAdaptiveArmorHardener": False,
             "showShipBrowserTooltip": True,
         }