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

Make the stats pane collapsable, need feedback on looks

Browse Source
This commit is contained in:
cncfanatics
2010-08-26 01:04:01 +02:00
parent 2e5d88d4c1
commit 6462e1a588
2 changed files with 111 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gui/mainFrame.py
View File

@@ -22,7 +22,7 @@ from gui import bitmapLoader
from gui.mainMenuBar import MainMenuBar
from gui.mainToolBar import MainToolBar
from gui.marketBrowser import MarketBrowser
from gui.fitMultiSwitch import FitMultiSwitch
from gui.multiSwitch import MultiSwitch
from gui.statsPane import StatsPane
from gui.shipBrowser import ShipBrowser
from wx.lib.wordwrap import wordwrap
@@ -56,16 +56,16 @@ class MainFrame(wx.Frame):
notebookBrowsers.AddPage(self.shipBrowser, "Ships")
statsFitviewPanel = wx.Panel(self.splitter)
sizer = wx.BoxSizer(wx.HORIZONTAL)
statsFitviewPanel.SetSizer(sizer)
self.statsSizer = wx.BoxSizer(wx.HORIZONTAL)
statsFitviewPanel.SetSizer(self.statsSizer)
self.fitMultiSwitch = FitMultiSwitch(statsFitviewPanel)
self.fitMultiSwitch = MultiSwitch(statsFitviewPanel)
self.fitMultiSwitch.AddTab()
self.statsPane = StatsPane(statsFitviewPanel)
sizer.Add(self.fitMultiSwitch, 1, wx.EXPAND)
sizer.Add(self.statsPane, 0, wx.EXPAND)
self.statsSizer.Add(self.fitMultiSwitch, 1, wx.EXPAND)
self.statsSizer.Add(self.statsPane, 0, wx.EXPAND)
self.splitter.SplitVertically(notebookBrowsers, statsFitviewPanel)
self.splitter.SetMinimumPaneSize(10)

190
gui/statsPane.py
View File

