From 4669b4813ce39009595f36bef977799f6eef2a31 Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Tue, 26 Oct 2021 12:22:25 +0300
Subject: [PATCH] Use short muta + base names for mutated items

---
 eos/saveddata/mutatedMixin.py            | 8 +++++++-
 gui/builtinAdditionPanes/droneView.py    | 7 ++-----
 gui/builtinItemStatsViews/itemMutator.py | 3 +--
 gui/builtinViewColumns/baseName.py       | 4 ++--
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/eos/saveddata/mutatedMixin.py b/eos/saveddata/mutatedMixin.py
index 20c5ea6d2..4e41fd244 100644
--- a/eos/saveddata/mutatedMixin.py
+++ b/eos/saveddata/mutatedMixin.py
@@ -34,7 +34,7 @@ class MutatedMixin:
 
     @property
     def isMutated(self):
-        return self.baseItemID and self.mutaplasmidID
+        return bool(self.baseItemID and self.mutaplasmidID)
 
     @property
     def baseItem(self):
@@ -44,6 +44,12 @@ class MutatedMixin:
     def mutaplasmid(self):
         return self.__mutaplasmid
 
+    @property
+    def fullName(self):
+        if self.isMutated:
+            return f'{self.mutaplasmid.shortName} {self.baseItem.customName}'
+        return self.item.customName
+
     def _mutaInit(self, baseItem, mutaplasmid):
         self.baseItemID = baseItem.ID if baseItem is not None else None
         self.mutaplasmidID = mutaplasmid.ID if mutaplasmid is not None else None
diff --git a/gui/builtinAdditionPanes/droneView.py b/gui/builtinAdditionPanes/droneView.py
index d104bb7a4..209f7fc00 100644
--- a/gui/builtinAdditionPanes/droneView.py
+++ b/gui/builtinAdditionPanes/droneView.py
@@ -193,11 +193,8 @@ class DroneView(Display):
 
     @staticmethod
     def droneKey(drone):
-        sMkt = Market.getInstance()
-
-        groupName = sMkt.getMarketGroupByItem(drone.item).marketGroupName
-
-        return (DRONE_ORDER.index(groupName), drone.item.name)
+        groupName = Market.getInstance().getMarketGroupByItem(drone.item).marketGroupName
+        return (DRONE_ORDER.index(groupName), drone.isMutated, drone.fullName)
 
     def fitChanged(self, event):
         event.Skip()
diff --git a/gui/builtinItemStatsViews/itemMutator.py b/gui/builtinItemStatsViews/itemMutator.py
index a49819b9a..a7424b0fc 100644
--- a/gui/builtinItemStatsViews/itemMutator.py
+++ b/gui/builtinItemStatsViews/itemMutator.py
@@ -33,8 +33,7 @@ class ItemMutatorPanel(wx.Panel):
         mutaIcon = BitmapLoader.getStaticBitmap(stuff.mutaplasmid.item.iconID, self, "icons")
         if mutaIcon is not None:
             headerSizer.Add(mutaIcon, 0, wx.LEFT, 0)
-        sourceItemShort = "{} {}".format(stuff.mutaplasmid.shortName, stuff.baseItem.name)
-        sourceItemText = wx.StaticText(self, wx.ID_ANY, sourceItemShort)
+        sourceItemText = wx.StaticText(self, wx.ID_ANY, stuff.fullName)
         font = parent.GetFont()
         font.SetWeight(wx.BOLD)
         sourceItemText.SetFont(font)
diff --git a/gui/builtinViewColumns/baseName.py b/gui/builtinViewColumns/baseName.py
index 2677b904c..0624566ab 100644
--- a/gui/builtinViewColumns/baseName.py
+++ b/gui/builtinViewColumns/baseName.py
@@ -70,7 +70,7 @@ class BaseName(ViewColumn):
             stuff = stuff.item
 
         if isinstance(stuff, Drone):
-            return "%dx %s" % (stuff.amount, stuff.item.name)
+            return "%dx %s" % (stuff.amount, stuff.fullName)
         elif isinstance(stuff, Fighter):
             return "%d/%d %s" % \
                    (stuff.amount, stuff.getModifiedItemAttr("fighterSquadronMaxSize"), stuff.item.name)
@@ -117,7 +117,7 @@ class BaseName(ViewColumn):
             if stuff.isEmpty:
                 return "%s Slot" % FittingSlot(stuff.slot).name.capitalize()
             else:
-                return stuff.item.customName
+                return stuff.fullName
         elif isinstance(stuff, Implant):
             return stuff.item.name
         elif isinstance(stuff, TargetProfile):