dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 17 Wiki Activity

Merge branch 'EosImportCleanup' of https://github.com/Ebag333/Pyfa into development

Browse Source 
Conflicts:
	eos/db/gamedata/metaData.py
	eos/db/gamedata/queries.py
	eos/db/saveddata/queries.py
	eos/saveddata/fleet.py
	eos/types.py
	eve.db
	gui/builtinContextMenus/amount.py
	gui/builtinViewColumns/ammo.py
	gui/builtinViewColumns/ammoIcon.py
	gui/builtinViewColumns/capacitorUse.py
	service/port.py
This commit is contained in:
blitzman
2017-02-07 19:22:26 -05:00
parent ca311e5dec 3c31391ec9
commit f7d7b3fe5e
66 changed files with 137 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/builtinViewColumns/abilities.py
View File

@@ -19,7 +19,7 @@
import wx
from eos.types import Fighter
from eos.saveddata.fighter import Fighter
from gui.viewColumn import ViewColumn
import gui.mainFrame

2
gui/builtinViewColumns/ammo.py
View File

@@ -18,7 +18,7 @@
# =============================================================================
import wx
from eos.types import Fighter
from eos.saveddata.fighter import Fighter
from gui.viewColumn import ViewColumn
from gui.bitmapLoader import BitmapLoader

2
gui/builtinViewColumns/ammoIcon.py
View File

@@ -19,7 +19,7 @@
from gui.viewColumn import ViewColumn
import wx
from eos.types import Module
from eos.saveddata.module import Module
class AmmoIcon(ViewColumn):

5
gui/builtinViewColumns/baseIcon.py
View File

@@ -1,5 +1,8 @@
import wx
from eos.types import Drone, Fit, Module, Slot, Rack, Implant
from eos.saveddata.implant import Implant
from eos.saveddata.drone import Drone
from eos.saveddata.module import Module, Slot, Rack
from eos.saveddata.fit import Fit
from gui.viewColumn import ViewColumn

6
gui/builtinViewColumns/baseName.py
View File

@@ -19,7 +19,11 @@
# =============================================================================
import wx
from eos.types import Drone, Cargo, Module, Slot, Rack, Implant, Fighter
from eos.saveddata.cargo import Cargo
from eos.saveddata.implant import Implant
from eos.saveddata.drone import Drone
from eos.saveddata.fighter import Fighter
from eos.saveddata.module import Module, Slot, Rack
from service.fit import Fit
from gui.viewColumn import ViewColumn
import gui.mainFrame

2
gui/builtinViewColumns/capacitorUse.py
View File

@@ -19,7 +19,7 @@
import wx
from eos.types import Mode
from eos.saveddata.mode import Mode
from service.attribute import Attribute
from gui.utils.numberFormatter import formatAmount
from gui.viewColumn import ViewColumn

2
gui/builtinViewColumns/maxRange.py
View File

@@ -19,7 +19,7 @@
import wx
from eos.types import Mode
from eos.saveddata.mode import Mode
from service.attribute import Attribute
from gui.viewColumn import ViewColumn
from gui.bitmapLoader import BitmapLoader

3
gui/builtinViewColumns/price.py
View File

@@ -19,7 +19,8 @@
import wx
from eos.types import Drone, Cargo
from eos.saveddata.cargo import Cargo
from eos.saveddata.drone import Drone
from service.market import Market
from gui.viewColumn import ViewColumn
from gui.bitmapLoader import BitmapLoader

6
gui/builtinViewColumns/state.py
View File

@@ -20,8 +20,10 @@
import wx
from eos.types import Drone, Module, Rack, Fit, Implant
from eos.types import State as State_
from eos.saveddata.fit import Fit
from eos.saveddata.implant import Implant
from eos.saveddata.drone import Drone
from eos.saveddata.module import Module, State as State_, Rack
from gui.viewColumn import ViewColumn
import gui.mainFrame