Merge branch 'master' into singularity

gui/builtinViewColumns/attributeDisplay.py

@@ -84,11 +84,12 @@ class AttributeDisplay(ViewColumn):
             return ""
 
         if self.info.name == "volume":
-            str_ = (formatAmount(attr, 3, 0, 3))
-            if hasattr(mod, "amount"):
-                str_ += "m\u00B3 (%s m\u00B3)" % (formatAmount(attr * mod.amount, 3, 0, 3))
-            attr = str_
-
+            if getattr(mod, "amount", 1) != 1:
+                attr = "{} m\u00B3 ({} m\u00B3)".format(
+                    formatAmount(attr, 3, 0, 6),
+                    formatAmount(attr * mod.amount, 3, 0, 6))
+            else:
+                attr = "{} m\u00B3".format(formatAmount(attr, 3, 0, 6))
         if isinstance(attr, (float, int)):
             attr = (formatAmount(attr, 3, 0, 3))
 

gui/builtinViewColumns/baseName.py

@@ -33,6 +33,7 @@ from eos.saveddata.module import Module, Rack
 from eos.saveddata.targetProfile import TargetProfile
 from graphs.wrapper import BaseWrapper
 from gui.builtinContextMenus.envEffectAdd import AddEnvironmentEffect
+from gui.utils.numberFormatter import formatAmount
 from gui.viewColumn import ViewColumn
 from service.fit import Fit as FitSvc
 from service.market import Market
@@ -64,7 +65,11 @@ class BaseName(ViewColumn):
             return "%d/%d %s" % \
                    (stuff.amount, stuff.getModifiedItemAttr("fighterSquadronMaxSize"), stuff.item.name)
         elif isinstance(stuff, Cargo):
-            return "%dx %s" % (stuff.amount, stuff.item.name)
+            if stuff.item.group.name in ("Cargo Container", "Secure Cargo Container", "Audit Log Secure Container", "Freight Container"):
+                capacity = stuff.item.getAttribute('capacity')
+                if capacity:
+                    return "{:d}x {} ({} m\u00B3)".format(stuff.amount, stuff.item.name, formatAmount(capacity, 3, 0, 6))
+            return "{:d}x {}".format(stuff.amount, stuff.item.name)
         elif isinstance(stuff, Fit):
             if self.projectedView:
                 # we need a little more information for the projected view