diff --git a/ElvUI_SLE/config/profile.lua b/ElvUI_SLE/config/profile.lua
index 3e25cca..3fd5703 100755
--- a/ElvUI_SLE/config/profile.lua
+++ b/ElvUI_SLE/config/profile.lua
@@ -77,7 +77,6 @@ P['sle'] = {
["fontOutline"] = "OUTLINE",
},
['itemenchant'] = {
- ['enable'] = true,
['font'] = "ElvUI Font",
['fontSize'] = 12,
['fontOutline'] = "OUTLINE",
diff --git a/ElvUI_SLE/modules/characterframe/characterframe.lua b/ElvUI_SLE/modules/characterframe/characterframe.lua
index a55c250..86b644f 100755
--- a/ElvUI_SLE/modules/characterframe/characterframe.lua
+++ b/ElvUI_SLE/modules/characterframe/characterframe.lua
@@ -313,7 +313,6 @@ function CFO:ArmoryFrame_DataSetting()
ItemUpgradeID = ItemLink:match(':(%d+)\124h%[')
- --<< Enchant Parts >>--
for i = 1, f.ScanTTForEnchanting1:NumLines() do
CurrentLineText = _G['KnightArmoryScanTT_E1TextLeft'..i]:GetText()
@@ -321,6 +320,7 @@ function CFO:ArmoryFrame_DataSetting()
TrueItemLevel = tonumber(CurrentLineText:match(C.ItemLevelKey))
elseif CurrentLineText:find(C.EnchantKey) then
CurrentLineText = CurrentLineText:match(C.EnchantKey) -- Get enchant string
+ CurrentLineText = gsub(CurrentLineText, ITEM_MOD_INTELLECT_SHORT, INT) --Intellect is to long for darth
CurrentLineText = gsub(CurrentLineText, ITEM_MOD_CRIT_RATING_SHORT, CRIT_ABBR) -- Critical is too long
CurrentLineText = gsub(CurrentLineText, ' + ', '+') -- Remove space
diff --git a/ElvUI_SLE/modules/characterframe/options.lua b/ElvUI_SLE/modules/characterframe/options.lua
index ebda251..2c78f69 100755
--- a/ElvUI_SLE/modules/characterframe/options.lua
+++ b/ElvUI_SLE/modules/characterframe/options.lua
@@ -66,57 +66,39 @@ local function configTable()
guiInline = true,
disabled = function() return not E.private.sle.characterframeoptions.enable end,
args = {
- enable = {
+ font = {
+ type = "select", dialogControl = 'LSM30_Font',
order = 1,
- type = "toggle",
- name = L["Enable"],
- --desc = L["Show/Hide Item Levels"],
- get = function(info) return E.db.sle.characterframeoptions.itemlevel.enable end,
- set = function(info, value) E.db.sle.characterframeoptions.itemlevel.enable = value; CFO:ToggleCFO() end
+ --name = L["Fonts"],
+ name = L["Font"],
+ desc = L["The font that the item level will use."],
+ values = AceGUIWidgetLSMlists.font,
+ get = function(info) return E.db.sle.characterframeoptions.itemlevel.font end,
+ set = function(info, value) E.db.sle.characterframeoptions.itemlevel.font = value; CFO:UpdateItemLevelFont(); end,
},
- fontGroup = {
+ fontSize = {
order = 2,
- type = 'group',
- guiInline = true,
- disabled = true,
- --disabled = function() return not E.db.sle.characterframeoptions.itemlevel.enable end,
- name = L['Font'],
- args = {
- font = {
- type = "select", dialogControl = 'LSM30_Font',
- order = 1,
- --name = L["Fonts"],
- name = L["Font"],
- desc = L["The font that the item level will use."],
- values = AceGUIWidgetLSMlists.font,
- get = function(info) return E.db.sle.characterframeoptions.itemlevel.font end,
- set = function(info, value) E.db.sle.characterframeoptions.itemlevel.font = value; CFO:UpdateItemLevelFont(); end,
- },
- fontSize = {
- order = 2,
- name = L["Font Size"],
- desc = L["Set the font size that the item level will use."],
- type = "range",
- min = 6, max = 22, step = 1,
- get = function(info) return E.db.sle.characterframeoptions.itemlevel.fontSize end,
- set = function(info, value) E.db.sle.characterframeoptions.itemlevel.fontSize = value; CFO:UpdateItemLevelFont(); end,
- },
- fontOutline = {
- order = 3,
- name = L["Font Outline"],
- desc = L["Set the font outline that the item level will use."],
- type = "select",
- values = {
- ['NONE'] = L['None'],
- ['OUTLINE'] = 'OUTLINE',
- ['MONOCHROME'] = 'MONOCHROME',
- ['MONOCHROMEOUTLINE'] = 'MONOCROMEOUTLINE',
- ['THICKOUTLINE'] = 'THICKOUTLINE',
- },
- get = function(info) return E.db.sle.characterframeoptions.itemlevel.fontOutline end,
- set = function(info, value) E.db.sle.characterframeoptions.itemlevel.fontOutline = value; CFO:UpdateItemLevelFont(); end,
- },
+ name = L["Font Size"],
+ desc = L["Set the font size that the item level will use."],
+ type = "range",
+ min = 6, max = 22, step = 1,
+ get = function(info) return E.db.sle.characterframeoptions.itemlevel.fontSize end,
+ set = function(info, value) E.db.sle.characterframeoptions.itemlevel.fontSize = value; CFO:UpdateItemLevelFont(); end,
+ },
+ fontOutline = {
+ order = 3,
+ name = L["Font Outline"],
+ desc = L["Set the font outline that the item level will use."],
+ type = "select",
+ values = {
+ ['NONE'] = L['None'],
+ ['OUTLINE'] = 'OUTLINE',
+ ['MONOCHROME'] = 'MONOCHROME',
+ ['MONOCHROMEOUTLINE'] = 'MONOCROMEOUTLINE',
+ ['THICKOUTLINE'] = 'THICKOUTLINE',
},
+ get = function(info) return E.db.sle.characterframeoptions.itemlevel.fontOutline end,
+ set = function(info, value) E.db.sle.characterframeoptions.itemlevel.fontOutline = value; CFO:UpdateItemLevelFont(); end,
},
},
},
@@ -128,56 +110,38 @@ local function configTable()
guiInline = true,
disabled = function() return not E.private.sle.characterframeoptions.enable end,
args = {
- enable = {
+ font = {
+ type = "select", dialogControl = 'LSM30_Font',
order = 1,
- type = "toggle",
- name = L["Enable"],
- --desc = L["Show/Hide Item Durability"],
- get = function(info) return E.db.sle.characterframeoptions.itemdurability.enable end,
- set = function(info, value) E.db.sle.characterframeoptions.itemdurability.enable = value; CFO:ToggleCFO() end,
+ name = L["Font"],
+ desc = L["The font that the item durability will use."],
+ values = AceGUIWidgetLSMlists.font,
+ get = function(info) return E.db.sle.characterframeoptions.itemdurability.font end,
+ set = function(info, value) E.db.sle.characterframeoptions.itemdurability.font = value; CFO:UpdateItemDurabilityFont(); end,
},
- fontGroup = {
+ fontSize = {
order = 2,
- type = 'group',
- guiInline = true,
- disabled = true,
- --disabled = function() return not E.db.sle.characterframeoptions.itemdurability.enable end,
- name = L['Font'],
- args = {
- font = {
- type = "select", dialogControl = 'LSM30_Font',
- order = 1,
- name = L["Font"],
- desc = L["The font that the item durability will use."],
- values = AceGUIWidgetLSMlists.font,
- get = function(info) return E.db.sle.characterframeoptions.itemdurability.font end,
- set = function(info, value) E.db.sle.characterframeoptions.itemdurability.font = value; CFO:UpdateItemDurabilityFont(); end,
- },
- fontSize = {
- order = 2,
- name = L["Font Size"],
- desc = L["Set the font size that the item durability will use."],
- type = "range",
- min = 6, max = 22, step = 1,
- get = function(info) return E.db.sle.characterframeoptions.itemdurability.fontSize end,
- set = function(info, value) E.db.sle.characterframeoptions.itemdurability.fontSize = value; CFO:UpdateItemDurabilityFont(); end,
- },
- fontOutline = {
- order = 3,
- name = L["Font Outline"],
- desc = L["Set the font outline that the item durability will use."],
- type = "select",
- values = {
- ['NONE'] = L['None'],
- ['OUTLINE'] = 'OUTLINE',
- ['MONOCHROME'] = 'MONOCHROME',
- ['MONOCHROMEOUTLINE'] = 'MONOCROMEOUTLINE',
- ['THICKOUTLINE'] = 'THICKOUTLINE',
- },
- get = function(info) return E.db.sle.characterframeoptions.itemdurability.fontOutline end,
- set = function(info, value) E.db.sle.characterframeoptions.itemdurability.fontOutline = value; CFO:UpdateItemDurabilityFont(); end,
- },
+ name = L["Font Size"],
+ desc = L["Set the font size that the item durability will use."],
+ type = "range",
+ min = 6, max = 22, step = 1,
+ get = function(info) return E.db.sle.characterframeoptions.itemdurability.fontSize end,
+ set = function(info, value) E.db.sle.characterframeoptions.itemdurability.fontSize = value; CFO:UpdateItemDurabilityFont(); end,
+ },
+ fontOutline = {
+ order = 3,
+ name = L["Font Outline"],
+ desc = L["Set the font outline that the item durability will use."],
+ type = "select",
+ values = {
+ ['NONE'] = L['None'],
+ ['OUTLINE'] = 'OUTLINE',
+ ['MONOCHROME'] = 'MONOCHROME',
+ ['MONOCHROMEOUTLINE'] = 'MONOCROMEOUTLINE',
+ ['THICKOUTLINE'] = 'THICKOUTLINE',
},
+ get = function(info) return E.db.sle.characterframeoptions.itemdurability.fontOutline end,
+ set = function(info, value) E.db.sle.characterframeoptions.itemdurability.fontOutline = value; CFO:UpdateItemDurabilityFont(); end,
},
},
},
@@ -189,14 +153,6 @@ local function configTable()
guiInline = true,
disabled = function() return not E.private.sle.characterframeoptions.enable end,
args = {
- enable = {
- order = 1,
- type = "toggle",
- name = L["Enable"],
- --desc = L["Show/Hide Item Durability"],
- get = function(info) return E.db.sle.characterframeoptions.itemenchant.enable end,
- set = function(info, value) E.db.sle.characterframeoptions.itemenchant.enable = value; CFO:ToggleCFO() end,
- },
fontGroup = {
order = 2,
type = 'group',