Skip to content

GitLab

Commit 6af59914 authored by Ivaria's avatar Ivaria
Browse files

Merge branch 'master' into tbcc

parents d9284dd9 bf3e9c6e
Hide whitespace changes
Inline Side-by-side
Showing with 188 additions and 50 deletions
VuhDoBarCustomizerHots.lua
View file @ 6af59914
......@@ -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);
......
VuhDoDefaults.lua
View file @ 6af59914
......@@ -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);
......
VuhDoOptions/VuhDoLocalization_de.lua
View file @ 6af59914
......@@ -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";
VuhDoOptions/VuhDoLocalization_en.lua
View file @ 6af59914
......@@ -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";
VuhDoOptions/VuhDoLocalization_es.lua
View file @ 6af59914
......@@ -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";
VuhDoOptions/VuhDoLocalization_fr.lua
View file @ 6af59914
......@@ -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";
VuhDoOptions/VuhDoLocalization_ko.lua
View file @ 6af59914
......@@ -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";
VuhDoOptions/VuhDoLocalization_ru.lua
View file @ 6af59914
......@@ -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";
VuhDoOptions/VuhDoLocalization_zhCN.lua
View file @ 6af59914
......@@ -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
......
VuhDoOptions/VuhDoLocalization_zhTW.lua
View file @ 6af59914
......@@ -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";
VuhDoOptions/VuhDoNewOptionsColorsHots.lua
View file @ 6af59914
......@@ -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 "";
......
VuhDoOptions/VuhDoNewOptionsColorsHots.xml
View file @ 6af59914
......@@ -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">
......
changelog.txt
View file @ 6af59914
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment