This commit is contained in:
Crum
2018-01-03 20:09:34 -06:00
parent fce1e1dc35
commit 2bbe331c21
12 changed files with 12 additions and 27 deletions
+4 -3
View File
@@ -38,11 +38,11 @@ E.PopupDialogs["ELVUI_UPDATE_AVAILABLE"] = {
button1 = OKAY, button1 = OKAY,
OnAccept = E.noop, OnAccept = E.noop,
EditBoxOnEnterPressed = function() EditBoxOnEnterPressed = function()
ChatEdit_FocusActiveWindow() -- ChatEdit_FocusActiveWindow()
this:GetParent():Hide() this:GetParent():Hide()
end, end,
EditBoxOnEscapePressed = function() EditBoxOnEscapePressed = function()
ChatEdit_FocusActiveWindow() -- ChatEdit_FocusActiveWindow()
this:GetParent():Hide() this:GetParent():Hide()
end, end,
EditBoxOnTextChanged = function() EditBoxOnTextChanged = function()
@@ -51,7 +51,7 @@ E.PopupDialogs["ELVUI_UPDATE_AVAILABLE"] = {
end end
this:HighlightText() this:HighlightText()
this:ClearFocus() this:ClearFocus()
ChatEdit_FocusActiveWindow() -- ChatEdit_FocusActiveWindow()
end, end,
OnEditFocusGained = function() OnEditFocusGained = function()
this:HighlightText() this:HighlightText()
@@ -62,6 +62,7 @@ E.PopupDialogs["ELVUI_UPDATE_AVAILABLE"] = {
E.PopupDialogs["CLIQUE_ADVERT"] = { 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."], 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, button1 = YES,
button2 = "", -- Temporary until further fix
OnAccept = E.noop, OnAccept = E.noop,
showAlert = 1 showAlert = 1
} }
+4 -4
View File
@@ -25,13 +25,13 @@ local ERR_NOT_IN_COMBAT = ERR_NOT_IN_COMBAT
local MAX_TALENT_TABS = MAX_TALENT_TABS local MAX_TALENT_TABS = MAX_TALENT_TABS
local RAID_CLASS_COLORS = RAID_CLASS_COLORS local RAID_CLASS_COLORS = RAID_CLASS_COLORS
E.myclass = UnitClass("player") -- Constants _, E.myclass = UnitClass("player") -- Constants
E.myrace = UnitRace("player") _, E.myrace = UnitRace("player")
E.myfaction = UnitFactionGroup("player") _, E.myfaction = UnitFactionGroup("player")
E.myname = UnitName("player") E.myname = UnitName("player")
E.version = GetAddOnMetadata("ElvUI", "Version") E.version = GetAddOnMetadata("ElvUI", "Version")
E.myrealm = GetRealmName() E.myrealm = GetRealmName()
E.wowbuild = GetBuildInfo() E.wowbuild = tonumber(E.wowbuild) _, E.wowbuild = GetBuildInfo() E.wowbuild = tonumber(E.wowbuild)
E.resolution = GetCVar("gxResolution") E.resolution = GetCVar("gxResolution")
E.screenheight = tonumber(match(E.resolution, "%d+x(%d+)")); E.screenheight = tonumber(match(E.resolution, "%d+x(%d+)"));
E.screenwidth = tonumber(match(E.resolution, "(%d+)x+%d")); E.screenwidth = tonumber(match(E.resolution, "(%d+)x+%d"));
+3 -10
View File
@@ -15,26 +15,19 @@ E.Options.args.general = {
get = function(info) return E.global.general.versionCheck; end, get = function(info) return E.global.general.versionCheck; end,
set = function(info, value) E.global.general.versionCheck = value; 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 = { spacer = {
order = 3, order = 2,
type = "description", type = "description",
name = "", name = "",
width = "full", width = "full",
}, },
intro = { intro = {
order = 4, order = 3,
type = "description", type = "description",
name = L["ELVUI_DESC"], name = L["ELVUI_DESC"],
}, },
general = { general = {
order = 5, order = 4,
type = "group", type = "group",
name = L["General"], name = L["General"],
args = { args = {
@@ -379,7 +379,6 @@ L["Reset Aura Filters"] = "重置光环过滤器" --Used in Nameplates/UnitFrame
L["Accept Invites"] = "自动接受邀请" L["Accept Invites"] = "自动接受邀请"
L["Adjust the position of the threat bar to either the left or right datatext panels."] = "调整仇恨条的位置于左侧或右侧信息面板" L["Adjust the position of the threat bar to either the left or right datatext panels."] = "调整仇恨条的位置于左侧或右侧信息面板"
L["AFK Mode"] = "离开模式" L["AFK Mode"] = "离开模式"
L["Animate Config"] = "动画设置"
L["Announce Interrupts"] = "打断通告" L["Announce Interrupts"] = "打断通告"
L["Announce when you interrupt a spell to the specified chat channel."] = "在指定对话频道通知打断信息" L["Announce when you interrupt a spell to the specified chat channel."] = "在指定对话频道通知打断信息"
L["Attempt to support eyefinity/nvidia surround."] = "尝试支持eyefinity/nvidia surround" L["Attempt to support eyefinity/nvidia surround."] = "尝试支持eyefinity/nvidia surround"
@@ -368,7 +368,6 @@ L["Reset Aura Filters"] = true --Used in Nameplates/UnitFrames general options
L["Accept Invites"] = true; L["Accept Invites"] = true;
L["Adjust the position of the threat bar to either the left or right datatext panels."] = true; L["Adjust the position of the threat bar to either the left or right datatext panels."] = true;
L["AFK Mode"] = true; L["AFK Mode"] = true;
L["Animate Config"] = true;
L["Announce Interrupts"] = true; L["Announce Interrupts"] = true;
L["Announce when you interrupt a spell to the specified chat channel."] = true; L["Announce when you interrupt a spell to the specified chat channel."] = true;
L["Attempt to support eyefinity/nvidia surround."] = true; L["Attempt to support eyefinity/nvidia surround."] = true;
@@ -379,7 +379,6 @@ L["Reset Aura Filters"] = "Réinitialiser les filtres des auras" --Used in Namep
L["Accept Invites"] = "Invitations automatiques" 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["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["AFK Mode"] = "Mode AFK"
L["Animate Config"] = true;
L["Announce Interrupts"] = "Annoncer les Interruptions" 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["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." L["Attempt to support eyefinity/nvidia surround."] = "Tente de supporter eyefinity/nvidia surround."
@@ -379,7 +379,6 @@ L["Reset Aura Filters"] = "Setze Aurafilter zurück" --Used in Nameplates/UnitFr
L["Accept Invites"] = "Einladungen akzeptieren" 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["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["AFK Mode"] = "AFK Modus"
L["Animate Config"] = "Animierte Konfiguration"
L["Announce Interrupts"] = "Unterbrechungen ankündigen" 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["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" L["Attempt to support eyefinity/nvidia surround."] = "Versucht Eyefinity/NVIDIA Surround zu unterstützen"
@@ -427,7 +427,6 @@ L["Reset Aura Filters"] = true --Used in Nameplates/UnitFrames general options
L["Accept Invites"] = "지인의 초대 자동수락" L["Accept Invites"] = "지인의 초대 자동수락"
L["Adjust the position of the threat bar to either the left or right datatext panels."] = "위협수치 바를 어느 패널의 정보문자 탭에 배치할지 결정합니다." L["Adjust the position of the threat bar to either the left or right datatext panels."] = "위협수치 바를 어느 패널의 정보문자 탭에 배치할지 결정합니다."
L["AFK Mode"] = "자리비움 모드" L["AFK Mode"] = "자리비움 모드"
L["Animate Config"] = true;
L["Announce Interrupts"] = "차단 성공시 알림" L["Announce Interrupts"] = "차단 성공시 알림"
L["Announce when you interrupt a spell to the specified chat channel."] = "주문 차단에 성공하면 여기에서 설정한 채널로 차단성공을 알립니다." L["Announce when you interrupt a spell to the specified chat channel."] = "주문 차단에 성공하면 여기에서 설정한 채널로 차단성공을 알립니다."
L["Attempt to support eyefinity/nvidia surround."] = "다중모니터 기술인 아이피니티 기능이나 nvidia 서라운드 기능 지원을 적용합니다." L["Attempt to support eyefinity/nvidia surround."] = "다중모니터 기술인 아이피니티 기능이나 nvidia 서라운드 기능 지원을 적용합니다."
@@ -379,7 +379,6 @@ L["Reset Aura Filters"] = true --Used in Nameplates/UnitFrames general options
L["Accept Invites"] = "Aceitar Convites" 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["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["AFK Mode"] = true;
L["Animate Config"] = true;
L["Announce Interrupts"] = "Anunciar Interrupções" 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["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; L["Attempt to support eyefinity/nvidia surround."] = true;
@@ -379,7 +379,6 @@ L["Reset Aura Filters"] = "Сбросить фильтры аур" --Used in Nam
L["Accept Invites"] = "Принимать приглашения" L["Accept Invites"] = "Принимать приглашения"
L["Adjust the position of the threat bar to either the left or right datatext panels."] = "Изменяет позицию полосы угрозы" L["Adjust the position of the threat bar to either the left or right datatext panels."] = "Изменяет позицию полосы угрозы"
L["AFK Mode"] = "Режим АФК" L["AFK Mode"] = "Режим АФК"
L["Animate Config"] = "Анимировать настройки"
L["Announce Interrupts"] = "Объявлять о прерываниях" L["Announce Interrupts"] = "Объявлять о прерываниях"
L["Announce when you interrupt a spell to the specified chat channel."] = "Объявлять о прерванных Вами заклинаниях в указанный канал чата." L["Announce when you interrupt a spell to the specified chat channel."] = "Объявлять о прерванных Вами заклинаниях в указанный канал чата."
L["Attempt to support eyefinity/nvidia surround."] = "Пытаться поддерживать eyefinity/nvidia surround" L["Attempt to support eyefinity/nvidia surround."] = "Пытаться поддерживать eyefinity/nvidia surround"
@@ -379,7 +379,6 @@ L["Reset Aura Filters"] = true --Used in Nameplates/UnitFrames general options
L["Accept Invites"] = "Aceptar Invitaciones" 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["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["AFK Mode"] = true;
L["Animate Config"] = true;
L["Announce Interrupts"] = "Anunciar Interrupciones" 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["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; L["Attempt to support eyefinity/nvidia surround."] = true;
@@ -379,7 +379,6 @@ L["Reset Aura Filters"] = true --Used in Nameplates/UnitFrames general options
L["Accept Invites"] = "接受組隊邀請" L["Accept Invites"] = "接受組隊邀請"
L["Adjust the position of the threat bar to either the left or right datatext panels."] = "調整仇恨條的位置於左側或右側資訊面板" L["Adjust the position of the threat bar to either the left or right datatext panels."] = "調整仇恨條的位置於左側或右側資訊面板"
L["AFK Mode"] = "離開模式" L["AFK Mode"] = "離開模式"
L["Animate Config"] = true;
L["Announce Interrupts"] = "斷法通告" L["Announce Interrupts"] = "斷法通告"
L["Announce when you interrupt a spell to the specified chat channel."] = "在指定對話頻道通知斷法信息." L["Announce when you interrupt a spell to the specified chat channel."] = "在指定對話頻道通知斷法信息."
L["Attempt to support eyefinity/nvidia surround."] = true; L["Attempt to support eyefinity/nvidia surround."] = true;