feat(theme): style input controls and lists

Apply Colors.styleInput() to TextCtrl, Choice, ComboBox controls.

On Windows, native controls ignore SetBackgroundColour due to visual styles.

styleInput() calls SetWindowTheme() via ctypes to disable native theming,

allowing custom dark backgrounds to render correctly.

Apply theme colors to MarketTree, preference views, ESI fittings.

Author: nicklafleur

gui/builtinMarketBrowser/marketTree.py

@@ -2,6 +2,7 @@
 
 from gui.cachingImageList import CachingImageList
 from gui.builtinMarketBrowser.events import RECENTLY_USED_MODULES, CHARGES_FOR_FIT
+from gui.utils.colors import Colors
 
 from logbook import Logger
 
@@ -13,6 +14,8 @@ class MarketTree(wx.TreeCtrl):
 
     def __init__(self, parent, marketBrowser):
         wx.TreeCtrl.__init__(self, parent, style=wx.TR_DEFAULT_STYLE | wx.TR_HIDE_ROOT)
+        self.SetBackgroundColour(Colors.listBackground())
+        self.SetForegroundColour(Colors.text())
         pyfalog.debug("Initialize marketTree")
         self.root = self.AddRoot("root")
 

gui/builtinMarketBrowser/pfSearchBox.py

@@ -2,6 +2,7 @@
 import wx
 import gui.utils.color as colorUtils
 import gui.utils.draw as drawUtils
+from gui.utils.colors import Colors
 from gui.utils.helpers_wxPython import HandleCtrlBackspace
 
 SearchButton, EVT_SEARCH_BTN = wx.lib.newevent.NewEvent()
@@ -44,6 +45,7 @@ def __init__(self, parent, id=wx.ID_ANY, value="", pos=wx.DefaultPosition, size=
         self.EditBox = wx.TextCtrl(self, wx.ID_ANY, "", wx.DefaultPosition,
                                    (-1, h - 2 if 'wxGTK' in wx.PlatformInfo else -1),
                                    wx.TE_PROCESS_ENTER | (wx.BORDER_NONE if 'wxGTK' in wx.PlatformInfo else 0))
+        Colors.styleInput(self.EditBox)
 
         self.Bind(wx.EVT_PAINT, self.OnPaint)
         self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBk)
@@ -235,7 +237,7 @@ def UpdateElementsPos(self, dc):
     def OnPaint(self, event):
         dc = wx.AutoBufferedPaintDC(self)
 
-        bkColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
+        bkColor = Colors.windowBackground()
         sepColor = colorUtils.GetSuitable(bkColor, 0.2)
         rect = self.GetRect()
 

gui/builtinPreferenceViews/pyfaDatabasePreferences.py

@@ -5,6 +5,7 @@
 from gui.bitmap_loader import BitmapLoader
 from gui.preferenceView import PreferenceView
 from gui.utils import helpers_wxPython as wxHelpers
+from gui.utils.colors import Colors
 
 _t = wx.GetTranslation
 
@@ -40,7 +41,7 @@ def populatePanel(self, panel):
         mainSizer.Add(self.stSetUserPath, 0, wx.ALL, 5)
         self.inputUserPath = wx.TextCtrl(panel, wx.ID_ANY, config.savePath, wx.DefaultPosition, wx.DefaultSize, 0)
         self.inputUserPath.SetEditable(False)
-        self.inputUserPath.SetBackgroundColour((200, 200, 200))
+        Colors.styleInput(self.inputUserPath, disabled=True)
         mainSizer.Add(self.inputUserPath, 0, wx.ALL | wx.EXPAND, 5)
 
         # Save DB
@@ -50,7 +51,7 @@ def populatePanel(self, panel):
 
         self.inputFitDB = wx.TextCtrl(panel, wx.ID_ANY, config.saveDB, wx.DefaultPosition, wx.DefaultSize, 0)
         self.inputFitDB.SetEditable(False)
-        self.inputFitDB.SetBackgroundColour((200, 200, 200))
+        Colors.styleInput(self.inputFitDB, disabled=True)
         mainSizer.Add(self.inputFitDB, 0, wx.ALL | wx.EXPAND, 5)
 
         # Game Data DB
@@ -60,7 +61,7 @@ def populatePanel(self, panel):
 
         self.inputGameDB = wx.TextCtrl(panel, wx.ID_ANY, config.gameDB, wx.DefaultPosition, wx.DefaultSize, 0)
         self.inputGameDB.SetEditable(False)
