Merge remote-tracking branch 'origin/master' into citadel

Conflicts:
	config.py

gui/builtinStatsViews/priceViewFull.py

@@ -83,6 +83,11 @@ class PriceViewFull(StatsView):
             for drone in fit.drones:
                 for _ in xrange(drone.amount):
                     typeIDs.append(drone.itemID)
+
+            for fighter in fit.fighters:
+                for _ in xrange(fighter.amountActive):
+                    typeIDs.append(fighter.itemID)
+
             for cargo in fit.cargo:
                 for _ in xrange(cargo.amount):
                     typeIDs.append(cargo.itemID)

gui/itemStats.py

@@ -29,6 +29,7 @@ from gui.utils.numberFormatter import formatAmount
 import service
 import config
 from gui.contextMenu import ContextMenu
+from gui.utils.numberFormatter import formatAmount
 
 try:
     from collections import OrderedDict
@@ -551,6 +552,10 @@ class ItemCompare(wx.Panel):
         self.UpdateList()
         event.Skip()
 
+    def processPrices(self, prices):
+        for i, price in enumerate(prices):
+            self.paramList.SetStringItem(i, len(self.attrs)+1, formatAmount(price.price, 3, 3, 9, currency=True))
+
     def PopulateList(self):
         self.paramList.InsertColumn(0, "Item")
         self.paramList.SetColumnWidth(0, 200)
@@ -560,6 +565,12 @@ class ItemCompare(wx.Panel):
             self.paramList.InsertColumn(i+1, name)
             self.paramList.SetColumnWidth(i+1, 120)
 
+        self.paramList.InsertColumn(len(self.attrs)+1, "Price")
+        self.paramList.SetColumnWidth(len(self.attrs)+1, 60)
+
+        sMkt = service.Market.getInstance()
+        sMkt.getPrices([x.ID for x in self.items], self.processPrices)
+
         for item in self.items:
             i = self.paramList.InsertStringItem(sys.maxint, item.name)
             for x, attr in enumerate(self.attrs.keys()):