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

Even more fixes

Browse Source
This commit is contained in:
Ryan Holmes
2017-06-13 15:01:30 -04:00
parent 1cbd8ee901
commit 2bbcd96ce3
11 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/builtinAdditionPanes/droneView.py
View File

@@ -101,7 +101,7 @@ class DroneView(Display):
if self.DEFAULT_COLS[col] == "Miscellanea":
tooltip = self.activeColumns[col].getToolTip(mod)
if tooltip is not None:
self.SetToolTipString(tooltip)
self.SetToolTip(tooltip)
else:
self.SetToolTip(None)
else:

2
gui/builtinAdditionPanes/fighterView.py
View File

@@ -164,7 +164,7 @@ class FighterDisplay(d.Display):
if self.DEFAULT_COLS[col] == "Miscellanea":
tooltip = self.activeColumns[col].getToolTip(mod)
if tooltip is not None:
self.SetToolTipString(tooltip)
self.SetToolTip(tooltip)
else:
self.SetToolTip(None)
else:

2
gui/builtinViews/entityEditor.py
View File

@@ -60,7 +60,7 @@ class EntityEditor(wx.Panel):
btn.SetMinSize(size)
btn.SetMaxSize(size)
btn.SetToolTipString("{} {}".format(name.capitalize(), self.entityName))
btn.SetToolTip("{} {}".format(name.capitalize(), self.entityName))
btn.Bind(wx.EVT_BUTTON, func)
setattr(self, "btn%s" % name.capitalize(), btn)
self.navSizer.Add(btn, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 2)

7
gui/builtinViews/fittingView.py
View File

@@ -55,7 +55,8 @@ class FitSpawner(gui.multiSwitch.TabSpawner):
def fitSelected(self, event):
count = -1
for index, page in enumerate(self.multiSwitch.pages):
# @todo pheonix: _pages is supposed to be private?
for index, page in enumerate(self.multiSwitch._pages):
if not isinstance(page, gui.builtinViews.emptyView.BlankPage): # Don't try and process it if it's a blank page.
try:
if page.activeFitID == event.fitID:
@@ -184,7 +185,7 @@ class FittingView(d.Display):
mod = self.mods[self.GetItemData(row)]
tooltip = self.activeColumns[col].getToolTip(mod)
if tooltip is not None:
self.SetToolTipString(tooltip)
self.SetToolTip(tooltip)
else:
self.SetToolTip(None)
else:
@@ -610,7 +611,7 @@ class FittingView(d.Display):
# update state tooltip
tooltip = self.activeColumns[col].getToolTip(self.mods[self.GetItemData(row)])
if tooltip:
self.SetToolTipString(tooltip)
self.SetToolTip(tooltip)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit()))
else:

6
gui/characterSelection.py
View File

@@ -58,7 +58,7 @@ class CharacterSelection(wx.Panel):
self.btnRefresh.SetMinSize(size)
self.btnRefresh.SetMaxSize(size)
self.btnRefresh.SetToolTipString("Refresh API")
self.btnRefresh.SetToolTip("Refresh API")
self.btnRefresh.Bind(wx.EVT_BUTTON, self.refreshApi)
self.btnRefresh.Enable(False)
@@ -212,7 +212,7 @@ class CharacterSelection(wx.Panel):
if event.fitID is None:
self.skillReqsStaticBitmap.SetBitmap(self.cleanSkills)
self.skillReqsStaticBitmap.SetToolTipString("No active fit")
self.skillReqsStaticBitmap.SetToolTip("No active fit")
else:
sCharacter = Character.getInstance()
self.reqs = sCharacter.checkRequirements(fit)
@@ -233,7 +233,7 @@ class CharacterSelection(wx.Panel):
else:
tip += self._buildSkillsTooltip(self.reqs)
self.skillReqsStaticBitmap.SetBitmap(self.redSkills)
self.skillReqsStaticBitmap.SetToolTipString(tip.strip())
self.skillReqsStaticBitmap.SetToolTip(tip.strip())
if newCharID is None:
sChar = Character.getInstance()

2
gui/display.py
View File

@@ -134,7 +134,7 @@ class Display(wx.ListCtrl):
items_rect = wx.Rect(topRect.left, 0, bottomRect.right - topRect.left, bottomRect.bottom)
updateRegion = wx.Region(x, y, w, h)
updateRegion.SubtractRect(items_rect)
updateRegion.Subtract(items_rect)
dc.DestroyClippingRegion()
dc.SetClippingRegionAsRegion(updateRegion)

14
gui/mainFrame.py
View File

@@ -198,16 +198,16 @@ class MainFrame(wx.Frame):
self.fitting_additions_split.SetSashPosition(self.fittingHeight)
self.fitting_additions_split.SetSashGravity(1.0)
cstatsSizer = wx.BoxSizer(wx.VERTICAL)
self.charSelection = CharacterSelection(self)
cstatsSizer.Add(self.charSelection, 0, wx.EXPAND)
# @todo pheonix: fix all stats stuff
# cstatsSizer = wx.BoxSizer(wx.VERTICAL)
#
# self.charSelection = CharacterSelection(self)
# cstatsSizer.Add(self.charSelection, 0, wx.EXPAND)
#
# self.statsPane = StatsPane(self)
# cstatsSizer.Add(self.statsPane, 0, wx.EXPAND)
#
# mainSizer.Add(cstatsSizer, 0, wx.EXPAND)
mainSizer.Add(cstatsSizer, 0, wx.EXPAND)
self.SetSizer(mainSizer)

2
gui/patternEditor.py
View File

@@ -179,7 +179,7 @@ class DmgPatternEditorDlg(wx.Dialog):
btn.Layout()
setattr(self, name, btn)
btn.Enable(True)
btn.SetToolTipString("%s patterns %s clipboard" % (name, direction))
btn.SetToolTip("%s patterns %s clipboard" % (name, direction))
footerSizer.Add(btn, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_RIGHT)
btn.Bind(wx.EVT_BUTTON, getattr(self, "{}Patterns".format(name.lower())))

2
gui/resistsEditor.py
View File

@@ -170,7 +170,7 @@ class ResistsEditorDlg(wx.Dialog):
btn.Layout()
setattr(self, name, btn)
btn.Enable(True)
btn.SetToolTipString("%s patterns %s clipboard" % (name, direction))
btn.SetToolTip("%s patterns %s clipboard" % (name, direction))
footerSizer.Add(btn, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_RIGHT)
btn.Bind(wx.EVT_BUTTON, getattr(self, "{}Patterns".format(name.lower())))

2
gui/setEditor.py
View File

@@ -157,7 +157,7 @@ class ImplantSetEditorDlg(wx.Dialog):
btn.Layout()
setattr(self, name, btn)
btn.Enable(True)
btn.SetToolTipString("%s implant sets %s clipboard" % (name, direction))
btn.SetToolTip("%s implant sets %s clipboard" % (name, direction))
footerSizer.Add(btn, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_RIGHT)
mainSizer.Add(footerSizer, 0, wx.ALL | wx.EXPAND, 5)

2
gui/shipBrowser.py
View File

@@ -50,7 +50,7 @@ class ShipBrowser(wx.Panel):
if race:
self.racesFilter[race] = False
self.SetSizeHintsSz(wx.DefaultSize, wx.DefaultSize)
self.SetSizeHints(wx.DefaultSize, wx.DefaultSize)
mainSizer = wx.BoxSizer(wx.VERTICAL)