Options: skin ClassicAPI's key binding buttons and page scroll bars

ClassicAPI's option pages now have key binding rows. Their two buttons are
numbered ClassicAPIOptionsControlN like the other controls, but they are
Buttons: strip the UIPanelButtonTemplate2 slices (BACKGROUND layer) and
skin them as buttons.

The control loop's last branch skinned anything unknown as a dropdown,
and SkinDropDown errors without the dropdown's Button, which stopped the
loop for every later control. It now runs only for a control that has
that Button; a type without a branch stays unskinned.

ClassicAPI's pages scroll with retail's MinimalScrollBar, named
ClassicAPIOptionsScrollBarN. SkinScrollbar expects the old named
UIPanelScrollBar parts, so these get their own pass: pfUI arrow buttons,
a backdrop track between them and a flat thumb, as SkinScrollbar draws.
The bar's steppers and thumb set their atlas again on every state
change, so their art is hidden rather than cleared.

api/config.lua

@@ -71,6 +71,7 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("buffs",      nil,           "debuffrowsize",    "16")
   pfUI:UpdateConfig("buffs",      nil,           "textinside",       "0")
   pfUI:UpdateConfig("buffs",      nil,           "fontsize",         "-1")
+  pfUI:UpdateConfig("buffs",      nil,           "timers",           "both")
 
   pfUI:UpdateConfig("buffbar",    "pbuff",       "enable",           "0")
   pfUI:UpdateConfig("buffbar",    "pbuff",       "use_unitfonts",    "0")
@@ -149,38 +150,9 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("cooldown",   nil,           "minutecolor",      ".2,1,1,1")
   pfUI:UpdateConfig("cooldown",   nil,           "hourcolor",        ".2,.5,1,1")
   pfUI:UpdateConfig("cooldown",   nil,           "daycolor",         ".2,.2,1,1")
-  pfUI:UpdateConfig("cooldown",   "actionbar",   "text",             "1")
+  pfUI:UpdateConfig("cooldown",   nil,           "blizzard_timers",  "both")
-  pfUI:UpdateConfig("cooldown",   "actionbar",   "animation",        "1")
+  pfUI:UpdateConfig("cooldown",   nil,           "lossofcontrol_timers", "both")
-  pfUI:UpdateConfig("cooldown",   "actionbar",   "reverse",          "0")
+  pfUI:UpdateConfig("cooldown",   nil,           "foreign_timers",   "sweep")
-  pfUI:UpdateConfig("cooldown",   "bags",        "text",             "1")
-  pfUI:UpdateConfig("cooldown",   "bags",        "animation",        "1")
-  pfUI:UpdateConfig("cooldown",   "bags",        "reverse",          "0")
-  pfUI:UpdateConfig("cooldown",   "blizzard",    "text",             "1")
-  pfUI:UpdateConfig("cooldown",   "blizzard",    "animation",        "1")
-  pfUI:UpdateConfig("cooldown",   "blizzard",    "reverse",          "0")
-  pfUI:UpdateConfig("cooldown",   "unitframe",   "text",             "1")
-  pfUI:UpdateConfig("cooldown",   "unitframe",   "animation",        "0")
-  pfUI:UpdateConfig("cooldown",   "unitframe",   "reverse",          "1")
-  pfUI:UpdateConfig("cooldown",   "indicator",   "text",             "1")
-  pfUI:UpdateConfig("cooldown",   "indicator",   "animation",        "0")
-  pfUI:UpdateConfig("cooldown",   "indicator",   "reverse",          "0")
-  pfUI:UpdateConfig("cooldown",   "nameplate",   "text",             "1")
-  pfUI:UpdateConfig("cooldown",   "nameplate",   "animation",        "0")
-  pfUI:UpdateConfig("cooldown",   "nameplate",   "reverse",          "1")
-  pfUI:UpdateConfig("cooldown",   "buff",        "text",             "1")
-  pfUI:UpdateConfig("cooldown",   "buff",        "animation",        "1")
-  pfUI:UpdateConfig("cooldown",   "buff",        "reverse",          "1")
-  pfUI:UpdateConfig("cooldown",   "tooltip",     "text",             "1")
-  pfUI:UpdateConfig("cooldown",   "tooltip",     "animation",        "0")
-  pfUI:UpdateConfig("cooldown",   "tooltip",     "reverse",          "0")
-  pfUI:UpdateConfig("cooldown",   "totem",       "text",             "1")
-  pfUI:UpdateConfig("cooldown",   "totem",       "animation",        "1")
-  pfUI:UpdateConfig("cooldown",   "totem",       "reverse",          "1")
-  pfUI:UpdateConfig("cooldown",   "lossofcontrol", "text",           "1")
-  pfUI:UpdateConfig("cooldown",   "lossofcontrol", "animation",      "1")
-  pfUI:UpdateConfig("cooldown",   "lossofcontrol", "reverse",        "0")
-  pfUI:UpdateConfig("cooldown",   "foreign",     "text",             "0")
-  pfUI:UpdateConfig("cooldown",   "foreign",     "animation",        "1")
 
   pfUI:UpdateConfig("appearance", "castbar",     "castbarcolor",     ".7,.7,.9,.8")
   pfUI:UpdateConfig("appearance", "castbar",     "channelcolor",     ".9,.9,.7,.8")
@@ -207,6 +179,7 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("appearance", "bags",        "autoSortOnOpen",   "0")
   pfUI:UpdateConfig("appearance", "bags",        "sortreverse",      "0")
   pfUI:UpdateConfig("appearance", "bags",        "sortprioreverse",  "0")
+  pfUI:UpdateConfig("appearance", "bags",        "timers",           "both")
   pfUI:UpdateConfig("appearance", "minimap",     "size",             "140")
   pfUI:UpdateConfig("appearance", "minimap",     "arrowscale",       "1")
   pfUI:UpdateConfig("appearance", "minimap",     "zonetext",         "off")
@@ -564,6 +537,7 @@ function pfUI:LoadConfig()
     pfUI:UpdateConfig("unitframes", unit,      "debuffoffy",       "0")
     pfUI:UpdateConfig("unitframes", unit,      "debuffspacingx",   "1")
     pfUI:UpdateConfig("unitframes", unit,      "debuffspacingy",   "1")
+    pfUI:UpdateConfig("unitframes", unit,      "aura_timers",      "text")
     pfUI:UpdateConfig("unitframes", unit,      "invert_healthbar", "0")
     pfUI:UpdateConfig("unitframes", unit,      "verticalbar",      "0")
     pfUI:UpdateConfig("unitframes", unit,      "buff_indicator",   "0")
@@ -584,6 +558,7 @@ function pfUI:LoadConfig()
     pfUI:UpdateConfig("unitframes", unit,      "indicator_size",   "10")
     pfUI:UpdateConfig("unitframes", unit,      "indicator_spacing","1")
     pfUI:UpdateConfig("unitframes", unit,      "indicator_pos",    "TOPLEFT")
+    pfUI:UpdateConfig("unitframes", unit,      "indicator_timers", "text")
 
     pfUI:UpdateConfig("unitframes", unit,      "clickcast",        "0")
     pfUI:UpdateConfig("unitframes", unit,      "faderange",        "0")
@@ -714,6 +689,7 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("bars",       nil,           "count_color",      ".2,1,.8,1")
   pfUI:UpdateConfig("bars",       nil,           "bind_size",        "8")
   pfUI:UpdateConfig("bars",       nil,           "bind_color",       "1,1,0,1")
+  pfUI:UpdateConfig("bars",       nil,           "timers",           "both")
 
   pfUI:UpdateConfig("bars",       "gryphons",    "texture",          "None")
   pfUI:UpdateConfig("bars",       "gryphons",    "color",            ".6,.6,.6,1")
@@ -727,6 +703,7 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("totems",     nil,           "iconsize",         "26")
   pfUI:UpdateConfig("totems",     nil,           "spacing",          "3")
   pfUI:UpdateConfig("totems",     nil,           "showbg",           "0")
+  pfUI:UpdateConfig("totems",     nil,           "timers",           "both")
 
   pfUI:UpdateConfig("panel",      nil,           "use_unitfonts",    "0")
   pfUI:UpdateConfig("panel",      nil,           "hide_leftchat",    "0")
@@ -839,6 +816,7 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("tooltip",    "statusbar",   "texture",          "Interface\\AddOns\\pfUI\\img\\bar")
   pfUI:UpdateConfig("tooltip",     nil,          "font_tooltip",     "Interface\\AddOns\\pfUI\\fonts\\Myriad-Pro.ttf")
   pfUI:UpdateConfig("tooltip",     nil,          "font_tooltip_size", "12")
+  pfUI:UpdateConfig("tooltip",     nil,          "aura_timers",      "text")
 
   -- Throttle Settings
 
@@ -963,6 +941,7 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("nameplates", nil,           "glowcolor",        "1,1,1,1")
   pfUI:UpdateConfig("nameplates", nil,           "targetzoom",       "0")
   pfUI:UpdateConfig("nameplates", nil,           "targetzoomval",    ".40")
+  pfUI:UpdateConfig("nameplates", nil,           "debuff_timers",    "text")
   pfUI:UpdateConfig("nameplates", nil,           "notargalpha",      ".75")
   pfUI:UpdateConfig("nameplates", nil,           "healthtexture",    "Interface\\AddOns\\pfUI\\img\\bar")
   pfUI:UpdateConfig("nameplates", "name",        "fontstyle",        "OUTLINE")
@@ -1436,9 +1415,32 @@ function pfUI:MigrateConfig()
     pfUI_config.unitframes.always2dportrait = nil
   end
 
-  -- migrate the scattered cooldown settings into the cooldown table; keyed
+  -- migrate the old cooldown settings into each feature's timers setting;
-  -- on the old settings rather than the version, like the portrait style
+  -- keyed on the old settings rather than the version, like the portrait
+  -- style. Reverse options are dropped: the direction follows what a
+  -- cooldown times.
   local cooldown = pfUI_config.cooldown
