From 8b632f672b54b7b864ade36d1e868de0d503bdf0 Mon Sep 17 00:00:00 2001
From: Repooc <repooc82@gmail.com>
Date: Tue, 25 Feb 2014 08:56:45 -0500
Subject: [PATCH] Some tweaks to characterframe.

---
 ElvUI_SLE/config/profile.lua                       |    1 +
 .../modules/characterframe/characterframe.lua      |   10 ++++++++--
 ElvUI_SLE/modules/characterframe/core.lua          |    2 +-
 ElvUI_SLE/modules/characterframe/options.lua       |   13 ++++++++++---
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/ElvUI_SLE/config/profile.lua b/ElvUI_SLE/config/profile.lua
index c53c658..ad56fca 100755
--- a/ElvUI_SLE/config/profile.lua
+++ b/ElvUI_SLE/config/profile.lua
@@ -75,6 +75,7 @@ P['sle'] = {
 			["fontOutline"] = "OUTLINE",
 		},
 		['itemenchant'] = {
+			['show'] = true,
 			['font'] = "ElvUI Pixel",
 			['fontSize'] = 10,
 			['fontOutline'] = "OUTLINE",
diff --git a/ElvUI_SLE/modules/characterframe/characterframe.lua b/ElvUI_SLE/modules/characterframe/characterframe.lua
index a525c18..c211744 100755
--- a/ElvUI_SLE/modules/characterframe/characterframe.lua
+++ b/ElvUI_SLE/modules/characterframe/characterframe.lua
@@ -336,8 +336,13 @@ function CFO:ArmoryFrame_DataSetting()
 						CurrentLineText = gsub(CurrentLineText, ITEM_MOD_CRIT_RATING_SHORT, CRIT_ABBR) -- Critical is too long
 						CurrentLineText = gsub(CurrentLineText, ' + ', '+') -- Remove space
 
-						Slot.ItemEnchant:FontTemplate(LSM:Fetch("font", E.db.sle.characterframeoptions.itemenchant.font), E.db.sle.characterframeoptions.itemenchant.fontSize, E.db.sle.characterframeoptions.itemenchant.fontOutline)
-						Slot.ItemEnchant:SetText('|cffceff00'..CurrentLineText)
+						if E.db.sle.characterframeoptions.itemenchant.show then
+							Slot.ItemEnchant:Show()
+							Slot.ItemEnchant:FontTemplate(LSM:Fetch("font", E.db.sle.characterframeoptions.itemenchant.font), E.db.sle.characterframeoptions.itemenchant.fontSize, E.db.sle.characterframeoptions.itemenchant.fontOutline)
+							Slot.ItemEnchant:SetText('|cffceff00'..CurrentLineText)
+						else
+							Slot.ItemEnchant:Hide()
+						end
 
 						IsEnchanted = true
 					elseif CurrentLineText:find(ITEM_SPELL_TRIGGER_ONUSE) then
@@ -376,6 +381,7 @@ function CFO:ArmoryFrame_DataSetting()
 					ErrorDetected = true
 					if E.db.sle.characterframeoptions.itemenchant.showwarning ~= false then
 						Slot.EnchantWarning:Show()
+						Slot.ItemEnchant:FontTemplate(LSM:Fetch("font", E.db.sle.characterframeoptions.itemenchant.font), E.db.sle.characterframeoptions.itemenchant.fontSize, E.db.sle.characterframeoptions.itemenchant.fontOutline)
 						Slot.ItemEnchant:SetText('|cffff0000'..L['Not Enchanted'])
 					end
 				elseif CFO.PlayerProfession.Engineering and ((slotName == 'BackSlot' and CFO.PlayerProfession.Engineering >= 380) or (slotName == 'HandsSlot' and CFO.PlayerProfession.Engineering >= 400) or (slotName == 'WaistSlot' and CFO.PlayerProfession.Engineering >= 380)) and not UsableEffect then
diff --git a/ElvUI_SLE/modules/characterframe/core.lua b/ElvUI_SLE/modules/characterframe/core.lua
index 6a12ae5..70bc530 100644
--- a/ElvUI_SLE/modules/characterframe/core.lua
+++ b/ElvUI_SLE/modules/characterframe/core.lua
@@ -3,7 +3,7 @@ local E, L, V, P, G, _  = unpack(ElvUI)
 -- Constants
 SLArmoryConstants = {
 	['ItemLevelKey'] = ITEM_LEVEL:gsub('%%d', '(.+)'),
-	['ItemLevelKey_Alt'] = ITEM_LEVEL_ALT:gsub('%%d', '.+', 1):gsub('%(%%d%)', '%%((.+)%%)'),
+	['ItemLevelKey_Alt'] = ITEM_LEVEL_ALT:gsub('%%d', '.+'):gsub('%(.+%)', '%%((.+)%%)'),
 	['EnchantKey'] = ENCHANTED_TOOLTIP_LINE:gsub('%%s', '(.+)'),
 	['ItemSetBonusKey'] = ITEM_SET_BONUS:gsub('%%s', '(.+)'),
 	['TransmogrifiedKey'] = TRANSMOGRIFIED:gsub('%%s', '(.+)'),
diff --git a/ElvUI_SLE/modules/characterframe/options.lua b/ElvUI_SLE/modules/characterframe/options.lua
index 2d219c5..531e047 100755
--- a/ElvUI_SLE/modules/characterframe/options.lua
+++ b/ElvUI_SLE/modules/characterframe/options.lua
@@ -152,15 +152,22 @@ local function configTable()
 				guiInline = true,
 				disabled = function() return not E.private.sle.characterframeoptions.enable end,
 				args = {
-					showwarning = {
+					show = {
 						order = 1,
 						type = "toggle",
+						name = L["Show Enchant Text"],
+						get = function(info) return E.db.sle.characterframeoptions.itemenchant.show end,
+						set = function(info, value) E.db.sle.characterframeoptions.itemenchant.show = value; CFO:ArmoryFrame_DataSetting(); end,
+					},
+					showwarning = {
+						order = 2,
+						type = "toggle",
 						name = L["Show Warning"],
 						get = function(info) return E.db.sle.characterframeoptions.itemenchant.showwarning end,
 						set = function(info, value) E.db.sle.characterframeoptions.itemenchant.showwarning = value; CFO:ArmoryFrame_DataSetting(); end,
 					},
 					warningsize = {
-						order = 2,
+						order = 3,
 						name = L["Warning Size"],
 						desc = L["Set the icon size that the warning notification will use."],
 						type = "range",
@@ -169,7 +176,7 @@ local function configTable()
 						set = function(info, value) E.db.sle.characterframeoptions.itemenchant.warningSize = value; CFO:ResizeErrorIcon(); end,
 					},
 					fontGroup = {
-						order = 3,
+						order = 4,
 						type = 'group',
 						guiInline = true,
 						name = L['Font'],
-- 
1.7.9.5