refac: rename colors module to themes

nicklafleur · nicklafleur · commit c333f019d172 · 2026-01-02T16:03:00.000-05:00
diff --git a/graphs/gui/canvasPanel.py b/graphs/gui/canvasPanel.py
@@ -31,7 +31,7 @@
 
 
 from graphs.style import BASE_COLORS, LIGHTNESSES, STYLES, hsl_to_hsv
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 from gui.utils.dark import isDark
 from gui.utils.numberFormatter import roundToPrec
 
diff --git a/graphs/gui/ctrlPanel.py b/graphs/gui/ctrlPanel.py
@@ -25,7 +25,7 @@
 
 from gui.bitmap_loader import BitmapLoader
 from gui.contextMenu import ContextMenu
-from gui.utils.colors import ThemedPanel, Colors
+from gui.utils.themes import ThemedPanel, Colors
 from gui.utils.inputs import FloatBox, FloatRangeBox
 from service.const import GraphCacheCleanupReason
 from service.fit import Fit
diff --git a/graphs/gui/frame.py b/graphs/gui/frame.py
@@ -29,7 +29,7 @@
 from graphs.events import RESIST_MODE_CHANGED
 from gui.auxWindow import AuxiliaryFrame
 from gui.bitmap_loader import BitmapLoader
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 from service.const import GraphCacheCleanupReason
 from service.settings import GraphSettings
 from . import canvasPanel
diff --git a/graphs/gui/stylePickers.py b/graphs/gui/stylePickers.py
@@ -23,7 +23,7 @@
 
 from graphs.style import BASE_COLORS, LIGHTNESSES, STYLES
 from gui.bitmap_loader import BitmapLoader
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 from service.const import GraphLightness
 
 
diff --git a/graphs/gui/vector.py b/graphs/gui/vector.py
@@ -24,7 +24,7 @@
 import wx
 
 from eos.utils.float import floatUnerr
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 
 
 class VectorPicker(wx.Window):
diff --git a/graphs/style.py b/graphs/style.py
@@ -23,7 +23,7 @@
 # noinspection PyPackageRequirements
 import wx
 
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 from service.const import GraphColor, GraphLightness, GraphLineStyle
 
 ColorData = namedtuple('ColorData', ('hsl', 'name', 'iconName'))
diff --git a/gui/attribute_gauge.py b/gui/attribute_gauge.py
@@ -3,7 +3,7 @@
 import wx
 
 from gui.utils import anim_effects
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 
 
 # todo: clean class up. Took from pyfa gauge, has a bunch of extra shit we don't need
diff --git a/gui/auxWindow.py b/gui/auxWindow.py
@@ -21,7 +21,7 @@
 # noinspection PyPackageRequirements
 import wx
 
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 from gui.utils.dark import setDarkTitleBar
 
 
diff --git a/gui/builtinAdditionPanes/fighterView.py b/gui/builtinAdditionPanes/fighterView.py
@@ -29,7 +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.themes import Colors
 from gui.utils.staticHelpers import DragDropHelper
 from service.fit import Fit
 from service.market import Market
diff --git a/gui/builtinContextMenus/droneSplitStack.py b/gui/builtinContextMenus/droneSplitStack.py
@@ -6,7 +6,7 @@
 import gui.fitCommands as cmd
 import gui.mainFrame
 from gui.contextMenu import ContextMenuSingle
-from gui.utils.colors import ThemedDialog, Colors
+from gui.utils.themes import ThemedDialog, Colors
 from service.fit import Fit
 
 _t = wx.GetTranslation
diff --git a/gui/builtinContextMenus/fitPilotSecurity.py b/gui/builtinContextMenus/fitPilotSecurity.py
@@ -5,7 +5,7 @@
 import gui.fitCommands as cmd
 import gui.mainFrame
 from gui.contextMenu import ContextMenuUnconditional
-from gui.utils.colors import ThemedDialog, Colors
+from gui.utils.themes import ThemedDialog, Colors
 from service.fit import Fit
 
 _t = wx.GetTranslation
diff --git a/gui/builtinContextMenus/implantSetSave.py b/gui/builtinContextMenus/implantSetSave.py
@@ -2,7 +2,7 @@
 
 import gui.mainFrame
 from gui.contextMenu import ContextMenuUnconditional
