diff --git a/gui/builtinViewColumns/baseName.py b/gui/builtinViewColumns/baseName.py index cf9222414..97b992337 100644 --- a/gui/builtinViewColumns/baseName.py +++ b/gui/builtinViewColumns/baseName.py @@ -18,9 +18,7 @@ # along with pyfa. If not, see . #=============================================================================== -from gui import builtinViewColumns from gui.viewColumn import ViewColumn -from gui import bitmapLoader import gui.mainFrame import wx @@ -31,10 +29,12 @@ class BaseName(ViewColumn): name = "Base Name" def __init__(self, fittingView, params): ViewColumn.__init__(self, fittingView) + self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.columnText = "Name" self.shipImage = fittingView.imageList.GetImageIndex("ship_small", "icons") self.mask = wx.LIST_MASK_TEXT + self.projectedView = isinstance(fittingView, gui.projectedView.ProjectedView) def getText(self, stuff): if isinstance(stuff, Drone): @@ -42,8 +42,12 @@ class BaseName(ViewColumn): elif isinstance(stuff, Cargo): return "%dx %s" % (stuff.amount, stuff.item.name) elif isinstance(stuff, Fit): - fitID = self.mainFrame.getActiveFit() - return "%dx %s (%s)" % (stuff.getProjectionInfo(fitID).amount, stuff.name, stuff.ship.item.name) + if self.projectedView: + # we need a little more information for the projected view + fitID = self.mainFrame.getActiveFit() + return "%dx %s (%s)" % (stuff.getProjectionInfo(fitID).amount, stuff.name, stuff.ship.item.name) + else: + return "%s (%s)" % (stuff.name, stuff.ship.item.name) elif isinstance(stuff, Rack): if service.Fit.getInstance().serviceFittingOptions["rackLabels"]: if stuff.slot == Slot.MODE: