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

4
gui/builtinContextMenus/amount.py
View File

@@ -1,5 +1,5 @@
from gui.contextMenu import ContextMenu
import eos.types
from eos.saveddata.fit import Fit as es_Fit
import gui.mainFrame
import gui.globalEvents as GE
import wx
@@ -60,7 +60,7 @@ class AmountChanger(wx.Dialog):
if isinstance(self.thing, es_Cargo):
sFit.addCargo(fitID, self.thing.item.ID, int(float(self.input.GetLineText(0))), replace=True)
elif isinstance(self.thing, eos.types.Fit):
elif isinstance(self.thing, es_Fit):
sFit.changeAmount(fitID, self.thing, int(float(self.input.GetLineText(0))))
elif isinstance(self.thing, es_Fighter):
sFit.changeActiveFighters(fitID, self.thing, int(float(self.input.GetLineText(0))))

2
gui/builtinContextMenus/changeAffectingSkills.py
View File

@@ -3,7 +3,7 @@ from gui.contextMenu import ContextMenu
import gui.mainFrame
import wx
from gui.bitmapLoader import BitmapLoader
from eos.types import Skill
from eos.saveddata.character import Skill
import gui.globalEvents as GE
from service.fit import Fit
from service.character import Character

2
gui/builtinContextMenus/moduleAmmoPicker.py
View File

@@ -4,7 +4,7 @@ import wx
from service.fit import Fit
from service.market import Market
from eos.types import Hardpoint
from eos.saveddata.module import Hardpoint
import gui.mainFrame
import gui.globalEvents as GE
from gui.contextMenu import ContextMenu

2
gui/builtinStatsViews/resourcesViewFull.py
View File

@@ -24,7 +24,7 @@ from gui import pygauge as PG
import gui.mainFrame
import gui.chromeTabs
from eos.types import Hardpoint
from eos.saveddata.module import Hardpoint
from gui.utils.numberFormatter import formatAmount

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

3
gui/builtinViews/fittingView.py
View File

@@ -25,7 +25,8 @@ import gui.display as d
from gui.contextMenu import ContextMenu
import gui.shipBrowser
import gui.multiSwitch
from eos.types import Slot, Rack, Module, Mode
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
import gui.builtinViews.emptyView

2
gui/crestFittings.py
View File

@@ -7,7 +7,7 @@ import requests
from service.port import Port
from service.fit import Fit
from eos.types import Cargo
from eos.saveddata.cargo import Cargo
from eos.db import getItem
import gui.display as d

2
gui/fighterView.py
View File

@@ -24,7 +24,7 @@ import gui.marketBrowser as mb
import gui.mainFrame
import gui.display as d
from gui.builtinViewColumns.state import State
from eos.types import Slot
from eos.saveddata.module import Slot
from gui.contextMenu import ContextMenu
from service.fit import Fit
from service.market import Market

2
gui/implantView.py
View File

@@ -24,7 +24,7 @@ import gui.mainFrame
from gui.builtinViewColumns.state import State
from gui.contextMenu import ContextMenu
import globalEvents as GE
from eos.types import ImplantLocation
from eos.saveddata.fit import ImplantLocation
from service.fit import Fit
from service.market import Market

11
gui/itemStats.py
View File

@@ -28,7 +28,16 @@ import wx.html
import wx.lib.mixins.listctrl as listmix
import config
from eos.types import Fit, Ship, Citadel, Module, Skill, Booster, Implant, Drone, Mode, Fighter
from eos.saveddata.mode import Mode
from eos.saveddata.character import Skill
from eos.saveddata.implant import Implant
from eos.saveddata.booster import Booster
from eos.saveddata.drone import Drone
from eos.saveddata.fighter import Fighter
from eos.saveddata.module import Module
from eos.saveddata.ship import Ship
from eos.saveddata.citadel import Citadel
from eos.saveddata.fit import Fit
from service.market import Market
from service.attribute import Attribute
import gui.mainFrame