-from gui.utils.colors import ThemedDialog, Colors
+from gui.utils.themes import ThemedDialog, Colors
 from service.fit import Fit
 
 _t = wx.GetTranslation
diff --git a/gui/builtinContextMenus/itemAmountChange.py b/gui/builtinContextMenus/itemAmountChange.py
@@ -9,7 +9,7 @@
 from eos.saveddata.fighter import Fighter as es_Fighter
 from eos.saveddata.fit import Fit as es_Fit
 from gui.contextMenu import ContextMenuCombined
-from gui.utils.colors import ThemedDialog, Colors
+from gui.utils.themes import ThemedDialog, Colors
 from service.fit import Fit
 
 # noinspection PyPackageRequirements
diff --git a/gui/builtinContextMenus/itemProjectionRange.py b/gui/builtinContextMenus/itemProjectionRange.py
@@ -9,7 +9,7 @@
 from eos.saveddata.module import Module as EosModule
 from gui.contextMenu import ContextMenuCombined
 from gui.fitCommands.helpers import getSimilarFighters, getSimilarModPositions
-from gui.utils.colors import ThemedDialog, Colors
+from gui.utils.themes import ThemedDialog, Colors
 from service.fit import Fit
 
 # noinspection PyPackageRequirements
diff --git a/gui/builtinItemStatsViews/itemAffectedBy.py b/gui/builtinItemStatsViews/itemAffectedBy.py
@@ -16,7 +16,7 @@
 import gui.mainFrame
 from gui.contextMenu import ContextMenu
 from gui.bitmap_loader import BitmapLoader
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 
 _t = wx.GetTranslation
 
diff --git a/gui/builtinItemStatsViews/itemAttributes.py b/gui/builtinItemStatsViews/itemAttributes.py
@@ -10,7 +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.themes import Colors
 from gui.utils.numberFormatter import formatAmount, roundDec
 from service.const import GuiAttrGroup
 
diff --git a/gui/builtinItemStatsViews/itemCompare.py b/gui/builtinItemStatsViews/itemCompare.py
@@ -2,7 +2,7 @@
 import wx
 
 from .helpers import AutoListCtrl
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 from service.price import Price as ServicePrice
 from service.market import Market
 from service.attribute import Attribute
diff --git a/gui/builtinItemStatsViews/itemDescription.py b/gui/builtinItemStatsViews/itemDescription.py
@@ -4,7 +4,7 @@
 import wx.html
 import re
 
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 
 _t = wx.GetTranslation
 
diff --git a/gui/builtinItemStatsViews/itemMutator.py b/gui/builtinItemStatsViews/itemMutator.py
@@ -8,7 +8,7 @@
 import gui.globalEvents as GE
 import gui.mainFrame
 from gui.bitmap_loader import BitmapLoader
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 from service.fit import Fit
 from .attributeSlider import AttributeSlider, EVT_VALUE_CHANGED
 from .itemAttributes import ItemParams
diff --git a/gui/builtinItemStatsViews/itemTraits.py b/gui/builtinItemStatsViews/itemTraits.py
@@ -3,7 +3,7 @@
 # noinspection PyPackageRequirements
 import wx.html
 
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 
 _t = wx.GetTranslation
 
diff --git a/gui/builtinMarketBrowser/marketTree.py b/gui/builtinMarketBrowser/marketTree.py
@@ -2,7 +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 gui.utils.themes import Colors
 
 from logbook import Logger
 
diff --git a/gui/builtinMarketBrowser/pfSearchBox.py b/gui/builtinMarketBrowser/pfSearchBox.py
@@ -2,7 +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.themes import Colors
 from gui.utils.helpers_wxPython import HandleCtrlBackspace
 
 SearchButton, EVT_SEARCH_BTN = wx.lib.newevent.NewEvent()
diff --git a/gui/builtinPreferenceViews/pyfaDatabasePreferences.py b/gui/builtinPreferenceViews/pyfaDatabasePreferences.py
@@ -5,7 +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
+from gui.utils.themes import Colors
 
 _t = wx.GetTranslation
 
