From 85aa5e4ebca8cc4c12543a5615e00e7268bd996f Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Sat, 4 Sep 2010 03:40:50 +0400 Subject: [PATCH] Move to new format in ViewColumns and suffixize drone bay and bandwidth --- gui/builtinViewColumns/attributeDisplay.py | 2 +- gui/builtinViewColumns/maxRange.py | 4 ++-- gui/statsPane.py | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gui/builtinViewColumns/attributeDisplay.py b/gui/builtinViewColumns/attributeDisplay.py index 5929d04ba..a1b60b979 100644 --- a/gui/builtinViewColumns/attributeDisplay.py +++ b/gui/builtinViewColumns/attributeDisplay.py @@ -54,7 +54,7 @@ class AttributeDisplay(ViewColumn): def getText(self, mod): attr = mod.getModifiedItemAttr(self.info.name) if attr: - return shorten(attr, 2) + return shorten(attr, 3, 0, 0) else: return "" diff --git a/gui/builtinViewColumns/maxRange.py b/gui/builtinViewColumns/maxRange.py index 0534bf6ec..3389c1f08 100644 --- a/gui/builtinViewColumns/maxRange.py +++ b/gui/builtinViewColumns/maxRange.py @@ -55,10 +55,10 @@ class MaxRange(ViewColumn): if falloff is None: falloff = "" else: - falloff = "+%sm" % shorten(falloff, 1) + falloff = "+%sm" % shorten(falloff, 3, 0, 3) if maxRange: - return "%sm" % shorten(maxRange, 1) + falloff + return "%sm" % shorten(maxRange, 3, 0, 3) + falloff else: return "" + falloff diff --git a/gui/statsPane.py b/gui/statsPane.py index 0db9eaef3..c45bf8119 100644 --- a/gui/statsPane.py +++ b/gui/statsPane.py @@ -68,10 +68,10 @@ class StatsPane(wx.Panel): ("label%sSpeed", lambda: fit.ship.getModifiedItemAttr("maxVelocity"), 3, 0, 0), ("label%sAlignTime", lambda: fit.alignTime, 3, 0, 0)) - stats = (("labelFullUsedDroneBay", lambda: fit.droneBayUsed, 0, 0, 0), - ("labelFullUsedDroneBandwidth", lambda: fit.droneBandwidthUsed, 0, 0, 0), - ("labelFullTotalDroneBay", lambda: fit.ship.getModifiedItemAttr("droneCapacity"), 0, 0, 0), - ("labelFullTotalDroneBandwidth", lambda: fit.ship.getModifiedItemAttr("droneBandwidth"), 0, 0, 0), + stats = (("labelFullUsedDroneBay", lambda: fit.droneBayUsed, 3, 0, 9), + ("labelFullUsedDroneBandwidth", lambda: fit.droneBandwidthUsed, 3, 0, 9), + ("labelFullTotalDroneBay", lambda: fit.ship.getModifiedItemAttr("droneCapacity"), 3, 0, 9), + ("labelFullTotalDroneBandwidth", lambda: fit.ship.getModifiedItemAttr("droneBandwidth"), 3, 0, 9), ("labelFullDpsWeapon", lambda: fit.weaponDPS, 3, 0, 9), ("labelFullDpsDrone", lambda: fit.droneDPS, 3, 0, 9), ("labelTankSustainedShieldPassive", lambda: fit.calculateShieldRecharge(), 3, 0, 9),