More work on the drone pane, more specificly, a pwetty + & - button (not working yet) and a bit of polish on the columns

gui/builtinViewColumns/attributeDisplay.py

@@ -54,7 +54,7 @@ class AttributeDisplay(ViewColumn):
     def getText(self, mod):
         attr = mod.getModifiedItemAttr(self.info.name)
         if attr:
-            return shorten(attr, 3, 0, 0)
+            return (shorten(attr, 3, 0, 3))
         else:
             return ""
 

gui/builtinViewColumns/display.py

@@ -94,8 +94,8 @@ class Display(wx.ListCtrl):
 
         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, col.size)
+                if self.GetColumnWidth(i) < 40 and col.size == wx.LIST_AUTOSIZE:
                     self.SetColumnWidth(i, 40)
 
         for sel in selection:

gui/droneView.py

@@ -21,16 +21,21 @@ import wx
 
 import controller
 import gui.mainFrame
+from gui import bitmapLoader
 import gui.fittingView as fv
 import gui.marketBrowser as mb
 import gui.builtinViewColumns.display as d
+from gui.builtinViewColumns import registerColumn
+from gui.viewColumn import ViewColumn
 
 class DroneView(d.Display):
-    DEFAULT_COLS = ["Drone Name/Amount",
+    DEFAULT_COLS = ["Activate Drone",
+                    "Deactivate Drone",
+                    "Drone Name/Amount",
                     "Drone DPS",
                     "Max range",
                     "attr:trackingSpeed",
-                    "attr:maxVelocity"]
+                    "attr:maxVelocity",]
 
     def __init__(self, parent):
         d.Display.__init__(self, parent)
@@ -42,7 +47,7 @@ class DroneView(d.Display):
         cFit = controller.Fit.getInstance()
         fit = cFit.getFit(event.fitID)
 
-        self.populate(fit.drones)
+        self.populate(fit.drones if fit is not None else None)
 
     def addItem(self, event):
         cFit = controller.Fit.getInstance()
@@ -59,3 +64,36 @@ class DroneView(d.Display):
             cFit.removeDrone(fitID, self.GetItemData(row))
 
             wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID))
+
+class DroneMore(ViewColumn):
+    name = "Activate Drone"
+    def __init__(self, fittingView, params):
+        ViewColumn.__init__(self, fittingView)
+        bitmap = bitmapLoader.getBitmap("more_small", "icons")
+        self.moreId = fittingView.imageList.Add(bitmap)
+        self.size = 16
+        self.columnText = ""
+
+    def getText(self, drone):
+        return ""
+
+    def getImageId(self, mod):
+        return self.moreId
+
+class DroneLess(ViewColumn):
+    name = "Deactivate Drone"
+    def __init__(self, fittingView, params):
+        ViewColumn.__init__(self, fittingView)
+        bitmap = bitmapLoader.getBitmap("less_small", "icons")
+        self.lessId = fittingView.imageList.Add(bitmap)
+        self.size = 16
+        self.columnText = ""
+
+    def getText(self, drone):
+        return ""
+
+    def getImageId(self, mod):
+        return self.lessId
+
+registerColumn(DroneMore)
+registerColumn(DroneLess)