Merge branch 'master' of evefit.org:pyfa
This commit is contained in:
@@ -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),
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user