Revert "Resolve 352 (Clean up root folder)"

This reverts commit cede27f1b2.

gui/bitmapLoader.py

@@ -18,14 +18,14 @@
 #===============================================================================
 
 import os.path
-from gui import config
+import config
 import wx
 import time
 
 try:
     from collections import OrderedDict
 except ImportError:
-    from gui.compat import OrderedDict
+    from compat import OrderedDict
 
 cachedBitmapsCount = 0
 cachedBitmaps = OrderedDict()

gui/builtinStatsViews/capacitorViewFull.py

@@ -21,7 +21,7 @@ import wx
 from gui.statsView import StatsView
 from gui import builtinStatsViews
 from gui import bitmapLoader
-from gui.util import formatAmount
+from util import formatAmount
 
 class CapacitorViewFull(StatsView):
     name = "capacitorViewFull"

gui/builtinStatsViews/firepowerViewFull.py

@@ -21,7 +21,7 @@ import wx
 from gui.statsView import StatsView
 from gui import builtinStatsViews
 from gui import bitmapLoader
-from gui.util import formatAmount
+from util import formatAmount
 
 class FirepowerViewFull(StatsView):
     name = "firepowerViewFull"

gui/builtinStatsViews/priceViewFull.py

@@ -21,7 +21,7 @@ import wx
 from gui.statsView import StatsView
 from gui import builtinStatsViews
 from gui import bitmapLoader
-from gui.util import formatAmount
+from util import formatAmount
 import service
 
 class PriceViewFull(StatsView):

gui/builtinStatsViews/rechargeViewFull.py

@@ -20,7 +20,7 @@
 import wx
 from gui.statsView import StatsView
 from gui import bitmapLoader
-from gui.util import formatAmount
+from util import formatAmount
 import gui.mainFrame
 import gui.builtinStatsViews.resistancesViewFull as rvf
 import service

gui/builtinStatsViews/resistancesViewFull.py

@@ -22,7 +22,7 @@ from gui.statsView import StatsView
 from gui import builtinStatsViews
 from gui import bitmapLoader
 from gui import pygauge as PG
-from gui.util import formatAmount
+from util import formatAmount
 import service
 import gui.mainFrame
 import gui.builtinViews.fittingView as fv

gui/builtinStatsViews/resourcesViewFull.py

@@ -25,7 +25,7 @@ from gui import pygauge as PG
 
 from eos.types import Hardpoint
 
-from gui.util import formatAmount
+from util import formatAmount
 
 class ResourcesViewFull(StatsView):
     name = "resourcesViewFull"

gui/builtinStatsViews/targetingMiscViewFull.py

@@ -20,7 +20,7 @@
 import wx
 from gui.statsView import StatsView
 from gui import builtinStatsViews
-from gui.util import formatAmount
+from util import formatAmount
 
 class TargetingMiscViewFull(StatsView):
     name = "targetingmiscViewFull"
@@ -132,7 +132,7 @@ class TargetingMiscViewFull(StatsView):
                 elif labelName is "labelFullSigRadius":
                     label.SetToolTip(wx.ToolTip("Probe Size: %.3f" % (fit.probeSize or 0) ))
                 elif labelName is "labelFullWarpSpeed":
