From 067810acf9fc21d90773cdc7e12a470f7673ce27 Mon Sep 17 00:00:00 2001 From: Repooc Date: Wed, 6 Aug 2014 21:50:38 -0400 Subject: [PATCH] Change guildmaster to db instead of private... not sure why it wasnt before... --- ElvUI_SLE/defaults/private.lua | 4 +- ElvUI_SLE/defaults/profile.lua | 120 +++++++++++++++++++++------------------- ElvUI_SLE/modules/chat.lua | 6 +- ElvUI_SLE/options/chat_c.lua | 6 +- 4 files changed, 70 insertions(+), 66 deletions(-) diff --git a/ElvUI_SLE/defaults/private.lua b/ElvUI_SLE/defaults/private.lua index 6d8e3ad..2145d5d 100644 --- a/ElvUI_SLE/defaults/private.lua +++ b/ElvUI_SLE/defaults/private.lua @@ -4,7 +4,6 @@ V['skins']['addons'] = { } V['sle'] = { - --Character Frame Options ['characterframeoptions'] = { ['enable'] = false, @@ -69,7 +68,6 @@ V['sle'] = { ['vehicle'] = { ['enable'] = false, }, - - ['guildmaster'] = false, + ['backgrounds'] = false, } \ No newline at end of file diff --git a/ElvUI_SLE/defaults/profile.lua b/ElvUI_SLE/defaults/profile.lua index df5238b..bab0481 100644 --- a/ElvUI_SLE/defaults/profile.lua +++ b/ElvUI_SLE/defaults/profile.lua @@ -1,44 +1,6 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB P['sle'] = { - --Auto release - ['pvpautorelease'] = true, - - --Media - ['media'] = { - ['fonts'] = { - ['zone'] = { - ['font'] = "ElvUI Font", - ['size'] = 32, - ['outline'] = "OUTLINE", - ['width'] = 512, - }, - ['subzone'] = { - ['font'] = "ElvUI Font", - ['size'] = 25, - ['outline'] = "OUTLINE", - ['offset'] = 0, - ['width'] = 512, - }, - ['pvp'] = { - ['font'] = "ElvUI Font", - ['size'] = 22, - ['outline'] = "OUTLINE", - ['width'] = 512, - }, - ['mail'] = { - ['font'] = "ElvUI Font", - ['size'] = 12, - ['outline'] = "NONE", - }, - ['editbox'] = { - ['font'] = "ElvUI Font", - ['size'] = 12, - ['outline'] = "NONE", - }, - }, - }, - --Background frames ['backgrounds'] = { ['bottom'] = { @@ -128,6 +90,11 @@ P['sle'] = { }, }, + --Chat + ['chat'] = { + ['guildmaster'] = false, + }, + --Combat Icon ['combatico'] = { ['pos'] = 'TOP', @@ -226,6 +193,15 @@ P['sle'] = { ['quest'] = false, }, + --Flares (Raid) + ['flares'] = { + ['growth'] = "RIGHT", + ['showinside'] = false, + ['size'] = 20, + ['tooltips'] = true, + ['mouseover'] = false, + }, + --LFR options ['lfrshow'] = { ['enabled'] = false, @@ -257,6 +233,50 @@ P['sle'] = { }, }, + --Marks (Raid) + ['marks'] = { + ['growth'] = "RIGHT", + ['showinside'] = false, + ['target'] = false, + ['size'] = 18, + ['mouseover'] = false, + }, + + --Media + ['media'] = { + ['fonts'] = { + ['zone'] = { + ['font'] = "ElvUI Font", + ['size'] = 32, + ['outline'] = "OUTLINE", + ['width'] = 512, + }, + ['subzone'] = { + ['font'] = "ElvUI Font", + ['size'] = 25, + ['outline'] = "OUTLINE", + ['offset'] = 0, + ['width'] = 512, + }, + ['pvp'] = { + ['font'] = "ElvUI Font", + ['size'] = 22, + ['outline'] = "OUTLINE", + ['width'] = 512, + }, + ['mail'] = { + ['font'] = "ElvUI Font", + ['size'] = 12, + ['outline'] = "NONE", + }, + ['editbox'] = { + ['font'] = "ElvUI Font", + ['size'] = 12, + ['outline'] = "NONE", + }, + }, + }, + --Minimap Module ['minimap'] = { ['enable'] = false, @@ -289,25 +309,15 @@ P['sle'] = { ['showthreat'] = false, ['targetcount'] = false, }, + --Power text on classbars ['powtext'] = false, - --Raid marks - ['marks'] = { - ['growth'] = "RIGHT", - ['showinside'] = false, - ['target'] = false, - ['size'] = 18, - ['mouseover'] = false, - }, + --PvP Auto release + ['pvpautorelease'] = true, - ['flares'] = { - ['growth'] = "RIGHT", - ['showinside'] = false, - ['size'] = 20, - ['tooltips'] = true, - ['mouseover'] = false, - }, + --Tooltip Faction Icon + ["tooltipicon"] = false, --UI Buttons ['uibuttons'] = { @@ -317,10 +327,6 @@ P['sle'] = { ['position'] = "uib_vert", ['spacing'] = 3, }, - - - --Tooltip Faction Icon - ["tooltipicon"] = false, } P.chat.editboxhistory = 5 diff --git a/ElvUI_SLE/modules/chat.lua b/ElvUI_SLE/modules/chat.lua index 2a96dc2..832c777 100644 --- a/ElvUI_SLE/modules/chat.lua +++ b/ElvUI_SLE/modules/chat.lua @@ -208,7 +208,7 @@ local function GetChatIcon(sender) end if not IsInGuild() then return "" end - if not E.private.sle.guildmaster then return "" end + if not E.db.sle.chat.guildmaster then return "" end if senderName == GMName and senderRealm == GMRealm then return leader end @@ -295,7 +295,7 @@ end function CH:GMIconUpdate() if E.private.chat.enable ~= true then return end - if E.private.sle.guildmaster then + if E.db.sle.chat.guildmaster then self:RegisterEvent('GUILD_ROSTER_UPDATE', Roster) GMCheck() else @@ -396,7 +396,7 @@ hooksecurefunc(LO, "CreateChatPanels", CreateChatPanels) hooksecurefunc(CH, "StyleChat", Style) hooksecurefunc(CH, "PositionChat", Position) hooksecurefunc(CH, "Initialize", function(self) - if E.private.sle.guildmaster then + if E.db.sle.chat.guildmaster then self:RegisterEvent('GUILD_ROSTER_UPDATE', Roster) GMCheck() end diff --git a/ElvUI_SLE/options/chat_c.lua b/ElvUI_SLE/options/chat_c.lua index 7d6bbc5..eb566d1 100644 --- a/ElvUI_SLE/options/chat_c.lua +++ b/ElvUI_SLE/options/chat_c.lua @@ -37,9 +37,9 @@ local function configTable() order = 5, type = "toggle", name = "Guild Master Icon", - desc = "Displays an icon near your Guild Master in chat.\n\nSome messages in chat history may disappear on login.", - get = function(info) return E.private.sle.guildmaster end, - set = function(info, value) E.private.sle.guildmaster = value; CH:GMIconUpdate() end, + desc = "Displays an icon near your Guild Master in chat.\n\n|cffFF0000Note:|r Some messages in chat history may disappear on login.", + get = function(info) return E.db.sle.chat.guildmaster end, + set = function(info, value) E.db.sle.chat.guildmaster = value; CH:GMIconUpdate() end, }, editboxhistory = { order = 6, -- 1.7.9.5