Redesign of the ship browser, its a lot cleaner and extensible now

gui/builtinViewColumns/attributeDisplay.py

@@ -52,7 +52,10 @@ class AttributeDisplay(ViewColumn):
             self.columnText = info.displayName if info.displayName != "" else info.name
 
     def getText(self, mod):
-        attr = mod.getModifiedItemAttr(self.info.name)
+        if hasattr(mod, "item"):
+            attr = mod.getModifiedItemAttr(self.info.name)
+        else:
+            attr = mod.getAttribute(self.info.name)
         if attr:
             return (formatAmount(attr, 3, 0, 3))
         else:
@@ -66,4 +69,4 @@ class AttributeDisplay(ViewColumn):
                 ("displayName", bool, False),
                 ("showIcon", bool, True))
 
-AttributeDisplay.register()
+AttributeDisplay.register()

gui/builtinViewColumns/name.py

@@ -29,10 +29,12 @@ class StuffName(ViewColumn):
         self.columnText = "Name"
 
     def getText(self, stuff):
-        return stuff.item.name
+        item = getattr(stuff, "item", stuff)
+        return item.name
 
     def getImageId(self, mod):
-        iconFile = mod.item.icon.iconFile if mod.item.icon else ""
+        item = getattr(mod, "item", mod)
+        iconFile = item.icon.iconFile if item.icon else ""
         if iconFile:
             bitmap = bitmapLoader.getBitmap(iconFile, "pack")
             if bitmap is None: