Made tab tooltips optional
This commit is contained in:
@@ -53,6 +53,10 @@ class PFGeneralPref ( PreferenceView):
|
|||||||
labelSizer.Add( self.cbRackLabels, 0, wx.ALL|wx.EXPAND, 5 )
|
labelSizer.Add( self.cbRackLabels, 0, wx.ALL|wx.EXPAND, 5 )
|
||||||
mainSizer.Add( labelSizer, 0, wx.LEFT|wx.EXPAND, 30 )
|
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 )
|
defCharSizer = wx.BoxSizer( wx.HORIZONTAL )
|
||||||
|
|
||||||
self.sFit = service.Fit.getInstance()
|
self.sFit = service.Fit.getInstance()
|
||||||
@@ -65,6 +69,7 @@ class PFGeneralPref ( PreferenceView):
|
|||||||
self.cbRackLabels.SetValue(self.sFit.serviceFittingOptions["rackLabels"] or False)
|
self.cbRackLabels.SetValue(self.sFit.serviceFittingOptions["rackLabels"] or False)
|
||||||
self.cbCompactSkills.SetValue(self.sFit.serviceFittingOptions["compactSkills"] or False)
|
self.cbCompactSkills.SetValue(self.sFit.serviceFittingOptions["compactSkills"] or False)
|
||||||
self.cbReopenFits.SetValue(self.openFitsSettings["enabled"])
|
self.cbReopenFits.SetValue(self.openFitsSettings["enabled"])
|
||||||
|
self.cbShowTooltip.SetValue(self.sFit.serviceFittingOptions["showTooltip"] or False)
|
||||||
|
|
||||||
self.cbGlobalChar.Bind(wx.EVT_CHECKBOX, self.OnCBGlobalCharStateChange)
|
self.cbGlobalChar.Bind(wx.EVT_CHECKBOX, self.OnCBGlobalCharStateChange)
|
||||||
self.cbGlobalDmgPattern.Bind(wx.EVT_CHECKBOX, self.OnCBGlobalDmgPatternStateChange)
|
self.cbGlobalDmgPattern.Bind(wx.EVT_CHECKBOX, self.OnCBGlobalDmgPatternStateChange)
|
||||||
@@ -74,6 +79,7 @@ class PFGeneralPref ( PreferenceView):
|
|||||||
self.cbRackLabels.Bind(wx.EVT_CHECKBOX, self.onCBGlobalRackLabels)
|
self.cbRackLabels.Bind(wx.EVT_CHECKBOX, self.onCBGlobalRackLabels)
|
||||||
self.cbCompactSkills.Bind(wx.EVT_CHECKBOX, self.onCBCompactSkills)
|
self.cbCompactSkills.Bind(wx.EVT_CHECKBOX, self.onCBCompactSkills)
|
||||||
self.cbReopenFits.Bind(wx.EVT_CHECKBOX, self.onCBReopenFits)
|
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)
|
self.cbRackLabels.Enable(self.sFit.serviceFittingOptions["rackSlots"] or False)
|
||||||
|
|
||||||
@@ -127,6 +133,9 @@ class PFGeneralPref ( PreferenceView):
|
|||||||
def onCBReopenFits(self, event):
|
def onCBReopenFits(self, event):
|
||||||
self.openFitsSettings["enabled"] = self.cbReopenFits.GetValue()
|
self.openFitsSettings["enabled"] = self.cbReopenFits.GetValue()
|
||||||
|
|
||||||
|
def onCBShowTooltip(self, event):
|
||||||
|
self.sFit.serviceFittingOptions["showTooltip"] = self.cbShowTooltip.GetValue()
|
||||||
|
|
||||||
def getImage(self):
|
def getImage(self):
|
||||||
return bitmapLoader.getBitmap("prefs_settings", "icons")
|
return bitmapLoader.getBitmap("prefs_settings", "icons")
|
||||||
|
|
||||||
|
|||||||
@@ -166,7 +166,8 @@ class FittingView(d.Display):
|
|||||||
if self.DEFAULT_COLS[col] == "Miscellanea":
|
if self.DEFAULT_COLS[col] == "Miscellanea":
|
||||||
tooltip = self.activeColumns[col].getToolTip(mod)
|
tooltip = self.activeColumns[col].getToolTip(mod)
|
||||||
if tooltip is not None:
|
if tooltip is not None:
|
||||||
self.SetToolTipString(tooltip)
|
#self.SetToolTipString(tooltip)
|
||||||
|
self.SetToolTip(None)
|
||||||
else:
|
else:
|
||||||
self.SetToolTip(None)
|
self.SetToolTip(None)
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -24,6 +24,8 @@ import gui.utils.drawUtils as drawUtils
|
|||||||
from gui import bitmapLoader
|
from gui import bitmapLoader
|
||||||
import gui.utils.fonts as fonts
|
import gui.utils.fonts as fonts
|
||||||
|
|
||||||
|
import service
|
||||||
|
|
||||||
_PageChanging, EVT_NOTEBOOK_PAGE_CHANGING = wx.lib.newevent.NewEvent()
|
_PageChanging, EVT_NOTEBOOK_PAGE_CHANGING = wx.lib.newevent.NewEvent()
|
||||||
_PageChanged, EVT_NOTEBOOK_PAGE_CHANGED = wx.lib.newevent.NewEvent()
|
_PageChanged, EVT_NOTEBOOK_PAGE_CHANGED = wx.lib.newevent.NewEvent()
|
||||||
_PageAdding, EVT_NOTEBOOK_PAGE_ADDING = 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.containerHeight = height
|
||||||
self.startDrag = False
|
self.startDrag = False
|
||||||
self.dragging = False
|
self.dragging = False
|
||||||
|
self.sFit = service.Fit.getInstance()
|
||||||
|
|
||||||
self.inclination = 7
|
self.inclination = 7
|
||||||
if canAdd:
|
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
|
Checks to see if we have a tab preview and sets up the timer for it
|
||||||
to display
|
to display
|
||||||
"""
|
"""
|
||||||
|
if not self.sFit.serviceFittingOptions["showTooltip"] or False:
|
||||||
|
return
|
||||||
|
|
||||||
if self.previewTimer:
|
if self.previewTimer:
|
||||||
if self.previewTimer.IsRunning():
|
if self.previewTimer.IsRunning():
|
||||||
if self.previewWnd:
|
if self.previewWnd:
|
||||||
|
|||||||
@@ -96,7 +96,8 @@ class Fit(object):
|
|||||||
"colorFitBySlot": False,
|
"colorFitBySlot": False,
|
||||||
"rackSlots": True,
|
"rackSlots": True,
|
||||||
"rackLabels": True,
|
"rackLabels": True,
|
||||||
"compactSkills": True}
|
"compactSkills": True,
|
||||||
|
"showTooltip": True}
|
||||||
|
|
||||||
self.serviceFittingOptions = SettingsProvider.getInstance().getSettings(
|
self.serviceFittingOptions = SettingsProvider.getInstance().getSettings(
|
||||||
"pyfaServiceFittingOptions", serviceFittingDefaultOptions)
|
"pyfaServiceFittingOptions", serviceFittingDefaultOptions)
|
||||||
|
|||||||
Reference in New Issue
Block a user