From 4a6594851da17668bdf3ddedfc7378034b6f7237 Mon Sep 17 00:00:00 2001 From: Corollax Date: Mon, 1 Nov 2010 15:59:45 -0500 Subject: [PATCH] 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"]