From 85e34aa70fe7606dcf2c383046c57032b57664c7 Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Sun, 18 Mar 2012 15:06:35 +0400
Subject: [PATCH] Rename column from tracking to misc and change its icon to
 data disk

---
 gui/builtinViewColumns/__init__.py            |   2 +-
 .../{tracking.py => misc.py}                  |  23 +++++-------------
 gui/builtinViews/fittingView.py               |   2 +-
 gui/droneView.py                              |   2 +-
 icons/column_misc.png                         | Bin 0 -> 761 bytes
 5 files changed, 9 insertions(+), 20 deletions(-)
 rename gui/builtinViewColumns/{tracking.py => misc.py} (93%)
 create mode 100644 icons/column_misc.png

diff --git a/gui/builtinViewColumns/__init__.py b/gui/builtinViewColumns/__init__.py
index 61185cd74..4c5d8495e 100644
--- a/gui/builtinViewColumns/__init__.py
+++ b/gui/builtinViewColumns/__init__.py
@@ -1,2 +1,2 @@
 __all__ = ["ammo", "ammoIcon", "attributeDisplay", "baseIcon", "baseName",
-           "capacitorUse", "maxRange", "price", "propertyDisplay", "state", "tracking"]
+           "capacitorUse", "maxRange", "price", "propertyDisplay", "state", "misc"]
diff --git a/gui/builtinViewColumns/tracking.py b/gui/builtinViewColumns/misc.py
similarity index 93%
rename from gui/builtinViewColumns/tracking.py
rename to gui/builtinViewColumns/misc.py
index f3281947e..7625d5a7a 100644
--- a/gui/builtinViewColumns/tracking.py
+++ b/gui/builtinViewColumns/misc.py
@@ -22,35 +22,24 @@ from gui.viewColumn import ViewColumn
 from gui import bitmapLoader
 from gui.utils.numberFormatter import formatAmount
 
-import service
-from eos.types import Hardpoint
 import wx
 
-class Tracking(ViewColumn):
-    name = "Tracking"
+class Miscellanea(ViewColumn):
+    name = "Miscellanea"
     def __init__(self, fittingView, params = None):
         if params == None:
             params = {"showIcon": True,
                       "displayName": False}
         ViewColumn.__init__(self, fittingView)
-        cAttribute = service.Attribute.getInstance()
-        info = cAttribute.getAttributeInfo("trackingSpeed")
-        self.info = info
         if params["showIcon"]:
-            iconFile = info.icon.iconFile if info.icon else None
-            if iconFile:
-                self.imageId = fittingView.imageList.GetImageIndex(iconFile, "pack")
-                self.bitmap = bitmapLoader.getBitmap(iconFile, "pack")
-            else:
-                self.imageId = -1
-
+            self.imageId = fittingView.imageList.GetImageIndex("column_misc", "icons")
+            self.bitmap = bitmapLoader.getBitmap("column_misc", "icons")
             self.mask = wx.LIST_MASK_IMAGE
-
         else:
             self.imageId = -1
 
         if params["displayName"] or self.imageId == -1:
-            self.columnText = info.displayName if info.displayName != "" else info.name
+            self.columnText = "Misc data"
             self.mask |= wx.LIST_MASK_TEXT
 
     def getText(self, stuff):
@@ -280,4 +269,4 @@ class Tracking(ViewColumn):
     def getParameters(self):
         return (("displayName", bool, False),
                 ("showIcon", bool, True))
-Tracking.register()
+Miscellanea.register()
diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py
index b4a0d61fa..db97024d4 100644
--- a/gui/builtinViews/fittingView.py
+++ b/gui/builtinViews/fittingView.py
@@ -108,7 +108,7 @@ class FittingView(d.Display):
                     "attr:cpu",
                     "Capacitor Usage",
                     "Max Range",
-                    "Tracking",
+                    "Miscellanea",
                     "Price",
                     "Ammo",
                     ]
diff --git a/gui/droneView.py b/gui/droneView.py
index d360201d2..a82d087dd 100644
--- a/gui/droneView.py
+++ b/gui/droneView.py
@@ -45,7 +45,7 @@ class DroneView(d.Display):
                     "Base Name",
                     "prop:droneDps,droneBandwidth",
                     "Max Range",
-                    "Tracking",
+                    "Miscellanea",
                     "attr:maxVelocity",]
 
     def __init__(self, parent):
diff --git a/icons/column_misc.png b/icons/column_misc.png
new file mode 100644
index 0000000000000000000000000000000000000000..363c5ca2d124dd3f5607451c27bec648be2e1080
GIT binary patch
literal 761
zcmV<V0tWqwP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY^
z3OF<`BwnZh00MbQL_t(I%e9k9OcQYw#=rk`I_+3mrlpj!m>JTtlr<VnOvE6Ii4hEj
zsNtY7ap9_o2QMDHkVs-|;?aXQNxTV>!~@7d2nhkIqEcuJWmp<Oru$;)bUYx4!o>sc
z@|L{!%a@n;fTJ*>z3D)$^kMg*z4ZQsvpW#-&Vm)AXL|bkYQ6cnowKp1Srv+nJlRm3
z7w|IhFF>^$XiEgd{9atW(>-WwYUpk3xZK+3o}Y_uC&Z*y#SP>$?bjK-Ys&RmI#fYw
z#gERLx10s`+Dk;1@glL=pE9T;6wLyRI!$L4Ilyop0F?md{sM3%0!~-(^_<{%;Has>
zm*^%KQ;`Xw%?Pb!0fPZDLt^G)D*!Yc0EAZjFr07fDYTdrSw%>+>)JO>D(F#L3TRem
zWDSf#lcKUrQVIc}^gwoJG6PV1JK*x#%vLMOmX^Rws5vnnJw|7Ag-S+euS!$Ac4@0<
zW6=v^OY@H$M>&rSG{7GK#ThL~#G@#Z6<FsNPcqBvHN44E-;tABH<O{ml?zLClM|ys
zzOi*IErs&|nD#F*o7_&IhUX!0dIZKNglbKWaQuWGUwxVB;)u^S?R2v7c<hnnp5fB#
z>i{6_SAcXlJUrr>QbeBzr^;+dNf8WhrQIs&yD9VLm3`*Z)R3vU{e#%|S_@zmz|Xxq
zIM;Rs6GMYzWsd6m%i$P&D<TN3fvrps#|PdfK0bfuQk#vBrP0v>0E@o?006QZD2f6?
z$lbFS+ip{oQX7n?XwTZ(z0w<90ngK3ot#X@089di9C}EE5CC{L_I}V0fCWJE$}9XW
r(#EPgnalzR{@+KbnH_I5;z;cm!DI2M{Ky)E00000NkvXXu0mjfwJ=f&

literal 0
HcmV?d00001