From 154122388e4bb912f0d47cc3397b9501e99659db Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Thu, 1 Aug 2019 11:12:26 +0300
Subject: [PATCH] Use short ship names along with fit names

---
 eos/saveddata/fit.py               | 3 ++-
 gui/builtinViewColumns/baseName.py | 6 +++---
 service/fit.py                     | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py
index 4aecb0f7d..07bc9325f 100644
--- a/eos/saveddata/fit.py
+++ b/eos/saveddata/fit.py
@@ -44,11 +44,12 @@ pyfalog = Logger(__name__)
 
 class FitLite:
 
-    def __init__(self, id=None, name=None, shipID=None, shipName=None):
+    def __init__(self, id=None, name=None, shipID=None, shipName=None, shipNameShort=None):
         self.ID = id
         self.name = name
         self.shipID = shipID
         self.shipName = shipName
+        self.shipNameShort = shipNameShort
 
     def __repr__(self):
         return 'FitLite(ID={})'.format(self.ID)
diff --git a/gui/builtinViewColumns/baseName.py b/gui/builtinViewColumns/baseName.py
index e5fb772c6..1e4c34f22 100644
--- a/gui/builtinViewColumns/baseName.py
+++ b/gui/builtinViewColumns/baseName.py
@@ -64,15 +64,15 @@ class BaseName(ViewColumn):
                 info = stuff.getProjectionInfo(fitID)
 
                 if info:
-                    return "%dx %s (%s)" % (stuff.getProjectionInfo(fitID).amount, stuff.name, stuff.ship.item.name)
+                    return "%dx %s (%s)" % (stuff.getProjectionInfo(fitID).amount, stuff.name, stuff.ship.item.getShortName())
 
                 pyfalog.warning("Projected View trying to display things that aren't there. stuff: {}, info: {}", repr(stuff),
                                 info)
                 return "<unknown>"
             else:
-                return "%s (%s)" % (stuff.name, stuff.ship.item.name)
+                return "%s (%s)" % (stuff.name, stuff.ship.item.getShortName())
         elif isinstance(stuff, FitLite):
-            return "{} ({})".format(stuff.name, stuff.shipName)
+            return "{} ({})".format(stuff.name, stuff.shipNameShort)
         elif isinstance(stuff, Rack):
             if FitSvc.getInstance().serviceFittingOptions["rackLabels"]:
                 if stuff.slot == FittingSlot.MODE:
diff --git a/service/fit.py b/service/fit.py
index ae5e775f9..5dd2f792c 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -110,10 +110,10 @@ class Fit:
         for shipID in shipMap:
             ship = eos.db.getItem(shipID)
             if ship is not None:
-                shipMap[shipID] = ship.name
+                shipMap[shipID] = (ship.name, ship.getShortName())
         for fit in fits:
             try:
-                fit.shipName = shipMap[fit.shipID]
+                fit.shipName, fit.shipNameShort = shipMap[fit.shipID]
             except KeyError:
                 pass
         return fits