diff --git a/gui/builtinPreferenceViews/pyfaEsiPreferences.py b/gui/builtinPreferenceViews/pyfaEsiPreferences.py
@@ -5,7 +5,7 @@
 import gui.mainFrame
 from gui.bitmap_loader import BitmapLoader
 from gui.preferenceView import PreferenceView
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 from service.esi import Esi
 from service.settings import EsiSettings
 
diff --git a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
@@ -5,7 +5,7 @@
 import gui.mainFrame
 from gui.bitmap_loader import BitmapLoader
 from gui.preferenceView import PreferenceView
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 from service.fit import Fit
 from service.settings import SettingsProvider, LocaleSettings, ThemeSettings
 import eos.config
diff --git a/gui/builtinPreferenceViews/pyfaLoggingPreferences.py b/gui/builtinPreferenceViews/pyfaLoggingPreferences.py
@@ -2,7 +2,7 @@
 
 from gui.preferenceView import PreferenceView
 from gui.bitmap_loader import BitmapLoader
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 import config
 from logbook import Logger
 
diff --git a/gui/builtinPreferenceViews/pyfaMarketPreferences.py b/gui/builtinPreferenceViews/pyfaMarketPreferences.py
@@ -4,7 +4,7 @@
 
 from gui.preferenceView import PreferenceView
 from gui.bitmap_loader import BitmapLoader
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 
 import gui.mainFrame
 import gui.globalEvents as GE
diff --git a/gui/builtinPreferenceViews/pyfaNetworkPreferences.py b/gui/builtinPreferenceViews/pyfaNetworkPreferences.py
@@ -3,7 +3,7 @@
 
 from gui.preferenceView import PreferenceView
 from gui.bitmap_loader import BitmapLoader
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 
 import gui.mainFrame
 from service.settings import NetworkSettings
diff --git a/gui/builtinShipBrowser/categoryItem.py b/gui/builtinShipBrowser/categoryItem.py
@@ -8,7 +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 gui.utils.themes import Colors
 from .events import Stage2Selected
 
 pyfalog = Logger(__name__)
diff --git a/gui/builtinShipBrowser/fitItem.py b/gui/builtinShipBrowser/fitItem.py
@@ -15,7 +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.utils.themes import Colors
 from gui.builtinShipBrowser.pfBitmapFrame import PFBitmapFrame
 from service.fit import Fit
 from .events import BoosterListUpdated, FitSelected, ImportSelected, SearchSelected, Stage3Selected
diff --git a/gui/builtinShipBrowser/navigationPanel.py b/gui/builtinShipBrowser/navigationPanel.py
@@ -9,7 +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.themes import Colors
 from gui.utils.helpers_wxPython import HandleCtrlBackspace
 from service.fit import Fit
 from utils.cjk import isStringCjk
diff --git a/gui/builtinShipBrowser/pfListPane.py b/gui/builtinShipBrowser/pfListPane.py
@@ -20,7 +20,7 @@
 # noinspection PyPackageRequirements
 import wx
 
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 
 
 class PFListPane(wx.ScrolledWindow):
diff --git a/gui/builtinShipBrowser/pfStaticText.py b/gui/builtinShipBrowser/pfStaticText.py
@@ -3,7 +3,7 @@
 import wx
 from logbook import Logger
 
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 
 pyfalog = Logger(__name__)
 
diff --git a/gui/builtinShipBrowser/raceSelector.py b/gui/builtinShipBrowser/raceSelector.py
@@ -6,7 +6,7 @@
 import gui.utils.anim_effects as animEffects
 import gui.utils.color as colorUtils
 import gui.utils.draw as drawUtils
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 from .events import Stage2Selected
 from gui.bitmap_loader import BitmapLoader
 
diff --git a/gui/builtinShipBrowser/sfBrowserItem.py b/gui/builtinShipBrowser/sfBrowserItem.py
@@ -2,7 +2,7 @@
 import wx
 import gui.utils.draw as drawUtils
 import gui.mainFrame
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 
 SB_ITEM_NORMAL = 0
 SB_ITEM_SELECTED = 1
diff --git a/gui/builtinShipBrowser/shipItem.py b/gui/builtinShipBrowser/shipItem.py
@@ -9,7 +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.themes import Colors
 from gui.contextMenu import ContextMenu
 from service.fit import Fit
 from service.market import Market
