diff --git a/VuhDoBarCustomizerHots.lua b/VuhDoBarCustomizerHots.lua index d227763711977ea4267074ce2e99c927ecca5261..f658d28e9db2d264e1be6b605b190725775e0bd4 100644 --- a/VuhDoBarCustomizerHots.lua +++ b/VuhDoBarCustomizerHots.lua @@ -3,6 +3,7 @@ local huge = math.huge; local format = format; local sIsFade; +local sIsFlashWhenLow; local sIsWarnColor; local sIsSwiftmend; local sHotSetup; @@ -78,8 +79,6 @@ local VUHDO_getBarIconCharge; local VUHDO_getBarIconClockOrStub; local VUHDO_backColor; local VUHDO_textColor; -local VUHDO_UIFrameFlash; -local VUHDO_UIFrameFlashStop; local VUHDO_PANEL_SETUP; local VUHDO_CAST_ICON_DIFF; @@ -117,10 +116,7 @@ function VUHDO_customHotsInitLocalOverrides() sBarColors = VUHDO_PANEL_SETUP["BAR_COLORS"]; sHotCols = sBarColors["HOTS"]; sIsFade = sHotCols["isFadeOut"]; - - VUHDO_UIFrameFlash = sHotCols["isFlashWhenLow"] and _G["VUHDO_UIFrameFlash"] or function() end; - VUHDO_UIFrameFlashStop = sHotCols["isFlashWhenLow"] and _G["VUHDO_UIFrameFlashStop"] or function() end; - + sIsFlashWhenLow = sHotCols["isFlashWhenLow"]; sIsWarnColor = sHotCols["WARNING"]["enabled"]; sHotSetup = VUHDO_PANEL_SETUP["HOTS"]; sHotSlots = VUHDO_PANEL_SETUP["HOTS"]["SLOTS"]; @@ -205,6 +201,9 @@ local function VUHDO_customizeHotIcons(aButton, aHotName, aRest, aTimes, anIcon, tIcon = VUHDO_getBarIcon(aButton, anIndex); if not tIcon then return end; -- Noch nicht erstellt von redraw + local VUHDO_UIFrameFlash = (sIsFlashWhenLow or tHotCfg["isFlashWhenLow"]) and _G["VUHDO_UIFrameFlash"] or function() end; + local VUHDO_UIFrameFlashStop = (sIsFlashWhenLow or tHotCfg["isFlashWhenLow"]) and _G["VUHDO_UIFrameFlashStop"] or function() end; + if not aRest then VUHDO_UIFrameFlashStop(tIcon); VUHDO_getBarIconFrame(aButton, anIndex):Hide(); @@ -249,7 +248,7 @@ local function VUHDO_customizeHotIcons(aButton, aHotName, aRest, aTimes, anIcon, return; elseif aRest > 0 then - tIcon:SetAlpha((aRest < 10 and sIsFade) and tHotCfg["O"] * aRest * 0.1 or tHotCfg["O"]); + tIcon:SetAlpha((aRest < 10 and (sIsFade or tHotCfg["isFadeOut"])) and tHotCfg["O"] * aRest * 0.1 or tHotCfg["O"]); if aRest < 10 or tHotCfg["isFullDuration"] then tDuration = (tHotCfg["countdownMode"] == 2 and aRest < sHotCols["WARNING"]["lowSecs"]) @@ -265,7 +264,7 @@ local function VUHDO_customizeHotIcons(aButton, aHotName, aRest, aTimes, anIcon, tClock:SetCooldown(tStarted, aDuration); tClock:SetAttribute("started", tStarted); end - tIcon:SetAlpha((sIsFade and aRest < 10) and tHotCfg["O"] * aRest * 0.1 or tHotCfg["O"]); + tIcon:SetAlpha(((sIsFade or tHotCfg["isFadeOut"]) and aRest < 10) and tHotCfg["O"] * aRest * 0.1 or tHotCfg["O"]); if aRest > 5 then VUHDO_UIFrameFlashStop(tIcon); diff --git a/VuhDoDefaults.lua b/VuhDoDefaults.lua index 7f11934db6af0a585372bd8ca16d13893be04032..e8afe0582c6619d673741943535501cacfe7fd58 100644 --- a/VuhDoDefaults.lua +++ b/VuhDoDefaults.lua @@ -391,7 +391,9 @@ end -- local function VUHDO_makeFullColorWoOpacity(...) local tColor = VUHDO_makeFullColor(...); + tColor["useOpacity"] = false; + return tColor; end @@ -400,10 +402,14 @@ end -- local function VUHDO_makeHotColor(...) local tColor = VUHDO_makeFullColor(...); + tColor["isFullDuration"] = false; tColor["isClock"] = false; tColor["countdownMode"] = 1; tColor["useOpacity"] = false; + tColor["isFadeOut"] = false; + tColor["isFlashWhenLow"] = false; + return tColor; end @@ -1856,7 +1862,7 @@ function VUHDO_loadDefaultPanelSetup() VUHDO_PANEL_SETUP[tPanelNum] = VUHDO_ensureSanity("VUHDO_PANEL_SETUP[" .. tPanelNum .. "]", VUHDO_PANEL_SETUP[tPanelNum], VUHDO_DEFAULT_PER_PANEL_SETUP); end - + VUHDO_PANEL_SETUP = VUHDO_ensureSanity("VUHDO_PANEL_SETUP", VUHDO_PANEL_SETUP, VUHDO_DEFAULT_PANEL_SETUP); VUHDO_DEFAULT_PANEL_SETUP = VUHDO_compressAndPackTable(VUHDO_DEFAULT_PANEL_SETUP); VUHDO_DEFAULT_PER_PANEL_SETUP = VUHDO_compressAndPackTable(VUHDO_DEFAULT_PER_PANEL_SETUP); diff --git a/VuhDoOptions/VuhDoLocalization_de.lua b/VuhDoOptions/VuhDoLocalization_de.lua index d8a5f4742482cc838903dfdf8abac5fe33d2ed04..9b48bd66ccb7ff04df91269a459537308782a89d 100644 --- a/VuhDoOptions/VuhDoLocalization_de.lua +++ b/VuhDoOptions/VuhDoLocalization_de.lua @@ -638,6 +638,8 @@ VUHDO_I18N_TT.K579 = "Select a color for the bar glow."; VUHDO_I18N_TT.K580 = "Select a modifier key to use with the right mouse button to blacklist debuff icons." VUHDO_I18N_TT.K581 = "Check to show player nickname on bars."; VUHDO_I18N_TT.K582 = "Select the unit to target."; +VUHDO_I18N_TT.K583 = "Check to make all HoT icons fade out when the HoT is expiring."; +VUHDO_I18N_TT.K584 = "Check to make all HoT icons flash when the HoT is expiring."; -- TBCC game version specific strings (tooltip IDs begin at K900) @@ -1169,6 +1171,8 @@ VUHDO_I18N_MOUSEOVER_HARM = "Mouseover unit (hostile only)"; VUHDO_I18N_MOUSEOVER_TARGET_HARM = "Mouseover's target unit (hostile only)"; VUHDO_I18N_MOUSEOVER_TARGET_TARGET_HARM = "Mouseover's target's target unit (hostile only)"; +VUHDO_I18N_CLOCK = "Clock"; + -- TBCC game version specific strings VUHDO_I18N_LIBHEALCOMM = "Use Lib\nHealComm"; diff --git a/VuhDoOptions/VuhDoLocalization_en.lua b/VuhDoOptions/VuhDoLocalization_en.lua index 269deab947314fddccf0237e13e1fdede12d6774..e84250c4be0327e22c43f749b47937fc00224746 100644 --- a/VuhDoOptions/VuhDoLocalization_en.lua +++ b/VuhDoOptions/VuhDoLocalization_en.lua @@ -353,7 +353,7 @@ VUHDO_I18N_TT.K255 = "Select at what time warning color will be applied and exte VUHDO_I18N_TT.K256 = "Check to have an outline around HoT counter and timer texts."; VUHDO_I18N_TT.K257 = "Check to have a shadow behind HoT counter and timer texts."; VUHDO_I18N_TT.K258 = "Check to to show warning color if HoT remaining duration is less than configured to the left."; -VUHDO_I18N_TT.K260 = "Check to fade out HoT icons/squares when HoT is running out."; +VUHDO_I18N_TT.K260 = "Check to fade out the HoT icon/square when the HoT is running out."; VUHDO_I18N_TT.K261 = "Select a color for your self-defined debuffs"; VUHDO_I18N_TT.K262 = "Check to have also debuff icon flying in."; VUHDO_I18N_TT.K263 = "This option selects what debuffs you want to see."; @@ -568,7 +568,7 @@ VUHDO_I18N_TT.K509 = "Shows direction arrow even if unit is not out of range."; VUHDO_I18N_TT.K510 = "Select a color for HoT Square 7"; VUHDO_I18N_TT.K511 = "Hides Blizz UI standard raid frames."; VUHDO_I18N_TT.K512 = "Create VuhDo internal key assignments. No empty macro slot will be needed, keys can be assigned differently outside VuhDo panels."; -VUHDO_I18N_TT.K513 = "Makes the HoT icons flash shortly before HoT expires"; +VUHDO_I18N_TT.K513 = "Makes this HoT icon flash shortly before the HoT expires"; VUHDO_I18N_TT.K514 = "Show tooltips for custom debuffs"; VUHDO_I18N_TT.K515 = "Show total HP of player."; VUHDO_I18N_TT.K516 = "Disable to avoid runtime errors from blizz standard ui incoming. Enable if you don't experience any problem."; @@ -637,6 +637,8 @@ VUHDO_I18N_TT.K579 = "Select a color for the bar glow."; VUHDO_I18N_TT.K580 = "Select a modifier key to use with the right mouse button to blacklist debuff icons." VUHDO_I18N_TT.K581 = "Check to show player nickname on bars."; VUHDO_I18N_TT.K582 = "Select the unit to target."; +VUHDO_I18N_TT.K583 = "Check to make all HoT icons fade out when the HoT is expiring."; +VUHDO_I18N_TT.K584 = "Check to make all HoT icons flash when the HoT is expiring."; -- TBCC game version specific strings (tooltip IDs begin at K900) @@ -1169,6 +1171,8 @@ VUHDO_I18N_MOUSEOVER_HARM = "Mouseover unit (hostile only)"; VUHDO_I18N_MOUSEOVER_TARGET_HARM = "Mouseover's target unit (hostile only)"; VUHDO_I18N_MOUSEOVER_TARGET_TARGET_HARM = "Mouseover's target's target unit (hostile only)"; +VUHDO_I18N_CLOCK = "Clock"; + -- TBCC game version specific strings VUHDO_I18N_LIBHEALCOMM = "Use Lib\nHealComm"; diff --git a/VuhDoOptions/VuhDoLocalization_es.lua b/VuhDoOptions/VuhDoLocalization_es.lua index 224719cdc6d31872d127187aedd0e972631827a5..9867ebee681a5dc3ccac13a1063234385f4e2919 100644 --- a/VuhDoOptions/VuhDoLocalization_es.lua +++ b/VuhDoOptions/VuhDoLocalization_es.lua @@ -645,6 +645,8 @@ VUHDO_I18N_TT.K579 = "Select a color for the bar glow."; VUHDO_I18N_TT.K580 = "Select a modifier key to use with the right mouse button to blacklist debuff icons." VUHDO_I18N_TT.K581 = "Check to show player nickname on bars."; VUHDO_I18N_TT.K582 = "Select the unit to target."; +VUHDO_I18N_TT.K583 = "Check to make all HoT icons fade out when the HoT is expiring."; +VUHDO_I18N_TT.K584 = "Check to make all HoT icons flash when the HoT is expiring."; -- TBCC game version specific strings (tooltip IDs begin at K900) @@ -1184,6 +1186,8 @@ VUHDO_I18N_MOUSEOVER_HARM = "Mouseover unit (hostile only)"; VUHDO_I18N_MOUSEOVER_TARGET_HARM = "Mouseover's target unit (hostile only)"; VUHDO_I18N_MOUSEOVER_TARGET_TARGET_HARM = "Mouseover's target's target unit (hostile only)"; +VUHDO_I18N_CLOCK = "Clock"; + -- TBCC game version specific strings VUHDO_I18N_LIBHEALCOMM = "Use Lib\nHealComm"; diff --git a/VuhDoOptions/VuhDoLocalization_fr.lua b/VuhDoOptions/VuhDoLocalization_fr.lua index 2f8a61383613291f10514876094c8d1b1a25ea87..78737c141f06babe295385b622c1342df26a1e28 100644 --- a/VuhDoOptions/VuhDoLocalization_fr.lua +++ b/VuhDoOptions/VuhDoLocalization_fr.lua @@ -647,6 +647,8 @@ VUHDO_I18N_TT.K579 = "Select a color for the bar glow."; VUHDO_I18N_TT.K580 = "Select a modifier key to use with the right mouse button to blacklist debuff icons." VUHDO_I18N_TT.K581 = "Check to show player nickname on bars."; VUHDO_I18N_TT.K582 = "Select the unit to target."; +VUHDO_I18N_TT.K583 = "Check to make all HoT icons fade out when the HoT is expiring."; +VUHDO_I18N_TT.K584 = "Check to make all HoT icons flash when the HoT is expiring."; -- TBCC game version specific strings (tooltip IDs begin at K900) @@ -1185,6 +1187,8 @@ VUHDO_I18N_MOUSEOVER_HARM = "Mouseover unit (hostile only)"; VUHDO_I18N_MOUSEOVER_TARGET_HARM = "Mouseover's target unit (hostile only)"; VUHDO_I18N_MOUSEOVER_TARGET_TARGET_HARM = "Mouseover's target's target unit (hostile only)"; +VUHDO_I18N_CLOCK = "Clock"; + -- TBCC game version specific strings VUHDO_I18N_LIBHEALCOMM = "Use Lib\nHealComm"; diff --git a/VuhDoOptions/VuhDoLocalization_ko.lua b/VuhDoOptions/VuhDoLocalization_ko.lua index 914593a2fb4e85276a1a440f65fe503bc0e69f6b..c56bfbb52c7b13bb25d7e77f20691228bf37b0f1 100644 --- a/VuhDoOptions/VuhDoLocalization_ko.lua +++ b/VuhDoOptions/VuhDoLocalization_ko.lua @@ -641,6 +641,8 @@ VUHDO_I18N_TT.K579 = "ë°” ê´‘íƒì˜ 색ìƒì„ ì„ íƒí•˜ì‹ì‹œì˜¤."; VUHDO_I18N_TT.K580 = "디버프 ì•„ì´ì½˜ì„ ì œì™¸ëª©ë¡ì— í‘œì‹œí•˜ë ¤ë©´ 마우스 오른쪽 버튼으로 ì‚¬ìš©í• ìˆ˜ì • 키를 ì„ íƒí•˜ì‹ì‹œì˜¤." VUHDO_I18N_TT.K581 = "Check to show player nickname on bars."; VUHDO_I18N_TT.K582 = "Select the unit to target."; +VUHDO_I18N_TT.K583 = "Check to make all HoT icons fade out when the HoT is expiring."; +VUHDO_I18N_TT.K584 = "Check to make all HoT icons flash when the HoT is expiring."; -- TBCC game version specific strings (tooltip IDs begin at K900) @@ -1175,6 +1177,8 @@ VUHDO_I18N_MOUSEOVER_HARM = "Mouseover unit (hostile only)"; VUHDO_I18N_MOUSEOVER_TARGET_HARM = "Mouseover's target unit (hostile only)"; VUHDO_I18N_MOUSEOVER_TARGET_TARGET_HARM = "Mouseover's target's target unit (hostile only)"; +VUHDO_I18N_CLOCK = "Clock"; + -- TBCC game version specific strings VUHDO_I18N_LIBHEALCOMM = "Use Lib\nHealComm"; diff --git a/VuhDoOptions/VuhDoLocalization_ru.lua b/VuhDoOptions/VuhDoLocalization_ru.lua index e8c21d933fb78eb03178710915390604d13f9035..4fdb98d9defcdf2c4e16415ab1369122094a3799 100644 --- a/VuhDoOptions/VuhDoLocalization_ru.lua +++ b/VuhDoOptions/VuhDoLocalization_ru.lua @@ -743,6 +743,8 @@ VUHDO_I18N_TT.K579 = "Выбрать цвет подÑветки фрейма."; VUHDO_I18N_TT.K580 = "Выберите модификатор Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ ÐŸÐšÐœ Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´ÐµÐ±Ð°Ñ„Ð¾Ð² в чёрный ÑпиÑок." VUHDO_I18N_TT.K581 = "Отметьте, чтобы показывать ники на фреймах."; VUHDO_I18N_TT.K582 = "Select the unit to target."; +VUHDO_I18N_TT.K583 = "Check to make all HoT icons fade out when the HoT is expiring."; +VUHDO_I18N_TT.K584 = "Check to make all HoT icons flash when the HoT is expiring."; -- TBCC game version specific strings (tooltip IDs begin at K900) @@ -1347,6 +1349,8 @@ VUHDO_I18N_MOUSEOVER_HARM = "Mouseover unit (hostile only)"; VUHDO_I18N_MOUSEOVER_TARGET_HARM = "Mouseover's target unit (hostile only)"; VUHDO_I18N_MOUSEOVER_TARGET_TARGET_HARM = "Mouseover's target's target unit (hostile only)"; +VUHDO_I18N_CLOCK = "Clock"; + -- TBCC game version specific strings VUHDO_I18N_LIBHEALCOMM = "Use Lib\nHealComm"; diff --git a/VuhDoOptions/VuhDoLocalization_zhCN.lua b/VuhDoOptions/VuhDoLocalization_zhCN.lua index 1225d8cec739a6de6b1cf27b0b2ba6abf1d69054..6afac901f4cc59375bfc06c1c6ba0e5a3bff3e82 100644 --- a/VuhDoOptions/VuhDoLocalization_zhCN.lua +++ b/VuhDoOptions/VuhDoLocalization_zhCN.lua @@ -638,7 +638,9 @@ VUHDO_I18N_TT.K578 = "é€‰æ‹©å›¾æ ‡é—ªå…‰çš„é¢œè‰²."; VUHDO_I18N_TT.K579 = "选择技能æ¡é—ªå…‰çš„颜色."; VUHDO_I18N_TT.K580 = "é€‰æ‹©ä¸€ä¸ªä¿®æ”¹é”®ï¼Œä½¿ç”¨é¼ æ ‡å³é”®å°†debuffå›¾æ ‡åˆ—å…¥é»‘åå•." VUHDO_I18N_TT.K581 = "选ä¸å¯åœ¨æ 上显示玩家昵称."; -VUHDO_I18N_TT.K582 = "Select the unit to target."; +VUHDO_I18N_TT.K582 = "é€‰æ‹©é‡Šæ”¾çš„ç›®æ ‡"; +VUHDO_I18N_TT.K583 = "Check to make all HoT icons fade out when the HoT is expiring."; +VUHDO_I18N_TT.K584 = "Check to make all HoT icons flash when the HoT is expiring."; -- TBCC game version specific strings (tooltip IDs begin at K900) @@ -1158,18 +1160,20 @@ VUHDO_I18N_SHOW_HEAL_ABSORB = "显示\næ²»ç–—å¸æ”¶"; VUHDO_I18N_HEAL_ABSORB_BAR = "æ²»ç–—å¸æ”¶æ¡"; VUHDO_I18N_PLAYER = "自己"; -VUHDO_I18N_TARGET = "Target unit" -VUHDO_I18N_TARGET_TARGET = "Target's target unit" -VUHDO_I18N_FOCUS = "焦点"; -VUHDO_I18N_MOUSEOVER = "Mouseover unit"; -VUHDO_I18N_MOUSEOVER_TARGET = "Mouseover's target unit"; -VUHDO_I18N_MOUSEOVER_TARGET_TARGET = "Mouseover's target's target unit"; -VUHDO_I18N_TARGET_HARM = "Target unit (hostile only)"; -VUHDO_I18N_TARGET_TARGET_HARM = "Target's target unit (hostile only)"; -VUHDO_I18N_FOCUS_HARM = "Focus unit (hostile only)"; -VUHDO_I18N_MOUSEOVER_HARM = "Mouseover unit (hostile only)"; -VUHDO_I18N_MOUSEOVER_TARGET_HARM = "Mouseover's target unit (hostile only)"; -VUHDO_I18N_MOUSEOVER_TARGET_TARGET_HARM = "Mouseover's target's target unit (hostile only)"; +VUHDO_I18N_TARGET = "ç›®æ ‡å•ä½" +VUHDO_I18N_TARGET_TARGET = "ç›®æ ‡çš„ç›®æ ‡å•ä½" +VUHDO_I18N_FOCUS = "焦点å•ä½"; +VUHDO_I18N_MOUSEOVER = "é¼ æ ‡æŒ‡å‘å•ä½"; +VUHDO_I18N_MOUSEOVER_TARGET = "é¼ æ ‡æŒ‡å‘çš„ç›®æ ‡å•ä½"; +VUHDO_I18N_MOUSEOVER_TARGET_TARGET = "é¼ æ ‡æŒ‡å‘ç›®æ ‡çš„ç›®æ ‡å•ä½"; +VUHDO_I18N_TARGET_HARM = "ç›®æ ‡å•ä½ (仅敌对)"; +VUHDO_I18N_TARGET_TARGET_HARM = "ç›®æ ‡çš„ç›®æ ‡ (仅敌对)"; +VUHDO_I18N_FOCUS_HARM = "焦点å•ä½ (仅敌对)"; +VUHDO_I18N_MOUSEOVER_HARM = "é¼ æ ‡æŒ‡å‘å•ä½ (仅敌对)"; +VUHDO_I18N_MOUSEOVER_TARGET_HARM = "é¼ æ ‡æŒ‡å‘çš„ç›®æ ‡å•ä½ (仅敌对)"; +VUHDO_I18N_MOUSEOVER_TARGET_TARGET_HARM = "é¼ æ ‡æŒ‡å‘ç›®æ ‡çš„ç›®æ ‡å•ä½ (仅敌对)"; + +VUHDO_I18N_CLOCK = "æ—¶é’Ÿ"; -- TBCC game version specific strings diff --git a/VuhDoOptions/VuhDoLocalization_zhTW.lua b/VuhDoOptions/VuhDoLocalization_zhTW.lua index 017160c05b5e5186cbb7d18915726aba9a4ae866..6d8184f16353e282b3fb9c31063aad27698be7c6 100644 --- a/VuhDoOptions/VuhDoLocalization_zhTW.lua +++ b/VuhDoOptions/VuhDoLocalization_zhTW.lua @@ -639,6 +639,8 @@ VUHDO_I18N_TT.K579 = "Select a color for the bar glow."; VUHDO_I18N_TT.K580 = "Select a modifier key to use with the right mouse button to blacklist debuff icons." VUHDO_I18N_TT.K581 = "Check to show player nickname on bars."; VUHDO_I18N_TT.K582 = "Select the unit to target."; +VUHDO_I18N_TT.K583 = "Check to make all HoT icons fade out when the HoT is expiring."; +VUHDO_I18N_TT.K584 = "Check to make all HoT icons flash when the HoT is expiring."; -- TBCC game version specific strings (tooltip IDs begin at K900) @@ -1171,6 +1173,8 @@ VUHDO_I18N_MOUSEOVER_HARM = "Mouseover unit (hostile only)"; VUHDO_I18N_MOUSEOVER_TARGET_HARM = "Mouseover's target unit (hostile only)"; VUHDO_I18N_MOUSEOVER_TARGET_TARGET_HARM = "Mouseover's target's target unit (hostile only)"; +VUHDO_I18N_CLOCK = "Clock"; + -- TBCC game version specific strings VUHDO_I18N_LIBHEALCOMM = "Use Lib\nHealComm"; diff --git a/VuhDoOptions/VuhDoNewOptionsColorsHots.lua b/VuhDoOptions/VuhDoNewOptionsColorsHots.lua index bcdaaac83353513bf3e5614658a42338e5ebadc9..3ac1904ed75ee280c31cd93ac8651bd5d2beeffa 100644 --- a/VuhDoOptions/VuhDoNewOptionsColorsHots.lua +++ b/VuhDoOptions/VuhDoNewOptionsColorsHots.lua @@ -28,6 +28,26 @@ end +-- +function VUHDO_initHotFadeCheckButton(aButton) + VUHDO_lnfSetModel(aButton, "VUHDO_PANEL_SETUP.BAR_COLORS.HOT" + .. VUHDO_getNumbersFromString(aButton:GetName(), 1)[1] + .. ".isFadeOut"); + VUHDO_lnfSetTooltip(aButton, VUHDO_I18N_TT.K260); +end + + + +-- +function VUHDO_initHotFlashCheckButton(aButton) + VUHDO_lnfSetModel(aButton, "VUHDO_PANEL_SETUP.BAR_COLORS.HOT" + .. VUHDO_getNumbersFromString(aButton:GetName(), 1)[1] + .. ".isFlashWhenLow"); + VUHDO_lnfSetTooltip(aButton, VUHDO_I18N_TT.K513); +end + + + -- function VUHDO_colorsHotsSetSwatchHotName(aTexture, aHotNum) tHotName = VUHDO_PANEL_SETUP["HOTS"]["SLOTS"][aHotNum] or ""; diff --git a/VuhDoOptions/VuhDoNewOptionsColorsHots.xml b/VuhDoOptions/VuhDoNewOptionsColorsHots.xml index 0c2379e76d4db5a6bbb87d033d50c9fa217eee28..dafc94eaaa4218355c1abdfdfc828a55bea95b87 100644 --- a/VuhDoOptions/VuhDoNewOptionsColorsHots.xml +++ b/VuhDoOptions/VuhDoNewOptionsColorsHots.xml @@ -81,6 +81,38 @@ </OnLoad> </Scripts> </CheckButton> + + <CheckButton name="$parentFadeCheckButton" inherits="VuhDoCheckBoxTemplate"> + <Anchors> + <Anchor point="TOPLEFT"> + <Offset> + <AbsDimension x="210" y="0" /> + </Offset> + </Anchor> + </Anchors> + <Scripts> + <OnLoad> + VUHDO_initHotFadeCheckButton(self); + VUHDO_lnfAddConstraint(self, VUHDO_LF_CONSTRAINT_DISABLE, "VUHDO_PANEL_SETUP.BAR_COLORS.HOTS.isFadeOut", true); + </OnLoad> + </Scripts> + </CheckButton> + + <CheckButton name="$parentFlashCheckButton" inherits="VuhDoCheckBoxTemplate"> + <Anchors> + <Anchor point="TOPLEFT"> + <Offset> + <AbsDimension x="252" y="0" /> + </Offset> + </Anchor> + </Anchors> + <Scripts> + <OnLoad> + VUHDO_initHotFlashCheckButton(self); + VUHDO_lnfAddConstraint(self, VUHDO_LF_CONSTRAINT_DISABLE, "VUHDO_PANEL_SETUP.BAR_COLORS.HOTS.isFlashWhenLow", true); + </OnLoad> + </Scripts> + </CheckButton> </Frames> </Frame> @@ -89,12 +121,12 @@ <Frames> <Frame name="$parentHotsPanel" inherits="VuhDoPanelTemplate"> <Size> - <AbsDimension x="464" y="364" /> + <AbsDimension x="457" y="409" /> </Size> <Anchors> <Anchor point="TOPLEFT"> <Offset> - <AbsDimension x="31" y="-31" /> + <AbsDimension x="21" y="-21" /> </Offset> </Anchor> </Anchors> @@ -316,18 +348,37 @@ </Scripts> </CheckButton> + <Frame name="$parentExpiryLabel" inherits="VuhDoLabelFrameTemplate"> + <Size> + <AbsDimension x="75" y="18" /> + </Size> + <Anchors> + <Anchor point="TOPLEFT"> + <Offset> + <AbsDimension x="364" y="-302" /> + </Offset> + </Anchor> + </Anchors> + <Layers> + <Layer> + <FontString name="$parentLabel" text="VUHDO_I18N_EXPIRY_WARNING" justifyH="RIGHT" inherits="VuDoDefaultFontTemplate"> + </FontString> + </Layer> + </Layers> + </Frame> + <CheckButton name="$parentFadeCheckButton" text="VUHDO_I18N_FADE_OUT" inherits="VuhDoCheckButtonTemplate"> <Anchors> <Anchor point="TOPLEFT"> <Offset> - <AbsDimension x="344" y="-50" /> + <AbsDimension x="13" y="-369" /> </Offset> </Anchor> </Anchors> <Scripts> <OnLoad> VUHDO_lnfSetModel(self, "VUHDO_PANEL_SETUP.BAR_COLORS.HOTS.isFadeOut"); - VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K260); + VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K583); </OnLoad> </Scripts> </CheckButton> @@ -336,14 +387,14 @@ <Anchors> <Anchor point="TOPLEFT"> <Offset> - <AbsDimension x="344" y="-88" /> + <AbsDimension x="119" y="-369" /> </Offset> </Anchor> </Anchors> <Scripts> <OnLoad> VUHDO_lnfSetModel(self, "VUHDO_PANEL_SETUP.BAR_COLORS.HOTS.isFlashWhenLow"); - VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K513); + VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K584); </OnLoad> </Scripts> </CheckButton> @@ -356,7 +407,7 @@ <Anchors> <Anchor point="TOPLEFT"> <Offset> - <AbsDimension x="364" y="-34" /> + <AbsDimension x="13" y="-352" /> </Offset> </Anchor> </Anchors> @@ -367,119 +418,148 @@ </Layer> </Layers> </Frame> -q - <Frame name="$parentExpiryLabel" inherits="VuhDoLabelFrameTemplate"> + + <Frame name="$parentOffLabel" inherits="VuhDoLabelFrameTemplate"> <Size> <AbsDimension x="75" y="18" /> </Size> <Anchors> <Anchor point="TOPLEFT"> <Offset> - <AbsDimension x="364" y="-302" /> + <AbsDimension x="80" y="-24" /> </Offset> </Anchor> </Anchors> <Layers> <Layer> - <FontString name="$parentLabel" text="VUHDO_I18N_EXPIRY_WARNING" justifyH="RIGHT" inherits="VuDoDefaultFontTemplate"> + <FontString name="$parentLabel" text="VUHDO_I18N_COUNTDOWN_OFF" justifyH="RIGHT" inherits="VuDoDefaultFontTemplate"> </FontString> </Layer> </Layers> </Frame> - <Frame name="$parentOffLabel" inherits="VuhDoLabelFrameTemplate"> + <Frame name="$parentSecLabel" inherits="VuhDoLabelFrameTemplate"> <Size> <AbsDimension x="75" y="18" /> </Size> <Anchors> <Anchor point="TOPLEFT"> <Offset> - <AbsDimension x="80" y="-24" /> + <AbsDimension x="150" y="-24" /> </Offset> </Anchor> </Anchors> <Layers> <Layer> - <FontString name="$parentLabel" text="VUHDO_I18N_COUNTDOWN_OFF" justifyH="RIGHT" inherits="VuDoDefaultFontTemplate"> + <FontString name="$parentLabel" text="VUHDO_I18N_SECS" justifyH="CENTER" inherits="VuDoDefaultFontTemplate"> </FontString> </Layer> </Layers> </Frame> - <Frame name="$parentSecLabel" inherits="VuhDoLabelFrameTemplate"> + <Frame name="$parentdSecLabel" inherits="VuhDoLabelFrameTemplate"> <Size> <AbsDimension x="75" y="18" /> </Size> <Anchors> <Anchor point="TOPLEFT"> <Offset> - <AbsDimension x="150" y="-24" /> + <AbsDimension x="173" y="-24" /> </Offset> </Anchor> </Anchors> <Layers> <Layer> - <FontString name="$parentLabel" text="VUHDO_I18N_SECS" justifyH="CENTER" inherits="VuDoDefaultFontTemplate"> + <FontString name="$parentLabel" text="VUHDO_I18N_SECS_10" justifyH="RIGHT" inherits="VuDoDefaultFontTemplate"> </FontString> </Layer> </Layers> </Frame> - <Frame name="$parentdSecLabel" inherits="VuhDoLabelFrameTemplate"> + <Frame name="$parentDurationLabel" inherits="VuhDoLabelFrameTemplate"> <Size> <AbsDimension x="75" y="18" /> </Size> <Anchors> <Anchor point="TOPLEFT"> <Offset> - <AbsDimension x="173" y="-24" /> + <AbsDimension x="245" y="-17" /> </Offset> </Anchor> </Anchors> <Layers> <Layer> - <FontString name="$parentLabel" text="VUHDO_I18N_SECS_10" justifyH="RIGHT" inherits="VuDoDefaultFontTemplate"> + <FontString name="$parentLabel" text="VUHDO_I18N_FULL_DURATION" justifyH="RIGHT" inherits="VuDoDefaultFontTemplate"> </FontString> </Layer> </Layers> </Frame> - <Frame name="$parentDurationLabel" inherits="VuhDoLabelFrameTemplate"> + <Frame name="$parentClockLabel" inherits="VuhDoLabelFrameTemplate"> <Size> <AbsDimension x="75" y="18" /> </Size> <Anchors> <Anchor point="TOPLEFT"> <Offset> - <AbsDimension x="245" y="-17" /> + <AbsDimension x="250" y="-31" /> </Offset> </Anchor> </Anchors> <Layers> <Layer> - <FontString name="$parentLabel" text="VUHDO_I18N_FULL_DURATION" justifyH="RIGHT" inherits="VuDoDefaultFontTemplate"> + <FontString name="$parentLabel" text="VUHDO_I18N_CLOCK" justifyH="RIGHT" inherits="VuDoDefaultFontTemplate"> </FontString> </Layer> </Layers> </Frame> - <Frame name="$parentClockLabel" inherits="VuhDoLabelFrameTemplate"> + <Frame name="$parentFadeLabel" inherits="VuhDoLabelFrameTemplate"> <Size> <AbsDimension x="75" y="18" /> </Size> <Anchors> <Anchor point="TOPLEFT"> <Offset> - <AbsDimension x="250" y="-31" /> + <AbsDimension x="346" y="-17" /> </Offset> </Anchor> </Anchors> <Layers> <Layer> - <FontString name="$parentLabel" text="Clock" justifyH="RIGHT" inherits="VuDoDefaultFontTemplate"> + <FontString name="$parentLabel" text="VUHDO_I18N_FADE_OUT" justifyH="LEFT" inherits="VuDoDefaultFontTemplate"> </FontString> </Layer> </Layers> + <Scripts> + <OnLoad> + VUHDO_lnfAddConstraint(self, VUHDO_LF_CONSTRAINT_DISABLE, "VUHDO_PANEL_SETUP.BAR_COLORS.HOTS.isFadeOut", true); + </OnLoad> + </Scripts> + </Frame> + + <Frame name="$parentFlashLabel" inherits="VuhDoLabelFrameTemplate"> + <Size> + <AbsDimension x="75" y="18" /> + </Size> + <Anchors> + <Anchor point="TOPLEFT"> + <Offset> + <AbsDimension x="387" y="-31" /> + </Offset> + </Anchor> + </Anchors> + <Layers> + <Layer> + <FontString name="$parentLabel" text="VUHDO_I18N_FLASH" justifyH="LEFT" inherits="VuDoDefaultFontTemplate"> + </FontString> + </Layer> + </Layers> + <Scripts> + <OnLoad> + VUHDO_lnfAddConstraint(self, VUHDO_LF_CONSTRAINT_DISABLE, "VUHDO_PANEL_SETUP.BAR_COLORS.HOTS.isFlashWhenLow", true); + </OnLoad> + </Scripts> </Frame> <Frame name="$parentHot1RadiGroup" inherits="VuhDoHotTimerRadioGroup"> diff --git a/changelog.txt b/changelog.txt index 02b8e80b5f8f783c1d94c476acab6dd5154b7b39..fd2287901eb66e047b50879b3731667dfd584ce6 100644 --- a/changelog.txt +++ b/changelog.txt @@ -40,6 +40,7 @@ Bugfixes: Improvements: +-- Added background flash or fade out per HoT icon -- Added unit macro conditional options for auto-trigger custom spells -- Added trinket slots ('13' and '14') as valid actions -- Updated string localizations for Russian (ruRU)