From ae79710fb270b77361140b476bc3cb8c8d4e86e1 Mon Sep 17 00:00:00 2001
From: Repooc <repooc82@gmail.com>
Date: Sat, 16 Aug 2014 21:07:04 -0400
Subject: [PATCH] clean up

---
 ElvUI_SLE/core/modules.lua         |   39 ++++++++++++++++++------------------
 ElvUI_SLE/defaults/profile.lua     |    6 ++++++
 ElvUI_SLE/modules/load_modules.xml |    1 +
 ElvUI_SLE/options/load_options.xml |    1 +
 ElvUI_SLE/options/loot_c.lua       |   24 +++++++++++-----------
 5 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/ElvUI_SLE/core/modules.lua b/ElvUI_SLE/core/modules.lua
index ae129b4..45f25bd 100644
--- a/ElvUI_SLE/core/modules.lua
+++ b/ElvUI_SLE/core/modules.lua
@@ -2,27 +2,28 @@
 local unit
 
 local modules = {
-	['SLE_AutoRelease'] = { 'AceHook-3.0', 'AceEvent-3.0' },
-	['SLE_AuraTimers'] = { 'AceEvent-3.0' },
-	['SLE_DTPanels'] = { 'AceHook-3.0', 'AceEvent-3.0' },
-	['SLE_BackGrounds'] = { 'AceHook-3.0', 'AceEvent-3.0'},
-	['SLE_BagInfo'] = { 'AceHook-3.0', 'AceEvent-3.0', 'AceTimer-3.0'},
-	['CharacterFrameOptions'] = { 'AceEvent-3.0'},
-	['InspectFrameOptions'] = { 'AceEvent-3.0'},
-	['SLE_EquipManager'] = { 'AceHook-3.0', 'AceEvent-3.0'},
-	['SLE_Farm'] = { 'AceHook-3.0', 'AceEvent-3.0'},
+	['SLE_AutoRelease'] = {'AceHook-3.0', 'AceEvent-3.0'},
+	['SLE_AuraTimers'] = {'AceEvent-3.0'},
+	['SLE_DTPanels'] = {'AceHook-3.0', 'AceEvent-3.0'},
+	['SLE_BackGrounds'] = {'AceHook-3.0', 'AceEvent-3.0'},
+	['SLE_BagInfo'] = {'AceHook-3.0', 'AceEvent-3.0', 'AceTimer-3.0'},
+	['CharacterFrameOptions'] = {'AceEvent-3.0'},
+	['InspectFrameOptions'] = {'AceEvent-3.0'},
+	['SLE_EquipManager'] = {'AceHook-3.0', 'AceEvent-3.0'},
+	['SLE_Farm'] = {'AceHook-3.0', 'AceEvent-3.0'},
 	['SLE_AddonInstaller'] = {},
-	['SLE_Loot'] = { 'AceHook-3.0', 'AceEvent-3.0'},
-	['SLE_RaidFlares'] = { 'AceHook-3.0', 'AceEvent-3.0'},
-	['SLE_RaidMarks'] = { 'AceHook-3.0', 'AceEvent-3.0'},
-	['SLE_SquareMinimapButtons'] = { 'AceHook-3.0', 'AceEvent-3.0'},
-	['SLE_PvPMover'] = { 'AceHook-3.0', 'AceEvent-3.0'},
-	['SLE_UIButtons'] = { 'AceHook-3.0', 'AceEvent-3.0'},
+	['SLE_Loot'] = {'AceHook-3.0', 'AceEvent-3.0'},
+	['SLE_RaidFlares'] = {'AceHook-3.0', 'AceEvent-3.0'},
+	['SLE_RaidMarks'] = {'AceHook-3.0', 'AceEvent-3.0'},
+	['SLE_SquareMinimapButtons'] = {'AceHook-3.0', 'AceEvent-3.0'},
+	['SLE_Threat'] = {'AceHook-3.0'},
+	['SLE_PvPMover'] = {'AceHook-3.0', 'AceEvent-3.0'},
+	['SLE_UIButtons'] = {'AceHook-3.0', 'AceEvent-3.0'},
 	['SLE_EnhancedVehicleBar'] = {},
-	['SLE_Test'] = { 'AceHook-3.0', 'AceEvent-3.0'}, --Testing module in dev folder
-	['SLE_Media'] = { 'AceHook-3.0' },
-	['SLE_InstDif'] = { 'AceHook-3.0', 'AceEvent-3.0'},
-	['SLE'] = { 'AceHook-3.0', 'AceEvent-3.0' },
+	['SLE_Test'] = {'AceHook-3.0', 'AceEvent-3.0'}, --Testing module in dev folder
+	['SLE_Media'] = {'AceHook-3.0'},
+	['SLE_InstDif'] = {'AceHook-3.0', 'AceEvent-3.0'},
+	['SLE'] = {'AceHook-3.0', 'AceEvent-3.0'},
 }
 
 local function Register()
