From bf9edad24ceb6d2b3ead0582954ecfeb13d62881 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 6 Jun 2015 20:03:47 +0400 Subject: [PATCH] Moar stuff --- CHANGELOG.txt | 1 + ElvUI_SLE/locales/russian.lua | 1 + ElvUI_SLE/modules/loot.lua | 17 +++++++++++++++-- ElvUI_SLE/modules/screensaver.lua | 20 +++++++++++++++++--- 4 files changed, 34 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index ea6f01e..550b3fe 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -11,6 +11,7 @@ Changes: - Config sections that have new stuff in them are now marked with an exclamation points. - Screensaer now should be less demanding on cpu. - Removed "Exit AFK" button in screensaver. +- To avoid confusion core ElvUI's options disabled/moved by S&L are now replaced with buttons redirecting user towards the place where he/she can cancel the effect. Fixes: - Fixed the button from PAWN addon being unclickable with armory mode enabled - Fixed numerous errors when inspecting people (probably not all of them so keep an eye on those) diff --git a/ElvUI_SLE/locales/russian.lua b/ElvUI_SLE/locales/russian.lua index 6d84124..5f4c549 100644 --- a/ElvUI_SLE/locales/russian.lua +++ b/ElvUI_SLE/locales/russian.lua @@ -43,6 +43,7 @@ L['You have got Loot Confirm and Shadow & Light both enabled at the same time. S L["Enabling mouse over will make ElvUI's raid utility show on mouse over instead of always showing."] = "Отображать кнопку управления рейдом только при наведении мыши." L['Adjust the position of the threat bar to any of the datatext panels in ElvUI & S&L.'] = "Позволяет поместить полосу угрозы на любой панели инфо-текстов." L["This option have been moved by Shadow & Light. Click to access it's new place."] = "Shadow & Light переместил эту опцию. Кликните для перехода к ее новому расположению." +L["This option have been disabled by Shadow & Light. To return it you need to disable S&L's option. Click here to see it's location."] = "Shadow & Light отключил эту опцию. Для доступа к ней нужно отключить соответствующую опцию S&L. Кликните для перехода к ее расположению." L["This will clear your chat history and reload your UI.\nContinue?"] = "История чата будет очищена, а интерфейс перезагружен.\nПродолжить?" L["This will clear your editbox history and reload your UI.\nContinue?"] = "История введенных сообщений будет очищена, а интерфейс перезагружен.\nПродолжить?" diff --git a/ElvUI_SLE/modules/loot.lua b/ElvUI_SLE/modules/loot.lua index 2b81eae..81189d7 100644 --- a/ElvUI_SLE/modules/loot.lua +++ b/ElvUI_SLE/modules/loot.lua @@ -1,6 +1,7 @@ local E, L, V, P, G = unpack(ElvUI); local LT = E:GetModule('SLE_Loot') local M = E:GetModule('Misc') +local ACD = LibStub("AceConfigDialog-3.0") local check = false local t = 0 @@ -251,9 +252,21 @@ end function LT:Update() if IsAddOnLoaded("ElvUI_Config") then if E.db.sle.loot.autoroll.enable then - E.Options.args.general.args.general.args.autoRoll.disabled = function() return true end + E.Options.args.general.args.general.args.autoRoll = { + order = 6, + name = L["Auto Greed/DE"], + desc = L["This option have been disabled by Shadow & Light. To return it you need to disable S&L's option. Click here to see it's location."], + type = "execute", + func = function() ACD:SelectGroup("ElvUI", "sle", "options", "loot") end, + } else - E.Options.args.general.args.general.args.autoRoll.disabled = function() return false end + E.Options.args.general.args.general.args.autoRoll = { + order = 6, + name = L["Auto Greed/DE"], + desc = L["Automatically select greed or disenchant (when available) on green quality items. This will only work if you are the max level."], + type = 'toggle', + disabled = function() return not E.private.general.lootRoll end + } end end diff --git a/ElvUI_SLE/modules/screensaver.lua b/ElvUI_SLE/modules/screensaver.lua index 4007923..0a18d25 100644 --- a/ElvUI_SLE/modules/screensaver.lua +++ b/ElvUI_SLE/modules/screensaver.lua @@ -3,6 +3,7 @@ local SLE = E:GetModule('SLE'); local S = E:GetModule("SLE_ScreenSaver") local LSM = LibStub("LibSharedMedia-3.0") local Sk = E:GetModule("Skins") +local ACD = LibStub("AceConfigDialog-3.0") local SS local ru = false @@ -109,7 +110,7 @@ function S:Setup() SS.testmodel:SetPoint("RIGHT", E.UIParent, "RIGHT", -5, 0) -- SS.testmodel:CreateBackdrop("Transparent") SS.testmodel:Hide() -\ + -- SS.ScrollFrame:SetShadowColor(0, 0, 0, 0) SS.ScrollFrame:SetFading(false) SS.ScrollFrame:SetFadeDuration(0) @@ -290,9 +291,22 @@ end function S:UpdateConfig() if IsAddOnLoaded("ElvUI_Config") then if E.db.sle.media.screensaver.enable then - E.Options.args.general.args.general.args.afk.disabled = function() return true end + E.Options.args.general.args.general.args.afk = { + order = 15, + name = L["AFK Mode"], + desc = L["This option have been disabled by Shadow & Light. To return it you need to disable S&L's option. Click here to see it's location."], + type = "execute", + func = function() ACD:SelectGroup("ElvUI", "sle", "screensaver") end, + } else - E.Options.args.general.args.general.args.afk.disabled = function() return false end + E.Options.args.general.args.general.args.afk = { + order = 15, + type = 'toggle', + name = L["AFK Mode"], + desc = L["When you go AFK display the AFK screen."], + get = function(info) return E.db.general.afk end, + set = function(info, value) E.db.general.afk = value; E:GetModule('AFK'):Toggle() end + } end end end -- 1.7.9.5