-                    label.SetToolTip(wx.ToolTip("Max Warp Distance: %.1f AU" %
+                    label.SetToolTip(wx.ToolTip("Max Warp Distance: %.1f AU" % 
                         fit.maxWarpDistance))
                 elif fit is not None:
                     label.SetToolTip(wx.ToolTip("%.1f" % value))

gui/builtinViewColumns/attributeDisplay.py

@@ -21,7 +21,7 @@ from gui import builtinViewColumns
 from gui.viewColumn import ViewColumn
 from gui import bitmapLoader
 import service
-from gui.util import formatAmount
+from util import formatAmount
 import wx
 
 class AttributeDisplay(ViewColumn):

gui/builtinViewColumns/capacitorUse.py

@@ -20,7 +20,7 @@
 import wx
 import service
 
-from gui.util import formatAmount
+from util import formatAmount
 from gui.viewColumn import ViewColumn
 from gui import bitmapLoader
 

gui/builtinViewColumns/maxRange.py

@@ -21,7 +21,7 @@ from gui import builtinViewColumns
 from gui.viewColumn import ViewColumn
 from gui import bitmapLoader
 import service
-from gui.util import formatAmount
+from util import formatAmount
 import wx
 
 class MaxRange(ViewColumn):

gui/builtinViewColumns/price.py

@@ -20,7 +20,7 @@
 from gui.viewColumn import ViewColumn
 from gui import bitmapLoader
 import service
-from gui.util import formatAmount
+from util import formatAmount
 import wx
 
 class Price(ViewColumn):

gui/builtinViewColumns/propertyDisplay.py

@@ -20,7 +20,7 @@
 from gui.viewColumn import ViewColumn
 from gui import bitmapLoader
 import service
-from gui.util import formatAmount
+from util import formatAmount
 import wx
 
 class PropertyDisplay(ViewColumn):

gui/builtinViewColumns/tracking.py

@@ -21,7 +21,7 @@ from gui import builtinViewColumns
 from gui.viewColumn import ViewColumn
 from gui import bitmapLoader
 import service
-from gui.util import formatAmount
+from util import formatAmount
 from eos.types import Hardpoint
 import wx
 

gui/fleetBrowser.py

@@ -4,7 +4,7 @@ from gui import bitmapLoader
 import gui.mainFrame
 from gui.PFListPane import PFListPane
 import service.fleet
-from gui.util import GetPartialText
+from util import GetPartialText
 
 from wx.lib.buttons import GenBitmapButton
 
@@ -572,4 +572,4 @@ class PFGenBitmapButton(GenBitmapButton):
         self.bgcolor = wx.Brush(color)
 
     def GetBackgroundBrush(self, dc):
-        return self.bgcolor
+        return self.bgcolor

gui/itemStats.py

@@ -25,7 +25,7 @@ import sys
 import wx.lib.mixins.listctrl  as  listmix
 import wx.html
 from eos.types import Ship, Module, Skill, Booster, Implant, Drone
-from gui.util import formatAmount
+from util import formatAmount
 import service
 
 class ItemStatsDialog(wx.Dialog):

gui/mainFrame.py

@@ -19,7 +19,7 @@
 
 import wx
 import service
-from gui import config
+import config
 from gui import bitmapLoader
 from gui.mainMenuBar import MainMenuBar
 from gui.additionsPane import AdditionsPane
@@ -34,11 +34,11 @@ from gui.patternEditor import DmgPatternEditorDlg
 from gui.preferenceDialog import PreferenceDialog
 from gui.graphFrame import GraphFrame
 from gui.copySelectDialog import CopySelectDialog
-from gui import aboutData
+import aboutData
 from wx._core import PyDeadObjectError
 import os.path
 import gui.chromeTabs
-from gui.util import toClipboard, fromClipboard
+from util import toClipboard, fromClipboard
 from builtinViews import *
 from gui.fleetBrowser import FleetBrowser
 

gui/mainMenuBar.py

@@ -18,7 +18,7 @@
 #===============================================================================
 
 import wx
-from gui import config
+import config
 import bitmapLoader
 import gui.mainFrame
 import gui.graphFrame

gui/patternEditor.py

@@ -21,7 +21,7 @@ import wx
 import bitmapLoader
 import service
 from wx.lib.intctrl import IntCtrl
-from gui.util import toClipboard, fromClipboard
+from util import toClipboard, fromClipboard
 
 ###########################################################################
 ## Class DmgPatternEditorDlg

run.py

@@ -24,7 +24,7 @@ if not hasattr(sys, 'frozen'):
     import wxversion
     wxversion.ensureMinimal('2.8')
 
-from gui import config
+import config
 
 # try:
 #    import apsw

service/settings.py

@@ -19,7 +19,7 @@
 
 import cPickle
 import os.path
-from gui import config
+import config
 
 class SettingsProvider():
     BASE_PATH = os.path.join(config.savePath, "settings")