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 03c257fee..283638d95 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): @@ -283,4 +272,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 89fb10c1e..671c5c031 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 000000000..363c5ca2d Binary files /dev/null and b/icons/column_misc.png differ