From 9c2a66763574f203f03c67cfeacd753bc06fdea3 Mon Sep 17 00:00:00 2001 From: Stefan Ott Date: Fri, 2 Jan 2015 16:55:05 +0100 Subject: [PATCH 1/3] Made tab tooltips optional --- gui/builtinPreferenceViews/pyfaGeneralPreferences.py | 9 +++++++++ gui/builtinViews/fittingView.py | 3 ++- gui/chromeTabs.py | 6 ++++++ service/fit.py | 3 ++- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py index 98190fcde..59cb527c2 100644 --- a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py +++ b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py @@ -53,6 +53,10 @@ class PFGeneralPref ( PreferenceView): labelSizer.Add( self.cbRackLabels, 0, wx.ALL|wx.EXPAND, 5 ) mainSizer.Add( labelSizer, 0, wx.LEFT|wx.EXPAND, 30 ) + self.cbShowTooltip = wx.CheckBox( panel, wx.ID_ANY, u"Show tab tooltips", wx.DefaultPosition, wx.DefaultSize, 0 ) + mainSizer.Add( self.cbShowTooltip, 0, wx.ALL|wx.EXPAND, 5 ) + + defCharSizer = wx.BoxSizer( wx.HORIZONTAL ) self.sFit = service.Fit.getInstance() @@ -65,6 +69,7 @@ class PFGeneralPref ( PreferenceView): self.cbRackLabels.SetValue(self.sFit.serviceFittingOptions["rackLabels"] or False) self.cbCompactSkills.SetValue(self.sFit.serviceFittingOptions["compactSkills"] or False) self.cbReopenFits.SetValue(self.openFitsSettings["enabled"]) + self.cbShowTooltip.SetValue(self.sFit.serviceFittingOptions["showTooltip"] or False) self.cbGlobalChar.Bind(wx.EVT_CHECKBOX, self.OnCBGlobalCharStateChange) self.cbGlobalDmgPattern.Bind(wx.EVT_CHECKBOX, self.OnCBGlobalDmgPatternStateChange) @@ -74,6 +79,7 @@ class PFGeneralPref ( PreferenceView): self.cbRackLabels.Bind(wx.EVT_CHECKBOX, self.onCBGlobalRackLabels) self.cbCompactSkills.Bind(wx.EVT_CHECKBOX, self.onCBCompactSkills) self.cbReopenFits.Bind(wx.EVT_CHECKBOX, self.onCBReopenFits) + self.cbShowTooltip.Bind(wx.EVT_CHECKBOX, self.onCBShowTooltip) self.cbRackLabels.Enable(self.sFit.serviceFittingOptions["rackSlots"] or False) @@ -127,6 +133,9 @@ class PFGeneralPref ( PreferenceView): def onCBReopenFits(self, event): self.openFitsSettings["enabled"] = self.cbReopenFits.GetValue() + def onCBShowTooltip(self, event): + self.sFit.serviceFittingOptions["showTooltip"] = self.cbShowTooltip.GetValue() + def getImage(self): return bitmapLoader.getBitmap("prefs_settings", "icons") diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index 4b2547d8a..5dfbde2c8 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -166,7 +166,8 @@ class FittingView(d.Display): if self.DEFAULT_COLS[col] == "Miscellanea": tooltip = self.activeColumns[col].getToolTip(mod) if tooltip is not None: - self.SetToolTipString(tooltip) + #self.SetToolTipString(tooltip) + self.SetToolTip(None) else: self.SetToolTip(None) else: diff --git a/gui/chromeTabs.py b/gui/chromeTabs.py index 7ea61a2e3..3a0c7b11c 100644 --- a/gui/chromeTabs.py +++ b/gui/chromeTabs.py @@ -24,6 +24,8 @@ import gui.utils.drawUtils as drawUtils from gui import bitmapLoader import gui.utils.fonts as fonts +import service + _PageChanging, EVT_NOTEBOOK_PAGE_CHANGING = wx.lib.newevent.NewEvent() _PageChanged, EVT_NOTEBOOK_PAGE_CHANGED = wx.lib.newevent.NewEvent() _PageAdding, EVT_NOTEBOOK_PAGE_ADDING = wx.lib.newevent.NewEvent() @@ -677,6 +679,7 @@ class PFTabsContainer(wx.Panel): self.containerHeight = height self.startDrag = False self.dragging = False + self.sFit = service.Fit.getInstance() self.inclination = 7 if canAdd: @@ -1010,6 +1013,9 @@ class PFTabsContainer(wx.Panel): Checks to see if we have a tab preview and sets up the timer for it to display """ + if not self.sFit.serviceFittingOptions["showTooltip"] or False: + return + if self.previewTimer: if self.previewTimer.IsRunning(): if self.previewWnd: diff --git a/service/fit.py b/service/fit.py index e731c3edf..37b2f8e4e 100644 --- a/service/fit.py +++ b/service/fit.py @@ -96,7 +96,8 @@ class Fit(object): "colorFitBySlot": False, "rackSlots": True, "rackLabels": True, - "compactSkills": True} + "compactSkills": True, + "showTooltip": True} self.serviceFittingOptions = SettingsProvider.getInstance().getSettings( "pyfaServiceFittingOptions", serviceFittingDefaultOptions) From 0ed91e4079880ad3c07cc2222c9f91d8b52dc40c Mon Sep 17 00:00:00 2001 From: Stefan Ott Date: Fri, 2 Jan 2015 17:04:10 +0100 Subject: [PATCH 2/3] Fixed code formatting --- gui/builtinPreferenceViews/pyfaGeneralPreferences.py | 5 ++--- service/fit.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py index 59cb527c2..60468ec9a 100644 --- a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py +++ b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py @@ -56,7 +56,6 @@ class PFGeneralPref ( PreferenceView): self.cbShowTooltip = wx.CheckBox( panel, wx.ID_ANY, u"Show tab tooltips", wx.DefaultPosition, wx.DefaultSize, 0 ) mainSizer.Add( self.cbShowTooltip, 0, wx.ALL|wx.EXPAND, 5 ) - defCharSizer = wx.BoxSizer( wx.HORIZONTAL ) self.sFit = service.Fit.getInstance() @@ -69,7 +68,7 @@ class PFGeneralPref ( PreferenceView): self.cbRackLabels.SetValue(self.sFit.serviceFittingOptions["rackLabels"] or False) self.cbCompactSkills.SetValue(self.sFit.serviceFittingOptions["compactSkills"] or False) self.cbReopenFits.SetValue(self.openFitsSettings["enabled"]) - self.cbShowTooltip.SetValue(self.sFit.serviceFittingOptions["showTooltip"] or False) + self.cbShowTooltip.SetValue(self.sFit.serviceFittingOptions["showTooltip"] or False) self.cbGlobalChar.Bind(wx.EVT_CHECKBOX, self.OnCBGlobalCharStateChange) self.cbGlobalDmgPattern.Bind(wx.EVT_CHECKBOX, self.OnCBGlobalDmgPatternStateChange) @@ -79,7 +78,7 @@ class PFGeneralPref ( PreferenceView): self.cbRackLabels.Bind(wx.EVT_CHECKBOX, self.onCBGlobalRackLabels) self.cbCompactSkills.Bind(wx.EVT_CHECKBOX, self.onCBCompactSkills) self.cbReopenFits.Bind(wx.EVT_CHECKBOX, self.onCBReopenFits) - self.cbShowTooltip.Bind(wx.EVT_CHECKBOX, self.onCBShowTooltip) + self.cbShowTooltip.Bind(wx.EVT_CHECKBOX, self.onCBShowTooltip) self.cbRackLabels.Enable(self.sFit.serviceFittingOptions["rackSlots"] or False) diff --git a/service/fit.py b/service/fit.py index 37b2f8e4e..fa53b2557 100644 --- a/service/fit.py +++ b/service/fit.py @@ -97,7 +97,7 @@ class Fit(object): "rackSlots": True, "rackLabels": True, "compactSkills": True, - "showTooltip": True} + "showTooltip": True} self.serviceFittingOptions = SettingsProvider.getInstance().getSettings( "pyfaServiceFittingOptions", serviceFittingDefaultOptions) From c202aefd2ed808cb7fb4ea62be61af6442e3a2dc Mon Sep 17 00:00:00 2001 From: Stefan Ott Date: Fri, 2 Jan 2015 17:06:26 +0100 Subject: [PATCH 3/3] Reverted accidentally committed change --- gui/builtinViews/fittingView.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index 5dfbde2c8..4b2547d8a 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -166,8 +166,7 @@ class FittingView(d.Display): if self.DEFAULT_COLS[col] == "Miscellanea": tooltip = self.activeColumns[col].getToolTip(mod) if tooltip is not None: - #self.SetToolTipString(tooltip) - self.SetToolTip(None) + self.SetToolTipString(tooltip) else: self.SetToolTip(None) else: