From 243291959f3252a013ba1d20c427b02cf3e917b4 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Sat, 18 Dec 2010 13:46:36 +0300 Subject: [PATCH] Revert "Resolve 352 (Clean up root folder)" This reverts commit cede27f1b255def37976345eed195ee437e3a035. --- gui/aboutData.py => aboutData.py | 0 gui/compat.py => compat.py | 0 gui/config.py => config.py | 0 gui/bitmapLoader.py | 4 ++-- gui/builtinStatsViews/capacitorViewFull.py | 2 +- gui/builtinStatsViews/firepowerViewFull.py | 2 +- gui/builtinStatsViews/priceViewFull.py | 2 +- gui/builtinStatsViews/rechargeViewFull.py | 2 +- gui/builtinStatsViews/resistancesViewFull.py | 2 +- gui/builtinStatsViews/resourcesViewFull.py | 2 +- gui/builtinStatsViews/targetingMiscViewFull.py | 4 ++-- gui/builtinViewColumns/attributeDisplay.py | 2 +- gui/builtinViewColumns/capacitorUse.py | 2 +- gui/builtinViewColumns/maxRange.py | 2 +- gui/builtinViewColumns/price.py | 2 +- gui/builtinViewColumns/propertyDisplay.py | 2 +- gui/builtinViewColumns/tracking.py | 2 +- gui/fleetBrowser.py | 4 ++-- gui/itemStats.py | 2 +- gui/mainFrame.py | 6 +++--- gui/mainMenuBar.py | 2 +- gui/patternEditor.py | 2 +- pyfa.py => run.py | 2 +- service/settings.py | 2 +- gui/util.py => util.py | 0 25 files changed, 26 insertions(+), 26 deletions(-) rename gui/aboutData.py => aboutData.py (100%) rename gui/compat.py => compat.py (100%) rename gui/config.py => config.py (100%) rename pyfa.py => run.py (98%) rename gui/util.py => util.py (100%) diff --git a/gui/aboutData.py b/aboutData.py similarity index 100% rename from gui/aboutData.py rename to aboutData.py diff --git a/gui/compat.py b/compat.py similarity index 100% rename from gui/compat.py rename to compat.py diff --git a/gui/config.py b/config.py similarity index 100% rename from gui/config.py rename to config.py diff --git a/gui/bitmapLoader.py b/gui/bitmapLoader.py index 6cdf0e6c1..0a95416aa 100644 --- a/gui/bitmapLoader.py +++ b/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() diff --git a/gui/builtinStatsViews/capacitorViewFull.py b/gui/builtinStatsViews/capacitorViewFull.py index 786d9ef0b..3594da4ad 100644 --- a/gui/builtinStatsViews/capacitorViewFull.py +++ b/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" diff --git a/gui/builtinStatsViews/firepowerViewFull.py b/gui/builtinStatsViews/firepowerViewFull.py index 75f2b509e..8accb64be 100644 --- a/gui/builtinStatsViews/firepowerViewFull.py +++ b/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" diff --git a/gui/builtinStatsViews/priceViewFull.py b/gui/builtinStatsViews/priceViewFull.py index 670e214dd..906aace21 100644 --- a/gui/builtinStatsViews/priceViewFull.py +++ b/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): diff --git a/gui/builtinStatsViews/rechargeViewFull.py b/gui/builtinStatsViews/rechargeViewFull.py index 4c78f1580..6fd200993 100644 --- a/gui/builtinStatsViews/rechargeViewFull.py +++ b/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 diff --git a/gui/builtinStatsViews/resistancesViewFull.py b/gui/builtinStatsViews/resistancesViewFull.py index 7b9c7fb3e..1954f1345 100644 --- a/gui/builtinStatsViews/resistancesViewFull.py +++ b/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 diff --git a/gui/builtinStatsViews/resourcesViewFull.py b/gui/builtinStatsViews/resourcesViewFull.py index 56c55c4a4..80967805f 100644 --- a/gui/builtinStatsViews/resourcesViewFull.py +++ b/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" diff --git a/gui/builtinStatsViews/targetingMiscViewFull.py b/gui/builtinStatsViews/targetingMiscViewFull.py index 9fcba8ae3..cd0ad9ab6 100644 --- a/gui/builtinStatsViews/targetingMiscViewFull.py +++ b/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)) diff --git a/gui/builtinViewColumns/attributeDisplay.py b/gui/builtinViewColumns/attributeDisplay.py index 312d009aa..a72ed7143 100644 --- a/gui/builtinViewColumns/attributeDisplay.py +++ b/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): diff --git a/gui/builtinViewColumns/capacitorUse.py b/gui/builtinViewColumns/capacitorUse.py index c56e505ac..68e5fb355 100644 --- a/gui/builtinViewColumns/capacitorUse.py +++ b/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 diff --git a/gui/builtinViewColumns/maxRange.py b/gui/builtinViewColumns/maxRange.py index 29fff06b9..4fcee9d4e 100644 --- a/gui/builtinViewColumns/maxRange.py +++ b/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): diff --git a/gui/builtinViewColumns/price.py b/gui/builtinViewColumns/price.py index c9a411e1e..9c21b1f63 100644 --- a/gui/builtinViewColumns/price.py +++ b/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): diff --git a/gui/builtinViewColumns/propertyDisplay.py b/gui/builtinViewColumns/propertyDisplay.py index 59abccba1..88339439b 100644 --- a/gui/builtinViewColumns/propertyDisplay.py +++ b/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): diff --git a/gui/builtinViewColumns/tracking.py b/gui/builtinViewColumns/tracking.py index 3c0df7442..6640ea721 100644 --- a/gui/builtinViewColumns/tracking.py +++ b/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 diff --git a/gui/fleetBrowser.py b/gui/fleetBrowser.py index 12776398f..e96dca5fe 100644 --- a/gui/fleetBrowser.py +++ b/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 \ No newline at end of file diff --git a/gui/itemStats.py b/gui/itemStats.py index 6be86317b..5ff4afa78 100644 --- a/gui/itemStats.py +++ b/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): diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 0ce7fdf7b..316d715e5 100644 --- a/gui/mainFrame.py +++ b/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 diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py index 37c5cb473..4f0735414 100644 --- a/gui/mainMenuBar.py +++ b/gui/mainMenuBar.py @@ -18,7 +18,7 @@ #=============================================================================== import wx -from gui import config +import config import bitmapLoader import gui.mainFrame import gui.graphFrame diff --git a/gui/patternEditor.py b/gui/patternEditor.py index c10e28019..12bd8b973 100644 --- a/gui/patternEditor.py +++ b/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 diff --git a/pyfa.py b/run.py similarity index 98% rename from pyfa.py rename to run.py index a707709df..ef4ccd376 100755 --- a/pyfa.py +++ b/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 diff --git a/service/settings.py b/service/settings.py index b7eb79d96..4a6428e43 100644 --- a/service/settings.py +++ b/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") diff --git a/gui/util.py b/util.py similarity index 100% rename from gui/util.py rename to util.py