diff --git a/gui/builtinStatsViews/resourcesViewFull.py b/gui/builtinStatsViews/resourcesViewFull.py
@@ -25,7 +25,7 @@
 import gui.mainFrame
 from gui.chrome_tabs import EVT_NOTEBOOK_PAGE_CHANGED
 from gui.utils import fonts
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 
 from eos.const import FittingHardpoint
 
diff --git a/gui/builtinViews/emptyView.py b/gui/builtinViews/emptyView.py
@@ -3,7 +3,7 @@
 import gui.globalEvents as GE
 from gui.chrome_tabs import EVT_NOTEBOOK_PAGE_CHANGED
 import gui.mainFrame
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 
 
 class BlankPage(wx.Panel):
diff --git a/gui/builtinViews/entityEditor.py b/gui/builtinViews/entityEditor.py
@@ -1,7 +1,7 @@
 # noinspection PyPackageRequirements
 import wx
 from gui.bitmap_loader import BitmapLoader
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 
 
 class BaseValidator(wx.Validator):
diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py
@@ -40,7 +40,7 @@
 from gui.contextMenu import ContextMenu
 from gui.utils.staticHelpers import DragDropHelper
 from gui.utils.dark import isDark
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 from service.fit import Fit
 from service.market import Market
 from config import slotColourMap, slotColourMapDark, errColor, errColorDark
diff --git a/gui/builtinViews/implantEditor.py b/gui/builtinViews/implantEditor.py
@@ -9,7 +9,7 @@
 import gui.display as d
 from gui.bitmap_loader import BitmapLoader
 from gui.marketBrowser import SearchBox
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 from service.market import Market
 
 
diff --git a/gui/characterEditor.py b/gui/characterEditor.py
@@ -40,7 +40,7 @@
 from gui.builtinViews.implantEditor import BaseImplantEditorView
 from gui.contextMenu import ContextMenu
 from gui.utils.clipboard import fromClipboard, toClipboard
-from gui.utils.colors import Colors, ThemedDialog
+from gui.utils.themes import Colors, ThemedDialog
 from service.character import Character
 from service.esi import Esi
 from service.esiAccess import APIException
diff --git a/gui/characterSelection.py b/gui/characterSelection.py
@@ -30,7 +30,7 @@
 import gui.mainFrame
 from gui.bitmap_loader import BitmapLoader
 from gui.utils.clipboard import toClipboard
-from gui.utils.colors import Colors, ThemedPanel
+from gui.utils.themes import Colors, ThemedPanel
 from service.character import Character
 from service.fit import Fit
 
diff --git a/gui/chrome_tabs.py b/gui/chrome_tabs.py
@@ -22,7 +22,7 @@
 
 from gui.bitmap_loader import BitmapLoader
 from gui.utils import color as color_utils, draw, fonts
-from gui.utils.colors import Colors
+from gui.utils.themes import Colors
 from service.fit import Fit
 
 _t = wx.GetTranslation
diff --git a/gui/copySelectDialog.py b/gui/copySelectDialog.py
diff --git a/gui/display.py b/gui/display.py
diff --git a/gui/esiFittings.py b/gui/esiFittings.py
diff --git a/gui/fitBrowserLite.py b/gui/fitBrowserLite.py
diff --git a/gui/mainFrame.py b/gui/mainFrame.py
diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py
diff --git a/gui/preferenceDialog.py b/gui/preferenceDialog.py
diff --git a/gui/pyfa_gauge.py b/gui/pyfa_gauge.py
diff --git a/gui/setEditor.py b/gui/setEditor.py
diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py
diff --git a/gui/ssoLogin.py b/gui/ssoLogin.py
diff --git a/gui/statsPane.py b/gui/statsPane.py
diff --git a/gui/toggle_panel.py b/gui/toggle_panel.py
diff --git a/gui/updateDialog.py b/gui/updateDialog.py
diff --git a/gui/utils/anim.py b/gui/utils/anim.py
diff --git a/gui/utils/inputs.py b/gui/utils/inputs.py
diff --git a/gui/utils/themes.py b/gui/utils/themes.py