-        self.inputGameDB.SetBackgroundColour((200, 200, 200))
+        Colors.styleInput(self.inputGameDB, disabled=True)
         mainSizer.Add(self.inputGameDB, 0, wx.ALL | wx.EXPAND, 5)
 
         self.cbsaveInRoot.SetValue(config.saveInRoot)

gui/builtinPreferenceViews/pyfaEsiPreferences.py

@@ -5,6 +5,7 @@
 import gui.mainFrame
 from gui.bitmap_loader import BitmapLoader
 from gui.preferenceView import PreferenceView
+from gui.utils.colors import Colors
 from service.esi import Esi
 from service.settings import EsiSettings
 
@@ -67,6 +68,7 @@ def populatePanel(self, panel):
         self.esiServer.SetToolTip(wx.ToolTip(_t('The source you choose will be used on connection.')))
 
         self.chESIserver = wx.Choice(panel, choices=list(self.settings.keys()))
+        Colors.styleInput(self.chESIserver)
 
         self.chESIserver.SetStringSelection(self.settings.get("server"))
 

gui/builtinPreferenceViews/pyfaLoggingPreferences.py

@@ -2,6 +2,7 @@
 
 from gui.preferenceView import PreferenceView
 from gui.bitmap_loader import BitmapLoader
+from gui.utils.colors import Colors
 import config
 from logbook import Logger
 
@@ -40,7 +41,7 @@ def populatePanel(self, panel):
         mainSizer.Add(self.stLogPath, 0, wx.ALL, 5)
         self.inputLogPath = wx.TextCtrl(panel, wx.ID_ANY, config.logPath, wx.DefaultPosition, wx.DefaultSize, 0)
         self.inputLogPath.SetEditable(False)
-        self.inputLogPath.SetBackgroundColour((200, 200, 200))
+        Colors.styleInput(self.inputLogPath, disabled=True)
         mainSizer.Add(self.inputLogPath, 0, wx.ALL | wx.EXPAND, 5)
 
         import requests
@@ -49,7 +50,7 @@ def populatePanel(self, panel):
         mainSizer.Add(self.certPath, 0, wx.ALL, 5)
         self.certPathCtrl = wx.TextCtrl(panel, wx.ID_ANY, requests.certs.where(), wx.DefaultPosition, wx.DefaultSize, 0)
         self.certPathCtrl.SetEditable(False)
-        self.certPathCtrl.SetBackgroundColour((200, 200, 200))
+        Colors.styleInput(self.certPathCtrl, disabled=True)
         mainSizer.Add(self.certPathCtrl, 0, wx.ALL | wx.EXPAND, 5)
 
         # Debug Logging

gui/builtinPreferenceViews/pyfaMarketPreferences.py

@@ -4,6 +4,7 @@
 
 from gui.preferenceView import PreferenceView
 from gui.bitmap_loader import BitmapLoader
+from gui.utils.colors import Colors
 
 import gui.mainFrame
 import gui.globalEvents as GE
@@ -44,6 +45,7 @@ def populatePanel(self, panel):
                 _t('The delay between a keystroke and the market search. Can help reduce lag when typing fast in the market search box.')))
         delayTimer.Add(self.stMarketDelay, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
         self.intDelay = IntCtrl(panel, max=1000, limited=True)
+        Colors.styleInput(self.intDelay)
         delayTimer.Add(self.intDelay, 0, wx.ALL, 5)
         mainSizer.Add(delayTimer, 0, wx.EXPAND | wx.TOP | wx.RIGHT, 10)
         self.intDelay.SetValue(self.sFit.serviceFittingOptions["marketSearchDelay"])
@@ -65,6 +67,8 @@ def populatePanel(self, panel):
                    'The system you choose will also be tried first, and if no data is available, global price will be used.')))
         self.chPriceSource = wx.Choice(panel, choices=sorted(Price.sources.keys()))
         self.chPriceSystem = wx.Choice(panel, choices=list(Price.systemsList.keys()))
+        Colors.styleInput(self.chPriceSource)
+        Colors.styleInput(self.chPriceSystem)
         priceSizer.Add(self.chPriceSource, 1, wx.ALL | wx.EXPAND, 5)
         priceSizer.Add(self.chPriceSystem, 1, wx.ALL | wx.EXPAND, 5)
         mainSizer.Add(priceSizer, 0, wx.EXPAND | wx.TOP | wx.RIGHT, 10)

gui/builtinPreferenceViews/pyfaNetworkPreferences.py

@@ -3,6 +3,7 @@
 
 from gui.preferenceView import PreferenceView
 from gui.bitmap_loader import BitmapLoader
+from gui.utils.colors import Colors
 
 import gui.mainFrame
 from service.settings import NetworkSettings
