From 07da5aa8610963fc842eacfd68d28d887c0d1c89 Mon Sep 17 00:00:00 2001
From: blitzmann <ryan.xgamer99@gmail.com>
Date: Thu, 8 Jan 2015 12:39:16 -0500
Subject: [PATCH] Resolve #245 - Adding tooltips to fitting columns

---
 gui/builtinViewColumns/ammo.py             |   1 -
 gui/builtinViewColumns/attributeDisplay.py |   6 ++++++
 gui/builtinViewColumns/capacitorUse.py     |   8 +++++---
 gui/builtinViewColumns/maxRange.py         |   3 +++
 gui/builtinViewColumns/price.py            |   3 +++
 gui/builtinViews/fittingView.py            |   9 +++------
 gui/viewColumn.py                          |   2 +-
 icons/capacitorRecharge_small.png          | Bin 0 -> 656 bytes
 8 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 icons/capacitorRecharge_small.png

diff --git a/gui/builtinViewColumns/ammo.py b/gui/builtinViewColumns/ammo.py
index cb3234ccc..fe50c6fbd 100644
--- a/gui/builtinViewColumns/ammo.py
+++ b/gui/builtinViewColumns/ammo.py
@@ -42,7 +42,6 @@ class Ammo(ViewColumn):
 
         return text
 
-
     def getImageId(self, mod):
         return -1
 
diff --git a/gui/builtinViewColumns/attributeDisplay.py b/gui/builtinViewColumns/attributeDisplay.py
index a55a50407..86966574b 100644
--- a/gui/builtinViewColumns/attributeDisplay.py
+++ b/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),
diff --git a/gui/builtinViewColumns/capacitorUse.py b/gui/builtinViewColumns/capacitorUse.py
index 9e4916f2b..497869a66 100644
--- a/gui/builtinViewColumns/capacitorUse.py
+++ b/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()
diff --git a/gui/builtinViewColumns/maxRange.py b/gui/builtinViewColumns/maxRange.py
index be6be2a86..17d27ef5d 100644
--- a/gui/builtinViewColumns/maxRange.py
+++ b/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()
diff --git a/gui/builtinViewColumns/price.py b/gui/builtinViewColumns/price.py
index 0afcb22c0..5fe6ef954 100644
--- a/gui/builtinViewColumns/price.py
+++ b/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()
diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py
index 4b2547d8a..8e3db0836 100644
--- a/gui/builtinViews/fittingView.py
+++ b/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:
diff --git a/gui/viewColumn.py b/gui/viewColumn.py
index 948d09074..c2ffff612 100644
--- a/gui/viewColumn.py
+++ b/gui/viewColumn.py
@@ -50,7 +50,7 @@ class ViewColumn(object):
         return ""
 
     def getToolTip(self, mod):
-        return ""
+        return None
 
     def getImageId(self, mod):
         return -1
diff --git a/icons/capacitorRecharge_small.png b/icons/capacitorRecharge_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1c662dd88ff2b6080ee6d304fd7d2bae9fa9b79
GIT binary patch
literal 656
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl47=r_RLR^8|q8O){tz|{=KFg-G
z=tv7DdK!vzv7B1lw`OwLog*u2lUx#lU1v6DXT}6adz!Wv`sOBv@7}!X|NpbwH>_l1
zW#(gLU}Itw<zfB*|No~)hl-+|4(-}-{LtR3=g-J8FnHMLrTCbf+P|}}CObFKw6`X^
zC^Zad>CG)&3tDpu(qbof)o)$YSrG3tqbBy)mWA8a%+pYm>?w_z)|h$j<PlFd7og(Q
zP`6FXX67Xasmcj;)|c$tyxdk-c1m06@(DTaR$8Zy9VkwVu+|XKmE#uSWy^~7+OnW3
zDcBCEk(rT!kDZB!ok2}mcJbuOq!4?cAQ04+r{|}K0~x_S4tiQD7f$TIfBV|O?Q5s^
z)KBlOzi@0%X_B9XhQyWQJAF)LGvWg;pWOBI_W65PPfw~zan%-@HL>OE$LBj%PLHsY
zbJmkOb7a@;OGithovl>3_bh7@c-@c*G&;N_$PXCIIDtf2izy>h>wO#3r>%_ai~sGZ
zmGt|xUs>e9(`fdzKj)p2etvy>#fG>2<&QmwAB3|B1=m#^NN48pO5+veiF(|w3^aJE
zr;B5V#O34!1#ttf(<e@yG(PzA3|H4fL9bIfYYZ68M6aG$kzra|rZL~y*;viY&pX<E
zy6~CjkFH(r_xJGeGBbF>$o)Y|a`}>FOVek}nAP~R=Fc;+nUOawcTNjqN?>$U%$~ic
zCVDqhHG5*mOr<`*b9(FY-pS2d6cBx6&z{<vzkkji5!B=5;Njw%=uoyhC1Zw2Sv(_y
XV1>kc3I8&X0~tJB{an^LB{Ts5KHdDG

literal 0
HcmV?d00001