Merge branch 'master' into wx3

gui/builtinViewColumns/baseName.py

@@ -42,7 +42,10 @@ class BaseName(ViewColumn):
             return "%s (%s)" % (stuff.name, stuff.ship.item.name)
         elif isinstance(stuff, Rack):
             if service.Fit.getInstance().serviceFittingOptions["rackLabels"]:
-                return u'─ {} Slots ─'.format(Slot.getName(stuff.slot).capitalize())
+                if stuff.slot == Slot.MODE:
+                    return u'─ Tactical Mode ─'
+                else:
+                    return u'─ {} Slots ─'.format(Slot.getName(stuff.slot).capitalize())
             else:
                 return ""
         elif isinstance(stuff, Module):

gui/builtinViewColumns/capacitorUse.py

@@ -23,6 +23,7 @@ import service
 from gui.utils.numberFormatter import formatAmount
 from gui.viewColumn import ViewColumn
 from gui import bitmapLoader
+from eos.types import Mode
 
 class CapacitorUse(ViewColumn):
     name = "Capacitor Usage"
@@ -38,6 +39,9 @@ class CapacitorUse(ViewColumn):
 
 
     def getText(self, mod):
+        if isinstance(mod, Mode):
+            return ""
+
         capUse = mod.capUse
         if capUse:
             return "%s%s" % ("+" if capUse < 0 else "", (formatAmount(-capUse, 3, 0, 3)))

gui/builtinViewColumns/maxRange.py

@@ -23,6 +23,7 @@ from gui import bitmapLoader
 import service
 from gui.utils.numberFormatter import formatAmount
 import wx
+from eos.types import Mode
 
 class MaxRange(ViewColumn):
     name = "Max Range"
@@ -51,6 +52,9 @@ class MaxRange(ViewColumn):
             self.mask |= wx.LIST_MASK_TEXT
 
     def getText(self, stuff):
+        if isinstance(stuff, Mode):
+            return ""
+
         maxRange = stuff.maxRange if hasattr(stuff, "maxRange") else stuff.getModifiedItemAttr("maxRange")
         falloff = stuff.falloff
         if falloff:

gui/builtinViewColumns/misc.py

@@ -19,7 +19,6 @@
 
 
 import gui.mainFrame
-from gui import builtinViewColumns
 from gui.viewColumn import ViewColumn
 from gui import bitmapLoader
 from gui.utils.numberFormatter import formatAmount
@@ -62,19 +61,30 @@ class Miscellanea(ViewColumn):
         return (("displayName", bool, False),
                 ("showIcon", bool, True))
 
-
     def __getData(self, stuff):
         item = stuff.item
         if item is None:
             return "", None
         itemGroup = item.group.name
-        if itemGroup in ("Energy Weapon", "Hybrid Weapon", "Projectile Weapon", "Combat Drone", "Fighter Drone"):
+        itemCategory = item.category.name
+
+        if itemGroup == "Ship Modifiers":
+            return "", None
+        elif itemGroup in ("Energy Weapon", "Hybrid Weapon", "Projectile Weapon", "Combat Drone", "Fighter Drone"):
             trackingSpeed = stuff.getModifiedItemAttr("trackingSpeed")
             if not trackingSpeed:
                 return "", None
             text = "{0}".format(formatAmount(trackingSpeed, 3, 0, 3))
             tooltip = "Tracking speed"
             return text, tooltip
+        elif itemCategory == "Subsystem":
+            slots = ("hi", "med", "low")
+            info = []
+            for slot in slots:
+                n = int(stuff.getModifiedItemAttr("%sSlotModifier"%slot))
+                if n > 0:
+                    info.append("{0}{1}".format(n, slot[0].upper()))
+            return "+ "+", ".join(info), "Slot Modifiers"
         elif itemGroup == "Energy Destabilizer":
             neutAmount = stuff.getModifiedItemAttr("energyDestabilizationAmount")
             cycleTime = stuff.cycleTime