feat(theme): apply dark mode to panels and views

Convert MarketBrowser, ShipBrowser, StatsPane, CharacterSelection to ThemedPanel.

Apply Colors to ship browser items, item stats views, chrome tabs, display.

Update toggle panel, fitting view, implant editor with theme colors.

Author: nicklafleur

gui/builtinAdditionPanes/fighterView.py

@@ -29,6 +29,7 @@
 from gui.builtinViewColumns.state import State
 from gui.contextMenu import ContextMenu
 from gui.fitCommands.helpers import getSimilarFighters
+from gui.utils.colors import Colors
 from gui.utils.staticHelpers import DragDropHelper
 from service.fit import Fit
 from service.market import Market
@@ -115,8 +116,7 @@ def fitChanged(self, event):
                     slot = getattr(FittingSlot, "F_{}".format(x.upper()))
                 used = fit.getSlotsUsed(slot)
                 total = fit.getNumSlots(slot)
-                color = wx.Colour(204, 51, 51) if used > total else wx.SystemSettings.GetColour(
-                    wx.SYS_COLOUR_WINDOWTEXT)
+                color = wx.Colour(204, 51, 51) if used > total else Colors.text()
 
                 lbl = getattr(self, "label%sUsed" % x.capitalize())
                 lbl.SetLabel(str(int(used)))

gui/builtinItemStatsViews/itemAffectedBy.py

@@ -16,6 +16,7 @@
 import gui.mainFrame
 from gui.contextMenu import ContextMenu
 from gui.bitmap_loader import BitmapLoader
+from gui.utils.colors import Colors
 
 _t = wx.GetTranslation
 
@@ -41,7 +42,7 @@ class ItemAffectedBy(wx.Panel):
 
     def __init__(self, parent, stuff, item):
         wx.Panel.__init__(self, parent)
-        self.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_BTNFACE))
+        self.SetBackgroundColour(Colors.buttonFace())
         self.stuff = stuff
         self.item = item
 
@@ -56,7 +57,7 @@ def __init__(self, parent, stuff, item):
         mainSizer = wx.BoxSizer(wx.VERTICAL)
 
         self.affectedBy = wx.TreeCtrl(self, style=wx.TR_DEFAULT_STYLE | wx.TR_HIDE_ROOT | wx.NO_BORDER)
-        self.affectedBy.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW))
+        self.affectedBy.SetBackgroundColour(Colors.windowBackground())
         mainSizer.Add(self.affectedBy, 1, wx.ALL | wx.EXPAND, 0)
 
         self.m_staticline = wx.StaticLine(self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL)

gui/builtinItemStatsViews/itemAttributes.py

@@ -10,6 +10,7 @@
 from gui import globalEvents as GE
 from gui.bitmap_loader import BitmapLoader
 from gui.builtinItemStatsViews.attributeGrouping import *
+from gui.utils.colors import Colors
 from gui.utils.numberFormatter import formatAmount, roundDec
 from service.const import GuiAttrGroup
 
@@ -26,15 +27,16 @@ class ItemParams(wx.Panel):
     def __init__(self, parent, stuff, item, context=None):
         # Had to manually set the size here, otherwise column widths couldn't be calculated correctly. See #1878
         wx.Panel.__init__(self, parent, size=(1000, 1000))
-        self.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_BTNFACE))
+        self.SetBackgroundColour(Colors.buttonFace())
+        self.SetForegroundColour(Colors.text())
 
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
 
         mainSizer = wx.BoxSizer(wx.VERTICAL)
 
         self.paramList = wx.lib.agw.hypertreelist.HyperTreeList(self, wx.ID_ANY,
                                                                 agwStyle=wx.TR_HIDE_ROOT | wx.TR_NO_LINES | wx.TR_FULL_ROW_HIGHLIGHT | wx.TR_HAS_BUTTONS)
-        self.paramList.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW))
+        self.paramList.SetBackgroundColour(Colors.windowBackground())
 
         mainSizer.Add(self.paramList, 1, wx.ALL | wx.EXPAND, 0)
         self.SetSizer(mainSizer)
@@ -209,7 +211,7 @@ def AddAttribute(self, parent, attr):
 
             attrIcon, attrName, currentVal, baseVal = data
             attr_item = self.paramList.AppendItem(parent, attrName)
