Make some imports more explicit

gui/builtinContextMenus/targetResists.py

@@ -3,7 +3,7 @@ import gui.mainFrame
 import gui.globalEvents as GE
 import wx
 from gui.bitmapLoader import BitmapLoader
-from service import targetResists as svc_targetResists
+from service.targetResists import TargetResists as svc_TargetResists
 from service.fit import Fit
 
 try:
@@ -20,7 +20,7 @@ class TargetResists(ContextMenu):
         if self.mainFrame.getActiveFit() is None or srcContext != "firepowerViewFull":
             return False
 
-        sTR = svc_targetResists.TargetResists.getInstance()
+        sTR = svc_TargetResists.getInstance()
         self.patterns = sTR.getTargetResistsList()
         self.patterns.sort(key=lambda p: (p.name in ["None"], p.name))
 

gui/pygauge.py

@@ -19,7 +19,7 @@ import gui.utils.drawUtils as drawUtils
 import gui.utils.animEffects as animEffects
 import gui.utils.fonts as fonts
 
-from service import fit
+from service.fit import Fit
 
 
 class PyGauge(wx.PyWindow):
@@ -173,7 +173,7 @@ class PyGauge(wx.PyWindow):
         return self._range
 
     def Animate(self):
-        sFit = fit.Fit.getInstance()
+        sFit = Fit.getInstance()
         if sFit.serviceFittingOptions["enableGaugeAnimation"]:
             if not self._timer:
                 self._timer = wx.Timer(self, self._timerId)

gui/updateDialog.py

@@ -19,7 +19,7 @@
 
 import wx
 import dateutil.parser
-from service import settings
+from service.settings import UpdateSettings as svc_UpdateSettings
 
 
 class UpdateDialog(wx.Dialog):
@@ -27,7 +27,7 @@ class UpdateDialog(wx.Dialog):
         wx.Dialog.__init__(self, parent, id=wx.ID_ANY, title="Pyfa Update", pos=wx.DefaultPosition,
                            size=wx.Size(400, 300), style=wx.DEFAULT_DIALOG_STYLE)
 
-        self.UpdateSettings = settings.UpdateSettings.getInstance()
+        self.UpdateSettings = svc_UpdateSettings.getInstance()
         self.releaseInfo = release
         self.SetSizeHintsSz(wx.DefaultSize, wx.DefaultSize)