From 2bbcd96ce35466846ac98a26ff4ce0e134852b65 Mon Sep 17 00:00:00 2001 From: Ryan Holmes Date: Tue, 13 Jun 2017 15:01:30 -0400 Subject: [PATCH] Even more fixes --- gui/builtinAdditionPanes/droneView.py | 2 +- gui/builtinAdditionPanes/fighterView.py | 2 +- gui/builtinViews/entityEditor.py | 2 +- gui/builtinViews/fittingView.py | 7 ++++--- gui/characterSelection.py | 6 +++--- gui/display.py | 2 +- gui/mainFrame.py | 14 +++++++------- gui/patternEditor.py | 2 +- gui/resistsEditor.py | 2 +- gui/setEditor.py | 2 +- gui/shipBrowser.py | 2 +- 11 files changed, 22 insertions(+), 21 deletions(-) diff --git a/gui/builtinAdditionPanes/droneView.py b/gui/builtinAdditionPanes/droneView.py index b03426e31..2fd15a1e7 100644 --- a/gui/builtinAdditionPanes/droneView.py +++ b/gui/builtinAdditionPanes/droneView.py @@ -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: diff --git a/gui/builtinAdditionPanes/fighterView.py b/gui/builtinAdditionPanes/fighterView.py index df3c5715b..4291e421d 100644 --- a/gui/builtinAdditionPanes/fighterView.py +++ b/gui/builtinAdditionPanes/fighterView.py @@ -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: diff --git a/gui/builtinViews/entityEditor.py b/gui/builtinViews/entityEditor.py index 13ebb8162..544e7a178 100644 --- a/gui/builtinViews/entityEditor.py +++ b/gui/builtinViews/entityEditor.py @@ -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) diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index 01e4230b1..cca20a40b 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -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: diff --git a/gui/characterSelection.py b/gui/characterSelection.py index c28f8b798..e0ddf7964 100644 --- a/gui/characterSelection.py +++ b/gui/characterSelection.py @@ -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() diff --git a/gui/display.py b/gui/display.py index 0006ebc84..173b5fa40 100644 --- a/gui/display.py +++ b/gui/display.py @@ -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) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index d264a33d8..fd49c9b00 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -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) diff --git a/gui/patternEditor.py b/gui/patternEditor.py index 736815fb2..ae27bf924 100644 --- a/gui/patternEditor.py +++ b/gui/patternEditor.py @@ -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()))) diff --git a/gui/resistsEditor.py b/gui/resistsEditor.py index 34737b1af..0e88a10a4 100644 --- a/gui/resistsEditor.py +++ b/gui/resistsEditor.py @@ -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()))) diff --git a/gui/setEditor.py b/gui/setEditor.py index 1a9295dea..e8a17c9a3 100644 --- a/gui/setEditor.py +++ b/gui/setEditor.py @@ -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) diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 5f21f489a..5645989f1 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -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)