-            self.paramList.SetItemTextColour(attr_item, wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT))
+            self.paramList.SetItemTextColour(attr_item, Colors.text())
 
             self.paramList.SetItemText(attr_item, currentVal, 1)
             if self.stuff is not None:
@@ -238,7 +240,7 @@ def PopulateList(self):
             heading = data.get("label")
 
             header_item = self.paramList.AppendItem(root, heading)
-            self.paramList.SetItemTextColour(header_item, wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT))
+            self.paramList.SetItemTextColour(header_item, Colors.text())
             for attr in data.get("attributes", []):
                 # Attribute is a "grouped" attr (eg: damage, sensor strengths, etc). Automatically group these into a child item
                 if attr in GroupedAttributes:
@@ -249,7 +251,7 @@ def PopulateList(self):
 
                     # create a child item with the groups label
                     item = self.paramList.AppendItem(header_item, grouping[1])
-                    self.paramList.SetItemTextColour(item, wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT))
+                    self.paramList.SetItemTextColour(item, Colors.text())
                     for attr2 in grouping[0]:
                         # add each attribute in the group
                         self.AddAttribute(item, attr2)
@@ -274,7 +276,7 @@ def PopulateList(self):
 
                 # get all attributes in group
                 item = self.paramList.AppendItem(root, grouping[1])
-                self.paramList.SetItemTextColour(item, wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT))
+                self.paramList.SetItemTextColour(item, Colors.text())
                 for attr2 in grouping[0]:
                     self.AddAttribute(item, attr2)
 

gui/builtinItemStatsViews/itemCompare.py

@@ -2,6 +2,7 @@
 import wx
 
 from .helpers import AutoListCtrl
+from gui.utils.colors import Colors
 from service.price import Price as ServicePrice
 from service.market import Market
 from service.attribute import Attribute
@@ -21,7 +22,8 @@ def __init__(self, parent, stuff, item, items, context=None):
         sPrice.getPrices(items, self.UpdateList, fetchTimeout=90)
 
         wx.Panel.__init__(self, parent)
-        self.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_BTNFACE))
+        self.SetBackgroundColour(Colors.buttonFace())
+        self.SetForegroundColour(Colors.text())
         mainSizer = wx.BoxSizer(wx.VERTICAL)
 
         self.paramList = AutoListCtrl(self, wx.ID_ANY,

gui/builtinItemStatsViews/itemDescription.py

@@ -4,6 +4,8 @@
 import wx.html
 import re
 
+from gui.utils.colors import Colors
+
 _t = wx.GetTranslation
 
 
@@ -13,8 +15,8 @@ def __init__(self, parent, stuff, item):
         mainSizer = wx.BoxSizer(wx.VERTICAL)
         self.SetSizer(mainSizer)
 
-        bgcolor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
-        fgcolor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT)
+        bgcolor = Colors.windowBackground()
+        fgcolor = Colors.text()
 
         self.description = wx.html.HtmlWindow(self)
         if not item.description:

gui/builtinItemStatsViews/itemMutator.py

@@ -8,6 +8,7 @@
 import gui.globalEvents as GE
 import gui.mainFrame
 from gui.bitmap_loader import BitmapLoader
+from gui.utils.colors import Colors
 from service.fit import Fit
 from .attributeSlider import AttributeSlider, EVT_VALUE_CHANGED
 from .itemAttributes import ItemParams
@@ -21,7 +22,8 @@ class ItemMutatorPanel(wx.Panel):
     def __init__(self, parent, stuff):
         wx.Panel.__init__(self, parent)
         self.stuff = stuff
-        self.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_BTNFACE))
+        self.SetBackgroundColour(Colors.buttonFace())
+        self.SetForegroundColour(Colors.text())
 
         mainSizer = wx.BoxSizer(wx.VERTICAL)
 
@@ -72,7 +74,8 @@ def __init__(self, parent, stuff):
         self.SetScrollRate(0, 15)
         self.carryingFitID = gui.mainFrame.MainFrame.getInstance().getActiveFit()
         self.initialMutations = {}
-        self.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW))
+        self.SetBackgroundColour(Colors.windowBackground())
+        self.SetForegroundColour(Colors.text())
         self.stuff = stuff
         self.timer = None
         self.isModified = False

