First iteration of the drone view, as well as a bunch of other related changes

gui/builtinViewColumns/display.py

@@ -20,6 +20,7 @@
 import wx
 import gui.mainFrame
 from gui.builtinViewColumns import *
+import sys
 
 class Display(wx.ListCtrl):
     def __init__(self, parent):
@@ -72,3 +73,30 @@ class Display(wx.ListCtrl):
     def clearItemImages(self):
         for i in xrange(self.imageList.ImageCount - 1, self.imageListBase, -1):
             self.imageList.Remove(i)
+
+    def populate(self, stuff):
+        selection = []
+        sel = self.GetFirstSelected()
+        while sel != -1:
+            selection.append(sel)
+            sel = self.GetNextSelected(sel)
+
+        self.DeleteAllItems()
+        self.clearItemImages()
+
+        if stuff is not None:
+            for id, st in enumerate(stuff):
+                index = self.InsertStringItem(sys.maxint, "")
+                for i, col in enumerate(self.activeColumns):
+                    self.SetStringItem(index, i, col.getText(st), col.getImageId(st))
+                    self.SetItemData(index, id)
+
+
+        for i, col in enumerate(self.activeColumns):
+            if not col.resized:
+                self.SetColumnWidth(i, wx.LIST_AUTOSIZE)
+                if self.GetColumnWidth(i) < 40:
+                    self.SetColumnWidth(i, 40)
+
+        for sel in selection:
+            self.Select(sel)

gui/builtinViewColumns/droneDps.py

@@ -31,7 +31,7 @@ class DroneDps(ViewColumn):
         self.imageId = fittingView.imageList.Add(bitmap)
 
     def getText(self, stuff):
-       return stuff.item.name
+       return "%.1f" % stuff.dps
 
     def getImageId(self, mod):
         return -1

gui/builtinViewColumns/droneNameAmount.py

@@ -29,7 +29,7 @@ class DroneNameAmount(ViewColumn):
         self.columnText = "Name"
 
     def getText(self, drone):
-        return "%dX %s (%d Active)" % (drone.amount, stuff.item.name, drone.amountActive)
+        return "%dx %s (%d Active)" % (drone.amount, drone.item.name, drone.amountActive)
 
     def getImageId(self, mod):
         return -1