Merge branch 'master' into wx3

gui/builtinViewColumns/ammo.py

@@ -42,7 +42,6 @@ class Ammo(ViewColumn):
 
         return text
 
-
     def getImageId(self, mod):
         return -1
 

gui/builtinViewColumns/ammoIcon.py

@@ -48,4 +48,8 @@ class AmmoIcon(ViewColumn):
             else:
                 return -1
 
+    def getToolTip(self, mod):
+        if isinstance(mod, Module) and mod.charge is not None:
+            return mod.charge.name
+
 AmmoIcon.register()

gui/builtinViewColumns/attributeDisplay.py

@@ -89,6 +89,12 @@ class AttributeDisplay(ViewColumn):
     def getImageId(self, mod):
         return -1
 
+    def getToolTip(self, stuff):
+        if self.info.name == "cpu":
+            return "CPU"
+        else:
+            return self.info.name.title()
+
     @staticmethod
     def getParameters():
         return (("attribute", str, None),

gui/builtinViewColumns/capacitorUse.py

@@ -34,9 +34,8 @@ class CapacitorUse(ViewColumn):
 
         sAttr = service.Attribute.getInstance()
         info = sAttr.getAttributeInfo("capacitorNeed")
-        self.imageId = fittingView.imageList.GetImageIndex(info.icon.iconFile, "pack")
-        self.bitmap = bitmapLoader.getBitmap(info.icon.iconFile, "pack")
-
+        self.imageId = fittingView.imageList.GetImageIndex("capacitorRecharge_small", "icons")
+        self.bitmap = bitmapLoader.getBitmap("capacitorRecharge_small", "icons")
 
     def getText(self, mod):
         if isinstance(mod, Mode):
@@ -51,4 +50,7 @@ class CapacitorUse(ViewColumn):
     def getImageId(self, mod):
         return -1
 
+    def getToolTip(self, mod):
+        return self.name
+
 CapacitorUse.register()

gui/builtinViewColumns/maxRange.py

@@ -74,4 +74,7 @@ class MaxRange(ViewColumn):
         return (("displayName", bool, False),
                 ("showIcon", bool, True))
 
+    def getToolTip(self, mod):
+        return "Optimal + Falloff"
+
 MaxRange.register()

gui/builtinViewColumns/price.py

@@ -60,4 +60,7 @@ class Price(ViewColumn):
     def getImageId(self, mod):
         return -1
 
+    def getToolTip(self, mod):
+        return self.name
+
 Price.register()

gui/builtinViewColumns/state.py

@@ -44,6 +44,10 @@ class State(ViewColumn):
     def getText(self, mod):
         return ""
 
+    def getToolTip(self, mod):
+        if isinstance(mod, Module) and not mod.isEmpty:
+            return State_.getName(mod.state).title()
+
     def getImageId(self, stuff):
         if isinstance(stuff, Drone):
             return self.checkedId if stuff.amountActive > 0 else self.uncheckedId