@@ -86,6 +87,7 @@ def populatePanel(self, panel):
 
         self.chProxyTypeChoices = [_t("No proxy"), _t("Auto-detected proxy settings"), _t("Manual proxy settings")]
         self.chProxyType = wx.Choice(panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, self.chProxyTypeChoices, 0)
+        Colors.styleInput(self.chProxyType)
 
         self.chProxyType.SetSelection(self.nMode)
 
@@ -103,6 +105,7 @@ def populatePanel(self, panel):
         fgAddrSizer.Add(self.stPSetAddr, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
 
         self.editProxySettingsAddr = wx.TextCtrl(panel, wx.ID_ANY, self.nAddr, wx.DefaultPosition, wx.DefaultSize, 0)
+        Colors.styleInput(self.editProxySettingsAddr)
 
         fgAddrSizer.Add(self.editProxySettingsAddr, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 5)
 
@@ -112,6 +115,7 @@ def populatePanel(self, panel):
         fgAddrSizer.Add(self.stPSetPort, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
 
         self.editProxySettingsPort = wx.TextCtrl(panel, wx.ID_ANY, self.nPort, wx.DefaultPosition, wx.DefaultSize, 0)
+        Colors.styleInput(self.editProxySettingsPort)
 
         fgAddrSizer.Add(self.editProxySettingsPort, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 5)
 
@@ -122,10 +126,12 @@ def populatePanel(self, panel):
         self.stPSetLogin.Wrap(-1)
         self.editProxySettingsLogin = wx.TextCtrl(panel, wx.ID_ANY, self.nAuth[0], wx.DefaultPosition, wx.DefaultSize,
                                                   0)
+        Colors.styleInput(self.editProxySettingsLogin)
         self.stPSetPassword = wx.StaticText(panel, wx.ID_ANY, _t("Password:"), wx.DefaultPosition, wx.DefaultSize, 0)
         self.stPSetPassword.Wrap(-1)
         self.editProxySettingsPassword = wx.TextCtrl(panel, wx.ID_ANY, self.nAuth[1], wx.DefaultPosition,
                                                      wx.DefaultSize, wx.TE_PASSWORD)
+        Colors.styleInput(self.editProxySettingsPassword)
         pAuthSizer = wx.BoxSizer(wx.HORIZONTAL)
         pAuthSizer.Add(self.stPSetLogin, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
         pAuthSizer.Add(self.editProxySettingsLogin, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)

gui/builtinViews/entityEditor.py

@@ -1,6 +1,7 @@
 # noinspection PyPackageRequirements
 import wx
 from gui.bitmap_loader import BitmapLoader
+from gui.utils.colors import Colors
 
 
 class BaseValidator(wx.Validator):
@@ -45,6 +46,7 @@ def __init__(self, parent, entityName, selected=None):
         self.choices = []
         self.choices.sort(key=lambda p: p.name)
         self.entityChoices = wx.Choice(self, choices=[p.name for p in self.choices])
+        Colors.styleInput(self.entityChoices)
         self.navSizer.Add(self.entityChoices, 1, wx.ALL, 5)
 
         buttons = (("new", wx.ART_NEW, self.OnNew),

gui/esiFittings.py

@@ -20,6 +20,7 @@
 from service.port import Port
 from service.port.esi import ESIExportException
 from service.settings import EsiSettings
+from gui.utils.colors import Colors
 
 
 _t = wx.GetTranslation
@@ -39,6 +40,7 @@ def __init__(self, parent):
         characterSelectSizer = wx.BoxSizer(wx.HORIZONTAL)
 
         self.charChoice = wx.Choice(self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, [])
+        Colors.styleInput(self.charChoice)
         characterSelectSizer.Add(self.charChoice, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
         self.updateCharList()
 
@@ -276,6 +278,7 @@ def __init__(self, parent):
         hSizer = wx.BoxSizer(wx.HORIZONTAL)
 
         self.charChoice = wx.Choice(self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, [])
+        Colors.styleInput(self.charChoice)
         hSizer.Add(self.charChoice, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
         self.updateCharList()
         self.charChoice.SetSelection(0)

gui/utils/inputs.py

@@ -24,6 +24,7 @@
 import wx
 
 from eos.utils.float import floatUnerr
+from gui.utils.colors import Colors
 
 
 def valToStr(val):
@@ -77,7 +78,7 @@ def ChangeValueFloat(self, value):
 
     def updateColor(self):
         if self.isValid():
-            self.SetForegroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT))
+            self.SetForegroundColour(Colors.text())
         else:
             self.SetForegroundColour(wx.RED)