+
+  -- 'mode' with its numbers and sweep replaced by 'text' and 'sweep' ("1" or
+  -- "0"), each kept when nil
+  local function timers(mode, text, sweep)
+    local numbers = mode == "text" or mode == "both"
+    local swipe = mode == "sweep" or mode == "both"
+    if text then numbers = text == "1" end
+    if sweep then swipe = sweep == "1" end
+
+    if numbers and swipe then return "both" end
+    return numbers and "text" or swipe and "sweep" or "off"
+  end
+
+  -- every unit frame's settings
+  local function units(func)
+    for _, unit in pairs(pfUI_config.unitframes) do
+      if type(unit) == "table" and unit.aura_timers then func(unit) end
+    end
+  end
+
+  -- the shared look and the foreign and Blizzard toggles of appearance.cd
   local cd = pfUI_config.appearance.cd
   if cd then
     for _, entry in pairs({ "font", "font_size", "dynamicsize", "threshold", "milliseconds",
@@ -1446,17 +1448,12 @@ function pfUI:MigrateConfig()
       cooldown[entry] = cd[entry] or cooldown[entry]
     end
 
-    cooldown.foreign.text = cd.foreign or cooldown.foreign.text
+    local sweep = cd.hideanim and (cd.hideanim == "1" and "0" or "1")
-    if cd.hideanim then
+    cooldown.foreign_timers = timers(cooldown.foreign_timers, cd.foreign, sweep)
-      cooldown.foreign.animation = cd.hideanim == "1" and "0" or "1"
-    end
 
     -- spellbook and character slots took the foreign sweep, and with the
     -- Blizzard toggle off the foreign numbers too
-    cooldown.blizzard.animation = cooldown.foreign.animation
+    cooldown.blizzard_timers = timers(cooldown.blizzard_timers, cd.blizzard == "0" and (cd.foreign or "0") or nil, sweep)
-    if cd.blizzard == "0" then
-      cooldown.blizzard.text = cooldown.foreign.text
-    end
 
     -- pfUI drew its own numbers before; the native countdown shows them
     -- only with this cvar on, which only the first-run setup sets
@@ -1465,40 +1462,51 @@ function pfUI:MigrateConfig()
     pfUI_config.appearance.cd = nil
   end
 
-  local function move(config, old, kind, entry)
+  -- the options of each module
-    if config[old] then
+  local buffs, nameplates = pfUI_config.buffs, pfUI_config.nameplates
-      cooldown[kind][entry] = config[old]
+  buffs.timers = timers(buffs.timers, nil, buffs.cooldown_anim)
-      config[old] = nil
+  nameplates.debuff_timers = timers(nameplates.debuff_timers, nameplates.debufftext, nameplates.debuffanim)
-    end
+  if nameplates.debufftimers == "0" then nameplates.debuff_timers = "off" end
-  end
 
-  move(pfUI_config.bars, "cooldown_reverse", "actionbar", "reverse")
+  units(function(unit)
-  move(pfUI_config.appearance.bags, "cooldown_reverse", "bags", "reverse")
+    unit.aura_timers = timers(unit.aura_timers, unit.cooldown_text, unit.cooldown_anim)
-  move(pfUI_config.buffs, "cooldown_anim", "buff", "animation")
+    unit.indicator_timers = timers(unit.indicator_timers, unit.indicator_time)
-  move(pfUI_config.buffs, "cooldown_reverse", "buff", "reverse")
-  move(pfUI_config.totems, "cooldown_reverse", "totem", "reverse")
-  move(pfUI_config.nameplates, "debufftext", "nameplate", "text")
-  move(pfUI_config.nameplates, "debuffanim", "nameplate", "animation")
-  move(pfUI_config.nameplates, "debreverse", "nameplate", "reverse")
-
-  if pfUI_config.nameplates.debufftimers == "0" then
-    cooldown.nameplate.text, cooldown.nameplate.animation = "0", "0"
-  end
-
-  -- one setting now covers every unit frame: the target frame's auras and
-  -- the raid frames' indicators stand for the rest
-  move(pfUI_config.unitframes.target, "cooldown_text", "unitframe", "text")
-  move(pfUI_config.unitframes.target, "cooldown_anim", "unitframe", "animation")
-  move(pfUI_config.unitframes.target, "cooldown_reverse", "unitframe", "reverse")
-  move(pfUI_config.unitframes.raid, "indicator_time", "indicator", "text")
-
-  for _, unit in pairs(pfUI_config.unitframes) do
-    if type(unit) == "table" then
     unit.cooldown_text, unit.cooldown_anim, unit.cooldown_reverse, unit.indicator_time = nil, nil, nil, nil
-    end
+  end)
-  end
 
-  pfUI_config.nameplates.debufftimers = nil
+  pfUI_config.bars.cooldown_reverse = nil
+  pfUI_config.appearance.bags.cooldown_reverse = nil
+  pfUI_config.totems.cooldown_reverse = nil
+  buffs.cooldown_anim, buffs.cooldown_reverse = nil, nil
+  nameplates.debufftext, nameplates.debuffanim, nameplates.debreverse, nameplates.debufftimers = nil, nil, nil, nil
+
+  -- the cooldown kinds of Settings -> Cooldown, each with its numbers and
+  -- sweep, into the setting that replaced it
+  local kinds = {
+    actionbar = { pfUI_config.bars, "timers" },
+    bags = { pfUI_config.appearance.bags, "timers" },
+    blizzard = { cooldown, "blizzard_timers" },
+    nameplate = { nameplates, "debuff_timers" },
+    buff = { buffs, "timers" },
+    tooltip = { pfUI_config.tooltip, "aura_timers" },
+    totem = { pfUI_config.totems, "timers" },
+    lossofcontrol = { cooldown, "lossofcontrol_timers" },
+    foreign = { cooldown, "foreign_timers" },
+    unitframe = "aura_timers",
+    indicator = "indicator_timers",
+  }
+
+  for kind, target in pairs(kinds) do
+    local old = cooldown[kind]
+    if type(old) == "table" then
+      if type(target) == "string" then
+        units(function(unit) unit[target] = timers(unit[target], old.text, old.animation) end)
+      else
+        target[1][target[2]] = timers(target[1][target[2]], old.text, old.animation)
+      end
+      cooldown[kind] = nil
+    end
+  end
   pfUI_config.bars.cd_size = nil
 
   -- Remove "Show only own debuffs" from unitframes and nameplates

api/cooldown.lua

@@ -1,16 +1,20 @@
 -- load pfUI environment
 setfenv(1, pfUI:GetEnvironment())
 
--- Every pfUI cooldown is a Cooldown frame from CreateCooldown, made for one
+-- Every pfUI cooldown is a Cooldown frame from CreateCooldown. The settings
--- kind of timer. Settings -> Cooldown (C.cooldown) sets for each kind its
+-- of the feature it belongs to pick its timers: none, numbers, sweep or both.
--- countdown numbers, its sweep and the sweep's direction, and shares one font
+-- Settings -> Cooldown (C.cooldown) sets one font and one formatter for them
--- and one formatter between them all. The numbers are the frame's own
+-- all. The numbers are the frame's own countdown (ClassicAPI): the engine
--- countdown (ClassicAPI): the engine ticks them, gated by the
+-- ticks them, gated by the countdownForCooldowns cvar. Other addons' Cooldown
--- countdownForCooldowns cvar. Other addons' Cooldown frames take the
+-- frames take the "foreign" timers as their timers start.
--- "foreign" settings as their timers start.
 
--- kinds that time spells or items: no numbers for the global cooldown
+local function ShowNumbers(mode)
-local spell = { actionbar = true, bags = true, blizzard = true, foreign = true }
+  return mode == "text" or mode == "both"
+end
+
+local function ShowSweep(mode)
+  return mode == "sweep" or mode == "both"
+end
 
 -- every cooldown CreateCooldown made, for UpdateCooldowns
 local cooldowns = {}
@@ -58,60 +62,60 @@ function pfUI.api.GetCooldownFontSize(height)
   return size
 end
 
--- sizes the numbers to the cooldown's parent; the size follows its height,
+-- sizes the numbers to the height of the frame the cooldown covers
--- so a timer start calls this again whenever that height changed
+local function UpdateFont(cooldown, height)
-local function UpdateFont(cooldown)
-  local height = (cooldown:GetParent() or cooldown):GetHeight()
-  cooldown.pfCountdownHeight = height
   cooldown:GetCountdownFontString():SetFont(pfUI.media[C.cooldown.font], pfUI.api.GetCooldownFontSize(height), "OUTLINE")
 end
 
--- applies the settings of its kind to one of pfUI's cooldowns
+-- a pfUI cooldown covers its parent, so it resizes with it; a hidden one is
-local function SetupCooldown(cooldown)
+-- laid out, and this runs, as it shows
-  local kind = cooldown.pfCooldownKind
+local function OnSizeChanged(cooldown, width, height)
-  local config = C.cooldown[kind]
+  UpdateFont(cooldown, height)
-  local sweep = config.animation == "1" and not cooldown.pfTimeLeftOnly
-
-  cooldown:SetHideCountdownNumbers(config.text ~= "1")
-  cooldown:SetDrawSwipe(sweep)
-  cooldown:SetDrawBling(sweep)
-  cooldown:SetReverse(config.reverse == "1")
-  cooldown:SetMinimumCountdownDuration(spell[kind] and tonumber(C.cooldown.threshold) * 1000 or 0)
-  cooldown:SetCountdownFormatter(GetFormatter())
-  UpdateFont(cooldown)
 end
 
--- applies the "foreign" settings to another addon's cooldown. They only take
+-- applies its timers setting to one of pfUI's cooldowns
+local function SetupCooldown(cooldown)
+  local kind = cooldown.pfCooldownKind
+  local mode = cooldown.pfCooldownConfig[cooldown.pfCooldownKey]
+  local sweep = ShowSweep(mode) and not cooldown.pfTimeLeftOnly
+
+  cooldown:SetHideCountdownNumbers(not ShowNumbers(mode))
+  cooldown:SetDrawSwipe(sweep)
+  cooldown:SetDrawBling(sweep)
+  cooldown:SetReverse(kind == "aura")
+  cooldown:SetMinimumCountdownDuration(kind == "spell" and tonumber(C.cooldown.threshold) * 1000 or 0)
+  cooldown:SetCountdownFormatter(GetFormatter())
+  UpdateFont(cooldown, cooldown:GetParent():GetHeight())
+end
+
+-- applies the "foreign" timers to another addon's cooldown. They only take
 -- the numbers or the sweep away, which the addon may have set up itself, so
 -- turning one back on needs a reload.
 local function SetupForeign(cooldown)
-  local config = C.cooldown.foreign
+  local mode = C.cooldown.foreign_timers
 
-  if config.animation ~= "1" then
+  if not ShowSweep(mode) then
     cooldown:SetDrawSwipe(false)
     cooldown:SetDrawBling(false)
   end
 
   -- omnicc's flag for cooldowns that want no numbers
-  if config.text ~= "1" or cooldown.noCooldownCount then
+  if not ShowNumbers(mode) or cooldown.noCooldownCount then
     cooldown:SetHideCountdownNumbers(true)
     return
   end
 
   cooldown:SetMinimumCountdownDuration(tonumber(C.cooldown.threshold) * 1000)
   cooldown:SetCountdownFormatter(GetFormatter())
-  UpdateFont(cooldown)
+  UpdateFont(cooldown, (cooldown:GetParent() or cooldown):GetHeight())
 end
 
 -- runs as a pfUI cooldown's timer starts: a timer with a total brings back
--- the sweep a time-left-only one took away, and the font follows a changed
+-- the sweep a time-left-only one took away
--- height
 local function StartTimer(cooldown, timeleftOnly)
   if cooldown.pfTimeLeftOnly ~= timeleftOnly then
     cooldown.pfTimeLeftOnly = timeleftOnly
     SetupCooldown(cooldown)
-  elseif cooldown:GetParent():GetHeight() ~= cooldown.pfCountdownHeight then
-    UpdateFont(cooldown)
   end
 end
 
@@ -129,17 +133,23 @@ hooksecurefunc("CooldownFrame_SetTimer", function(cooldown)
 end)
 
 -- [ CreateCooldown ] --
--- Creates one of pfUI's cooldowns: a Cooldown frame over all of 'parent'
+-- Creates one of pfUI's cooldowns: a Cooldown frame over all of 'parent'.
--- with the settings of its kind. Start it with CooldownFrame_SetTimer.
+-- Start it with CooldownFrame_SetTimer.
 -- 'parent'   [frame]    the frame the cooldown covers
--- 'kind'     [string]   what it times, a group of C.cooldown: actionbar,
+-- 'kind'     [string]   what it times: "spell" (spells and items: the sweep
---                       bags, blizzard, unitframe, indicator, nameplate,
+--                       fills, no numbers for the global cooldown), "aura"
---                       buff, tooltip, totem or lossofcontrol
+--                       (the sweep drains) or "timer" (the sweep fills)
+-- 'config'   [table]    the settings that hold its timers
+-- 'key'      [string]   the timers setting in 'config': "off", "text",
+--                       "sweep" or "both"
 -- 'name'     [string]   optional frame name
 -- return     [frame]    the Cooldown frame
-function pfUI.api.CreateCooldown(parent, kind, name)
+function pfUI.api.CreateCooldown(parent, kind, config, key, name)
   local cooldown = CreateFrame("Cooldown", name, parent, "CooldownFrameTemplate")
   cooldown.pfCooldownKind = kind
+  cooldown.pfCooldownConfig = config
+  cooldown.pfCooldownKey = key
+  cooldown:SetScript("OnSizeChanged", OnSizeChanged)
   table.insert(cooldowns, cooldown)
   SetupCooldown(cooldown)
   return cooldown

api/unitframes.lua

@@ -248,6 +248,11 @@ local VISIBILITY_EVENTS = {
   UNIT_TARGET = true, -- a link of a chained frame's unit retargeted
 }
 
+-- The units of a chain that unit events name by token, whatever nampower does
+-- with its GUID events: the focus, and the focus's target, whose unit events
+-- ClassicAPI fires as "focustarget" from the unit's own fields.
+local CHAIN_TOKENS = { focus = true, focustarget = true }
+
 -- The events a frame hears hidden or not: the visibility events that concern
 -- the unit it was created for (raid.lua remaps a raid frame's label, so this is
 -- decided once, at creation), and the logout guard. UNIT_TARGET belongs to
@@ -482,7 +487,9 @@ function pfUI.uf:UpdateVisibility()
   --
   -- A chained unit -- another unit's target, "targettarget" or "party1target"
   -- -- has no token that unit events name, so the frame follows it by GUID,
-  -- which every unit event also fires with. It follows the unit only while
+  -- which nampower fires every unit event with too, unless its GUID events
+  -- are off or filtered. The focus's target is named (CHAIN_TOKENS), so that
+  -- frame follows its token instead. It follows the unit only while
   -- the client has it: a link's target can be out of sight, and its coming
   -- back is then a new unit too. The unit changes with no event of its own
   -- whenever a link of the chain retargets; UNIT_TARGET on every link reports
@@ -491,8 +498,9 @@ function pfUI.uf:UpdateVisibility()
   self.chain = visibility ~= "hide" and unitstr:match("^(.+)target$") or nil
   if self.chain then
     local guid = UnitName(unitstr) and UnitGUID(unitstr)
-    if guid ~= self.eventunit then self.update_full = true end
+    if guid ~= self.unitguid then self.update_full = true end
-    self:RegisterUnitEvents(guid)
+    self.unitguid = guid
+    self:RegisterUnitEvents(guid and CHAIN_TOKENS[unitstr] and unitstr or guid)
   else
     self:RegisterUnitEvents(visibility ~= "hide" and unitstr or nil)
   end
@@ -938,7 +946,7 @@ function pfUI.uf:UpdateConfig()
       f.buffs[i]:SetFrameLevel(12)
       f.buffs[i]:RegisterForClicks("RightButtonUp")
 
-      f.buffs[i].cd = f.buffs[i].cd or CreateCooldown(f.buffs[i], "unitframe", f.buffs[i]:GetName() .. "Cooldown")
+      f.buffs[i].cd = f.buffs[i].cd or CreateCooldown(f.buffs[i], "aura", f.config, "aura_timers", f.buffs[i]:GetName() .. "Cooldown")
       f.buffs[i].cd:SetFrameLevel(14)
 
       f.buffs[i].id = i
@@ -991,7 +999,7 @@ function pfUI.uf:UpdateConfig()
       f.debuffs[i]:RegisterForClicks("RightButtonUp")
       f.debuffs[i]:SetNormalTexture(nil)
       
-      f.debuffs[i].cd = f.debuffs[i].cd or CreateCooldown(f.debuffs[i], "unitframe", f.debuffs[i]:GetName() .. "Cooldown")
+      f.debuffs[i].cd = f.debuffs[i].cd or CreateCooldown(f.debuffs[i], "aura", f.config, "aura_timers", f.debuffs[i]:GetName() .. "Cooldown")
       f.debuffs[i].cd:SetFrameLevel(14)
 
       f.debuffs[i].id = i
@@ -1359,8 +1367,8 @@ local UNIT_EVENTS = {
 
 -- Auras and power. ClassicAPI's UNIT_AURA_DELTA also reports refreshes and new
 -- durations and says what changed; its generic power events name the power, so
--- a frame skips the ones it does not draw. Both fire for tokens only, so a
+-- a frame skips the ones it does not draw. Both fire for tokens only, and not
--- chained unit, followed by GUID, keeps 1.12's events instead. A group
+-- as "focustarget", so a chained unit keeps 1.12's events instead. A group
 -- member's connection and sight come with them, and a chained unit has
 -- neither event.
 local TOKEN_EVENTS = {
@@ -1425,16 +1433,18 @@ end
 -- unit, whose `owner` is the unit it is the target of -- for
 -- "targettargettarget" the links are "targettarget" and "target" -- or drop it
 -- when `owner` is nil. By GUID, since the inner links are no token that events
--- name. Cheap to call repeatedly: it re-registers only when a link changed.
+-- name, save the ones in CHAIN_TOKENS. Cheap to call repeatedly: it
+-- re-registers only when a link changed.
 local chainlinks = {}
 function pfUI.uf:RegisterChainEvents(owner)
   local n, key = 0, nil
   while owner do
     local guid = UnitGUID(owner)
     if guid then
+      local link = CHAIN_TOKENS[owner] and owner or guid
       n = n + 1
-      chainlinks[n] = guid
+      chainlinks[n] = link
-      key = key and key .. guid or guid
+      key = key and key .. link or link
     end
     owner = owner:match("^(.+)target$")
   end
@@ -2433,6 +2443,7 @@ function pfUI.uf:AddIcon(frame, pos, icon, timeleft, stacks, start, duration)
   local position = frame.config.indicator_pos or "TOPLEFT"
   local iconsize = tonumber(frame.config.indicator_size)
   local spacing = tonumber(frame.config.indicator_spacing)
+  local config = frame.config
 
   if not frame.hp then return end
   local frame = frame.hp.bar
@@ -2451,7 +2462,7 @@ function pfUI.uf:AddIcon(frame, pos, icon, timeleft, stacks, start, duration)
     frame.icon[pos].stacks:SetJustifyH("RIGHT")
     frame.icon[pos].stacks:SetJustifyV("BOTTOM")
 
-    frame.icon[pos].cd = CreateCooldown(frame.icon[pos], "indicator")
+    frame.icon[pos].cd = CreateCooldown(frame.icon[pos], "aura", config, "indicator_timers")
     frame.icon[pos].cd:SetFrameLevel(48)
   end
 

env/translations_deDE.lua

@@ -8,7 +8,6 @@ pfUI_translation["deDE"] = {
   ["Actionbar"] = nil,
   ["Action Bar"] = nil,
   ["Action Bar Border Size"] = nil,
-  ["Action Bars"] = nil,
   ["Active Addons"] = nil,
   ["Add button to the frame"] = nil,
   ["Added button"] = nil,
@@ -77,11 +76,11 @@ pfUI_translation["deDE"] = {
   ["Bottom"] = nil,
   ["Bottom Left"] = nil,
   ["Bottom Right"] = nil,
+  ["Buff And Debuff Timers"] = nil,
   ["Buffbar Height"] = nil,
   ["Buffbar Width"] = nil,
   ["Buff/Debuff Icons"] = nil,
   ["Buff/Debuff Indicators"] = nil,
-  ["Buff Indicators"] = nil,
   ["Buff Limit"] = nil,
   ["Buff Position"] = nil,
   ["Buffs"] = nil,
@@ -106,6 +105,15 @@ pfUI_translation["deDE"] = {
   ["Center Text"] = nil,
   ["Center Text X Offset"] = nil,
   ["Center Text Y Offset"] = nil,
+  ["Cooldown Timers"] = nil,
+  ["Debuff Timers"] = nil,
+  ["Duration Timers"] = nil,
+  ["Indicator Timers"] = nil,
+  ["Numbers"] = nil,
+  ["Numbers And Sweep"] = nil,
+  ["Sweep"] = nil,
+  ["Timers"] = nil,
+  ["Unit Buff Timers"] = nil,
   ["|cff33ffccBlizzard: \"Interface Options\"|r\n\nDo you want me to set up the recommended Blizzard UI settings? This will enable settings that can be found in the Interface section of your client. Options like Buff Durations, Instant Quest Text, Auto Selfcast and others will be set."] = nil,
   ["|cff33ffccChat: \"Channels\"|r\n\nDo you want me to setup the chat channels of your chatframes? This would set important or personal messages to the left chat and world channels and lootinformation to the right chat."] = nil,
   ["|cff33ffccChat: \"Layout\"|r\n\nDo you want me to adjust the layout of your chatframes? This would make sure, that every window is placed on its dedicated position."] = nil,
@@ -516,7 +524,6 @@ pfUI_translation["deDE"] = {
   ["Name | Health Missing"] = nil,
   ["Name (Linebreak) -Health Missing"] = nil,
   ["Nameplate Border Size"] = nil,
-  ["Nameplate Debuffs"] = nil,
   ["Nameplates"] = nil,
   ["Nameplate Width"] = nil,
   ["Name (Short)"] = nil,
@@ -584,7 +591,6 @@ pfUI_translation["deDE"] = {
   ["Pixel"] = nil,
   ["Player"] = nil,
   ["Player Buff Bar"] = nil,
-  ["Player Buffs"] = nil,
   ["Player Castbar"] = nil,
   ["Player Debuff Bar"] = nil,
   ["Player SP/Haste Display"] = nil,
@@ -651,7 +657,6 @@ pfUI_translation["deDE"] = {
   ["Resting"] = nil,
   ["Reveal Unexplored Areas"] = nil,
   ["Switch to current zone"] = "Zur aktuellen Zone wechseln",
-  ["Reverse Sweep On"] = nil,
   ["Right"] = nil,
   ["Right Actionbar"] = nil,
   ["Right Anchor"] = nil,
@@ -733,7 +738,6 @@ pfUI_translation["deDE"] = {
   ["Show Loot Icon"] = nil,
   ["Show Macro Text"] = nil,
   ["Show Meters By Default"] = nil,
-  ["Show Numbers On"] = nil,
   ["Show On Friendly Units"] = nil,
   ["Show On Hostile Units"] = nil,
   ["Show Procs Indicators"] = nil,
@@ -751,7 +755,6 @@ pfUI_translation["deDE"] = {
   ["Show Spell Icon"] = nil,
   ["Show Spell Name"] = nil,
   ["Show Stacks"] = nil,
-  ["Show Sweep On"] = nil,
   ["Show Tenths Below 5 Seconds"] = nil,
   ["Show Text"] = nil,
   ["Show Timer"] = nil,
@@ -819,7 +822,6 @@ pfUI_translation["deDE"] = {
   ["Tiny (PixelPerfect)"] = nil,
   ["Toggle as Tank"] = nil,
   ["Tooltip"] = nil,
-  ["Tooltip Auras"] = nil,
   ["Tooltip Position"] = nil,
   ["Tooltip Text Font"] = nil,
   ["Tooltip Text Font Size"] = nil,
@@ -831,13 +833,11 @@ pfUI_translation["deDE"] = {
   ["Total Gold"] = nil,
   ["Totem Direction"] = nil,
   ["Totem Icons"] = nil,
-  ["Totems"] = nil,
   ["Tracked Reputation"] = nil,
   ["Tracking Icon Size"] = nil,
   ["Trigger Actions On Key Down"] = nil,
   ["UI-Scale"] = nil,
   ["Unbuffed"] = nil,
-  ["Unit Frame Auras"] = nil,
   ["Unit Frame Border Size"] = nil,
   ["Unit Frame Layout"] = nil,
   ["Unit Frames"] = nil,

env/translations_enUS.lua

@@ -8,7 +8,6 @@ pfUI_translation["enUS"] = {
   ["Actionbar"] = nil,
   ["Action Bar"] = nil,
   ["Action Bar Border Size"] = nil,
-  ["Action Bars"] = nil,
   ["Active Addons"] = nil,
   ["Add button to the frame"] = nil,
   ["Added button"] = nil,
@@ -80,11 +79,11 @@ pfUI_translation["enUS"] = {
   ["Bottom"] = nil,
   ["Bottom Left"] = nil,
   ["Bottom Right"] = nil,
+  ["Buff And Debuff Timers"] = nil,
   ["Buffbar Height"] = nil,
   ["Buffbar Width"] = nil,
   ["Buff/Debuff Icons"] = nil,
   ["Buff/Debuff Indicators"] = nil,
-  ["Buff Indicators"] = nil,
   ["Buff Limit"] = nil,
   ["Buff Position"] = nil,
   ["Buffs"] = nil,
@@ -113,6 +112,15 @@ pfUI_translation["enUS"] = {
   ["Center Text"] = nil,
   ["Center Text X Offset"] = nil,
   ["Center Text Y Offset"] = nil,
+  ["Cooldown Timers"] = nil,
+  ["Debuff Timers"] = nil,
+  ["Duration Timers"] = nil,
+  ["Indicator Timers"] = nil,
+  ["Numbers"] = nil,
+  ["Numbers And Sweep"] = nil,
+  ["Sweep"] = nil,
+  ["Timers"] = nil,
+  ["Unit Buff Timers"] = nil,
   ["|cff33ffccBlizzard: \"Interface Options\"|r\n\nDo you want me to set up the recommended Blizzard UI settings? This will enable settings that can be found in the Interface section of your client. Options like Buff Durations, Instant Quest Text, Auto Selfcast and others will be set."] = nil,
   ["|cff33ffccChat: \"Channels\"|r\n\nDo you want me to setup the chat channels of your chatframes? This would set important or personal messages to the left chat and world channels and lootinformation to the right chat."] = nil,
   ["|cff33ffccChat: \"Layout\"|r\n\nDo you want me to adjust the layout of your chatframes? This would make sure, that every window is placed on its dedicated position."] = nil,
@@ -533,7 +541,6 @@ pfUI_translation["enUS"] = {
   ["Name | Health Missing"] = nil,
   ["Name (Linebreak) -Health Missing"] = nil,
   ["Nameplate Border Size"] = nil,
-  ["Nameplate Debuffs"] = nil,
   ["Nameplates"] = nil,
   ["Nameplate Width"] = nil,
   ["Name (Short)"] = nil,
@@ -606,7 +613,6 @@ pfUI_translation["enUS"] = {
   ["Pixel"] = nil,
   ["Player"] = nil,
   ["Player Buff Bar"] = nil,
-  ["Player Buffs"] = nil,
   ["Player Castbar"] = nil,
   ["Player Debuff Bar"] = nil,
   ["Player SP/Haste Display"] = nil,
@@ -674,7 +680,6 @@ pfUI_translation["enUS"] = {
   ["Reveal Unexplored Areas"] = nil,
   ["Switch to current zone"] = nil,
   ["Retrieving item information..."] = nil,
-  ["Reverse Sweep On"] = nil,
   ["Right"] = nil,
   ["Right Actionbar"] = nil,
   ["Right Anchor"] = nil,
@@ -756,7 +761,6 @@ pfUI_translation["enUS"] = {
   ["Show Loot Icon"] = nil,
   ["Show Macro Text"] = nil,
   ["Show Meters By Default"] = nil,
-  ["Show Numbers On"] = nil,
   ["Show On Friendly Units"] = nil,
   ["Show On Hostile Units"] = nil,
   ["Show Procs Indicators"] = nil,
@@ -774,7 +778,6 @@ pfUI_translation["enUS"] = {
   ["Show Spell Icon"] = nil,
   ["Show Spell Name"] = nil,
   ["Show Stacks"] = nil,
-  ["Show Sweep On"] = nil,
   ["Show Tenths Below 5 Seconds"] = nil,
   ["Show Text"] = nil,
   ["Show Timer"] = nil,
@@ -851,7 +854,6 @@ pfUI_translation["enUS"] = {
   ["Tiny (PixelPerfect)"] = nil,
   ["Toggle as Tank"] = nil,
   ["Tooltip"] = nil,
-  ["Tooltip Auras"] = nil,
   ["Tooltip Position"] = nil,
   ["Tooltip Text Font"] = nil,
   ["Tooltip Text Font Size"] = nil,
@@ -863,13 +865,11 @@ pfUI_translation["enUS"] = {
   ["Total Gold"] = nil,
   ["Totem Direction"] = nil,
   ["Totem Icons"] = nil,
-  ["Totems"] = nil,
   ["Tracked Reputation"] = nil,
   ["Tracking Icon Size"] = nil,
   ["Trigger Actions On Key Down"] = nil,
   ["UI-Scale"] = nil,
   ["Unbuffed"] = nil,
-  ["Unit Frame Auras"] = nil,
   ["Unit Frame Border Size"] = nil,
   ["Unit Frame Layout"] = nil,
   ["Unit Frames"] = nil,

env/translations_esES.lua

@@ -8,7 +8,6 @@ pfUI_translation["esES"] = {
   ["Actionbar"] = "Barra de acción",
   ["Action Bar"] = "Barra de acción",
   ["Action Bar Border Size"] = "Tamaño del borde de la barra de acción",
-  ["Action Bars"] = nil,
   ["Active Addons"] = "Accesorios activos",
   ["Add button to the frame"] = "Añadir botón al marco",
   ["Added button"] = "Botón añadido",
@@ -77,11 +76,11 @@ pfUI_translation["esES"] = {
   ["Bottom"] = "Inferior",
   ["Bottom Left"] = "Inferior izquierda",
   ["Bottom Right"] = "Inferior derecha",
+  ["Buff And Debuff Timers"] = nil,
   ["Buffbar Height"] = "Altura de la barra de beneficios",
   ["Buffbar Width"] = "Ancho de la barra de beneficios",
   ["Buff/Debuff Icons"] = "Iconos de los beneficios/perjuicios",
   ["Buff/Debuff Indicators"] = "Indicadores de beneficios/perjuicios",
-  ["Buff Indicators"] = nil,
   ["Buff Limit"] = "Límite de beneficios",
   ["Buff Position"] = "Posición de los beneficios",
   ["Buffs"] = "Beneficios",
@@ -106,6 +105,15 @@ pfUI_translation["esES"] = {
   ["Center Text"] = "Centrar texto",
   ["Center Text X Offset"] = nil,
   ["Center Text Y Offset"] = nil,
+  ["Cooldown Timers"] = nil,
+  ["Debuff Timers"] = nil,
+  ["Duration Timers"] = nil,
+  ["Indicator Timers"] = nil,
+  ["Numbers"] = nil,
+  ["Numbers And Sweep"] = nil,
+  ["Sweep"] = nil,
+  ["Timers"] = nil,
+  ["Unit Buff Timers"] = nil,
   ["|cff33ffccBlizzard: \"Interface Options\"|r\n\nDo you want me to set up the recommended Blizzard UI settings? This will enable settings that can be found in the Interface section of your client. Options like Buff Durations, Instant Quest Text, Auto Selfcast and others will be set."] = "|cff33ffccBlizzard: \"Opciones de la interfaz\"|r\n\n¿Prefieres usar la configuración IU recomendada de Blizzard? Se activarán algunas de las opciones que se encuentran en la sección Interfaz de tu cliente. Opciones como duración de buffs, texto de misión instantáneo, autolanzarse hechizos y otros serán activadas.",
   ["|cff33ffccChat: \"Channels\"|r\n\nDo you want me to setup the chat channels of your chatframes? This would set important or personal messages to the left chat and world channels and lootinformation to the right chat."] = "|cff33ffccChat: \"Canales\"|r\n\n¿Quieres que configure los canales de chat para tu marco de chat? Los mensajes importantes o personales aparecerán en la ventana de chat izquierda y los canales del mundo e información del botín en la ventana de chat derecha.",
   ["|cff33ffccChat: \"Layout\"|r\n\nDo you want me to adjust the layout of your chatframes? This would make sure, that every window is placed on its dedicated position."] = "|cff33ffccChat: \"Disposición\"|r\n\n¿Quieres que ajuste la disposición de los marcos de chat? De esta manera cada ventana estará en su posición correcta.",
@@ -516,7 +524,6 @@ pfUI_translation["esES"] = {
   ["Name | Health Missing"] = "Nombre | Falta de salud",
   ["Name (Linebreak) -Health Missing"] = nil,
   ["Nameplate Border Size"] = "Tamaño del borde de las placas de nombre",
-  ["Nameplate Debuffs"] = nil,
   ["Nameplates"] = "Placas identificativas",
   ["Nameplate Width"] = "Ancho de las placas identificativas",
   ["Name (Short)"] = "Nombre (corto)",
@@ -584,7 +591,6 @@ pfUI_translation["esES"] = {
   ["Pixel"] = "Píxel",
   ["Player"] = "Jugador",
   ["Player Buff Bar"] = "Barra de beneficios del jugador",
-  ["Player Buffs"] = nil,
   ["Player Castbar"] = "Barra de lanzamiento del jugador",
   ["Player Debuff Bar"] = "Barra de perjuicios del jugador",
   ["Player SP/Haste Display"] = nil,
@@ -651,7 +657,6 @@ pfUI_translation["esES"] = {
   ["Resting"] = "Descansando",
   ["Reveal Unexplored Areas"] = "Mostrar áreas no exploradas",
   ["Switch to current zone"] = "Ir a la zona actual",
-  ["Reverse Sweep On"] = nil,
   ["Right"] = "Derecho",
   ["Right Actionbar"] = "Barra de acción derecha",
   ["Right Anchor"] = nil,
@@ -733,7 +738,6 @@ pfUI_translation["esES"] = {
   ["Show Loot Icon"] = "Mostrar icono de botín",
   ["Show Macro Text"] = "Mostrar texto de macro",
   ["Show Meters By Default"] = "Mostrar medidores por defecto",
-  ["Show Numbers On"] = nil,
   ["Show On Friendly Units"] = "Mostrar en unidades amistosas",
   ["Show On Hostile Units"] = "Mostrar en unidades enemigas",
   ["Show Procs Indicators"] = "Mostrar indicadores de beneficios temporales activados",
@@ -751,7 +755,6 @@ pfUI_translation["esES"] = {
   ["Show Spell Icon"] = "Mostrar icono de hechizo",
   ["Show Spell Name"] = nil,
   ["Show Stacks"] = "Mostrar pilas",
-  ["Show Sweep On"] = nil,
   ["Show Tenths Below 5 Seconds"] = nil,
   ["Show Text"] = nil,
   ["Show Timer"] = nil,
@@ -819,7 +822,6 @@ pfUI_translation["esES"] = {
   ["Tiny (PixelPerfect)"] = "Minúsculo (píxel perfecta)",
   ["Toggle as Tank"] = "Alternar si eres el tanque",
   ["Tooltip"] = "Descripción emergente",
-  ["Tooltip Auras"] = nil,
   ["Tooltip Position"] = "Posición de la descripción emergente",
   ["Tooltip Text Font"] = nil,
   ["Tooltip Text Font Size"] = nil,
@@ -831,13 +833,11 @@ pfUI_translation["esES"] = {
   ["Total Gold"] = "Oro Total",
   ["Totem Direction"] = "Dirección del tótem",
   ["Totem Icons"] = "Iconos de los tótems",
-  ["Totems"] = nil,
   ["Tracked Reputation"] = "Reputación rastreada",
   ["Tracking Icon Size"] = "Tamaño del icono de rastreo",
   ["Trigger Actions On Key Down"] = "Disparar acciones por presionar la tecla abajo",
   ["UI-Scale"] = "Escala de IU",
   ["Unbuffed"] = "Sin beneficios",
-  ["Unit Frame Auras"] = nil,
   ["Unit Frame Border Size"] = "Tamaño del borde del marco de unidad",
   ["Unit Frame Layout"] = "Disposición del Marco de unidad",
   ["Unit Frames"] = "Marcos de unidad",

env/translations_frFR.lua

@@ -8,7 +8,6 @@ pfUI_translation["frFR"] = {
   ["Actionbar"] = "Barre d'action",
   ["Action Bar"] = "Barre d'action",
   ["Action Bar Border Size"] = "Taille de la bordure de la barre d'action",
-  ["Action Bars"] = nil,
   ["Active Addons"] = "Addons Actif",
   ["Add button to the frame"] = "Ajoute un bouton au cadre",
   ["Added button"] = "Bouton ajouté",
@@ -77,11 +76,11 @@ pfUI_translation["frFR"] = {
   ["Bottom"] = "Bas",
   ["Bottom Left"] = "Bas Gauche",
   ["Bottom Right"] = "Bas Droit",
+  ["Buff And Debuff Timers"] = nil,
   ["Buffbar Height"] = "Hauteur de la barre des Améliorations",
   ["Buffbar Width"] = "Largeur de la barre des Améliorations",
   ["Buff/Debuff Icons"] = "Icones de Améliorations/Affaiblissements",
   ["Buff/Debuff Indicators"] = nil,
-  ["Buff Indicators"] = nil,
   ["Buff Limit"] = "Limite des améliorations",
   ["Buff Position"] = "Position des améliorations",
   ["Buffs"] = "Buffs",
@@ -106,6 +105,15 @@ pfUI_translation["frFR"] = {
   ["Center Text"] = "Centrer le texte",
   ["Center Text X Offset"] = nil,
   ["Center Text Y Offset"] = nil,
+  ["Cooldown Timers"] = nil,
+  ["Debuff Timers"] = nil,
+  ["Duration Timers"] = nil,
+  ["Indicator Timers"] = nil,
+  ["Numbers"] = nil,
+  ["Numbers And Sweep"] = nil,
+  ["Sweep"] = nil,
+  ["Timers"] = nil,
+  ["Unit Buff Timers"] = nil,
   ["|cff33ffccBlizzard: \"Interface Options\"|r\n\nDo you want me to set up the recommended Blizzard UI settings? This will enable settings that can be found in the Interface section of your client. Options like Buff Durations, Instant Quest Text, Auto Selfcast and others will be set."] = "|cff33ffccBlizzard: \"Options d'Interface\"|r\n\nVoulez-vous que le logiciel vous paramètre les options d'interface recommandées ? Si oui, cela va choisir les options d'interface par défaut de votre client. Les options comme la durée des améliorations, le texte instantané des quêtes, lancer sur soi par défaut et d'autres vont être activées.",
   ["|cff33ffccChat: \"Channels\"|r\n\nDo you want me to setup the chat channels of your chatframes? This would set important or personal messages to the left chat and world channels and lootinformation to the right chat."] = "|cff33ffccChat: \"Canaux\"|r\n\nVoulez-vous que le logiciel vous paramètre les canaux de discussion dans votre fenêtre de chat ?  En faisant ceci, les  messages importants et personnels seront sur le chat de gauche, alors que les textes de butin ou autre informations diverses seront affichés sur le chat de droite.",
   ["|cff33ffccChat: \"Layout\"|r\n\nDo you want me to adjust the layout of your chatframes? This would make sure, that every window is placed on its dedicated position."] = "|cff33ffccChat: \"Position\"|r\n\nVoulez-vous que le logiciel vous paramètre la position de la fenêtre de discussion ?  Ceci permet d'optimiser et de placer correctement les fenêtres.",
@@ -516,7 +524,6 @@ pfUI_translation["frFR"] = {
   ["Name | Health Missing"] = "Nom | santé manquante",
   ["Name (Linebreak) -Health Missing"] = nil,
   ["Nameplate Border Size"] = "Taille de la bordure des barres de vie flottantes",
-  ["Nameplate Debuffs"] = nil,
   ["Nameplates"] = "Barres de vie flottantes",
   ["Nameplate Width"] = "Largeur des barres de vie flottantes",
   ["Name (Short)"] = "Nom (Court)",
@@ -584,7 +591,6 @@ pfUI_translation["frFR"] = {
   ["Pixel"] = "Pixel",
   ["Player"] = "Joueur",
   ["Player Buff Bar"] = "Barre des Améliorations du Joueur",
-  ["Player Buffs"] = nil,
   ["Player Castbar"] = "Barre d'incantation du Joueur",
   ["Player Debuff Bar"] = "Barre des Affaiblissements du Joueur",
   ["Player SP/Haste Display"] = nil,
@@ -651,7 +657,6 @@ pfUI_translation["frFR"] = {
   ["Resting"] = "Au Repos",
   ["Reveal Unexplored Areas"] = "Révèle les zones non explorées",
   ["Switch to current zone"] = "Aller à la zone actuelle",
-  ["Reverse Sweep On"] = nil,
   ["Right"] = "Droit",
   ["Right Actionbar"] = "Barre d'action droite",
   ["Right Anchor"] = nil,
@@ -733,7 +738,6 @@ pfUI_translation["frFR"] = {
   ["Show Loot Icon"] = "Afficher l'icône du butin",
   ["Show Macro Text"] = "Afficher le texte des macros",
   ["Show Meters By Default"] = "Afficher les compteurs par défaut",
-  ["Show Numbers On"] = nil,
   ["Show On Friendly Units"] = "Afficher sur les unités amicales",
   ["Show On Hostile Units"] = "Afficher sur les unités hostiles",
   ["Show Procs Indicators"] = "Afficher les indicateurs de Procs",
@@ -751,7 +755,6 @@ pfUI_translation["frFR"] = {
   ["Show Spell Icon"] = "Afficher l'icone des sorts",
   ["Show Spell Name"] = nil,
   ["Show Stacks"] = "Afficher les empilements",
-  ["Show Sweep On"] = nil,
   ["Show Tenths Below 5 Seconds"] = nil,
   ["Show Text"] = nil,
   ["Show Timer"] = nil,
@@ -819,7 +822,6 @@ pfUI_translation["frFR"] = {
   ["Tiny (PixelPerfect)"] = "Minuscule (PixelParfait)",
   ["Toggle as Tank"] = "Basculer en tant que tank",
   ["Tooltip"] = "Infobulle",
-  ["Tooltip Auras"] = nil,
   ["Tooltip Position"] = "Position de l'infobulle",
   ["Tooltip Text Font"] = nil,
   ["Tooltip Text Font Size"] = nil,
@@ -831,13 +833,11 @@ pfUI_translation["frFR"] = {
   ["Total Gold"] = "Or Total",
   ["Totem Direction"] = "Direction des totems",
   ["Totem Icons"] = "Icones des totems",
-  ["Totems"] = nil,
   ["Tracked Reputation"] = nil,
   ["Tracking Icon Size"] = "Taille de l'icône de suivi",
   ["Trigger Actions On Key Down"] = "Déclencher des actions sur la touche enfoncée",
   ["UI-Scale"] = "Echelle de l'interface",
   ["Unbuffed"] = "Sans Améliorations",
-  ["Unit Frame Auras"] = nil,
   ["Unit Frame Border Size"] = "Taille de la bordure des cadres d'unité",
   ["Unit Frame Layout"] = "Position des cadres d'unité",
   ["Unit Frames"] = "Cadres d'unités",

env/translations_koKR.lua

@@ -8,7 +8,6 @@ pfUI_translation["koKR"] = {
   ["Actionbar"] = "액션바",
   ["Action Bar"] = nil,
   ["Action Bar Border Size"] = "액션바 테두리 크기",
-  ["Action Bars"] = nil,
   ["Active Addons"] = "애드온 활성화",
   ["Add button to the frame"] = nil,
   ["Added button"] = nil,
@@ -77,11 +76,11 @@ pfUI_translation["koKR"] = {
   ["Bottom"] = "아래",
   ["Bottom Left"] = nil,
   ["Bottom Right"] = nil,
+  ["Buff And Debuff Timers"] = nil,
   ["Buffbar Height"] = nil,
   ["Buffbar Width"] = nil,
   ["Buff/Debuff Icons"] = nil,
   ["Buff/Debuff Indicators"] = nil,
-  ["Buff Indicators"] = nil,
   ["Buff Limit"] = "버프 한도",
   ["Buff Position"] = "버프 위치",
   ["Buffs"] = nil,
@@ -106,6 +105,15 @@ pfUI_translation["koKR"] = {
   ["Center Text"] = "가운데 텍스트",
   ["Center Text X Offset"] = nil,
   ["Center Text Y Offset"] = nil,
+  ["Cooldown Timers"] = nil,
+  ["Debuff Timers"] = nil,
+  ["Duration Timers"] = nil,
+  ["Indicator Timers"] = nil,
+  ["Numbers"] = nil,
+  ["Numbers And Sweep"] = nil,
+  ["Sweep"] = nil,
+  ["Timers"] = nil,
+  ["Unit Buff Timers"] = nil,
   ["|cff33ffccBlizzard: \"Interface Options\"|r\n\nDo you want me to set up the recommended Blizzard UI settings? This will enable settings that can be found in the Interface section of your client. Options like Buff Durations, Instant Quest Text, Auto Selfcast and others will be set."] = "|cff33ffcc블리자드: \"인터페이스 옵션\"|r\n\n내가 권장하는 블리자드 UI 설정을 설치하길 원하십니까? 이렇게하면 클라이언트의 인터페이스 섹션에서 찾을 수 있는 설정이 활성화됩니다. 버프 기간, 인스턴트 퀘스트 텍스트, 자동 셀프 캐스트 및 기타 옵션이 설정됩니다.",
   ["|cff33ffccChat: \"Channels\"|r\n\nDo you want me to setup the chat channels of your chatframes? This would set important or personal messages to the left chat and world channels and lootinformation to the right chat."] = "|cff33ffcc채팅: \"채널\"|r\n\n채팅 프레임의 채팅 채널을 설정하길 원하십니까? 그렇다면 왼쪽하단 채팅창에 중요하거나 개인적인 메시지가 표시됩니다. 그리고 오른쪽하단 채팅창에는 월드채널,룻팅정보가 표시됩니다.",
   ["|cff33ffccChat: \"Layout\"|r\n\nDo you want me to adjust the layout of your chatframes? This would make sure, that every window is placed on its dedicated position."] = "|cff33ffcc채팅: \"레이아웃\"|r\n\n채팅 프레임의 레이아웃을 조정하길 원하십니까? 이렇게하면 모든 창을 전용 위치에 배치 할 수 있습니다.",
@@ -516,7 +524,6 @@ pfUI_translation["koKR"] = {
   ["Name | Health Missing"] = nil,
   ["Name (Linebreak) -Health Missing"] = nil,
   ["Nameplate Border Size"] = nil,
-  ["Nameplate Debuffs"] = nil,
   ["Nameplates"] = "상바",
   ["Nameplate Width"] = "상바 넓이",
   ["Name (Short)"] = nil,
@@ -584,7 +591,6 @@ pfUI_translation["koKR"] = {
   ["Pixel"] = nil,
   ["Player"] = "플레이어",
   ["Player Buff Bar"] = nil,
-  ["Player Buffs"] = nil,
   ["Player Castbar"] = nil,
   ["Player Debuff Bar"] = nil,
   ["Player SP/Haste Display"] = nil,
@@ -651,7 +657,6 @@ pfUI_translation["koKR"] = {
   ["Resting"] = "휴식",
   ["Reveal Unexplored Areas"] = nil,
   ["Switch to current zone"] = nil,
-  ["Reverse Sweep On"] = nil,
   ["Right"] = "오른쪽",
   ["Right Actionbar"] = nil,
   ["Right Anchor"] = nil,
@@ -733,7 +738,6 @@ pfUI_translation["koKR"] = {
   ["Show Loot Icon"] = nil,
   ["Show Macro Text"] = "매크로 텍스트 표시",
   ["Show Meters By Default"] = nil,
-  ["Show Numbers On"] = nil,
   ["Show On Friendly Units"] = nil,
   ["Show On Hostile Units"] = nil,
   ["Show Procs Indicators"] = nil,
@@ -751,7 +755,6 @@ pfUI_translation["koKR"] = {
   ["Show Spell Icon"] = nil,
   ["Show Spell Name"] = nil,
   ["Show Stacks"] = nil,
-  ["Show Sweep On"] = nil,
   ["Show Tenths Below 5 Seconds"] = nil,
   ["Show Text"] = nil,
   ["Show Timer"] = nil,
@@ -819,7 +822,6 @@ pfUI_translation["koKR"] = {
   ["Tiny (PixelPerfect)"] = nil,
   ["Toggle as Tank"] = nil,
   ["Tooltip"] = "툴팁",
-  ["Tooltip Auras"] = nil,
   ["Tooltip Position"] = "툴팁위치",
   ["Tooltip Text Font"] = nil,
   ["Tooltip Text Font Size"] = nil,
@@ -831,13 +833,11 @@ pfUI_translation["koKR"] = {
   ["Total Gold"] = "총 금",
   ["Totem Direction"] = nil,
   ["Totem Icons"] = nil,
-  ["Totems"] = nil,
   ["Tracked Reputation"] = nil,
   ["Tracking Icon Size"] = nil,
   ["Trigger Actions On Key Down"] = nil,
   ["UI-Scale"] = "UI-크기",
   ["Unbuffed"] = nil,
-  ["Unit Frame Auras"] = nil,
   ["Unit Frame Border Size"] = "유닛프레임 테두리 크기",
   ["Unit Frame Layout"] = "유닛프레임 레이아웃",
   ["Unit Frames"] = "유닛프레임",

env/translations_ruRU.lua

@@ -8,7 +8,6 @@ pfUI_translation["ruRU"] = {
   ["Actionbar"] = "Панель действий",
   ["Action Bar"] = "Панель действий",
   ["Action Bar Border Size"] = "Размер границы панели действий",
-  ["Action Bars"] = nil,
   ["Active Addons"] = "Активные аддоны",
   ["Add button to the frame"] = "Добавить кнопку в окно",
   ["Added button"] = "Добавлена кнопка",
@@ -77,11 +76,11 @@ pfUI_translation["ruRU"] = {
   ["Bottom"] = "Снизу",
   ["Bottom Left"] = "Снизу слева",
   ["Bottom Right"] = "Снизу справа",
+  ["Buff And Debuff Timers"] = nil,
   ["Buffbar Height"] = "Высота панели баффов",
   ["Buffbar Width"] = "Ширина панели баффов",
   ["Buff/Debuff Icons"] = "Иконки баффов/дебаффов",
   ["Buff/Debuff Indicators"] = "Индикаторы баффов/дебаффов",
-  ["Buff Indicators"] = nil,
   ["Buff Limit"] = "Предел баффов",
   ["Buff Position"] = "Расположение баффов",
   ["Buffs"] = "Баффы",
@@ -106,6 +105,15 @@ pfUI_translation["ruRU"] = {
   ["Center Text"] = "Текст по центру",
   ["Center Text X Offset"] = nil,
   ["Center Text Y Offset"] = nil,
+  ["Cooldown Timers"] = nil,
+  ["Debuff Timers"] = nil,
+  ["Duration Timers"] = nil,
+  ["Indicator Timers"] = nil,
+  ["Numbers"] = nil,
+  ["Numbers And Sweep"] = nil,
+  ["Sweep"] = nil,
+  ["Timers"] = nil,
+  ["Unit Buff Timers"] = nil,
   ["|cff33ffccBlizzard: \"Interface Options\"|r\n\nDo you want me to set up the recommended Blizzard UI settings? This will enable settings that can be found in the Interface section of your client. Options like Buff Durations, Instant Quest Text, Auto Selfcast and others will be set."] = "|cff33ffccBlizzard: \"Настройки интерфейса\"|r\n\nВы хотите, чтобы я установил рекомендуемые настройки пользовательского интерфейса Blizzard? Это позволит настроить параметры, которые можно найти в разделе \"Интерфейс\" вашего клиента. Будут установлены такие параметры, как Срок действия эффектов, Мгновенное отображение текста, Автовыбор себя и другие.",
   ["|cff33ffccChat: \"Channels\"|r\n\nDo you want me to setup the chat channels of your chatframes? This would set important or personal messages to the left chat and world channels and lootinformation to the right chat."] = "|cff33ffccЧат: \"Каналы\"|r\n\nВы хотите, чтобы я настраивал каналы для вашего чата? Это установило бы важные или личные сообщения в левый чат, а мировые каналы и информацию о добыче в правый чат.",
   ["|cff33ffccChat: \"Layout\"|r\n\nDo you want me to adjust the layout of your chatframes? This would make sure, that every window is placed on its dedicated position."] = "|cff33ffccЧат: \"Макет\"|r\n\nВы хотите, чтобы я скорректировал макет вашего чата? Это обеспечило бы уверенность, что каждое окно будет помещено в его выделенное положение.",
@@ -516,7 +524,6 @@ pfUI_translation["ruRU"] = {
   ["Name | Health Missing"] = "Имя | Отсутствующее здоровье",
   ["Name (Linebreak) -Health Missing"] = "Имя (разрыв линии) -Отсутствует здоровье",
   ["Nameplate Border Size"] = "Размер границы индикатора здоровья",
-  ["Nameplate Debuffs"] = nil,
   ["Nameplates"] = "Индикаторы здоровья",
   ["Nameplate Width"] = "Ширина индикатора здоровья",
   ["Name (Short)"] = "Короткое имя",
@@ -584,7 +591,6 @@ pfUI_translation["ruRU"] = {
   ["Pixel"] = "пиксель",
   ["Player"] = "Игрок",
   ["Player Buff Bar"] = "Панель баффов игрока",
-  ["Player Buffs"] = nil,
   ["Player Castbar"] = "Панель применения игрока",
   ["Player Debuff Bar"] = "Панель дебаффов игрока",
   ["Player SP/Haste Display"] = nil,
@@ -651,7 +657,6 @@ pfUI_translation["ruRU"] = {
   ["Resting"] = "Отдыхающий",
   ["Reveal Unexplored Areas"] = "Показывать неисследованные области",
   ["Switch to current zone"] = "Перейти к текущей зоне",
-  ["Reverse Sweep On"] = nil,
   ["Right"] = "Справа",
   ["Right Actionbar"] = "Правая",
   ["Right Anchor"] = nil,
@@ -733,7 +738,6 @@ pfUI_translation["ruRU"] = {
   ["Show Loot Icon"] = "Показать иконку добычи",
   ["Show Macro Text"] = "Показать текст макросов",
   ["Show Meters By Default"] = "Показать счетчики по умолчанию",
-  ["Show Numbers On"] = nil,
   ["Show On Friendly Units"] = "Показать на дружественных юнитах",
   ["Show On Hostile Units"] = "Показать на вражеских юнитах",
   ["Show Procs Indicators"] = "Показать проки (Procs)",
@@ -751,7 +755,6 @@ pfUI_translation["ruRU"] = {
   ["Show Spell Icon"] = "Показать иконку заклинания",
   ["Show Spell Name"] = "Показать название заклинания",
   ["Show Stacks"] = "Показать стаки",
-  ["Show Sweep On"] = nil,
   ["Show Tenths Below 5 Seconds"] = nil,
   ["Show Text"] = nil,
   ["Show Timer"] = "Показать таймер",
@@ -819,7 +822,6 @@ pfUI_translation["ruRU"] = {
   ["Tiny (PixelPerfect)"] = "Крошечный (идеальный пиксель)",
   ["Toggle as Tank"] = "Переключить как танк",
   ["Tooltip"] = "Подсказка",
-  ["Tooltip Auras"] = nil,
   ["Tooltip Position"] = "Расположение подсказки",
   ["Tooltip Text Font"] = nil,
   ["Tooltip Text Font Size"] = nil,
@@ -831,13 +833,11 @@ pfUI_translation["ruRU"] = {
   ["Total Gold"] = "Всего золота",
   ["Totem Direction"] = "Направление тотемов",
   ["Totem Icons"] = "Иконки тотемов",
-  ["Totems"] = nil,
   ["Tracked Reputation"] = "Отслеживаемая репутация",
   ["Tracking Icon Size"] = "Размер иконки отслеживания",
   ["Trigger Actions On Key Down"] = "Активация действий при нажатии клавиши (а не ее отпускании)",
   ["UI-Scale"] = "Масштаб пользовательского интерфейса",
   ["Unbuffed"] = "Без баффа",
-  ["Unit Frame Auras"] = nil,
   ["Unit Frame Border Size"] = "Размер границы окна юнита",
   ["Unit Frame Layout"] = "Макет окна юнита",
   ["Unit Frames"] = "Окна юнита",

env/translations_zhCN.lua

@@ -8,7 +8,6 @@ pfUI_translation["zhCN"] = {
   ["Actionbar"] = "动作条",
   ["Action Bar"] = "动作条",
   ["Action Bar Border Size"] = "动作条边框大小",
-  ["Action Bars"] = nil,
   ["Active Addons"] = "激活的插件",
   ["Add button to the frame"] = "添加按钮到框架",
   ["Added button"] = "已添加按钮",
@@ -77,11 +76,11 @@ pfUI_translation["zhCN"] = {
   ["Bottom"] = "底部",
   ["Bottom Left"] = "左下方",
   ["Bottom Right"] = "右下方",
+  ["Buff And Debuff Timers"] = nil,
   ["Buffbar Height"] = "Buff条高度",
   ["Buffbar Width"] = "Buff条宽度",
   ["Buff/Debuff Icons"] = "Buff/Debuff图标",
   ["Buff/Debuff Indicators"] = "Buff/Debuff指示器",
-  ["Buff Indicators"] = nil,
   ["Buff Limit"] = "Buff总数量",
   ["Buff Position"] = "Buff显示的位置",
   ["Buffs"] = "Buff（增益）",
@@ -106,6 +105,15 @@ pfUI_translation["zhCN"] = {
   ["Center Text"] = "中间文字",
   ["Center Text X Offset"] = "中心文本水平偏移量",
   ["Center Text Y Offset"] = "中心文本垂直偏移量",
+  ["Cooldown Timers"] = nil,
+  ["Debuff Timers"] = nil,
+  ["Duration Timers"] = nil,
+  ["Indicator Timers"] = nil,
+  ["Numbers"] = nil,
+  ["Numbers And Sweep"] = nil,
+  ["Sweep"] = nil,
+  ["Timers"] = nil,
+  ["Unit Buff Timers"] = nil,
   ["|cff33ffccBlizzard: \"Interface Options\"|r\n\nDo you want me to set up the recommended Blizzard UI settings? This will enable settings that can be found in the Interface section of your client. Options like Buff Durations, Instant Quest Text, Auto Selfcast and others will be set."] = "|cff33ffcc暴雪: \"界面选项\"|r\n\n你要我安装暴雪UI设置建议？ 启用此设置可以在客户端的接口部分找到。 像buff持续时间选项，即时任务文本，自动施法和其他功能将被设置。",
   ["|cff33ffccChat: \"Channels\"|r\n\nDo you want me to setup the chat channels of your chatframes? This would set important or personal messages to the left chat and world channels and lootinformation to the right chat."] = "|cff33ffcc聊天框架: \"聊天频道\"|r\n\n你想建立聊天框架中新的聊天频道？ 这将设置重要或个人信息到左侧聊天。 和世界频道和信息到正确的聊天窗口。",
   ["|cff33ffccChat: \"Layout\"|r\n\nDo you want me to adjust the layout of your chatframes? This would make sure, that every window is placed on its dedicated position."] = "|cff33ffcc聊天框架: \"聊天窗口布局\"|r\n\n你要我调整聊天框架的布局吗？ 这将确保每个窗口都放在其专用位置上。",
@@ -516,7 +524,6 @@ pfUI_translation["zhCN"] = {
   ["Name | Health Missing"] = "名字 | 失去的生命值",
   ["Name (Linebreak) -Health Missing"] = "名字 (换行符) -失去的生命值",
   ["Nameplate Border Size"] = "姓名板边框尺寸",
-  ["Nameplate Debuffs"] = nil,
   ["Nameplates"] = "姓名板",
   ["Nameplate Width"] = "姓名板宽度",
   ["Name (Short)"] = "名字 (短)",
@@ -584,7 +591,6 @@ pfUI_translation["zhCN"] = {
   ["Pixel"] = "像素",
   ["Player"] = "玩家",
   ["Player Buff Bar"] = "玩家Buffs条",
-  ["Player Buffs"] = nil,
   ["Player Castbar"] = "玩家施法条",
   ["Player Debuff Bar"] = "玩家Debuffs条",
   ["Player SP/Haste Display"] = nil,
@@ -651,7 +657,6 @@ pfUI_translation["zhCN"] = {
   ["Resting"] = "休息中",
   ["Reveal Unexplored Areas"] = "展示未勘探的地区",
   ["Switch to current zone"] = nil,
-  ["Reverse Sweep On"] = nil,
   ["Right"] = "右边",
   ["Right Actionbar"] = "右侧动作条",
   ["Right Anchor"] = "右锚点",
@@ -734,7 +739,6 @@ pfUI_translation["zhCN"] = {
   ["Show Loot Icon"] = "显示拾取权图标",
   ["Show Macro Text"] = "显示宏的名字",
   ["Show Meters By Default"] = "由默认显示其他接口表",
-  ["Show Numbers On"] = nil,
   ["Show On Friendly Units"] = "显示友好单位姓名板",
   ["Show On Hostile Units"] = "显示敌对单位姓名板",
   ["Show Procs Indicators"] = "显示触发效果计时器",
@@ -752,7 +756,6 @@ pfUI_translation["zhCN"] = {
   ["Show Spell Icon"] = "显示技能图标",
   ["Show Spell Name"] = "显示技能名称",
   ["Show Stacks"] = "显示堆叠",
-  ["Show Sweep On"] = nil,
   ["Show Tenths Below 5 Seconds"] = nil,
   ["Show Text"] = "显示文本",
   ["Show Timer"] = "显示计时器",
@@ -820,7 +823,6 @@ pfUI_translation["zhCN"] = {
   ["Tiny (PixelPerfect)"] = "极小(像素完美)",
   ["Toggle as Tank"] = "切换成为坦克",
   ["Tooltip"] = "信息提示框",
-  ["Tooltip Auras"] = nil,
   ["Tooltip Position"] = "信息提示框位置",
   ["Tooltip Text Font"] = "鼠标提示框字体",
   ["Tooltip Text Font Size"] ="鼠标提示框字体大小",
@@ -832,13 +834,11 @@ pfUI_translation["zhCN"] = {
   ["Total Gold"] = "总黄金",
   ["Totem Direction"] = "图腾方向",
   ["Totem Icons"] = "图腾图标",
-  ["Totems"] = nil,
   ["Tracked Reputation"] = "被追踪的声望",
   ["Tracking Icon Size"] = "追踪图标大小",
   ["Trigger Actions On Key Down"] = "按下即施法",
   ["UI-Scale"] = "UI缩放比例",
   ["Unbuffed"] = "该Buff缺失者",
-  ["Unit Frame Auras"] = nil,
   ["Unit Frame Border Size"] = "头像边框大小",
   ["Unit Frame Layout"] = "头像框架样式",
   ["Unit Frames"] = "头像框架",

env/translations_zhTW.lua

@@ -8,7 +8,6 @@ pfUI_translation["zhTW"] = {
   ["Actionbar"] = "動作條",
   ["Action Bar"] = nil,
   ["Action Bar Border Size"] = "動作條邊框大小",
-  ["Action Bars"] = nil,
   ["Active Addons"] = "啟動的外掛程式",
   ["Add button to the frame"] = nil,
   ["Added button"] = nil,
@@ -77,11 +76,11 @@ pfUI_translation["zhTW"] = {
   ["Bottom"] = "底部",
   ["Bottom Left"] = "左下方",
   ["Bottom Right"] = "右下方",
+  ["Buff And Debuff Timers"] = nil,
   ["Buffbar Height"] = "Buff高度",
   ["Buffbar Width"] = "Buff寬度",
   ["Buff/Debuff Icons"] = nil,
   ["Buff/Debuff Indicators"] = nil,
-  ["Buff Indicators"] = nil,
   ["Buff Limit"] = "Buff總數量",
   ["Buff Position"] = "Buff顯示的位置",
   ["Buffs"] = "Buff（增益）",
@@ -106,6 +105,15 @@ pfUI_translation["zhTW"] = {
   ["Center Text"] = "中間文字",
   ["Center Text X Offset"] = nil,
   ["Center Text Y Offset"] = nil,
+  ["Cooldown Timers"] = nil,
+  ["Debuff Timers"] = nil,
+  ["Duration Timers"] = nil,
+  ["Indicator Timers"] = nil,
+  ["Numbers"] = nil,
+  ["Numbers And Sweep"] = nil,
+  ["Sweep"] = nil,
+  ["Timers"] = nil,
+  ["Unit Buff Timers"] = nil,
   ["|cff33ffccBlizzard: \"Interface Options\"|r\n\nDo you want me to set up the recommended Blizzard UI settings? This will enable settings that can be found in the Interface section of your client. Options like Buff Durations, Instant Quest Text, Auto Selfcast and others will be set."] = "|cff33ffcc暴雪: \"介面選項\"|r\n\n你要我安裝暴雪UI設置建議？ 啟用此設置可以在用戶端的介面部分找到。 像buff持續時間選項，即時任務文本，自動施法和其他功能將被設置。",
   ["|cff33ffccChat: \"Channels\"|r\n\nDo you want me to setup the chat channels of your chatframes? This would set important or personal messages to the left chat and world channels and lootinformation to the right chat."] = "|cff33ffcc聊天框架: \"聊天頻道\"|r\n\n你想建立聊天框架中新的聊天頻道？ 這將設置重要或個人資訊到左側聊天。 和世界頻道和資訊到正確的聊天視窗。",
   ["|cff33ffccChat: \"Layout\"|r\n\nDo you want me to adjust the layout of your chatframes? This would make sure, that every window is placed on its dedicated position."] = "|cff33ffcc聊天框架: \"聊天視窗佈局\"|r\n\n你要我調整聊天框架的佈局嗎？ 這將確保每個視窗都放在其專用位置上。",
@@ -516,7 +524,6 @@ pfUI_translation["zhTW"] = {
   ["Name | Health Missing"] = nil,
   ["Name (Linebreak) -Health Missing"] = nil,
   ["Nameplate Border Size"] = nil,
-  ["Nameplate Debuffs"] = nil,
   ["Nameplates"] = "姓名板",
   ["Nameplate Width"] = "姓名板高度",
   ["Name (Short)"] = "名字 (短)",
@@ -584,7 +591,6 @@ pfUI_translation["zhTW"] = {
   ["Pixel"] = nil,
   ["Player"] = "玩家",
   ["Player Buff Bar"] = nil,
-  ["Player Buffs"] = nil,
   ["Player Castbar"] = nil,
   ["Player Debuff Bar"] = nil,
   ["Player SP/Haste Display"] = nil,
@@ -651,7 +657,6 @@ pfUI_translation["zhTW"] = {
   ["Resting"] = "休息中",
   ["Reveal Unexplored Areas"] = "展示未勘探的地區",
   ["Switch to current zone"] = nil,
-  ["Reverse Sweep On"] = nil,
   ["Right"] = "右邊",
   ["Right Actionbar"] = nil,
   ["Right Anchor"] = nil,
@@ -733,7 +738,6 @@ pfUI_translation["zhTW"] = {
   ["Show Loot Icon"] = nil,
   ["Show Macro Text"] = "顯示巨集的名字",
   ["Show Meters By Default"] = "由默認顯示其他介面表",
-  ["Show Numbers On"] = nil,
   ["Show On Friendly Units"] = nil,
   ["Show On Hostile Units"] = nil,
   ["Show Procs Indicators"] = nil,
@@ -751,7 +755,6 @@ pfUI_translation["zhTW"] = {
   ["Show Spell Icon"] = nil,
   ["Show Spell Name"] = nil,
   ["Show Stacks"] = nil,
-  ["Show Sweep On"] = nil,
   ["Show Tenths Below 5 Seconds"] = nil,
   ["Show Text"] = nil,
   ["Show Timer"] = nil,
@@ -819,7 +822,6 @@ pfUI_translation["zhTW"] = {
   ["Tiny (PixelPerfect)"] = "極小(像素完美)",
   ["Toggle as Tank"] = "切換成為坦克",
   ["Tooltip"] = "滑鼠提示框",
-  ["Tooltip Auras"] = nil,
   ["Tooltip Position"] = "滑鼠提示框位置",
   ["Tooltip Text Font"] = nil,
   ["Tooltip Text Font Size"] = nil,
@@ -831,13 +833,11 @@ pfUI_translation["zhTW"] = {
   ["Total Gold"] = "總金量",
   ["Totem Direction"] = nil,
   ["Totem Icons"] = nil,
-  ["Totems"] = nil,
   ["Tracked Reputation"] = nil,
   ["Tracking Icon Size"] = "追蹤圖示大小",
   ["Trigger Actions On Key Down"] = nil,
   ["UI-Scale"] = "UI縮放比例",
   ["Unbuffed"] = "該Buff缺失者",
-  ["Unit Frame Auras"] = nil,
   ["Unit Frame Border Size"] = "頭像邊框大小",
   ["Unit Frame Layout"] = "頭像框架樣式",
   ["Unit Frames"] = "頭像框架",

modules/actionbar.lua

@@ -1007,7 +1007,7 @@ pfUI:RegisterModule("actionbar", function ()
       f.slot = id
 
       -- cooldown
-      f.cd = CreateCooldown(f, "actionbar", f:GetName() .. "Cooldown")
+      f.cd = CreateCooldown(f, "spell", C.bars, "timers", f:GetName() .. "Cooldown")
 
       -- icon
       f.icon = f:CreateTexture(button_name .. "Icon", "BACKGROUND")

modules/bags.lua

@@ -415,7 +415,7 @@ pfUI:RegisterModule("bags", function ()
       -- reaches it after that
       local slotframe = pfUI.bags[bag].slots[slot].frame
       local cdname = slotframe:GetName() .. "Cooldown"
-      slotframe.cd = CreateCooldown(slotframe, "bags", cdname)
+      slotframe.cd = CreateCooldown(slotframe, "spell", C.appearance.bags, "timers", cdname)
       _G[cdname] = slotframe.cd
 
       if not pfUI.bags[bag].slots[slot].frame.backdrop then

modules/buff.lua

@@ -152,7 +152,7 @@ pfUI:RegisterModule("buff", function ()
 
     -- the sweep and the duration numbers (the template covers the button and
     -- starts hidden); RefreshBuffButton starts its timer
-    buff.cd = CreateCooldown(buff, "buff", buttonName .. "Cooldown")
+    buff.cd = CreateCooldown(buff, "aura", C.buffs, "timers", buttonName .. "Cooldown")
     buff.cd:SetFrameLevel(buff:GetFrameLevel() + 1)
     buff.overlay:SetFrameLevel(buff:GetFrameLevel() + 2)
 

modules/equipmentmanager.lua

@@ -768,11 +768,13 @@ pfUI:RegisterModule("equipmentmanager", function()
   -- Popout arrows follow the EM sidecar by default. With the
   -- "Always Show Equipment Slot Flyouts" option they follow the paperdoll
   -- instead, so gear can be swapped without opening the equipment manager.
+  -- IsVisible, not IsShown: closing CharacterFrame fires OnHide on both
+  -- without clearing their own shown flags.
   local function PopoutsActive()
     if C.character.inventory.equipflyout == "1" then
-      return PaperDollFrame:IsShown()
+      return PaperDollFrame:IsVisible()
     end
-    return frame:IsShown()
+    return frame:IsVisible()
   end
 
   function UpdatePopouts()

modules/focus.lua

@@ -17,9 +17,10 @@ pfUI:RegisterModule("focus", function ()
   -- PLAYER_FOCUS_CHANGED drives immediate refresh on focus assign / clear.
   -- Between events, ClassicAPI fires UNIT_* (health/mana/aura/...) with
   -- arg1 == "focus", so the bars update event-driven like target.
-  -- focustarget is a chained unit like targettarget: UNIT_TARGET follows the
+  -- focustarget is a chained unit like targettarget, but ClassicAPI fires its
-  -- focus retargeting, and a new focus only needs its visibility re-checked,
+  -- UNIT_* as "focustarget", and UNIT_TARGET on "focus" follows the focus
-  -- which queues the full refresh when its target is a different unit.
+  -- retargeting. A new focus only needs its visibility re-checked, which
+  -- queues the full refresh when its target is a different unit.
   pfUI.events:RegisterFrameEventAndCallback("PLAYER_FOCUS_CHANGED", function()
     pfUI.uf:RefreshUnit(pfUI.uf.focus, "all")
     pfUI.uf.focustarget:UpdateVisibility()

modules/gui.lua

@@ -981,6 +981,12 @@ pfUI:RegisterModule("gui", function ()
         "BOTTOMRIGHT:" .. T["Bottom Right"],
         "off:" .. T["Disabled"]
       },
+      ["cooldown_timers"] = {
+        "off:" .. T["None"],
+        "text:" .. T["Numbers"],
+        "sweep:" .. T["Sweep"],
+        "both:" .. T["Numbers And Sweep"]
+      },
       ["uf_debuff_indicator"] = {
         "0:" .. T["Disabled"],
         "1:" .. T["Legacy"],
@@ -1597,23 +1603,6 @@ pfUI:RegisterModule("gui", function ()
     end)
 
     CreateGUIEntry(T["Settings"], T["Cooldown"], function()
-      -- every kind of cooldown CreateCooldown makes, as C.cooldown groups.
-      -- Other addons' cooldowns only lose numbers or sweep (see
-      -- api/cooldown.lua), so giving them back takes a reload
-      local kinds = {
-        { "actionbar", T["Action Bars"] },
-        { "bags", T["Bags"] },
-        { "blizzard", T["Spellbook And Character"] },
-        { "unitframe", T["Unit Frame Auras"] },
-        { "indicator", T["Buff Indicators"] },
-        { "nameplate", T["Nameplate Debuffs"] },
-        { "buff", T["Player Buffs"] },
-        { "tooltip", T["Tooltip Auras"] },
-        { "totem", T["Totems"] },
-        { "lossofcontrol", T["Loss Of Control"] },
-        { "foreign", T["Other Addons"] },
-      }
-
       CreateConfig(nil, COUNTDOWN_FOR_COOLDOWNS_TEXT, "CVAR", "countdownForCooldowns", "checkbox")
       CreateConfig(UpdateCooldowns, T["Font"], C.cooldown, "font", "dropdown", pfUI.gui.dropdowns.fonts)
       CreateConfig(nil, T["Font Size"], C.cooldown, "font_size")
@@ -1626,22 +1615,14 @@ pfUI:RegisterModule("gui", function ()
       CreateConfig(UpdateCooldowns, T["Cooldown Color (Hours)"], C.cooldown, "hourcolor", "color")
       CreateConfig(UpdateCooldowns, T["Cooldown Color (Days)"], C.cooldown, "daycolor", "color")
 
-      CreateConfig(nil, T["Show Numbers On"], nil, nil, "header")
+      -- the timers of cooldowns no other page covers. Other addons' cooldowns
-      for _, kind in ipairs(kinds) do
+      -- only lose numbers or sweep (see api/cooldown.lua), so giving them
-        CreateConfig(kind[1] ~= "foreign" and UpdateCooldowns or nil, kind[2], C.cooldown[kind[1]], "text", "checkbox")
+      -- back takes a reload
-      end
+      local timers = pfUI.gui.dropdowns.cooldown_timers
-
+      CreateConfig(nil, T["Timers"], nil, nil, "header")
-      CreateConfig(nil, T["Show Sweep On"], nil, nil, "header")
+      CreateConfig(UpdateCooldowns, T["Spellbook And Character"], C.cooldown, "blizzard_timers", "dropdown", timers)
-      for _, kind in ipairs(kinds) do
+      CreateConfig(UpdateCooldowns, T["Loss Of Control"], C.cooldown, "lossofcontrol_timers", "dropdown", timers)
-        CreateConfig(kind[1] ~= "foreign" and UpdateCooldowns or nil, kind[2], C.cooldown[kind[1]], "animation", "checkbox")
+      CreateConfig(nil, T["Other Addons"], C.cooldown, "foreign_timers", "dropdown", timers)
-      end
-
-      CreateConfig(nil, T["Reverse Sweep On"], nil, nil, "header")
-      for _, kind in ipairs(kinds) do
-        if kind[1] ~= "foreign" then
-          CreateConfig(UpdateCooldowns, kind[2], C.cooldown[kind[1]], "reverse", "checkbox")
-        end
-      end
     end)
 
     CreateGUIEntry(T["Settings"], T["Screenshot"], function()
@@ -2206,6 +2187,7 @@ pfUI:RegisterModule("gui", function ()
         CreateConfig(U[c], T["Automatic Class Text Color"], C.unitframes[c], "classcolor", "checkbox")
 
         CreateConfig(U[c], T["Buffs"], nil, nil, "header")
+        CreateConfig(UpdateCooldowns, T["Buff And Debuff Timers"], C.unitframes[c], "aura_timers", "dropdown", pfUI.gui.dropdowns.cooldown_timers)
         CreateConfig(U[c], T["Buff Position"], C.unitframes[c], "buffs", "dropdown", pfUI.gui.dropdowns.uf_buff_position)
         CreateConfig(U[c], T["Buff Size"], C.unitframes[c], "buffsize")
         CreateConfig(U[c], T["Buff Limit"], C.unitframes[c], "bufflimit")
@@ -2239,6 +2221,7 @@ pfUI:RegisterModule("gui", function ()
         CreateConfig(U[c], T["Buff/Debuff Indicators"], nil, nil, "header")
         CreateConfig(U[c], T["Enable Indicators"], C.unitframes[c], "buff_indicator", "checkbox")
         CreateConfig(U[c], T["Show Stacks"], C.unitframes[c], "indicator_stacks", "checkbox")
+        CreateConfig(UpdateCooldowns, T["Indicator Timers"], C.unitframes[c], "indicator_timers", "dropdown", pfUI.gui.dropdowns.cooldown_timers)
         CreateConfig(U[c], T["Indicator Size"], C.unitframes[c], "indicator_size")
         CreateConfig(U[c], T["Indicator Spacing"], C.unitframes[c], "indicator_spacing", "dropdown", pfUI.gui.dropdowns.spacing)
         CreateConfig(U[c], T["Indicator Position"], C.unitframes[c], "indicator_pos", "dropdown", pfUI.gui.dropdowns.positions)
@@ -2325,6 +2308,7 @@ pfUI:RegisterModule("gui", function ()
       CreateConfig(nil, T["Bagslots Per Row"], C.appearance.bags, "bagrowlength")
       CreateConfig(nil, T["Bankslots Per Row"], C.appearance.bags, "bankrowlength")
       CreateConfig(nil, T["Item Slot Size"], C.appearance.bags, "icon_size")
+      CreateConfig(UpdateCooldowns, T["Cooldown Timers"], C.appearance.bags, "timers", "dropdown", pfUI.gui.dropdowns.cooldown_timers)
       CreateConfig(nil, T["Auto Sell Grey Items"], C.global, "autosell", "checkbox")
       CreateConfig(nil, T["Auto Repair Items"], C.global, "autorepair", "checkbox")
       CreateConfig(nil, T["Auto Sort When Opening Bags"], C.appearance.bags, "autoSortOnOpen", "checkbox")
@@ -2373,6 +2357,7 @@ pfUI:RegisterModule("gui", function ()
       CreateConfig(U["buff"], T["Number Of Weapon Buffs Per Row"], C.buffs, "wepbuffrowsize")
       CreateConfig(U["buff"], T["Number Of Buffs Per Row"], C.buffs, "buffrowsize")
       CreateConfig(U["buff"], T["Number Of Debuffs Per Row"], C.buffs, "debuffrowsize")
+      CreateConfig(UpdateCooldowns, T["Duration Timers"], C.buffs, "timers", "dropdown", pfUI.gui.dropdowns.cooldown_timers)
       CreateConfig(U["buff"], T["Show Duration Inside Buff"], C.buffs, "textinside", "checkbox")
       CreateConfig(U["buff"], T["Stack Count Font Size"], C.buffs, "fontsize")
     end)
@@ -2382,6 +2367,7 @@ pfUI:RegisterModule("gui", function ()
       CreateConfig(U["totems"], T["Icon Size"], C.totems, "iconsize")
       CreateConfig(U["totems"], T["Spacing"], C.totems, "spacing", "dropdown", pfUI.gui.dropdowns.spacing)
       CreateConfig(U["totems"], T["Show Background"], C.totems, "showbg", "checkbox")
+      CreateConfig(UpdateCooldowns, T["Duration Timers"], C.totems, "timers", "dropdown", pfUI.gui.dropdowns.cooldown_timers)
     end)
 
     CreateGUIEntry(T["Buffs"], T["Player Buff Bar"], function()
@@ -2448,6 +2434,7 @@ pfUI:RegisterModule("gui", function ()
       CreateConfig(U["bars"], T["Self Cast: Right Click"], C.bars, "rightself", "checkbox")
       CreateConfig(U["bars"], T["Button Animation"], C.bars, "animation", "dropdown", pfUI.gui.dropdowns.actionbuttonanimations)
       CreateConfig(U["bars"], T["Button Animation Trigger"], C.bars, "animmode", "dropdown", pfUI.gui.dropdowns.animationmode)
+      CreateConfig(UpdateCooldowns, T["Cooldown Timers"], C.bars, "timers", "dropdown", pfUI.gui.dropdowns.cooldown_timers)
       CreateConfig(U["bars"], T["Show Animation On Hidden Bars"], C.bars, "animalways", "checkbox")
       CreateConfig(U["bars"], T["Show Reagent Count"], C.bars, "reagents", "checkbox")
       CreateConfig(U["bars"], T["Highlight Equipped Items"], C.bars, "showequipped", "checkbox")
@@ -2677,6 +2664,7 @@ pfUI:RegisterModule("gui", function ()
       CreateConfig(nil, T["Always Show Health In Percent"], C.tooltip, "alwaysperc", "checkbox")
       CreateConfig(nil, T["Show Movement Speed"], C.tooltip, "movespeed", "checkbox")
       CreateConfig(nil, T["Show Unit Buffs"], C.tooltip, "showbuffs", "checkbox")
+      CreateConfig(UpdateCooldowns, T["Unit Buff Timers"], C.tooltip, "aura_timers", "dropdown", pfUI.gui.dropdowns.cooldown_timers)
       CreateConfig(nil, T["Show Unit IDs"], C.tooltip, "unitid", "checkbox")
     end)
 
@@ -2840,6 +2828,7 @@ pfUI:RegisterModule("gui", function ()
       CreateConfig(U["nameplates"], T["Debuff Icon Offset"], C.nameplates, "debuffoffset")
       CreateConfig(U["nameplates"], T["Debuff Icon Size"], C.nameplates, "debuffsize")
       CreateConfig(U["nameplates"], T["Show Debuff Stacks"], C.nameplates.debuffs, "showstacks", "checkbox")
+      CreateConfig(UpdateCooldowns, T["Debuff Timers"], C.nameplates, "debuff_timers", "dropdown", pfUI.gui.dropdowns.cooldown_timers)
 
       CreateConfig(U["nameplates"], T["Filter Mode"], C.nameplates.debuffs, "filter", "dropdown", pfUI.gui.dropdowns.buffbarfilter)
       CreateConfig(U["nameplates"], T["Blacklist"], C.nameplates.debuffs, "blacklist", "list")

modules/lossofcontrol.lua

@@ -34,7 +34,7 @@ pfUI:RegisterModule("lossofcontrol", function ()
   frame.icon.tex = frame.icon:CreateTexture(nil, "ARTWORK")
   HandleIcon(frame.icon, frame.icon.tex)
 
-  frame.cd = CreateCooldown(frame.icon, "lossofcontrol")
+  frame.cd = CreateCooldown(frame.icon, "timer", C.cooldown, "lossofcontrol_timers")
   frame.cd:SetAllPoints(frame.icon.tex)
 
   frame.label = frame:CreateFontString(nil, "OVERLAY")

modules/nameplates.lua

@@ -671,7 +671,8 @@ pfUI:RegisterModule("nameplates", function ()
   local function CreateDebuffIcon(plate, index)
     local icon = CreateFrame("Frame", plate.platename.."Debuff"..index, plate)
     icon:Hide()
-    icon:SetFrameLevel(4)
+    -- relative: a raised target plate can grow icons too
+    icon:SetFrameLevel(plate.health:GetFrameLevel())
 
     icon.icon = icon:CreateTexture(nil, "BACKGROUND")
     icon.icon:SetColorTexture(.3,1,.8,1)
@@ -683,8 +684,8 @@ pfUI:RegisterModule("nameplates", function ()
     icon.stacks:SetJustifyV("BOTTOM")
     icon.stacks:SetTextColor(1,1,0)
 
-    icon.cd = CreateCooldown(icon, "nameplate", plate.platename.."Debuff"..index.."Cooldown")
+    icon.cd = CreateCooldown(icon, "aura", C.nameplates, "debuff_timers", plate.platename.."Debuff"..index.."Cooldown")
-    icon.cd:SetFrameLevel(6)
+    icon.cd:SetFrameLevel(icon:GetFrameLevel() + 2)
 
     plate.debuffs[index] = icon
   end
@@ -799,11 +800,22 @@ pfUI:RegisterModule("nameplates", function ()
     plate:SetAlpha(alpha)
   end
 
-  local function UpdateStrata(plate)
+  -- The engine's plates draw in the world frame's stratum, under every UI
-    local strata = plate.istarget and "LOW" or "BACKGROUND"
+  -- stratum, and the overlay inherits it; a SetFrameStrata would lift it into
-    if plate.strata == strata then return end
+  -- the UI's and over the chat. The target rises above the other plates by
-    plate.strata = strata
+  -- level instead: raise the engine frame, then re-parent the overlay, which
-    plate:SetFrameStrata(strata)
+  -- moves its whole subtree to the new parent level.
+  local TARGET_RAISE = 20
+
+  local function UpdateStacking(plate)
+    local raised = plate.istarget and true or nil
+    if plate.raised == raised then return end
+    plate.raised = raised
+    local parent = plate.parent
+    parent:SetFrameLevel(plate.baselevel + (raised and TARGET_RAISE or 0))
+    -- SetParent does nothing for the same parent, so it goes through nil
+    plate:SetParent(nil)
+    plate:SetParent(parent)
   end
 
   -- ============================================================================
@@ -957,7 +969,7 @@ pfUI:RegisterModule("nameplates", function ()
   -- ============================================================================
   local function SetTarget(plate, istarget)
     plate.istarget = istarget
-    UpdateStrata(plate)
+    UpdateStacking(plate)
     UpdateBorder(plate)
     UpdateLayout(plate)
     UpdateCombo(plate)
@@ -1028,7 +1040,7 @@ pfUI:RegisterModule("nameplates", function ()
     UpdateLayout(plate)
     UpdateDebuffs(plate)
     UpdateCombo(plate)
-    UpdateStrata(plate)
+    UpdateStacking(plate)
     UpdateAlpha(plate)
     UpdateCast(plate)
     if cfg.targetzoom and plate.istarget then StartZoom(plate, true) end
@@ -1160,6 +1172,7 @@ pfUI:RegisterModule("nameplates", function ()
     nameplate.platename = platename
     nameplate:EnableMouse(false)
     nameplate.parent = parent
+    nameplate.baselevel = parent:GetFrameLevel()
     nameplate.cache = {}
 
     -- Each plate watches its own unit. With RegisterUnitEvent the token IS the

modules/thirdparty.lua

@@ -373,46 +373,63 @@ pfUI:RegisterModule("thirdparty", function()
   -- DPSMate Damage Meter
   -- Vanilla: https://github.com/Geigerkind/DPSMate
   -- TBC: https://github.com/Geigerkind/DPSMateTBC
-  HookAddon("DPSMate", function()
+  -- Repacks ship DPSMate under other folder names, so this waits on login and
-    -- DPSMate builds its windows on VARIABLES_LOADED, each named after its
+  -- checks DPSMate's globals instead of HookAddon's folder lookup.
-    -- settings entry, so DPSMate_DPSMate exists only while the first window
+  EventUtil.ContinueOnPlayerLogin(function()
-    -- keeps the default name "DPSMate"
+    if not DPSMate or not DPSMateSettings then return end
-    if not DPSMate_DPSMate then return end
 
-    local docktable = { "dpsmate", "DPSMate", "DPSMate_DPSMate",
+    -- DPSMate names each window "DPSMate_<name>" after its settings entry and
+    -- the user can rename it at any time, so the first window is resolved on
+    -- every call
+    local function window()
+      local first = DPSMateSettings.windows and DPSMateSettings.windows[1]
+      return first and _G["DPSMate_"..first.name]
+    end
+
+    local function place(anchor, width)
+      local frame = window()
+      if not frame then return end
+      local name = frame:GetName()
+
+      frame:ClearAllPoints()
+      frame:SetPoint("TOPLEFT", pfUI.chat.right, anchor, 0, 0)
+      frame:SetPoint("BOTTOMRIGHT", pfUI.chat.right, "BOTTOMRIGHT", 0, 0)
+      frame:SetWidth(width)
+      _G[name.."_ScrollFrame"]:ClearAllPoints()
+      _G[name.."_ScrollFrame"]:SetWidth(width)
+      _G[name.."_ScrollFrame"]:SetPoint("TOPLEFT", _G[name.."_Head"], "BOTTOMLEFT", 0, 0)
+      _G[name.."_ScrollFrame"]:SetPoint("BOTTOMRIGHT", pfUI.chat.right, "BOTTOMRIGHT", 0, pfUI.panel.right:GetHeight())
+      _G[name.."_ScrollFrame_Child"]:SetWidth(width)
+      _G[name.."_Resize"]:Hide()
+    end
+
+    local docktable = { "dpsmate", "DPSMate", "DPSMate",
       function() -- single
-        DPSMate_DPSMate:ClearAllPoints()
+        place("TOPLEFT", pfUI.chat.right:GetWidth())
-        DPSMate_DPSMate:SetAllPoints(pfUI.chat.right)
-        DPSMate_DPSMate:SetWidth(pfUI.chat.right:GetWidth())
-        DPSMate_DPSMate_ScrollFrame:ClearAllPoints()
-        DPSMate_DPSMate_ScrollFrame:SetWidth(pfUI.chat.right:GetWidth())
-        DPSMate_DPSMate_ScrollFrame:SetPoint("TOPLEFT", DPSMate_DPSMate_Head, "BOTTOMLEFT", 0, 0)
-        DPSMate_DPSMate_ScrollFrame:SetPoint("BOTTOMRIGHT", pfUI.chat.right, "BOTTOMRIGHT", 0, pfUI.panel.right:GetHeight())
-        DPSMate_DPSMate_ScrollFrame_Child:SetWidth(pfUI.chat.right:GetWidth())
-        DPSMate_DPSMate_Resize:Hide()
       end,
       function() -- dual
-        DPSMate_DPSMate:ClearAllPoints()
+        place("TOP", pfUI.chat.right:GetWidth() / 2)
-        DPSMate_DPSMate:SetPoint("TOPLEFT", pfUI.chat.right, "TOP", 0, 0)
-        DPSMate_DPSMate:SetPoint("BOTTOMRIGHT", pfUI.chat.right, "BOTTOMRIGHT", 0, 0)
-        DPSMate_DPSMate:SetWidth(pfUI.chat.right:GetWidth() / 2)
-        DPSMate_DPSMate_ScrollFrame:ClearAllPoints()
-        DPSMate_DPSMate_ScrollFrame:SetWidth(pfUI.chat.right:GetWidth() / 2)
-        DPSMate_DPSMate_ScrollFrame:SetPoint("TOPLEFT", DPSMate_DPSMate_Head, "BOTTOMLEFT", 0, 0)
-        DPSMate_DPSMate_ScrollFrame:SetPoint("BOTTOMRIGHT", pfUI.chat.right, "BOTTOMRIGHT", 0, pfUI.panel.right:GetHeight())
-        DPSMate_DPSMate_ScrollFrame_Child:SetWidth(pfUI.chat.right:GetWidth() / 2)
-        DPSMate_DPSMate_Resize:Hide()
       end,
       function() -- show
-        DPSMate_DPSMate:Show()
+        local frame = window()
+        if frame then frame:Show() end
       end,
       function() -- hide
-        DPSMate_DPSMate:Hide()
+        local frame = window()
+        if frame then frame:Hide() end
       end
     }
 
     pfUI.thirdparty.meters:RegisterMeter("damage", docktable)
 
+    -- DPSMate rebuilds its windows at their saved positions whenever its
+    -- settings change, so put the docked one back afterwards
+    hooksecurefunc(DPSMate, "InitializeFrames", function()
+      if pfUI.thirdparty.meters.damage == docktable then
+        pfUI.thirdparty.meters:Resize()
+      end
+    end)
+
     if C.thirdparty.dpsmate.skin == "1" then
       if DPSMateSettings then
         -- set DPSMate appearance to match pfUI

modules/tooltip.lua

@@ -216,7 +216,7 @@ pfUI:RegisterModule("tooltip", function ()
     icon.stacks:SetFont(C.tooltip.font_tooltip, C.tooltip.font_tooltip_size, "OUTLINE")
     icon.stacks:SetTextColor(1, 1, 1, 1)
 
-    icon.cd = CreateCooldown(icon, "tooltip")
+    icon.cd = CreateCooldown(icon, "aura", C.tooltip, "aura_timers")
     return icon
   end
 

modules/totems.lua

@@ -113,7 +113,7 @@ pfUI:RegisterModule("totems", function ()
       self.bar[i].cdbg = self.bar[i].cdbg or CreateFrame("Frame", nil, self.bar[i])
       self.bar[i].cdbg:SetSize(self.iconsize - 3, self.iconsize - 3)
       self.bar[i].cdbg:SetPoint("CENTER", self.bar[i], "CENTER", 0, 0)
-      self.bar[i].cd = self.bar[i].cd or CreateCooldown(self.bar[i].cdbg, "totem", "pfTotemsBar"..i.."Cooldown")
+      self.bar[i].cd = self.bar[i].cd or CreateCooldown(self.bar[i].cdbg, "aura", C.totems, "timers", "pfTotemsBar"..i.."Cooldown")
 
       self.bar[i]:RegisterForClicks("LeftButtonUp", "RightButtonUp")
       self.bar[i]:SetScript("OnClick", self.OnClick)

skins/blizzard/character.lua

@@ -199,7 +199,7 @@ pfUI:RegisterSkin("Character", function ()
       -- name only while that global is unset, so the global is rebound by
       -- hand; the Model starts hidden and nothing reaches it after that
       local cdname = "Character"..slotName.."Cooldown"
-      _G[cdname] = CreateCooldown(frame, "blizzard", cdname)
+      _G[cdname] = CreateCooldown(frame, "spell", C.cooldown, "blizzard_timers", cdname)
 
       CreateFontString(frame, "scoreText", "OVERLAY", 12)
       frame.scoreText:SetPoint("TOPRIGHT", 0, 0)

skins/blizzard/options-interface.lua

@@ -38,9 +38,51 @@ pfUI:RegisterSkin("Options - Interface", function ()
     elseif ctype == "EditBox" then
       StripTextures(control, nil, "BACKGROUND")
       CreateBackdrop(control, nil, true)
-    else
+    elseif ctype == "Button" then
+      -- key binding buttons: UIPanelButtonTemplate2's slices are BACKGROUND
+      StripTextures(control, nil, "BACKGROUND")
+      SkinButton(control)
+    elseif _G[control:GetName() .. "Button"] then
       SkinDropDown(control, nil, nil, nil, true)
     end
+    -- a control type without a branch stays unskinned; erroring here would
+    -- stop the loop and leave every later control unskinned too
+    i = i + 1
+  end
+
+  -- the pages scroll with retail's MinimalScrollBar, not the old named
+  -- UIPanelScrollBar, so SkinScrollbar does not fit. Its steppers and thumb set
+  -- their atlas again on every state change, so their art is hidden, not cleared
+  i = 1
+  while _G["ClassicAPIOptionsScrollBar" .. i] do
+    local bar = _G["ClassicAPIOptionsScrollBar" .. i]
+    local thumb = bar.Track.Thumb
+
+    StripTextures(bar)
+    bar.Background:Hide()
+    for _, stepper in ipairs({ bar.Back, bar.Forward }) do
+      stepper.Texture:Hide()
+      stepper.Overlay:SetAlpha(0)
+    end
+    SkinArrowButton(bar.Back, "up")
+    SkinArrowButton(bar.Forward, "down")
+
+    thumb.Begin:Hide()
+    thumb.Middle:Hide()
+    thumb.End:Hide()
+    thumb.thumbTexture:Hide()
+
+    bar.bg = CreateFrame("Frame", nil, bar)
+    bar.bg:SetPoint("TOPLEFT", bar.Back, "BOTTOMLEFT", 0, -3)
+    bar.bg:SetPoint("BOTTOMRIGHT", bar.Forward, "TOPRIGHT", 0, 3)
+    CreateBackdrop(bar.bg, nil, true)
+
+    bar.thumb = bar.bg:CreateTexture(nil, "ARTWORK")
+    bar.thumb:SetColorTexture(.8, .8, .8, .8)
+    bar.thumb:SetPoint("TOP", thumb, "TOP", 0, -4)
+    bar.thumb:SetPoint("BOTTOM", thumb, "BOTTOM", 0, 4)
+    bar.thumb:SetPoint("LEFT", bar.bg, "LEFT", 1, 0)
+    bar.thumb:SetPoint("RIGHT", bar.bg, "RIGHT", -1, 0)
     i = i + 1
   end
 

skins/blizzard/spellbook.lua

@@ -39,7 +39,7 @@ pfUI:RegisterSkin("Spellbook", function ()
     -- the global is rebound by hand; the Model starts hidden and nothing
     -- reaches it after that
     local cdname = "SpellButton"..i.."Cooldown"
-    _G[cdname] = CreateCooldown(button, "blizzard", cdname)
+    _G[cdname] = CreateCooldown(button, "spell", C.cooldown, "blizzard_timers", cdname)
 
     _G["SpellButton"..i.."SubSpellName"]:SetTextColor(1, 1, 1)
     _G["SpellButton"..i.."AutoCastable"]:SetTexture("Interface\\Buttons\\UI-AutoCastableOverlay")