From b0573fae88d91aa7babc30a4fd1cf966ee46c6d0 Mon Sep 17 00:00:00 2001
From: Corollax <corollax@gmail.com>
Date: Mon, 1 Nov 2010 16:04:52 -0500
Subject: [PATCH] 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",