diff --git a/2/3/4/5/6/7/ElvUI/Core/StaticPopups.lua b/2/3/4/5/6/7/ElvUI/Core/StaticPopups.lua index 8403e60..1981b88 100644 --- a/2/3/4/5/6/7/ElvUI/Core/StaticPopups.lua +++ b/2/3/4/5/6/7/ElvUI/Core/StaticPopups.lua @@ -38,11 +38,11 @@ E.PopupDialogs["ELVUI_UPDATE_AVAILABLE"] = { button1 = OKAY, OnAccept = E.noop, EditBoxOnEnterPressed = function() - ChatEdit_FocusActiveWindow() + -- ChatEdit_FocusActiveWindow() this:GetParent():Hide() end, EditBoxOnEscapePressed = function() - ChatEdit_FocusActiveWindow() + -- ChatEdit_FocusActiveWindow() this:GetParent():Hide() end, EditBoxOnTextChanged = function() @@ -51,7 +51,7 @@ E.PopupDialogs["ELVUI_UPDATE_AVAILABLE"] = { end this:HighlightText() this:ClearFocus() - ChatEdit_FocusActiveWindow() + -- ChatEdit_FocusActiveWindow() end, OnEditFocusGained = function() this:HighlightText() @@ -62,6 +62,7 @@ E.PopupDialogs["ELVUI_UPDATE_AVAILABLE"] = { E.PopupDialogs["CLIQUE_ADVERT"] = { text = L["Using the healer layout it is highly recommended you download the addon Clique if you wish to have the click-to-heal function."], button1 = YES, + button2 = "", -- Temporary until further fix OnAccept = E.noop, showAlert = 1 } @@ -809,7 +810,7 @@ function E:StaticPopup_Show(which, text_arg1, text_arg2, data) local button2 = _G[name.."Button2"] do - -- assert(getn(tempButtonLocs == 0)) + -- assert(getn(tempButtonLocs == 0)) tinsert(tempButtonLocs, button1) tinsert(tempButtonLocs, button2) diff --git a/2/3/4/5/6/7/ElvUI/Core/core.lua b/2/3/4/5/6/7/ElvUI/Core/core.lua index 0a09d90..7776a22 100644 --- a/2/3/4/5/6/7/ElvUI/Core/core.lua +++ b/2/3/4/5/6/7/ElvUI/Core/core.lua @@ -25,13 +25,13 @@ local ERR_NOT_IN_COMBAT = ERR_NOT_IN_COMBAT local MAX_TALENT_TABS = MAX_TALENT_TABS local RAID_CLASS_COLORS = RAID_CLASS_COLORS -E.myclass = UnitClass("player") -- Constants -E.myrace = UnitRace("player") -E.myfaction = UnitFactionGroup("player") +_, E.myclass = UnitClass("player") -- Constants +_, E.myrace = UnitRace("player") +_, E.myfaction = UnitFactionGroup("player") E.myname = UnitName("player") E.version = GetAddOnMetadata("ElvUI", "Version") E.myrealm = GetRealmName() -E.wowbuild = GetBuildInfo() E.wowbuild = tonumber(E.wowbuild) +_, E.wowbuild = GetBuildInfo() E.wowbuild = tonumber(E.wowbuild) E.resolution = GetCVar("gxResolution") E.screenheight = tonumber(match(E.resolution, "%d+x(%d+)")); E.screenwidth = tonumber(match(E.resolution, "(%d+)x+%d")); diff --git a/2/3/4/5/6/7/ElvUI_Config/General.lua b/2/3/4/5/6/7/ElvUI_Config/General.lua index d2f7ece..88c4099 100644 --- a/2/3/4/5/6/7/ElvUI_Config/General.lua +++ b/2/3/4/5/6/7/ElvUI_Config/General.lua @@ -15,26 +15,19 @@ E.Options.args.general = { get = function(info) return E.global.general.versionCheck; end, set = function(info, value) E.global.general.versionCheck = value; end }, - animateConfig = { - order = 2, - type = "toggle", - name = L["Animate Config"], - get = function(info) return E.global.general.animateConfig; end, - set = function(info, value) E.global.general.animateConfig = value; E:StaticPopup_Show("GLOBAL_RL"); end - }, spacer = { - order = 3, + order = 2, type = "description", name = "", width = "full", }, intro = { - order = 4, + order = 3, type = "description", name = L["ELVUI_DESC"], }, general = { - order = 5, + order = 4, type = "group", name = L["General"], args = { diff --git a/2/3/4/5/6/7/ElvUI_Config/Locales/Chinese_Config.lua b/2/3/4/5/6/7/ElvUI_Config/Locales/Chinese_Config.lua index a600ba9..0f64cc2 100644 --- a/2/3/4/5/6/7/ElvUI_Config/Locales/Chinese_Config.lua +++ b/2/3/4/5/6/7/ElvUI_Config/Locales/Chinese_Config.lua @@ -379,7 +379,6 @@ L["Reset Aura Filters"] = "重置光环过滤器" --Used in Nameplates/UnitFrame L["Accept Invites"] = "自动接受邀请" L["Adjust the position of the threat bar to either the left or right datatext panels."] = "调整仇恨条的位置于左侧或右侧信息面板" L["AFK Mode"] = "离开模式" -L["Animate Config"] = "动画设置" L["Announce Interrupts"] = "打断通告" L["Announce when you interrupt a spell to the specified chat channel."] = "在指定对话频道通知打断信息" L["Attempt to support eyefinity/nvidia surround."] = "尝试支持eyefinity/nvidia surround" diff --git a/2/3/4/5/6/7/ElvUI_Config/Locales/English_Config.lua b/2/3/4/5/6/7/ElvUI_Config/Locales/English_Config.lua index 6cccca9..670b626 100644 --- a/2/3/4/5/6/7/ElvUI_Config/Locales/English_Config.lua +++ b/2/3/4/5/6/7/ElvUI_Config/Locales/English_Config.lua @@ -368,7 +368,6 @@ L["Reset Aura Filters"] = true --Used in Nameplates/UnitFrames general options L["Accept Invites"] = true; L["Adjust the position of the threat bar to either the left or right datatext panels."] = true; L["AFK Mode"] = true; -L["Animate Config"] = true; L["Announce Interrupts"] = true; L["Announce when you interrupt a spell to the specified chat channel."] = true; L["Attempt to support eyefinity/nvidia surround."] = true; diff --git a/2/3/4/5/6/7/ElvUI_Config/Locales/French_Config.lua b/2/3/4/5/6/7/ElvUI_Config/Locales/French_Config.lua index 75a1815..11fc45a 100644 --- a/2/3/4/5/6/7/ElvUI_Config/Locales/French_Config.lua +++ b/2/3/4/5/6/7/ElvUI_Config/Locales/French_Config.lua @@ -379,7 +379,6 @@ L["Reset Aura Filters"] = "Réinitialiser les filtres des auras" --Used in Namep L["Accept Invites"] = "Invitations automatiques" L["Adjust the position of the threat bar to either the left or right datatext panels."] = "Ajustez la position de la barre de menace sur le panel des textes d'informations à gauche ou à droite." L["AFK Mode"] = "Mode AFK" -L["Animate Config"] = true; L["Announce Interrupts"] = "Annoncer les Interruptions" L["Announce when you interrupt a spell to the specified chat channel."] = "Annonce quand vous interrompez un sort dans le canal de chat spécifié." L["Attempt to support eyefinity/nvidia surround."] = "Tente de supporter eyefinity/nvidia surround." diff --git a/2/3/4/5/6/7/ElvUI_Config/Locales/German_Config.lua b/2/3/4/5/6/7/ElvUI_Config/Locales/German_Config.lua index 21a909b..a6fb655 100644 --- a/2/3/4/5/6/7/ElvUI_Config/Locales/German_Config.lua +++ b/2/3/4/5/6/7/ElvUI_Config/Locales/German_Config.lua @@ -379,7 +379,6 @@ L["Reset Aura Filters"] = "Setze Aurafilter zurück" --Used in Nameplates/UnitFr L["Accept Invites"] = "Einladungen akzeptieren" L["Adjust the position of the threat bar to either the left or right datatext panels."] = "Bestimme die Position der Bedrohungsleiste in den rechten oder linken Infotextleisten." L["AFK Mode"] = "AFK Modus" -L["Animate Config"] = "Animierte Konfiguration" L["Announce Interrupts"] = "Unterbrechungen ankündigen" L["Announce when you interrupt a spell to the specified chat channel."] = "Melde über den angegebenen Chatkanal einen unterbrochenen Zauber." L["Attempt to support eyefinity/nvidia surround."] = "Versucht Eyefinity/NVIDIA Surround zu unterstützen" diff --git a/2/3/4/5/6/7/ElvUI_Config/Locales/Korean_Config.lua b/2/3/4/5/6/7/ElvUI_Config/Locales/Korean_Config.lua index 363f188..780e4c0 100644 --- a/2/3/4/5/6/7/ElvUI_Config/Locales/Korean_Config.lua +++ b/2/3/4/5/6/7/ElvUI_Config/Locales/Korean_Config.lua @@ -427,7 +427,6 @@ L["Reset Aura Filters"] = true --Used in Nameplates/UnitFrames general options L["Accept Invites"] = "지인의 초대 자동수락" L["Adjust the position of the threat bar to either the left or right datatext panels."] = "위협수치 바를 어느 패널의 정보문자 탭에 배치할지 결정합니다." L["AFK Mode"] = "자리비움 모드" -L["Animate Config"] = true; L["Announce Interrupts"] = "차단 성공시 알림" L["Announce when you interrupt a spell to the specified chat channel."] = "주문 차단에 성공하면 여기에서 설정한 채널로 차단성공을 알립니다." L["Attempt to support eyefinity/nvidia surround."] = "다중모니터 기술인 아이피니티 기능이나 nvidia 서라운드 기능 지원을 적용합니다." diff --git a/2/3/4/5/6/7/ElvUI_Config/Locales/Portuguese_Config.lua b/2/3/4/5/6/7/ElvUI_Config/Locales/Portuguese_Config.lua index 82cbba1..007a348 100644 --- a/2/3/4/5/6/7/ElvUI_Config/Locales/Portuguese_Config.lua +++ b/2/3/4/5/6/7/ElvUI_Config/Locales/Portuguese_Config.lua @@ -379,7 +379,6 @@ L["Reset Aura Filters"] = true --Used in Nameplates/UnitFrames general options L["Accept Invites"] = "Aceitar Convites" L["Adjust the position of the threat bar to either the left or right datatext panels."] = "Ajustar a posição da barra de agro para os painéis de texto informativos da esquerda ou da direita." L["AFK Mode"] = true; -L["Animate Config"] = true; L["Announce Interrupts"] = "Anunciar Interrupções" L["Announce when you interrupt a spell to the specified chat channel."] = "Anunciar quando interromper um feitiço para o canal de bate-papo especificado." L["Attempt to support eyefinity/nvidia surround."] = true; diff --git a/2/3/4/5/6/7/ElvUI_Config/Locales/Russian_Config.lua b/2/3/4/5/6/7/ElvUI_Config/Locales/Russian_Config.lua index e17c358..9da33d8 100644 --- a/2/3/4/5/6/7/ElvUI_Config/Locales/Russian_Config.lua +++ b/2/3/4/5/6/7/ElvUI_Config/Locales/Russian_Config.lua @@ -379,7 +379,6 @@ L["Reset Aura Filters"] = "Сбросить фильтры аур" --Used in Nam L["Accept Invites"] = "Принимать приглашения" L["Adjust the position of the threat bar to either the left or right datatext panels."] = "Изменяет позицию полосы угрозы" L["AFK Mode"] = "Режим АФК" -L["Animate Config"] = "Анимировать настройки" L["Announce Interrupts"] = "Объявлять о прерываниях" L["Announce when you interrupt a spell to the specified chat channel."] = "Объявлять о прерванных Вами заклинаниях в указанный канал чата." L["Attempt to support eyefinity/nvidia surround."] = "Пытаться поддерживать eyefinity/nvidia surround" diff --git a/2/3/4/5/6/7/ElvUI_Config/Locales/Spanish_Config.lua b/2/3/4/5/6/7/ElvUI_Config/Locales/Spanish_Config.lua index 68f6f17..0a17b4b 100644 --- a/2/3/4/5/6/7/ElvUI_Config/Locales/Spanish_Config.lua +++ b/2/3/4/5/6/7/ElvUI_Config/Locales/Spanish_Config.lua @@ -379,7 +379,6 @@ L["Reset Aura Filters"] = true --Used in Nameplates/UnitFrames general options L["Accept Invites"] = "Aceptar Invitaciones" L["Adjust the position of the threat bar to either the left or right datatext panels."] = "Ajusta la posición de la barra de amenaza a la izquierda o derecha de los paneles de texto de datos." L["AFK Mode"] = true; -L["Animate Config"] = true; L["Announce Interrupts"] = "Anunciar Interrupciones" L["Announce when you interrupt a spell to the specified chat channel."] = "Anunciar cuando interrumpas un hechizo en el canal especificado." L["Attempt to support eyefinity/nvidia surround."] = true; diff --git a/2/3/4/5/6/7/ElvUI_Config/Locales/Taiwanese_Config.lua b/2/3/4/5/6/7/ElvUI_Config/Locales/Taiwanese_Config.lua index 843df9a..56e09c8 100644 --- a/2/3/4/5/6/7/ElvUI_Config/Locales/Taiwanese_Config.lua +++ b/2/3/4/5/6/7/ElvUI_Config/Locales/Taiwanese_Config.lua @@ -379,7 +379,6 @@ L["Reset Aura Filters"] = true --Used in Nameplates/UnitFrames general options L["Accept Invites"] = "接受組隊邀請" L["Adjust the position of the threat bar to either the left or right datatext panels."] = "調整仇恨條的位置於左側或右側資訊面板" L["AFK Mode"] = "離開模式" -L["Animate Config"] = true; L["Announce Interrupts"] = "斷法通告" L["Announce when you interrupt a spell to the specified chat channel."] = "在指定對話頻道通知斷法信息." L["Attempt to support eyefinity/nvidia surround."] = true;