From bfdc2161e02ee659616ada56d352775f545c2403 Mon Sep 17 00:00:00 2001
From: blitzmann <holmes.ryan.90@gmail.com>
Date: Sat, 4 Jul 2015 00:52:44 -0400
Subject: [PATCH] Add shortcut cues as toggle in prefs

---
 gui/builtinPreferenceViews/pyfaGeneralPreferences.py |  8 ++++++++
 gui/builtinViewColumns/baseName.py                   | 11 ++++++-----
 service/fit.py                                       |  3 ++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
index 60468ec9a..87f506ba6 100644
--- a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
@@ -56,6 +56,9 @@ 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 )
 
+        self.cbMarketShortcuts = wx.CheckBox( panel, wx.ID_ANY, u"Show market shortcuts", wx.DefaultPosition, wx.DefaultSize, 0 )
+        mainSizer.Add( self.cbMarketShortcuts, 0, wx.ALL|wx.EXPAND, 5 )
+
         defCharSizer = wx.BoxSizer( wx.HORIZONTAL )
 
         self.sFit = service.Fit.getInstance()
@@ -69,6 +72,7 @@ class PFGeneralPref ( PreferenceView):
         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.cbMarketShortcuts.SetValue(self.sFit.serviceFittingOptions["showMarketShortcuts"] or False)
 
         self.cbGlobalChar.Bind(wx.EVT_CHECKBOX, self.OnCBGlobalCharStateChange)
         self.cbGlobalDmgPattern.Bind(wx.EVT_CHECKBOX, self.OnCBGlobalDmgPatternStateChange)
@@ -79,6 +83,7 @@ class PFGeneralPref ( PreferenceView):
         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.cbMarketShortcuts.Bind(wx.EVT_CHECKBOX, self.onCBShowShortcuts)
 
         self.cbRackLabels.Enable(self.sFit.serviceFittingOptions["rackSlots"] or False)
 
@@ -135,6 +140,9 @@ class PFGeneralPref ( PreferenceView):
     def onCBShowTooltip(self, event):
         self.sFit.serviceFittingOptions["showTooltip"] = self.cbShowTooltip.GetValue()
 
+    def onCBShowShortcuts(self, event):
+        self.sFit.serviceFittingOptions["showMarketShortcuts"] = self.cbMarketShortcuts.GetValue()
+
     def getImage(self):
         return bitmapLoader.getBitmap("prefs_settings", "icons")
 
diff --git a/gui/builtinViewColumns/baseName.py b/gui/builtinViewColumns/baseName.py
index 57816b855..a6b3fe49f 100644
--- a/gui/builtinViewColumns/baseName.py
+++ b/gui/builtinViewColumns/baseName.py
@@ -55,13 +55,14 @@ class BaseName(ViewColumn):
                 return stuff.item.name
         else:
             item = getattr(stuff, "item", stuff)
-            marketShortcut = getattr(item, "marketShortcut", None)
 
-            if marketShortcut:
-                # use unicode subscript to display shortcut value
-                shortcut = unichr(marketShortcut+8320)+u" "
+            if service.Fit.getInstance().serviceFittingOptions["showMarketShortcuts"]:
+                marketShortcut = getattr(item, "marketShortcut", None)
 
-                return shortcut+item.name
+                if marketShortcut:
+                    # use unicode subscript to display shortcut value
+                    shortcut = unichr(marketShortcut+8320)+u" "
+                    return shortcut+item.name
 
             return item.name
 
diff --git a/service/fit.py b/service/fit.py
index 32820f6b7..8a55fb5b4 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -97,7 +97,8 @@ class Fit(object):
             "rackSlots": True,
             "rackLabels": True,
             "compactSkills": True,
-            "showTooltip": True}
+            "showTooltip": True,
+            "showMarketShortcuts": False}
 
         self.serviceFittingOptions = SettingsProvider.getInstance().getSettings(
             "pyfaServiceFittingOptions", serviceFittingDefaultOptions)