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

More deprecated fixes, and re-enable a working stats view

Browse Source
This commit is contained in:
Ryan Holmes
2017-06-14 03:51:19 -04:00
parent ba64f75f88
commit 3b546de070
22 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/builtinStatsViews/capacitorViewFull.py
View File

@@ -45,7 +45,7 @@ class CapacitorViewFull(StatsView):
panel = "full"
sizerCapacitor = wx.GridSizer(1, 2)
sizerCapacitor = wx.GridSizer(1, 2, 0, 0)
contentSizer.Add(sizerCapacitor, 0, wx.EXPAND, 0)
# Capacitor capacity and time
baseBox = wx.BoxSizer(wx.HORIZONTAL)
@@ -91,7 +91,7 @@ class CapacitorViewFull(StatsView):
baseBox.Add(bitmap, 0, wx.ALIGN_CENTER)
# Recharge
chargeSizer = wx.FlexGridSizer(2, 3)
chargeSizer = wx.FlexGridSizer(2, 3, 0, 0)
baseBox.Add(chargeSizer, 0, wx.ALIGN_CENTER)
chargeSizer.Add(wx.StaticText(parent, wx.ID_ANY, "+ "), 0, wx.ALIGN_CENTER)

2
gui/builtinStatsViews/firepowerViewFull.py
View File

@@ -53,7 +53,7 @@ class FirepowerViewFull(StatsView):
panel = "full"
sizerFirepower = wx.FlexGridSizer(1, 4)
sizerFirepower = wx.FlexGridSizer(1, 4, 0, 0)
sizerFirepower.AddGrowableCol(1)
contentSizer.Add(sizerFirepower, 0, wx.EXPAND, 0)

2
gui/builtinStatsViews/miningyieldViewFull.py
View File

@@ -48,7 +48,7 @@ class MiningYieldViewFull(StatsView):
panel = "full"
sizerMiningYield = wx.FlexGridSizer(1, 4)
sizerMiningYield = wx.FlexGridSizer(1, 4, 0, 0)
sizerMiningYield.AddGrowableCol(1)
contentSizer.Add(sizerMiningYield, 0, wx.EXPAND, 0)

2
gui/builtinStatsViews/outgoingViewFull.py
View File

@@ -44,7 +44,7 @@ class OutgoingViewFull(StatsView):
parent = self.panel = contentPanel
self.headerPanel = headerPanel
sizerOutgoing = wx.GridSizer(1, 4)
sizerOutgoing = wx.GridSizer(1, 4, 0, 0)
contentSizer.Add(sizerOutgoing, 0, wx.EXPAND, 0)

2
gui/builtinStatsViews/outgoingViewMinimal.py
View File

@@ -43,7 +43,7 @@ class OutgoingViewMinimal(StatsView):
parent = self.panel = contentPanel
self.headerPanel = headerPanel
sizerOutgoing = wx.GridSizer(1, 4)
sizerOutgoing = wx.GridSizer(1, 4, 0, 0)
contentSizer.Add(sizerOutgoing, 0, wx.EXPAND, 0)

2
gui/builtinStatsViews/priceViewFull.py
View File

@@ -47,7 +47,7 @@ class PriceViewFull(StatsView):
headerContentSizer.Add(self.labelEMStatus)
headerPanel.GetParent().AddToggleItem(self.labelEMStatus)
gridPrice = wx.GridSizer(2, 3)
gridPrice = wx.GridSizer(2, 3, 0, 0)
contentSizer.Add(gridPrice, 0, wx.EXPAND | wx.ALL, 0)
for _type in ("ship", "fittings", "drones", "cargoBay", "character", "total"):
if _type in "ship":

2
gui/builtinStatsViews/priceViewMinimal.py
View File

@@ -47,7 +47,7 @@ class PriceViewMinimal(StatsView):
headerContentSizer.Add(self.labelEMStatus)
headerPanel.GetParent().AddToggleItem(self.labelEMStatus)
gridPrice = wx.GridSizer(1, 3)
gridPrice = wx.GridSizer(1, 3, 0, 0)
contentSizer.Add(gridPrice, 0, wx.EXPAND | wx.ALL, 0)
for _type in ("ship", "fittings", "total"):
image = "%sPrice_big" % _type if _type != "ship" else "ship_big"

2
gui/builtinStatsViews/rechargeViewFull.py
View File

@@ -55,7 +55,7 @@ class RechargeViewFull(StatsView):
self.panel = contentPanel
self.headerPanel = headerPanel
sizerTankStats = wx.FlexGridSizer(3, 5)
sizerTankStats = wx.FlexGridSizer(3, 5, 0, 0)
for i in range(4):
sizerTankStats.AddGrowableCol(i + 1)

5
gui/builtinStatsViews/resistancesViewFull.py
View File

