From 4bdad90a5097c2b375a5af1cdf20ad7366d7cdb7 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 01:47:54 +0400 Subject: [PATCH 001/267] Main files test branch --- ElvUI_SLE/ElvUI_SLE.lua | 44 ++++++++++++-------------------------------- ElvUI_SLE/ElvUI_SLE.toc | 2 +- 2 files changed, 13 insertions(+), 33 deletions(-) diff --git a/ElvUI_SLE/ElvUI_SLE.lua b/ElvUI_SLE/ElvUI_SLE.lua index 79a52ea..5a38d79 100755 --- a/ElvUI_SLE/ElvUI_SLE.lua +++ b/ElvUI_SLE/ElvUI_SLE.lua @@ -21,8 +21,10 @@ function SLE:ConfigCats() --Additional mover groups E.ConfigModeLocalizedStrings["S&L"] = L["S&L: All"] tinsert(E.ConfigModeLayouts, #(E.ConfigModeLayouts)+1, "S&L DT"); E.ConfigModeLocalizedStrings["S&L DT"] = L["S&L: Datatexts"] - tinsert(E.ConfigModeLayouts, #(E.ConfigModeLayouts)+1, "S&L BG"); - E.ConfigModeLocalizedStrings["S&L BG"] = L["S&L: Backgrounds"] + if E.private.sle.backgrounds then + tinsert(E.ConfigModeLayouts, #(E.ConfigModeLayouts)+1, "S&L BG"); + E.ConfigModeLocalizedStrings["S&L BG"] = L["S&L: Backgrounds"] + end tinsert(E.ConfigModeLayouts, #(E.ConfigModeLayouts)+1, "S&L MISC"); E.ConfigModeLocalizedStrings["S&L MISC"] = L["S&L: Misc"] end @@ -36,43 +38,22 @@ function SLE:LootShow() end end -function SLE:ChatPos() - if not E:HasMoverBeenMoved("LeftChatMover") and E.db.datatexts.leftChatPanel then - if not E.db.movers then E.db.movers = {}; end - if E.PixelMode then - E.db.movers.LeftChatMover = "BOTTOMLEFTUIParentBOTTOMLEFT019" - else - E.db.movers.LeftChatMover = "BOTTOMLEFTUIParentBOTTOMLEFT021" - end - E:SetMoversPositions() - end - - if not E:HasMoverBeenMoved("RightChatMover") and E.db.datatexts.rightChatPanel then - if not E.db.movers then E.db.movers = {}; end - if E.PixelMode then - E.db.movers.RightChatMover = "BOTTOMRIGHTUIParentBOTTOMRIGHT019" - else - E.db.movers.RightChatMover = "BOTTOMRIGHTUIParentBOTTOMRIGHT021" - end - E:SetMoversPositions() - end -end - E.UpdateAllSLE = E.UpdateAll function E:UpdateAll() E.UpdateAllSLE(self) - E:GetModule('BackGrounds'):UpdateFrames() - E:GetModule('BackGrounds'):RegisterHide() + E:GetModule('SLE_BackGrounds'):UpdateFrames() + E:GetModule('SLE_BackGrounds'):RegisterHide() DTP:Update() DTP:DashboardShow() DTP:DashWidth() if E.private.unitframe.enable then UF:Update_CombatIndicator() end - E:GetModule('UIButtons'):UpdateAll() - E:GetModule('RaidMarks'):Update() - E:GetModule('Farm'):UpdateLayout() - SLE:ChatPos() + E:GetModule('SLE_UIButtons'):UpdateAll() + E:GetModule('SLE_RaidMarks'):Update() + E:GetModule('SLE_RaidFlares'):Update() + E:GetModule('SLE_Farm'):UpdateLayout() + E:GetModule("Chat"):GMIconUpdate() end function SLE:Reset(all, uf, dt, bg, mark) @@ -189,7 +170,7 @@ function SLE:Initialize() E:StaticPopup_Show("VERSION_MISMATCH") end EP:RegisterPlugin(addon,SLE.GetOptions) - DTP = E:GetModule('DTPanels') + DTP = E:GetModule('SLE_DTPanels') if E.private.unitframe.enable then self:RegisterEvent("PLAYER_REGEN_DISABLED", UF.Update_CombatIndicator); end @@ -200,7 +181,6 @@ function SLE:Initialize() DTP:DashboardShow() SLE:Tutorials() SLE:ConfigCats() - SLE:ChatPos() SLE:RegisterCommands() SLE:CheckIncompatible() end diff --git a/ElvUI_SLE/ElvUI_SLE.toc b/ElvUI_SLE/ElvUI_SLE.toc index 07f1220..f08ce68 100755 --- a/ElvUI_SLE/ElvUI_SLE.toc +++ b/ElvUI_SLE/ElvUI_SLE.toc @@ -1,7 +1,7 @@ ## Interface: 50400 ## Title: |cff1784d1ElvUI |rShadow and Light ## Author: Darth Predator, Repooc -## Version: 1.88 +## Version: 2.00 ## Notes: Plugin-edit for |cff1784d1ElvUI|r. ## Notes-ruRU: Плагин-редакция для |cff1784d1ElvUI|r. ## eMail: darthpred@gmail.com, repooc@tukui.org -- 1.7.9.5 From f9001708021e400cf62ba54b97133bb67cc134ed Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 02:00:18 +0400 Subject: [PATCH 002/267] config --- ElvUI_SLE/config/profile.lua | 4 ++-- ElvUI_SLE/config/sle_private.lua | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ElvUI_SLE/config/profile.lua b/ElvUI_SLE/config/profile.lua index f640449..fd6dfa8 100755 --- a/ElvUI_SLE/config/profile.lua +++ b/ElvUI_SLE/config/profile.lua @@ -156,6 +156,7 @@ P['sle'] = { ['enable'] = false, ['width'] = 100, }, + ['chathandle'] = false, }, --E.db.sle.dt.guild.totals --DT Options @@ -238,14 +239,13 @@ P['sle'] = { --Raid marks ['marks'] = { - ['enabled'] = false, ['growth'] = "RIGHT", ['showinside'] = false, + ['target'] = false, ['size'] = 18, }, ['flares'] = { - ['enabled'] = false, ['growth'] = "RIGHT", ['showinside'] = false, ['size'] = 20, diff --git a/ElvUI_SLE/config/sle_private.lua b/ElvUI_SLE/config/sle_private.lua index 9a1db63..a9157fe 100755 --- a/ElvUI_SLE/config/sle_private.lua +++ b/ElvUI_SLE/config/sle_private.lua @@ -3,9 +3,6 @@ V['skins']['addons'] = { ['EmbedSkada'] = true, } V['sle'] = { - ['dbm'] = { - ['size'] = 10, - }, --Character Frame Options ['characterframeoptions'] = { @@ -45,6 +42,11 @@ V['sle'] = { ['pvp'] = "NONE", ['setoverlay'] = false, }, + + ['marks'] = { + ['marks'] = false, + ['flares'] = false, + }, --Minimap Moduel ['minimap'] = { @@ -63,4 +65,7 @@ V['sle'] = { ['vehicle'] = { ['enable'] = false, }, + + ['guildmaster'] = false, + ['backgrounds'] = false, } -- 1.7.9.5 From de56a45aa417c744b6ad3c6a91fec42abb25b162 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 02:01:00 +0400 Subject: [PATCH 003/267] dev folder --- ElvUI_SLE/dev/commands.lua | 5 ----- ElvUI_SLE/dev/options.lua | 20 ++++++++++++++++++- ElvUI_SLE/dev/staticpopups.lua | 20 +++++++++++++++++++ ElvUI_SLE/dev/test.lua | 42 ++++++++++++++++++++-------------------- 4 files changed, 60 insertions(+), 27 deletions(-) diff --git a/ElvUI_SLE/dev/commands.lua b/ElvUI_SLE/dev/commands.lua index 108c259..5a7f62b 100755 --- a/ElvUI_SLE/dev/commands.lua +++ b/ElvUI_SLE/dev/commands.lua @@ -14,11 +14,6 @@ local Authors = { ["Repøøc"] = "SLEAUTHOR", ["Repooc"] = "SLEAUTHOR" }, - ["СвежевательДуш"] = { - --Darth's toons - ["Джатон"] = "SLEAUTHOR", - ["Нарджо"] = "SLEAUTHOR" - }, ["ВечнаяПесня"] = { --Darth's toons ["Дартпредатор"] = "SLEAUTHOR", diff --git a/ElvUI_SLE/dev/options.lua b/ElvUI_SLE/dev/options.lua index e0e3eec..6bf7890 100755 --- a/ElvUI_SLE/dev/options.lua +++ b/ElvUI_SLE/dev/options.lua @@ -177,7 +177,7 @@ if SLE:Auth() then }, }, devcommand = { - order = 500, + order = 4, type = "group", name = "Commands", args = { @@ -313,6 +313,24 @@ if SLE:Auth() then }, }, + devdiaggroup = { + order = 5, + type = "group", + name = "Tech and shit", + args = { + subgroup = { + order = 1, + type = "header", + name = "Some tech stuff", + }, + cpuprofiling = { + order = 2, + type = 'execute', + name = "CPU Profiling", + func = function() SetCVar("scriptProfile", GetCVar("scriptProfile") == "1" and 0 or 1); ReloadUI() end, + }, + }, + }, devgroupone = { order = 500, type = "group", diff --git a/ElvUI_SLE/dev/staticpopups.lua b/ElvUI_SLE/dev/staticpopups.lua index 9fea07f..556bbc8 100755 --- a/ElvUI_SLE/dev/staticpopups.lua +++ b/ElvUI_SLE/dev/staticpopups.lua @@ -30,4 +30,24 @@ E.PopupDialogs['SLE_INCOMPATIBLE_ADDON'] = { timeout = 0, whileDead = 1, hideOnEscape = false, +} + +E.PopupDialogs['SLE_CHAT_HISTORY'] = { + text = "This will clear your chat history, you will no longer be able to see messages shown before executing after reload.\nContinue?", + button1 = ACCEPT, + button2 = CANCEL, + OnAccept = function(self) if ElvCharacterDB.ChatLog then ElvCharacterDB.ChatLog = {} end end, + timeout = 0, + whileDead = 1, + hideOnEscape = false, +} + +E.PopupDialogs['SLE_EDIT_HISTORY'] = { + text = "This will clear your editbox history and reload UI.\nContinue?", + button1 = ACCEPT, + button2 = CANCEL, + OnAccept = function(self) if ElvCharacterDB.ChatEditHistory then ElvCharacterDB.ChatEditHistory = {}; ReloadUI() end end, + timeout = 0, + whileDead = 1, + hideOnEscape = false, } \ No newline at end of file diff --git a/ElvUI_SLE/dev/test.lua b/ElvUI_SLE/dev/test.lua index bba7ded..6e668dd 100755 --- a/ElvUI_SLE/dev/test.lua +++ b/ElvUI_SLE/dev/test.lua @@ -1,21 +1,21 @@ -local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB ---[[local T = E:NewModule('Test', 'AceHook-3.0', 'AceEvent-3.0'); - -local f1, f2, b1, b2 - -function T:Initialize() - f1 = CreateFrame("PlayerModel") - f1:SetPoint("TOPLEFT", LeftChatPanel,"TOPLEFT",0,0) - f1:SetHeight(E.db.chat.panelHeight) - f1:SetWidth(E.db.chat.panelWidth) - - f1:SetFrameStrata(LeftChatPanel:GetFrameStrata()) - f1:SetFrameLevel(LeftChatPanel:GetFrameLevel() - 2) - f1:SetScale(0.71) - f1:SetUnit("player") - - f1:SetPosition(2.5,0,-0.9) - f1:SetFacing(0.5) -end - -E:RegisterModule(T:GetName())]] +local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB +--[[local T = E:NewModule('SLE_Test', 'AceHook-3.0', 'AceEvent-3.0'); + +local f1, f2, b1, b2 + +function T:Initialize() + f1 = CreateFrame("PlayerModel") + f1:SetPoint("TOPLEFT", LeftChatPanel,"TOPLEFT",0,0) + f1:SetHeight(E.db.chat.panelHeight) + f1:SetWidth(E.db.chat.panelWidth) + + f1:SetFrameStrata(LeftChatPanel:GetFrameStrata()) + f1:SetFrameLevel(LeftChatPanel:GetFrameLevel() - 2) + f1:SetScale(0.71) + f1:SetUnit("player") + + f1:SetPosition(2.5,0,-0.9) + f1:SetFacing(0.5) +end + +E:RegisterModule(T:GetName())]] -- 1.7.9.5 From 786f2e8b98d51b966a27598ede53fb4db387e6d3 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 02:01:23 +0400 Subject: [PATCH 004/267] Layout --- ElvUI_SLE/layout/layout.lua | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/ElvUI_SLE/layout/layout.lua b/ElvUI_SLE/layout/layout.lua index 9c52f14..3aedfb1 100755 --- a/ElvUI_SLE/layout/layout.lua +++ b/ElvUI_SLE/layout/layout.lua @@ -1,6 +1,6 @@ local E, L, V, P, G = unpack(ElvUI); --Inport: Engine, Locales, ProfileDB, GlobalDB local LO = E:GetModule('Layout'); -local DTP = E:GetModule('DTPanels'); +local DTP = E:GetModule('SLE_DTPanels'); local Point = Point @@ -10,6 +10,28 @@ local SIDE_BUTTON_WIDTH = 16; LO.ToggleChatPanelsSLE = LO.ToggleChatPanels function LO:ToggleChatPanels() LO.ToggleChatPanelsSLE(self) + + if not E.db.sle.datatext.chathandle then return end + + if not E:HasMoverBeenMoved("LeftChatMover") and E.db.datatexts.leftChatPanel then + if not E.db.movers then E.db.movers = {}; end + if E.PixelMode then + E.db.movers.LeftChatMover = "BOTTOMLEFTUIParentBOTTOMLEFT019" + else + E.db.movers.LeftChatMover = "BOTTOMLEFTUIParentBOTTOMLEFT021" + end + E:SetMoversPositions() + end + + if not E:HasMoverBeenMoved("RightChatMover") and E.db.datatexts.rightChatPanel then + if not E.db.movers then E.db.movers = {}; end + if E.PixelMode then + E.db.movers.RightChatMover = "BOTTOMRIGHTUIParentBOTTOMRIGHT019" + else + E.db.movers.RightChatMover = "BOTTOMRIGHTUIParentBOTTOMRIGHT021" + end + E:SetMoversPositions() + end if E.db.chat.panelBackdrop == 'SHOWBOTH' then LeftChatPanel.backdrop:Show() @@ -72,4 +94,4 @@ function LO:CreateChatPanels() --Right Chat Tab RightChatTab:Point('TOPRIGHT', RightChatPanel, 'TOPRIGHT', -2, -2) RightChatTab:Point('BOTTOMLEFT', RightChatPanel, 'TOPLEFT', 2, -PANEL_HEIGHT) -end +end \ No newline at end of file -- 1.7.9.5 From 106f24573f55ff2e3f5a018d927db5e2258cd480 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 02:02:10 +0400 Subject: [PATCH 005/267] Autorelease --- ElvUI_SLE/modules/autorelease/autorelease.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI_SLE/modules/autorelease/autorelease.lua b/ElvUI_SLE/modules/autorelease/autorelease.lua index dad7b69..04f5184 100755 --- a/ElvUI_SLE/modules/autorelease/autorelease.lua +++ b/ElvUI_SLE/modules/autorelease/autorelease.lua @@ -1,7 +1,7 @@ --Credit to Repooc. --Remade his auto release featule to module which allows profile setting of the function not the global one. local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore -local AR = E:NewModule('AutoRelease', 'AceHook-3.0', 'AceEvent-3.0'); +local AR = E:NewModule('SLE_AutoRelease', 'AceHook-3.0', 'AceEvent-3.0'); local myclass = E.myclass local IsInInstance = IsInInstance local soulstone = GetSpellInfo(20707) -- 1.7.9.5 From eeb476f21f490a5cc7a9924e9a9fe452339be547 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 02:02:28 +0400 Subject: [PATCH 006/267] datatexts --- ElvUI_SLE/modules/datatexts/add_panels.lua | 4 +++- .../modules/datatexts/dashboard/dashboard.lua | 2 +- ElvUI_SLE/modules/datatexts/options.lua | 10 +++++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ElvUI_SLE/modules/datatexts/add_panels.lua b/ElvUI_SLE/modules/datatexts/add_panels.lua index cf28837..6e0bdf9 100755 --- a/ElvUI_SLE/modules/datatexts/add_panels.lua +++ b/ElvUI_SLE/modules/datatexts/add_panels.lua @@ -1,5 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore -local DTP = E:NewModule('DTPanels', 'AceHook-3.0', 'AceEvent-3.0'); +local DTP = E:NewModule('SLE_DTPanels', 'AceHook-3.0', 'AceEvent-3.0'); local DT = E:GetModule('DataTexts'); local LO = E:GetModule('Layout'); local dp1 = CreateFrame('Frame', "DP_1", E.UIParent) @@ -10,6 +10,8 @@ local dp5 = CreateFrame('Frame', "DP_5", E.UIParent) local dp6 = CreateFrame('Frame', "DP_6", E.UIParent) local top = CreateFrame('Frame', "Top_Center", E.UIParent) local bottom = CreateFrame('Frame', "Bottom_Panel", E.UIParent) +local rchat = CreateFrame('Frame', "Right_Chat_SLE", E.UIParent) +local lchat = CreateFrame('Frame', "Left_Chat_SLE", E.UIParent) local panels = { --Panel = short, name, point, x, panel, slot diff --git a/ElvUI_SLE/modules/datatexts/dashboard/dashboard.lua b/ElvUI_SLE/modules/datatexts/dashboard/dashboard.lua index 5fafa05..ffe016a 100755 --- a/ElvUI_SLE/modules/datatexts/dashboard/dashboard.lua +++ b/ElvUI_SLE/modules/datatexts/dashboard/dashboard.lua @@ -4,7 +4,7 @@ made for ElvUI under Sinaris permission. Big thanks :) ]] local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local DTP = E:GetModule('DTPanels') +local DTP = E:GetModule('SLE_DTPanels') local DT = E:GetModule('DataTexts') local LSM = LibStub("LibSharedMedia-3.0") if E.db.sle == nil then E.db.sle = {} end diff --git a/ElvUI_SLE/modules/datatexts/options.lua b/ElvUI_SLE/modules/datatexts/options.lua index d749a43..2b21e83 100755 --- a/ElvUI_SLE/modules/datatexts/options.lua +++ b/ElvUI_SLE/modules/datatexts/options.lua @@ -1,5 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore -local DTP = E:GetModule('DTPanels') +local DTP = E:GetModule('SLE_DTPanels') local DT = E:GetModule('DataTexts') local datatexts = {} @@ -73,6 +73,14 @@ E.Options.args.sle.args.datatext = { get = function(info) return E.db.sle.datatext.dashboard.width end, set = function(info, value) E.db.sle.datatext.dashboard.width = value; DTP:DashWidth() end, }, + chathandle = { + order = 7, + type = "toggle", + name = "Chat handle", + desc = L["Show/Hide dashboard."], + get = function(info) return E.db.sle.datatext.chathandle end, + set = function(info, value) E.db.sle.datatext.chathandle = value; E:GetModule('Layout'):ToggleChatPanels() end + }, }, }, }, -- 1.7.9.5 From e34126e1b5be5f53299732c686cb31b4006bedff Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 02:02:36 +0400 Subject: [PATCH 007/267] pvpmover --- ElvUI_SLE/modules/pvpmover/pvpmover.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI_SLE/modules/pvpmover/pvpmover.lua b/ElvUI_SLE/modules/pvpmover/pvpmover.lua index 87af78b..4f5c5dc 100755 --- a/ElvUI_SLE/modules/pvpmover/pvpmover.lua +++ b/ElvUI_SLE/modules/pvpmover/pvpmover.lua @@ -1,5 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local P = E:NewModule('PvPMover', 'AceHook-3.0', 'AceEvent-3.0'); +local P = E:NewModule('SLE_PvPMover', 'AceHook-3.0', 'AceEvent-3.0'); local holder = CreateFrame("Frame", "SLE_PvP", E.UIParent) -- 1.7.9.5 From be6501fb09dc1207e9203256e8e1b2590e0bb812 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 02:02:50 +0400 Subject: [PATCH 008/267] backgrounds --- ElvUI_SLE/modules/backgrounds/backgrounds.lua | 31 +++++++++++++++++++++---- ElvUI_SLE/modules/backgrounds/options.lua | 31 ++++++++++++++++++------- 2 files changed, 48 insertions(+), 14 deletions(-) diff --git a/ElvUI_SLE/modules/backgrounds/backgrounds.lua b/ElvUI_SLE/modules/backgrounds/backgrounds.lua index e159367..405970b 100755 --- a/ElvUI_SLE/modules/backgrounds/backgrounds.lua +++ b/ElvUI_SLE/modules/backgrounds/backgrounds.lua @@ -1,20 +1,34 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore -local BG = E:NewModule('BackGrounds', 'AceHook-3.0', 'AceEvent-3.0'); +local BG = E:NewModule('SLE_BackGrounds', 'AceHook-3.0', 'AceEvent-3.0'); -local BGb = CreateFrame('Frame', "BottomBG", E.UIParent); +local BGb, BGl, BGr, BGa, Fr + +--[[local BGb = CreateFrame('Frame', "BottomBG", E.UIParent); local BGl = CreateFrame('Frame', "LeftBG", E.UIParent); local BGr = CreateFrame('Frame', "RightBG", E.UIParent); -local BGa = CreateFrame('Frame', "ActionBG", E.UIParent); +local BGa = CreateFrame('Frame', "ActionBG", E.UIParent);]] -local Fr = { +--[[local Fr = { BottomBG = {BGb,"bottom"}, LeftBG = {BGl,"left"}, RightBG = {BGr,"right"}, ActionBG = {BGa,"action"}, -} +}]] --Frames setup function BG:FramesCreate() + BGb = CreateFrame('Frame', "BottomBG", E.UIParent); + BGl = CreateFrame('Frame', "LeftBG", E.UIParent); + BGr = CreateFrame('Frame', "RightBG", E.UIParent); + BGa = CreateFrame('Frame', "ActionBG", E.UIParent); + + Fr = { + BottomBG = {BGb,"bottom"}, + LeftBG = {BGl,"left"}, + RightBG = {BGr,"right"}, + ActionBG = {BGa,"action"}, + } + for _,v in pairs(Fr) do v[1]:SetFrameLevel(v[1]:GetFrameLevel() - 1) v[1]:SetScript("OnShow", function() v[1]:SetFrameStrata('BACKGROUND') end) @@ -36,6 +50,7 @@ end --Frames Size function BG:FramesSize() + if not BGb then return end local db = E.db.sle.backgrounds for _,v in pairs(Fr) do v[1]:SetSize(db[v[2]].width, db[v[2]].height) @@ -44,6 +59,7 @@ end --Frames points function BG:FramesPositions() + if not BGb then return end BGb:Point("BOTTOM", E.UIParent, "BOTTOM", 0, 21); BGl:Point("BOTTOMRIGHT", E.UIParent, "BOTTOM", -(E.screenwidth/4 + 32)/2 - 1, 21); BGr:Point("BOTTOMLEFT", E.UIParent, "BOTTOM", (E.screenwidth/4 + 32)/2 + 1, 21); @@ -52,6 +68,7 @@ end --Updating textures function BG:UpdateTex() + if not BGb then return end local db = E.db.sle.backgrounds for _,v in pairs(Fr) do v[1].tex:Point('TOPLEFT', v[1], 'TOPLEFT', 2, -2) @@ -62,6 +79,7 @@ end --Visibility / Enable check function BG:FramesVisibility() + if not BGb then return end local db = E.db.sle.backgrounds for _,v in pairs(Fr) do if db[v[2]].enabled then @@ -73,6 +91,7 @@ function BG:FramesVisibility() end function BG:UpdateFrames() + if not BGb then return end local db = E.db.sle.backgrounds for _,v in pairs(Fr) do v[1]:SetTemplate(db[v[2]].template, true) @@ -83,6 +102,7 @@ function BG:UpdateFrames() end function BG:RegisterHide() + if not BGb then return end local db = E.db.sle.backgrounds for k,v in pairs(Fr) do if db[v[2]].pethide then @@ -94,6 +114,7 @@ function BG:RegisterHide() end function BG:Initialize() + if not E.private.sle.backgrounds then return end BG:FramesCreate() BG:FramesPositions() BG:UpdateFrames() diff --git a/ElvUI_SLE/modules/backgrounds/options.lua b/ElvUI_SLE/modules/backgrounds/options.lua index e79896c..421bf9b 100755 --- a/ElvUI_SLE/modules/backgrounds/options.lua +++ b/ElvUI_SLE/modules/backgrounds/options.lua @@ -1,5 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore -local BG = E:GetModule('BackGrounds') +local BG = E:GetModule('SLE_BackGrounds') local function configTable() local drop = { --Group name = {short name, order} @@ -25,52 +25,65 @@ E.Options.args.sle.args.datatext.args.backgrounds = { type = "description", name = L["BG_DESC"] }, - Reset = { + enabled = { order = 3, + type = "toggle", + name = L["Enable"], + desc = L["Show/Hide this frame."], + get = function(info) return E.private.sle.backgrounds end, + set = function(info, value) E.private.sle.backgrounds = value; E:StaticPopup_Show("PRIVATE_RL") end + }, + Reset = { + order = 4, type = 'execute', name = L['Restore Defaults'], desc = L["Reset these options to defaults"], + disabled = function() return not E.private.sle.backgrounds end, func = function() E:GetModule('SLE'):Reset(nil, nil, nil, true) end, }, spacerreset = { - order = 4, + order = 5, type = 'description', name = "", }, bottom_enabled = { - order = 5, + order = 6, type = "toggle", name = L["Bottom BG"], desc = L["Show/Hide this frame."], + disabled = function() return not E.private.sle.backgrounds end, get = function(info) return E.db.sle.backgrounds.bottom.enabled end, set = function(info, value) E.db.sle.backgrounds.bottom.enabled = value; BG:FramesVisibility() end }, left_enabled = { - order = 6, + order = 7, type = "toggle", name = L["Left BG"], desc = L["Show/Hide this frame."], + disabled = function() return not E.private.sle.backgrounds end, get = function(info) return E.db.sle.backgrounds.left.enabled end, set = function(info, value) E.db.sle.backgrounds.left.enabled = value; BG:FramesVisibility() end }, spacer = { - order = 7, + order = 8, type = "description", name = "", }, right_enabled = { - order = 8, + order = 9, type = "toggle", name = L["Right BG"], desc = L["Show/Hide this frame."], + disabled = function() return not E.private.sle.backgrounds end, get = function(info) return E.db.sle.backgrounds.right.enabled end, set = function(info, value) E.db.sle.backgrounds.right.enabled = value; BG:FramesVisibility() end }, action_enabled = { - order = 9, + order = 10, type = "toggle", name = L["Actionbar BG"], desc = L["Show/Hide this frame."], + disabled = function() return not E.private.sle.backgrounds end, get = function(info) return E.db.sle.backgrounds.action.enabled end, set = function(info, value) E.db.sle.backgrounds.action.enabled = value; BG:FramesVisibility() end }, @@ -84,7 +97,7 @@ for k,v in pairs(drop) do name = L[k], order = v[2], get = function(info) return E.db.sle.backgrounds[v[1]][ info[#info] ] end, - disabled = function() return not E.db.sle.backgrounds[v[1]].enabled end, + disabled = function() return not E.db.sle.backgrounds[v[1]].enabled or not E.private.sle.backgrounds end, args = { width = { --setting width (obviously) order = 1, -- 1.7.9.5 From f62f1a2ad3e8c162239d9cd241e5f4f8b52afe6a Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 02:03:11 +0400 Subject: [PATCH 009/267] bags --- ElvUI_SLE/modules/bags/baginfo.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI_SLE/modules/bags/baginfo.lua b/ElvUI_SLE/modules/bags/baginfo.lua index a6e4b5a..1abbee7 100755 --- a/ElvUI_SLE/modules/bags/baginfo.lua +++ b/ElvUI_SLE/modules/bags/baginfo.lua @@ -1,5 +1,5 @@ local E, L, V, P, G = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore -local BI = E:NewModule('BagInfo', 'AceHook-3.0', 'AceEvent-3.0', 'AceTimer-3.0') +local BI = E:NewModule('SLE_BagInfo', 'AceHook-3.0', 'AceEvent-3.0', 'AceTimer-3.0') local B = E:GetModule('Bags') local byte, format = string.byte, string.format -- 1.7.9.5 From f7af4ccbe01d766dbc19fa9df584c8f5dd13677a Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 02:03:28 +0400 Subject: [PATCH 010/267] install --- ElvUI_SLE/modules/install/BigWigs.lua | 2 +- ElvUI_SLE/modules/install/BigWigsFights.lua | 2 +- ElvUI_SLE/modules/install/BigWigsIcon.lua | 2 +- ElvUI_SLE/modules/install/Clique.lua | 2 +- ElvUI_SLE/modules/install/Hermes.lua | 2 +- ElvUI_SLE/modules/install/install.lua | 952 ++------------------------- ElvUI_SLE/modules/install/installer.lua | 2 +- ElvUI_SLE/modules/install/xCT+.lua | 2 +- 8 files changed, 56 insertions(+), 910 deletions(-) diff --git a/ElvUI_SLE/modules/install/BigWigs.lua b/ElvUI_SLE/modules/install/BigWigs.lua index bdf7b67..a2bb6c4 100755 --- a/ElvUI_SLE/modules/install/BigWigs.lua +++ b/ElvUI_SLE/modules/install/BigWigs.lua @@ -1,5 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); -local AI = E:GetModule('AddonInstaller') +local AI = E:GetModule('SLE_AddonInstaller') local ace3 = true -- whether or not this database is a Ace3 profile local name = 'BigWigs' -- the name of the addon diff --git a/ElvUI_SLE/modules/install/BigWigsFights.lua b/ElvUI_SLE/modules/install/BigWigsFights.lua index a0bb3f7..683fc08 100755 --- a/ElvUI_SLE/modules/install/BigWigsFights.lua +++ b/ElvUI_SLE/modules/install/BigWigsFights.lua @@ -1,5 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); -local AI = E:GetModule('AddonInstaller') +local AI = E:GetModule('SLE_AddonInstaller') local ace3 = false -- whether or not this database is a Ace3 profile local name = 'BigWigs' -- the name of the addon diff --git a/ElvUI_SLE/modules/install/BigWigsIcon.lua b/ElvUI_SLE/modules/install/BigWigsIcon.lua index be3a2e8..08e8ffc 100755 --- a/ElvUI_SLE/modules/install/BigWigsIcon.lua +++ b/ElvUI_SLE/modules/install/BigWigsIcon.lua @@ -1,5 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); -local AI = E:GetModule('AddonInstaller') +local AI = E:GetModule('SLE_AddonInstaller') local ace3 = false -- whether or not this database is a Ace3 profile local name = 'BigWigs' -- the name of the addon diff --git a/ElvUI_SLE/modules/install/Clique.lua b/ElvUI_SLE/modules/install/Clique.lua index 652e78f..9b4e294 100755 --- a/ElvUI_SLE/modules/install/Clique.lua +++ b/ElvUI_SLE/modules/install/Clique.lua @@ -1,5 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); -local AI = E:GetModule('AddonInstaller') +local AI = E:GetModule('SLE_AddonInstaller') local ace3 = false -- whether or not this database is a Ace3 profile local name = 'Clique' -- the name of the addon diff --git a/ElvUI_SLE/modules/install/Hermes.lua b/ElvUI_SLE/modules/install/Hermes.lua index d1c3658..5a3dc97 100755 --- a/ElvUI_SLE/modules/install/Hermes.lua +++ b/ElvUI_SLE/modules/install/Hermes.lua @@ -1,5 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); -local AI = E:GetModule('AddonInstaller') +local AI = E:GetModule('SLE_AddonInstaller') local ace3 = true -- whether or not this database is a Ace3 profile local name = 'Hermes' -- the name of the addon diff --git a/ElvUI_SLE/modules/install/install.lua b/ElvUI_SLE/modules/install/install.lua index 17831b3..b9b0351 100755 --- a/ElvUI_SLE/modules/install/install.lua +++ b/ElvUI_SLE/modules/install/install.lua @@ -1,762 +1,14 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB local UF = E:GetModule('UnitFrames'); -local AI = E:GetModule('AddonInstaller'); +local AI = E:GetModule('SLE_AddonInstaller'); local SLE = E:GetModule('SLE'); local CURRENT_PAGE = 0 -local MAX_PAGE +local MAX_PAGE = 5 -local function MaxPages() - if IsAddOnLoaded("ElvUI_Hud") then - MAX_PAGE = 11 - else - MAX_PAGE = 10 - end -end - -local function SetupChat() - InstallStepComplete.message = L["Chat Set"] - InstallStepComplete:Show() - FCF_ResetChatWindows() - FCF_SetLocked(ChatFrame1, 1) - FCF_DockFrame(ChatFrame2) - FCF_SetLocked(ChatFrame2, 1) - - FCF_OpenNewWindow(LOOT) - FCF_UnDockFrame(ChatFrame3) - FCF_SetLocked(ChatFrame3, 1) - ChatFrame3:Show() - - for i = 1, NUM_CHAT_WINDOWS do - local frame = _G[format("ChatFrame%s", i)] - local chatFrameId = frame:GetID() - local chatName = FCF_GetChatWindowInfo(chatFrameId) - - -- move general bottom left - if i == 1 then - frame:ClearAllPoints() - frame:Point("BOTTOMLEFT", LeftChatToggleButton, "TOPLEFT", 1, 3) - elseif i == 3 then - frame:ClearAllPoints() - frame:Point("BOTTOMLEFT", RightChatDataPanel, "TOPLEFT", 1, 3) - end - - FCF_SavePositionAndDimensions(frame) - FCF_StopDragging(frame) - - -- set default Elvui font size - FCF_SetChatWindowFontSize(nil, frame, 12) - - -- rename windows general because moved to chat #3 - if i == 1 then - FCF_SetWindowName(frame, GENERAL) - elseif i == 2 then - FCF_SetWindowName(frame, GUILD_EVENT_LOG) - elseif i == 3 then - FCF_SetWindowName(frame, LOOT.." / "..TRADE) - end - end - - ChatFrame_RemoveAllMessageGroups(ChatFrame1) - ChatFrame_AddMessageGroup(ChatFrame1, "SAY") - ChatFrame_AddMessageGroup(ChatFrame1, "EMOTE") - ChatFrame_AddMessageGroup(ChatFrame1, "YELL") - ChatFrame_AddMessageGroup(ChatFrame1, "GUILD") - ChatFrame_AddMessageGroup(ChatFrame1, "OFFICER") - ChatFrame_AddMessageGroup(ChatFrame1, "GUILD_ACHIEVEMENT") - ChatFrame_AddMessageGroup(ChatFrame1, "WHISPER") - ChatFrame_AddMessageGroup(ChatFrame1, "MONSTER_SAY") - ChatFrame_AddMessageGroup(ChatFrame1, "MONSTER_EMOTE") - ChatFrame_AddMessageGroup(ChatFrame1, "MONSTER_YELL") - ChatFrame_AddMessageGroup(ChatFrame1, "MONSTER_BOSS_EMOTE") - ChatFrame_AddMessageGroup(ChatFrame1, "PARTY") - ChatFrame_AddMessageGroup(ChatFrame1, "PARTY_LEADER") - ChatFrame_AddMessageGroup(ChatFrame1, "RAID") - ChatFrame_AddMessageGroup(ChatFrame1, "RAID_LEADER") - ChatFrame_AddMessageGroup(ChatFrame1, "RAID_WARNING") - ChatFrame_AddMessageGroup(ChatFrame1, "INSTANCE_CHAT") - ChatFrame_AddMessageGroup(ChatFrame1, "INSTANCE_CHAT_LEADER") - ChatFrame_AddMessageGroup(ChatFrame1, "BATTLEGROUND") - ChatFrame_AddMessageGroup(ChatFrame1, "BATTLEGROUND_LEADER") - ChatFrame_AddMessageGroup(ChatFrame1, "BG_HORDE") - ChatFrame_AddMessageGroup(ChatFrame1, "BG_ALLIANCE") - ChatFrame_AddMessageGroup(ChatFrame1, "BG_NEUTRAL") - ChatFrame_AddMessageGroup(ChatFrame1, "SYSTEM") - ChatFrame_AddMessageGroup(ChatFrame1, "ERRORS") - ChatFrame_AddMessageGroup(ChatFrame1, "AFK") - ChatFrame_AddMessageGroup(ChatFrame1, "DND") - ChatFrame_AddMessageGroup(ChatFrame1, "IGNORED") - ChatFrame_AddMessageGroup(ChatFrame1, "ACHIEVEMENT") - ChatFrame_AddMessageGroup(ChatFrame1, "BN_WHISPER") - ChatFrame_AddMessageGroup(ChatFrame1, "BN_CONVERSATION") - ChatFrame_AddMessageGroup(ChatFrame1, "BN_INLINE_TOAST_ALERT") - - - ChatFrame_RemoveAllMessageGroups(ChatFrame3) - ChatFrame_AddMessageGroup(ChatFrame3, "COMBAT_FACTION_CHANGE") - ChatFrame_AddMessageGroup(ChatFrame3, "SKILL") - ChatFrame_AddMessageGroup(ChatFrame3, "LOOT") - ChatFrame_AddMessageGroup(ChatFrame3, "MONEY") - ChatFrame_AddMessageGroup(ChatFrame3, "COMBAT_XP_GAIN") - ChatFrame_AddMessageGroup(ChatFrame3, "COMBAT_HONOR_GAIN") - ChatFrame_AddMessageGroup(ChatFrame3, "COMBAT_GUILD_XP_GAIN") - ChatFrame_AddChannel(ChatFrame1, GENERAL) - ChatFrame_RemoveChannel(ChatFrame1, L['Trade']) - ChatFrame_AddChannel(ChatFrame3, L['Trade']) - - - if E.myname == "Elvz" then - SetCVar("scriptErrors", 1) - end - - -- enable classcolor automatically on login and on each character without doing /configure each time. - ToggleChatColorNamesByClassGroup(true, "SAY") - ToggleChatColorNamesByClassGroup(true, "EMOTE") - ToggleChatColorNamesByClassGroup(true, "YELL") - ToggleChatColorNamesByClassGroup(true, "GUILD") - ToggleChatColorNamesByClassGroup(true, "OFFICER") - ToggleChatColorNamesByClassGroup(true, "GUILD_ACHIEVEMENT") - ToggleChatColorNamesByClassGroup(true, "ACHIEVEMENT") - ToggleChatColorNamesByClassGroup(true, "WHISPER") - ToggleChatColorNamesByClassGroup(true, "PARTY") - ToggleChatColorNamesByClassGroup(true, "PARTY_LEADER") - ToggleChatColorNamesByClassGroup(true, "RAID") - ToggleChatColorNamesByClassGroup(true, "RAID_LEADER") - ToggleChatColorNamesByClassGroup(true, "RAID_WARNING") - ToggleChatColorNamesByClassGroup(true, "BATTLEGROUND") - ToggleChatColorNamesByClassGroup(true, "BATTLEGROUND_LEADER") - ToggleChatColorNamesByClassGroup(true, "INSTANCE_CHAT") - ToggleChatColorNamesByClassGroup(true, "INSTANCE_CHAT_LEADER") - ToggleChatColorNamesByClassGroup(true, "CHANNEL1") - ToggleChatColorNamesByClassGroup(true, "CHANNEL2") - ToggleChatColorNamesByClassGroup(true, "CHANNEL3") - ToggleChatColorNamesByClassGroup(true, "CHANNEL4") - ToggleChatColorNamesByClassGroup(true, "CHANNEL5") - ToggleChatColorNamesByClassGroup(true, "CHANNEL6") - ToggleChatColorNamesByClassGroup(true, "CHANNEL7") - ToggleChatColorNamesByClassGroup(true, "CHANNEL8") - ToggleChatColorNamesByClassGroup(true, "CHANNEL9") - ToggleChatColorNamesByClassGroup(true, "CHANNEL10") - ToggleChatColorNamesByClassGroup(true, "CHANNEL11") - - --Adjust Chat Colors - --General - ChangeChatColor("CHANNEL1", 195/255, 230/255, 232/255) - --Trade - ChangeChatColor("CHANNEL2", 232/255, 158/255, 121/255) - --Local Defense - ChangeChatColor("CHANNEL3", 232/255, 228/255, 121/255) - - if E.Chat then - E.Chat:PositionChat(true) - if E.db['RightChatPanelFaded'] then - RightChatToggleButton:Click() - end - - if E.db['LeftChatPanelFaded'] then - LeftChatToggleButton:Click() - end - end -end - -local function SetupCVars() - SetCVar("alternateResourceText", 1) - SetCVar("statusTextDisplay", "BOTH") - SetCVar("mapQuestDifficulty", 1) - SetCVar("ShowClassColorInNameplate", 1) - SetCVar("screenshotQuality", 10) - SetCVar("chatMouseScroll", 1) - SetCVar("chatStyle", "classic") - SetCVar("WholeChatWindowClickable", 0) - SetCVar("ConversationMode", "inline") - SetCVar("showTutorials", 0) - SetCVar("UberTooltips", 1) - SetCVar("threatWarning", 3) - SetCVar('alwaysShowActionBars', 1) - SetCVar('lockActionBars', 1) - SetCVar('SpamFilter', 0) --Blocks mmo-champion.com, dumb... ElvUI one is more effeciant anyways. - InterfaceOptionsActionBarsPanelPickupActionKeyDropDown:SetValue('SHIFT') - InterfaceOptionsActionBarsPanelPickupActionKeyDropDown:RefreshValue() - - InstallStepComplete.message = L["CVars Set"] - InstallStepComplete:Show() -end - -function E:GetColor(r, b, g, a) - return { r = r, b = b, g = g, a = a } -end - -function E:SetupPixelPerfect(enabled, noMsg) - E.private.general.pixelPerfect = enabled; - - if (E.PixelMode ~= enabled) then - E:StaticPopup_Show('PIXELPERFECT_CHANGED') - end - - if not noMsg then - E.db.general.bottomPanel = enabled - E:GetModule('Layout'):BottomPanelVisibility() - end - - if noMsg then - if enabled then - if not E.db.movers then E.db.movers = {}; end - - E.db.actionbar.bar1.backdrop = false; - E.db.actionbar.bar3.backdrop = false; - E.db.actionbar.bar5.backdrop = false; - E.db.actionbar.bar1.buttonspacing = 2; - E.db.actionbar.bar2.buttonspacing = 2; - E.db.actionbar.bar3.buttonspacing = 2; - E.db.actionbar.bar4.buttonspacing = 2; - E.db.actionbar.bar5.buttonspacing = 2; - E.db.actionbar.barPet.buttonspacing = 2; - E.db.actionbar.stanceBar.buttonspacing = 2; - else - E.db.actionbar.bar1.backdrop = true; - E.db.actionbar.bar3.backdrop = true; - E.db.actionbar.bar5.backdrop = true; - E.db.actionbar.bar1.buttonspacing = 4; - E.db.actionbar.bar2.buttonspacing = 4; - E.db.actionbar.bar3.buttonspacing = 4; - E.db.actionbar.bar4.buttonspacing = 4; - E.db.actionbar.bar5.buttonspacing = 4; - E.db.actionbar.barPet.buttonspacing = 4; - E.db.actionbar.stanceBar.buttonspacing = 4; - end - end - - if InstallStepComplete and not noMsg then - InstallStepComplete.message = L["Pixel Perfect Set"] - InstallStepComplete:Show() - E:UpdateAll(true) - end - - - E.PixelMode = enabled -end - -function E:SetupTheme(theme, noDisplayMsg) - local classColor = E.myclass == 'PRIEST' and E.PriestColors or RAID_CLASS_COLORS[E.myclass] - E.private.theme = theme - - - --Set colors - if theme == "classic" then - E.db.general.bordercolor = E:GetColor(.31, .31, .31) - E.db.general.backdropcolor = E:GetColor(.1, .1, .1) - E.db.general.backdropfadecolor = E:GetColor(.06, .06, .06, .8) - - E.db.unitframe.colors.healthclass = false - E.db.unitframe.colors.health = E:GetColor(.31, .31, .31) - E.db.unitframe.colors.auraBarBuff = E:GetColor(.31, .31, .31) - E.db.unitframe.colors.castColor = E:GetColor(.31, .31, .31) - E.db.unitframe.colors.castClassColor = false - - elseif theme == "class" then - E.db.general.bordercolor = E:GetColor(.31, .31, .31) - E.db.general.backdropcolor = E:GetColor(.1, .1, .1) - E.db.general.backdropfadecolor = E:GetColor(.06, .06, .06, .8) - E.db.unitframe.colors.auraBarBuff = E:GetColor(classColor.r, classColor.b, classColor.g) - E.db.unitframe.colors.healthclass = true - E.db.unitframe.colors.castClassColor = true - else - E.db.general.bordercolor = E:GetColor(.1, .1, .1) - E.db.general.backdropcolor = E:GetColor(.1, .1, .1) - E.db.general.backdropfadecolor = E:GetColor(.054, .054, .054, .8) - E.db.unitframe.colors.auraBarBuff = E:GetColor(.1, .1, .1) - E.db.unitframe.colors.healthclass = false - E.db.unitframe.colors.health = E:GetColor(.1, .1, .1) - E.db.unitframe.colors.castColor = E:GetColor(.1, .1, .1) - E.db.unitframe.colors.castClassColor = false - end - - --Value Color - if theme == "class" then - E.db.general.valuecolor = E:GetColor(classColor.r, classColor.b, classColor.g) - else - E.db.general.valuecolor = E:GetColor(.09, .819, .513) - end - - if not noDisplayMsg then - E:UpdateAll(true) - end - - if InstallStatus then - InstallStatus:SetStatusBarColor(unpack(E['media'].rgbvaluecolor)) - - if InstallStepComplete and not noDisplayMsg then - InstallStepComplete.message = L["Theme Set"] - InstallStepComplete:Show() - end - end -end - -function E:SetupResolution(noDataReset) - if not noDataReset then - E:ResetMovers('') - end - - if self == 'low' then - if not E.db.movers then E.db.movers = {}; end - if not noDataReset then - E.db.chat.panelWidth = 400 - E.db.chat.panelHeight = 180 - - E:CopyTable(E.db.actionbar, P.actionbar) - - E.db.actionbar.bar1.heightMult = 2; - E.db.actionbar.bar2.enabled = true; - E.db.actionbar.bar3.enabled = false; - E.db.actionbar.bar5.enabled = false; - end - - if not noDataReset then - E.db.auras.wrapAfter = 10; - end - E.db.general.reputation.width = 400 - E.db.general.experience.width = 400 - E.db.movers.ElvAB_2 = "CENTERElvUIParentBOTTOM056.18" - - if not noDataReset then - E:CopyTable(E.db.unitframe.units, P.unitframe.units) - - E.db.unitframe.fontSize = 10 - - E.db.unitframe.units.player.width = 200; - E.db.unitframe.units.player.castbar.width = 200; - E.db.unitframe.units.player.classbar.fill = 'fill'; - E.db.unitframe.units.player.health.text_format = "[healthcolor][health:current]" - - E.db.unitframe.units.target.width = 200; - E.db.unitframe.units.target.castbar.width = 200; - E.db.unitframe.units.target.health.text_format = '[healthcolor][health:current]' - - E.db.unitframe.units.pet.power.enable = false; - E.db.unitframe.units.pet.width = 200; - E.db.unitframe.units.pet.height = 26; - - E.db.unitframe.units.targettarget.debuffs.enable = false; - E.db.unitframe.units.targettarget.power.enable = false; - E.db.unitframe.units.targettarget.width = 200; - E.db.unitframe.units.targettarget.height = 26; - - E.db.unitframe.units.boss.width = 200; - E.db.unitframe.units.boss.castbar.width = 200; - E.db.unitframe.units.arena.width = 200; - E.db.unitframe.units.arena.castbar.width = 200; - end - - local isPixel = E.private.general.pixelPerfect - local xOffset = isPixel and 103 or 106; - local yOffset = isPixel and 125 or 135; - local yOffsetSmall = isPixel and 76 or 80; - - E.db.movers.ElvUF_PlayerMover = "BOTTOMElvUIParentBOTTOM"..-xOffset..""..yOffset - E.db.movers.ElvUF_TargetTargetMover = "BOTTOMElvUIParentBOTTOM"..xOffset..""..yOffsetSmall - E.db.movers.ElvUF_TargetMover = "BOTTOMElvUIParentBOTTOM"..xOffset..""..yOffset - E.db.movers.ElvUF_PetMover = "BOTTOMElvUIParentBOTTOM"..-xOffset..""..yOffsetSmall - E.db.movers.ElvUF_FocusMover = "BOTTOMElvUIParentBOTTOM310332" - - E.db.lowresolutionset = true; - elseif not noDataReset then - E.db.chat.panelWidth = P.chat.panelWidth - E.db.chat.panelHeight = P.chat.panelHeight - - E:CopyTable(E.db.actionbar, P.actionbar) - E:CopyTable(E.db.unitframe.units, P.unitframe.units) - E:SetupPixelPerfect(E.PixelMode, true) - E.db.auras.wrapAfter = P.auras.wrapAfter; - E.db.general.reputation.width = P.general.reputation.width - E.db.general.experience.width = P.general.experience.width - - E.db.lowresolutionset = nil; - end - - if not noDataReset and E.private.theme then - E:SetupTheme(E.private.theme, true) - end - - E:UpdateAll(true) - - if InstallStepComplete and not noDataReset then - InstallStepComplete.message = L["Resolution Style Set"] - InstallStepComplete:Show() - end -end - -function E:SetupLayout(layout, noDataReset) - --Unitframes - if not noDataReset then - E:CopyTable(E.db.unitframe.units, P.unitframe.units) - E:CopyTable(E.db.sle.combatico, P.sle.combatico) - E.db.sle.powtext = false - end - - if not noDataReset then - E:ResetMovers('') - E:SetupPixelPerfect(E.PixelMode, true) - if not E.db.movers then E.db.movers = {} end - - E.db.actionbar.bar2.enabled = E.db.lowresolutionset - if E.PixelMode then - E.db.movers.ElvAB_2 = "BOTTOMElvUIParentBOTTOM038" - else - E.db.movers.ElvAB_2 = "BOTTOMElvUIParentBOTTOM040" - end - if not E.db.lowresolutionset then - E.db.actionbar.bar3.buttons = 6 - E.db.actionbar.bar5.buttons = 6 - E.db.actionbar.bar4.enabled = true - end - end - - if layout == 'healer' then - if not IsAddOnLoaded('Clique') then - E:StaticPopup_Show("CLIQUE_ADVERT") - end - - if not noDataReset then - E.db.unitframe.units.raid10.horizontalSpacing = 9; - E.db.unitframe.units.raid10.rdebuffs.enable = false; - E.db.unitframe.units.raid10.verticalSpacing = 9; - E.db.unitframe.units.raid10.debuffs.sizeOverride = 16; - E.db.unitframe.units.raid10.debuffs.enable = true - E.db.unitframe.units.raid10.debuffs.anchorPoint = "TOPRIGHT"; - E.db.unitframe.units.raid10.debuffs.xOffset = -4; - E.db.unitframe.units.raid10.debuffs.yOffset = -7; - E.db.unitframe.units.raid10.positionOverride = "BOTTOMRIGHT"; - E.db.unitframe.units.raid10.height = 45; - E.db.unitframe.units.raid10.buffs.noConsolidated = false - E.db.unitframe.units.raid10.buffs.xOffset = 50; - E.db.unitframe.units.raid10.buffs.yOffset = -6; - E.db.unitframe.units.raid10.buffs.clickThrough = true - E.db.unitframe.units.raid10.buffs.noDuration = false - E.db.unitframe.units.raid10.buffs.playerOnly = false; - E.db.unitframe.units.raid10.buffs.perrow = 1 - E.db.unitframe.units.raid10.buffs.useFilter = "TurtleBuffs" - E.db.unitframe.units.raid10.buffs.sizeOverride = 22 - E.db.unitframe.units.raid10.buffs.useBlacklist = false - E.db.unitframe.units.raid10.buffs.enable = true - E.db.unitframe.units.raid10.growthDirection = "LEFT_UP" - - E.db.unitframe.units.raid25.horizontalSpacing = 9; - E.db.unitframe.units.raid25.rdebuffs.enable = false; - E.db.unitframe.units.raid25.verticalSpacing = 9; - E.db.unitframe.units.raid25.debuffs.sizeOverride = 16; - E.db.unitframe.units.raid25.debuffs.enable = true - E.db.unitframe.units.raid25.debuffs.anchorPoint = "TOPRIGHT"; - E.db.unitframe.units.raid25.debuffs.xOffset = -4; - E.db.unitframe.units.raid25.debuffs.yOffset = -7; - E.db.unitframe.units.raid25.height = 45; - E.db.unitframe.units.raid25.buffs.noConsolidated = false - E.db.unitframe.units.raid25.buffs.xOffset = 50; - E.db.unitframe.units.raid25.buffs.yOffset = -6; - E.db.unitframe.units.raid25.buffs.clickThrough = true - E.db.unitframe.units.raid25.buffs.noDuration = false - 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.buffs.sizeOverride = 22 - E.db.unitframe.units.raid25.buffs.useBlacklist = false - E.db.unitframe.units.raid25.buffs.enable = true - E.db.unitframe.units.raid25.growthDirection = "LEFT_UP" - - E.db.unitframe.units.party.growthDirection = "LEFT_UP" - E.db.unitframe.units.party.horizontalSpacing = 9; - E.db.unitframe.units.party.verticalSpacing = 9; - E.db.unitframe.units.party.debuffs.sizeOverride = 16; - E.db.unitframe.units.party.debuffs.enable = true - E.db.unitframe.units.party.debuffs.anchorPoint = "TOPRIGHT"; - E.db.unitframe.units.party.debuffs.xOffset = -4; - E.db.unitframe.units.party.debuffs.yOffset = -7; - E.db.unitframe.units.party.height = 45; - E.db.unitframe.units.party.buffs.noConsolidated = false - E.db.unitframe.units.party.buffs.xOffset = 50; - E.db.unitframe.units.party.buffs.yOffset = -6; - E.db.unitframe.units.party.buffs.clickThrough = true - E.db.unitframe.units.party.buffs.noDuration = false - E.db.unitframe.units.party.buffs.playerOnly = false; - E.db.unitframe.units.party.buffs.perrow = 1 - E.db.unitframe.units.party.buffs.useFilter = "TurtleBuffs" - E.db.unitframe.units.party.buffs.sizeOverride = 22 - E.db.unitframe.units.party.buffs.useBlacklist = false - E.db.unitframe.units.party.buffs.enable = true - E.db.unitframe.units.party.roleIcon.position = "BOTTOMRIGHT" - E.db.unitframe.units.party.health.text_format = "[healthcolor][health:deficit]" - E.db.unitframe.units.party.health.position = "BOTTOM" - E.db.unitframe.units.party.GPSArrow.size = 40 - E.db.unitframe.units.party.width = 80 - E.db.unitframe.units.party.height = 45 - E.db.unitframe.units.party.name.text_format = "[namecolor][name:short]" - E.db.unitframe.units.party.name.position = "TOP" - E.db.unitframe.units.party.power.text_format = "" - - E.db.unitframe.units.raid40.height = 30 - E.db.unitframe.units.raid40.growthDirection = "LEFT_UP" - - E.db.unitframe.units.party.health.frequentUpdates = true - E.db.unitframe.units.raid10.health.frequentUpdates = true - E.db.unitframe.units.raid25.health.frequentUpdates = true - E.db.unitframe.units.raid40.health.frequentUpdates = true - - E.db.unitframe.units.party.healPrediction = true; - E.db.unitframe.units.raid10.healPrediction = true; - E.db.unitframe.units.raid25.healPrediction = true; - E.db.unitframe.units.raid40.healPrediction = true; - - E.db.actionbar.bar2.enabled = true - if not E.db.lowresolutionset then - E.db.actionbar.bar3.buttons = 12 - E.db.actionbar.bar5.buttons = 12 - E.db.actionbar.bar4.enabled = false - if not E.PixelMode then - E.db.actionbar.bar1.heightMult = 2 - end - end - end - - if not E.db.movers then E.db.movers = {}; end - local xOffset = GetScreenWidth() * 0.34375 - - if E.PixelMode then - E.db.movers.ElvAB_3 = "BOTTOMElvUIParentBOTTOM3124" - E.db.movers.ElvAB_5 = "BOTTOMElvUIParentBOTTOM-3124" - E.db.movers.ElvUF_PartyMover = "BOTTOMRIGHTElvUIParentBOTTOMLEFT"..xOffset.."450" - E.db.movers.ElvUF_Raid10Mover = "BOTTOMRIGHTElvUIParentBOTTOMLEFT"..xOffset.."450" - E.db.movers.ElvUF_Raid25Mover = "BOTTOMRIGHTElvUIParentBOTTOMLEFT"..xOffset.."450" - E.db.movers.ElvUF_Raid40Mover = "BOTTOMRIGHTElvUIParentBOTTOMLEFT"..xOffset.."450" - - if not E.db.lowresolutionset then - E.db.movers.ElvUF_TargetMover = "BOTTOMElvUIParentBOTTOM278132" - E.db.movers.ElvUF_PlayerMover = "BOTTOMElvUIParentBOTTOM-278132" - E.db.movers.ElvUF_PetMover = "BOTTOMElvUIParentBOTTOM0176" - E.db.movers.ElvUF_TargetTargetMover = "BOTTOMElvUIParentBOTTOM0132" - E.db.movers.ElvUF_FocusMover = "BOTTOMElvUIParentBOTTOM310432" - E.db.movers["BossButton"] = "BOTTOMElvUIParentBOTTOM0275" - else - E.db.movers.ElvUF_PlayerMover = "BOTTOMElvUIParentBOTTOM-102182" - E.db.movers.ElvUF_TargetMover = "BOTTOMElvUIParentBOTTOM102182" - E.db.movers.ElvUF_TargetTargetMover = "BOTTOMElvUIParentBOTTOM102120" - E.db.movers.ElvUF_PetMover = "BOTTOMElvUIParentBOTTOM-102120" - E.db.movers.ElvUF_FocusMover = "BOTTOMElvUIParentBOTTOM310332" - E.db.movers["BossButton"] = "TOPElvUIParentTOP0-138" - end - else - E.db.movers.ElvAB_3 = "BOTTOMElvUIParentBOTTOM3324" - E.db.movers.ElvAB_5 = "BOTTOMElvUIParentBOTTOM-3324" - E.db.movers.ElvUF_PartyMover = "BOTTOMRIGHTElvUIParentBOTTOMLEFT"..xOffset.."450" - E.db.movers.ElvUF_Raid10Mover = "BOTTOMRIGHTElvUIParentBOTTOMLEFT"..xOffset.."450" - E.db.movers.ElvUF_Raid25Mover = "BOTTOMRIGHTElvUIParentBOTTOMLEFT"..xOffset.."450" - E.db.movers.ElvUF_Raid40Mover = "BOTTOMRIGHTElvUIParentBOTTOMLEFT"..xOffset.."450" - - if not E.db.lowresolutionset then - E.db.movers.ElvUF_TargetMover = "BOTTOMElvUIParentBOTTOM307145" - E.db.movers.ElvUF_PlayerMover = "BOTTOMElvUIParentBOTTOM-307145" - E.db.movers.ElvUF_PetMover = "BOTTOMElvUIParentBOTTOM0186" - E.db.movers.ElvUF_TargetTargetMover = "BOTTOMElvUIParentBOTTOM0145" - E.db.movers.ElvUF_FocusMover = "BOTTOMElvUIParentBOTTOM310432" - E.db.movers["BossButton"] = "BOTTOMElvUIParentBOTTOM0275" - else - E.db.movers.ElvUF_PlayerMover = "BOTTOMElvUIParentBOTTOM-118182" - E.db.movers.ElvUF_TargetMover = "BOTTOMElvUIParentBOTTOM118182" - E.db.movers.ElvUF_TargetTargetMover = "BOTTOMElvUIParentBOTTOM118120" - E.db.movers.ElvUF_PetMover = "BOTTOMElvUIParentBOTTOM-118120" - E.db.movers.ElvUF_FocusMover = "BOTTOMElvUIParentBOTTOM310332" - E.db.movers["BossButton"] = "TOPElvUIParentTOP0-138" - end - end - elseif E.db.lowresolutionset then - if not E.db.movers then E.db.movers = {}; end - if E.PixelMode then - E.db.movers.ElvUF_PlayerMover = "BOTTOMElvUIParentBOTTOM-102135" - E.db.movers.ElvUF_TargetMover = "BOTTOMElvUIParentBOTTOM102135" - E.db.movers.ElvUF_TargetTargetMover = "BOTTOMElvUIParentBOTTOM10280" - E.db.movers.ElvUF_PetMover = "BOTTOMElvUIParentBOTTOM-10280" - E.db.movers.ElvUF_FocusMover = "BOTTOMElvUIParentBOTTOM310332" - else - E.db.movers.ElvUF_PlayerMover = "BOTTOMElvUIParentBOTTOM-118142" - E.db.movers.ElvUF_TargetMover = "BOTTOMElvUIParentBOTTOM118142" - E.db.movers.ElvUF_TargetTargetMover = "BOTTOMElvUIParentBOTTOM11884" - E.db.movers.ElvUF_PetMover = "BOTTOMElvUIParentBOTTOM-11884" - E.db.movers.ElvUF_FocusMover = "BOTTOMElvUIParentBOTTOM310332" - end - - E.db.movers["BossButton"] = "TOPElvUIParentTOP0-138" - end - - if layout ~= 'healer' and not E.db.lowresolutionset then - E.db.actionbar.bar1.heightMult = 1 - end - - if E.db.lowresolutionset and not noDataReset then - E.db.unitframe.units.player.width = 200; - if layout ~= 'healer' then - E.db.unitframe.units.player.castbar.width = 200; - end - E.db.unitframe.units.player.classbar.fill = 'fill'; - - E.db.unitframe.units.target.width = 200; - E.db.unitframe.units.target.castbar.width = 200; - - E.db.unitframe.units.pet.power.enable = false; - E.db.unitframe.units.pet.width = 200; - E.db.unitframe.units.pet.height = 26; - - E.db.unitframe.units.targettarget.debuffs.enable = false; - E.db.unitframe.units.targettarget.power.enable = false; - E.db.unitframe.units.targettarget.width = 200; - E.db.unitframe.units.targettarget.height = 26; - - E.db.unitframe.units.boss.width = 200; - E.db.unitframe.units.boss.castbar.width = 200; - E.db.unitframe.units.arena.width = 200; - E.db.unitframe.units.arena.castbar.width = 200; - end - - if(layout == 'dpsCaster' or layout == 'healer' or (layout == 'dpsMelee' and E.myclass == 'HUNTER')) then - if not E.db.movers then E.db.movers = {}; end - E.db.unitframe.units.player.castbar.width = E.PixelMode and 406 or 436 - E.db.unitframe.units.player.castbar.height = 28 - local yOffset = 80 - if not E.db.lowresolutionset then - if layout ~= 'healer' then - yOffset = 42 - - if E.PixelMode then - E.db.movers.ElvUF_PlayerMover = "BOTTOMElvUIParentBOTTOM-278110" - E.db.movers.ElvUF_TargetMover = "BOTTOMElvUIParentBOTTOM278110" - E.db.movers.ElvUF_TargetTargetMover = "BOTTOMElvUIParentBOTTOM0110" - E.db.movers.ElvUF_PetMover = "BOTTOMElvUIParentBOTTOM0150" - E.db.movers["BossButton"] = "BOTTOMElvUIParentBOTTOM0195" - else - E.db.movers.ElvUF_PlayerMover = "BOTTOMElvUIParentBOTTOM-307110" - E.db.movers.ElvUF_TargetMover = "BOTTOMElvUIParentBOTTOM307110" - E.db.movers.ElvUF_TargetTargetMover = "BOTTOMElvUIParentBOTTOM0110" - E.db.movers.ElvUF_PetMover = "BOTTOMElvUIParentBOTTOM0150" - E.db.movers["BossButton"] = "BOTTOMElvUIParentBOTTOM0195" - end - else - yOffset = 76 - end - elseif E.db.lowresolutionset then - if E.PixelMode then - E.db.movers.ElvUF_PlayerMover = "BOTTOMElvUIParentBOTTOM-102182" - E.db.movers.ElvUF_TargetMover = "BOTTOMElvUIParentBOTTOM102182" - E.db.movers.ElvUF_TargetTargetMover = "BOTTOMElvUIParentBOTTOM102120" - E.db.movers.ElvUF_PetMover = "BOTTOMElvUIParentBOTTOM-102120" - E.db.movers.ElvUF_FocusMover = "BOTTOMElvUIParentBOTTOM310332" - else - E.db.movers.ElvUF_PlayerMover = "BOTTOMElvUIParentBOTTOM-118182" - E.db.movers.ElvUF_TargetMover = "BOTTOMElvUIParentBOTTOM118182" - E.db.movers.ElvUF_TargetTargetMover = "BOTTOMElvUIParentBOTTOM118120" - E.db.movers.ElvUF_PetMover = "BOTTOMElvUIParentBOTTOM-118120" - E.db.movers.ElvUF_FocusMover = "BOTTOMElvUIParentBOTTOM310332" - end - - E.db.movers["BossButton"] = "TOPElvUIParentTOP0-138" - end - - if E.PixelMode then - E.db.movers.ElvUF_PlayerCastbarMover = "BOTTOMElvUIParentBOTTOM0"..yOffset - else - E.db.movers.ElvUF_PlayerCastbarMover = "BOTTOMElvUIParentBOTTOM-2"..(yOffset + 5) - end - elseif (layout == 'dpsMelee' or layout == 'tank') and not E.db.lowresolutionset and not E.PixelMode then - E.db.movers.ElvUF_PlayerMover = "BOTTOMElvUIParentBOTTOM-30776" - E.db.movers.ElvUF_TargetMover = "BOTTOMElvUIParentBOTTOM30776" - E.db.movers.ElvUF_TargetTargetMover = "BOTTOMElvUIParentBOTTOM076" - E.db.movers.ElvUF_PetMover = "BOTTOMElvUIParentBOTTOM0115" - E.db.movers["BossButton"] = "BOTTOMElvUIParentBOTTOM0158" - - end - - --Datatexts - if not noDataReset then - E:CopyTable(E.db.datatexts.panels, P.datatexts.panels) - if layout == 'tank' then - E.db.datatexts.panels.LeftChatDataPanel.left = 'Avoidance'; - E.db.datatexts.panels.LeftChatDataPanel.right = 'Vengeance'; - elseif layout == 'healer' or layout == 'dpsCaster' then - E.db.datatexts.panels.LeftChatDataPanel.left = 'Spell/Heal Power'; - E.db.datatexts.panels.LeftChatDataPanel.right = 'Haste'; - else - E.db.datatexts.panels.LeftChatDataPanel.left = 'Attack Power'; - E.db.datatexts.panels.LeftChatDataPanel.right = 'Haste'; - end - - if InstallStepComplete then - InstallStepComplete.message = L["Layout Set"] - InstallStepComplete:Show() - end - end - - E.db.layoutSet = layout - - if not noDataReset and E.private.theme then - E:SetupTheme(E.private.theme, true) - end - - if not noDataReset then - E:CopyTable(E.db.sle.marks, P.sle.marks) - E:CopyTable(E.db.sle.backgrounds, P.sle.backgrounds) - E:CopyTable(E.db.sle.uibuttons, P.sle.uibuttons) - end - - E:UpdateAll(true) - local DT = E:GetModule('DataTexts') - DT:LoadDataTexts() -end - - -local function SetupAuras(style) - E:CopyTable(E.db.unitframe.units.player.buffs, P.unitframe.units.player.buffs) - E:CopyTable(E.db.unitframe.units.player.debuffs, P.unitframe.units.player.debuffs) - E:CopyTable(E.db.unitframe.units.player.aurabar, P.unitframe.units.player.aurabar) - - E:CopyTable(E.db.unitframe.units.target.buffs, P.unitframe.units.target.buffs) - E:CopyTable(E.db.unitframe.units.target.debuffs, P.unitframe.units.target.debuffs) - E:CopyTable(E.db.unitframe.units.target.aurabar, P.unitframe.units.target.aurabar) - E.db.unitframe.units.target.smartAuraDisplay = P.unitframe.units.target.smartAuraDisplay - - E:CopyTable(E.db.unitframe.units.focus.buffs, P.unitframe.units.focus.buffs) - E:CopyTable(E.db.unitframe.units.focus.debuffs, P.unitframe.units.focus.debuffs) - E:CopyTable(E.db.unitframe.units.focus.aurabar, P.unitframe.units.focus.aurabar) - E.db.unitframe.units.focus.smartAuraDisplay = P.unitframe.units.focus.smartAuraDisplay - - if not style then - --PLAYER - E.db.unitframe.units.player.buffs.enable = true; - E.db.unitframe.units.player.buffs.attachTo = 'FRAME'; - E.db.unitframe.units.player.buffs.noDuration = false; - - E.db.unitframe.units.player.debuffs.attachTo = 'BUFFS'; - - E.db.unitframe.units.player.aurabar.enable = false; - - --TARGET - E.db.unitframe.units.target.smartAuraDisplay = 'DISABLED'; - E.db.unitframe.units.target.debuffs.enable = true; - E.db.unitframe.units.target.aurabar.enable = false; - elseif style == 'integrated' then - --seriosly is this fucking hard?? - E.db.unitframe.units.target.smartAuraDisplay = 'SHOW_DEBUFFS_ON_FRIENDLIES'; - E.db.unitframe.units.target.buffs.playerOnly = {friendly = true, enemy = false}; - E.db.unitframe.units.target.debuffs.enable = false; - E.db.unitframe.units.target.aurabar.attachTo = 'BUFFS'; - end - - E:GetModule('UnitFrames'):Update_AllFrames() - if InstallStepComplete then - InstallStepComplete.message = L["Auras Set"] - InstallStepComplete:Show() - end -end - - -function E:DarthSetup() --The function to switch from classic ElvUI settings to Darth's - InstallStepComplete.message = L["Darth's Defaults Set"] - InstallStepComplete:Show() +function SLE:DarthSetup() --The function to switch from classic ElvUI settings to Darth's + SLEInstallStepComplete.message = L["Darth's Defaults Set"] + SLEInstallStepComplete:Show() if not E.db.movers then E.db.movers = {}; end if not E.db.loclite then E.db.loclite = {} end @@ -1506,9 +758,9 @@ function E:DarthSetup() --The function to switch from classic ElvUI settings to E:UpdateAll(true) end -function E:RepoocSetup() --The function to switch from classic ElvUI settings to Repooc's - InstallStepComplete.message = L["Repooc's Defaults Set"] - InstallStepComplete:Show() +function SLE:RepoocSetup() --The function to switch from classic ElvUI settings to Repooc's + SLEInstallStepComplete.message = L["Repooc's Defaults Set"] + SLEInstallStepComplete:Show() if not E.db.movers then E.db.movers = {}; end local layout = E.db.layoutSet --Pull which layout was selected if any. @@ -2054,9 +1306,9 @@ function E:RepoocSetup() --The function to switch from classic ElvUI settings to E:UpdateAll(true) end -function E:AffinitiiSetup() --The function to switch from class ElvUI settings to Affinitii's - InstallStepComplete.message = L["Affinitii's Defaults Set"] - InstallStepComplete:Show() +function SLE:AffinitiiSetup() --The function to switch from class ElvUI settings to Affinitii's + SLEInstallStepComplete.message = L["Affinitii's Defaults Set"] + SLEInstallStepComplete:Show() if not E.db.movers then E.db.movers = {}; end layout = E.db.layoutSet --Pull which layout was selected if any. pixel = E.PixelMode --Pull PixelMode @@ -2562,24 +1814,9 @@ function E:AffinitiiSetup() --The function to switch from class ElvUI settings t E:UpdateAll(true) end -function E:HudSimple() - local H = E:GetModule('HUD') - InstallStepComplete.message = L["Simple Layout Set"] - InstallStepComplete:Show() - H:SimpleLayout() - H:UpdateAllFrames() -end - -function E:HudDefault() - local H = E:GetModule('HUD') - InstallStepComplete.message = L["Default Layout"] - InstallStepComplete:Show() - E:CopyTable(E.db.hud,P.hud) - H:UpdateAllFrames() -end local function InstallComplete() - E.private.install_complete = E.version + E.private.sle.install_complete = SLE.version if GetCVarBool("Sound_EnableMusic") then StopMusic() @@ -2603,11 +1840,11 @@ local function ResetAll() InstallOption4Button:Hide() InstallOption4Button:SetScript('OnClick', nil) InstallOption4Button:SetText('') - ElvUIInstallFrame.SubTitle:SetText("") - ElvUIInstallFrame.Desc1:SetText("") - ElvUIInstallFrame.Desc2:SetText("") - ElvUIInstallFrame.Desc3:SetText("") - ElvUIInstallFrame:Size(550, 400) + SLEInstallFrame.SubTitle:SetText("") + SLEInstallFrame.Desc1:SetText("") + SLEInstallFrame.Desc2:SetText("") + SLEInstallFrame.Desc3:SetText("") + SLEInstallFrame:Size(550, 400) end local function SetPage(PageNum) @@ -2615,7 +1852,7 @@ local function SetPage(PageNum) ResetAll() InstallStatus:SetValue(PageNum) - local f = ElvUIInstallFrame + local f = SLEInstallFrame if PageNum == MAX_PAGE then InstallNextButton:Disable() @@ -2630,150 +1867,60 @@ local function SetPage(PageNum) end if PageNum == 1 then - f.SubTitle:SetText(format(L["Welcome to ElvUI version %s!"], E.version)) - f.Desc1:SetText(L["This install process will help you learn some of the features in ElvUI has to offer and also prepare your user interface for usage."]) - f.Desc2:SetText(L["The in-game configuration menu can be accesses by typing the /ec command or by clicking the 'C' button on the minimap. Press the button below if you wish to skip the installation process."]) + f.SubTitle:SetText(format(L["Welcome to |cff1784d1Shadow & Light|r version %s!"], SLE.version)) + f.Desc1:SetText("This install process will setup configuration of Shadow & Light.") + f.Desc2:SetText("") f.Desc3:SetText(L["Please press the continue button to go onto the next step."]) InstallOption1Button:Show() InstallOption1Button:SetScript("OnClick", InstallComplete) InstallOption1Button:SetText(L["Skip Process"]) elseif PageNum == 2 then - f.SubTitle:SetText(L["CVars"]) - f.Desc1:SetText(L["This part of the installation process sets up your World of Warcraft default options it is recommended you should do this step for everything to behave properly."]) - f.Desc2:SetText(L["Please click the button below to setup your CVars."]) - f.Desc3:SetText(L["Importance: |cff07D400High|r"]) - InstallOption1Button:Show() - InstallOption1Button:SetScript("OnClick", SetupCVars) - InstallOption1Button:SetText(L["Setup CVars"]) - elseif PageNum == 3 then f.SubTitle:SetText(L["Chat"]) - f.Desc1:SetText(L["This part of the installation process sets up your chat windows names, positions and colors."]) - f.Desc2:SetText(L["The chat windows function the same as Blizzard standard chat windows, you can right click the tabs and drag them around, rename, etc. Please click the button below to setup your chat windows."]) + f.Desc1:SetText("This options will determine if you want to use default ElvUI's chat datapanels or let Shadow & Light handle them.") + f.Desc2:SetText("Shadow & Light will dock them outside of actual chat panels.") f.Desc3:SetText(L["Importance: |cffD3CF00Medium|r"]) + InstallOption1Button:Show() - InstallOption1Button:SetScript("OnClick", SetupChat) - InstallOption1Button:SetText(L["Setup Chat"]) - elseif PageNum == 4 then - f.SubTitle:SetText(L["Pixel Perfect"]) - f.Desc1:SetText(L['The Pixel Perfect option will change the overall apperance of your UI. Using Pixel Perfect is a slight performance increase over the traditional layout.']) - f.Desc2:SetText(L['Using this option will cause your borders around frames to be 1 pixel wide instead of 3 pixel. You may have to finish the installation to notice a differance. By default this is enabled.']) - f.Desc3:SetText(L["Importance: |cffFF0000Low|r"]) - - InstallOption1Button:Show() - InstallOption1Button:SetScript('OnClick', function() E:SetupPixelPerfect(true) end) - InstallOption1Button:SetText(L["Enable"]) + InstallOption1Button:SetScript("OnClick", function() E.db.sle.datatext.chathandle = false; E:GetModule('Layout'):ToggleChatPanels() end) + InstallOption1Button:SetText("ElvUI Panels") InstallOption2Button:Show() - InstallOption2Button:SetScript('OnClick', function() E:SetupPixelPerfect(false) end) - InstallOption2Button:SetText(L['Disable']) - elseif PageNum == 5 then - f.SubTitle:SetText(L['Theme Setup']) - f.Desc1:SetText(L['Choose a theme layout you wish to use for your initial setup.']) - f.Desc2:SetText(L['You can always change fonts and colors of any element of elvui from the in-game configuration.']) + InstallOption2Button:SetScript('OnClick', function() E.db.sle.datatext.chathandle = true; E:GetModule('Layout'):ToggleChatPanels() end) + InstallOption2Button:SetText("S&L Panels") + elseif PageNum == 3 then + f.SubTitle:SetText(L["Armory Mode"]) + f.Desc1:SetText("Imma test text") + f.Desc2:SetText("This page is for armory mode disable/enable stuff") f.Desc3:SetText(L["Importance: |cffFF0000Low|r"]) - - InstallOption1Button:Show() - InstallOption1Button:SetScript('OnClick', function() E:SetupTheme('classic') end) - InstallOption1Button:SetText(L["Classic"]) - InstallOption2Button:Show() - InstallOption2Button:SetScript('OnClick', function() E:SetupTheme('default') end) - InstallOption2Button:SetText(L['Dark']) - InstallOption3Button:Show() - InstallOption3Button:SetScript('OnClick', function() E:SetupTheme('class') end) - InstallOption3Button:SetText(CLASS) - elseif PageNum == 6 then - f.SubTitle:SetText(L["Resolution"]) - f.Desc1:SetText(format(L["Your current resolution is %s, this is considered a %s resolution."], E.resolution, E.lowversion == true and L["low"] or L["high"])) - if E.lowversion then - f.Desc2:SetText(L["This resolution requires that you change some settings to get everything to fit on your screen."].." "..L["Click the button below to resize your chat frames, unitframes, and reposition your actionbars."].." "..L["You may need to further alter these settings depending how low you resolution is."]) - f.Desc3:SetText(L["Importance: |cff07D400High|r"]) - else - f.Desc2:SetText(L["This resolution doesn't require that you change settings for the UI to fit on your screen."].." "..L["Click the button below to resize your chat frames, unitframes, and reposition your actionbars."].." "..L["This is completely optional."]) - f.Desc3:SetText(L["Importance: |cffFF0000Low|r"]) - end - - InstallOption1Button:Show() - InstallOption1Button:SetScript('OnClick', function() E.SetupResolution('high') end) - InstallOption1Button:SetText(L["High Resolution"]) - InstallOption2Button:Show() - InstallOption2Button:SetScript('OnClick', function() E.SetupResolution('low') end) - InstallOption2Button:SetText(L['Low Resolution']) - elseif PageNum == 7 then - f.SubTitle:SetText(L["Layout"]) - f.Desc1:SetText(L["You can now choose what layout you wish to use based on your combat role."]) - f.Desc2:SetText(L["This will change the layout of your unitframes, raidframes, and datatexts."]) - f.Desc3:SetText(L["Importance: |cffD3CF00Medium|r"]) - InstallOption1Button:Show() - InstallOption1Button:SetScript('OnClick', function() E.db.layoutSet = nil; E:SetupLayout('tank') end) - InstallOption1Button:SetText(L['Tank']) - InstallOption2Button:Show() - InstallOption2Button:SetScript('OnClick', function() E.db.layoutSet = nil; E:SetupLayout('healer') end) - InstallOption2Button:SetText(L['Healer']) - InstallOption3Button:Show() - InstallOption3Button:SetScript('OnClick', function() E.db.layoutSet = nil; E:SetupLayout('dpsMelee') end) - InstallOption3Button:SetText(L['Physical DPS']) - InstallOption4Button:Show() - InstallOption4Button:SetScript('OnClick', function() E.db.layoutSet = nil; E:SetupLayout('dpsCaster') end) - InstallOption4Button:SetText(L['Caster DPS']) - elseif PageNum == 8 then - f.SubTitle:SetText(L["Auras System"]) - f.Desc1:SetText(L["Select the type of aura system you want to use with ElvUI's unitframes. The integrated system utilizes both aura-bars and aura-icons. The icons only system will display only icons and aurabars won't be used. The classic system will configure your auras to be default."]) - f.Desc2:SetText(L["If you have an icon or aurabar that you don't want to display simply hold down shift and right click the icon for it to disapear."]) - f.Desc3:SetText(L["Importance: |cffD3CF00Medium|r"]) + InstallOption1Button:Show() - InstallOption1Button:SetScript('OnClick', function() SetupAuras('classic') end) - InstallOption1Button:SetText(L['Classic']) - InstallOption2Button:Show() - InstallOption2Button:SetScript('OnClick', function() SetupAuras() end) - InstallOption2Button:SetText(L['Icons Only']) - InstallOption3Button:Show() - InstallOption3Button:SetScript('OnClick', function() SetupAuras('integrated') end) - InstallOption3Button:SetText(L['Integrated']) - elseif PageNum == 9 then --The new page + InstallOption1Button:SetScript('OnClick', function() E.private.sle.characterframeoptions.enable = true; E.private.sle.inspectframeoptions.enable = true; end) + InstallOption1Button:SetText(L["Enable"]) + elseif PageNum == 4 then f.SubTitle:SetText(L["Shadow & Light Settings"]) f.Desc1:SetText(L["You can now choose if you what to use one of authors' set of options. This will change not only the positioning of some elements but also change a bunch of other options."]) f.Desc2:SetText(L["SLE_Install_Text2"]) f.Desc3:SetText(L["Importance: |cffFF0000Low|r"]) InstallOption1Button:Show() - InstallOption1Button:SetScript('OnClick', function() E:DarthSetup() end) + InstallOption1Button:SetScript('OnClick', function() SLE:DarthSetup() end) InstallOption1Button:SetText(L["Darth's Config"]) InstallOption2Button:Show() - InstallOption2Button:SetScript('OnClick', function() E:AffinitiiSetup() end) + InstallOption2Button:SetScript('OnClick', function() SLE:AffinitiiSetup() end) InstallOption2Button:SetText(L["Affinitii's Config"]) InstallOption3Button:Show() - InstallOption3Button:SetScript('OnClick', function() E:RepoocSetup() end) + InstallOption3Button:SetScript('OnClick', function() SLE:RepoocSetup() end) InstallOption3Button:SetText(L["Repooc's Config"]) - elseif PageNum == 10 and IsAddOnLoaded("ElvUI_Hud") then --Hud's page if enabled - f.SubTitle:SetText("ElvUI Hud") - f.Desc1:SetText(L["Thank you for using ElvUI Hud!"]) - f.Desc2:SetText(L["Here you can choose between the simple layout (only player health and power) or the default layout for the hud"]) - f.Desc3:SetText(L["Importance: |cffFF0000Low|r"]) - - InstallOption1Button:Show() - InstallOption1Button:SetScript('OnClick', function() E:HudSimple() end) - InstallOption1Button:SetText(L["Simple Layout"]) - InstallOption2Button:Show() - InstallOption2Button:SetScript('OnClick', function() E:HudDefault() end) - InstallOption2Button:SetText(L["Default Layout"]) - elseif PageNum == 10 and not IsAddOnLoaded("ElvUI_Hud") then --Finish install if Hud disabled - f.SubTitle:SetText(L["Installation Complete"]) - f.Desc1:SetText(L["You are now finished with the installation process. If you are in need of technical support please visit us at http://www.tukui.org."]) - f.Desc2:SetText(L["Please click the button below so you can setup variables and ReloadUI."]) - InstallOption1Button:Show() - InstallOption1Button:SetScript("OnClick", InstallComplete) - InstallOption1Button:SetText(L["Finished"]) - ElvUIInstallFrame:Size(550, 350) - elseif PageNum == 11 then --Finish install if Hud enabled + elseif PageNum == 5 then f.SubTitle:SetText(L["Installation Complete"]) f.Desc1:SetText(L["You are now finished with the installation process. If you are in need of technical support please visit us at http://www.tukui.org."]) f.Desc2:SetText(L["Please click the button below so you can setup variables and ReloadUI."]) InstallOption1Button:Show() InstallOption1Button:SetScript("OnClick", InstallComplete) InstallOption1Button:SetText(L["Finished"]) - ElvUIInstallFrame:Size(550, 350) + SLEInstallFrame:Size(550, 350) end end @@ -2792,10 +1939,9 @@ local function PreviousPage() end --Install UI -function E:Install() - MaxPages() - if not InstallStepComplete then - local imsg = CreateFrame("Frame", "InstallStepComplete", E.UIParent) +function SLE:Install() + if not SLEInstallStepComplete then + local imsg = CreateFrame("Frame", "SLEInstallStepComplete", E.UIParent) imsg:Size(418, 72) imsg:Point("TOP", 0, -190) imsg:Hide() @@ -2848,8 +1994,8 @@ function E:Install() end --Create Frame - if not ElvUIInstallFrame then - local f = CreateFrame("Button", "ElvUIInstallFrame", E.UIParent) + if not SLEInstallFrame then + local f = CreateFrame("Button", "SLEInstallFrame", E.UIParent) f.SetPage = SetPage f:Size(550, 400) f:SetTemplate("Transparent") @@ -2859,7 +2005,7 @@ function E:Install() f.Title = f:CreateFontString(nil, 'OVERLAY') f.Title:FontTemplate(nil, 17, nil) f.Title:Point("TOP", 0, -5) - f.Title:SetText(L["ElvUI Installation"]) + f.Title:SetText(L["|cff1784d1Shadow & Light|r Installation"]) f.Next = CreateFrame("Button", "InstallNextButton", f, "UIPanelButtonTemplate") f.Next:StripTextures() @@ -2971,10 +2117,10 @@ function E:Install() f.tutorialImage = f:CreateTexture('InstallTutorialImage', 'OVERLAY') f.tutorialImage:Size(256, 128) - f.tutorialImage:SetTexture('Interface\\AddOns\\ElvUI_SLE\\media\\textures\\logo_elvui_sle') + f.tutorialImage:SetTexture('Interface\\AddOns\\ElvUI_SLE\\media\\textures\\SLE_Banner') f.tutorialImage:Point('BOTTOM', 0, 70) end - ElvUIInstallFrame:Show() + SLEInstallFrame:Show() NextPage() end \ No newline at end of file diff --git a/ElvUI_SLE/modules/install/installer.lua b/ElvUI_SLE/modules/install/installer.lua index 929e23b..fedf046 100755 --- a/ElvUI_SLE/modules/install/installer.lua +++ b/ElvUI_SLE/modules/install/installer.lua @@ -1,5 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore -local AI = E:NewModule('AddonInstaller') +local AI = E:NewModule('SLE_AddonInstaller') -- Upvalue for performance local pairs, string, table, unpack, _G = pairs, string, table, unpack, _G diff --git a/ElvUI_SLE/modules/install/xCT+.lua b/ElvUI_SLE/modules/install/xCT+.lua index 06dced0..36d12fb 100755 --- a/ElvUI_SLE/modules/install/xCT+.lua +++ b/ElvUI_SLE/modules/install/xCT+.lua @@ -1,5 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); -local AI = E:GetModule('AddonInstaller') +local AI = E:GetModule('SLE_AddonInstaller') local ace3 = true -- whether or not this database is a Ace3 profile local name = 'xCT+' -- the name of the addon -- 1.7.9.5 From 5426b91581603fb3a5c1fa3afd6ec2b0596e0ae0 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 02:03:40 +0400 Subject: [PATCH 011/267] chat --- ElvUI_SLE/modules/chat/chat.lua | 130 +++++++++++++++++++++++++++++------- ElvUI_SLE/modules/chat/options.lua | 26 ++++++++ 2 files changed, 133 insertions(+), 23 deletions(-) diff --git a/ElvUI_SLE/modules/chat/chat.lua b/ElvUI_SLE/modules/chat/chat.lua index c62f231..d9b10af 100755 --- a/ElvUI_SLE/modules/chat/chat.lua +++ b/ElvUI_SLE/modules/chat/chat.lua @@ -16,6 +16,10 @@ local lfgChannels = { local Myname = E.myname --local Myrealm = E.myrealm +local GetGuildRosterInfo = GetGuildRosterInfo +local IsInGuild = IsInGuild +local GuildMaster = "" +local GMName, GMRealm local len, gsub, find, sub, gmatch, format, random = string.len, string.gsub, string.find, string.sub, string.gmatch, string.format, math.random local tinsert, tremove, tsort, twipe, tconcat = table.insert, table.remove, table.sort, table.wipe, table.concat @@ -45,6 +49,7 @@ local hulkhead = "|TInterface\\AddOns\\ElvUI\\media\\textures\\hulk_head:18:22|t local hellokitty = "|TInterface\\AddOns\\ElvUI\\media\\textures\\helloKittyChatLogo:18:20|t" local shortbus = "|TInterface\\AddOns\\ElvUI\\media\\textures\\short_bus:16:16|t" local kitalie = "|TInterface\\Icons\\%s:12:12:0:0:64:64:4:60:4:60|t" +local leader = [[|TInterface\GroupFrame\UI-Group-LeaderIcon:12:12|t]] local specialChatIcons = { @@ -156,11 +161,13 @@ function CH:StyleChat(frame) end --Replacement of chat tab position and size function +local PixelOff = E.PixelMode and 31 or 27 + function CH:PositionChat(override) if not self.db.lockPositions or ((InCombatLockdown() and not override and self.initialMove) or (IsMouseButtonDown("LeftButton") and not override)) then return end if not RightChatPanel or not LeftChatPanel then return; end - RightChatPanel:Size(E.db.chat.panelWidth, E.db.chat.panelHeight) - LeftChatPanel:Size(E.db.chat.panelWidth, E.db.chat.panelHeight) + RightChatPanel:SetSize(E.db.chat.panelWidth, E.db.chat.panelHeight) + LeftChatPanel:SetSize(E.db.chat.panelWidth, E.db.chat.panelHeight) if E.private.chat.enable ~= true then return end @@ -181,7 +188,7 @@ function CH:PositionChat(override) else self.RightChatWindowID = nil end - + for i=1, CreatedFrames do local BASE_OFFSET = 60 if E.PixelMode then @@ -205,21 +212,37 @@ function CH:PositionChat(override) end end - if point == "BOTTOMRIGHT" and chat:IsShown() and not (id > NUM_CHAT_WINDOWS) and not isDocked and id == self.RightChatWindowID then + + if point == "BOTTOMRIGHT" and chat:IsShown() and not (id > NUM_CHAT_WINDOWS) and id == self.RightChatWindowID then chat:ClearAllPoints() - if E.db.datatexts.rightChatPanel then - chat:Point("BOTTOMRIGHT", RightChatDataPanel, "TOPRIGHT", 10, 3) -- <<< Changed - else - BASE_OFFSET = BASE_OFFSET - 24 - chat:Point("BOTTOMLEFT", RightChatDataPanel, "TOPLEFT", 4, 3) - end - if id ~= 2 then - chat:SetSize(E.db.chat.panelWidth - 10, (E.db.chat.panelHeight - (E.PixelMode and 31 or 27))) -- <<< Changed + if E.db.sle.datatext.chathandle then + if E.db.datatexts.rightChatPanel then + chat:Point("BOTTOMRIGHT", RightChatDataPanel, "TOPRIGHT", 10, 3) -- <<< Changed + else + BASE_OFFSET = BASE_OFFSET - 24 + chat:Point("BOTTOMLEFT", RightChatPanel, "BOTTOMLEFT", 4, 4) + end + if id ~= 2 then + chat:SetSize(E.db.chat.panelWidth - 11, (E.db.chat.panelHeight - PixelOff)) -- <<< Changed + else + chat:Size(E.db.chat.panelWidth - 11, (E.db.chat.panelHeight - PixelOff) - CombatLogQuickButtonFrame_Custom:GetHeight()) + end else - chat:Size(E.db.chat.panelWidth - 10, (E.db.chat.panelHeight - (E.PixelMode and 31 or 27)) - CombatLogQuickButtonFrame_Custom:GetHeight()) + if E.db.datatexts.rightChatPanel then + chat:SetPoint("BOTTOMLEFT", RightChatDataPanel, "TOPLEFT", 1, 3) + else + BASE_OFFSET = BASE_OFFSET - 24 + chat:SetPoint("BOTTOMLEFT", RightChatDataPanel, "BOTTOMLEFT", 1, 1) + end + if id ~= 2 then + chat:SetSize(E.db.chat.panelWidth - 11, (E.db.chat.panelHeight - BASE_OFFSET)) + else + chat:SetSize(E.db.chat.panelWidth - 11, (E.db.chat.panelHeight - BASE_OFFSET) - CombatLogQuickButtonFrame_Custom:GetHeight()) + end end + FCF_SavePositionAndDimensions(chat) tab:SetParent(RightChatPanel) @@ -239,16 +262,30 @@ function CH:PositionChat(override) CH:SetupChatTabs(tab, true) else - if id ~= 2 and not (id > NUM_CHAT_WINDOWS) then - chat:ClearAllPoints() - if E.db.datatexts.leftChatPanel then - chat:Point("BOTTOMLEFT", LeftChatToggleButton, "TOPLEFT", 5, 3) - else - BASE_OFFSET = BASE_OFFSET - 24 - chat:Point("BOTTOMLEFT", LeftChatToggleButton, "TOPLEFT", 5, 3) + if E.db.sle.datatext.chathandle then + if id ~= 2 and not (id > NUM_CHAT_WINDOWS) then + chat:ClearAllPoints() + if E.db.datatexts.leftChatPanel then + chat:Point("BOTTOMLEFT", LeftChatToggleButton, "TOPLEFT", 5, 3) + else + BASE_OFFSET = BASE_OFFSET - 24 + chat:Point("BOTTOMLEFT", LeftChatToggleButton, "TOPLEFT", 5, 3) + end + chat:Size(E.db.chat.panelWidth - 11, (E.db.chat.panelHeight - PixelOff)) -- <<< Changed + FCF_SavePositionAndDimensions(chat) + end + else + if id ~= 2 and not (id > NUM_CHAT_WINDOWS) then + chat:ClearAllPoints() + if E.db.datatexts.leftChatPanel then + chat:SetPoint("BOTTOMLEFT", LeftChatToggleButton, "TOPLEFT", 1, 3) + else + BASE_OFFSET = BASE_OFFSET - 24 + chat:SetPoint("BOTTOMLEFT", LeftChatToggleButton, "BOTTOMLEFT", 1, 1) + end + chat:SetSize(E.db.chat.panelWidth - 11, (E.db.chat.panelHeight - BASE_OFFSET)) + FCF_SavePositionAndDimensions(chat) end - chat:Size(E.db.chat.panelWidth - 6, (E.db.chat.panelHeight - (E.PixelMode and 31 or 27))) -- <<< Changed - FCF_SavePositionAndDimensions(chat) end chat:SetParent(LeftChatPanel) if i > 2 then @@ -704,13 +741,20 @@ function SLE:GetChatIcon(sender) end senderRealm = senderRealm or PLAYER_REALM senderRealm = senderRealm:gsub(' ', '') - + --Disabling ALL special icons. IDK why Elv use that and why would we want to have that but whatever if(specialChatIcons[PLAYER_REALM] == nil or (specialChatIcons[PLAYER_REALM] and specialChatIcons[PLAYER_REALM][Myname] ~= true)) then if specialChatIcons[senderRealm] and specialChatIcons[senderRealm][senderName] then return specialChatIcons[senderRealm][senderName] end end + + if not IsInGuild() then return "" end + if not E.private.sle.guildmaster then return "" end + if senderName == GMName and senderRealm == GMRealm then + return leader + end + return "" end @@ -773,6 +817,42 @@ function CH:CheckLFGRoles() end end +function CH:GMCheck() + local name, rank + if GetNumGuildMembers() == 0 and IsInGuild() then E:Delay(2, CH.GMCheck); return end + if not IsInGuild() then GuildMaster = ""; GMName = ''; GMRealm = ''; return end + for i = 1, GetNumGuildMembers() do + name, _, rank = GetGuildRosterInfo(i) + if rank == 0 then + break + end + end + + GuildMaster = name + if GuildMaster then + GMName, GMRealm = string.split('-', GuildMaster) + end + GMRealm = GMRealm or PLAYER_REALM + GMRealm = GMRealm:gsub(' ', '') +end + +function CH:GMIconUpdate() + if E.private.chat.enable ~= true then return end + if E.private.sle.guildmaster then + self:RegisterEvent('GUILD_ROSTER_UPDATE', 'Roster') + CH:GMCheck() + else + self:UnregisterEvent('GUILD_ROSTER_UPDATE') + GuildMaster = "" + GMName = '' + GMRealm = '' + end +end + +function CH:Roster(event, update) + if update then CH:GMCheck() end +end + function CH:Initialize() if ElvCharacterDB.ChatHistory then ElvCharacterDB.ChatHistory = nil --Depreciated @@ -821,6 +901,10 @@ function CH:Initialize() self:RegisterEvent('UPDATE_CHAT_WINDOWS', 'SetupChat') self:RegisterEvent('UPDATE_FLOATING_CHAT_WINDOWS', 'SetupChat') self:RegisterEvent('PET_BATTLE_CLOSE') + if E.private.sle.guildmaster then + self:RegisterEvent('GUILD_ROSTER_UPDATE', 'Roster') + CH:GMCheck() + end self:SetupChat() self:UpdateAnchors() diff --git a/ElvUI_SLE/modules/chat/options.lua b/ElvUI_SLE/modules/chat/options.lua index 5eabb06..4175d30 100755 --- 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 CH = E:GetModule("Chat") local function configTable() E.Options.args.sle.args.options.args.general.args.chat = { @@ -20,6 +21,31 @@ E.Options.args.sle.args.options.args.general.args.chat = { get = function(info) return E.db.chat.editboxhistory end, set = function(info, value) E.db.chat.editboxhistory = value; end, }, + guildmaster = { + order = 3, + type = "toggle", + name = "Guild Master Icon", + desc = [[Show an icon near your Guild Master's messages in chat. +Will not affect messages in chat history and possibly some messages right after your loading screen disappears on login.]], + get = function(info) return E.private.sle.guildmaster end, + set = function(info, value) E.private.sle.guildmaster = value; CH:GMIconUpdate() end, + }, + historyreset = { + order = 4, + type = 'execute', + name = "Reset Chat History", + desc = "Will delete all messages from chat history added prior clicking the button.", + disabled = function() return not E.db.chat.chatHistory end, + func = function() E:StaticPopup_Show("SLE_CHAT_HISTORY") end, + }, + editreset = { + order = 5, + type = 'execute', + name = "Reset Editbox History", + desc = "Will delete all messages from editbox history. Will immidiatly reload your UI.", + disabled = function() return not E.db.chat.chatHistory end, + func = function() E:StaticPopup_Show("SLE_EDIT_HISTORY") end, + }, }, } end -- 1.7.9.5 From 6b10f3d093066a29e4c2f02c3ba792fb61f947f0 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 02:03:48 +0400 Subject: [PATCH 012/267] equip manager --- ElvUI_SLE/modules/equipmanager/equipmanager.lua | 2 +- ElvUI_SLE/modules/equipmanager/options.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ElvUI_SLE/modules/equipmanager/equipmanager.lua b/ElvUI_SLE/modules/equipmanager/equipmanager.lua index df5430d..8e9352b 100755 --- a/ElvUI_SLE/modules/equipmanager/equipmanager.lua +++ b/ElvUI_SLE/modules/equipmanager/equipmanager.lua @@ -1,6 +1,6 @@ --Raid mark bar. Similar to quickmark which just semms to be impossible to skin local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore -local EM = E:NewModule('EquipManager', 'AceHook-3.0', 'AceEvent-3.0'); +local EM = E:NewModule('SLE_EquipManager', 'AceHook-3.0', 'AceEvent-3.0'); local GetEquipmentSetInfo = GetEquipmentSetInfo local GetSpecialization = GetSpecialization diff --git a/ElvUI_SLE/modules/equipmanager/options.lua b/ElvUI_SLE/modules/equipmanager/options.lua index 6f261fb..0d95f19 100755 --- a/ElvUI_SLE/modules/equipmanager/options.lua +++ b/ElvUI_SLE/modules/equipmanager/options.lua @@ -1,6 +1,6 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore -local EM = E:GetModule('EquipManager') -local BI = E:GetModule('BagInfo') +local EM = E:GetModule('SLE_EquipManager') +local BI = E:GetModule('SLE_BagInfo') local sets = {} -- 1.7.9.5 From 0c8de8a6f5e08a6f610a03c39d5d215153dd03ff Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 02:04:12 +0400 Subject: [PATCH 013/267] Marks --- ElvUI_SLE/modules/marks/flares.lua | 75 ++++++++++++++++++------------- ElvUI_SLE/modules/marks/marks.lua | 83 ++++++++++++++++++++++++----------- ElvUI_SLE/modules/marks/options.lua | 45 +++++++++++-------- 3 files changed, 129 insertions(+), 74 deletions(-) diff --git a/ElvUI_SLE/modules/marks/flares.lua b/ElvUI_SLE/modules/marks/flares.lua index 2191531..4c887d1 100644 --- a/ElvUI_SLE/modules/marks/flares.lua +++ b/ElvUI_SLE/modules/marks/flares.lua @@ -1,5 +1,6 @@ local E, L, V, P, G, _ = unpack(ElvUI); -local RF = E:NewModule('RaidFlares', 'AceHook-3.0', 'AceEvent-3.0'); +local RF = E:NewModule('SLE_RaidFlares', 'AceHook-3.0', 'AceEvent-3.0'); +local template = "SecureActionButtonTemplate" BINDING_HEADER_SHADOWLIGHT_WORLDMARKER = "|cff1784d1Shadow & Light|r" _G["BINDING_NAME_CLICK SquareFlareMarker:LeftButton"] = L["Square Flare"]; @@ -8,25 +9,28 @@ _G["BINDING_NAME_CLICK DiamondFlareMarker:LeftButton"] = L["Diamond Flare"]; _G["BINDING_NAME_CLICK CrossFlareMarker:LeftButton"] = L["Cross Flare"]; _G["BINDING_NAME_CLICK StarFlareMarker:LeftButton"] = L["Star Flare"]; -local mainFlares = CreateFrame("Frame", "Main_Flares", E.UIParent) -local f1 = CreateFrame("Button", "SquareFlareMarker", Main_Flares, "SecureActionButtonTemplate") -local f2 = CreateFrame("Button", "TriangleFlareMarker", Main_Flares, "SecureActionButtonTemplate") -local f3 = CreateFrame("Button", "DiamondFlareMarker", Main_Flares, "SecureActionButtonTemplate") -local f4 = CreateFrame("Button", "CrossFlareMarker", Main_Flares, "SecureActionButtonTemplate") -local f5 = CreateFrame("Button", "StarFlareMarker", Main_Flares, "SecureActionButtonTemplate") -local f6 = CreateFrame("Button", "ClearFlaresMarker", Main_Flares, "SecureActionButtonTemplate") - -local FlareB = {f1,f2,f3,f4,f5,f6} +local mainFlares, f1, f2, f3, f4, f5, f6, FlareB function RF:CreateFrame() + mainFlares = CreateFrame("Frame", "Main_Flares", E.UIParent) mainFlares:Point("CENTER", E.UIParent, "CENTER", 0, 40); mainFlares:SetFrameStrata('LOW'); mainFlares:CreateBackdrop(); mainFlares.backdrop:SetAllPoints(); mainFlares:Hide(); + + f1 = CreateFrame("Button", "SquareFlareMarker", Main_Flares, template) + f2 = CreateFrame("Button", "TriangleFlareMarker", Main_Flares, template) + f3 = CreateFrame("Button", "DiamondFlareMarker", Main_Flares, template) + f4 = CreateFrame("Button", "CrossFlareMarker", Main_Flares, template) + f5 = CreateFrame("Button", "StarFlareMarker", Main_Flares, template) + f6 = CreateFrame("Button", "ClearFlaresMarker", Main_Flares, template) + + FlareB = {f1,f2,f3,f4,f5,f6} end function RF:SetupButton(button, flare) + if not mainFlares then return end button:CreateBackdrop() button.backdrop:SetAllPoints() button:SetAttribute("type", "macro") @@ -64,6 +68,7 @@ function RF:SetupButton(button, flare) end function RF:CreateButtons() + if not mainFlares then return end RF:SetupButton(f1, "/clearworldmarker 1\n/worldmarker 1") RF:SetupButton(f2, "/clearworldmarker 2\n/worldmarker 2") RF:SetupButton(f3, "/clearworldmarker 3\n/worldmarker 3") @@ -73,12 +78,14 @@ function RF:CreateButtons() end function RF:FrameButtonsSize() + if not mainFlares then return end for i = 1, 6 do FlareB[i]:Size(E.db.sle.flares.size) end end function RF:FrameButtonsGrowth() + if not mainFlares then return end local db = E.db.sle.flares local size = db.size local width, height, x, y, anchor, point @@ -110,26 +117,30 @@ function RF:FrameButtonsGrowth() end function RF:UpdateVisibility() + if not mainFlares then return end local inInstance, instanceType = IsInInstance() local db = E.db.sle.flares - if db.enabled then - if (inInstance and instanceType ~= "pvp") and db.showinside then - E.FrameLocks['Main_Flares'] = true - mainFlares:Show() - elseif not inInstance and db.showinside then - E.FrameLocks['Main_Flares'] = nil - mainFlares:Hide() - elseif not db.showinside then - E.FrameLocks['Main_Flares'] = true - mainFlares:Show() - end - else + local show = false + + if (inInstance and instanceType ~= "pvp") and db.showinside then + show = true + elseif not inInstance and db.showinside then + show = false + elseif not db.showinside then + show = true + end + + if show then E.FrameLocks['Main_Flares'] = true + mainFlares:Show() + else + E.FrameLocks['Main_Flares'] = nil mainFlares:Hide() end end function RF:Backdrop() + if not mainFlares then return end if E.db.sle.flares.backdrop then mainFlares.backdrop:Show() else @@ -138,19 +149,21 @@ function RF:Backdrop() end function RF:Update() - RF:FrameButtonsSize() - RF:FrameButtonsGrowth() - RF:UpdateVisibility() - RF:Backdrop() + if not mainFlares then return end + RF:FrameButtonsSize() + RF:FrameButtonsGrowth() + RF:UpdateVisibility() + RF:Backdrop() end function RF:Initialize() - RF:CreateFrame() - RF:Update() - RF:CreateButtons() - self:RegisterEvent("PLAYER_ENTERING_WORLD", "UpdateVisibility"); + if not E.private.sle.marks.flares then return end + RF:CreateFrame() + RF:Update() + RF:CreateButtons() + self:RegisterEvent("PLAYER_ENTERING_WORLD", "UpdateVisibility"); - E:CreateMover(mainFlares, "FlareMover", "RF", nil, nil, nil, "ALL,S&L,S&L MISC") + E:CreateMover(mainFlares, "FlareMover", "RF", nil, nil, nil, "ALL,S&L,S&L MISC") end E:RegisterModule(RF:GetName()) \ No newline at end of file diff --git a/ElvUI_SLE/modules/marks/marks.lua b/ElvUI_SLE/modules/marks/marks.lua index 3897795..402c7c1 100755 --- a/ElvUI_SLE/modules/marks/marks.lua +++ b/ElvUI_SLE/modules/marks/marks.lua @@ -1,28 +1,30 @@ --Raid mark bar. Similar to quickmark which just semms to be impossible to skin local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore -local RM = E:NewModule('RaidMarks', 'AceHook-3.0', 'AceEvent-3.0'); +local RM = E:NewModule('SLE_RaidMarks', 'AceHook-3.0', 'AceEvent-3.0'); local Mtemplate = "SecureActionButtonTemplate" - -local mark_menu = CreateFrame("Frame", "Mark_Menu", E.UIParent) -local m1 = CreateFrame("Button", "M1", Mark_Menu, Mtemplate) -local m2 = CreateFrame("Button", "M2", Mark_Menu, Mtemplate) -local m3 = CreateFrame("Button", "M3", Mark_Menu, Mtemplate) -local m4 = CreateFrame("Button", "M4", Mark_Menu, Mtemplate) -local m5 = CreateFrame("Button", "M5", Mark_Menu, Mtemplate) -local m6 = CreateFrame("Button", "M6", Mark_Menu, Mtemplate) -local m7 = CreateFrame("Button", "M7", Mark_Menu, Mtemplate) -local m8 = CreateFrame("Button", "M8", Mark_Menu, Mtemplate) - -local MarkB = {m1,m2,m3,m4,m5,m6,m7,m8} - +local IsInInstance = IsInInstance +local UnitExists = UnitExists +local mark_menu, m1, m2, m3, m4, m5, m6, m7, m8, MarkB --Main frame function RM:CreateFrame() + mark_menu = CreateFrame("Frame", "Mark_Menu", E.UIParent) mark_menu:Point("BOTTOMRIGHT", RightChatTab, "TOPRIGHT", 2, 3) --Default positon mark_menu:SetFrameStrata('LOW'); mark_menu:CreateBackdrop(); mark_menu.backdrop:SetAllPoints(); + m1 = CreateFrame("Button", "M1", Mark_Menu, Mtemplate) + m2 = CreateFrame("Button", "M2", Mark_Menu, Mtemplate) + m3 = CreateFrame("Button", "M3", Mark_Menu, Mtemplate) + m4 = CreateFrame("Button", "M4", Mark_Menu, Mtemplate) + m5 = CreateFrame("Button", "M5", Mark_Menu, Mtemplate) + m6 = CreateFrame("Button", "M6", Mark_Menu, Mtemplate) + m7 = CreateFrame("Button", "M7", Mark_Menu, Mtemplate) + m8 = CreateFrame("Button", "M8", Mark_Menu, Mtemplate) + + MarkB = {m1,m2,m3,m4,m5,m6,m7,m8} + mark_menu:Hide() end @@ -40,6 +42,7 @@ end --Buttons creation function RM:CreateButtons() + if not mark_menu then return end for i = 1, 8 do RM:SetupButton(MarkB[i], 9 - i) end @@ -47,6 +50,7 @@ end --Setting/updating buttons' size function RM:FrameButtonsSize() + if not mark_menu then return end for i = 1, 8 do MarkB[i]:Size(E.db.sle.marks.size) end @@ -54,6 +58,7 @@ end --Setting growth direction for buttons function RM:FrameButtonsGrowth() + if not mark_menu then return end local db = E.db.sle.marks local size = db.size local width, height, x, y, anchor, point @@ -86,26 +91,51 @@ end --Visibility/enable check function RM:UpdateVisibility() + if not mark_menu then return end local inInstance, instanceType = IsInInstance() local db = E.db.sle.marks - if db.enabled then - if (inInstance and instanceType ~= "pvp") and db.showinside then - E.FrameLocks['Mark_Menu'] = true -- Because theyre thinking of adding battle pets to raids - mark_menu:Show() - elseif not inInstance and db.showinside then - E.FrameLocks['Mark_Menu'] = nil - mark_menu:Hide() - elseif not db.showinside then - E.FrameLocks['Mark_Menu'] = true - mark_menu:Show() + local show = false + if (inInstance and instanceType ~= "pvp") and db.showinside then + if db.target and UnitExists("target") then + show = true + elseif db.target and not UnitExists("target") then + show = false + else + show = true end - else + elseif not inInstance and db.showinside then + show = false + elseif not db.showinside then + if db.target and UnitExists("target") then + show = true + elseif db.target and not UnitExists("target") then + show = false + else + show = true + end + end + + if show then E.FrameLocks['Mark_Menu'] = true + mark_menu:Show() + else + E.FrameLocks['Mark_Menu'] = nil mark_menu:Hide() end end +function RM:Target() + if not mark_menu then return end + local db = E.db.sle.marks + if db.target then + self:RegisterEvent("PLAYER_TARGET_CHANGED", "UpdateVisibility"); + else + self:UnregisterEvent("PLAYER_TARGET_CHANGED"); + end +end + function RM:Backdrop() + if not mark_menu then return end if E.db.sle.marks.backdrop then mark_menu.backdrop:Show() else @@ -114,6 +144,7 @@ function RM:Backdrop() end function RM:Update() + if not mark_menu then return end RM:FrameButtonsSize() RM:FrameButtonsGrowth() RM:UpdateVisibility() @@ -121,10 +152,12 @@ function RM:Update() end function RM:Initialize() + if not E.private.sle.marks.marks then return end RM:CreateFrame() RM:Update() RM:CreateButtons() self:RegisterEvent("PLAYER_ENTERING_WORLD", "UpdateVisibility"); + RM:Target() E:CreateMover(mark_menu, "MarkMover", "RM", nil, nil, nil, "ALL,S&L,S&L MISC") end diff --git a/ElvUI_SLE/modules/marks/options.lua b/ElvUI_SLE/modules/marks/options.lua index 9a15de0..e92d261 100755 --- a/ElvUI_SLE/modules/marks/options.lua +++ b/ElvUI_SLE/modules/marks/options.lua @@ -1,6 +1,6 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore -local RM = E:GetModule('RaidMarks') -local RF = E:GetModule('RaidFlares') +local RM = E:GetModule('SLE_RaidMarks') +local RF = E:GetModule('SLE_RaidFlares') local function configTable() --Main options group @@ -29,14 +29,14 @@ E.Options.args.sle.args.options.args.marks = { type = "toggle", name = L["Enable"], desc = L["Show/Hide raid marks."], - get = function(info) return E.db.sle.marks.enabled end, - set = function(info, value) E.db.sle.marks.enabled = value; RM:UpdateVisibility() end + get = function(info) return E.private.sle.marks.marks end, + set = function(info, value) E.private.sle.marks.marks = value; E:StaticPopup_Show("PRIVATE_RL") end }, backdrop = { order = 3, type = "toggle", name = L["Backdrop"], - disabled = function() return not E.db.sle.marks.enabled end, + disabled = function() return not E.private.sle.marks.marks end, get = function(info) return E.db.sle.marks.backdrop end, set = function(info, value) E.db.sle.marks.backdrop = value; RM:Backdrop() end }, @@ -45,7 +45,7 @@ E.Options.args.sle.args.options.args.marks = { type = 'execute', name = L['Restore Defaults'], desc = L["Reset these options to defaults"], - disabled = function() return not E.db.sle.marks.enabled end, + disabled = function() return not E.private.sle.marks.marks end, func = function() E:GetModule('SLE'):Reset(nil, nil, nil, nil, true) end, }, spacer = { @@ -58,26 +58,35 @@ E.Options.args.sle.args.options.args.marks = { type = "toggle", name = L["Show only in instances"], desc = L["Selecting this option will have the Raid Markers appear only while in a raid or dungeon."], - disabled = function() return not E.db.sle.marks.enabled end, + disabled = function() return not E.private.sle.marks.marks end, get = function(info) return E.db.sle.marks.showinside end, set = function(info, value) E.db.sle.marks.showinside = value; RM:UpdateVisibility() end }, - size = { + target = { order = 7, + type = "toggle", + name = L["Target Exists"], + desc = L["Selecting this option will have the Raid Markers appear only when you have a target."], + disabled = function() return not E.private.sle.marks.marks end, + get = function(info) return E.db.sle.marks.target end, + set = function(info, value) E.db.sle.marks.target = value; RM:Target(); RM:UpdateVisibility() end + }, + size = { + order = 8, type = "range", name = L['Size'], desc = L["Sets size of buttons"], - disabled = function() return not E.db.sle.marks.enabled end, + disabled = function() return not E.private.sle.marks.marks end, min = 15, max = 30, step = 1, get = function(info) return E.db.sle.marks.size end, set = function(info, value) E.db.sle.marks.size = value; RM:FrameButtonsGrowth(); RM:FrameButtonsSize() end, }, growth = { - order = 8, + order = 9, type = "select", name = L["Direction"], desc = L["Change the direction of buttons growth from the skull marker"], - disabled = function() return not E.db.sle.marks.enabled end, + disabled = function() return not E.private.sle.marks.marks end, get = function(info) return E.db.sle.marks.growth end, set = function(info, value) E.db.sle.marks.growth = value; RM:FrameButtonsGrowth() end, values = { @@ -104,14 +113,14 @@ E.Options.args.sle.args.options.args.marks = { type = "toggle", name = L["Enable"], desc = L["Show/Hide Raid Flares."], - get = function(info) return E.db.sle.flares.enabled end, - set = function(info, value) E.db.sle.flares.enabled = value; RF:UpdateVisibility() end + get = function(info) return E.private.sle.marks.flares end, + set = function(info, value) E.private.sle.marks.flares = value; E:StaticPopup_Show("PRIVATE_RL") end }, backdrop = { order = 3, type = "toggle", name = L["Backdrop"], - disabled = function() return not E.db.sle.flares.enabled end, + disabled = function() return not E.private.sle.marks.flares end, get = function(info) return E.db.sle.flares.backdrop end, set = function(info, value) E.db.sle.flares.backdrop = value; RF:Backdrop() end }, @@ -125,7 +134,7 @@ E.Options.args.sle.args.options.args.marks = { type = "toggle", name = L["Show only in instances"], desc = L["Selecting this option will have the Raid Flares appear only while in a raid or dungeon."], - disabled = function() return not E.db.sle.flares.enabled end, + disabled = function() return not E.private.sle.marks.flares end, get = function(info) return E.db.sle.flares.showinside end, set = function(info, value) E.db.sle.flares.showinside = value; RF:UpdateVisibility() end }, @@ -133,7 +142,7 @@ E.Options.args.sle.args.options.args.marks = { order = 7, type = "toggle", name = L["Show Tooltip"], - disabled = function() return not E.db.sle.flares.enabled end, + disabled = function() return not E.private.sle.marks.flares end, get = function(info) return E.db.sle.flares.tooltips end, set = function(info, value) E.db.sle.flares.tooltips = value; end }, @@ -142,7 +151,7 @@ E.Options.args.sle.args.options.args.marks = { type = "range", name = L['Size'], desc = L["Sets size of buttons"], - disabled = function() return not E.db.sle.flares.enabled end, + disabled = function() return not E.private.sle.marks.flares end, min = 15, max = 30, step = 1, get = function(info) return E.db.sle.flares.size end, set = function(info, value) E.db.sle.flares.size = value; RF:FrameButtonsGrowth(); RF:FrameButtonsSize() end, @@ -152,7 +161,7 @@ E.Options.args.sle.args.options.args.marks = { type = "select", name = L["Direction"], desc = L["Change the direction of buttons growth from the square marker"], - disabled = function() return not E.db.sle.flares.enabled end, + disabled = function() return not E.private.sle.marks.flares end, get = function(info) return E.db.sle.flares.growth end, set = function(info, value) E.db.sle.flares.growth = value; RF:FrameButtonsGrowth() end, values = { -- 1.7.9.5 From cb55a4d2952ba2e1dbb5fd72135af991d93e5e37 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 02:04:18 +0400 Subject: [PATCH 014/267] farm --- ElvUI_SLE/modules/farm/farm.lua | 2 +- ElvUI_SLE/modules/farm/options.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ElvUI_SLE/modules/farm/farm.lua b/ElvUI_SLE/modules/farm/farm.lua index 001f32c..a9b7035 100755 --- a/ElvUI_SLE/modules/farm/farm.lua +++ b/ElvUI_SLE/modules/farm/farm.lua @@ -1,7 +1,7 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB local B = LibStub("LibBabble-SubZone-3.0") local BL = B:GetLookupTable() -local F = E:NewModule('Farm', 'AceHook-3.0', 'AceEvent-3.0'); +local F = E:NewModule('SLE_Farm', 'AceHook-3.0', 'AceEvent-3.0'); local SLE = E:GetModule('SLE'); local SeedAnchor, ToolAnchor, PortalAnchor diff --git a/ElvUI_SLE/modules/farm/options.lua b/ElvUI_SLE/modules/farm/options.lua index deaddb8..0db6317 100755 --- a/ElvUI_SLE/modules/farm/options.lua +++ b/ElvUI_SLE/modules/farm/options.lua @@ -1,5 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local F = E:GetModule('Farm') +local F = E:GetModule('SLE_Farm') local function configTable() E.Options.args.sle.args.options.args.farm = { -- 1.7.9.5 From ea6214fcd0108225274d404cd5db105383c1467c Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 02:04:26 +0400 Subject: [PATCH 015/267] loot --- ElvUI_SLE/modules/loot/loot.lua | 2 +- ElvUI_SLE/modules/loot/options.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ElvUI_SLE/modules/loot/loot.lua b/ElvUI_SLE/modules/loot/loot.lua index 8acbc5b..08c6d24 100755 --- a/ElvUI_SLE/modules/loot/loot.lua +++ b/ElvUI_SLE/modules/loot/loot.lua @@ -1,6 +1,6 @@ --Raid mark bar. Similar to quickmark which just semms to be impossible to skin local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore -local LT = E:NewModule('Loot', 'AceHook-3.0', 'AceEvent-3.0') +local LT = E:NewModule('SLE_Loot', 'AceHook-3.0', 'AceEvent-3.0') local check = false local t = 0 local loottemp = {} diff --git a/ElvUI_SLE/modules/loot/options.lua b/ElvUI_SLE/modules/loot/options.lua index d2430c3..95b239f 100755 --- a/ElvUI_SLE/modules/loot/options.lua +++ b/ElvUI_SLE/modules/loot/options.lua @@ -1,5 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore -local LT = E:GetModule('Loot') +local LT = E:GetModule('SLE_Loot') local function configTable() --Main options group -- 1.7.9.5 From eb082b507fe11023920fbee92dd5965ddeb46610 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 02:04:38 +0400 Subject: [PATCH 016/267] minimap --- ElvUI_SLE/modules/minimap/minimapicons.lua | 2 +- ElvUI_SLE/modules/minimap/options.lua | 25 +++++++++++++------------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ElvUI_SLE/modules/minimap/minimapicons.lua b/ElvUI_SLE/modules/minimap/minimapicons.lua index 81f90ee..3232893 100755 --- a/ElvUI_SLE/modules/minimap/minimapicons.lua +++ b/ElvUI_SLE/modules/minimap/minimapicons.lua @@ -1,5 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore -local SMB = E:NewModule('SquareMinimapButtons', 'AceHook-3.0', 'AceEvent-3.0'); +local SMB = E:NewModule('SLE_SquareMinimapButtons', 'AceHook-3.0', 'AceEvent-3.0'); local AddOnName, NS = ... local strsub, strlen, strfind, ceil = strsub, strlen, strfind, ceil diff --git a/ElvUI_SLE/modules/minimap/options.lua b/ElvUI_SLE/modules/minimap/options.lua index f975cf1..f616649 100755 --- a/ElvUI_SLE/modules/minimap/options.lua +++ b/ElvUI_SLE/modules/minimap/options.lua @@ -16,15 +16,7 @@ local function configTable() type = 'description', name = L['MINIMAP_DESC'], }, - coordsenable = { - type = "toggle", - name = L['Enable'], - order = 3, - desc = L['Enable/Disable Square Minimap Coords.'], - get = function(info) return E.db.sle.minimap.enable end, - set = function(info, value) E.db.sle.minimap.enable = value; E:GetModule('Minimap'):UpdateSettings() end, - disabled = function() return not E.private.general.minimap.enable end, - }, + coords = { type = "group", name = L["Minimap Coordinates"], @@ -32,6 +24,15 @@ local function configTable() guiInline = true, disabled = function() return not E.private.general.minimap.enable or not E.db.sle.minimap.enable end, args = { + coordsenable = { + type = "toggle", + name = L['Enable'], + order = 1, + desc = L['Enable/Disable Square Minimap Coords.'], + get = function(info) return E.db.sle.minimap.enable end, + set = function(info, value) E.db.sle.minimap.enable = value; E:GetModule('Minimap'):UpdateSettings() end, + disabled = function() return not E.private.general.minimap.enable end, + }, display = { order = 2, type = 'select', @@ -115,7 +116,7 @@ local function configTable() desc = L['The size of the minimap buttons when not anchored to the minimap.'], min = 16, max = 40, step = 1, get = function(info) return E.db.sle.minimap.mapicons.iconsize end, - set = function(info, value) E.db.sle.minimap.mapicons.iconsize = value; E:GetModule('SquareMinimapButtons'):Update(SquareMinimapButtonBar) end, + set = function(info, value) E.db.sle.minimap.mapicons.iconsize = value; E:GetModule('SLE_SquareMinimapButtons'):Update(SquareMinimapButtonBar) end, disabled = function() return not E.private.sle.minimap.mapicons.enable end, }, iconperrow = { @@ -125,7 +126,7 @@ local function configTable() desc = L['Anchor mode for displaying the minimap buttons are skinned.'], min = 1, max = 12, step = 1, get = function(info) return E.db.sle.minimap.mapicons.iconperrow end, - set = function(info, value) E.db.sle.minimap.mapicons.iconperrow = value; E:GetModule('SquareMinimapButtons'):Update(SquareMinimapButtonBar) end, + set = function(info, value) E.db.sle.minimap.mapicons.iconperrow = value; E:GetModule('SLE_SquareMinimapButtons'):Update(SquareMinimapButtonBar) end, disabled = function() return not E.private.sle.minimap.mapicons.enable end, }, iconmouseover = { @@ -134,7 +135,7 @@ local function configTable() desc = L['Show minimap buttons on mouseover.'], type = "toggle", get = function(info) return E.db.sle.minimap.mapicons.iconmouseover end, - set = function(info, value) E.db.sle.minimap.mapicons.iconmouseover = value; E:GetModule('SquareMinimapButtons'):ChangeMouseOverSetting() end, + set = function(info, value) E.db.sle.minimap.mapicons.iconmouseover = value; E:GetModule('SLE_SquareMinimapButtons'):ChangeMouseOverSetting() end, disabled = function() return not E.private.sle.minimap.mapicons.enable end, }, }, -- 1.7.9.5 From c323c01c81fdcfb3f697dd47f3f79b15794b5c86 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 02:04:48 +0400 Subject: [PATCH 017/267] ui buttons --- ElvUI_SLE/modules/uibuttons/options.lua | 2 +- ElvUI_SLE/modules/uibuttons/uibuttons.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ElvUI_SLE/modules/uibuttons/options.lua b/ElvUI_SLE/modules/uibuttons/options.lua index 382173e..9a5fa33 100755 --- a/ElvUI_SLE/modules/uibuttons/options.lua +++ b/ElvUI_SLE/modules/uibuttons/options.lua @@ -1,5 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore -local UB = E:GetModule('UIButtons') +local UB = E:GetModule('SLE_UIButtons') local function configTable() --UI Buttons diff --git a/ElvUI_SLE/modules/uibuttons/uibuttons.lua b/ElvUI_SLE/modules/uibuttons/uibuttons.lua index b49c7ff..0d3be9c 100755 --- a/ElvUI_SLE/modules/uibuttons/uibuttons.lua +++ b/ElvUI_SLE/modules/uibuttons/uibuttons.lua @@ -1,5 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore -local UB = E:NewModule('UIButtons', 'AceHook-3.0', 'AceEvent-3.0'); +local UB = E:NewModule('SLE_UIButtons', 'AceHook-3.0', 'AceEvent-3.0'); local Btemplate = "SecureActionButtonTemplate" local NumBut = 5 -- 1.7.9.5 From bd96b6a95d0acb8132d6065186d69ad39950dfbc Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 02:05:00 +0400 Subject: [PATCH 018/267] More install --- ElvUI_SLE/modules/install/Skada.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI_SLE/modules/install/Skada.lua b/ElvUI_SLE/modules/install/Skada.lua index c466245..304e818 100755 --- a/ElvUI_SLE/modules/install/Skada.lua +++ b/ElvUI_SLE/modules/install/Skada.lua @@ -1,5 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); -local AI = E:GetModule('AddonInstaller') +local AI = E:GetModule('SLE_AddonInstaller') local ace3 = true -- whether or not this database is a Ace3 profile local name = 'Skada' -- the name of the addon -- 1.7.9.5 From 3c94d8f812c1e718dc8a81ab1bedb0cb0e76fc00 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 02:05:13 +0400 Subject: [PATCH 019/267] vehicle & imports --- ElvUI_SLE/modules/imports/options.lua | 2 +- ElvUI_SLE/modules/vehicle/vehicle.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ElvUI_SLE/modules/imports/options.lua b/ElvUI_SLE/modules/imports/options.lua index 33ba351..4a6fb23 100755 --- a/ElvUI_SLE/modules/imports/options.lua +++ b/ElvUI_SLE/modules/imports/options.lua @@ -1,5 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); -local AI = E:GetModule('AddonInstaller'); +local AI = E:GetModule('SLE_AddonInstaller'); local selectedAuthor local selectedClass diff --git a/ElvUI_SLE/modules/vehicle/vehicle.lua b/ElvUI_SLE/modules/vehicle/vehicle.lua index f3e5812..8cc69b2 100755 --- a/ElvUI_SLE/modules/vehicle/vehicle.lua +++ b/ElvUI_SLE/modules/vehicle/vehicle.lua @@ -1,5 +1,5 @@ local E, L, V, P, G = unpack(ElvUI); -local EVB = E:NewModule("EnhancedVehicleBar"); +local EVB = E:NewModule("SLE_EnhancedVehicleBar"); local AB = E:GetModule("ActionBars"); local LAB = LibStub("LibActionButton-1.0") -- 1.7.9.5 From 6d2cfa6fa708c8c6cf5298e00ba1c3b9eb7ad3b2 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 02:05:19 +0400 Subject: [PATCH 020/267] core options --- ElvUI_SLE/modules/options.lua | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/ElvUI_SLE/modules/options.lua b/ElvUI_SLE/modules/options.lua index e341980..734189f 100755 --- a/ElvUI_SLE/modules/options.lua +++ b/ElvUI_SLE/modules/options.lua @@ -13,10 +13,14 @@ E.Options.args.ElvUI_Header = { width = "full", } +local size = E.db.general.fontSize + --Main options group E.Options.args.sle = { type = "group", name = L["Shadow & Light"], + desc = [[The |cff1784d1ElvUI|r modification by +|cff30ee30Darth Predator|r and |cffffff00Repooc|r.]], order = 50, args = { header = { @@ -35,6 +39,13 @@ E.Options.args.sle = { type = "description", name = L["SLE_DESC"], }, + Install = { + order = 4, + type = 'execute', + name = L['Install'], + desc = L['Run the installation process.'], + func = function() SLE:Install(); E:ToggleConfig() end, + }, options = { order = 1, type = "group", @@ -44,7 +55,7 @@ E.Options.args.sle = { intro = { order = 1, type = "description", - name = L["Below you can see option groups presented by Shadow & Light."], + name = L["Below you can see option groups presented by |cff1784d1Shadow & Light|r."], }, general = { order = 2, @@ -54,7 +65,7 @@ E.Options.args.sle = { intro = { order = 1, type = "description", - name = L["General options of Shadow & Light."], + name = L["General options of |cff1784d1Shadow & Light|r."], }, Reset = { order = 2, @@ -113,40 +124,40 @@ E.Options.args.sle = { }, links = { type = 'group', - name = L['About/Help'], + name = 'About/Help', order = -2, args = { desc = { order = 1, type = 'description', fontSize = 'medium', - name = L["LINK_DESC"], + name = 'Da LinkZ!!!!', }, tukuilink = { type = 'input', width = 'full', - name = 'TukUI.org', + name = 'On TukUI.org', get = function(info) return 'http://www.tukui.org/addons/index.php?act=view&id=42' end, order = 2, }, wowilink = { type = 'input', width = 'full', - name = 'WoWInterface.com', + name = 'On WoWI', get = function(info) return 'http://www.wowinterface.com/downloads/info20927-ElvUIShadowLight.html' end, order = 3, }, curselink= { type = 'input', width = 'full', - name = 'Curse.com', + name = 'On Curse', get = function(info) return 'http://www.curse.com/addons/wow/shadow-and-light-edit' end, order = 4, }, gitlablink = { type = 'input', width = 'full', - name = L['TukUI GitLab / Report Errors'], + name = 'GitLab Link / Report Errors', get = function(info) return 'http://git.tukui.org/repooc/elvui-shadowandlight' end, order = 5, }, -- 1.7.9.5 From 0e9ad05b0f25ae156ad77abc01b237e17c08683a Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 20:16:13 +0400 Subject: [PATCH 021/267] Raid marks mouseover --- ElvUI_SLE/config/profile.lua | 1 + ElvUI_SLE/modules/marks/marks.lua | 30 +++++++++++++++++++++++++++++- ElvUI_SLE/modules/marks/options.lua | 13 +++++++++++-- 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/ElvUI_SLE/config/profile.lua b/ElvUI_SLE/config/profile.lua index fd6dfa8..5e4b108 100755 --- a/ElvUI_SLE/config/profile.lua +++ b/ElvUI_SLE/config/profile.lua @@ -243,6 +243,7 @@ P['sle'] = { ['showinside'] = false, ['target'] = false, ['size'] = 18, + ['mouseover'] = false, }, ['flares'] = { diff --git a/ElvUI_SLE/modules/marks/marks.lua b/ElvUI_SLE/modules/marks/marks.lua index 402c7c1..fa00ed5 100755 --- a/ElvUI_SLE/modules/marks/marks.lua +++ b/ElvUI_SLE/modules/marks/marks.lua @@ -5,6 +5,8 @@ local Mtemplate = "SecureActionButtonTemplate" local IsInInstance = IsInInstance local UnitExists = UnitExists local mark_menu, m1, m2, m3, m4, m5, m6, m7, m8, MarkB +local UIFrameFadeIn = UIFrameFadeIn +local UIFrameFadeOut = UIFrameFadeOut --Main frame function RM:CreateFrame() @@ -118,10 +120,17 @@ function RM:UpdateVisibility() if show then E.FrameLocks['Mark_Menu'] = true mark_menu:Show() + for i = 1, 8 do + MarkB[i]:Show() + end else E.FrameLocks['Mark_Menu'] = nil mark_menu:Hide() + for i = 1, 8 do + MarkB[i]:Hide() + end end + RM:Mouseover() end function RM:Target() @@ -143,10 +152,30 @@ function RM:Backdrop() end end +function RM:Mouseover() + if not mark_menu then return end + local db = E.db.sle.marks + if db.mouseover then + mark_menu:SetScript("OnUpdate", function(self) + if MouseIsOver(self) then + UIFrameFadeIn(self, 0.2, self:GetAlpha(), 1) + else + UIFrameFadeOut(self, 0.2, self:GetAlpha(), 0) + end + end) + else + mark_menu:SetScript("OnUpdate", nil) + if mark_menu:IsShown() then + UIFrameFadeIn(mark_menu, 0.2, mark_menu:GetAlpha(), 1) + end + end +end + function RM:Update() if not mark_menu then return end RM:FrameButtonsSize() RM:FrameButtonsGrowth() + RM:Target() RM:UpdateVisibility() RM:Backdrop() end @@ -157,7 +186,6 @@ function RM:Initialize() RM:Update() RM:CreateButtons() self:RegisterEvent("PLAYER_ENTERING_WORLD", "UpdateVisibility"); - RM:Target() E:CreateMover(mark_menu, "MarkMover", "RM", nil, nil, nil, "ALL,S&L,S&L MISC") end diff --git a/ElvUI_SLE/modules/marks/options.lua b/ElvUI_SLE/modules/marks/options.lua index e92d261..0a97a5b 100755 --- a/ElvUI_SLE/modules/marks/options.lua +++ b/ElvUI_SLE/modules/marks/options.lua @@ -71,8 +71,17 @@ E.Options.args.sle.args.options.args.marks = { get = function(info) return E.db.sle.marks.target end, set = function(info, value) E.db.sle.marks.target = value; RM:Target(); RM:UpdateVisibility() end }, + mouseover = { + order = 7, + type = "toggle", + name = L["Mouseover"], + desc = L["Show on mouse over."], + disabled = function() return not E.private.sle.marks.marks end, + get = function(info) return E.db.sle.marks.mouseover end, + set = function(info, value) E.db.sle.marks.mouseover = value; RM:UpdateVisibility() end --RM:Mouseover() end + }, size = { - order = 8, + order = 9, type = "range", name = L['Size'], desc = L["Sets size of buttons"], @@ -82,7 +91,7 @@ E.Options.args.sle.args.options.args.marks = { set = function(info, value) E.db.sle.marks.size = value; RM:FrameButtonsGrowth(); RM:FrameButtonsSize() end, }, growth = { - order = 9, + order = 10, type = "select", name = L["Direction"], desc = L["Change the direction of buttons growth from the skull marker"], -- 1.7.9.5 From 42aa554262b162efa1cc89d4506a261a5101e7a6 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 20:17:00 +0400 Subject: [PATCH 022/267] fade anim for ui buttons --- ElvUI_SLE/modules/uibuttons/uibuttons.lua | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ElvUI_SLE/modules/uibuttons/uibuttons.lua b/ElvUI_SLE/modules/uibuttons/uibuttons.lua index 0d3be9c..3ff587a 100755 --- a/ElvUI_SLE/modules/uibuttons/uibuttons.lua +++ b/ElvUI_SLE/modules/uibuttons/uibuttons.lua @@ -148,11 +148,14 @@ function UB:Start() end function UB:Mouseover() + local self = UIBFrame if E.db.sle.uibuttons.mouse then - if (MouseIsOver(UIBFrame)) then - UIBFrame:SetAlpha(1) - else - UIBFrame:SetAlpha(0) + if (MouseIsOver(self)) then + UIFrameFadeIn(self, 0.2, self:GetAlpha(), 1) + --UIBFrame:SetAlpha(1) + else + UIFrameFadeOut(self, 0.2, self:GetAlpha(), 0) + --UIBFrame:SetAlpha(0) end else UIBFrame:SetAlpha(1) -- 1.7.9.5 From d0782210fdbb13c2591ae2e07c98e11fce727df2 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 20:24:51 +0400 Subject: [PATCH 023/267] Flares mouseover --- ElvUI_SLE/config/profile.lua | 1 + ElvUI_SLE/modules/marks/flares.lua | 20 ++++++++++++++++++++ ElvUI_SLE/modules/marks/options.lua | 13 +++++++++++-- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/ElvUI_SLE/config/profile.lua b/ElvUI_SLE/config/profile.lua index 5e4b108..b9bafe5 100755 --- a/ElvUI_SLE/config/profile.lua +++ b/ElvUI_SLE/config/profile.lua @@ -251,6 +251,7 @@ P['sle'] = { ['showinside'] = false, ['size'] = 20, ['tooltips'] = true, + ['mouseover'] = false, }, --UI Buttons diff --git a/ElvUI_SLE/modules/marks/flares.lua b/ElvUI_SLE/modules/marks/flares.lua index 4c887d1..c1c2bb6 100644 --- a/ElvUI_SLE/modules/marks/flares.lua +++ b/ElvUI_SLE/modules/marks/flares.lua @@ -137,6 +137,7 @@ function RF:UpdateVisibility() E.FrameLocks['Main_Flares'] = nil mainFlares:Hide() end + RF:Mouseover() end function RF:Backdrop() @@ -148,6 +149,25 @@ function RF:Backdrop() end end +function RF:Mouseover() + if not mainFlares then return end + local db = E.db.sle.flares + if db.mouseover then + mainFlares:SetScript("OnUpdate", function(self) + if MouseIsOver(self) then + UIFrameFadeIn(self, 0.2, self:GetAlpha(), 1) + else + UIFrameFadeOut(self, 0.2, self:GetAlpha(), 0) + end + end) + else + mainFlares:SetScript("OnUpdate", nil) + if mainFlares:IsShown() then + UIFrameFadeIn(mainFlares, 0.2, mainFlares:GetAlpha(), 1) + end + end +end + function RF:Update() if not mainFlares then return end RF:FrameButtonsSize() diff --git a/ElvUI_SLE/modules/marks/options.lua b/ElvUI_SLE/modules/marks/options.lua index 0a97a5b..54adb62 100755 --- a/ElvUI_SLE/modules/marks/options.lua +++ b/ElvUI_SLE/modules/marks/options.lua @@ -147,16 +147,25 @@ E.Options.args.sle.args.options.args.marks = { get = function(info) return E.db.sle.flares.showinside end, set = function(info, value) E.db.sle.flares.showinside = value; RF:UpdateVisibility() end }, - tooltips = { + mouseover = { order = 7, type = "toggle", + name = L["Mouseover"], + desc = L["Show on mouse over."], + disabled = function() return not E.private.sle.marks.flares end, + get = function(info) return E.db.sle.flares.mouseover end, + set = function(info, value) E.db.sle.flares.mouseover = value; RF:UpdateVisibility() end + }, + tooltips = { + order = 8, + type = "toggle", name = L["Show Tooltip"], disabled = function() return not E.private.sle.marks.flares end, get = function(info) return E.db.sle.flares.tooltips end, set = function(info, value) E.db.sle.flares.tooltips = value; end }, size = { - order = 8, + order = 9, type = "range", name = L['Size'], desc = L["Sets size of buttons"], -- 1.7.9.5 From b6f1a56bd7cd60250e5318fd01838605c95c2c94 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 20:26:17 +0400 Subject: [PATCH 024/267] Woops --- ElvUI_SLE/modules/marks/flares.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ElvUI_SLE/modules/marks/flares.lua b/ElvUI_SLE/modules/marks/flares.lua index c1c2bb6..efb4e2a 100644 --- a/ElvUI_SLE/modules/marks/flares.lua +++ b/ElvUI_SLE/modules/marks/flares.lua @@ -133,9 +133,15 @@ function RF:UpdateVisibility() if show then E.FrameLocks['Main_Flares'] = true mainFlares:Show() + for i = 1, 6 do + FlareB[i]:Show() + end else E.FrameLocks['Main_Flares'] = nil mainFlares:Hide() + for i = 1, 6 do + FlareB[i]:Hide() + end end RF:Mouseover() end -- 1.7.9.5 From e75ae1a4b5c103dc88950e492123dd0a0887af1f Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 23:48:39 +0400 Subject: [PATCH 025/267] Some guild datatext shit --- ElvUI_SLE/modules/datatexts/guild.lua | 54 ++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/ElvUI_SLE/modules/datatexts/guild.lua b/ElvUI_SLE/modules/datatexts/guild.lua index 9de4d22..f981505 100644 --- a/ElvUI_SLE/modules/datatexts/guild.lua +++ b/ElvUI_SLE/modules/datatexts/guild.lua @@ -27,6 +27,25 @@ local MINIMIZE = "|TInterface\\BUTTONS\\UI-PlusButton-Up:0|t" local FACTION_COLOR_HORDE = RED_FONT_COLOR_CODE local FACTION_COLOR_ALLIANCE = "|cff0070dd" +local GetGuildLevel = GetGuildLevel +local UnitGetGuildXP = UnitGetGuildXP +local guildXP= {} +local join = string.join +local tthead, ttsubh, ttoff = {r=0.4, g=0.78, b=1}, {r=0.75, g=0.9, b=1}, {r=.3,g=1,b=.3} +local guildXpCurrentString = gsub(join("", E:RGBToHex(ttsubh.r, ttsubh.g, ttsubh.b), COMBAT_XP_GAIN..": ".."%s/%s (%s%%)"), ": ", ":|r |cffffffff", 1) +local function UpdateGuildXP() + local currentXP, remainingXP = UnitGetGuildXP("player") + local nextLevelXP = currentXP + remainingXP + local percentTotal + if currentXP > 0 and nextLevelXP > 0 then + percentTotal = ceil((currentXP / nextLevelXP) * 100) + else + percentTotal = 0 + end + + guildXP[0] = { currentXP, nextLevelXP, percentTotal } +end + -- Setup the Title Font. 14 local ssTitleFont = CreateFont("ssTitleFont") ssTitleFont:SetTextColor(1,0.823529,0) @@ -256,11 +275,24 @@ function LDB.OnEnter(self) tooltip:SetScript("OnShow", function(ttskinself) ttskinself:SetTemplate('Transparent') end) end + local Glevel = GetGuildLevel() + local line = tooltip:AddLine() tooltip:SetCell(line, 1, "Shadow & Light Guild", ssTitleFont, "CENTER", 0) tooltip:AddLine(" ") - + + local XPline + if IsInGuild() then + if Glevel ~= 25 then + if guildXP[0] then + local currentXP, nextLevelXP, percentTotal = unpack(guildXP[0]) + + XPline = " ["..Glevel.."]|r | "..format(guildXpCurrentString, E:ShortValue(currentXP), E:ShortValue(nextLevelXP), percentTotal) + end + else + XPline = " ["..Glevel.."]|r" + end local guild_table = {} if not E.db.sle.dt.guild.hide_gmotd then line = tooltip:AddLine() @@ -288,9 +320,9 @@ function LDB.OnEnter(self) line = tooltip:AddLine() if not E.db.sle.dt.guild.hideGuild then - tooltip:SetCell(line, 1, "|cffffffff" .. ssGuildName .."|r", "LEFT", 3) + tooltip:SetCell(line, 1, "|cffffffff" .. ssGuildName ..XPline , "LEFT", 0) else - line = tooltip:SetCell(line, 1, MINIMIZE .. "|cffffffff" .. ssGuildName .. "|r", "LEFT", 3) + line = tooltip:SetCell(line, 1, MINIMIZE .. "|cffffffff" .. ssGuildName .. XPline, "LEFT", 0) end tooltip:SetCellScript(line, 1, "OnMouseUp", HideOnMouseUp, "hideGuild") @@ -408,6 +440,18 @@ frame:SetScript("OnEvent", function(self, event, ...) end end) +function frame:PLAYER_ENTERING_WORLD(self, event, ...) + if not GuildFrame and IsInGuild() then + LoadAddOn("Blizzard_GuildUI") + UpdateGuildXP() + GuildRoster() + end +end + +function frame:GUILD_XP_UPDATE(self, event, ...) + UpdateGuildXP() +end + local DELAY = 15 -- Update every 15 seconds local elapsed = DELAY - 5 @@ -420,4 +464,6 @@ frame:SetScript("OnUpdate", function (self, elapse) end end) -frame:RegisterEvent("PLAYER_LOGIN") \ No newline at end of file +frame:RegisterEvent("PLAYER_LOGIN") +frame:RegisterEvent("PLAYER_ENTERING_WORLD") +frame:RegisterEvent("GUILD_XP_UPDATE") \ No newline at end of file -- 1.7.9.5 From 05c2fd3c61965932633d66877d85936be9a629eb Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 28 Jun 2014 23:56:24 +0400 Subject: [PATCH 026/267] SLE install check. Temporary disabled --- ElvUI_SLE/ElvUI_SLE.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/ElvUI_SLE/ElvUI_SLE.lua b/ElvUI_SLE/ElvUI_SLE.lua index 5a38d79..e37386f 100755 --- a/ElvUI_SLE/ElvUI_SLE.lua +++ b/ElvUI_SLE/ElvUI_SLE.lua @@ -175,6 +175,7 @@ function SLE:Initialize() self:RegisterEvent("PLAYER_REGEN_DISABLED", UF.Update_CombatIndicator); end self:RegisterEvent('PLAYER_ENTERING_WORLD', 'LootShow'); + --if E.private.install_complete == E.version and E.private.sle.install_complete == nil then SLE:Install() end if E.db.general.loginmessage then print(format(L['SLE_LOGIN_MSG'], E["media"].hexvaluecolor, SLE.version)) end -- 1.7.9.5 From d0667ccd1d974cafcc7225abbed755e2f2099d9a Mon Sep 17 00:00:00 2001 From: Darthpred Date: Mon, 30 Jun 2014 22:46:48 +0400 Subject: [PATCH 027/267] A little cleanup --- ElvUI_SLE/config/profile.lua | 2 +- ElvUI_SLE/dev/options.lua | 6 ------ ElvUI_SLE/modules/autorelease/autorelease.lua | 2 -- ElvUI_SLE/modules/chat/chat.lua | 3 --- ElvUI_SLE/modules/loot/loot.lua | 2 +- 5 files changed, 2 insertions(+), 13 deletions(-) diff --git a/ElvUI_SLE/config/profile.lua b/ElvUI_SLE/config/profile.lua index b9bafe5..3d096b6 100755 --- a/ElvUI_SLE/config/profile.lua +++ b/ElvUI_SLE/config/profile.lua @@ -158,7 +158,7 @@ P['sle'] = { }, ['chathandle'] = false, }, ---E.db.sle.dt.guild.totals + --DT Options ['dt'] = { ['friends'] = { diff --git a/ElvUI_SLE/dev/options.lua b/ElvUI_SLE/dev/options.lua index 6bf7890..8c90cf4 100755 --- a/ElvUI_SLE/dev/options.lua +++ b/ElvUI_SLE/dev/options.lua @@ -211,9 +211,6 @@ if SLE:Auth() then get = function() return addonChannel end, set = function(_, value) addonChannel = value - --if addonChannel == "BNET" then - -- SLE:GetBNetInfo() - --end end, values = { ['GUILD'] = 'Guild', @@ -232,9 +229,6 @@ if SLE:Auth() then get = function() return bnetP end, set = function(_, value) bnetP = value - --if addonChannel == "BNET" then - -- SLE:GetBNetInfo() - --end end, values = function() SLE:GetBNetInfo() diff --git a/ElvUI_SLE/modules/autorelease/autorelease.lua b/ElvUI_SLE/modules/autorelease/autorelease.lua index 04f5184..7d6930b 100755 --- a/ElvUI_SLE/modules/autorelease/autorelease.lua +++ b/ElvUI_SLE/modules/autorelease/autorelease.lua @@ -1,5 +1,3 @@ ---Credit to Repooc. ---Remade his auto release featule to module which allows profile setting of the function not the global one. local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore local AR = E:NewModule('SLE_AutoRelease', 'AceHook-3.0', 'AceEvent-3.0'); local myclass = E.myclass diff --git a/ElvUI_SLE/modules/chat/chat.lua b/ElvUI_SLE/modules/chat/chat.lua index d9b10af..8dcf604 100755 --- a/ElvUI_SLE/modules/chat/chat.lua +++ b/ElvUI_SLE/modules/chat/chat.lua @@ -15,7 +15,6 @@ local lfgChannels = { } local Myname = E.myname ---local Myrealm = E.myrealm local GetGuildRosterInfo = GetGuildRosterInfo local IsInGuild = IsInGuild local GuildMaster = "" @@ -24,8 +23,6 @@ local GMName, GMRealm local len, gsub, find, sub, gmatch, format, random = string.len, string.gsub, string.find, string.sub, string.gmatch, string.format, math.random local tinsert, tremove, tsort, twipe, tconcat = table.insert, table.remove, table.sort, table.wipe, table.concat ---Myrealm = Myrealm:gsub(' ', '') - local PLAYER_REALM = gsub(E.myrealm,'[%s%-]','') local PLAYER_NAME = Myname.."-"..PLAYER_REALM diff --git a/ElvUI_SLE/modules/loot/loot.lua b/ElvUI_SLE/modules/loot/loot.lua index 08c6d24..0bcdad6 100755 --- a/ElvUI_SLE/modules/loot/loot.lua +++ b/ElvUI_SLE/modules/loot/loot.lua @@ -35,7 +35,7 @@ function LT:Announce() local m = 0 local q = E.db.sle.loot.quality == "EPIC" and 4 or E.db.sle.loot.quality == "RARE" and 3 or E.db.sle.loot.quality == "UNCOMMON" and 2 local n = 0 - --local inGroup, inRaid, inPartyLFG = IsInGroup(), IsInRaid(), IsPartyLFG() + local p, chat if not IsInGroup() then return end -- not in group, exit. if (LT:Check() and E.db.sle.loot.auto) or (IsLeftControlKeyDown() and (IsInGroup() or IsInRaid())) then -- 1.7.9.5 From d3de83e416851f4ef415bc4770c2a9aac5553fd8 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sun, 6 Jul 2014 07:08:31 +0400 Subject: [PATCH 028/267] First --- ElvUI_SLE/modules/loot/loot.lua | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ElvUI_SLE/modules/loot/loot.lua b/ElvUI_SLE/modules/loot/loot.lua index 0bcdad6..90d90be 100755 --- a/ElvUI_SLE/modules/loot/loot.lua +++ b/ElvUI_SLE/modules/loot/loot.lua @@ -1,6 +1,7 @@ --Raid mark bar. Similar to quickmark which just semms to be impossible to skin local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore local LT = E:NewModule('SLE_Loot', 'AceHook-3.0', 'AceEvent-3.0') +local SLE = E:GetModule("SLE") local check = false local t = 0 local loottemp = {} @@ -13,6 +14,16 @@ local IsLeftControlKeyDown = IsLeftControlKeyDown local GetLootSlotLink = GetLootSlotLink local GetLootSlotInfo = GetLootSlotInfo +local improved = { + 110, --Test + --Thunderforged + 528, + 541, + --Warforged + 559, + 572, +} + function LT:Check() local name, rank, isML for x = 1, GetNumGroupMembers() do -- 1.7.9.5 From d111be82fa5320423d11f06abee571332889a98e Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sun, 6 Jul 2014 07:09:17 +0400 Subject: [PATCH 029/267] Second --- ElvUI_SLE/modules/loot/loot.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ElvUI_SLE/modules/loot/loot.lua b/ElvUI_SLE/modules/loot/loot.lua index 90d90be..d0f64f3 100755 --- a/ElvUI_SLE/modules/loot/loot.lua +++ b/ElvUI_SLE/modules/loot/loot.lua @@ -42,11 +42,14 @@ end function LT:Announce() local name = {} local loot = {} + local lootImp = {} local numbers = {} + local numbersImp = {} local m = 0 local q = E.db.sle.loot.quality == "EPIC" and 4 or E.db.sle.loot.quality == "RARE" and 3 or E.db.sle.loot.quality == "UNCOMMON" and 2 local n = 0 - + local nI = 0 + local p, chat if not IsInGroup() then return end -- not in group, exit. if (LT:Check() and E.db.sle.loot.auto) or (IsLeftControlKeyDown() and (IsInGroup() or IsInRaid())) then -- 1.7.9.5 From fe6cf1afe02665dc081c45ca1b4791aca47d86b2 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sun, 6 Jul 2014 07:13:57 +0400 Subject: [PATCH 030/267] Third --- ElvUI_SLE/modules/loot/loot.lua | 57 ++++++++++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 7 deletions(-) diff --git a/ElvUI_SLE/modules/loot/loot.lua b/ElvUI_SLE/modules/loot/loot.lua index d0f64f3..c3a41c9 100755 --- a/ElvUI_SLE/modules/loot/loot.lua +++ b/ElvUI_SLE/modules/loot/loot.lua @@ -119,13 +119,13 @@ function LT:Announce() elseif numbers[i] > 1 then SendChatMessage(i..". "..loot[i].."x"..numbers[i], IsPartyLFG() and "INSTANCE_CHAT" or "RAID") end - else - if numbers[i] == 1 then - SendChatMessage(i..". "..loot[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") - elseif numbers[i] > 1 then - SendChatMessage(i..". "..loot[i].."x"..numbers[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") - end - end + else + if numbers[i] == 1 then + SendChatMessage(i..". "..loot[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") + elseif numbers[i] > 1 then + SendChatMessage(i..". "..loot[i].."x"..numbers[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") + end + end elseif E.db.sle.loot.chat == "SAY" then if numbers[i] == 1 then SendChatMessage(i..". "..loot[i], "SAY") @@ -135,6 +135,49 @@ function LT:Announce() end end end + if nI ~= 0 then + if E.db.sle.loot.chat == "PARTY" then + SendChatMessage(L["Loot Dropped (Improved):"], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") + elseif E.db.sle.loot.chat == "RAID" then + if IsInRaid() then + SendChatMessage(L["Loot Dropped (Improved):"], IsPartyLFG() and "INSTANCE_CHAT" or "RAID") + else + SendChatMessage(L["Loot Dropped (Improved):"], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") + end + elseif E.db.sle.loot.chat == "SAY" then + SendChatMessage(L["Loot Dropped (Improved):"], "SAY") + end + end + for i = 1, n do + if E.db.sle.loot.chat == "PARTY" then + if numbersImp[i] == 1 then + SendChatMessage(i..". "..lootImp[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") + elseif numbersImp[i] > 1 then + SendChatMessage(i..". "..lootImp[i].."x"..numbersImp[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") + end + elseif E.db.sle.loot.chat == "RAID" then + if IsInRaid() then + if numbersImp[i] == 1 then + SendChatMessage(i..". "..lootImp[i], IsPartyLFG() and "INSTANCE_CHAT" or "RAID") + elseif numbersImp[i] > 1 then + SendChatMessage(i..". "..lootImp[i].."x"..numbersImp[i], IsPartyLFG() and "INSTANCE_CHAT" or "RAID") + end + else + if numbersImp[i] == 1 then + SendChatMessage(i..". "..lootImp[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") + elseif numbersImp[i] > 1 then + SendChatMessage(i..". "..lootImp[i].."x"..numbersImp[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") + end + end + elseif E.db.sle.loot.chat == "SAY" then + if numbersImp[i] == 1 then + SendChatMessage(i..". "..lootImp[i], "SAY") + elseif numbersImp[i] > 1 then + SendChatMessage(i..". "..lootImp[i].."x"..numbersImp[i], "SAY") + end + end + end + end for i = 1, GetNumLootItems() do if GetLootSlotType(i) == 1 then loottemp[i] = GetLootSlotLink(i) -- 1.7.9.5 From 49f1fbca19b3d6fd43ef0e7b56691e829df6a895 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sun, 6 Jul 2014 07:15:10 +0400 Subject: [PATCH 031/267] Forth --- ElvUI_SLE/modules/loot/loot.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI_SLE/modules/loot/loot.lua b/ElvUI_SLE/modules/loot/loot.lua index c3a41c9..73418a4 100755 --- a/ElvUI_SLE/modules/loot/loot.lua +++ b/ElvUI_SLE/modules/loot/loot.lua @@ -80,7 +80,7 @@ function LT:Announce() n = n + 1 loot[n] = GetLootSlotLink(i) numbers[n] = quantity - else + else p = 1 while GetLootSlotLink(k) ~= loot[p] do -- 1.7.9.5 From 72d13d59d9fd24bfafcba5d57c42efd80740a0f2 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sun, 6 Jul 2014 07:16:24 +0400 Subject: [PATCH 032/267] Blah --- ElvUI_SLE/modules/loot/loot.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ElvUI_SLE/modules/loot/loot.lua b/ElvUI_SLE/modules/loot/loot.lua index 73418a4..ceea7f4 100755 --- a/ElvUI_SLE/modules/loot/loot.lua +++ b/ElvUI_SLE/modules/loot/loot.lua @@ -79,12 +79,12 @@ function LT:Announce() if i == k then n = n + 1 loot[n] = GetLootSlotLink(i) - numbers[n] = quantity - else + numbers[n] = quantity + else - p = 1 - while GetLootSlotLink(k) ~= loot[p] do - p = p + 1 + p = 1 + while GetLootSlotLink(k) ~= loot[p] do + p = p + 1 end numbers[p] = numbers[p] + quantity -- 1.7.9.5 From 01438328a294cd95a39e316c035e7c7be62c52a1 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sun, 6 Jul 2014 07:17:35 +0400 Subject: [PATCH 033/267] Should be good now --- ElvUI_SLE/modules/loot/loot.lua | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/ElvUI_SLE/modules/loot/loot.lua b/ElvUI_SLE/modules/loot/loot.lua index ceea7f4..5c11496 100755 --- a/ElvUI_SLE/modules/loot/loot.lua +++ b/ElvUI_SLE/modules/loot/loot.lua @@ -77,9 +77,18 @@ function LT:Announce() end if i == k then - n = n + 1 - loot[n] = GetLootSlotLink(i) - numbers[n] = quantity + local _, link, ilvl + link = GetLootSlotLink(i) + _, _, _, ilvl = GetItemInfo(link) + if SLE:SimpleTable(improved, ilvl) then + nI = nI + 1 + lootImp[nI] = GetLootSlotLink(i) + numbersImp[nI] = quantity + else + n = n + 1 + loot[n] = GetLootSlotLink(i) + numbers[n] = quantity + end else p = 1 -- 1.7.9.5 From 9b6e3c651e86af53ad34d13e98893efee9581d4d Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sun, 6 Jul 2014 07:20:43 +0400 Subject: [PATCH 034/267] fml --- ElvUI_SLE/modules/loot/loot.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ElvUI_SLE/modules/loot/loot.lua b/ElvUI_SLE/modules/loot/loot.lua index 5c11496..be7347c 100755 --- a/ElvUI_SLE/modules/loot/loot.lua +++ b/ElvUI_SLE/modules/loot/loot.lua @@ -126,8 +126,8 @@ function LT:Announce() if numbers[i] == 1 then SendChatMessage(i..". "..loot[i], IsPartyLFG() and "INSTANCE_CHAT" or "RAID") elseif numbers[i] > 1 then - SendChatMessage(i..". "..loot[i].."x"..numbers[i], IsPartyLFG() and "INSTANCE_CHAT" or "RAID") - end + SendChatMessage(i..". "..loot[i].."x"..numbers[i], IsPartyLFG() and "INSTANCE_CHAT" or "RAID") + end else if numbers[i] == 1 then SendChatMessage(i..". "..loot[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") @@ -140,7 +140,6 @@ function LT:Announce() SendChatMessage(i..". "..loot[i], "SAY") elseif numbers[i] > 1 then SendChatMessage(i..". "..loot[i].."x"..numbers[i], "SAY") - end end end end -- 1.7.9.5 From 125504f4fc6687b0041dfc6f900f7f9058abced4 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sun, 6 Jul 2014 07:43:31 +0400 Subject: [PATCH 035/267] Kinda works --- ElvUI_SLE/modules/loot/loot.lua | 50 ++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/ElvUI_SLE/modules/loot/loot.lua b/ElvUI_SLE/modules/loot/loot.lua index be7347c..e928148 100755 --- a/ElvUI_SLE/modules/loot/loot.lua +++ b/ElvUI_SLE/modules/loot/loot.lua @@ -51,8 +51,8 @@ function LT:Announce() local nI = 0 local p, chat - if not IsInGroup() then return end -- not in group, exit. - if (LT:Check() and E.db.sle.loot.auto) or (IsLeftControlKeyDown() and (IsInGroup() or IsInRaid())) then + --if not IsInGroup() then return end -- not in group, exit. + if (LT:Check() and E.db.sle.loot.auto) or (IsLeftControlKeyDown() --[[and (IsInGroup() or IsInRaid())]]) then for i = 1, GetNumLootItems() do if GetLootSlotType(i) == 1 then for j = 1, t do @@ -155,33 +155,35 @@ function LT:Announce() elseif E.db.sle.loot.chat == "SAY" then SendChatMessage(L["Loot Dropped (Improved):"], "SAY") end - end - for i = 1, n do - if E.db.sle.loot.chat == "PARTY" then - if numbersImp[i] == 1 then - SendChatMessage(i..". "..lootImp[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") - elseif numbersImp[i] > 1 then - SendChatMessage(i..". "..lootImp[i].."x"..numbersImp[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") - end - elseif E.db.sle.loot.chat == "RAID" then - if IsInRaid() then - if numbersImp[i] == 1 then - SendChatMessage(i..". "..lootImp[i], IsPartyLFG() and "INSTANCE_CHAT" or "RAID") - elseif numbersImp[i] > 1 then - SendChatMessage(i..". "..lootImp[i].."x"..numbersImp[i], IsPartyLFG() and "INSTANCE_CHAT" or "RAID") - end - else + + for i = 1, nI do + if E.db.sle.loot.chat == "PARTY" then if numbersImp[i] == 1 then SendChatMessage(i..". "..lootImp[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") elseif numbersImp[i] > 1 then SendChatMessage(i..". "..lootImp[i].."x"..numbersImp[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") end - end - elseif E.db.sle.loot.chat == "SAY" then - if numbersImp[i] == 1 then - SendChatMessage(i..". "..lootImp[i], "SAY") - elseif numbersImp[i] > 1 then - SendChatMessage(i..". "..lootImp[i].."x"..numbersImp[i], "SAY") + elseif E.db.sle.loot.chat == "RAID" then + if IsInRaid() then + if numbersImp[i] == 1 then + SendChatMessage(i..". "..lootImp[i], IsPartyLFG() and "INSTANCE_CHAT" or "RAID") + elseif numbersImp[i] > 1 then + SendChatMessage(i..". "..lootImp[i].."x"..numbersImp[i], IsPartyLFG() and "INSTANCE_CHAT" or "RAID") + end + else + if numbersImp[i] == 1 then + SendChatMessage(i..". "..lootImp[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") + elseif numbersImp[i] > 1 then + SendChatMessage(i..". "..lootImp[i].."x"..numbersImp[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") + end + end + elseif E.db.sle.loot.chat == "SAY" then + + if numbersImp[i] == 1 then + SendChatMessage(i..". "..lootImp[i], "SAY") + elseif numbersImp[i] > 1 then + SendChatMessage(i..". "..lootImp[i].."x"..numbersImp[i], "SAY") + end end end end -- 1.7.9.5 From 7dcabaa7038b06dff4362b19c30767e6221b2900 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sun, 6 Jul 2014 07:44:43 +0400 Subject: [PATCH 036/267] Cleaning and fixing fuck ups --- ElvUI_SLE/modules/loot/loot.lua | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ElvUI_SLE/modules/loot/loot.lua b/ElvUI_SLE/modules/loot/loot.lua index e928148..2085b69 100755 --- a/ElvUI_SLE/modules/loot/loot.lua +++ b/ElvUI_SLE/modules/loot/loot.lua @@ -15,7 +15,7 @@ local GetLootSlotLink = GetLootSlotLink local GetLootSlotInfo = GetLootSlotInfo local improved = { - 110, --Test + --110, --Test, BC Heroic last boss epic drop ilvl --Thunderforged 528, 541, @@ -51,8 +51,8 @@ function LT:Announce() local nI = 0 local p, chat - --if not IsInGroup() then return end -- not in group, exit. - if (LT:Check() and E.db.sle.loot.auto) or (IsLeftControlKeyDown() --[[and (IsInGroup() or IsInRaid())]]) then + if not IsInGroup() then return end -- not in group, exit. + if (LT:Check() and E.db.sle.loot.auto) or (IsLeftControlKeyDown() and (IsInGroup() or IsInRaid())) then for i = 1, GetNumLootItems() do if GetLootSlotType(i) == 1 then for j = 1, t do @@ -178,7 +178,6 @@ function LT:Announce() end end elseif E.db.sle.loot.chat == "SAY" then - if numbersImp[i] == 1 then SendChatMessage(i..". "..lootImp[i], "SAY") elseif numbersImp[i] > 1 then -- 1.7.9.5 From 1c6784ec6b414f2b005d2b54d01dd029cf8060fe Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sun, 6 Jul 2014 08:06:59 +0400 Subject: [PATCH 037/267] Oh well, whatever --- ElvUI_SLE/config/profile.lua | 1 + ElvUI_SLE/modules/loot/loot.lua | 115 +++++++++++++++++++++++++++++++++++- ElvUI_SLE/modules/loot/options.lua | 9 ++- 3 files changed, 121 insertions(+), 4 deletions(-) diff --git a/ElvUI_SLE/config/profile.lua b/ElvUI_SLE/config/profile.lua index 3d096b6..a425519 100755 --- a/ElvUI_SLE/config/profile.lua +++ b/ElvUI_SLE/config/profile.lua @@ -268,6 +268,7 @@ P['sle'] = { ['quality'] = "EPIC", ['chat'] = "RAID", ['auto'] = true, + ['improved'] = false, }, --Tooltip Faction Icon diff --git a/ElvUI_SLE/modules/loot/loot.lua b/ElvUI_SLE/modules/loot/loot.lua index 2085b69..3904115 100755 --- a/ElvUI_SLE/modules/loot/loot.lua +++ b/ElvUI_SLE/modules/loot/loot.lua @@ -13,6 +13,7 @@ local GetNumLootItems = GetNumLootItems local IsLeftControlKeyDown = IsLeftControlKeyDown local GetLootSlotLink = GetLootSlotLink local GetLootSlotInfo = GetLootSlotInfo +local GetItemInfo = GetItemInfo local improved = { --110, --Test, BC Heroic last boss epic drop ilvl @@ -42,6 +43,108 @@ end function LT:Announce() local name = {} local loot = {} + local numbers = {} + local m = 0 + local q = E.db.sle.loot.quality == "EPIC" and 4 or E.db.sle.loot.quality == "RARE" and 3 or E.db.sle.loot.quality == "UNCOMMON" and 2 + local n = 0 + --local inGroup, inRaid, inPartyLFG = IsInGroup(), IsInRaid(), IsPartyLFG() + local p, chat + if not IsInGroup() then return end -- not in group, exit. + if (LT:Check() and E.db.sle.loot.auto) or (IsLeftControlKeyDown() and (IsInGroup() or IsInRaid())) then + for i = 1, GetNumLootItems() do + if GetLootSlotType(i) == 1 then + for j = 1, t do + if GetLootSlotLink(i) == loottemp[j] then + check = true + end + end + end + end + if check == false or IsLeftControlKeyDown() then + for i = 1, GetNumLootItems() do + if GetLootSlotType(i) ~= 1 then + m = m + 1 + else + local _, item, quantity, quality = GetLootSlotInfo(i) + if quality >= q then + name[i] = item + + k = 1 + while name[i] ~= name[k] do + k = k + 1 + end + + if i == k then + n = n + 1 + loot[n] = GetLootSlotLink(i) + numbers[n] = quantity + else + + p = 1 + while GetLootSlotLink(k) ~= loot[p] do + p = p + 1 + end + numbers[p] = numbers[p] + quantity + end + end + end + end + if n ~= 0 then + if E.db.sle.loot.chat == "PARTY" then + SendChatMessage(L["Loot Dropped:"], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") + elseif E.db.sle.loot.chat == "RAID" then + if IsInRaid() then + SendChatMessage(L["Loot Dropped:"], IsPartyLFG() and "INSTANCE_CHAT" or "RAID") + else + SendChatMessage(L["Loot Dropped:"], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") + end + elseif E.db.sle.loot.chat == "SAY" then + SendChatMessage(L["Loot Dropped:"], "SAY") + end + end + for i = 1, n do + if E.db.sle.loot.chat == "PARTY" then + if numbers[i] == 1 then + SendChatMessage(i..". "..loot[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") + elseif numbers[i] > 1 then + SendChatMessage(i..". "..loot[i].."x"..numbers[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") + end + elseif E.db.sle.loot.chat == "RAID" then + if IsInRaid() then + if numbers[i] == 1 then + SendChatMessage(i..". "..loot[i], IsPartyLFG() and "INSTANCE_CHAT" or "RAID") + elseif numbers[i] > 1 then + SendChatMessage(i..". "..loot[i].."x"..numbers[i], IsPartyLFG() and "INSTANCE_CHAT" or "RAID") + end + else + if numbers[i] == 1 then + SendChatMessage(i..". "..loot[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") + elseif numbers[i] > 1 then + SendChatMessage(i..". "..loot[i].."x"..numbers[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") + end + end + elseif E.db.sle.loot.chat == "SAY" then + if numbers[i] == 1 then + SendChatMessage(i..". "..loot[i], "SAY") + elseif numbers[i] > 1 then + SendChatMessage(i..". "..loot[i].."x"..numbers[i], "SAY") + end + end + end + end + for i = 1, GetNumLootItems() do + if GetLootSlotType(i) == 1 then + loottemp[i] = GetLootSlotLink(i) + end + end + t = GetNumLootItems() + check = false + end +end + +function LT:AnnounceI() + local name = {} + local loot = {} local lootImp = {} local numbers = {} local numbersImp = {} @@ -178,6 +281,7 @@ function LT:Announce() end end elseif E.db.sle.loot.chat == "SAY" then + if numbersImp[i] == 1 then SendChatMessage(i..". "..lootImp[i], "SAY") elseif numbersImp[i] > 1 then @@ -197,9 +301,18 @@ function LT:Announce() end end +function LT:Register() + self:UnregisterEvent("LOOT_OPENED") + if E.db.sle.loot.improved then + self:RegisterEvent("LOOT_OPENED", "AnnounceI") + else + self:RegisterEvent("LOOT_OPENED", "Announce") + end +end + function LT:Initialize() if not E.private.sle.loot.enable then return end - self:RegisterEvent("LOOT_OPENED", "Announce") + self:Register() end E:RegisterModule(LT:GetName()) \ No newline at end of file diff --git a/ElvUI_SLE/modules/loot/options.lua b/ElvUI_SLE/modules/loot/options.lua index 95b239f..7cd4e81 100755 --- a/ElvUI_SLE/modules/loot/options.lua +++ b/ElvUI_SLE/modules/loot/options.lua @@ -34,10 +34,13 @@ E.Options.args.sle.args.options.args.loot = { get = function(info) return E.db.sle.loot.auto end, set = function(info, value) E.db.sle.loot.auto = value; end }, - spacer = { + improved = { order = 5, - type = "description", - name = "", + type = "toggle", + name = L["Improved"], + disabled = function() return not E.private.sle.loot.enable end, + get = function(info) return E.db.sle.loot.improved end, + set = function(info, value) E.db.sle.loot.improved = value; LT:Register() end }, quality = { order = 6, -- 1.7.9.5 From bac9d24af2d22257ac56fbb543e9c9128c941019 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Mon, 7 Jul 2014 22:10:10 +0400 Subject: [PATCH 038/267] Rewrote the loot announcer moar shit less lines --- ElvUI_SLE/modules/loot/loot.lua | 329 ++++++++---------------------------- ElvUI_SLE/modules/loot/options.lua | 9 +- 2 files changed, 76 insertions(+), 262 deletions(-) diff --git a/ElvUI_SLE/modules/loot/loot.lua b/ElvUI_SLE/modules/loot/loot.lua index 3904115..eac412b 100755 --- a/ElvUI_SLE/modules/loot/loot.lua +++ b/ElvUI_SLE/modules/loot/loot.lua @@ -1,31 +1,20 @@ ---Raid mark bar. Similar to quickmark which just semms to be impossible to skin -local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore +local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore local LT = E:NewModule('SLE_Loot', 'AceHook-3.0', 'AceEvent-3.0') -local SLE = E:GetModule("SLE") local check = false local t = 0 local loottemp = {} local MyName = E.myname local IsInGroup, IsInRaid, IsPartyLFG = IsInGroup, IsInRaid, IsPartyLFG local GetNumGroupMembers, GetRaidRosterInfo = GetNumGroupMembers, GetRaidRosterInfo -local GetLootSlotType = GetLootSlotType -local GetNumLootItems = GetNumLootItems +local GetLootSlotType, GetLootSlotLink, GetLootSlotInfo = GetLootSlotType, GetLootSlotLink, GetLootSlotInfo +local GetNumLootItems, GetItemInfo = GetNumLootItems, GetItemInfo local IsLeftControlKeyDown = IsLeftControlKeyDown -local GetLootSlotLink = GetLootSlotLink -local GetLootSlotInfo = GetLootSlotInfo -local GetItemInfo = GetItemInfo +local loot = {} +local numbers = {} +local n = 0 +local Tremove = table.remove -local improved = { - --110, --Test, BC Heroic last boss epic drop ilvl - --Thunderforged - 528, - 541, - --Warforged - 559, - 572, -} - -function LT:Check() +local function Check() local name, rank, isML for x = 1, GetNumGroupMembers() do name, rank, _, _, _, _, _, _, _, _, isML = GetRaidRosterInfo(x) @@ -40,122 +29,76 @@ function LT:Check() return false end -function LT:Announce() - local name = {} - local loot = {} - local numbers = {} - local m = 0 - local q = E.db.sle.loot.quality == "EPIC" and 4 or E.db.sle.loot.quality == "RARE" and 3 or E.db.sle.loot.quality == "UNCOMMON" and 2 - local n = 0 - --local inGroup, inRaid, inPartyLFG = IsInGroup(), IsInRaid(), IsPartyLFG() - local p, chat - if not IsInGroup() then return end -- not in group, exit. - if (LT:Check() and E.db.sle.loot.auto) or (IsLeftControlKeyDown() and (IsInGroup() or IsInRaid())) then - for i = 1, GetNumLootItems() do - if GetLootSlotType(i) == 1 then - for j = 1, t do - if GetLootSlotLink(i) == loottemp[j] then - check = true - end - end - end - end - if check == false or IsLeftControlKeyDown() then - for i = 1, GetNumLootItems() do - if GetLootSlotType(i) ~= 1 then - m = m + 1 - else - local _, item, quantity, quality = GetLootSlotInfo(i) - if quality >= q then - name[i] = item - - k = 1 - while name[i] ~= name[k] do - k = k + 1 - end - - if i == k then - n = n + 1 - loot[n] = GetLootSlotLink(i) - numbers[n] = quantity - else - - p = 1 - while GetLootSlotLink(k) ~= loot[p] do - p = p + 1 - end - numbers[p] = numbers[p] + quantity - end - end - end +local function Merge() + local p, k + for i = 1, #loot do + k = 1 + while loot[i] ~= loot[k] do k = k + 1 end + if i ~= k then + numbers[i] = numbers[i] + numbers[k] + Tremove(numbers, k) + Tremove(loot, k) + n = n - 1 end - if n ~= 0 then - if E.db.sle.loot.chat == "PARTY" then - SendChatMessage(L["Loot Dropped:"], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") - elseif E.db.sle.loot.chat == "RAID" then - if IsInRaid() then - SendChatMessage(L["Loot Dropped:"], IsPartyLFG() and "INSTANCE_CHAT" or "RAID") - else - SendChatMessage(L["Loot Dropped:"], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") - end - elseif E.db.sle.loot.chat == "SAY" then - SendChatMessage(L["Loot Dropped:"], "SAY") + end +end + +local function PopulateTable(q) + local p, k + for i = 1, GetNumLootItems() do + if GetLootSlotType(i) == 1 then + local _, item, quantity, quality = GetLootSlotInfo(i) + local _, link, ilvl + + if quality >= q then + link = GetLootSlotLink(i) + ilvl = select(4, GetItemInfo(link)) + + n = n + 1 + loot[n] = link + loot[n] = loot[n].." (ilvl: "..ilvl..")" + numbers[n] = quantity end end - for i = 1, n do - if E.db.sle.loot.chat == "PARTY" then - if numbers[i] == 1 then - SendChatMessage(i..". "..loot[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") - elseif numbers[i] > 1 then - SendChatMessage(i..". "..loot[i].."x"..numbers[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") - end - elseif E.db.sle.loot.chat == "RAID" then - if IsInRaid() then - if numbers[i] == 1 then - SendChatMessage(i..". "..loot[i], IsPartyLFG() and "INSTANCE_CHAT" or "RAID") - elseif numbers[i] > 1 then - SendChatMessage(i..". "..loot[i].."x"..numbers[i], IsPartyLFG() and "INSTANCE_CHAT" or "RAID") - end - else - if numbers[i] == 1 then - SendChatMessage(i..". "..loot[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") - elseif numbers[i] > 1 then - SendChatMessage(i..". "..loot[i].."x"..numbers[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") - end - end - elseif E.db.sle.loot.chat == "SAY" then - if numbers[i] == 1 then - SendChatMessage(i..". "..loot[i], "SAY") - elseif numbers[i] > 1 then - SendChatMessage(i..". "..loot[i].."x"..numbers[i], "SAY") - end - end - end + end + + if E.db.sle.loot.merge then + Merge() + end +end + +local function Channel() + local channel + if E.db.sle.loot.chat ~= "SAY" and IsPartyLFG() then + return "INSTANCE_CHAT" + end + if E.db.sle.loot.chat == "RAID" and not IsInRaid() then + return "PARTY" + end + return E.db.sle.loot.chat +end + +local function List() + for i = 1, n do + if numbers[i] == 1 then + SendChatMessage(i..". "..loot[i], Channel()) + elseif numbers[i] > 1 then + SendChatMessage(i..". "..numbers[i].."x"..loot[i], Channel()) end - for i = 1, GetNumLootItems() do - if GetLootSlotType(i) == 1 then - loottemp[i] = GetLootSlotLink(i) - end + if i == n then + loot = {} + numbers = {} + n = 0 end - t = GetNumLootItems() - check = false end end -function LT:AnnounceI() - local name = {} - local loot = {} - local lootImp = {} - local numbers = {} - local numbersImp = {} +function LT:Announce() + if not IsInGroup() then return end -- not in group, exit. local m = 0 local q = E.db.sle.loot.quality == "EPIC" and 4 or E.db.sle.loot.quality == "RARE" and 3 or E.db.sle.loot.quality == "UNCOMMON" and 2 - local n = 0 - local nI = 0 - local p, chat - if not IsInGroup() then return end -- not in group, exit. - if (LT:Check() and E.db.sle.loot.auto) or (IsLeftControlKeyDown() and (IsInGroup() or IsInRaid())) then + if (Check() and E.db.sle.loot.auto) or (IsLeftControlKeyDown() and (IsInGroup() or IsInRaid())) then for i = 1, GetNumLootItems() do if GetLootSlotType(i) == 1 then for j = 1, t do @@ -166,129 +109,10 @@ function LT:AnnounceI() end end if check == false or IsLeftControlKeyDown() then - for i = 1, GetNumLootItems() do - if GetLootSlotType(i) ~= 1 then - m = m + 1 - else - local _, item, quantity, quality = GetLootSlotInfo(i) - if quality >= q then - name[i] = item - - k = 1 - while name[i] ~= name[k] do - k = k + 1 - end - - if i == k then - local _, link, ilvl - link = GetLootSlotLink(i) - _, _, _, ilvl = GetItemInfo(link) - if SLE:SimpleTable(improved, ilvl) then - nI = nI + 1 - lootImp[nI] = GetLootSlotLink(i) - numbersImp[nI] = quantity - else - n = n + 1 - loot[n] = GetLootSlotLink(i) - numbers[n] = quantity - end - else - - p = 1 - while GetLootSlotLink(k) ~= loot[p] do - p = p + 1 - end - numbers[p] = numbers[p] + quantity - - end - end - end - end - if n ~= 0 then - if E.db.sle.loot.chat == "PARTY" then - SendChatMessage(L["Loot Dropped:"], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") - elseif E.db.sle.loot.chat == "RAID" then - if IsInRaid() then - SendChatMessage(L["Loot Dropped:"], IsPartyLFG() and "INSTANCE_CHAT" or "RAID") - else - SendChatMessage(L["Loot Dropped:"], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") - end - elseif E.db.sle.loot.chat == "SAY" then - SendChatMessage(L["Loot Dropped:"], "SAY") - end - end - for i = 1, n do - if E.db.sle.loot.chat == "PARTY" then - if numbers[i] == 1 then - SendChatMessage(i..". "..loot[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") - elseif numbers[i] > 1 then - SendChatMessage(i..". "..loot[i].."x"..numbers[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") - end - elseif E.db.sle.loot.chat == "RAID" then - if IsInRaid() then - if numbers[i] == 1 then - SendChatMessage(i..". "..loot[i], IsPartyLFG() and "INSTANCE_CHAT" or "RAID") - elseif numbers[i] > 1 then - SendChatMessage(i..". "..loot[i].."x"..numbers[i], IsPartyLFG() and "INSTANCE_CHAT" or "RAID") - end - else - if numbers[i] == 1 then - SendChatMessage(i..". "..loot[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") - elseif numbers[i] > 1 then - SendChatMessage(i..". "..loot[i].."x"..numbers[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") - end - end - elseif E.db.sle.loot.chat == "SAY" then - if numbers[i] == 1 then - SendChatMessage(i..". "..loot[i], "SAY") - elseif numbers[i] > 1 then - SendChatMessage(i..". "..loot[i].."x"..numbers[i], "SAY") - end - end - end - if nI ~= 0 then - if E.db.sle.loot.chat == "PARTY" then - SendChatMessage(L["Loot Dropped (Improved):"], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") - elseif E.db.sle.loot.chat == "RAID" then - if IsInRaid() then - SendChatMessage(L["Loot Dropped (Improved):"], IsPartyLFG() and "INSTANCE_CHAT" or "RAID") - else - SendChatMessage(L["Loot Dropped (Improved):"], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") - end - elseif E.db.sle.loot.chat == "SAY" then - SendChatMessage(L["Loot Dropped (Improved):"], "SAY") - end - - for i = 1, nI do - if E.db.sle.loot.chat == "PARTY" then - if numbersImp[i] == 1 then - SendChatMessage(i..". "..lootImp[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") - elseif numbersImp[i] > 1 then - SendChatMessage(i..". "..lootImp[i].."x"..numbersImp[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") - end - elseif E.db.sle.loot.chat == "RAID" then - if IsInRaid() then - if numbersImp[i] == 1 then - SendChatMessage(i..". "..lootImp[i], IsPartyLFG() and "INSTANCE_CHAT" or "RAID") - elseif numbersImp[i] > 1 then - SendChatMessage(i..". "..lootImp[i].."x"..numbersImp[i], IsPartyLFG() and "INSTANCE_CHAT" or "RAID") - end - else - if numbersImp[i] == 1 then - SendChatMessage(i..". "..lootImp[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") - elseif numbersImp[i] > 1 then - SendChatMessage(i..". "..lootImp[i].."x"..numbersImp[i], IsPartyLFG() and "INSTANCE_CHAT" or "PARTY") - end - end - elseif E.db.sle.loot.chat == "SAY" then - - if numbersImp[i] == 1 then - SendChatMessage(i..". "..lootImp[i], "SAY") - elseif numbersImp[i] > 1 then - SendChatMessage(i..". "..lootImp[i].."x"..numbersImp[i], "SAY") - end - end - end + PopulateTable(q) + if n ~= 0 then + SendChatMessage(L["Loot Dropped:"], Channel()) + List() end end for i = 1, GetNumLootItems() do @@ -301,18 +125,9 @@ function LT:AnnounceI() end end -function LT:Register() - self:UnregisterEvent("LOOT_OPENED") - if E.db.sle.loot.improved then - self:RegisterEvent("LOOT_OPENED", "AnnounceI") - else - self:RegisterEvent("LOOT_OPENED", "Announce") - end -end - function LT:Initialize() if not E.private.sle.loot.enable then return end - self:Register() + self:RegisterEvent("LOOT_OPENED", "Announce") end E:RegisterModule(LT:GetName()) \ No newline at end of file diff --git a/ElvUI_SLE/modules/loot/options.lua b/ElvUI_SLE/modules/loot/options.lua index 7cd4e81..f80dc0c 100755 --- a/ElvUI_SLE/modules/loot/options.lua +++ b/ElvUI_SLE/modules/loot/options.lua @@ -1,5 +1,4 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore -local LT = E:GetModule('SLE_Loot') local function configTable() --Main options group @@ -34,13 +33,13 @@ E.Options.args.sle.args.options.args.loot = { get = function(info) return E.db.sle.loot.auto end, set = function(info, value) E.db.sle.loot.auto = value; end }, - improved = { + merge = { order = 5, type = "toggle", - name = L["Improved"], + name = L["Merge identical"], disabled = function() return not E.private.sle.loot.enable end, - get = function(info) return E.db.sle.loot.improved end, - set = function(info, value) E.db.sle.loot.improved = value; LT:Register() end + get = function(info) return E.db.sle.loot.merge end, + set = function(info, value) E.db.sle.loot.merge = value end }, quality = { order = 6, -- 1.7.9.5 From 017a3867be7ba692017f1ea6fa8bf74d7b66ae2d Mon Sep 17 00:00:00 2001 From: Darthpred Date: Mon, 7 Jul 2014 22:10:50 +0400 Subject: [PATCH 039/267] Woops --- ElvUI_SLE/config/profile.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI_SLE/config/profile.lua b/ElvUI_SLE/config/profile.lua index a425519..edd9839 100755 --- a/ElvUI_SLE/config/profile.lua +++ b/ElvUI_SLE/config/profile.lua @@ -268,7 +268,7 @@ P['sle'] = { ['quality'] = "EPIC", ['chat'] = "RAID", ['auto'] = true, - ['improved'] = false, + ['merge'] = true, }, --Tooltip Faction Icon -- 1.7.9.5 From d25d8884b372c6f9a0b396e068fcc0aa95aa7152 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Mon, 7 Jul 2014 22:12:17 +0400 Subject: [PATCH 040/267] Don't need dat --- ElvUI_SLE/modules/loot/loot.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI_SLE/modules/loot/loot.lua b/ElvUI_SLE/modules/loot/loot.lua index eac412b..5db634e 100755 --- a/ElvUI_SLE/modules/loot/loot.lua +++ b/ElvUI_SLE/modules/loot/loot.lua @@ -48,7 +48,7 @@ local function PopulateTable(q) for i = 1, GetNumLootItems() do if GetLootSlotType(i) == 1 then local _, item, quantity, quality = GetLootSlotInfo(i) - local _, link, ilvl + local link, ilvl if quality >= q then link = GetLootSlotLink(i) -- 1.7.9.5 From 76eebbb3e1f25c9ead950334f8a3890f906301ea Mon Sep 17 00:00:00 2001 From: Darthpred Date: Mon, 7 Jul 2014 22:15:15 +0400 Subject: [PATCH 041/267] FU Repooc --- ElvUI_SLE/config/profile.lua | 1 - ElvUI_SLE/modules/loot/loot.lua | 5 +---- ElvUI_SLE/modules/loot/options.lua | 10 ++++------ 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/ElvUI_SLE/config/profile.lua b/ElvUI_SLE/config/profile.lua index edd9839..3d096b6 100755 --- a/ElvUI_SLE/config/profile.lua +++ b/ElvUI_SLE/config/profile.lua @@ -268,7 +268,6 @@ P['sle'] = { ['quality'] = "EPIC", ['chat'] = "RAID", ['auto'] = true, - ['merge'] = true, }, --Tooltip Faction Icon diff --git a/ElvUI_SLE/modules/loot/loot.lua b/ElvUI_SLE/modules/loot/loot.lua index 5db634e..cbc45c6 100755 --- a/ElvUI_SLE/modules/loot/loot.lua +++ b/ElvUI_SLE/modules/loot/loot.lua @@ -61,10 +61,7 @@ local function PopulateTable(q) end end end - - if E.db.sle.loot.merge then - Merge() - end + Merge() end local function Channel() diff --git a/ElvUI_SLE/modules/loot/options.lua b/ElvUI_SLE/modules/loot/options.lua index f80dc0c..95b239f 100755 --- a/ElvUI_SLE/modules/loot/options.lua +++ b/ElvUI_SLE/modules/loot/options.lua @@ -1,4 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore +local LT = E:GetModule('SLE_Loot') local function configTable() --Main options group @@ -33,13 +34,10 @@ E.Options.args.sle.args.options.args.loot = { get = function(info) return E.db.sle.loot.auto end, set = function(info, value) E.db.sle.loot.auto = value; end }, - merge = { + spacer = { order = 5, - type = "toggle", - name = L["Merge identical"], - disabled = function() return not E.private.sle.loot.enable end, - get = function(info) return E.db.sle.loot.merge end, - set = function(info, value) E.db.sle.loot.merge = value end + type = "description", + name = "", }, quality = { order = 6, -- 1.7.9.5 From a28c7e6ebdcbfc5350f984f6b0a2e9532c675a15 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Mon, 7 Jul 2014 22:16:00 +0400 Subject: [PATCH 042/267] damn >_> --- ElvUI_SLE/modules/loot/options.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/ElvUI_SLE/modules/loot/options.lua b/ElvUI_SLE/modules/loot/options.lua index 95b239f..bda2831 100755 --- a/ElvUI_SLE/modules/loot/options.lua +++ b/ElvUI_SLE/modules/loot/options.lua @@ -1,5 +1,4 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore -local LT = E:GetModule('SLE_Loot') local function configTable() --Main options group -- 1.7.9.5 From 32e0098737fc75d4ceaf592dc1e515f2be3388cc Mon Sep 17 00:00:00 2001 From: Darthpred Date: Fri, 11 Jul 2014 20:33:56 +0400 Subject: [PATCH 043/267] Ok, Lets do this! Leeeeeeeeeeeeeeeeeeeeeroy! --- ElvUI_SLE/Bindings.xml | 17 - ElvUI_SLE/ElvUI_SLE.lua | 189 - ElvUI_SLE/ElvUI_SLE.toc | 24 - ElvUI_SLE/config/load_config.xml | 4 - ElvUI_SLE/config/profile.lua | 312 - ElvUI_SLE/config/sle_private.lua | 71 - ElvUI_SLE/dev/commands.lua | 204 - ElvUI_SLE/dev/elvprot.lua | 61 - ElvUI_SLE/dev/load_dev.xml | 1 - ElvUI_SLE/dev/options.lua | 375 - ElvUI_SLE/dev/staticpopups.lua | 53 - ElvUI_SLE/dev/test.lua | 21 - ElvUI_SLE/layout/layout.lua | 97 - ElvUI_SLE/libs/AceAddon-3.0/AceAddon-3.0.lua | 674 - ElvUI_SLE/libs/AceAddon-3.0/AceAddon-3.0.xml | 4 - ElvUI_SLE/libs/AceConfig-3.0/AceConfig-3.0.lua | 57 - ElvUI_SLE/libs/AceConfig-3.0/AceConfig-3.0.xml | 8 - .../AceConfigCmd-3.0/AceConfigCmd-3.0.lua | 794 - .../AceConfigCmd-3.0/AceConfigCmd-3.0.xml | 4 - .../AceConfigDialog-3.0/AceConfigDialog-3.0.lua | 1947 - .../AceConfigDialog-3.0/AceConfigDialog-3.0.xml | 4 - .../AceConfigRegistry-3.0.lua | 347 - .../AceConfigRegistry-3.0.xml | 4 - ElvUI_SLE/libs/AceConsole-3.0/AceConsole-3.0.lua | 250 - ElvUI_SLE/libs/AceConsole-3.0/AceConsole-3.0.xml | 4 - ElvUI_SLE/libs/AceDB-3.0/AceDB-3.0.lua | 733 - ElvUI_SLE/libs/AceDB-3.0/AceDB-3.0.xml | 4 - .../libs/AceDBOptions-3.0/AceDBOptions-3.0.lua | 440 - .../libs/AceDBOptions-3.0/AceDBOptions-3.0.xml | 4 - .../BackgroundWidget.lua | 231 - .../AceGUI-3.0-SharedMediaWidgets/BorderWidget.lua | 228 - .../AceGUI-3.0-SharedMediaWidgets/FontWidget.lua | 214 - .../AceGUI-3.0-SharedMediaWidgets/SoundWidget.lua | 262 - .../StatusbarWidget.lua | 230 - .../AceGUI-3.0-SharedMediaWidgets/prototypes.lua | 267 - .../libs/AceGUI-3.0-SharedMediaWidgets/widget.xml | 9 - ElvUI_SLE/libs/AceGUI-3.0/AceGUI-3.0.lua | 805 - ElvUI_SLE/libs/AceGUI-3.0/AceGUI-3.0.xml | 28 - .../widgets/AceGUIContainer-BlizOptionsGroup.lua | 138 - .../widgets/AceGUIContainer-DropDownGroup.lua | 157 - .../AceGUI-3.0/widgets/AceGUIContainer-Frame.lua | 311 - .../widgets/AceGUIContainer-InlineGroup.lua | 103 - .../widgets/AceGUIContainer-ScrollFrame.lua | 204 - .../widgets/AceGUIContainer-SimpleGroup.lua | 69 - .../widgets/AceGUIContainer-TabGroup.lua | 350 - .../widgets/AceGUIContainer-TreeGroup.lua | 707 - .../AceGUI-3.0/widgets/AceGUIContainer-Window.lua | 331 - .../AceGUI-3.0/widgets/AceGUIWidget-Button.lua | 98 - .../AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua | 295 - .../widgets/AceGUIWidget-ColorPicker.lua | 187 - .../widgets/AceGUIWidget-DropDown-Items.lua | 471 - .../AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua | 717 - .../AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua | 256 - .../AceGUI-3.0/widgets/AceGUIWidget-Heading.lua | 78 - .../libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua | 144 - .../widgets/AceGUIWidget-InteractiveLabel.lua | 101 - .../AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua | 239 - .../libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua | 166 - .../widgets/AceGUIWidget-MultiLineEditBox.lua | 368 - .../AceGUI-3.0/widgets/AceGUIWidget-Slider.lua | 281 - ...hangelog-LibBabble-SubZone-3.0-5.1-release1.txt | 13 - .../libs/LibBabble-SubZone-3.0/LibBabble-3.0.lua | 292 - .../LibBabble-SubZone-3.0.lua |45876 -------------------- .../LibBabble-SubZone-3.0.toc | 17 - .../libs/LibBabble-SubZone-3.0/LibStub/LibStub.lua | 51 - .../libs/LibBabble-SubZone-3.0/LibStub/LibStub.toc | 13 - .../LibBabble-SubZone-3.0/LibStub/tests/test.lua | 41 - .../LibBabble-SubZone-3.0/LibStub/tests/test2.lua | 27 - .../LibBabble-SubZone-3.0/LibStub/tests/test3.lua | 14 - .../LibBabble-SubZone-3.0/LibStub/tests/test4.lua | 41 - ElvUI_SLE/libs/LibBabble-SubZone-3.0/lib.xml | 13 - ElvUI_SLE/libs/LibQTip-1.0/LICENSE.txt | 29 - ElvUI_SLE/libs/LibQTip-1.0/LibQTip-1.0.lua | 1329 - ElvUI_SLE/libs/LibQTip-1.0/LibQTip-1.0.toc | 17 - ElvUI_SLE/libs/LibQTip-1.0/LibStub/LibStub.lua | 51 - ElvUI_SLE/libs/LibQTip-1.0/LibStub/LibStub.toc | 13 - ElvUI_SLE/libs/LibQTip-1.0/LibStub/tests/test.lua | 41 - ElvUI_SLE/libs/LibQTip-1.0/LibStub/tests/test2.lua | 27 - ElvUI_SLE/libs/LibQTip-1.0/LibStub/tests/test3.lua | 14 - ElvUI_SLE/libs/LibQTip-1.0/LibStub/tests/test4.lua | 41 - ElvUI_SLE/libs/LibQTip-1.0/lib.xml | 4 - .../libs/LibRangeCheck-2.0/LibRangeCheck-2.0.lua | 1046 - ElvUI_SLE/libs/load_libs.xml | 1 - ElvUI_SLE/libs/oUF_NecroStrike/oUF_NecroStrike.lua | 116 - ElvUI_SLE/libs/oUF_NecroStrike/oUF_NecroStrike.toc | 9 - ElvUI_SLE/locales/china.lua | 6 - ElvUI_SLE/locales/english.lua | 428 - ElvUI_SLE/locales/french.lua | 7 - ElvUI_SLE/locales/german.lua | 170 - ElvUI_SLE/locales/italian.lua | 8 - ElvUI_SLE/locales/korean.lua | 6 - ElvUI_SLE/locales/load_locales.xml | 11 - ElvUI_SLE/locales/portuguese.lua | 6 - ElvUI_SLE/locales/russian.lua | 415 - ElvUI_SLE/locales/spanish.lua | 6 - ElvUI_SLE/locales/taiwan.lua | 6 - ElvUI_SLE/media/fonts/Accidental_Presidency.ttf | Bin 41556 -> 0 bytes ElvUI_SLE/media/fonts/DORISBR.TTF | Bin 33980 -> 0 bytes ElvUI_SLE/media/fonts/KGSmallTownSouthernGirl.ttf | Bin 31212 -> 0 bytes ElvUI_SLE/media/load_media.xml | 3 - ElvUI_SLE/media/sharedmedia.lua | 9 - ElvUI_SLE/media/sounds/sheep.mp3 | Bin 30134 -> 0 bytes ElvUI_SLE/media/textures/Alliance-text.blp | Bin 88564 -> 0 bytes ElvUI_SLE/media/textures/Alliance.blp | Bin 2564 -> 0 bytes ElvUI_SLE/media/textures/Castle.blp | Bin 44876 -> 0 bytes ElvUI_SLE/media/textures/Chat_Friend.blp | Bin 1684 -> 0 bytes ElvUI_SLE/media/textures/Chat_RPG.blp | Bin 2196 -> 0 bytes ElvUI_SLE/media/textures/Chat_Test.blp | Bin 3220 -> 0 bytes ElvUI_SLE/media/textures/Config_SL.blp | Bin 350724 -> 0 bytes ElvUI_SLE/media/textures/Gradation.blp | Bin 88580 -> 0 bytes ElvUI_SLE/media/textures/Horde-text.blp | Bin 88564 -> 0 bytes ElvUI_SLE/media/textures/Horde.blp | Bin 2564 -> 0 bytes ElvUI_SLE/media/textures/Neutral.blp | Bin 9364 -> 0 bytes ElvUI_SLE/media/textures/SLE_Chat_Logo.blp | Bin 1876 -> 0 bytes ElvUI_SLE/media/textures/SLE_Chat_LogoD.blp | Bin 1876 -> 0 bytes ElvUI_SLE/media/textures/SLE_Title.blp | Bin 700244 -> 0 bytes ElvUI_SLE/media/textures/Space.blp | Bin 175956 -> 0 bytes ElvUI_SLE/media/textures/TheEmpire.blp | Bin 44876 -> 0 bytes ElvUI_SLE/media/textures/Warning-Small.blp | Bin 1540 -> 0 bytes ElvUI_SLE/media/textures/adapt.blp | Bin 1876 -> 0 bytes ElvUI_SLE/media/textures/anchor.tga | Bin 1068 -> 0 bytes ElvUI_SLE/media/textures/bar15.blp | Bin 12148 -> 0 bytes ElvUI_SLE/media/textures/bl_logo.blp | Bin 44884 -> 0 bytes ElvUI_SLE/media/textures/chat_1.blp | Bin 700244 -> 0 bytes ElvUI_SLE/media/textures/clearmarker.blp | Bin 6660 -> 0 bytes ElvUI_SLE/media/textures/logo_elvui_sle.blp | Bin 44884 -> 0 bytes ElvUI_SLE/media/textures/outfitter.blp | Bin 1524 -> 0 bytes ElvUI_SLE/modules/autorelease/autorelease.lua | 49 - ElvUI_SLE/modules/autorelease/load_autorelease.xml | 4 - ElvUI_SLE/modules/autorelease/options.lua | 30 - ElvUI_SLE/modules/backgrounds/backgrounds.lua | 129 - ElvUI_SLE/modules/backgrounds/load_backgrounds.xml | 4 - ElvUI_SLE/modules/backgrounds/options.lua | 160 - ElvUI_SLE/modules/bags/baginfo.lua | 136 - ElvUI_SLE/modules/bags/load_bags.xml | 3 - .../modules/characterframe/characterframe.lua | 614 - ElvUI_SLE/modules/characterframe/communication.lua | 948 - ElvUI_SLE/modules/characterframe/core.lua | 494 - ElvUI_SLE/modules/characterframe/inspectframe.lua | 2240 - .../modules/characterframe/load_characterframe.xml | 20 - ElvUI_SLE/modules/characterframe/notifyinspect.lua | 138 - ElvUI_SLE/modules/characterframe/options.lua | 370 - ElvUI_SLE/modules/chat/chat.lua | 1053 - ElvUI_SLE/modules/chat/load_chat.xml | 4 - ElvUI_SLE/modules/chat/options.lua | 53 - ElvUI_SLE/modules/datatexts/add_panels.lua | 106 - ElvUI_SLE/modules/datatexts/agility.lua | 21 - ElvUI_SLE/modules/datatexts/currency.lua | 290 - .../modules/datatexts/dashboard/dashboard.lua | 87 - .../datatexts/dashboard/datapanels/bags.lua | 25 - .../datatexts/dashboard/datapanels/durability.lua | 65 - .../modules/datatexts/dashboard/datapanels/fps.lua | 23 - .../modules/datatexts/dashboard/datapanels/ms.lua | 24 - .../modules/datatexts/dashboard/load_dashboard.xml | 7 - ElvUI_SLE/modules/datatexts/energyregen.lua | 21 - ElvUI_SLE/modules/datatexts/friends.lua | 564 - ElvUI_SLE/modules/datatexts/guild.lua | 469 - ElvUI_SLE/modules/datatexts/intellect.lua | 21 - ElvUI_SLE/modules/datatexts/itemlevel.lua | 263 - ElvUI_SLE/modules/datatexts/lfr.lua | 407 - ElvUI_SLE/modules/datatexts/load_datatexts.xml | 23 - ElvUI_SLE/modules/datatexts/mail.lua | 86 - ElvUI_SLE/modules/datatexts/micromenu.lua | 73 - ElvUI_SLE/modules/datatexts/options.lua | 504 - ElvUI_SLE/modules/datatexts/played.lua | 167 - ElvUI_SLE/modules/datatexts/range.lua | 53 - ElvUI_SLE/modules/datatexts/regen.lua | 28 - ElvUI_SLE/modules/datatexts/spirit.lua | 21 - ElvUI_SLE/modules/datatexts/stamina.lua | 21 - ElvUI_SLE/modules/datatexts/strength.lua | 21 - ElvUI_SLE/modules/datatexts/time.lua | 214 - ElvUI_SLE/modules/datatexts/version.lua | 46 - ElvUI_SLE/modules/equipmanager/equipmanager.lua | 82 - .../modules/equipmanager/load_equipmanager.xml | 4 - ElvUI_SLE/modules/equipmanager/options.lua | 130 - ElvUI_SLE/modules/exprepbar/exprepbar.lua | 272 - ElvUI_SLE/modules/exprepbar/load_exprepbar.xml | 4 - ElvUI_SLE/modules/exprepbar/options.lua | 44 - ElvUI_SLE/modules/farm/farm.lua | 606 - ElvUI_SLE/modules/farm/load_farm.xml | 4 - ElvUI_SLE/modules/farm/options.lua | 97 - ElvUI_SLE/modules/imports/load_imports.xml | 3 - ElvUI_SLE/modules/imports/options.lua | 539 - ElvUI_SLE/modules/install/BigWigs.lua | 35 - ElvUI_SLE/modules/install/BigWigsFights.lua | 91 - ElvUI_SLE/modules/install/BigWigsIcon.lua | 29 - ElvUI_SLE/modules/install/Clique.lua | 27 - ElvUI_SLE/modules/install/Hermes.lua | 1046 - ElvUI_SLE/modules/install/Skada.lua | 160 - ElvUI_SLE/modules/install/install.lua | 2126 - ElvUI_SLE/modules/install/installer.lua | 153 - ElvUI_SLE/modules/install/load_install.xml | 11 - ElvUI_SLE/modules/install/xCT+.lua | 324 - ElvUI_SLE/modules/load_modules.xml | 24 - ElvUI_SLE/modules/loot/load_loot.xml | 4 - ElvUI_SLE/modules/loot/loot.lua | 130 - ElvUI_SLE/modules/loot/options.lua | 73 - ElvUI_SLE/modules/marks/flares.lua | 195 - ElvUI_SLE/modules/marks/load_marks.xml | 5 - ElvUI_SLE/modules/marks/marks.lua | 193 - ElvUI_SLE/modules/marks/options.lua | 198 - ElvUI_SLE/modules/minimap/load_minimap.xml | 5 - ElvUI_SLE/modules/minimap/minimapcoords.lua | 87 - ElvUI_SLE/modules/minimap/minimapicons.lua | 353 - ElvUI_SLE/modules/minimap/options.lua | 147 - ElvUI_SLE/modules/nameplates/load_nameplates.xml | 4 - ElvUI_SLE/modules/nameplates/nameplates.lua | 110 - ElvUI_SLE/modules/nameplates/options.lua | 33 - ElvUI_SLE/modules/options.lua | 189 - ElvUI_SLE/modules/pvpmover/pvpmover.lua | 25 - ElvUI_SLE/modules/raidutility/load_raidutility.xml | 3 - ElvUI_SLE/modules/raidutility/raidutility.lua | 41 - ElvUI_SLE/modules/tooltip/load_tooltip.xml | 4 - ElvUI_SLE/modules/tooltip/options.lua | 67 - ElvUI_SLE/modules/tooltip/tooltip.lua | 67 - ElvUI_SLE/modules/uibuttons/load_uibuttons.xml | 4 - ElvUI_SLE/modules/uibuttons/options.lua | 85 - ElvUI_SLE/modules/uibuttons/uibuttons.lua | 182 - ElvUI_SLE/modules/unitframes/load_unitframes.xml | 6 - ElvUI_SLE/modules/unitframes/options.lua | 82 - ElvUI_SLE/modules/unitframes/tags.lua | 152 - ElvUI_SLE/modules/unitframes/units/load_units.xml | 3 - ElvUI_SLE/modules/unitframes/units/player.lua | 91 - ElvUI_SLE/modules/unitframes/update_elements.lua | 41 - ElvUI_SLE/modules/vehicle/load_vehicle.xml | 4 - ElvUI_SLE/modules/vehicle/options.lua | 30 - ElvUI_SLE/modules/vehicle/vehicle.lua | 139 - ElvUI_SLE/skins/blizzard/extraab.lua | 30 - ElvUI_SLE/skins/blizzard/load_blizzard.xml | 4 - ElvUI_SLE/skins/blizzard/petbattle.lua | 379 - ElvUI_SLE/skins/load_skins.xml | 3 - 231 files changed, 84047 deletions(-) delete mode 100644 ElvUI_SLE/Bindings.xml delete mode 100755 ElvUI_SLE/ElvUI_SLE.lua delete mode 100755 ElvUI_SLE/ElvUI_SLE.toc delete mode 100755 ElvUI_SLE/config/load_config.xml delete mode 100755 ElvUI_SLE/config/profile.lua delete mode 100755 ElvUI_SLE/config/sle_private.lua delete mode 100755 ElvUI_SLE/dev/commands.lua delete mode 100755 ElvUI_SLE/dev/elvprot.lua delete mode 100755 ElvUI_SLE/dev/load_dev.xml delete mode 100755 ElvUI_SLE/dev/options.lua delete mode 100755 ElvUI_SLE/dev/staticpopups.lua delete mode 100755 ElvUI_SLE/dev/test.lua delete mode 100755 ElvUI_SLE/layout/layout.lua delete mode 100644 ElvUI_SLE/libs/AceAddon-3.0/AceAddon-3.0.lua delete mode 100644 ElvUI_SLE/libs/AceAddon-3.0/AceAddon-3.0.xml delete mode 100644 ElvUI_SLE/libs/AceConfig-3.0/AceConfig-3.0.lua delete mode 100644 ElvUI_SLE/libs/AceConfig-3.0/AceConfig-3.0.xml delete mode 100644 ElvUI_SLE/libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua delete mode 100644 ElvUI_SLE/libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml delete mode 100644 ElvUI_SLE/libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua delete mode 100644 ElvUI_SLE/libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml delete mode 100644 ElvUI_SLE/libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua delete mode 100644 ElvUI_SLE/libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml delete mode 100644 ElvUI_SLE/libs/AceConsole-3.0/AceConsole-3.0.lua delete mode 100644 ElvUI_SLE/libs/AceConsole-3.0/AceConsole-3.0.xml delete mode 100644 ElvUI_SLE/libs/AceDB-3.0/AceDB-3.0.lua delete mode 100644 ElvUI_SLE/libs/AceDB-3.0/AceDB-3.0.xml delete mode 100644 ElvUI_SLE/libs/AceDBOptions-3.0/AceDBOptions-3.0.lua delete mode 100644 ElvUI_SLE/libs/AceDBOptions-3.0/AceDBOptions-3.0.xml delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0-SharedMediaWidgets/BackgroundWidget.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0-SharedMediaWidgets/BorderWidget.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0-SharedMediaWidgets/FontWidget.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0-SharedMediaWidgets/SoundWidget.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0-SharedMediaWidgets/StatusbarWidget.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0-SharedMediaWidgets/prototypes.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0-SharedMediaWidgets/widget.xml delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/AceGUI-3.0.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/AceGUI-3.0.xml delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/widgets/AceGUIContainer-SimpleGroup.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/widgets/AceGUIWidget-InteractiveLabel.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua delete mode 100644 ElvUI_SLE/libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua delete mode 100755 ElvUI_SLE/libs/LibBabble-SubZone-3.0/Changelog-LibBabble-SubZone-3.0-5.1-release1.txt delete mode 100755 ElvUI_SLE/libs/LibBabble-SubZone-3.0/LibBabble-3.0.lua delete mode 100755 ElvUI_SLE/libs/LibBabble-SubZone-3.0/LibBabble-SubZone-3.0.lua delete mode 100755 ElvUI_SLE/libs/LibBabble-SubZone-3.0/LibBabble-SubZone-3.0.toc delete mode 100755 ElvUI_SLE/libs/LibBabble-SubZone-3.0/LibStub/LibStub.lua delete mode 100755 ElvUI_SLE/libs/LibBabble-SubZone-3.0/LibStub/LibStub.toc delete mode 100755 ElvUI_SLE/libs/LibBabble-SubZone-3.0/LibStub/tests/test.lua delete mode 100755 ElvUI_SLE/libs/LibBabble-SubZone-3.0/LibStub/tests/test2.lua delete mode 100755 ElvUI_SLE/libs/LibBabble-SubZone-3.0/LibStub/tests/test3.lua delete mode 100755 ElvUI_SLE/libs/LibBabble-SubZone-3.0/LibStub/tests/test4.lua delete mode 100755 ElvUI_SLE/libs/LibBabble-SubZone-3.0/lib.xml delete mode 100644 ElvUI_SLE/libs/LibQTip-1.0/LICENSE.txt delete mode 100644 ElvUI_SLE/libs/LibQTip-1.0/LibQTip-1.0.lua delete mode 100644 ElvUI_SLE/libs/LibQTip-1.0/LibQTip-1.0.toc delete mode 100644 ElvUI_SLE/libs/LibQTip-1.0/LibStub/LibStub.lua delete mode 100644 ElvUI_SLE/libs/LibQTip-1.0/LibStub/LibStub.toc delete mode 100644 ElvUI_SLE/libs/LibQTip-1.0/LibStub/tests/test.lua delete mode 100644 ElvUI_SLE/libs/LibQTip-1.0/LibStub/tests/test2.lua delete mode 100644 ElvUI_SLE/libs/LibQTip-1.0/LibStub/tests/test3.lua delete mode 100644 ElvUI_SLE/libs/LibQTip-1.0/LibStub/tests/test4.lua delete mode 100644 ElvUI_SLE/libs/LibQTip-1.0/lib.xml delete mode 100644 ElvUI_SLE/libs/LibRangeCheck-2.0/LibRangeCheck-2.0.lua delete mode 100755 ElvUI_SLE/libs/load_libs.xml delete mode 100755 ElvUI_SLE/libs/oUF_NecroStrike/oUF_NecroStrike.lua delete mode 100755 ElvUI_SLE/libs/oUF_NecroStrike/oUF_NecroStrike.toc delete mode 100755 ElvUI_SLE/locales/china.lua delete mode 100755 ElvUI_SLE/locales/english.lua delete mode 100755 ElvUI_SLE/locales/french.lua delete mode 100755 ElvUI_SLE/locales/german.lua delete mode 100755 ElvUI_SLE/locales/italian.lua delete mode 100755 ElvUI_SLE/locales/korean.lua delete mode 100755 ElvUI_SLE/locales/load_locales.xml delete mode 100755 ElvUI_SLE/locales/portuguese.lua delete mode 100755 ElvUI_SLE/locales/russian.lua delete mode 100755 ElvUI_SLE/locales/spanish.lua delete mode 100755 ElvUI_SLE/locales/taiwan.lua delete mode 100755 ElvUI_SLE/media/fonts/Accidental_Presidency.ttf delete mode 100755 ElvUI_SLE/media/fonts/DORISBR.TTF delete mode 100755 ElvUI_SLE/media/fonts/KGSmallTownSouthernGirl.ttf delete mode 100755 ElvUI_SLE/media/load_media.xml delete mode 100755 ElvUI_SLE/media/sharedmedia.lua delete mode 100755 ElvUI_SLE/media/sounds/sheep.mp3 delete mode 100644 ElvUI_SLE/media/textures/Alliance-text.blp delete mode 100644 ElvUI_SLE/media/textures/Alliance.blp delete mode 100644 ElvUI_SLE/media/textures/Castle.blp delete mode 100755 ElvUI_SLE/media/textures/Chat_Friend.blp delete mode 100755 ElvUI_SLE/media/textures/Chat_RPG.blp delete mode 100755 ElvUI_SLE/media/textures/Chat_Test.blp delete mode 100644 ElvUI_SLE/media/textures/Config_SL.blp delete mode 100644 ElvUI_SLE/media/textures/Gradation.blp delete mode 100644 ElvUI_SLE/media/textures/Horde-text.blp delete mode 100644 ElvUI_SLE/media/textures/Horde.blp delete mode 100644 ElvUI_SLE/media/textures/Neutral.blp delete mode 100644 ElvUI_SLE/media/textures/SLE_Chat_Logo.blp delete mode 100644 ElvUI_SLE/media/textures/SLE_Chat_LogoD.blp delete mode 100644 ElvUI_SLE/media/textures/SLE_Title.blp delete mode 100644 ElvUI_SLE/media/textures/Space.blp delete mode 100644 ElvUI_SLE/media/textures/TheEmpire.blp delete mode 100644 ElvUI_SLE/media/textures/Warning-Small.blp delete mode 100644 ElvUI_SLE/media/textures/adapt.blp delete mode 100644 ElvUI_SLE/media/textures/anchor.tga delete mode 100644 ElvUI_SLE/media/textures/bar15.blp delete mode 100644 ElvUI_SLE/media/textures/bl_logo.blp delete mode 100644 ElvUI_SLE/media/textures/chat_1.blp delete mode 100644 ElvUI_SLE/media/textures/clearmarker.blp delete mode 100644 ElvUI_SLE/media/textures/logo_elvui_sle.blp delete mode 100644 ElvUI_SLE/media/textures/outfitter.blp delete mode 100755 ElvUI_SLE/modules/autorelease/autorelease.lua delete mode 100755 ElvUI_SLE/modules/autorelease/load_autorelease.xml delete mode 100755 ElvUI_SLE/modules/autorelease/options.lua delete mode 100755 ElvUI_SLE/modules/backgrounds/backgrounds.lua delete mode 100755 ElvUI_SLE/modules/backgrounds/load_backgrounds.xml delete mode 100755 ElvUI_SLE/modules/backgrounds/options.lua delete mode 100755 ElvUI_SLE/modules/bags/baginfo.lua delete mode 100755 ElvUI_SLE/modules/bags/load_bags.xml delete mode 100755 ElvUI_SLE/modules/characterframe/characterframe.lua delete mode 100644 ElvUI_SLE/modules/characterframe/communication.lua delete mode 100644 ElvUI_SLE/modules/characterframe/core.lua delete mode 100644 ElvUI_SLE/modules/characterframe/inspectframe.lua delete mode 100755 ElvUI_SLE/modules/characterframe/load_characterframe.xml delete mode 100644 ElvUI_SLE/modules/characterframe/notifyinspect.lua delete mode 100755 ElvUI_SLE/modules/characterframe/options.lua delete mode 100755 ElvUI_SLE/modules/chat/chat.lua delete mode 100755 ElvUI_SLE/modules/chat/load_chat.xml delete mode 100755 ElvUI_SLE/modules/chat/options.lua delete mode 100755 ElvUI_SLE/modules/datatexts/add_panels.lua delete mode 100644 ElvUI_SLE/modules/datatexts/agility.lua delete mode 100644 ElvUI_SLE/modules/datatexts/currency.lua delete mode 100755 ElvUI_SLE/modules/datatexts/dashboard/dashboard.lua delete mode 100755 ElvUI_SLE/modules/datatexts/dashboard/datapanels/bags.lua delete mode 100755 ElvUI_SLE/modules/datatexts/dashboard/datapanels/durability.lua delete mode 100755 ElvUI_SLE/modules/datatexts/dashboard/datapanels/fps.lua delete mode 100755 ElvUI_SLE/modules/datatexts/dashboard/datapanels/ms.lua delete mode 100755 ElvUI_SLE/modules/datatexts/dashboard/load_dashboard.xml delete mode 100644 ElvUI_SLE/modules/datatexts/energyregen.lua delete mode 100644 ElvUI_SLE/modules/datatexts/friends.lua delete mode 100644 ElvUI_SLE/modules/datatexts/guild.lua delete mode 100644 ElvUI_SLE/modules/datatexts/intellect.lua delete mode 100644 ElvUI_SLE/modules/datatexts/itemlevel.lua delete mode 100755 ElvUI_SLE/modules/datatexts/lfr.lua delete mode 100755 ElvUI_SLE/modules/datatexts/load_datatexts.xml delete mode 100644 ElvUI_SLE/modules/datatexts/mail.lua delete mode 100644 ElvUI_SLE/modules/datatexts/micromenu.lua delete mode 100755 ElvUI_SLE/modules/datatexts/options.lua delete mode 100644 ElvUI_SLE/modules/datatexts/played.lua delete mode 100644 ElvUI_SLE/modules/datatexts/range.lua delete mode 100755 ElvUI_SLE/modules/datatexts/regen.lua delete mode 100755 ElvUI_SLE/modules/datatexts/spirit.lua delete mode 100644 ElvUI_SLE/modules/datatexts/stamina.lua delete mode 100644 ElvUI_SLE/modules/datatexts/strength.lua delete mode 100755 ElvUI_SLE/modules/datatexts/time.lua delete mode 100755 ElvUI_SLE/modules/datatexts/version.lua delete mode 100755 ElvUI_SLE/modules/equipmanager/equipmanager.lua delete mode 100755 ElvUI_SLE/modules/equipmanager/load_equipmanager.xml delete mode 100755 ElvUI_SLE/modules/equipmanager/options.lua delete mode 100755 ElvUI_SLE/modules/exprepbar/exprepbar.lua delete mode 100755 ElvUI_SLE/modules/exprepbar/load_exprepbar.xml delete mode 100755 ElvUI_SLE/modules/exprepbar/options.lua delete mode 100755 ElvUI_SLE/modules/farm/farm.lua delete mode 100755 ElvUI_SLE/modules/farm/load_farm.xml delete mode 100755 ElvUI_SLE/modules/farm/options.lua delete mode 100755 ElvUI_SLE/modules/imports/load_imports.xml delete mode 100755 ElvUI_SLE/modules/imports/options.lua delete mode 100755 ElvUI_SLE/modules/install/BigWigs.lua delete mode 100755 ElvUI_SLE/modules/install/BigWigsFights.lua delete mode 100755 ElvUI_SLE/modules/install/BigWigsIcon.lua delete mode 100755 ElvUI_SLE/modules/install/Clique.lua delete mode 100755 ElvUI_SLE/modules/install/Hermes.lua delete mode 100755 ElvUI_SLE/modules/install/Skada.lua delete mode 100755 ElvUI_SLE/modules/install/install.lua delete mode 100755 ElvUI_SLE/modules/install/installer.lua delete mode 100755 ElvUI_SLE/modules/install/load_install.xml delete mode 100755 ElvUI_SLE/modules/install/xCT+.lua delete mode 100755 ElvUI_SLE/modules/load_modules.xml delete mode 100755 ElvUI_SLE/modules/loot/load_loot.xml delete mode 100755 ElvUI_SLE/modules/loot/loot.lua delete mode 100755 ElvUI_SLE/modules/loot/options.lua delete mode 100644 ElvUI_SLE/modules/marks/flares.lua delete mode 100755 ElvUI_SLE/modules/marks/load_marks.xml delete mode 100755 ElvUI_SLE/modules/marks/marks.lua delete mode 100755 ElvUI_SLE/modules/marks/options.lua delete mode 100755 ElvUI_SLE/modules/minimap/load_minimap.xml delete mode 100755 ElvUI_SLE/modules/minimap/minimapcoords.lua delete mode 100755 ElvUI_SLE/modules/minimap/minimapicons.lua delete mode 100755 ElvUI_SLE/modules/minimap/options.lua delete mode 100644 ElvUI_SLE/modules/nameplates/load_nameplates.xml delete mode 100644 ElvUI_SLE/modules/nameplates/nameplates.lua delete mode 100644 ElvUI_SLE/modules/nameplates/options.lua delete mode 100755 ElvUI_SLE/modules/options.lua delete mode 100755 ElvUI_SLE/modules/pvpmover/pvpmover.lua delete mode 100755 ElvUI_SLE/modules/raidutility/load_raidutility.xml delete mode 100755 ElvUI_SLE/modules/raidutility/raidutility.lua delete mode 100644 ElvUI_SLE/modules/tooltip/load_tooltip.xml delete mode 100644 ElvUI_SLE/modules/tooltip/options.lua delete mode 100644 ElvUI_SLE/modules/tooltip/tooltip.lua delete mode 100755 ElvUI_SLE/modules/uibuttons/load_uibuttons.xml delete mode 100755 ElvUI_SLE/modules/uibuttons/options.lua delete mode 100755 ElvUI_SLE/modules/uibuttons/uibuttons.lua delete mode 100755 ElvUI_SLE/modules/unitframes/load_unitframes.xml delete mode 100755 ElvUI_SLE/modules/unitframes/options.lua delete mode 100755 ElvUI_SLE/modules/unitframes/tags.lua delete mode 100755 ElvUI_SLE/modules/unitframes/units/load_units.xml delete mode 100755 ElvUI_SLE/modules/unitframes/units/player.lua delete mode 100755 ElvUI_SLE/modules/unitframes/update_elements.lua delete mode 100755 ElvUI_SLE/modules/vehicle/load_vehicle.xml delete mode 100755 ElvUI_SLE/modules/vehicle/options.lua delete mode 100755 ElvUI_SLE/modules/vehicle/vehicle.lua delete mode 100755 ElvUI_SLE/skins/blizzard/extraab.lua delete mode 100755 ElvUI_SLE/skins/blizzard/load_blizzard.xml delete mode 100755 ElvUI_SLE/skins/blizzard/petbattle.lua delete mode 100755 ElvUI_SLE/skins/load_skins.xml diff --git a/ElvUI_SLE/Bindings.xml b/ElvUI_SLE/Bindings.xml deleted file mode 100644 index f37f5e3..0000000 --- a/ElvUI_SLE/Bindings.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - -- Square - - - -- Triangle - - - -- Diamond - - - -- Cross - - - -- Star - - \ No newline at end of file diff --git a/ElvUI_SLE/ElvUI_SLE.lua b/ElvUI_SLE/ElvUI_SLE.lua deleted file mode 100755 index e37386f..0000000 --- a/ElvUI_SLE/ElvUI_SLE.lua +++ /dev/null @@ -1,189 +0,0 @@ -local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore -local SLE = E:NewModule('SLE', 'AceHook-3.0', 'AceEvent-3.0'); -local UF = E:GetModule('UnitFrames'); -local DTP -local EP = LibStub("LibElvUIPlugin-1.0") -local addon = ... - ---localizing functions-- -local IsInInstance = IsInInstance -local tinsert = tinsert - -SLE.version = GetAddOnMetadata("ElvUI_SLE", "Version") -E.SLEConfigs = {} - -function SLE:Tutorials() --Additional tutorials - tinsert(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]."]); -end - -function SLE:ConfigCats() --Additional mover groups - tinsert(E.ConfigModeLayouts, #(E.ConfigModeLayouts)+1, "S&L"); - E.ConfigModeLocalizedStrings["S&L"] = L["S&L: All"] - tinsert(E.ConfigModeLayouts, #(E.ConfigModeLayouts)+1, "S&L DT"); - E.ConfigModeLocalizedStrings["S&L DT"] = L["S&L: Datatexts"] - if E.private.sle.backgrounds then - tinsert(E.ConfigModeLayouts, #(E.ConfigModeLayouts)+1, "S&L BG"); - E.ConfigModeLocalizedStrings["S&L BG"] = L["S&L: Backgrounds"] - end - tinsert(E.ConfigModeLayouts, #(E.ConfigModeLayouts)+1, "S&L MISC"); - E.ConfigModeLocalizedStrings["S&L MISC"] = L["S&L: Misc"] -end - -function SLE:LootShow() - local instance = IsInInstance() - LootHistoryFrame:SetAlpha(E.db.sle.lootalpha or 1) - - if (not instance and E.db.sle.lootwin) then - LootHistoryFrame:Hide() - end -end - -E.UpdateAllSLE = E.UpdateAll -function E:UpdateAll() - E.UpdateAllSLE(self) - E:GetModule('SLE_BackGrounds'):UpdateFrames() - E:GetModule('SLE_BackGrounds'):RegisterHide() - DTP:Update() - DTP:DashboardShow() - DTP:DashWidth() - if E.private.unitframe.enable then - UF:Update_CombatIndicator() - end - E:GetModule('SLE_UIButtons'):UpdateAll() - E:GetModule('SLE_RaidMarks'):Update() - E:GetModule('SLE_RaidFlares'):Update() - E:GetModule('SLE_Farm'):UpdateLayout() - E:GetModule("Chat"):GMIconUpdate() -end - -function SLE:Reset(all, uf, dt, bg, mark) - if all then --Reset All button - E:CopyTable(E.db.sle, P.sle) - E:ResetMovers(L["DP_1"]) - E:ResetMovers(L["DP_2"]) - E:ResetMovers(L["DP_3"]) - E:ResetMovers(L["DP_4"]) - E:ResetMovers(L["DP_5"]) - E:ResetMovers(L["DP_6"]) - E:ResetMovers(L["Top_Center"]) - E:ResetMovers(L["Bottom_Panel"]) - E:ResetMovers(L["Dashboard"]) - E:ResetMovers(L["Pet Battle AB"]) - E:ResetMovers("PvP") - E:ResetMovers('RM') - E:ResetMovers(L["UI Buttons"]) - E:ResetMovers(L["Bottom BG"]) - E:ResetMovers(L["Left BG"]) - E:ResetMovers(L["Right BG"]) - E:ResetMovers(L["Actionbar BG"]) - end - if uf then - E.db.sle.combatico.pos = 'TOP' - E:CopyTable(E.db.unitframe.units.player.classbar, P.unitframe.units.player.classbar) - E.db.sle.powtext = false - end - if dt then - E:CopyTable(E.db.sle.datatext, P.sle.datatext) - E:ResetMovers(L["DP_1"]) - E:ResetMovers(L["DP_2"]) - E:ResetMovers(L["DP_3"]) - E:ResetMovers(L["DP_4"]) - E:ResetMovers(L["DP_5"]) - E:ResetMovers(L["DP_6"]) - E:ResetMovers(L["Top_Center"]) - E:ResetMovers(L["Bottom_Panel"]) - E:ResetMovers(L["Dashboard"]) - end - if bg then - E:CopyTable(E.db.sle.backgrounds, P.sle.backgrounds) - E:ResetMovers(L["Bottom BG"]) - E:ResetMovers(L["Left BG"]) - E:ResetMovers(L["Right BG"]) - E:ResetMovers(L["Actionbar BG"]) - end - if mark then - E:CopyTable(E.db.sle.marks, P.sle.marks) - E:ResetMovers('RM') - end - E:UpdateAll() -end - -function SLE:BagSearch(itemId) - for container = 0, NUM_BAG_SLOTS do - for slot = 1, GetContainerNumSlots(container) do - if itemId == GetContainerItemID(container, slot) then - return container, slot - end - end - end -end - -function SLE:ValueTable(table, item) - for i, _ in pairs(table) do - if i == item then return true end - end - return false -end - -function SLE:SimpleTable(table, item) - for i = 1, #table do - if table[i] == item then - return true - end - end - return false -end - -function SLE:Print(msg) - print(E["media"].hexvaluecolor..'S&L:|r', msg) -end - -function SLE:GetOptions() - for _, func in pairs(E.SLEConfigs) do - func() - end -end - -function SLE:IncompatibleAddOn(addon, module, optiontable, value) - E.PopupDialogs['SLE_INCOMPATIBLE_ADDON'].button1 = addon - E.PopupDialogs['SLE_INCOMPATIBLE_ADDON'].button2 = 'S&L: '..module - E.PopupDialogs['SLE_INCOMPATIBLE_ADDON'].addon = addon - E.PopupDialogs['SLE_INCOMPATIBLE_ADDON'].module = module - E.PopupDialogs['SLE_INCOMPATIBLE_ADDON'].optiontable = optiontable - E.PopupDialogs['SLE_INCOMPATIBLE_ADDON'].value = value - E.PopupDialogs['SLE_INCOMPATIBLE_ADDON'].showAlert = true - E:StaticPopup_Show('SLE_INCOMPATIBLE_ADDON', addon, module) -end - -function SLE:CheckIncompatible() - if IsAddOnLoaded('ElvUI_Enhanced') and not E.global.ignoreEnhancedIncompatible then - E:StaticPopup_Show('ENHANCED_SLE_INCOMPATIBLE') - end - if IsAddOnLoaded('SquareMinimapButtons') and E.private.sle.minimap.mapicons.enable then - SLE:IncompatibleAddOn('SquareMinimapButtons', 'SquareMinimapButtons', E.private.sle.minimap.mapicons, "enable") - end -end - -function SLE:Initialize() - --Showing warning message about too old versions of ElvUI - if tonumber(E.version) < 6.998 then - E:StaticPopup_Show("VERSION_MISMATCH") - end - EP:RegisterPlugin(addon,SLE.GetOptions) - DTP = E:GetModule('SLE_DTPanels') - if E.private.unitframe.enable then - self:RegisterEvent("PLAYER_REGEN_DISABLED", UF.Update_CombatIndicator); - end - self:RegisterEvent('PLAYER_ENTERING_WORLD', 'LootShow'); - --if E.private.install_complete == E.version and E.private.sle.install_complete == nil then SLE:Install() end - if E.db.general.loginmessage then - print(format(L['SLE_LOGIN_MSG'], E["media"].hexvaluecolor, SLE.version)) - end - DTP:DashboardShow() - SLE:Tutorials() - SLE:ConfigCats() - SLE:RegisterCommands() - SLE:CheckIncompatible() -end - -E:RegisterModule(SLE:GetName()) \ No newline at end of file diff --git a/ElvUI_SLE/ElvUI_SLE.toc b/ElvUI_SLE/ElvUI_SLE.toc deleted file mode 100755 index f08ce68..0000000 --- a/ElvUI_SLE/ElvUI_SLE.toc +++ /dev/null @@ -1,24 +0,0 @@ -## Interface: 50400 -## Title: |cff1784d1ElvUI |rShadow and Light -## Author: Darth Predator, Repooc -## Version: 2.00 -## Notes: Plugin-edit for |cff1784d1ElvUI|r. -## Notes-ruRU: Плагин-редакция для |cff1784d1ElvUI|r. -## eMail: darthpred@gmail.com, repooc@tukui.org -## URL: http://tukui.org/ -## RequiredDeps: ElvUI -## OptionalDeps: iFilger_ConfigUI, BigWigs, Clique, Hermes, xCT+ -## DefaultState: Enabled -## X-Tukui-ProjectID: 42 -## X-Tukui-ProjectFolders: ElvUI_SLE - -libs\load_libs.xml -locales\load_locales.xml -media\load_media.xml -ElvUI_SLE.lua -modules\load_modules.xml -skins\load_skins.xml -config\load_config.xml -layout\layout.lua -dev\load_dev.xml -Bindings.xml \ No newline at end of file diff --git a/ElvUI_SLE/config/load_config.xml b/ElvUI_SLE/config/load_config.xml deleted file mode 100755 index 31e82cc..0000000 --- a/ElvUI_SLE/config/load_config.xml +++ /dev/null @@ -1,4 +0,0 @@ - -