Resolve #245 - Adding tooltips to fitting columns

gui/builtinViewColumns/ammo.py

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

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/builtinViews/fittingView.py

@@ -163,12 +163,9 @@ class FittingView(d.Display):
                 self.hoveredColumn = col
                 if row != -1 and row not in self.blanks and col != -1 and col < len(self.DEFAULT_COLS):
                     mod = self.mods[self.GetItemData(row)]
-                    if self.DEFAULT_COLS[col] == "Miscellanea":
-                        tooltip = self.activeColumns[col].getToolTip(mod)
-                        if tooltip is not None:
-                            self.SetToolTipString(tooltip)
-                        else:
-                            self.SetToolTip(None)
+                    tooltip = self.activeColumns[col].getToolTip(mod)
+                    if tooltip is not None:
+                        self.SetToolTipString(tooltip)
                     else:
                         self.SetToolTip(None)
                 else:

gui/viewColumn.py

@@ -50,7 +50,7 @@ class ViewColumn(object):
         return ""
 
     def getToolTip(self, mod):
-        return ""
+        return None
 
     def getImageId(self, mod):
         return -1