diff --git a/ElvUI_SLE/ElvUI_SLE.lua b/ElvUI_SLE/ElvUI_SLE.lua index 7250ba4..3a0348d 100644 --- a/ElvUI_SLE/ElvUI_SLE.lua +++ b/ElvUI_SLE/ElvUI_SLE.lua @@ -4,6 +4,18 @@ local UF = E:GetModule('UnitFrames'); local DTP SLE.version = GetAddOnMetadata("ElvUI_SLE", "Version") +E.SLEConfigs = {} + +local f = CreateFrame("Frame") +f:RegisterEvent("ADDON_LOADED") +f:SetScript("OnEvent", function(self, event, addon) + if addon == "ElvUI_Config" then + for _, func in pairs(E.SLEConfigs) do + func() + end + self:UnregisterEvent("ADDON_LOADED") + end +end) function SLE:Tutorials() --Additional tutorials table.insert(E.TutorialList, #(E.TutorialList)+1, L["To enable full values of health/power on unitframes in Shadow & Light add \":sl\" to the end of the health/power tag.\nExample: [health:current:sl]."]); diff --git a/ElvUI_SLE/config/sle_private.lua b/ElvUI_SLE/config/sle_private.lua index c0d31ef..1dadd26 100644 --- a/ElvUI_SLE/config/sle_private.lua +++ b/ElvUI_SLE/config/sle_private.lua @@ -1,5 +1,7 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, ProfileDB, GlobalDB - +V['skins']['addons'] = { + ['EmbedSkada'] = true, +} V['sle'] = { ['dbm'] = { ['size'] = 10, diff --git a/ElvUI_SLE/modules/autorelease/options.lua b/ElvUI_SLE/modules/autorelease/options.lua index f89382c..b799854 100644 --- a/ElvUI_SLE/modules/autorelease/options.lua +++ b/ElvUI_SLE/modules/autorelease/options.lua @@ -1,5 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore - +local function configTable() --Main options group E.Options.args.sle.args.general.args.pvpautorelease = { order = 2, @@ -9,3 +9,6 @@ E.Options.args.sle.args.general.args.pvpautorelease = { get = function(info) return E.db.sle.pvpautorelease end, set = function(info, value) E.db.sle.pvpautorelease = value; end } +end + +table.insert(E.SLEConfigs, configTable) \ No newline at end of file diff --git a/ElvUI_SLE/modules/backgrounds/options.lua b/ElvUI_SLE/modules/backgrounds/options.lua index f1c48fb..3b751bd 100644 --- a/ElvUI_SLE/modules/backgrounds/options.lua +++ b/ElvUI_SLE/modules/backgrounds/options.lua @@ -1,6 +1,6 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore local BG = E:GetModule('BackGrounds') - +local function configTable() local drop = { --Group name = {short name, order, minimum width} ["Bottom BG"] = {"bottom", 1, 200}, @@ -143,3 +143,6 @@ for k,v in pairs(drop) do }, } end +end + +table.insert(E.SLEConfigs, configTable) \ No newline at end of file diff --git a/ElvUI_SLE/modules/characterframe/options.lua b/ElvUI_SLE/modules/characterframe/options.lua index 2ba7d76..01fa5a5 100644 --- a/ElvUI_SLE/modules/characterframe/options.lua +++ b/ElvUI_SLE/modules/characterframe/options.lua @@ -1,5 +1,6 @@ local E, L, V, P, G, _ = unpack(ElvUI); local CFO = E:GetModule('CharacterFrameOptions') +local function configTable() --UI Buttons E.Options.args.sle.args.characterframeoptions = { @@ -147,4 +148,7 @@ E.Options.args.sle.args.characterframeoptions = { }, }, }, -} \ No newline at end of file +} +end + +table.insert(E.SLEConfigs, configTable) \ No newline at end of file diff --git a/ElvUI_SLE/modules/chat/options.lua b/ElvUI_SLE/modules/chat/options.lua index 5ca6515..a2c0680 100644 --- a/ElvUI_SLE/modules/chat/options.lua +++ b/ElvUI_SLE/modules/chat/options.lua @@ -1,4 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore +local function configTable() E.Options.args.sle.args.chat = { order = 8, @@ -29,3 +30,6 @@ E.Options.args.sle.args.chat = { }, }, } +end + +table.insert(E.SLEConfigs, configTable) \ No newline at end of file diff --git a/ElvUI_SLE/modules/datatexts/options.lua b/ElvUI_SLE/modules/datatexts/options.lua index 29be37f..8b29f29 100644 --- a/ElvUI_SLE/modules/datatexts/options.lua +++ b/ElvUI_SLE/modules/datatexts/options.lua @@ -3,6 +3,7 @@ local DTP = E:GetModule('DTPanels') local DT = E:GetModule('DataTexts') local datatexts = {} +local function configTable() local drop = { --Group name = {short name, order, slot} ["DP_1"] = {"dp1", 1, 3}, @@ -207,4 +208,7 @@ E.Options.args.sle.args.timedt = { }, }, }, -} \ No newline at end of file +} +end + +table.insert(E.SLEConfigs, configTable) \ No newline at end of file diff --git a/ElvUI_SLE/modules/errors/options.lua b/ElvUI_SLE/modules/errors/options.lua index 363f35f..64e4002 100644 --- a/ElvUI_SLE/modules/errors/options.lua +++ b/ElvUI_SLE/modules/errors/options.lua @@ -1,5 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB - +local function configTable() E.Options.args.sle.args.general.args.errors = { order = 3, type = "toggle", @@ -7,4 +7,7 @@ E.Options.args.sle.args.general.args.errors = { desc = L["Show/hide error messages in combat."], get = function(info) return E.db.sle.errors end, set = function(info, value) E.db.sle.errors = value; end -} \ No newline at end of file +} +end + +table.insert(E.SLEConfigs, configTable) \ No newline at end of file diff --git a/ElvUI_SLE/modules/exprepbar/options.lua b/ElvUI_SLE/modules/exprepbar/options.lua index f3f67c2..a51fac1 100644 --- a/ElvUI_SLE/modules/exprepbar/options.lua +++ b/ElvUI_SLE/modules/exprepbar/options.lua @@ -1,5 +1,6 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore local M = E:GetModule('Misc') +local function configTable() --Options for Exp/Rep text E.Options.args.sle.args.exprep = { @@ -25,4 +26,7 @@ E.Options.args.sle.args.exprep = { set = function(info, value) E.db.sle.exprep.replong = value; M:UpdateReputation() end }, }, -} \ No newline at end of file +} +end + +table.insert(E.SLEConfigs, configTable) \ No newline at end of file diff --git a/ElvUI_SLE/modules/farm/options.lua b/ElvUI_SLE/modules/farm/options.lua index 15b0103..f2e6fc2 100644 --- a/ElvUI_SLE/modules/farm/options.lua +++ b/ElvUI_SLE/modules/farm/options.lua @@ -1,5 +1,6 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB local F = E:GetModule('Farm') +local function configTable() E.Options.args.sle.args.farm = { type = 'group', @@ -85,4 +86,7 @@ E.Options.args.sle.args.farm = { }, }, }, -} \ No newline at end of file +} +end + +table.insert(E.SLEConfigs, configTable) \ No newline at end of file diff --git a/ElvUI_SLE/modules/install.lua b/ElvUI_SLE/modules/install.lua index fdc5ec1..1acacab 100644 --- a/ElvUI_SLE/modules/install.lua +++ b/ElvUI_SLE/modules/install.lua @@ -1,6 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB local UF = E:GetModule('UnitFrames'); - local CURRENT_PAGE = 0 local MAX_PAGE @@ -1665,6 +1664,7 @@ function E:AffinitiiSetup() --The function to switch from class ElvUI settings t end --Unitframes + E.db.unitframe.font = "DorisPP" E.db.unitframe.fontOutline = "OUTLINE" E.db.unitframe.statusbar = "Polished Wood" E.db.unitframe.colors.castColor = { @@ -1727,7 +1727,7 @@ function E:AffinitiiSetup() --The function to switch from class ElvUI settings t E.db.unitframe.units.party.health.frequentUpdates = true E.db.unitframe.units.party.health.text_format = "[healthcolor][health:deficit]" E.db.unitframe.units.party.health.position = "BOTTOM" - E.db.unitframe.units.party.name.text_format = "[namecolor][name:short] [difficultycolor][smartlevel]" + E.db.unitframe.units.party.name.text_format = "[namecolor][name:veryshort] [difficultycolor][smartlevel]" E.db.unitframe.units.party.name.position = "TOP" E.db.unitframe.units.party.buffs.noConsolidated = false E.db.unitframe.units.party.buffs.enable = true @@ -1805,6 +1805,7 @@ function E:AffinitiiSetup() --The function to switch from class ElvUI settings t E.db.unitframe.units.raid10.raidicon.xOffset = 9 E.db.unitframe.units.raid10.raidicon.size = 13 E.db.unitframe.units.raid10.raidicon.yOffset = 0 + E.db.unitframe.units.raid10.name.text_format = "[namecolor][name:veryshort]" if layout == "healer" then E.db.unitframe.units.raid10.debuffs.sizeOverride = 16 E.db.unitframe.units.raid10.debuffs.xOffset = -4 @@ -1854,6 +1855,7 @@ function E:AffinitiiSetup() --The function to switch from class ElvUI settings t E.db.unitframe.units.raid25.buffs.playerOnly = false E.db.unitframe.units.raid25.buffs.perrow = 1 E.db.unitframe.units.raid25.buffs.useFilter = "TurtleBuffs" + E.db.unitframe.units.raid25.name.text_format = "[namecolor][name:veryshort]" if layout == "healer" then E.db.unitframe.units.raid25.yOffset = 4 E.db.unitframe.units.raid25.width = 80 @@ -1918,6 +1920,7 @@ function E:AffinitiiSetup() --The function to switch from class ElvUI settings t E.db.unitframe.units.raid40.buffs.sizeOverride = 17 E.db.unitframe.units.raid40.buffs.useBlacklist = false E.db.unitframe.units.raid40.buffs.enable = true + E.db.unitframe.units.raid40.name.text_format = "[namecolor][name:veryshort]" --Actionbars --Bar 1 diff --git a/ElvUI_SLE/modules/marks/options.lua b/ElvUI_SLE/modules/marks/options.lua index 7298a0d..898ef20 100644 --- a/ElvUI_SLE/modules/marks/options.lua +++ b/ElvUI_SLE/modules/marks/options.lua @@ -1,5 +1,6 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore local RM = E:GetModule('RaidMarks') +local function configTable() --Main options group E.Options.args.sle.args.marks = { @@ -76,4 +77,7 @@ E.Options.args.sle.args.marks = { }, }, }, -} \ No newline at end of file +} +end + +table.insert(E.SLEConfigs, configTable) \ No newline at end of file diff --git a/ElvUI_SLE/modules/options.lua b/ElvUI_SLE/modules/options.lua index 68dd3d9..43c624e 100644 --- a/ElvUI_SLE/modules/options.lua +++ b/ElvUI_SLE/modules/options.lua @@ -4,6 +4,7 @@ local AB = E:GetModule('ActionBars') local CH = E:GetModule('Chat') local A = E:GetModule('Auras') local SLE = E:GetModule('SLE') +local function configTable() --Main options group E.Options.args.sle = { @@ -99,4 +100,7 @@ E.Options.args.sle.args.changelog = { name = L["CHANGE_LOG"], }, }, -} \ No newline at end of file +} +end + +table.insert(E.SLEConfigs, configTable) \ No newline at end of file diff --git a/ElvUI_SLE/modules/tooltip/options.lua b/ElvUI_SLE/modules/tooltip/options.lua index 1c26304..b80e4eb 100644 --- a/ElvUI_SLE/modules/tooltip/options.lua +++ b/ElvUI_SLE/modules/tooltip/options.lua @@ -1,4 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore +local function configTable() E.Options.args.sle.args.auras = { type = "group", @@ -20,4 +21,7 @@ E.Options.args.sle.args.auras = { set = function(info, value) E.db.sle.castername = value; end, }, }, -} \ No newline at end of file +} +end + +table.insert(E.SLEConfigs, configTable) \ No newline at end of file diff --git a/ElvUI_SLE/modules/uibuttons/options.lua b/ElvUI_SLE/modules/uibuttons/options.lua index 5871564..e1a31fa 100644 --- a/ElvUI_SLE/modules/uibuttons/options.lua +++ b/ElvUI_SLE/modules/uibuttons/options.lua @@ -1,5 +1,6 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore local UB = E:GetModule('UIButtons') +local function configTable() --UI Buttons E.Options.args.sle.args.uibuttons = { @@ -59,4 +60,7 @@ E.Options.args.sle.args.uibuttons = { }, }, }, -} \ No newline at end of file +} +end + +table.insert(E.SLEConfigs, configTable) \ No newline at end of file diff --git a/ElvUI_SLE/modules/unitframes/options.lua b/ElvUI_SLE/modules/unitframes/options.lua index 4c8f463..370dfaf 100644 --- a/ElvUI_SLE/modules/unitframes/options.lua +++ b/ElvUI_SLE/modules/unitframes/options.lua @@ -1,6 +1,7 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore local UF = E:GetModule('UnitFrames') local CAN_HAVE_CLASSBAR = (E.myclass == "PALADIN" or E.myclass == "DRUID" or E.myclass == "DEATHKNIGHT" or E.myclass == "WARLOCK" or E.myclass == "PRIEST" or E.myclass == "MONK" or E.myclass == 'MAGE') +local function configTable() local positionValues = { TOPLEFT = 'TOPLEFT', @@ -169,4 +170,7 @@ E.Options.args.sle.args.unitframes.args.classbar = { }, }, } -end \ No newline at end of file +end +end + +table.insert(E.SLEConfigs, configTable) \ No newline at end of file diff --git a/ElvUI_SLE/skins/options.lua b/ElvUI_SLE/skins/options.lua index 531f16d..84fef6b 100644 --- a/ElvUI_SLE/skins/options.lua +++ b/ElvUI_SLE/skins/options.lua @@ -1,5 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore - +local function configTable() E.Options.args.sle.args.skins = { order = 8, type = "group", @@ -30,4 +30,7 @@ E.Options.args.sle.args.skins = { }, }, }, -} \ No newline at end of file +} +end + +table.insert(E.SLEConfigs, configTable) \ No newline at end of file