@@ -25,6 +25,7 @@ from gui.pyfa_gauge import PyGauge
from gui.utils.numberFormatter import formatAmount
import gui.mainFrame
import gui.globalEvents as GE
from gui.utils import fonts
EffectiveHpToggled, EFFECTIVE_HP_TOGGLED = wx.lib.newevent.NewEvent()
@@ -122,6 +123,8 @@ class ResistancesViewFull(StatsView):
continue
currGColour = 0
font = wx.Font(fonts.NORMAL, wx.SWISS, wx.NORMAL, wx.NORMAL, False)
for damageType in ("em", "thermal", "kinetic", "explosive"):
box = wx.BoxSizer(wx.HORIZONTAL)
sizerResistances.Add(box, wx.GBPosition(row, col), wx.GBSpan(1, 1), wx.ALIGN_CENTER)
@@ -133,7 +136,7 @@ class ResistancesViewFull(StatsView):
bc = pgColour[1]
currGColour += 1
lbl = PyGauge(contentPanel, wx.ID_ANY, 100)
lbl = PyGauge(contentPanel, font, (100, 25))
lbl.SetMinSize((48, 16))
lbl.SetBackgroundColour(wx.Colour(bc[0], bc[1], bc[2]))
lbl.SetBarColour(wx.Colour(fc[0], fc[1], fc[2]))

5
gui/builtinStatsViews/resourcesViewFull.py
View File

@@ -24,6 +24,7 @@ from gui.bitmap_loader import BitmapLoader
from gui.pyfa_gauge import PyGauge
import gui.mainFrame
from gui.chrome_tabs import EVT_NOTEBOOK_PAGE_CHANGED
from gui.utils import fonts
from eos.saveddata.module import Hardpoint
@@ -135,6 +136,8 @@ class ResourcesViewFull(StatsView):
if type_ != "drones":
sizer.AddSpacer(0)
gauge_font = wx.Font(fonts.NORMAL, wx.SWISS, wx.NORMAL, wx.NORMAL, False)
# PG, Cpu & drone stuff
tooltipText = {"cpu": "CPU", "pg": "PowerGrid", "droneBay": "Drone bay", "fighterBay": "Fighter bay",
"droneBandwidth": "Drone bandwidth", "cargoBay": "Cargo bay"}
@@ -176,7 +179,7 @@ class ResourcesViewFull(StatsView):
# Gauges modif. - Darriele
gauge = PyGauge(parent, wx.ID_ANY, 1)
gauge = PyGauge(parent, gauge_font)
gauge.SetValueRange(0, 0)
gauge.SetMinSize((self.getTextExtentW("1.999M/1.99M MW"), 23))
gauge.SetFractionDigits(2)

6
gui/builtinStatsViews/targetingMiscViewFull.py
View File

@@ -48,13 +48,13 @@ class TargetingMiscViewFull(StatsView):
self.panel = contentPanel
self.headerPanel = headerPanel
gridTargetingMisc = wx.FlexGridSizer(1, 3)
gridTargetingMisc = wx.FlexGridSizer(1, 3, 0, 0)
contentSizer.Add(gridTargetingMisc, 0, wx.EXPAND | wx.ALL, 0)
gridTargetingMisc.AddGrowableCol(0)
gridTargetingMisc.AddGrowableCol(2)
# Targeting
gridTargeting = wx.FlexGridSizer(5, 2)
gridTargeting = wx.FlexGridSizer(5, 2, 0, 0)
gridTargeting.AddGrowableCol(1)
gridTargetingMisc.Add(gridTargeting, 0, wx.ALIGN_LEFT | wx.ALL, 5)
@@ -79,7 +79,7 @@ class TargetingMiscViewFull(StatsView):
# Misc
gridTargetingMisc.Add(wx.StaticLine(contentPanel, wx.ID_ANY, style=wx.VERTICAL), 0, wx.EXPAND, 3)
gridMisc = wx.FlexGridSizer(5, 2)
gridMisc = wx.FlexGridSizer(5, 2, 0, 0)
gridMisc.AddGrowableCol(1)
gridTargetingMisc.Add(gridMisc, 0, wx.ALIGN_LEFT | wx.ALL, 5)

6
gui/builtinStatsViews/targetingMiscViewMinimal.py
View File

@@ -48,13 +48,13 @@ class TargetingMiscViewMinimal(StatsView):
self.panel = contentPanel
self.headerPanel = headerPanel
gridTargetingMisc = wx.FlexGridSizer(1, 3)
gridTargetingMisc = wx.FlexGridSizer(1, 3, 0, 0)
contentSizer.Add(gridTargetingMisc, 0, wx.EXPAND | wx.ALL, 0)
gridTargetingMisc.AddGrowableCol(0)
gridTargetingMisc.AddGrowableCol(2)
# Targeting
gridTargeting = wx.FlexGridSizer(5, 2)
gridTargeting = wx.FlexGridSizer(5, 2, 0, 0)
gridTargeting.AddGrowableCol(1)
gridTargetingMisc.Add(gridTargeting, 0, wx.ALIGN_LEFT | wx.ALL, 5)
@@ -79,7 +79,7 @@ class TargetingMiscViewMinimal(StatsView):
# Misc
gridTargetingMisc.Add(wx.StaticLine(contentPanel, wx.ID_ANY, style=wx.VERTICAL), 0, wx.EXPAND, 3)
gridMisc = wx.FlexGridSizer(5, 2)
gridMisc = wx.FlexGridSizer(5, 2, 0, 0)
gridMisc.AddGrowableCol(1)
gridTargetingMisc.Add(gridMisc, 0, wx.ALIGN_LEFT | wx.ALL, 5)