gui/builtinItemStatsViews/itemTraits.py

@@ -3,6 +3,8 @@
 # noinspection PyPackageRequirements
 import wx.html
 
+from gui.utils.colors import Colors
+
 _t = wx.GetTranslation
 
 
@@ -14,8 +16,8 @@ def __init__(self, parent, stuff, item):
 
         self.traits = wx.html.HtmlWindow(self)
 
-        bgcolor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
-        fgcolor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT)
+        bgcolor = Colors.windowBackground()
+        fgcolor = Colors.text()
         self.traits.SetPage("<body bgcolor='{}' text='{}'>{}</body>".format(
             bgcolor.GetAsString(wx.C2S_HTML_SYNTAX),
             fgcolor.GetAsString(wx.C2S_HTML_SYNTAX), item.traits.display))

gui/builtinShipBrowser/categoryItem.py

@@ -8,6 +8,7 @@
 import gui.utils.draw as drawUtils
 import gui.utils.fonts as fonts
 from gui.bitmap_loader import BitmapLoader
+from gui.utils.colors import Colors
 from .events import Stage2Selected
 
 pyfalog = Logger(__name__)
@@ -100,7 +101,7 @@ def DrawItem(self, mdc):
         # rect = self.GetRect()
         self.UpdateElementsPos(mdc)
 
-        windowColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
+        windowColor = Colors.windowBackground()
         textColor = colorUtils.GetSuitable(windowColor, 1)
 
         mdc.SetTextForeground(textColor)

gui/builtinShipBrowser/fitItem.py

@@ -15,6 +15,7 @@
 import gui.utils.draw as drawUtils
 import gui.utils.fonts as fonts
 from gui.bitmap_loader import BitmapLoader
+from gui.utils.colors import Colors
 from gui.builtinShipBrowser.pfBitmapFrame import PFBitmapFrame
 from service.fit import Fit
 from .events import BoosterListUpdated, FitSelected, ImportSelected, SearchSelected, Stage3Selected
@@ -421,7 +422,7 @@ def MouseMove(self, event):
                         bmpWidth = self.toolbarx if self.toolbarx < 200 else 200
                         self.dragTLFBmp = wx.Bitmap(round(bmpWidth), round(self.GetRect().height))
                         tdc.SelectObject(self.dragTLFBmp)
-                        tdc.SetBrush(wx.Brush(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)))
+                        tdc.SetBrush(wx.Brush(Colors.windowBackground()))
                         tdc.DrawRectangle(0, 0, bmpWidth, self.GetRect().height)
                         self.DrawItem(tdc)
                         tdc.SelectObject(wx.NullBitmap)
@@ -488,7 +489,7 @@ def UpdateElementsPos(self, mdc):
     def DrawItem(self, mdc):
         rect = self.GetRect()
 
-        windowColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
+        windowColor = Colors.windowBackground()
         textColor = colorUtils.GetSuitable(windowColor, 1)
 
         mdc.SetTextForeground(textColor)
@@ -572,7 +573,7 @@ def Refresh(self):
     def RenderBackground(self):
         rect = self.GetRect()
 
-        windowColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
+        windowColor = Colors.windowBackground()
 
         # activeFitID = self.mainFrame.getActiveFit()
         state = self.GetState()

gui/builtinShipBrowser/navigationPanel.py

@@ -9,6 +9,7 @@
 import gui.utils.draw as drawUtils
 import gui.utils.fonts as fonts
 from gui.bitmap_loader import BitmapLoader
+from gui.utils.colors import Colors
 from gui.utils.helpers_wxPython import HandleCtrlBackspace
 from service.fit import Fit
 from utils.cjk import isStringCjk
@@ -219,7 +220,7 @@ def UpdateElementsPos(self, mdc):
     def DrawItem(self, mdc):
         rect = self.GetRect()
 
-        windowColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
+        windowColor = Colors.windowBackground()
         textColor = colorUtils.GetSuitable(windowColor, 1)
         sepColor = colorUtils.GetSuitable(windowColor, 0.2)
 
@@ -238,7 +239,7 @@ def DrawItem(self, mdc):
     def RenderBackground(self):
         rect = self.GetRect()
 
-        windowColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
+        windowColor = Colors.windowBackground()
 
         sFactor = 0.1