From 91309299f5391596085753cc0951b007b9dc05ab Mon Sep 17 00:00:00 2001
From: cncfanatics <diego.duclos@gmail.com>
Date: Fri, 5 Nov 2010 18:05:58 +0100
Subject: [PATCH] Have projectedName handle projected fits instead of passing
 them on and having the slave die

---
 gui/builtinViewColumns/name.py          | 1 -
 gui/builtinViewColumns/projectedName.py | 8 +++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gui/builtinViewColumns/name.py b/gui/builtinViewColumns/name.py
index 4709d865a..529ea4cd1 100644
--- a/gui/builtinViewColumns/name.py
+++ b/gui/builtinViewColumns/name.py
@@ -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):
diff --git a/gui/builtinViewColumns/projectedName.py b/gui/builtinViewColumns/projectedName.py
index 7d3cc0cdf..2aef1ce8d 100644
--- a/gui/builtinViewColumns/projectedName.py
+++ b/gui/builtinViewColumns/projectedName.py
@@ -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)