@@ -19,28 +19,48 @@
import wx
from gui import bitmapLoader
import gui.mainFrame
class StatsPane(wx.CollapsiblePane):
def collapseChanged(self, event):
collapsed = event.Collapsed
if collapsed:
self.GetPane().SetMinSize(self.minSize)
else:
self.GetPane().SetMinSize(self.fullSize)
gui.mainFrame.MainFrame.getInstance().statsSizer.Layout()
class StatsPane(wx.Panel):
def __init__(self, parent):
wx.Panel.__init__(self, parent)
size = wx.Size()
size.SetWidth(330)
self.SetMinSize(size)
wx.CollapsiblePane.__init__(self, parent, label="Stats")
self.Expand()
self.fullSize = wx.Size()
pane = self.GetPane()
self.fullSize.SetWidth(330)
self.SetMinSize(self.fullSize)
self.minSize = wx.Size()
self.minSize.SetWidth(wx.SIZE_AUTO_WIDTH)
self.Bind(wx.EVT_COLLAPSIBLEPANE_CHANGED, self.collapseChanged)
boldFont = wx.SystemSettings_GetFont(wx.SYS_DEFAULT_GUI_FONT)
boldFont.SetWeight(wx.BOLD)
self.sizerBase = wx.BoxSizer(wx.VERTICAL)
self.SetSizer(self.sizerBase)
pane.SetSizer(self.sizerBase)
sizerHeaderResources = wx.BoxSizer(wx.HORIZONTAL)
self.sizerBase.Add(sizerHeaderResources, 0, wx.EXPAND | wx.LEFT, 3)
# Resources header
self.labelResources = wx.StaticText(self, wx.ID_ANY, "Resources")
self.labelResources = wx.StaticText(pane, wx.ID_ANY, "Resources")
self.labelResources.SetFont(boldFont)
sizerHeaderResources.Add(self.labelResources, 0, wx.ALIGN_CENTER)
sizerHeaderResources.Add(wx.StaticLine(self, wx.ID_ANY), 1, wx.ALIGN_CENTER)
sizerHeaderResources.Add(wx.StaticLine(pane, wx.ID_ANY), 1, wx.ALIGN_CENTER)
# Resources stuff
sizerResources = wx.BoxSizer(wx.HORIZONTAL)
@@ -54,37 +74,37 @@ class StatsPane(wx.Panel):
sizerResources.Add(sizerHardResources, 1, wx.ALIGN_CENTER)
for type in ("turret", "launcher"):
sizerHardResources.Add(bitmapLoader.getStaticBitmap("%s_big" % type, self, "icons"), 0, wx.ALIGN_CENTER)
sizerHardResources.Add(bitmapLoader.getStaticBitmap("%s_big" % type, pane, "icons"), 0, wx.ALIGN_CENTER)
box = wx.BoxSizer(wx.HORIZONTAL)
sizerHardResources.Add(box, 0, wx.ALIGN_CENTER)
lbl = wx.StaticText(self, wx.ID_ANY, "0")
setattr(self, "labelAvailable%sHardpoints", lbl)
lbl = wx.StaticText(pane, wx.ID_ANY, "0")
setattr(pane, "labelAvailable%sHardpoints", lbl)
box.Add(lbl, 0, wx.ALIGN_LEFT)
box.Add(wx.StaticText(self, wx.ID_ANY, "/"), 0, wx.ALIGN_LEFT)
box.Add(wx.StaticText(pane, wx.ID_ANY, "/"), 0, wx.ALIGN_LEFT)
lbl = wx.StaticText(self, wx.ID_ANY, "0")
lbl = wx.StaticText(pane, wx.ID_ANY, "0")
setattr(self, "labelTotal%sHardpoints", lbl)
box.Add(lbl, 0, wx.ALIGN_LEFT)
# Calibration points
sizerHardResources.Add(bitmapLoader.getStaticBitmap("calibration_big", self, "icons"))
sizerHardResources.Add(bitmapLoader.getStaticBitmap("calibration_big", pane, "icons"))
box = wx.BoxSizer(wx.HORIZONTAL)
sizerHardResources.Add(box, 0, wx.ALIGN_CENTER)
self.labelAvailableCalibrationPoints = wx.StaticText(self, wx.ID_ANY, "0")
self.labelAvailableCalibrationPoints = wx.StaticText(pane, wx.ID_ANY, "0")
box.Add(self.labelAvailableCalibrationPoints, 0, wx.ALIGN_LEFT)
box.Add(wx.StaticText(self, wx.ID_ANY, "/"), 0, wx.ALIGN_LEFT)
box.Add(wx.StaticText(pane, wx.ID_ANY, "/"), 0, wx.ALIGN_LEFT)
self.labelTotalCalibrationPoints = wx.StaticText(self, wx.ID_ANY, "0")
self.labelTotalCalibrationPoints = wx.StaticText(pane, wx.ID_ANY, "0")
box.Add(self.labelTotalCalibrationPoints, 0, wx.ALIGN_LEFT)
sizerResources.Add(wx.StaticLine(self, wx.ID_ANY, style=wx.VERTICAL), 0, wx.EXPAND)
sizerResources.Add(wx.StaticLine(pane, wx.ID_ANY, style=wx.VERTICAL), 0, wx.EXPAND)
#PG, Cpu & drone stuff
for group in (("cpu", "pg"), ("droneBay", "droneBandwidth")):
@@ -96,7 +116,7 @@ class StatsPane(wx.Panel):
base = wx.BoxSizer(wx.HORIZONTAL)
main.Add(base, 0, wx.EXPAND)
base.Add(bitmapLoader.getStaticBitmap(type + "_big", self, "icons"), 0, wx.ALIGN_CENTER)
base.Add(bitmapLoader.getStaticBitmap(type + "_big", pane, "icons"), 0, wx.ALIGN_CENTER)
stats = wx.BoxSizer(wx.VERTICAL)
base.Add(stats, 0, wx.EXPAND)
@@ -104,40 +124,40 @@ class StatsPane(wx.Panel):
absolute = wx.BoxSizer(wx.HORIZONTAL)
stats.Add(absolute)
lbl = wx.StaticText(self, wx.ID_ANY, "0")
lbl = wx.StaticText(pane, wx.ID_ANY, "0")
setattr(self, "labelAvailable%s" % capitalizedType, lbl)
absolute.Add(lbl, 0, wx.ALIGN_CENTER)
absolute.Add(wx.StaticText(self, wx.ID_ANY, "/"), 0, wx.ALIGN_CENTER)
absolute.Add(wx.StaticText(pane, wx.ID_ANY, "/"), 0, wx.ALIGN_CENTER)
lbl = wx.StaticText(self, wx.ID_ANY, "0")
lbl = wx.StaticText(pane, wx.ID_ANY, "0")
setattr(self, "labelTotal%s" % capitalizedType, lbl)
absolute.Add(lbl, 0, wx.ALIGN_CENTER)
gauge = wx.Gauge(self, wx.ID_ANY, 100)
gauge = wx.Gauge(pane, wx.ID_ANY, 100)
gauge.SetMinSize((100, -1))
setattr(self, "gauge%s" % capitalizedType, gauge)
stats.Add(gauge)
if "cpu" in group:
sizerResources.Add(wx.StaticLine(self, wx.ID_ANY, style=wx.VERTICAL), 0, wx.ALIGN_CENTER)
sizerResources.Add(wx.StaticLine(pane, wx.ID_ANY, style=wx.VERTICAL), 0, wx.ALIGN_CENTER)
# Resistances
sizerHeaderResistances = wx.BoxSizer(wx.HORIZONTAL)
self.sizerBase.Add(sizerHeaderResistances, 0, wx.EXPAND | wx.LEFT, 3)
# Header & EHP
labelResistances = wx.StaticText(self, wx.ID_ANY, "Resistances")
labelResistances = wx.StaticText(pane, wx.ID_ANY, "Resistances")
labelResistances.SetFont(boldFont)
sizerHeaderResistances.Add(labelResistances, 0, wx.ALIGN_CENTER)
sizerHeaderResistances.Add(wx.StaticText(self, wx.ID_ANY, " (Effective HP: "), 0, wx.ALIGN_CENTER)
sizerHeaderResistances.Add(wx.StaticText(pane, wx.ID_ANY, " (Effective HP: "), 0, wx.ALIGN_CENTER)
self.labelEhp = wx.StaticText(self, wx.ID_ANY, "0")
self.labelEhp = wx.StaticText(pane, wx.ID_ANY, "0")
sizerHeaderResistances.Add(self.labelEhp, 0, wx.ALIGN_CENTER)
sizerHeaderResistances.Add(wx.StaticText(self, wx.ID_ANY, ")"), 0, wx.ALIGN_CENTER)
sizerHeaderResistances.Add(wx.StaticLine(self, wx.ID_ANY), 1, wx.ALIGN_CENTER)
sizerHeaderResistances.Add(wx.StaticText(pane, wx.ID_ANY, ")"), 0, wx.ALIGN_CENTER)
sizerHeaderResistances.Add(wx.StaticLine(pane, wx.ID_ANY), 1, wx.ALIGN_CENTER)
# Display table
sizerResistances = wx.FlexGridSizer(4, 6)
@@ -147,28 +167,28 @@ class StatsPane(wx.Panel):
self.sizerBase.Add(sizerResistances, 0, wx.EXPAND | wx.LEFT, 3)
# Add an empty label, then the rest.
sizerResistances.Add(wx.StaticText(self, wx.ID_ANY))
sizerResistances.Add(wx.StaticText(pane, wx.ID_ANY))
for damageType in ("em", "thermal", "kinetic", "explosive"):
sizerResistances.Add(bitmapLoader.getStaticBitmap("%s_big" % damageType, self, "icons"), 0, wx.ALIGN_CENTER)
sizerResistances.Add(bitmapLoader.getStaticBitmap("%s_big" % damageType, pane, "icons"), 0, wx.ALIGN_CENTER)
sizerResistances.Add(wx.StaticText(self, wx.ID_ANY, "EHP"), 0, wx.ALIGN_CENTER)
sizerResistances.Add(wx.StaticText(pane, wx.ID_ANY, "EHP"), 0, wx.ALIGN_CENTER)
for tankType in ("damagePattern", "shield", "armor", "hull"):
sizerResistances.Add(bitmapLoader.getStaticBitmap("%s_big" % tankType, self, "icons"), 0, wx.ALIGN_CENTER)
sizerResistances.Add(bitmapLoader.getStaticBitmap("%s_big" % tankType, pane, "icons"), 0, wx.ALIGN_CENTER)
for damageType in ("em", "thermal", "kinetic", "explosive"):
box = wx.BoxSizer(wx.HORIZONTAL)
sizerResistances.Add(box, 1, wx.ALIGN_CENTER)
lbl = wx.StaticText(self, wx.ID_ANY, "0.00")
lbl = wx.StaticText(pane, wx.ID_ANY, "0.00")
setattr(self, "labelResistance%s%s" % (tankType, damageType), lbl)
box.Add(lbl, 0, wx.ALIGN_CENTER)
box.Add(wx.StaticText(self, wx.ID_ANY, "%"), 0, wx.ALIGN_CENTER)
box.Add(wx.StaticText(pane, wx.ID_ANY, "%"), 0, wx.ALIGN_CENTER)
lbl = wx.StaticText(self, wx.ID_ANY, "0" if tankType != "damagePattern" else "")
lbl = wx.StaticText(pane, wx.ID_ANY, "0" if tankType != "damagePattern" else "")
setattr(self, "labelResistance%sEhp" % tankType, lbl)
sizerResistances.Add(lbl, 0, wx.ALIGN_CENTER)
@@ -178,11 +198,11 @@ class StatsPane(wx.Panel):
sizerHeaderRechargeRates = wx.BoxSizer(wx.HORIZONTAL)
self.sizerBase.Add(sizerHeaderRechargeRates, 0, wx.EXPAND | wx.LEFT, 3)
labelRecharge = wx.StaticText(self, wx.ID_ANY, "Recharge Rates")
labelRecharge = wx.StaticText(pane, wx.ID_ANY, "Recharge Rates")
labelRecharge.SetFont(boldFont)
sizerHeaderRechargeRates.Add(labelRecharge, 0, wx.ALIGN_CENTER)
sizerHeaderRechargeRates.Add(wx.StaticLine(self, wx.ID_ANY), 1, wx.ALIGN_CENTER)
sizerHeaderRechargeRates.Add(wx.StaticLine(pane, wx.ID_ANY), 1, wx.ALIGN_CENTER)
sizerTankStats = wx.FlexGridSizer(3, 5)
for i in xrange(4):
@@ -191,20 +211,20 @@ class StatsPane(wx.Panel):
self.sizerBase.Add(sizerTankStats, 0, wx.EXPAND | wx.LEFT, 3)
#Add an empty label first for correct alignment.
sizerTankStats.Add(wx.StaticText(self, wx.ID_ANY, ""), 0)
sizerTankStats.Add(wx.StaticText(pane, wx.ID_ANY, ""), 0)
for tankType in ("shieldPassive", "shieldActive", "armorActive", "hullActive"):
sizerTankStats.Add(bitmapLoader.getStaticBitmap("%s_big" % tankType, self, "icons"), 1, wx.ALIGN_CENTER)
sizerTankStats.Add(bitmapLoader.getStaticBitmap("%s_big" % tankType, pane, "icons"), 1, wx.ALIGN_CENTER)
for stability in ("reinforced", "sustained"):
sizerTankStats.Add(bitmapLoader.getStaticBitmap("regen%s_big" % stability.capitalize(), self, "icons"), 0, wx.ALIGN_CENTER)
sizerTankStats.Add(bitmapLoader.getStaticBitmap("regen%s_big" % stability.capitalize(), pane, "icons"), 0, wx.ALIGN_CENTER)
for tankType in ("shieldPassive", "shieldActive", "armorActive", "hullActive"):
tankTypeCap = tankType[0].capitalize() + tankType[1:]
lbl = wx.StaticText(self, wx.ID_ANY, "0.0")
lbl = wx.StaticText(pane, wx.ID_ANY, "0.0")
setattr(self, "labelTank%s%s" % (stability.capitalize(), tankTypeCap), lbl)
box = wx.BoxSizer(wx.HORIZONTAL)
box.Add(lbl, 1, wx.ALIGN_CENTER)
box.Add(wx.StaticText(self, wx.ID_ANY, " HP/s"), 0, wx.ALIGN_CENTER)
box.Add(wx.StaticText(pane, wx.ID_ANY, " HP/s"), 0, wx.ALIGN_CENTER)
sizerTankStats.Add(box, 1, wx.ALIGN_CENTER)
@@ -212,11 +232,11 @@ class StatsPane(wx.Panel):
sizerHeaderFirepower = wx.BoxSizer(wx.HORIZONTAL)
self.sizerBase.Add(sizerHeaderFirepower, 0, wx.EXPAND | wx.LEFT, 3)
labelFirepower = wx.StaticText(self, wx.ID_ANY, "Firepower")
labelFirepower = wx.StaticText(pane, wx.ID_ANY, "Firepower")
labelFirepower.SetFont(boldFont)
sizerHeaderFirepower.Add(labelFirepower, 0, wx.ALIGN_CENTER)
sizerHeaderFirepower.Add(wx.StaticLine(self, wx.ID_ANY), 1, wx.ALIGN_CENTER)
sizerHeaderFirepower.Add(wx.StaticLine(pane, wx.ID_ANY), 1, wx.ALIGN_CENTER)
sizerFirepower = wx.FlexGridSizer(1, 3)
for i in xrange(3):
@@ -228,26 +248,26 @@ class StatsPane(wx.Panel):
baseBox = wx.BoxSizer(wx.HORIZONTAL)
sizerFirepower.Add(baseBox, 0, wx.ALIGN_CENTER)
baseBox.Add(bitmapLoader.getStaticBitmap("%s_big" % image, self, "icons"), 0, wx.ALIGN_CENTER)
baseBox.Add(bitmapLoader.getStaticBitmap("%s_big" % image, pane, "icons"), 0, wx.ALIGN_CENTER)
box = wx.BoxSizer(wx.VERTICAL)
baseBox.Add(box, 0, wx.ALIGN_CENTER)
box.Add(wx.StaticText(self, wx.ID_ANY, damageType.capitalize()), 0, wx.ALIGN_LEFT)
box.Add(wx.StaticText(pane, wx.ID_ANY, damageType.capitalize()), 0, wx.ALIGN_LEFT)
hbox = wx.BoxSizer(wx.HORIZONTAL)
box.Add(hbox, 1, wx.ALIGN_CENTER)
lbl = wx.StaticText(self, wx.ID_ANY, "0.0")
lbl = wx.StaticText(pane, wx.ID_ANY, "0.0")
setattr(self, "labelDps%s" % damageType, lbl)
hbox.Add(lbl, 0, wx.ALIGN_CENTER)
hbox.Add(wx.StaticText(self, wx.ID_ANY, " DPS"), 0, wx.ALIGN_CENTER)
hbox.Add(wx.StaticText(pane, wx.ID_ANY, " DPS"), 0, wx.ALIGN_CENTER)
baseBox = wx.BoxSizer(wx.HORIZONTAL)
sizerFirepower.Add(baseBox, 0, wx.ALIGN_CENTER)
baseBox.Add(bitmapLoader.getStaticBitmap("volley_big", self, "icons"), 0, wx.ALIGN_CENTER)
baseBox.Add(bitmapLoader.getStaticBitmap("volley_big", pane, "icons"), 0, wx.ALIGN_CENTER)
box = wx.BoxSizer(wx.VERTICAL)
baseBox.Add(box, 1, wx.ALIGN_CENTER)
@@ -255,26 +275,26 @@ class StatsPane(wx.Panel):
hbox = wx.BoxSizer(wx.HORIZONTAL)
box.Add(hbox, 1, wx.ALIGN_LEFT)
self.labelVolleyTotal = wx.StaticText(self, wx.ID_ANY, "0.0")
hbox.Add(wx.StaticText(self, wx.ID_ANY, "Volley: "), 0, wx.ALIGN_LEFT)
self.labelVolleyTotal = wx.StaticText(pane, wx.ID_ANY, "0.0")
hbox.Add(wx.StaticText(pane, wx.ID_ANY, "Volley: "), 0, wx.ALIGN_LEFT)
hbox.Add(self.labelVolleyTotal, 0, wx.EXPAND)
hbox = wx.BoxSizer(wx.HORIZONTAL)
box.Add(hbox, 1, wx.ALIGN_CENTER)
self.labelDpsTotal = wx.StaticText(self, wx.ID_ANY, "0.0")
hbox.Add(wx.StaticText(self, wx.ID_ANY, "Total DPS: "), 0, wx.ALIGN_LEFT)
self.labelDpsTotal = wx.StaticText(pane, wx.ID_ANY, "0.0")
hbox.Add(wx.StaticText(pane, wx.ID_ANY, "Total DPS: "), 0, wx.ALIGN_LEFT)
hbox.Add(self.labelDpsTotal, 0, wx.ALIGN_CENTER)
# Capacitor
sizerHeaderCapacitor = wx.BoxSizer(wx.HORIZONTAL)
self.sizerBase.Add(sizerHeaderCapacitor, 0, wx.EXPAND | wx.LEFT, 3)
labelCapacitor = wx.StaticText(self, wx.ID_ANY, "Capacitor")
labelCapacitor = wx.StaticText(pane, wx.ID_ANY, "Capacitor")
labelCapacitor.SetFont(boldFont)
sizerHeaderCapacitor.Add(labelCapacitor, 0, wx.ALIGN_CENTER)
sizerHeaderCapacitor.Add(wx.StaticLine(self, wx.ID_ANY), 1, wx.ALIGN_CENTER)
sizerHeaderCapacitor.Add(wx.StaticLine(pane, wx.ID_ANY), 1, wx.ALIGN_CENTER)
sizerCapacitor = wx.GridSizer(1, 2)
self.sizerBase.Add(sizerCapacitor, 0, wx.EXPAND | wx.LEFT, 3)
@@ -283,7 +303,7 @@ class StatsPane(wx.Panel):
baseBox = wx.BoxSizer(wx.HORIZONTAL)
sizerCapacitor.Add(baseBox, 1, wx.ALIGN_CENTER)
baseBox.Add(bitmapLoader.getStaticBitmap("capacitorInfo_big", self, "icons"), 0, wx.ALIGN_CENTER)
baseBox.Add(bitmapLoader.getStaticBitmap("capacitorInfo_big", pane, "icons"), 0, wx.ALIGN_CENTER)
box = wx.BoxSizer(wx.VERTICAL)
baseBox.Add(box, 0, wx.ALIGN_CENTER)
@@ -291,23 +311,23 @@ class StatsPane(wx.Panel):
hbox = wx.BoxSizer(wx.HORIZONTAL)
box.Add(hbox, 1, wx.ALIGN_CENTER)
hbox.Add(wx.StaticText(self, wx.ID_ANY, "Capacity: "), 0, wx.ALIGN_CENTER)
self.labelCapacitorCapacity = wx.StaticText(self, wx.ID_ANY, "0.0")
hbox.Add(wx.StaticText(pane, wx.ID_ANY, "Capacity: "), 0, wx.ALIGN_CENTER)
self.labelCapacitorCapacity = wx.StaticText(pane, wx.ID_ANY, "0.0")
hbox.Add(self.labelCapacitorCapacity, 0, wx.ALIGN_CENTER)
hbox.Add(wx.StaticText(self, wx.ID_ANY, " GJ"), 0, wx.ALIGN_CENTER)
hbox.Add(wx.StaticText(pane, wx.ID_ANY, " GJ"), 0, wx.ALIGN_CENTER)
hbox = wx.BoxSizer(wx.HORIZONTAL)
box.Add(hbox, 1, wx.ALIGN_LEFT)
hbox.Add(wx.StaticText(self, wx.ID_ANY, "Lasts "), 0, wx.ALIGN_LEFT)
self.labelCapacitorTime = wx.StaticText(self, wx.ID_ANY, "0s")
hbox.Add(wx.StaticText(pane, wx.ID_ANY, "Lasts "), 0, wx.ALIGN_LEFT)
self.labelCapacitorTime = wx.StaticText(pane, wx.ID_ANY, "0s")
hbox.Add(self.labelCapacitorTime, 0, wx.ALIGN_LEFT)
# Capacitor balance
baseBox = wx.BoxSizer(wx.HORIZONTAL)
sizerCapacitor.Add(baseBox, 1, wx.ALIGN_CENTER)
baseBox.Add(bitmapLoader.getStaticBitmap("capacitorRecharge_big", self, "icons"), 0, wx.ALIGN_CENTER)
baseBox.Add(bitmapLoader.getStaticBitmap("capacitorRecharge_big", pane, "icons"), 0, wx.ALIGN_CENTER)
box = wx.BoxSizer(wx.VERTICAL)
baseBox.Add(box, 0, wx.ALIGN_CENTER)
@@ -316,16 +336,16 @@ class StatsPane(wx.Panel):
chargeSizer = wx.FlexGridSizer(2, 3)
box.Add(chargeSizer)
chargeSizer.Add(wx.StaticText(self, wx.ID_ANY, "+ "), 0, wx.ALIGN_CENTER)
self.labelCapacitorRecharge = wx.StaticText(self, wx.ID_ANY, "0.0")
chargeSizer.Add(wx.StaticText(pane, wx.ID_ANY, "+ "), 0, wx.ALIGN_CENTER)
self.labelCapacitorRecharge = wx.StaticText(pane, wx.ID_ANY, "0.0")
chargeSizer.Add(self.labelCapacitorRecharge, 0, wx.ALIGN_CENTER)
chargeSizer.Add(wx.StaticText(self, wx.ID_ANY, " GJ/s"), 0, wx.ALIGN_CENTER)
chargeSizer.Add(wx.StaticText(pane, wx.ID_ANY, " GJ/s"), 0, wx.ALIGN_CENTER)
# Discharge
chargeSizer.Add(wx.StaticText(self, wx.ID_ANY, "- "), 0, wx.ALIGN_CENTER)
self.labelCapacitorDischarge = wx.StaticText(self, wx.ID_ANY, "0.0")
chargeSizer.Add(wx.StaticText(pane, wx.ID_ANY, "- "), 0, wx.ALIGN_CENTER)
self.labelCapacitorDischarge = wx.StaticText(pane, wx.ID_ANY, "0.0")
chargeSizer.Add(self.labelCapacitorDischarge, 0, wx.ALIGN_CENTER)
chargeSizer.Add(wx.StaticText(self, wx.ID_ANY, " GJ/s"), 0, wx.ALIGN_CENTER)
chargeSizer.Add(wx.StaticText(pane, wx.ID_ANY, " GJ/s"), 0, wx.ALIGN_CENTER)
# Targeting & Misc
grid = wx.GridSizer(1, 2)
@@ -335,21 +355,21 @@ class StatsPane(wx.Panel):
sizerHeaderTargeting = wx.BoxSizer(wx.HORIZONTAL)
grid.Add(sizerHeaderTargeting, 0, wx.EXPAND)
labelTargeting = wx.StaticText(self, wx.ID_ANY, "Targeting")
labelTargeting = wx.StaticText(pane, wx.ID_ANY, "Targeting")
labelTargeting.SetFont(boldFont)
sizerHeaderTargeting.Add(labelTargeting, 0, wx.ALIGN_CENTER)
sizerHeaderTargeting.Add(wx.StaticLine(self, wx.ID_ANY), 1, wx.ALIGN_CENTER)
sizerHeaderTargeting.Add(wx.StaticLine(pane, wx.ID_ANY), 1, wx.ALIGN_CENTER)
# Misc header
sizerHeaderMisc = wx.BoxSizer(wx.HORIZONTAL)
grid.Add(sizerHeaderMisc, 0, wx.EXPAND)
labelMisc = wx.StaticText(self, wx.ID_ANY, "Misc")
labelMisc = wx.StaticText(pane, wx.ID_ANY, "Misc")
labelMisc.SetFont(boldFont)
sizerHeaderMisc.Add(labelMisc, 0, wx.ALIGN_CENTER)
sizerHeaderMisc.Add(wx.StaticLine(self, wx.ID_ANY), 1, wx.ALIGN_CENTER)
sizerHeaderMisc.Add(wx.StaticLine(pane, wx.ID_ANY), 1, wx.ALIGN_CENTER)
gridTargetingMisc = wx.GridSizer(1, 2)
self.sizerBase.Add(gridTargetingMisc, 0, wx.EXPAND | wx.LEFT, 3)
@@ -366,16 +386,16 @@ class StatsPane(wx.Panel):
("Sensor str.", "SensorStr", ""))
for header, labelShort, unit in labels:
gridTargeting.Add(wx.StaticText(self, wx.ID_ANY, "%s: " % header), 0, wx.ALIGN_LEFT)
gridTargeting.Add(wx.StaticText(pane, wx.ID_ANY, "%s: " % header), 0, wx.ALIGN_LEFT)
box = wx.BoxSizer(wx.HORIZONTAL)
gridTargeting.Add(box, 0, wx.ALIGN_LEFT)
lbl = wx.StaticText(self, wx.ID_ANY, "0")
lbl = wx.StaticText(pane, wx.ID_ANY, "0")
setattr(self, "label%s" % labelShort, lbl)
box.Add(lbl, 0, wx.ALIGN_LEFT)
lblUnit = wx.StaticText(self, wx.ID_ANY, " %s" % unit)
lblUnit = wx.StaticText(pane, wx.ID_ANY, " %s" % unit)
setattr(self, "labelUnit%s" % labelShort, lblUnit)
box.Add(lblUnit, 0, wx.ALIGN_LEFT)
@@ -391,16 +411,16 @@ class StatsPane(wx.Panel):
("Signature", "SigRadius", "m"))
for header, labelShort, unit in labels:
gridMisc.Add(wx.StaticText(self, wx.ID_ANY, "%s: " % header), 0, wx.ALIGN_LEFT)
gridMisc.Add(wx.StaticText(pane, wx.ID_ANY, "%s: " % header), 0, wx.ALIGN_LEFT)
box = wx.BoxSizer(wx.HORIZONTAL)
gridMisc.Add(box, 0, wx.ALIGN_LEFT)
lbl = wx.StaticText(self, wx.ID_ANY, "0")
lbl = wx.StaticText(pane, wx.ID_ANY, "0")
setattr(self, "label%s" % labelShort, lbl)
box.Add(lbl, 0, wx.ALIGN_LEFT)
lblUnit = wx.StaticText(self, wx.ID_ANY, " %s" % unit)
lblUnit = wx.StaticText(pane, wx.ID_ANY, " %s" % unit)
setattr(self, "labelUnit%s" % labelShort, lblUnit)
box.Add(lblUnit, 0, wx.ALIGN_LEFT)
@@ -408,11 +428,11 @@ class StatsPane(wx.Panel):
sizerHeaderPrice = wx.BoxSizer(wx.HORIZONTAL)
self.sizerBase.Add(sizerHeaderPrice, 0, wx.EXPAND | wx.LEFT, 3)
labelPrice = wx.StaticText(self, wx.ID_ANY, "Price")
labelPrice = wx.StaticText(pane, wx.ID_ANY, "Price")
labelPrice.SetFont(boldFont)
sizerHeaderPrice.Add(labelPrice, 0, wx.ALIGN_CENTER)
sizerHeaderPrice.Add(wx.StaticLine(self, wx.ID_ANY), 1, wx.ALIGN_CENTER)
sizerHeaderPrice.Add(wx.StaticLine(pane, wx.ID_ANY), 1, wx.ALIGN_CENTER)
# Grid for the price stuff.
gridPrice = wx.GridSizer(1, 3)
@@ -423,18 +443,18 @@ class StatsPane(wx.Panel):
box = wx.BoxSizer(wx.HORIZONTAL)
gridPrice.Add(box)
box.Add(bitmapLoader.getStaticBitmap(image, self, "icons"), 0, wx.ALIGN_CENTER)
box.Add(bitmapLoader.getStaticBitmap(image, pane, "icons"), 0, wx.ALIGN_CENTER)
vbox = wx.BoxSizer(wx.VERTICAL)
box.Add(vbox, 1, wx.EXPAND)
vbox.Add(wx.StaticText(self, wx.ID_ANY, type.capitalize()), 0, wx.ALIGN_LEFT)
vbox.Add(wx.StaticText(pane, wx.ID_ANY, type.capitalize()), 0, wx.ALIGN_LEFT)
hbox = wx.BoxSizer(wx.HORIZONTAL)
vbox.Add(hbox)
lbl = wx.StaticText(self, wx.ID_ANY, "0.00")
lbl = wx.StaticText(pane, wx.ID_ANY, "0.00")
setattr(self, "labelPrice%s" % type, lbl)
hbox.Add(lbl, 0, wx.ALIGN_LEFT)
hbox.Add(wx.StaticText(self, wx.ID_ANY, " m ISK"), 0, wx.ALIGN_LEFT)
hbox.Add(wx.StaticText(pane, wx.ID_ANY, " m ISK"), 0, wx.ALIGN_LEFT)