From 3b546de0705421877b42f901beb815ae079d5813 Mon Sep 17 00:00:00 2001 From: Ryan Holmes Date: Wed, 14 Jun 2017 03:51:19 -0400 Subject: [PATCH] More deprecated fixes, and re-enable a working stats view --- gui/builtinAdditionPanes/cargoView.py | 4 ++-- gui/builtinContextMenus/itemStats.py | 2 +- gui/builtinShipBrowser/categoryItem.py | 2 +- gui/builtinShipBrowser/fitItem.py | 2 +- gui/builtinShipBrowser/pfBitmapFrame.py | 2 +- gui/builtinStatsViews/capacitorViewFull.py | 4 ++-- gui/builtinStatsViews/firepowerViewFull.py | 2 +- gui/builtinStatsViews/miningyieldViewFull.py | 2 +- gui/builtinStatsViews/outgoingViewFull.py | 2 +- gui/builtinStatsViews/outgoingViewMinimal.py | 2 +- gui/builtinStatsViews/priceViewFull.py | 2 +- gui/builtinStatsViews/priceViewMinimal.py | 2 +- gui/builtinStatsViews/rechargeViewFull.py | 2 +- gui/builtinStatsViews/resistancesViewFull.py | 5 ++++- gui/builtinStatsViews/resourcesViewFull.py | 5 ++++- gui/builtinStatsViews/targetingMiscViewFull.py | 6 +++--- gui/builtinStatsViews/targetingMiscViewMinimal.py | 6 +++--- gui/builtinViews/fittingView.py | 8 ++++---- gui/graphFrame.py | 2 +- gui/mainFrame.py | 4 ++-- gui/marketBrowser.py | 2 +- gui/pyfa_gauge.py | 3 +-- 22 files changed, 38 insertions(+), 33 deletions(-) diff --git a/gui/builtinAdditionPanes/cargoView.py b/gui/builtinAdditionPanes/cargoView.py index 5ea6c56d6..91b566283 100644 --- a/gui/builtinAdditionPanes/cargoView.py +++ b/gui/builtinAdditionPanes/cargoView.py @@ -119,14 +119,14 @@ class CargoView(d.Display): module = fit.modules[modIdx] if dstRow != -1: # we're swapping with cargo - if mstate.CmdDown(): # if copying, append to cargo + if mstate.cmdDown: # if copying, append to cargo sFit.addCargo(self.mainFrame.getActiveFit(), module.item.ID) else: # else, move / swap sFit.moveCargoToModule(self.mainFrame.getActiveFit(), module.position, dstRow) else: # dragging to blank spot, append sFit.addCargo(self.mainFrame.getActiveFit(), module.item.ID) - if not mstate.CmdDown(): # if not copying, remove module + if not mstate.cmdDown: # if not copying, remove module sFit.removeModule(self.mainFrame.getActiveFit(), module.position) wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit(), action="moddel", typeID=module.item.ID)) diff --git a/gui/builtinContextMenus/itemStats.py b/gui/builtinContextMenus/itemStats.py index 4e1b8187e..6221fa1e0 100644 --- a/gui/builtinContextMenus/itemStats.py +++ b/gui/builtinContextMenus/itemStats.py @@ -47,7 +47,7 @@ class ItemStats(ContextMenu): mstate = wx.GetMouseState() reuse = False - if mstate.CmdDown(): + if mstate.cmdDown: reuse = True if self.mainFrame.GetActiveStatsWindow() is None and reuse: diff --git a/gui/builtinShipBrowser/categoryItem.py b/gui/builtinShipBrowser/categoryItem.py index 66f30016d..28ffec3bd 100644 --- a/gui/builtinShipBrowser/categoryItem.py +++ b/gui/builtinShipBrowser/categoryItem.py @@ -20,7 +20,7 @@ class CategoryItem(SFBrowserItem): if categoryID: self.shipBmp = BitmapLoader.getBitmap("ship_small", "gui") else: - self.shipBmp = wx.EmptyBitmap(16, 16) + self.shipBmp = wx.Bitmap(16, 16) self.dropShadowBitmap = drawUtils.CreateDropShadowBitmap(self.shipBmp, 0.2) diff --git a/gui/builtinShipBrowser/fitItem.py b/gui/builtinShipBrowser/fitItem.py index 053d8b595..cd702d980 100644 --- a/gui/builtinShipBrowser/fitItem.py +++ b/gui/builtinShipBrowser/fitItem.py @@ -520,7 +520,7 @@ class FitItem(SFItem.SFBrowserItem): self.AdjustControlSizePos(self.tcFitName, self.textStartx, self.toolbarx - self.editWidth - self.padding) tdc = wx.MemoryDC() - self.dragTLFBmp = wx.EmptyBitmap((self.toolbarx if self.toolbarx < 200 else 200), rect.height, 24) + self.dragTLFBmp = wx.Bitmap((self.toolbarx if self.toolbarx < 200 else 200), rect.height, 24) tdc.SelectObject(self.dragTLFBmp) tdc.Blit(0, 0, (self.toolbarx if self.toolbarx < 200 else 200), rect.height, mdc, 0, 0, wx.COPY) tdc.SelectObject(wx.NullBitmap) diff --git a/gui/builtinShipBrowser/pfBitmapFrame.py b/gui/builtinShipBrowser/pfBitmapFrame.py index 2bfd3e28c..618401a4f 100644 --- a/gui/builtinShipBrowser/pfBitmapFrame.py +++ b/gui/builtinShipBrowser/pfBitmapFrame.py @@ -46,7 +46,7 @@ class PFBitmapFrame(wx.Frame): def OnWindowPaint(self, event): rect = self.GetRect() - canvas = wx.EmptyBitmap(rect.width, rect.height) + canvas = wx.Bitmap(rect.width, rect.height) mdc = wx.BufferedPaintDC(self) mdc.SelectObject(canvas) mdc.DrawBitmap(self.bitmap, 0, 0) diff --git a/gui/builtinStatsViews/capacitorViewFull.py b/gui/builtinStatsViews/capacitorViewFull.py index 2c478b163..8ff7d6a13 100644 --- a/gui/builtinStatsViews/capacitorViewFull.py +++ b/gui/builtinStatsViews/capacitorViewFull.py @@ -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) diff --git a/gui/builtinStatsViews/firepowerViewFull.py b/gui/builtinStatsViews/firepowerViewFull.py index 33c6092d8..1ab60cce3 100644 --- a/gui/builtinStatsViews/firepowerViewFull.py +++ b/gui/builtinStatsViews/firepowerViewFull.py @@ -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) diff --git a/gui/builtinStatsViews/miningyieldViewFull.py b/gui/builtinStatsViews/miningyieldViewFull.py index f35902653..4a4560cef 100644 --- a/gui/builtinStatsViews/miningyieldViewFull.py +++ b/gui/builtinStatsViews/miningyieldViewFull.py @@ -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) diff --git a/gui/builtinStatsViews/outgoingViewFull.py b/gui/builtinStatsViews/outgoingViewFull.py index a73363172..be24ee6af 100644 --- a/gui/builtinStatsViews/outgoingViewFull.py +++ b/gui/builtinStatsViews/outgoingViewFull.py @@ -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) diff --git a/gui/builtinStatsViews/outgoingViewMinimal.py b/gui/builtinStatsViews/outgoingViewMinimal.py index bb75f689d..21fe9bede 100644 --- a/gui/builtinStatsViews/outgoingViewMinimal.py +++ b/gui/builtinStatsViews/outgoingViewMinimal.py @@ -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) diff --git a/gui/builtinStatsViews/priceViewFull.py b/gui/builtinStatsViews/priceViewFull.py index b8fc25803..d5f8d84ca 100644 --- a/gui/builtinStatsViews/priceViewFull.py +++ b/gui/builtinStatsViews/priceViewFull.py @@ -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": diff --git a/gui/builtinStatsViews/priceViewMinimal.py b/gui/builtinStatsViews/priceViewMinimal.py index 04746b1a5..85f7eb18b 100644 --- a/gui/builtinStatsViews/priceViewMinimal.py +++ b/gui/builtinStatsViews/priceViewMinimal.py @@ -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" diff --git a/gui/builtinStatsViews/rechargeViewFull.py b/gui/builtinStatsViews/rechargeViewFull.py index 767172560..eadcf537f 100644 --- a/gui/builtinStatsViews/rechargeViewFull.py +++ b/gui/builtinStatsViews/rechargeViewFull.py @@ -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) diff --git a/gui/builtinStatsViews/resistancesViewFull.py b/gui/builtinStatsViews/resistancesViewFull.py index 7a6cc6ba9..3168df3b8 100644 --- a/gui/builtinStatsViews/resistancesViewFull.py +++ b/gui/builtinStatsViews/resistancesViewFull.py @@ -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])) diff --git a/gui/builtinStatsViews/resourcesViewFull.py b/gui/builtinStatsViews/resourcesViewFull.py index 959127944..0f89fd925 100644 --- a/gui/builtinStatsViews/resourcesViewFull.py +++ b/gui/builtinStatsViews/resourcesViewFull.py @@ -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) diff --git a/gui/builtinStatsViews/targetingMiscViewFull.py b/gui/builtinStatsViews/targetingMiscViewFull.py index 4e7630fc9..23c5efd0e 100644 --- a/gui/builtinStatsViews/targetingMiscViewFull.py +++ b/gui/builtinStatsViews/targetingMiscViewFull.py @@ -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) diff --git a/gui/builtinStatsViews/targetingMiscViewMinimal.py b/gui/builtinStatsViews/targetingMiscViewMinimal.py index 78664a2e2..fbc819d68 100644 --- a/gui/builtinStatsViews/targetingMiscViewMinimal.py +++ b/gui/builtinStatsViews/targetingMiscViewMinimal.py @@ -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) diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index b2cb2fe8a..7fa7adabc 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -605,7 +605,7 @@ class FittingView(d.Display): sFit = Fit.getInstance() fitID = self.mainFrame.getActiveFit() - ctrl = wx.GetMouseState().CmdDown() or wx.GetMouseState().MiddleDown() + ctrl = event.cmdDown or event.middleIsDown click = "ctrl" if ctrl is True else "right" if event.GetButton() == 3 else "left" sFit.toggleModulesState(fitID, self.mods[self.GetItemData(row)], mods, click) @@ -698,7 +698,7 @@ class FittingView(d.Display): if self.FVsnapshot: del self.FVsnapshot - tbmp = wx.EmptyBitmap(16, 16) + tbmp = wx.Bitmap(16, 16) tdc = wx.MemoryDC() tdc.SelectObject(tbmp) font = wx.SystemSettings_GetFont(wx.SYS_DEFAULT_GUI_FONT) @@ -774,7 +774,7 @@ class FittingView(d.Display): opts.m_labelText = name if imgId != -1: - opts.m_labelBitmap = wx.EmptyBitmap(isize, isize) + opts.m_labelBitmap = wx.Bitmap(isize, isize) width = render.DrawHeaderButton(self, tdc, (0, 0, 16, 16), sortArrow=wx.HDR_SORT_ICON_NONE, params=opts) @@ -790,7 +790,7 @@ class FittingView(d.Display): maxWidth += columnsWidths[i] mdc = wx.MemoryDC() - mbmp = wx.EmptyBitmap(maxWidth, maxRowHeight * rows + padding * 4 + headerSize) + mbmp = wx.Bitmap(maxWidth, maxRowHeight * rows + padding * 4 + headerSize) mdc.SelectObject(mbmp) diff --git a/gui/graphFrame.py b/gui/graphFrame.py index d8eb5c9ea..83cfd4a6b 100644 --- a/gui/graphFrame.py +++ b/gui/graphFrame.py @@ -143,7 +143,7 @@ class GraphFrame(wx.Frame): dummyBox = wx.BoxSizer(wx.VERTICAL) self.gridPanel.SetSizer(dummyBox) - self.gridSizer = wx.FlexGridSizer(0, 4) + self.gridSizer = wx.FlexGridSizer(0, 4, 0, 0) self.gridSizer.AddGrowableCol(1) dummyBox.Add(self.gridSizer, 0, wx.EXPAND) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index c54bf2969..1d9e3130f 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -200,8 +200,8 @@ class MainFrame(wx.Frame): cstatsSizer.Add(self.charSelection, 0, wx.EXPAND) # @todo pheonix: fix all stats stuff - # self.statsPane = StatsPane(self) - # cstatsSizer.Add(self.statsPane, 0, wx.EXPAND) + self.statsPane = StatsPane(self) + cstatsSizer.Add(self.statsPane, 0, wx.EXPAND) mainSizer.Add(cstatsSizer, 0, wx.EXPAND) diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py index f097f4a09..c31c98df4 100644 --- a/gui/marketBrowser.py +++ b/gui/marketBrowser.py @@ -79,7 +79,7 @@ class MarketBrowser(wx.Panel): def toggleMetaButton(self, event): """Process clicks on toggle buttons""" - appendMeta = wx.GetMouseState().CmdDown() + appendMeta = event.cmdDown clickedBtn = event.EventObject if appendMeta: diff --git a/gui/pyfa_gauge.py b/gui/pyfa_gauge.py index bc05c5ea7..fc9ffd321 100644 --- a/gui/pyfa_gauge.py +++ b/gui/pyfa_gauge.py @@ -79,7 +79,7 @@ class PyGauge(wx.Window): def OnEraseBackground(self, event): pass - + def OnWindowEnter(self, event): self._show_remaining = True self.Refresh() @@ -298,7 +298,6 @@ class PyGauge(wx.Window): dc.DrawBitmap(gradient_bitmap, r.left, r.top) # font stuff begins here - print(self.font) dc.SetFont(self.font) # determine shadow position