dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Use stored bitmaps for viewcolumns headers (required to get a proper fitting view snapshot)

Browse Source
This commit is contained in:
HomeWorld
2010-12-11 00:45:09 +02:00
parent d455c65412
commit 2cac5adf8d
8 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gui/builtinViewColumns/ammo.py
View File

@@ -28,6 +28,7 @@ class Ammo(ViewColumn):
ViewColumn.__init__(self, fittingView)
self.mask = wx.LIST_MASK_IMAGE
self.imageId = fittingView.imageList.GetImageIndex("damagePattern_small", "icons")
self.bitmap = bitmapLoader.getBitmap("damagePattern_small", "icons")
def getText(self, stuff):
return "%s (%s)" % (stuff.charge.name, stuff.numCharges) if getattr(stuff, "charge", None) is not None else ""

1
gui/builtinViewColumns/attributeDisplay.py
View File

@@ -40,6 +40,7 @@ class AttributeDisplay(ViewColumn):
iconType = "pack"
if iconFile:
self.imageId = fittingView.imageList.GetImageIndex(iconFile, iconType)
self.bitmap = bitmapLoader.getBitmap(iconFile, iconType)
else:
self.imageId = -1

1
gui/builtinViewColumns/capacitorUse.py
View File

@@ -34,6 +34,7 @@ class CapacitorUse(ViewColumn):
cAttribute = service.Attribute.getInstance()
info = cAttribute.getAttributeInfo("capacitorNeed")
self.imageId = fittingView.imageList.GetImageIndex(info.icon.iconFile, "pack")
self.bitmap = bitmapLoader.getBitmap(info.icon.iconFile, "pack")
def getText(self, mod):

1
gui/builtinViewColumns/maxRange.py
View File

@@ -39,6 +39,7 @@ class MaxRange(ViewColumn):
iconFile = info.icon.iconFile if info.icon else None
if iconFile:
self.imageId = fittingView.imageList.GetImageIndex(iconFile, "pack")
self.bitmap = bitmapLoader.getBitmap(iconFile, "pack")
else:
self.imageId = -1
self.mask = wx.LIST_MASK_IMAGE

2
gui/builtinViewColumns/price.py
View File

@@ -28,7 +28,7 @@ class Price(ViewColumn):
def __init__(self, fittingView, params):
ViewColumn.__init__(self, fittingView)
self.mask = wx.LIST_MASK_IMAGE
bitmap = bitmapLoader.getBitmap("totalPrice_small", "icons")
self.bitmap = bitmapLoader.getBitmap("totalPrice_small", "icons")
self.imageId = fittingView.imageList.GetImageIndex("totalPrice_small", "icons")
def getText(self, stuff):

1
gui/builtinViewColumns/tracking.py
View File

@@ -39,6 +39,7 @@ class Tracking(ViewColumn):
iconFile = info.icon.iconFile if info.icon else None
if iconFile:
self.imageId = fittingView.imageList.GetImageIndex(iconFile, "pack")
self.bitmap = bitmapLoader.getBitmap(iconFile, "pack")
else:
self.imageId = -1

2
gui/builtinViews/fittingView.py
View File

@@ -528,7 +528,7 @@ class FittingView(d.Display):
opts.m_labelText = name
if imgId != -1:
bmp = self.imageList.GetBitmap(imgId)
bmp = col.bitmap
opts.m_labelBitmap = bmp
width = render.DrawHeaderButton (self, mdc, (cx, padding, columnsWidths[i], headerSize), wx.CONTROL_CURRENT,

2
gui/viewColumn.py
View File

@@ -33,7 +33,7 @@ class ViewColumn(object):
self.size = wx.LIST_AUTOSIZE_USEHEADER
self.mask = 0
self.maxsize = -1
self.bitmap = wx.NullBitmap
@classmethod
def register(cls):