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

Have projectedName handle projected fits instead of passing them on and

Browse Source 
having the slave die
This commit is contained in:
cncfanatics
2010-11-05 18:05:58 +01:00
parent 653a3108d6
commit 91309299f5
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gui/builtinViewColumns/name.py
View File

@@ -20,7 +20,6 @@
from gui import builtinViewColumns
from gui.viewColumn import ViewColumn
from gui import bitmapLoader
from eos.types import Slot
import wx
class StuffName(ViewColumn):

8
gui/builtinViewColumns/projectedName.py
View File

@@ -20,8 +20,9 @@
from gui.viewColumn import ViewColumn
import gui.builtinViewColumns.name
import gui.builtinViewColumns.droneNameAmount
from eos.types import Drone
from eos.types import Drone, Fit
import wx
from gui import bitmapLoader
class ProjectedName(ViewColumn):
name = "Projected Name"
@@ -29,18 +30,23 @@ class ProjectedName(ViewColumn):
ViewColumn.__init__(self, fittingView)
self.columnText = "Name"
self.mask = wx.LIST_MASK_TEXT
self.shipImage = fittingView.imageList.Add(bitmapLoader.getBitmap("ship_small", "icons"))
self.slave = gui.builtinViewColumns.name.StuffName(fittingView, params)
self.droneSlave = gui.builtinViewColumns.droneNameAmount.DroneNameAmount(fittingView, params)
def getText(self, stuff):
if isinstance(stuff, Drone):
return self.droneSlave.getText(stuff)
elif isinstance(stuff, Fit):
return "%s (%s)" % (stuff.name, stuff.ship.item.name)
else:
return self.slave.getText(stuff)
def getImageId(self, thing):
if isinstance(thing, Drone):
return self.droneSlave.getImageId(thing)
elif isinstance(thing, Fit):
return self.shipImage
else:
return self.slave.getImageId(thing)