Merge branch 'master' into wx3

2015-04-17 17:48:56 -04:00
parent e8268633e3 5eaaaf070b
commit 39c14b62fd
135 changed files with 1420 additions and 508 deletions
--- a/gui/builtinViewColumns/ammoIcon.py
+++ b/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()