From 8e4db5a8c394111e00d75248069417df75e857ec Mon Sep 17 00:00:00 2001 From: Ryan Holmes Date: Mon, 12 Jun 2017 18:08:07 -0400 Subject: [PATCH] Do some renaming of some files --- gui/additionsPane.py | 4 ++-- gui/{bitmapLoader.py => bitmap_loader.py} | 0 gui/builtinContextMenus/changeAffectingSkills.py | 2 +- gui/builtinContextMenus/damagePattern.py | 2 +- gui/builtinContextMenus/factorReload.py | 2 +- gui/builtinContextMenus/moduleAmmoPicker.py | 2 +- gui/builtinContextMenus/targetResists.py | 2 +- gui/builtinGraphs/fitDps.py | 2 +- gui/builtinMarketBrowser/pfSearchBox.py | 4 ++-- gui/builtinMarketBrowser/searchBox.py | 2 +- .../pyfaContextMenuPreferences.py | 2 +- .../pyfaCrestPreferences.py | 2 +- .../pyfaDatabasePreferences.py | 2 +- .../pyfaEnginePreferences.py | 2 +- .../pyfaGaugePreferences.py | 16 ++++++++-------- .../pyfaGeneralPreferences.py | 2 +- .../pyfaHTMLExportPreferences.py | 2 +- .../pyfaLoggingPreferences.py | 2 +- .../pyfaNetworkPreferences.py | 2 +- .../pyfaStatViewPreferences.py | 2 +- .../pyfaUpdatePreferences.py | 2 +- gui/builtinShipBrowser/categoryItem.py | 6 +++--- gui/builtinShipBrowser/fitItem.py | 6 +++--- gui/builtinShipBrowser/navigationPanel.py | 6 +++--- gui/builtinShipBrowser/pfWidgetContainer.py | 2 +- gui/builtinShipBrowser/raceSelector.py | 8 ++++---- gui/builtinShipBrowser/sfBrowserItem.py | 2 +- gui/builtinShipBrowser/shipItem.py | 6 +++--- gui/builtinStatsViews/capacitorViewFull.py | 2 +- gui/builtinStatsViews/firepowerViewFull.py | 2 +- gui/builtinStatsViews/miningyieldViewFull.py | 2 +- gui/builtinStatsViews/outgoingViewFull.py | 2 +- gui/builtinStatsViews/priceViewFull.py | 2 +- gui/builtinStatsViews/priceViewMinimal.py | 2 +- gui/builtinStatsViews/rechargeViewFull.py | 2 +- gui/builtinStatsViews/resistancesViewFull.py | 2 +- gui/builtinStatsViews/resourcesViewFull.py | 4 ++-- gui/builtinViewColumns/ammo.py | 2 +- gui/builtinViewColumns/attributeDisplay.py | 2 +- gui/builtinViewColumns/capacitorUse.py | 2 +- gui/builtinViewColumns/maxRange.py | 2 +- gui/builtinViewColumns/misc.py | 2 +- gui/builtinViewColumns/price.py | 2 +- gui/builtinViews/emptyView.py | 2 +- gui/builtinViews/entityEditor.py | 2 +- gui/builtinViews/fittingView.py | 4 ++-- gui/builtinViews/implantEditor.py | 2 +- gui/cachingImageList.py | 2 +- gui/characterEditor.py | 2 +- gui/characterSelection.py | 2 +- gui/{chromeTabs.py => chrome_tabs.py} | 6 +++--- gui/graphFrame.py | 2 +- gui/itemStats.py | 2 +- gui/mainFrame.py | 4 ++-- gui/mainMenuBar.py | 2 +- gui/multiSwitch.py | 2 +- gui/patternEditor.py | 2 +- gui/preferenceDialog.py | 2 +- gui/propertyEditor.py | 2 +- gui/pyfatogglepanel.py | 2 +- gui/pygauge.py | 16 ++++++++-------- gui/resistsEditor.py | 2 +- gui/utils/{animUtils.py => anim.py} | 2 +- gui/utils/{animEffects.py => anim_effects.py} | 0 gui/utils/{colorUtils.py => color.py} | 0 gui/utils/{drawUtils.py => draw.py} | 2 +- 66 files changed, 95 insertions(+), 95 deletions(-) rename gui/{bitmapLoader.py => bitmap_loader.py} (100%) rename gui/{chromeTabs.py => chrome_tabs.py} (99%) rename gui/utils/{animUtils.py => anim.py} (98%) rename gui/utils/{animEffects.py => anim_effects.py} (100%) rename gui/utils/{colorUtils.py => color.py} (100%) rename gui/utils/{drawUtils.py => draw.py} (98%) diff --git a/gui/additionsPane.py b/gui/additionsPane.py index b12fe5036..00a126a30 100644 --- a/gui/additionsPane.py +++ b/gui/additionsPane.py @@ -20,7 +20,7 @@ # noinspection PyPackageRequirements import wx -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from gui.builtinAdditionPanes.boosterView import BoosterView from gui.builtinAdditionPanes.cargoView import CargoView from gui.builtinAdditionPanes.commandView import CommandView @@ -29,7 +29,7 @@ from gui.builtinAdditionPanes.fighterView import FighterView from gui.builtinAdditionPanes.implantView import ImplantView from gui.builtinAdditionPanes.notesView import NotesView from gui.builtinAdditionPanes.projectedView import ProjectedView -from gui.chromeTabs import PFNotebook +from gui.chrome_tabs import PFNotebook from gui.pyfatogglepanel import TogglePanel diff --git a/gui/bitmapLoader.py b/gui/bitmap_loader.py similarity index 100% rename from gui/bitmapLoader.py rename to gui/bitmap_loader.py diff --git a/gui/builtinContextMenus/changeAffectingSkills.py b/gui/builtinContextMenus/changeAffectingSkills.py index 1f16b8cb8..523557379 100644 --- a/gui/builtinContextMenus/changeAffectingSkills.py +++ b/gui/builtinContextMenus/changeAffectingSkills.py @@ -3,7 +3,7 @@ from gui.contextMenu import ContextMenu import gui.mainFrame # noinspection PyPackageRequirements import wx -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from eos.saveddata.character import Skill import gui.globalEvents as GE from service.fit import Fit diff --git a/gui/builtinContextMenus/damagePattern.py b/gui/builtinContextMenus/damagePattern.py index 86899aeab..710447a50 100644 --- a/gui/builtinContextMenus/damagePattern.py +++ b/gui/builtinContextMenus/damagePattern.py @@ -3,7 +3,7 @@ import gui.mainFrame import gui.globalEvents as GE # noinspection PyPackageRequirements import wx -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from service.fit import Fit from service.damagePattern import DamagePattern as import_DamagePattern from service.settings import ContextMenuSettings diff --git a/gui/builtinContextMenus/factorReload.py b/gui/builtinContextMenus/factorReload.py index 6770e64af..64e246413 100644 --- a/gui/builtinContextMenus/factorReload.py +++ b/gui/builtinContextMenus/factorReload.py @@ -3,7 +3,7 @@ import gui.mainFrame import gui.globalEvents as GE # noinspection PyPackageRequirements import wx -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from service.fit import Fit from service.settings import ContextMenuSettings diff --git a/gui/builtinContextMenus/moduleAmmoPicker.py b/gui/builtinContextMenus/moduleAmmoPicker.py index 79cd790f0..7b1f86169 100644 --- a/gui/builtinContextMenus/moduleAmmoPicker.py +++ b/gui/builtinContextMenus/moduleAmmoPicker.py @@ -9,7 +9,7 @@ from eos.saveddata.module import Hardpoint import gui.mainFrame import gui.globalEvents as GE from gui.contextMenu import ContextMenu -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from service.settings import ContextMenuSettings diff --git a/gui/builtinContextMenus/targetResists.py b/gui/builtinContextMenus/targetResists.py index ca59e22f1..677605f31 100644 --- a/gui/builtinContextMenus/targetResists.py +++ b/gui/builtinContextMenus/targetResists.py @@ -3,7 +3,7 @@ import gui.mainFrame import gui.globalEvents as GE # noinspection PyPackageRequirements import wx -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from service.targetResists import TargetResists as svc_TargetResists from service.fit import Fit from service.settings import ContextMenuSettings diff --git a/gui/builtinGraphs/fitDps.py b/gui/builtinGraphs/fitDps.py index 9a3048a24..d848d3f9c 100644 --- a/gui/builtinGraphs/fitDps.py +++ b/gui/builtinGraphs/fitDps.py @@ -18,7 +18,7 @@ # ============================================================================= from gui.graph import Graph -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from eos.graph.fitDps import FitDpsGraph as FitDps from eos.graph import Data import gui.mainFrame diff --git a/gui/builtinMarketBrowser/pfSearchBox.py b/gui/builtinMarketBrowser/pfSearchBox.py index f5f8d8c6d..12a069e85 100644 --- a/gui/builtinMarketBrowser/pfSearchBox.py +++ b/gui/builtinMarketBrowser/pfSearchBox.py @@ -1,7 +1,7 @@ # noinspection PyPackageRequirements import wx -import gui.utils.colorUtils as colorUtils -import gui.utils.drawUtils as drawUtils +import gui.utils.color as colorUtils +import gui.utils.draw as drawUtils SearchButton, EVT_SEARCH_BTN = wx.lib.newevent.NewEvent() CancelButton, EVT_CANCEL_BTN = wx.lib.newevent.NewEvent() diff --git a/gui/builtinMarketBrowser/searchBox.py b/gui/builtinMarketBrowser/searchBox.py index fb86bbb2e..43dd9acf6 100644 --- a/gui/builtinMarketBrowser/searchBox.py +++ b/gui/builtinMarketBrowser/searchBox.py @@ -1,4 +1,4 @@ -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from .pfSearchBox import PFSearchBox diff --git a/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py b/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py index ab286458e..458424dce 100644 --- a/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py +++ b/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py @@ -1,7 +1,7 @@ import wx from gui.preferenceView import PreferenceView -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader import gui.mainFrame from service.settings import ContextMenuSettings diff --git a/gui/builtinPreferenceViews/pyfaCrestPreferences.py b/gui/builtinPreferenceViews/pyfaCrestPreferences.py index be427ff0d..2e82cb7bc 100644 --- a/gui/builtinPreferenceViews/pyfaCrestPreferences.py +++ b/gui/builtinPreferenceViews/pyfaCrestPreferences.py @@ -2,7 +2,7 @@ import wx from gui.preferenceView import PreferenceView -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader import gui.mainFrame diff --git a/gui/builtinPreferenceViews/pyfaDatabasePreferences.py b/gui/builtinPreferenceViews/pyfaDatabasePreferences.py index 1e644102a..200cbb597 100644 --- a/gui/builtinPreferenceViews/pyfaDatabasePreferences.py +++ b/gui/builtinPreferenceViews/pyfaDatabasePreferences.py @@ -1,7 +1,7 @@ import wx from gui.preferenceView import PreferenceView -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from gui.utils import helpers_wxPython as wxHelpers import config from eos.db.saveddata.queries import clearPrices, clearDamagePatterns, clearTargetResists diff --git a/gui/builtinPreferenceViews/pyfaEnginePreferences.py b/gui/builtinPreferenceViews/pyfaEnginePreferences.py index 641b48f8a..c4d8c7f46 100644 --- a/gui/builtinPreferenceViews/pyfaEnginePreferences.py +++ b/gui/builtinPreferenceViews/pyfaEnginePreferences.py @@ -3,7 +3,7 @@ import logging import wx from service.fit import Fit -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from gui.preferenceView import PreferenceView from service.settings import EOSSettings diff --git a/gui/builtinPreferenceViews/pyfaGaugePreferences.py b/gui/builtinPreferenceViews/pyfaGaugePreferences.py index 557d79c4e..c17002590 100644 --- a/gui/builtinPreferenceViews/pyfaGaugePreferences.py +++ b/gui/builtinPreferenceViews/pyfaGaugePreferences.py @@ -7,9 +7,9 @@ import wx import copy from gui.preferenceView import PreferenceView -from gui.bitmapLoader import BitmapLoader -from gui.utils import colorUtils -import gui.utils.drawUtils as drawUtils +from gui.bitmap_loader import BitmapLoader +from gui.utils import color +import gui.utils.draw as drawUtils ########################################################################### @@ -122,13 +122,13 @@ class PFGaugePreview(wx.Window): r = copy.copy(rect) r.width = w - color = colorUtils.CalculateTransitionColor(self.colorS, self.colorE, float(value) / 100) + color = color.CalculateTransitionColor(self.colorS, self.colorE, float(value) / 100) if self.gradientStart > 0: - gcolor = colorUtils.BrightenColor(color, float(self.gradientStart) / 100) - gMid = colorUtils.BrightenColor(color, float(self.gradientStart / 2) / 100) + gcolor = color.BrightenColor(color, float(self.gradientStart) / 100) + gMid = color.BrightenColor(color, float(self.gradientStart / 2) / 100) else: - gcolor = colorUtils.DarkenColor(color, float(-self.gradientStart) / 100) - gMid = colorUtils.DarkenColor(color, float(-self.gradientStart / 2) / 100) + gcolor = color.DarkenColor(color, float(-self.gradientStart) / 100) + gMid = color.DarkenColor(color, float(-self.gradientStart / 2) / 100) gBmp = drawUtils.DrawGradientBar(r.width, r.height, gMid, color, gcolor) dc.DrawBitmap(gBmp, 0, 0) diff --git a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py index caecd1cc9..23a1d67a4 100644 --- a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py +++ b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py @@ -3,7 +3,7 @@ import wx from wx.lib.intctrl import IntCtrl from gui.preferenceView import PreferenceView -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader import gui.mainFrame import gui.globalEvents as GE diff --git a/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py b/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py index 1afdc7f90..2165ce114 100644 --- a/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py +++ b/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py @@ -3,7 +3,7 @@ import wx import os from gui.preferenceView import PreferenceView -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader import gui.mainFrame diff --git a/gui/builtinPreferenceViews/pyfaLoggingPreferences.py b/gui/builtinPreferenceViews/pyfaLoggingPreferences.py index 78490c2ad..e83fcd799 100644 --- a/gui/builtinPreferenceViews/pyfaLoggingPreferences.py +++ b/gui/builtinPreferenceViews/pyfaLoggingPreferences.py @@ -1,7 +1,7 @@ import wx from gui.preferenceView import PreferenceView -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader import config from logbook import Logger diff --git a/gui/builtinPreferenceViews/pyfaNetworkPreferences.py b/gui/builtinPreferenceViews/pyfaNetworkPreferences.py index 78b6dd32d..711d332c4 100644 --- a/gui/builtinPreferenceViews/pyfaNetworkPreferences.py +++ b/gui/builtinPreferenceViews/pyfaNetworkPreferences.py @@ -2,7 +2,7 @@ import wx from gui.preferenceView import PreferenceView -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader import gui.mainFrame from service.settings import NetworkSettings diff --git a/gui/builtinPreferenceViews/pyfaStatViewPreferences.py b/gui/builtinPreferenceViews/pyfaStatViewPreferences.py index eb7d424b8..e9e0d8cb0 100644 --- a/gui/builtinPreferenceViews/pyfaStatViewPreferences.py +++ b/gui/builtinPreferenceViews/pyfaStatViewPreferences.py @@ -2,7 +2,7 @@ import wx from gui.preferenceView import PreferenceView -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from service.settings import StatViewSettings diff --git a/gui/builtinPreferenceViews/pyfaUpdatePreferences.py b/gui/builtinPreferenceViews/pyfaUpdatePreferences.py index b1158df94..8bb6faad2 100644 --- a/gui/builtinPreferenceViews/pyfaUpdatePreferences.py +++ b/gui/builtinPreferenceViews/pyfaUpdatePreferences.py @@ -2,7 +2,7 @@ import wx from gui.preferenceView import PreferenceView -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from service.settings import UpdateSettings diff --git a/gui/builtinShipBrowser/categoryItem.py b/gui/builtinShipBrowser/categoryItem.py index 86ce08f75..7788aeef9 100644 --- a/gui/builtinShipBrowser/categoryItem.py +++ b/gui/builtinShipBrowser/categoryItem.py @@ -4,10 +4,10 @@ import wx from logbook import Logger from gui.builtinShipBrowser.sfBrowserItem import SFBrowserItem -import gui.utils.colorUtils as colorUtils -import gui.utils.drawUtils as drawUtils +import gui.utils.color as colorUtils +import gui.utils.draw as drawUtils import gui.utils.fonts as fonts -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from .events import * pyfalog = Logger(__name__) diff --git a/gui/builtinShipBrowser/fitItem.py b/gui/builtinShipBrowser/fitItem.py index bf51204b4..5e6b089c3 100644 --- a/gui/builtinShipBrowser/fitItem.py +++ b/gui/builtinShipBrowser/fitItem.py @@ -9,11 +9,11 @@ from logbook import Logger import gui.builtinShipBrowser.sfBrowserItem as SFItem import gui.globalEvents as GE import gui.mainFrame -import gui.utils.colorUtils as colorUtils -import gui.utils.drawUtils as drawUtils +import gui.utils.color as colorUtils +import gui.utils.draw as drawUtils import gui.utils.fonts as fonts from .events import * -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from gui.builtinShipBrowser.pfBitmapFrame import PFBitmapFrame from service.fit import Fit diff --git a/gui/builtinShipBrowser/navigationPanel.py b/gui/builtinShipBrowser/navigationPanel.py index 1e0112f93..7f802a71b 100644 --- a/gui/builtinShipBrowser/navigationPanel.py +++ b/gui/builtinShipBrowser/navigationPanel.py @@ -5,11 +5,11 @@ from logbook import Logger import gui.builtinShipBrowser.sfBrowserItem as SFItem import gui.mainFrame -import gui.utils.colorUtils as colorUtils -import gui.utils.drawUtils as drawUtils +import gui.utils.color as colorUtils +import gui.utils.draw as drawUtils import gui.utils.fonts as fonts from .events import * -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from service.fit import Fit pyfalog = Logger(__name__) diff --git a/gui/builtinShipBrowser/pfWidgetContainer.py b/gui/builtinShipBrowser/pfWidgetContainer.py index 305bd6385..e3219530a 100644 --- a/gui/builtinShipBrowser/pfWidgetContainer.py +++ b/gui/builtinShipBrowser/pfWidgetContainer.py @@ -1,6 +1,6 @@ from gui.builtinShipBrowser.pfListPane import PFListPane import gui.mainFrame -import gui.utils.animUtils as animUtils +import gui.utils.anim as animUtils class PFWidgetsContainer(PFListPane): diff --git a/gui/builtinShipBrowser/raceSelector.py b/gui/builtinShipBrowser/raceSelector.py index 5df6b772d..5b3b40601 100644 --- a/gui/builtinShipBrowser/raceSelector.py +++ b/gui/builtinShipBrowser/raceSelector.py @@ -3,11 +3,11 @@ import wx from logbook import Logger -import gui.utils.animEffects as animEffects -import gui.utils.colorUtils as colorUtils -import gui.utils.drawUtils as drawUtils +import gui.utils.anim_effects as animEffects +import gui.utils.color as colorUtils +import gui.utils.draw as drawUtils from .events import * -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader pyfalog = Logger(__name__) diff --git a/gui/builtinShipBrowser/sfBrowserItem.py b/gui/builtinShipBrowser/sfBrowserItem.py index 246a1b407..876143bdb 100644 --- a/gui/builtinShipBrowser/sfBrowserItem.py +++ b/gui/builtinShipBrowser/sfBrowserItem.py @@ -1,6 +1,6 @@ # noinspection PyPackageRequirements import wx -import gui.utils.drawUtils as drawUtils +import gui.utils.draw as drawUtils SB_ITEM_NORMAL = 0 SB_ITEM_SELECTED = 1 diff --git a/gui/builtinShipBrowser/shipItem.py b/gui/builtinShipBrowser/shipItem.py index 1f7112d0a..b6879f01b 100644 --- a/gui/builtinShipBrowser/shipItem.py +++ b/gui/builtinShipBrowser/shipItem.py @@ -5,11 +5,11 @@ from logbook import Logger import gui.builtinShipBrowser.sfBrowserItem as SFItem import gui.mainFrame -import gui.utils.colorUtils as colorUtils -import gui.utils.drawUtils as drawUtils +import gui.utils.color as colorUtils +import gui.utils.draw as drawUtils import gui.utils.fonts as fonts from .events import * -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from gui.contextMenu import ContextMenu from service.fit import Fit from service.market import Market diff --git a/gui/builtinStatsViews/capacitorViewFull.py b/gui/builtinStatsViews/capacitorViewFull.py index 1986d29f9..2c478b163 100644 --- a/gui/builtinStatsViews/capacitorViewFull.py +++ b/gui/builtinStatsViews/capacitorViewFull.py @@ -20,7 +20,7 @@ # noinspection PyPackageRequirements import wx from gui.statsView import StatsView -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from gui.utils.numberFormatter import formatAmount diff --git a/gui/builtinStatsViews/firepowerViewFull.py b/gui/builtinStatsViews/firepowerViewFull.py index 618ca52de..33c6092d8 100644 --- a/gui/builtinStatsViews/firepowerViewFull.py +++ b/gui/builtinStatsViews/firepowerViewFull.py @@ -21,7 +21,7 @@ import wx import gui.mainFrame from gui.statsView import StatsView -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from gui.utils.numberFormatter import formatAmount from service.fit import Fit diff --git a/gui/builtinStatsViews/miningyieldViewFull.py b/gui/builtinStatsViews/miningyieldViewFull.py index 476a5644a..f35902653 100644 --- a/gui/builtinStatsViews/miningyieldViewFull.py +++ b/gui/builtinStatsViews/miningyieldViewFull.py @@ -21,7 +21,7 @@ import wx import gui.mainFrame from gui.statsView import StatsView -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from gui.utils.numberFormatter import formatAmount from service.fit import Fit diff --git a/gui/builtinStatsViews/outgoingViewFull.py b/gui/builtinStatsViews/outgoingViewFull.py index da0c73829..a73363172 100644 --- a/gui/builtinStatsViews/outgoingViewFull.py +++ b/gui/builtinStatsViews/outgoingViewFull.py @@ -20,7 +20,7 @@ # noinspection PyPackageRequirements import wx from gui.statsView import StatsView -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from gui.utils.numberFormatter import formatAmount diff --git a/gui/builtinStatsViews/priceViewFull.py b/gui/builtinStatsViews/priceViewFull.py index 7a91c8d04..b8fc25803 100644 --- a/gui/builtinStatsViews/priceViewFull.py +++ b/gui/builtinStatsViews/priceViewFull.py @@ -20,7 +20,7 @@ # noinspection PyPackageRequirements import wx from gui.statsView import StatsView -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from gui.utils.numberFormatter import formatAmount from service.price import Price diff --git a/gui/builtinStatsViews/priceViewMinimal.py b/gui/builtinStatsViews/priceViewMinimal.py index a928918fb..04746b1a5 100644 --- a/gui/builtinStatsViews/priceViewMinimal.py +++ b/gui/builtinStatsViews/priceViewMinimal.py @@ -20,7 +20,7 @@ # noinspection PyPackageRequirements import wx from gui.statsView import StatsView -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from gui.utils.numberFormatter import formatAmount from service.price import Price diff --git a/gui/builtinStatsViews/rechargeViewFull.py b/gui/builtinStatsViews/rechargeViewFull.py index 18af61d73..767172560 100644 --- a/gui/builtinStatsViews/rechargeViewFull.py +++ b/gui/builtinStatsViews/rechargeViewFull.py @@ -20,7 +20,7 @@ # noinspection PyPackageRequirements import wx from gui.statsView import StatsView -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from gui.utils.numberFormatter import formatAmount import gui.mainFrame from gui.builtinStatsViews.resistancesViewFull import EFFECTIVE_HP_TOGGLED diff --git a/gui/builtinStatsViews/resistancesViewFull.py b/gui/builtinStatsViews/resistancesViewFull.py index 98b0c896f..a06e4e444 100644 --- a/gui/builtinStatsViews/resistancesViewFull.py +++ b/gui/builtinStatsViews/resistancesViewFull.py @@ -20,7 +20,7 @@ # noinspection PyPackageRequirements import wx from gui.statsView import StatsView -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from gui.pygauge import PyGauge from gui.utils.numberFormatter import formatAmount import gui.mainFrame diff --git a/gui/builtinStatsViews/resourcesViewFull.py b/gui/builtinStatsViews/resourcesViewFull.py index 298fed756..2a8cb0196 100644 --- a/gui/builtinStatsViews/resourcesViewFull.py +++ b/gui/builtinStatsViews/resourcesViewFull.py @@ -20,10 +20,10 @@ # noinspection PyPackageRequirements import wx from gui.statsView import StatsView -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from gui.pygauge import PyGauge import gui.mainFrame -from gui.chromeTabs import EVT_NOTEBOOK_PAGE_CHANGED +from gui.chrome_tabs import EVT_NOTEBOOK_PAGE_CHANGED from eos.saveddata.module import Hardpoint diff --git a/gui/builtinViewColumns/ammo.py b/gui/builtinViewColumns/ammo.py index 069328a32..862148285 100644 --- a/gui/builtinViewColumns/ammo.py +++ b/gui/builtinViewColumns/ammo.py @@ -21,7 +21,7 @@ import wx from eos.saveddata.fighter import Fighter from gui.viewColumn import ViewColumn -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader class Ammo(ViewColumn): diff --git a/gui/builtinViewColumns/attributeDisplay.py b/gui/builtinViewColumns/attributeDisplay.py index 0ccdcd96b..6b5422f1d 100644 --- a/gui/builtinViewColumns/attributeDisplay.py +++ b/gui/builtinViewColumns/attributeDisplay.py @@ -21,7 +21,7 @@ import wx from gui.viewColumn import ViewColumn -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from gui.utils.numberFormatter import formatAmount from service.attribute import Attribute diff --git a/gui/builtinViewColumns/capacitorUse.py b/gui/builtinViewColumns/capacitorUse.py index 5d0287375..8770a9d4c 100644 --- a/gui/builtinViewColumns/capacitorUse.py +++ b/gui/builtinViewColumns/capacitorUse.py @@ -24,7 +24,7 @@ from eos.saveddata.mode import Mode from service.attribute import Attribute from gui.utils.numberFormatter import formatAmount from gui.viewColumn import ViewColumn -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader class CapacitorUse(ViewColumn): diff --git a/gui/builtinViewColumns/maxRange.py b/gui/builtinViewColumns/maxRange.py index d4b3367da..728e2b9bc 100644 --- a/gui/builtinViewColumns/maxRange.py +++ b/gui/builtinViewColumns/maxRange.py @@ -23,7 +23,7 @@ import wx from eos.saveddata.mode import Mode from service.attribute import Attribute from gui.viewColumn import ViewColumn -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from gui.utils.numberFormatter import formatAmount diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py index 0c3971445..e3ee83bd6 100644 --- a/gui/builtinViewColumns/misc.py +++ b/gui/builtinViewColumns/misc.py @@ -24,7 +24,7 @@ from service.fit import Fit from service.market import Market import gui.mainFrame from gui.viewColumn import ViewColumn -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from gui.utils.numberFormatter import formatAmount from gui.utils.listFormatter import formatList from eos.saveddata.drone import Drone diff --git a/gui/builtinViewColumns/price.py b/gui/builtinViewColumns/price.py index 3797052a2..728376bef 100644 --- a/gui/builtinViewColumns/price.py +++ b/gui/builtinViewColumns/price.py @@ -24,7 +24,7 @@ from eos.saveddata.cargo import Cargo from eos.saveddata.drone import Drone from service.price import Price as ServicePrice from gui.viewColumn import ViewColumn -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from gui.utils.numberFormatter import formatAmount diff --git a/gui/builtinViews/emptyView.py b/gui/builtinViews/emptyView.py index ebf667726..c5df9e4bd 100644 --- a/gui/builtinViews/emptyView.py +++ b/gui/builtinViews/emptyView.py @@ -1,7 +1,7 @@ # noinspection PyPackageRequirements import wx import gui.globalEvents as GE -from gui.chromeTabs import EVT_NOTEBOOK_PAGE_CHANGED +from gui.chrome_tabs import EVT_NOTEBOOK_PAGE_CHANGED import gui.mainFrame diff --git a/gui/builtinViews/entityEditor.py b/gui/builtinViews/entityEditor.py index 5e717378f..13ebb8162 100644 --- a/gui/builtinViews/entityEditor.py +++ b/gui/builtinViews/entityEditor.py @@ -1,6 +1,6 @@ # noinspection PyPackageRequirements import wx -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader class BaseValidator(wx.PyValidator): diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index 1b9544e08..75f76cc31 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -30,10 +30,10 @@ import gui.multiSwitch from eos.saveddata.mode import Mode from eos.saveddata.module import Module, Slot, Rack from gui.builtinViewColumns.state import State -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader import gui.builtinViews.emptyView from logbook import Logger -from gui.chromeTabs import EVT_NOTEBOOK_PAGE_CHANGED +from gui.chrome_tabs import EVT_NOTEBOOK_PAGE_CHANGED from service.fit import Fit from service.market import Market diff --git a/gui/builtinViews/implantEditor.py b/gui/builtinViews/implantEditor.py index 827d514a2..36bcc37f0 100644 --- a/gui/builtinViews/implantEditor.py +++ b/gui/builtinViews/implantEditor.py @@ -5,7 +5,7 @@ from wx.lib.buttons import GenBitmapButton import gui.builtinMarketBrowser.pfSearchBox as SBox import gui.display as d -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from gui.marketBrowser import SearchBox from service.market import Market diff --git a/gui/cachingImageList.py b/gui/cachingImageList.py index 4bbef1e23..578da97c7 100644 --- a/gui/cachingImageList.py +++ b/gui/cachingImageList.py @@ -20,7 +20,7 @@ # noinspection PyPackageRequirements import wx -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader class CachingImageList(wx.ImageList): diff --git a/gui/characterEditor.py b/gui/characterEditor.py index bb8c52892..4865cb578 100644 --- a/gui/characterEditor.py +++ b/gui/characterEditor.py @@ -25,7 +25,7 @@ from .utils.floatspin import FloatSpin import wx.lib.newevent # noinspection PyPackageRequirements import wx.gizmos -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from gui.contextMenu import ContextMenu import gui.globalEvents as GE from gui.builtinViews.implantEditor import BaseImplantEditorView diff --git a/gui/characterSelection.py b/gui/characterSelection.py index 4b6947e4b..c28f8b798 100644 --- a/gui/characterSelection.py +++ b/gui/characterSelection.py @@ -19,7 +19,7 @@ # noinspection PyPackageRequirements import wx -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader import gui.globalEvents as GE import gui.mainFrame from service.character import Character diff --git a/gui/chromeTabs.py b/gui/chrome_tabs.py similarity index 99% rename from gui/chromeTabs.py rename to gui/chrome_tabs.py index 89ad9327b..9ee74a2ac 100644 --- a/gui/chromeTabs.py +++ b/gui/chrome_tabs.py @@ -21,10 +21,10 @@ import wx # noinspection PyPackageRequirements import wx.lib.newevent -import gui.utils.colorUtils as colorUtils -import gui.utils.drawUtils as drawUtils +import gui.utils.color as colorUtils +import gui.utils.draw as drawUtils import gui.utils.fonts as fonts -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from logbook import Logger from service.fit import Fit diff --git a/gui/graphFrame.py b/gui/graphFrame.py index 178e9c8d9..d8eb5c9ea 100644 --- a/gui/graphFrame.py +++ b/gui/graphFrame.py @@ -28,7 +28,7 @@ import gui.display import gui.mainFrame import gui.globalEvents as GE from gui.graph import Graph -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader import traceback pyfalog = Logger(__name__) diff --git a/gui/itemStats.py b/gui/itemStats.py index 90f3172e4..79a9b9caf 100644 --- a/gui/itemStats.py +++ b/gui/itemStats.py @@ -45,7 +45,7 @@ from service.market import Market from service.attribute import Attribute from service.price import Price as ServicePrice import gui.mainFrame -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from gui.utils.numberFormatter import formatAmount from gui.contextMenu import ContextMenu diff --git a/gui/mainFrame.py b/gui/mainFrame.py index a7eafadcd..bffee39b7 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -39,10 +39,10 @@ import config from eos.config import gamedata_version import gui.aboutData -from gui.chromeTabs import PFNotebook +from gui.chrome_tabs import PFNotebook import gui.globalEvents as GE -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from gui.mainMenuBar import MainMenuBar from gui.additionsPane import AdditionsPane from gui.marketBrowser import MarketBrowser diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py index bade53d3d..128cb23fb 100644 --- a/gui/mainMenuBar.py +++ b/gui/mainMenuBar.py @@ -25,7 +25,7 @@ from service.character import Character from service.fit import Fit import gui.graphFrame import gui.globalEvents as GE -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from logbook import Logger pyfalog = Logger(__name__) diff --git a/gui/multiSwitch.py b/gui/multiSwitch.py index 2efe80bc0..d64d41e68 100644 --- a/gui/multiSwitch.py +++ b/gui/multiSwitch.py @@ -17,7 +17,7 @@ # along with pyfa. If not, see . # ============================================================================= -from gui.chromeTabs import PFNotebook +from gui.chrome_tabs import PFNotebook import gui.builtinViews.emptyView diff --git a/gui/patternEditor.py b/gui/patternEditor.py index 4fe15077e..736815fb2 100644 --- a/gui/patternEditor.py +++ b/gui/patternEditor.py @@ -19,7 +19,7 @@ # noinspection PyPackageRequirements import wx -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader # noinspection PyPackageRequirements from wx.lib.intctrl import IntCtrl from gui.utils.clipboard import toClipboard, fromClipboard diff --git a/gui/preferenceDialog.py b/gui/preferenceDialog.py index d51ee2515..13850567f 100644 --- a/gui/preferenceDialog.py +++ b/gui/preferenceDialog.py @@ -20,7 +20,7 @@ # noinspection PyPackageRequirements import wx from gui.preferenceView import PreferenceView -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader class PreferenceDialog(wx.Dialog): diff --git a/gui/propertyEditor.py b/gui/propertyEditor.py index 658e0bc21..7cf012f08 100644 --- a/gui/propertyEditor.py +++ b/gui/propertyEditor.py @@ -19,7 +19,7 @@ import gui.display as d import gui.globalEvents as GE import gui.builtinMarketBrowser.pfSearchBox as SBox from gui.marketBrowser import SearchBox -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader pyfalog = Logger(__name__) diff --git a/gui/pyfatogglepanel.py b/gui/pyfatogglepanel.py index ae653e11b..75af0b214 100644 --- a/gui/pyfatogglepanel.py +++ b/gui/pyfatogglepanel.py @@ -23,7 +23,7 @@ # noinspection PyPackageRequirements import wx -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader class TogglePanel(wx.Panel): diff --git a/gui/pygauge.py b/gui/pygauge.py index f670c1427..6c08ea209 100644 --- a/gui/pygauge.py +++ b/gui/pygauge.py @@ -15,9 +15,9 @@ It uses the easeOutQuad equation from caurina.transitions.Tweener to do the anim import wx import copy -from gui.utils import colorUtils -import gui.utils.drawUtils as drawUtils -import gui.utils.animEffects as animEffects +from gui.utils import color +import gui.utils.draw as drawUtils +import gui.utils.anim_effects as animEffects import gui.utils.fonts as fonts from service.fit import Fit @@ -347,16 +347,16 @@ class PyGauge(wx.PyWindow): if transition != -1: colorS, colorE = self.transitionsColors[transition] - color = colorUtils.CalculateTransitionColor(colorS, colorE, xv) + color = color.CalculateTransitionColor(colorS, colorE, xv) else: color = wx.Colour(191, 48, 48) if self.gradientEffect > 0: - gcolor = colorUtils.BrightenColor(color, float(self.gradientEffect) / 100) - gMid = colorUtils.BrightenColor(color, float(self.gradientEffect / 2) / 100) + gcolor = color.BrightenColor(color, float(self.gradientEffect) / 100) + gMid = color.BrightenColor(color, float(self.gradientEffect / 2) / 100) else: - gcolor = colorUtils.DarkenColor(color, float(-self.gradientEffect) / 100) - gMid = colorUtils.DarkenColor(color, float(-self.gradientEffect / 2) / 100) + gcolor = color.DarkenColor(color, float(-self.gradientEffect) / 100) + gMid = color.DarkenColor(color, float(-self.gradientEffect / 2) / 100) gBmp = drawUtils.DrawGradientBar(r.width, r.height, gMid, color, gcolor) dc.DrawBitmap(gBmp, r.left, r.top) diff --git a/gui/resistsEditor.py b/gui/resistsEditor.py index 76ea7551a..34737b1af 100644 --- a/gui/resistsEditor.py +++ b/gui/resistsEditor.py @@ -20,7 +20,7 @@ # noinspection PyPackageRequirements import wx from service.targetResists import TargetResists -from gui.bitmapLoader import BitmapLoader +from gui.bitmap_loader import BitmapLoader from gui.utils.clipboard import toClipboard, fromClipboard from gui.builtinViews.entityEditor import EntityEditor, BaseValidator from logbook import Logger diff --git a/gui/utils/animUtils.py b/gui/utils/anim.py similarity index 98% rename from gui/utils/animUtils.py rename to gui/utils/anim.py index 4003e7760..947fa2abf 100644 --- a/gui/utils/animUtils.py +++ b/gui/utils/anim.py @@ -1,6 +1,6 @@ # noinspection PyPackageRequirements import wx -import gui.utils.colorUtils as colorUtils +import gui.utils.color as colorUtils class LoadAnimation(wx.Window): diff --git a/gui/utils/animEffects.py b/gui/utils/anim_effects.py similarity index 100% rename from gui/utils/animEffects.py rename to gui/utils/anim_effects.py diff --git a/gui/utils/colorUtils.py b/gui/utils/color.py similarity index 100% rename from gui/utils/colorUtils.py rename to gui/utils/color.py diff --git a/gui/utils/drawUtils.py b/gui/utils/draw.py similarity index 98% rename from gui/utils/drawUtils.py rename to gui/utils/draw.py index d7034ece7..51d0ba903 100644 --- a/gui/utils/drawUtils.py +++ b/gui/utils/draw.py @@ -1,6 +1,6 @@ # noinspection PyPackageRequirements import wx -import gui.utils.colorUtils as colorUtils +import gui.utils.color as colorUtils def RenderGradientBar(windowColor, width, height, sFactor, eFactor, mFactor=None, fillRatio=2):