From b4525d233ed5e86241698ff37aad9dec5c8193db Mon Sep 17 00:00:00 2001 From: Corollax Date: Mon, 1 Nov 2010 14:41:04 -0500 Subject: [PATCH 1/4] Do not display capacitor use column on 0 A long column of 0's is annoying. Don't display it if it's 0. --- gui/builtinViewColumns/capacitorUse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/builtinViewColumns/capacitorUse.py b/gui/builtinViewColumns/capacitorUse.py index 732e96c0c..0c2a89e89 100644 --- a/gui/builtinViewColumns/capacitorUse.py +++ b/gui/builtinViewColumns/capacitorUse.py @@ -37,7 +37,7 @@ class CapacitorUse(ViewColumn): def getText(self, mod): capUse = mod.capUse - if capUse is not None: + if capUse: return "%s%s" % ("+" if capUse < 0 else "", (formatAmount(-capUse, 3, 0, 3))) else: return "" From 4a6594851da17668bdf3ddedfc7378034b6f7237 Mon Sep 17 00:00:00 2001 From: Corollax Date: Mon, 1 Nov 2010 15:59:45 -0500 Subject: [PATCH 2/4] Swapped projected module state and ammo icons Projected view should be consistent with fitting view. Also fixed a capitalization issue in moduleState.py --- gui/builtinViewColumns/moduleState.py | 2 +- gui/fittingView.py | 2 +- gui/projectedView.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gui/builtinViewColumns/moduleState.py b/gui/builtinViewColumns/moduleState.py index 0cadfdb4d..d331ebe6d 100644 --- a/gui/builtinViewColumns/moduleState.py +++ b/gui/builtinViewColumns/moduleState.py @@ -23,7 +23,7 @@ from gui import bitmapLoader from eos.types import State class ModuleState(ViewColumn): - name = "Module state" + name = "Module State" def __init__(self, fittingView, params): ViewColumn.__init__(self, fittingView) self.resizable = False diff --git a/gui/fittingView.py b/gui/fittingView.py index b2af14c56..48b3cf7ee 100644 --- a/gui/fittingView.py +++ b/gui/fittingView.py @@ -30,7 +30,7 @@ from gui.builtinViewColumns.moduleState import ModuleState FitChanged, FIT_CHANGED = wx.lib.newevent.NewEvent() class FittingView(d.Display): - DEFAULT_COLS = ["Module state", + DEFAULT_COLS = ["Module State", "Module Ammo Icon", "Module name/slot", "attr:power", diff --git a/gui/projectedView.py b/gui/projectedView.py index 0125d5e2a..f6c1a0a17 100644 --- a/gui/projectedView.py +++ b/gui/projectedView.py @@ -27,8 +27,8 @@ from gui.contextMenu import ContextMenu import eos.types class ProjectedView(d.Display): - DEFAULT_COLS = ["Projected Ammo Icon", - "Projected State", + DEFAULT_COLS = ["Projected State", + "Projected Ammo Icon", "Projected Name", "Projected Ammo"] From b0573fae88d91aa7babc30a4fd1cf966ee46c6d0 Mon Sep 17 00:00:00 2001 From: Corollax Date: Mon, 1 Nov 2010 16:04:52 -0500 Subject: [PATCH 3/4] Renamed moduleNameOrSlot.py In preparation for its division into moduleName and moduleIcon. This refactor will let the module icon occupy a different column from its Name, so that module/ammo icons can be swapped. --- gui/builtinViewColumns/__init__.py | 2 +- .../{moduleNameOrSlot.py => moduleName.py} | 6 +++--- gui/fittingView.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename gui/builtinViewColumns/{moduleNameOrSlot.py => moduleName.py} (95%) diff --git a/gui/builtinViewColumns/__init__.py b/gui/builtinViewColumns/__init__.py index 408fd5eb9..a9aff35e8 100644 --- a/gui/builtinViewColumns/__init__.py +++ b/gui/builtinViewColumns/__init__.py @@ -1,4 +1,4 @@ -__all__ = ["moduleState", "moduleNameOrSlot", "attributeDisplay", "maxRange", +__all__ = ["moduleState", "moduleName", "attributeDisplay", "maxRange", "name", "droneDps", "droneNameAmount", "droneCheckbox", "moduleAmmo", "capacitorUse", "activityCheckbox", "moduleAmmoIcon", "modulePrice", "projectedName", "projectedState", "projectedAmmoIcon", "projectedAmmo", diff --git a/gui/builtinViewColumns/moduleNameOrSlot.py b/gui/builtinViewColumns/moduleName.py similarity index 95% rename from gui/builtinViewColumns/moduleNameOrSlot.py rename to gui/builtinViewColumns/moduleName.py index 5c7a7ead8..23e0538b6 100644 --- a/gui/builtinViewColumns/moduleNameOrSlot.py +++ b/gui/builtinViewColumns/moduleName.py @@ -22,8 +22,8 @@ from gui.viewColumn import ViewColumn from gui import bitmapLoader from eos.types import Slot -class ModuleNameOrSlot(ViewColumn): - name = "Module name/slot" +class ModuleName(ViewColumn): + name = "Module Name" def __init__(self, fittingView, params): ViewColumn.__init__(self, fittingView) self.columnText = "Name" @@ -51,4 +51,4 @@ class ModuleNameOrSlot(ViewColumn): return iconId -ModuleNameOrSlot.register() +ModuleName.register() diff --git a/gui/fittingView.py b/gui/fittingView.py index 48b3cf7ee..2efa14a26 100644 --- a/gui/fittingView.py +++ b/gui/fittingView.py @@ -32,7 +32,7 @@ FitChanged, FIT_CHANGED = wx.lib.newevent.NewEvent() class FittingView(d.Display): DEFAULT_COLS = ["Module State", "Module Ammo Icon", - "Module name/slot", + "Module Name", "attr:power", "attr:cpu", "Max range", From 020a30c8fe4c65f2c320600cf789a8651d7cd48b Mon Sep 17 00:00:00 2001 From: Corollax Date: Mon, 1 Nov 2010 17:12:05 -0500 Subject: [PATCH 4/4] Don't display price if value is 0 Stuff like faction items aren't queried properly. We shouldn't display the valueif we don't know it. --- gui/builtinViewColumns/modulePrice.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/builtinViewColumns/modulePrice.py b/gui/builtinViewColumns/modulePrice.py index 40c4c6bec..81ddad99b 100644 --- a/gui/builtinViewColumns/modulePrice.py +++ b/gui/builtinViewColumns/modulePrice.py @@ -39,12 +39,12 @@ class ModulePrice(ViewColumn): sMarket = service.Market.getInstance() price = sMarket.getPriceNow(mod.item.ID).price - return formatAmount(price, 3, 3, 9) if price is not None else False + return formatAmount(price, 3, 3, 9) if price else False def delayedText(self, mod, display, colItem): def callback(requests): price = requests[0].price - colItem.SetText(formatAmount(price, 3, 3, 9) if price is not None else "") + colItem.SetText(formatAmount(price, 3, 3, 9) if price else "") display.SetItem(colItem)