From 9bdb4ea9677c11eb212bfdb2ca3642a03d20fee5 Mon Sep 17 00:00:00 2001
From: Tony Cook <tony@develop-help.com>
Date: Fri, 1 Mar 2019 19:47:04 +1100
Subject: [PATCH] move the item slot colours to config and use it from there

---
 config.py                            |  6 ++++++
 gui/builtinMarketBrowser/itemView.py | 13 +++++--------
 gui/builtinViews/fittingView.py      |  9 ++-------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/config.py b/config.py
index 4e1234e90..fd5ba387c 100644
--- a/config.py
+++ b/config.py
@@ -1,6 +1,7 @@
 import os
 import sys
 import yaml
+import wx
 
 from logbook import CRITICAL, DEBUG, ERROR, FingersCrossedHandler, INFO, Logger, NestedSetup, NullHandler, \
     StreamHandler, TimedRotatingFileHandler, WARNING
@@ -47,6 +48,11 @@ LOGLEVEL_MAP = {
     "debug": DEBUG,
 }
 
+slotColourMap = {1: wx.Colour(250, 235, 204),  # yellow = low slots
+                 2: wx.Colour(188, 215, 241),  # blue   = mid slots
+                 3: wx.Colour(235, 204, 209),  # red    = high slots
+                 4: '',
+                 5: '' }
 
 def getClientSecret():
     return clientHash
diff --git a/gui/builtinMarketBrowser/itemView.py b/gui/builtinMarketBrowser/itemView.py
index 83be7e22f..7f26a9055 100644
--- a/gui/builtinMarketBrowser/itemView.py
+++ b/gui/builtinMarketBrowser/itemView.py
@@ -8,6 +8,7 @@ from gui.display import Display
 from gui.utils.staticHelpers import DragDropHelper
 from service.attribute import Attribute
 from service.fit import Fit
+from config import slotColourMap
 
 pyfalog = Logger(__name__)
 
@@ -268,13 +269,9 @@ class ItemView(Display):
             i += 1
         return revmap
 
-    slotColourMap = { 1: wx.Colour(250, 235, 204),
-                      2: wx.Colour(188, 215, 241),
-                      3: wx.Colour(235, 204, 209) }
-
     def columnBackground(self, colItem, item):
         if self.sFit.serviceFittingOptions["colorFitBySlot"]:
-            slot = item.slot;
-            if slot in self.slotColourMap:
-                return self.slotColourMap[slot]
-        return wx.Colour(255, 255, 255)
+            slot = item.slot
+            return slotColourMap.get(slot) or self.GetBackgroundColour()
+        else:
+            return self.GetBackgroundColour()
diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py
index a0aea6043..372ea6a2e 100644
--- a/gui/builtinViews/fittingView.py
+++ b/gui/builtinViews/fittingView.py
@@ -40,6 +40,7 @@ from gui.contextMenu import ContextMenu
 from gui.utils.staticHelpers import DragDropHelper
 from service.fit import Fit
 from service.market import Market
+from config import slotColourMap
 
 pyfalog = Logger(__name__)
 
@@ -629,14 +630,8 @@ class FittingView(d.Display):
         else:
             event.Skip()
 
-    slotColourMap = {1: wx.Colour(250, 235, 204),  # yellow = low slots
-                     2: wx.Colour(188, 215, 241),  # blue   = mid slots
-                     3: wx.Colour(235, 204, 209),  # red    = high slots
-                     4: '',
-                     5: ''}
-
     def slotColour(self, slot):
-        return self.slotColourMap.get(slot) or self.GetBackgroundColour()
+        return slotColourMap.get(slot) or self.GetBackgroundColour()
 
     def refresh(self, stuff):
         """