From 7e0982b81b6639f382debb6f18a6b191b19e9a09 Mon Sep 17 00:00:00 2001
From: HomeWorld <homeworld@gmail.com>
Date: Tue, 22 Nov 2011 19:19:20 +0200
Subject: [PATCH] More gang UI related stuff (don't ask)

---
 gui/gangView.py | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/gui/gangView.py b/gui/gangView.py
index 20560f1d4..230dc1afd 100644
--- a/gui/gangView.py
+++ b/gui/gangView.py
@@ -175,6 +175,7 @@ class GangView ( ScrolledPanel ):
         fleetSrv = service.Fleet.getInstance()
 
         activeFitID = self.mainFrame.getActiveFit()
+
         if activeFitID:
             commanders = fleetSrv.loadLinearFleet(fit)
             if commanders is None:
@@ -184,26 +185,46 @@ class GangView ( ScrolledPanel ):
 
             if fleetCom:
                 fleetComName = fleetCom.ship.item.name + ": " + fleetCom.name
+                fleetComCharName = fleetCom.character.name if fleetCom.character is not None else "All 0"
             else:
                 fleetComName = "None"
+                fleetComCharName = "All 0"
 
             if wingCom:
                 wingComName = wingCom.ship.item.name + ": " + wingCom.name
+                wingComCharName = wingCom.character.name if wingCom.character is not None else "All 0"
             else:
                 wingComName = "None"
+                wingComCharName = "All 0"
 
             if squadCom:
                 squadComName = squadCom.ship.item.name + ": " + squadCom.name
+                squadComCharName = squadCom.character.name if squadCom.character is not None else "All 0"
             else:
                 squadComName = "None"
+                squadComCharName = "All 0"
 
-            self.UpdateFleetFitsUI( fleetComName, wingComName, squadComName )
+            self.UpdateFleetFitsUI( fleetComName, wingComName, squadComName, fleetComCharName, wingComCharName, squadComCharName )
 
-    def UpdateFleetFitsUI(self, fleet, wing, squad):
+        else:
+            fleetComName = "None"
+            fleetComCharName = "All 0"
+            wingComName = "None"
+            wingComCharName = "All 0"
+            squadComName = "None"
+            squadComCharName = "All 0"
+
+            self.UpdateFleetFitsUI( fleetComName, wingComName, squadComName, fleetComCharName, wingComCharName, squadComCharName )
+
+    def UpdateFleetFitsUI(self, fleet, wing, squad, fleetChar, wingChar, squadChar):
         self.stFleetFit.SetLabel(fleet)
         self.stWingFit.SetLabel(wing)
         self.stSquadFit.SetLabel(squad)
 
+        self.chFleetChar.SetStringSelection(fleetChar)
+        self.chWingChar.SetStringSelection(wingChar)
+        self.chSquadChar.SetStringSelection(squadChar)
+
         self.Layout()