From f70df39696f9627b4e4cf3d5f1b9c85101b9283c Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Wed, 27 Oct 2010 14:39:51 +0300 Subject: [PATCH 1/2] Properly aligned searchctrls in shipbrowser/marketbrowser --- gui/marketBrowser.py | 2 +- gui/shipBrowser.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py index 9138bcab1..922d7a673 100644 --- a/gui/marketBrowser.py +++ b/gui/marketBrowser.py @@ -42,7 +42,7 @@ class MarketBrowser(wx.Panel): vbox.Add(p, 0, wx.EXPAND) self.search = SearchBox(p) - sizer.Add(self.search, 1, wx.EXPAND | wx.TOP, 2) + sizer.Add(self.search, 1, wx.ALIGN_CENTER_VERTICAL | wx.TOP, 2) p.SetMinSize((wx.SIZE_AUTO_WIDTH, 27)) self.splitter = wx.SplitterWindow(self, style = wx.SP_LIVE_UPDATE) diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index a18bf942d..27f953983 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -424,7 +424,7 @@ class ShipMenu(wx.Panel): self.search = wx.SearchCtrl(p, wx.ID_ANY, style=wx.TE_PROCESS_ENTER) self.search.ShowCancelButton(True) - psizer.Add(self.search, 1, wx.EXPAND | wx.ALIGN_CENTER_VERTICAL) + psizer.Add(self.search, 1, wx.ALIGN_CENTER_VERTICAL) # p.SetMinSize((wx.SIZE_AUTO_WIDTH, 27)) - sizer.Add(p, 1, wx.EXPAND) + sizer.Add(p, 1, wx.ALIGN_CENTER_VERTICAL) From 1dcc136d18034e08d41de0d8236c8461ca067d6c Mon Sep 17 00:00:00 2001 From: Corollax Date: Wed, 27 Oct 2010 09:22:08 -0500 Subject: [PATCH 2/2] Fixed maxActiveDrones function call Now pulling from the extraAttributes field. --- gui/builtinStatsViews/resourcesViewFull.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/builtinStatsViews/resourcesViewFull.py b/gui/builtinStatsViews/resourcesViewFull.py index f602392c3..ed8156a9d 100644 --- a/gui/builtinStatsViews/resourcesViewFull.py +++ b/gui/builtinStatsViews/resourcesViewFull.py @@ -138,7 +138,7 @@ class ResourcesViewFull(StatsView): stats = (("label%sUsedTurretHardpoints", lambda: fit.getHardpointsUsed(Hardpoint.TURRET), 0, 0, 0), ("label%sTotalTurretHardpoints", lambda: fit.ship.getModifiedItemAttr('turretSlotsLeft'), 0, 0, 0), ("label%sUsedDronesActive", lambda: fit.activeDrones, 0, 0, 0), - ("label%sTotalDronesActive", lambda: fit.maxActiveDrones, 0, 0, 0), + ("label%sTotalDronesActive", lambda: fit.extraAttributes["maxActiveDrones"], 0, 0, 0), ("label%sUsedLauncherHardpoints", lambda: fit.getHardpointsUsed(Hardpoint.MISSILE), 0, 0, 0), ("label%sTotalLauncherHardpoints", lambda: fit.ship.getModifiedItemAttr('launcherSlotsLeft'), 0, 0, 0), ("label%sUsedCalibrationPoints", lambda: fit.calibrationUsed, 0, 0, 0),