diff --git a/ElvUI_SLE/defaults/profile.lua b/ElvUI_SLE/defaults/profile.lua
index 84c4102..e54319c 100644
--- a/ElvUI_SLE/defaults/profile.lua
+++ b/ElvUI_SLE/defaults/profile.lua
@@ -351,6 +351,12 @@ P['sle'] = {
 	--PvP Auto release
 	['pvpautorelease'] = true,
 
+	--Threat
+	['threat'] = {
+		['enable'] = true,
+		['position'] = "RightChatDataPanel",
+	},
+
 	--Tooltip
 	['tooltip'] = {
 		['enable'] = false,
diff --git a/ElvUI_SLE/modules/load_modules.xml b/ElvUI_SLE/modules/load_modules.xml
index c6d724a..29b4551 100644
--- a/ElvUI_SLE/modules/load_modules.xml
+++ b/ElvUI_SLE/modules/load_modules.xml
@@ -17,6 +17,7 @@
 	<Script file='nameplates.lua'/>
 	<Script file='raidutility.lua'/>
 	<Script file='pvpmover.lua'/>
+	<Script file='threat.lua'/>
 	<Script file='tooltip.lua'/>
 	<Script file='uibuttons.lua'/>
 	<Script file='unitframes.lua'/>
diff --git a/ElvUI_SLE/options/load_options.xml b/ElvUI_SLE/options/load_options.xml
index 9a42991..52e426d 100644
--- a/ElvUI_SLE/options/load_options.xml
+++ b/ElvUI_SLE/options/load_options.xml
@@ -18,6 +18,7 @@
 	<Script file='minimap_c.lua'/>
 	<Script file='nameplates_c.lua'/>
 	<Script file='raidutility_c.lua'/>
+	<Script file='threat_c.lua'/>
 	<Script file='tooltip_c.lua'/>
 	<Script file='uibuttons_c.lua'/>
 	<Script file='unitframes_c.lua'/>
diff --git a/ElvUI_SLE/options/loot_c.lua b/ElvUI_SLE/options/loot_c.lua
index 7182906..fc19173 100644
--- a/ElvUI_SLE/options/loot_c.lua
+++ b/ElvUI_SLE/options/loot_c.lua
@@ -59,8 +59,8 @@ local function configTable()
 						name = "Auto Confirm",
 						desc = "Automatically click OK on BOP items",
 						disabled = function() return not E.db.sle.loot.enable or not E.db.sle.loot.autoroll.enable end,
-						get = function(info) return E.db.sle.loot.autoconfirm end,
-						set = function(info, value) E.db.sle.loot.autoconfirm = value end,
+						get = function(info) return E.db.sle.loot.autoroll.autoconfirm end,
+						set = function(info, value) E.db.sle.loot.autoroll.autoconfirm = value end,
 					},
 					autogreed = {
 						order = 7,
@@ -68,8 +68,8 @@ local function configTable()
 						name = "Auto Greed",
 						desc = "Automatically greed uncommon (green) quality items at max level",
 						disabled = function() return not E.db.sle.loot.enable or not E.db.sle.loot.autoroll.enable end,
-						get = function(info) return E.db.sle.loot.autogreed end,
-						set = function(info, value) E.db.sle.loot.autogreed = value end,
+						get = function(info) return E.db.sle.loot.autoroll.autogreed end,
+						set = function(info, value) E.db.sle.loot.autoroll.autogreed = value end,
 					},
 					autode = {
 						order = 8,
@@ -77,8 +77,8 @@ local function configTable()
 						name = "Auto Disenchant",
 						desc = "Automatically disenchant uncommon (green) quality items at max level",
 						disabled = function() return not E.db.sle.loot.enable or not E.db.sle.loot.autoroll.enable end,
-						get = function(info) return E.db.sle.loot.autode end,
-						set = function(info, value) E.db.sle.loot.autode = value; end,
+						get = function(info) return E.db.sle.loot.autoroll.autode end,
+						set = function(info, value) E.db.sle.loot.autoroll.autode = value; end,
 					},
 					autoqlty = {
 						order = 9,
@@ -86,8 +86,8 @@ local function configTable()
 						name = L["Loot Quality"],
 						desc = "Sets the auto greed/disenchant quality\n\nUncommon: Rolls on Uncommon only\nRare: Rolls on Rares & Uncommon",
 						disabled = function() return not E.db.sle.loot.enable or not E.db.sle.loot.autoroll.enable end,
-						get = function(info) return E.db.sle.loot.autoqlty end,
-						set = function(info, value) E.db.sle.loot.autoqlty = value; end,
+						get = function(info) return E.db.sle.loot.autoroll.autoqlty end,
+						set = function(info, value) E.db.sle.loot.autoroll.autoqlty = value; end,
 						values = {
 							[4] = "|cffA335EE"..ITEM_QUALITY4_DESC.."|r",
 							[3] = "|cff0070DD"..ITEM_QUALITY3_DESC.."|r",
@@ -105,8 +105,8 @@ local function configTable()
 						name = "Roll based on level.",
 						desc = "This will auto-roll if you are above the given level if: You cannot equip the item being rolled on, or the ilevel of your equipped item is higher than the item being rolled on or you have an heirloom equipped in that slot",
 						disabled = function() return not E.db.sle.loot.enable or not E.db.sle.loot.autoroll.enable end,
-						get = function(info) return E.db.sle.loot.bylevel end,
-						set = function(info, value) E.db.sle.loot.bylevel = value; end,
+						get = function(info) return E.db.sle.loot.autoroll.bylevel end,
+						set = function(info, value) E.db.sle.loot.autoroll.bylevel = value; end,
 					},
 					level = {
 						order = 12,
@@ -115,8 +115,8 @@ local function configTable()
 						desc = "Automatically disenchant uncommon (green) quality items at max level",
 						disabled = function() return not E.db.sle.loot.enable or not E.db.sle.loot.autoroll.enable end,
 						min = 1, max = GetMaxPlayerLevel(), step = 1,
-						get = function(info) return E.db.sle.loot.level end,
-						set = function(info, value) E.db.sle.loot.level = value; end,
+						get = function(info) return E.db.sle.loot.autoroll.level end,
+						set = function(info, value) E.db.sle.loot.autoroll.level = value; end,
 					},
 				},
 			},
-- 
1.7.9.5