Merge branch 'master' of evefit.org:pyfa

gui/aboutData.py

@@ -19,7 +19,7 @@
 import config
 
 versionString = "{0} {1} - {2} {3}".format(config.version, config.tag, config.expansionName, config.expansionVersion)
-license = "pyfa is released under GNU GPL"
+license = "pyfa is released under GNU GPLv3"
 licenseLocation = "gpl.txt"
 developers = ("\n cncfanatics \t(Sakari Orisi)\n" , " DarkPhoenix \t(Kadesh Priestess)\n", " Darriele \t(Darriele)")
 credits = (("EVE SERVICE CORP \twww.evsco.net - host of EVEFIT project ( pyfa / EOS/ Aurora)"), ("Entity (Entity) \t\tCapacitor calculations / EVEAPI python lib / Reverence"), ("Aurora \t\tMaths"), ("Corollax (Aamrr) \tVarious EOS/pyfa improvements"))

gui/droneView.py

@@ -93,13 +93,11 @@ class DroneView(d.Display):
                    'Fighter Bombers', 'Combat Utility Drones',
                    'Electronic Warfare Drones', 'Logistic Drones', 'Mining Drones')
     def droneKey(self, drone):
-        item = drone.item
-        if item.name == "Shadow":
-            return (self.DRONE_ORDER.index('Fighter Bombers'), drone.item.name)
-        if item.marketGroup is None:
-            item = item.metaGroup.parent
+        cMarket = service.Market.getInstance()
 
-        return (self.DRONE_ORDER.index(item.marketGroup.name),
+        groupName = cMarket.getMarketGroupName(drone.item)
+
+        return (self.DRONE_ORDER.index(groupName),
                 drone.item.name)
 
     def fitChanged(self, event):

service/market.py

@@ -236,6 +236,22 @@ class Market():
 
     def getMarketGroup(self, marketGroupId):
         return eos.db.getMarketGroup(marketGroupId)
+    
+    def getForcedMarketGroupID(self,itemID):
+        if itemID in self.FORCED_ITEM_MKTGRPS:
+            grpID,meta = self.FORCED_ITEM_MKTGRPS[itemID]
+            return grpID
+        return None
+
+    def getMarketGroupName(self, item):
+        if item.marketGroup == None:
+            marketGroupID = self.getForcedMarketGroupID(item.ID)
+            marketGroup = self.getMarketGroup(marketGroupID)
+            groupName = marketGroup.name
+        else:
+            groupName = item.marketGroup.name
+
+        return groupName    
 
     MARKET_GROUPS = (9, #Modules
                     1111, #Rigs