Merge branch 'release/v1.10-Beta' into main

This commit is contained in:
Sumsebrum 2021-05-24 13:12:12 +02:00
commit 4721324a2a
23 changed files with 559 additions and 396 deletions

View File

@ -25,7 +25,7 @@ local MAJOR, MINOR = "Gladdy", 4
local Gladdy = LibStub:NewLibrary(MAJOR, MINOR) local Gladdy = LibStub:NewLibrary(MAJOR, MINOR)
local L local L
Gladdy.version_major_num = 1 Gladdy.version_major_num = 1
Gladdy.version_minor_num = 0.09 Gladdy.version_minor_num = 0.10
Gladdy.version_num = Gladdy.version_major_num + Gladdy.version_minor_num Gladdy.version_num = Gladdy.version_major_num + Gladdy.version_minor_num
Gladdy.version_releaseType = RELEASE_TYPES.beta Gladdy.version_releaseType = RELEASE_TYPES.beta
Gladdy.version = PREFIX .. Gladdy.version_num .. "-" .. Gladdy.version_releaseType Gladdy.version = PREFIX .. Gladdy.version_num .. "-" .. Gladdy.version_releaseType

View File

@ -1,6 +1,6 @@
## Interface: 20501 ## Interface: 20501
## Title: Gladdy - TBC ## Title: Gladdy - TBC
## Version: 1.08-Beta ## Version: 1.10-Beta
## Notes: The most powerful arena AddOn for WoW 2.5.1 ## Notes: The most powerful arena AddOn for WoW 2.5.1
## Author: XiconQoo, DnB_Junkee, Knall ## Author: XiconQoo, DnB_Junkee, Knall
## X-Email: contact me on discord Knall#1751 ## X-Email: contact me on discord Knall#1751

591
Lang.lua
View File

@ -1,33 +1,34 @@
local setmetatable = setmetatable local setmetatable = setmetatable
local C_CreatureInfo = C_CreatureInfo
local GetLocale = GetLocale local GetLocale = GetLocale
local L = {} local L = {}
if (GetLocale() == "ruRU") then
-- Races
L["Human"] = "Человек"
L["Dwarf"] = "Дворф"
L["Night Elf"] = "Ночной эльф"
L["Gnome"] = "Гном"
L["Draenei"] = "Дреней"
L["Orc"] = "Орк"
L["Undead"] = "Нежить"
L["Tauren"] = "Таурен"
L["Troll"] = "Тролль"
L["Blood Elf"] = "Эльф крови"
-- Classes -- Classes
L["Druid"] = "Друид" L["Druid"] = C_CreatureInfo.GetClassInfo(11).className
L["Hunter"] = "Охотник" L["Hunter"] = C_CreatureInfo.GetClassInfo(3).className
L["Mage"] = "Маг" L["Mage"] = C_CreatureInfo.GetClassInfo(8).className
L["Paladin"] = "Паладин" L["Paladin"] = C_CreatureInfo.GetClassInfo(2).className
L["Priest"] = "Жрец" L["Priest"] = C_CreatureInfo.GetClassInfo(5).className
L["Rogue"] = "Разбойник" L["Rogue"] = C_CreatureInfo.GetClassInfo(4).className
L["Shaman"] = "Шаман" L["Shaman"] = C_CreatureInfo.GetClassInfo(7).className
L["Warlock"] = "Чернокнижник" L["Warlock"] = C_CreatureInfo.GetClassInfo(9).className
L["Warrior"] = "Воин" L["Warrior"] = C_CreatureInfo.GetClassInfo(1).className
-- Races
L["Human"] = C_CreatureInfo.GetRaceInfo(1).raceName
L["Orc"] = C_CreatureInfo.GetRaceInfo(2).raceName
L["Dwarf"] = C_CreatureInfo.GetRaceInfo(3).raceName
L["Night Elf"] = C_CreatureInfo.GetRaceInfo(4).raceName
L["Undead"] = C_CreatureInfo.GetRaceInfo(5).raceName
L["Tauren"] = C_CreatureInfo.GetRaceInfo(6).raceName
L["Gnome"] = C_CreatureInfo.GetRaceInfo(7).raceName
L["Troll"] = C_CreatureInfo.GetRaceInfo(8).raceName
L["Blood Elf"] = C_CreatureInfo.GetRaceInfo(10).raceName
L["Draenei"] = C_CreatureInfo.GetRaceInfo(11).raceName
if (GetLocale() == "ruRU") then
-- Specs -- Specs
L["Balance"] = "Баланс" L["Balance"] = "Баланс"
L["Feral"] = "Сила зверя" L["Feral"] = "Сила зверя"
@ -157,40 +158,7 @@ if (GetLocale() == "ruRU") then
L["Color of the cast bar"] = "Цвет полосы применений" L["Color of the cast bar"] = "Цвет полосы применений"
L["Background color"] = "Цвет фона полосы" L["Background color"] = "Цвет фона полосы"
L["Color of the cast bar background"] = "Цвет фона полосы применений" L["Color of the cast bar background"] = "Цвет фона полосы применений"
L["Icon position"] "Расположение значка трансляции" L["Icon position"] = "Расположение значка трансляции"
-- Clicks.lua
L["Action #%d"] = "Действие #%d"
L["Left Click Enemy 1"] = "Левый клик по цели 1"
L["Left Click Enemy 2"] = "Левый клик по цели 2"
L["Left Click Enemy 3"] = "Левый клик по цели 3"
L["Left Click Enemy 4"] = "Левый клик по цели 4"
L["Left Click Enemy 5"] = "Левый клик по цели 5"
L["Right Click Enemy 1"] = "Правый клик по цели 1"
L["Right Click Enemy 2"] = "Правый клик по цели 2"
L["Right Click Enemy 3"] = "Правый клик по цели 3"
L["Right Click Enemy 4"] = "Правый клик по цели 4"
L["Right Click Enemy 5"] = "Правый клик по цели 5"
L["Left button"] = "Левая кнопка"
L["Right button"] = "Правая кнопка"
L["Middle button"] = "Средняя кнопка"
L["Button 4"] = "Кнопка 4"
L["Button 5"] = "Кнопка 5"
L["None"] = "Не назначено"
L["CTRL"] = "CTRL"
L["SHIFT"] = "SHIFT"
L["ALT"] = "ALT"
L["Cast Spell"] = "Применить заклинание"
L["Name"] = "Название"
L["Select the name of the click option"] = "Выбрать название опции клика"
L["Button"] = "Кнопка"
L["Select which mouse button to use"] = "Выбрать кнопку мыши для использования"
L["Modifier"] = "Модификатор"
L["Select which modifier to use"] = "Выбрать модификатор для использования"
L["Action"] = "Действите"
L["Select what action this mouse button does"] = "Выбрать действие, производимое данной кнопкой мыши"
L["Spell name / Macro text"] = "Название заклинания / Текст макроса"
L["Use *name* as unit's name. Like a '/rofl *name*'"] = "Используйте *name* в качестве имени игрока. Например, '/rofl *name*'"
-- Diminishings.lua -- Diminishings.lua
L["DR Cooldown position"] = "Позиция ДР таймеров" L["DR Cooldown position"] = "Позиция ДР таймеров"
@ -237,31 +205,146 @@ if (GetLocale() == "ruRU") then
-- Trinket.lua -- Trinket.lua
L["No cooldown count (OmniCC)"] = "Не показывать кулдаун (OmniCC)" L["No cooldown count (OmniCC)"] = "Не показывать кулдаун (OmniCC)"
L["Disable cooldown timers by addons (reload UI to take effect)"] = "Отключить таймер кулдаунов для аддонов (необходима перезагрузка интерфейса)" L["Disable cooldown timers by addons (reload UI to take effect)"] = "Отключить таймер кулдаунов для аддонов (необходима перезагрузка интерфейса)"
elseif (GetLocale() == "deDE") then elseif GetLocale() == "deDE" then
-- Races -- Announcements.lua
L["Human"] = "Mensch" L["Announcements"] = "Meldungen"
L["Dwarf"] = "Zwerg" L["RESURRECTING: %s (%s)"] = "Wiederbeleben: %s (%s) "
L["Night Elf"] = "Nachtelf" L["SPEC DETECTED: %s - %s (%s)"] = "Talenspezalisierung entdeckt: %s - %s (%s)"
L["Gnome"] = "Gnom" L["LOW HEALTH: %s (%s)"] = "Niedriges Leben: %s (%s)"
L["Draenei"] = "Draenei" L["TRINKET USED: %s (%s)"] = "Insiginie benutzt: %s (%s)"
L["Orc"] = "Ork" L["TRINKET READY: %s (%s)"] = "Insignie bereit: %s (%s)"
L["Undead"] = "Untoter" L["DRINKING: %s (%s)"] = "Trinken: %s (%s)"
L["Tauren"] = "Taure" L["Self"] = "Selbst"
L["Troll"] = "Тroll" L["Party"] = "Gruppe"
L["Blood Elf"] = "Blutelf" L["Raid Warning"] = "Schlachtzugwarnung"
L["Blizzard's Floating Combat Text"] = "Blizzard Kampftext"
L["Trinket used"] = "Insignie benutzt"
L["Announce when an enemy's trinket is used"] = "Warnt, wenn ein Gegner seine Insignie benutzt"
L["Trinket ready"] = "Insignie bereit"
L["Announce when an enemy's trinket is ready again"] = "Warnt wenn die Insignie eines Gegner wieder bereit ist"
L["Drinking"] = "Trinken"
L["Announces when enemies sit down to drink"] = "Warnt wenn Gegner sich zum Trinken hinsetzen"
L["Resurrection"] = "Wiederbelebung"
L["Announces when an enemy tries to resurrect a teammate"] = "Warnt wenn Gegner versuchen Teammitglieder wiederzubeleben"
L["New enemies"] = "Neue Gegner"
L["Announces when new enemies are discovered"] = "Gibt an, wenn neue Gegner entdeckt wurden"
L["Spec Detection"] = "Talent Entdeckung"
L["Announces when the spec of an enemy was detected"] = "Gibt an, wenn Talente eines Gegners entdeckt wurden"
L["Low health"] = "Wenig Leben"
L["Announces when an enemy drops below a certain health threshold"] = "Warnt, wenn das Leben eines Gegners unter einen bestimmten Prozentwert fällt"
L["Low health threshold"] = "Prozentwert: Wenig Leben"
L["Choose how low an enemy must be before low health is announced"] = "Bestimme wie wenig Leben ein Gegner haben muss, damit vor wenig Leben gewarnt wird"
L["Destination"] = "Ziel"
L["Choose how your announcements are displayed"] = "Bestimme wo Warnungen dargestellt werden"
-- Classes -- ArenaCountDown.lua
L["Druid"] = "Druide" L["Arena Countdown"] = "Arena Countdown"
L["Hunter"] = "Jäger" L["Turns countdown before the start of an arena match on/off."] = ""
L["Mage"] = "Magier" L["Size"] = "Größe"
L["Paladin"] = "Paladin"
L["Priest"] = "Priester"
L["Rogue"] = "Schurke"
L["Shaman"] = "Schamane"
L["Warlock"] = "Hexenmeister"
L["Warrior"] = "Krieger"
-- Specs -- Auras.lua
L["Auras"] = "Auren"
L["Frame"] = "Frame"
L["Cooldown"] = "Abklingzeit"
L["No Cooldown Circle"] = "Verstecke Abklingzeitzirkel"
L["Cooldown circle alpha"] = "Abklingzeitzirkel Alpha"
L["Font"] = "Schrift"
L["Font of the cooldown"] = "Schrift der Abklingzeit"
L["Font scale"] = "Schriftskalierung"
L["Scale of the text"] = "Skalierungfaktor des Texts"
L["Font color"] = "Schriftfarbe"
L["Color of the text"] = "Farbe des Texts"
L["Border"] = "Rahmen"
L["Border style"] = "Rahmen Stil"
L["Buff color"] = "Buff Farbe"
L["Debuff color"] = "Debuff Farbe"
L["Check All"] = "Alle auswählen"
L["Uncheck All"] = "Alle abwählen"
L["Enabled"] = "Eingeschaltet"
L["Priority"] = "Priorität"
-- BuffsDebuffs.lua
L["Buffs and Debuffs"] = "Buffs und Debuffs"
L["Enabled Buffs and Debuffs module"] = "Buffs und Debuffs Modul einschalten"
L["Show CC"] = "Zeige Crowdcontrol"
L["Shows all debuffs, which are displayed on the ClassIcon as well"] = "Zeigt alle Buffs & Debuffs, die auch auf dem Klassensymbol dargestellt werden"
L["Buffs"] = "Buffs"
L["Size & Padding"] = "Größe und Abstand"
L["Icon Size"] = "Symbol Größe"
L["Size of the DR Icons"] = "Größe der DR Symbole"
L["Icon Width Factor"] = "Symbol Breitenfaktor"
L["Stretches the icon"] = "Streckt das Symbol"
L["Icon Padding"] = "Symbol Abstand"
L["Space between Icons"] = "Abstand zwischen den Symbolen"
L["Position"] = "Position"
L["Aura Position"] = "Aura Position"
L["Position of the aura icons"] = "Position der Aura Symbole"
L["Top"] = "Oben"
L["Bottom"] = "Unten"
L["Left"] = "Links"
L["Right"] = "Rechts"
L["Grow Direction"] = "Richtung"
L["Grow Direction of the aura icons"] = "In welche Richtung die Symbole wachsen"
L["Horizontal offset"] = "Horizontaler Offset"
L["Vertical offset"] = "Vertikaler Offset"
L["Alpha"] = "Alpha"
L["Debuffs"] = "Debuffs"
L["Dynamic Timer Color"] = "Dynamische Textfarbe"
L["Show dynamic color on cooldown numbers"] = "Verändert die Farbe des Textes dynamisch"
L["Color of the cooldown timer and stacks"] = "Farbe der Abklingzeit und Stapel"
L["Spell School Colors"] = "Zauberart Farbe"
L["Spell School Colors Enabled"] = "Zauberart Farbe Eingeschaltet"
L["Show border colors by spell school"] = "Färbt den Rahmen entspechend der Zauberart"
L["Curse"] = "Fluch"
L["Color of the border"] = "Farbe des Rahmens"
L["Magic"] = "Magie"
L["Poison"] = "Gift"
L["Physical"] = "Physisch"
L["Immune"] = "Immun"
L["Disease"] = "Erkrankung"
L["Aura"] = "Aura"
L["Form"] = "Form"
-- Castbar.lua
L["Cast Bar"] = "Zauberleiste"
L["Bar"] = "Balken"
L["Bar Size"] = "Balken Größe"
L["Bar height"] = "Balken Höhe"
L["Height of the bar"] = "Höhe des Balken"
L["Bar width"] = "Balken Weite"
L["Width of the bars"] = "Weite des Balken"
L["Texture"] = "Textur"
L["Bar texture"] = "Balken Textur"
L["Texture of the bar"] = "Textur des Balken"
L["Bar color"] = "Balken Farbe"
L["Color of the cast bar"] = "Farbe des Balken"
L["Background color"] = "Hintergrundfarbe"
L["Color of the cast bar background"] = "Hinergrundfarbe des Zauberbalkens"
L["Border size"] = "Rahmen Größe"
L["Status Bar border"] = "Balken Rahmen"
L["Status Bar border color"] = "Balken Rahmen Farbe"
L["Icon"] = "Symbol"
L["Icon size"] = "Symbolgröße"
L["Icon border"] = "Symbolrahmen"
L["Icon border color"] = "Farbe Symbolrahmen"
L["Spark"] = "Funke"
L["Spark enabled"] = "Funke eingeschaltet"
L["Spark color"] = "Funkenfarbe"
L["Color of the cast bar spark"] = "Farbe des Zauberleisten Funke"
L["Font of the castbar"] = "Schriftart der Zauberleiste"
L["Font size"] = "Schriftgröße"
L["Size of the text"] = "Schriftgröße"
L["Format"] = "Darstellung"
L["Timer Format"] = "Zeitdarstellung"
L["Remaining"] = "Verbleibend"
L["Total"] = "Total"
L["Both"] = "Beides"
L["Castbar position"] = "Zauberleistenposition"
L["Icon position"] = "Symbolposition"
L["Offsets"] = "Offsets"
-- Classicon.lua
L["Class Icon"] = "Klassensymbol"
L["Balance"] = "Gleichgewicht" L["Balance"] = "Gleichgewicht"
L["Feral"] = "Wilder Kampf" L["Feral"] = "Wilder Kampf"
L["Restoration"] = "Wiederherstellung" L["Restoration"] = "Wiederherstellung"
@ -286,6 +369,145 @@ elseif (GetLocale() == "deDE") then
L["Destruction"] = "Zerstörung" L["Destruction"] = "Zerstörung"
L["Arms"] = "Waffen" L["Arms"] = "Waffen"
L["Fury"] = "Furor" L["Fury"] = "Furor"
L["Show Spec Icon"] = "Zeige Spezialisierungssymbol"
L["Shows Spec Icon once spec is detected"] = "Zeigt das Talentspezialisierungs Symbol sobald die Spezialisierung erkannt wurde"
L["Icon width factor"] = "Symbol Breitenfaktor"
L["This changes positions with trinket"] = "Das tauscht die Position mit dem Trinket, wenn auf der gleichen Seite."
L["Border color"] = "Rahmenfarbe"
--CombatIndicator.lua
L["Combat Indicator"] = "Kampfindikator"
L["Enable Combat Indicator icon"] = "Schalte Kampfindikator ein"
L["Anchor"] = "Anker"
L["This changes the anchor of the ci icon"] = "Dies ändert den Anker des Kampfindikatorsymbols"
L["This changes position relative to its anchor of the ci icon"] = "Dies ändert die Position relativ zum Anker"
-- Cooldowns.lua
L["Cooldowns"] = "Abklingzeiten"
L["Enabled cooldown module"] = ""
L["Cooldown size"] = "Abklingzeit Größe"
L["Size of each cd icon"] = "Größe eines einzelnen Symbols"
L["Max Icons per row"] = "Maximale Anzahl an Symbolen pro Reihe"
L["Scale of the font"] = "Skalierung der Schrift"
L["Anchor of the cooldown icons"] = "Anker der Abklingzeiten Symbole"
L["Grow Direction of the cooldown icons"] = "Richtung der Abklingzeiten Symbole"
L["Offset"] = "Offset"
-- Diminishings.lua
L["Diminishings"] = "DR"
L["Enabled DR module"] = "DR einschalten"
L["DR Cooldown position"] = "DR Position"
L["Position of the cooldown icons"] = "Position der Symbole"
L["DR Border Colors"] = "DR Rahmen Farbe"
L["Dr Border Colors Enabled"] = "DR Rahmen Farben eingeschaltet"
L["Colors borders of DRs in respective DR-color below"] = "Färbt die Rahmen der DR Symbole je nach Stärke der Verminderung"
L["Half"] = "Hälfte"
L["Quarter"] = "Viertel"
L["Categories"] = "Kategorien"
L["Force Icon"] = "Erzwinge Symbol"
L["Icon of the DR"] = "Symbol des DR"
-- ExportImport.lua
L["Export Import"] = "Exportieren Importieren"
L["Profile Export Import"] = "Profile Exportieren Importieren"
-- Healthbar.lua
L["Health Bar"] = "Lebensbalken"
L["DEAD"] = "TOT"
L["LEAVE"] = "VERLASSEN"
L["General"] = "Allgemein"
L["Color of the status bar background"] = "Farbe des Balkenhintergrunds"
L["Font of the bar"] = "Schriftart des Balken"
L["Name font size"] = "Schriftgröße des Namen"
L["Size of the name text"] = "Schriftgröße des Namen"
L["Health font size"] = "Schriftgröße der Gesundheit"
L["Size of the health text"] = "Schriftgröße der Gesundheit"
L["Size of the border"] = "Rahmengröße"
L["Health Bar Text"] = "Lebensbalken Text"
L["Show name text"] = "Namen zeigen"
L["Show the units name"] = "Zeige den Namen des Gegners"
L["Show ArenaX"] = "ArenaX zeigen"
L["Show Arena1-5 as name instead"] = "Zeigt Arena1-5 anstatt des Namens"
L["Show the actual health"] = "Zeige die momentane Gesundheit"
L["Show the actual health on the health bar"] = "Zeigt die momentane Gesundheit"
L["Show max health"] = "Zeige maximale Gesundheit"
L["Show max health on the health bar"] = "Zeige maximale Gesundheit"
L["Show health percentage"] = "Zeige Prozentwert"
L["Show health percentage on the health bar"] = "Zeige Prozentwert der Gesundheit"
-- Highlight.lua
L["Highlight"] = "Hervorhebung"
L["Show Inside"] = "Zeige innen"
L["Show Highlight border inside of frame"] = "Zeige die Hervorhebung innerhalb des Frames"
L["Colors"] = "Farben"
L["Target border color"] = "Rahmenfarbe deines Ziels"
L["Color of the selected targets border"] = "Rahmenfarbe deines momentanen Ziels"
L["Focus border color"] = "Rahmenfarbe deines Fokus"
L["Color of the focus border"] = "Rahmenfarbe deines momentanen Fokus"
L["Highlight target"] = "Hervorhebung des Ziels"
L["Toggle if the selected target should be highlighted"] = "Ziel hervorheben ein/ausschalten"
L["Show border around target"] = "Zeige Rahmen um dein Ziel"
L["Toggle if a border should be shown around the selected target"] = "Zeigt Rahmen um dein momentanes Ziel"
L["Show border around focus"] = "Zeige Rahmen um dein Fokus"
L["Toggle of a border should be shown around the current focus"] = "Zeigt Rahmen um dein Fokusziel"
-- Pets.lua
L["Pets"] = "Begleiter"
L["Enables Pets module"] = "Schaltet das Begleiter Modul ein"
L["Width of the bar"] = "Breite des Balkens"
L["Health color"] = "Gesundheitsfarbe"
L["Color of the status bar"] = "Farbe des Balkens"
L["Portrait"] = "Portrait"
L["Health Values"] = "Gesundheitswerte"
-- Powerbar.lua
L["Power Bar"] = "Mana/Energie Balken"
L["Power Bar Text"] = "Mana/Energie Balken Text"
L["Power Texts"] = "Mana/Energie Balken Texte"
L["Show race"] = "Rasse zeigen"
L["Show spec"] = "Spezialisierung zeigen"
L["Show the actual power"] = "Zeige das momentane Mana"
L["Show the actual power on the power bar"] = "Zeige das momentane Mana"
L["Show max power"] = "Zeige das maximale Mana"
L["Show max power on the power bar"] = "Zeige das maximale Mana"
L["Show power percentage"] = "Zeige Prozentwert"
L["Show power percentage on the power bar"] = "Zeige Prozentwert"
-- Racial.lua
L["Racial"] = "Rassenfertigkeit"
L["Enable racial icon"] = "Rassenfertigkeit einschalten"
L["This changes the anchor of the racial icon"] = "Dies ändert den Anker des Rassenfertigkeitssymbols"
L["This changes position relative to its anchor of the racial icon"] = "Dies ändert doe Position relativ zu seinem Anker"
-- TotemPlates.lua
L["Totem Plates"] = "Totem Symbole"
L["Customize Totems"] = "Individuelle Totemeinstellungen"
L["Custom totem name"] = "Individueller Totem Name"
L["Totem General"] = "Totems Allgemein"
L["Turns totem icons instead of nameplates on or off. (Requires reload)"] = ""
L["Show friendly"] = "Zeige für freundliche"
L["Show enemy"] = "Zeige für feindliche"
L["Totem size"] = "Totem Größe"
L["Size of totem icons"] = "Größe der Totemsymbole"
L["Font of the custom totem name"] = "Schriftart der benutzerdefinierten Totem Namen"
L["Apply alpha when no target"] = "Wende den Alpha-Wert an, wenn kein Ziel anvisiert ist"
L["Always applies alpha, even when you don't have a target. Else it is 1."] = "Alpha immer anwenden, auch wenn man kein Ziel anvisiert hat. Sonst ist der Alpha-Wert 1"
L["Apply alpha when targeted"] = "Wende den Alpha-Wert an, wenn das Totem als Ziel anvisiert ist"
L["Always applies alpha, even when you target the totem. Else it is 1."] = "Alpha immer anwenden, auch wenn das Totem als Ziel anvisiert ist. Sonst ist der Alpha-Wert 1"
L["All totem border alphas (configurable per totem)"] = "Alpha aller Totems"
L["Totem icon border style"] = "Totem Rahmenstil"
L["All totem border color"] = "Rahmenfarbe aller Totems"
-- Trinket.lua
L["Trinket"] = "Insignie"
L["Enable trinket icon"] = "Insignie einschalten"
L["This changes positions of the trinket"] = "Dies ändert die Position der Insignie"
-- XiconProfiles.lua
L["Profile"] = "Profil"
-- Frame.lua
L["Gladdy - drag to move"] = "Gladdy - ziehe um zu bewegen"
-- Gladdy.lua -- Gladdy.lua
L["Welcome to Gladdy!"] = "Willkommen bei Gladdy!" L["Welcome to Gladdy!"] = "Willkommen bei Gladdy!"
@ -293,185 +515,50 @@ elseif (GetLocale() == "deDE") then
L["Valid slash commands are:"] = "Gültige slash Befehle sind:" L["Valid slash commands are:"] = "Gültige slash Befehle sind:"
L["If this is not your first run please lock or move the frame to prevent this from happening."] = "Wenn dies nicht dein erster Start ist, sperre oder bewege das Bild um diese Meldung zu verhindern." L["If this is not your first run please lock or move the frame to prevent this from happening."] = "Wenn dies nicht dein erster Start ist, sperre oder bewege das Bild um diese Meldung zu verhindern."
-- Frame.lua
L["Gladdy - drag to move"] = "Gladdy - ziehe um zu bewegen"
-- Options.lua -- Options.lua
L["Announcements"] = "Meldungen" L["settings"] = "Einstellungen"
L["Announcement settings"] = "Meldungseinstellungen" L["Reset module"] = "Modul zurücksetzen"
L["Auras"] = "Auren" L["Reset module to defaults"] = "Setze das Modul auf seine Standardwerte zurück"
L["Auras settings"] = "Aureneinstellungen"
L["Castbar"] = "Zauberleiste"
L["Castbar settings"] = "Zauberleisteneinstellungen"
L["Classicon"] = "Klassensymbol"
L["Classicon settings"] = "Klassensymboleinstellungen"
L["Clicks"] = "Klicks"
L["Clicks settings"] = "Klickeinstellungen"
L["Diminishings"] = "DR"
L["Diminishings settings"] = "DR Einstellungen"
L["Healthbar"] = "Lebensleiste"
L["Healthbar settings"] = "Lebensleisteneinstellungen"
L["Highlight"] = "warnung"
L["Highlight settings"] = "Warnungseinstellungen"
L["Nameplates"] = "Namensplaketten"
L["Nameplates settings"] = "Namensplaketteneinstellungen"
L["Powerbar"] = "Powerleiste"
L["Powerbar settings"] = "Powerleisteneinstellungen"
L["Score"] = "Score"
L["Score settings"] = "Scoreeinstellungen"
L["Trinket"] = "Insignie"
L["Trinket settings"] = "Insignieneinstellungen"
L["Reset module"] = "Model zurücksetzen"
L["Reset module to defaults"] = "Modul auf Standardeinstellungen zurücksetzen"
L["No settings"] = "Keine Einstellungen" L["No settings"] = "Keine Einstellungen"
L["Module has no settings"] = "Modul hat keine Einstellungen" L["Module has no settings"] = "Modul hat keine Einstellungen"
L["General"] = "ОAllgemein"
L["General settings"] = "Allgemeine Einstellungen" L["General settings"] = "Allgemeine Einstellungen"
L["Lock frame"] = "Sperre Bild" L["Lock frame"] = "Sperre Frame"
L["Toggle if frame can be moved"] = "Aktivieren falls das Bild bewegt werden kann" L["Toggle if frame can be moved"] = "Aktivieren falls das Frame bewegt werden kann"
L["Grow frame upwards"] = "Bild von unten nach oben aufbauen" L["Grow frame upwards"] = "Frame von unten nach oben aufbauen"
L["If enabled the frame will grow upwards instead of downwards"] = "Falls aktiviert, wird das Bild von unten nach oben aufgebaut" L["If enabled the frame will grow upwards instead of downwards"] = "Falls aktiviert, wird das Frame von unten nach oben aufgebaut"
L["Frame scale"] = "Bildskalierung" L["Down"] = "Runter"
L["Scale of the frame"] = "Skalierung des Bildes" L["Up"] = "Hoch"
L["Frame padding"] = "Bild Unterlage" L["Frame General"] = "Frame Allgemein"
L["Padding of the frame"] = "Unterlage des Bildes" L["Frame scale"] = "Frame Skalierung"
L["Frame color"] = "Bildfarbe" L["Scale of the frame"] = "Skalierung des Frames"
L["Color of the frame"] = "Farbe des Bildes" L["Frame padding"] = "Symbolabstand"
L["Bar width"] = "Leistenbreite" L["Padding of the frame"] = "Abstand zwischen den Elementen des Frames"
L["Width of the bars"] = "Breite der Leisten" L["Frame width"] = "Frame Breite"
L["Bottom margin"] = "Unterer Abstand" L["Margin"] = "Frame Abstand"
L["Margin between each button"] = "Abstand zwischen jedem Buttom" L["Margin between each button"] = "Abstand zwischen den Arena Einheiten"
L["Cooldown General"] = "Abklingzeiten Allgemein"
-- Announcements.lua L["Font General"] = "Schriftart Allgemein"
L["RESURRECTING: %s (%s)"] = "Wiederbeleben: %s (%s) " L["General Font"] = "Allgemeine Schriftart"
L["SPEC DETECTED: %s - %s (%s)"] = "Talenspezalisierung entdeckt: %s - %s (%s)" L["Font color text"] = "Schriftfarbe von text"
L["LOW HEALTH: %s (%s)"] = "Niedriges Leben: %s (%s)" L["Font color timer"] = "Schriftfarbe von Abklingzeiten"
L["TRINKET USED: %s (%s)"] = "Insiginie benutzt: %s (%s)" L["Color of the timers"] = "Farbe der Abklingzeiten"
L["TRINKET READY: %s (%s)"] = "Insignie bereit: %s (%s)" L["Icons General"] = "Symbol Allgemein"
L["DRINKING: %s (%s)"] = "Trinken: %s (%s)" L["Icon border style"] = "Rahmenstil"
L["Self"] = "Selbst" L["This changes the border style of all icons"] = "Dies ändert den Rahmenstil aller Symbole"
L["Party"] = "Gruppe" L["This changes the border color of all icons"] = "Dies ändert die Rahmenfarbe aller Symbole"
L["Raid Warning"] = "Schlachtzugwarnung" L["Statusbar General"] = "Balken Allgemein"
L["Blizzard's Floating Combat Text"] = "Blizzard Kampftext" L["Statusbar texture"] = "Balken Textur"
L["MikScrollingBattleText"] = "MikScrollingBattleText" L["This changes the texture of all statusbar frames"] = "Dies ändert die Textur aller Balken"
L["Scrolling Combat Text"] = "Scrolling Combat Text" L["Statusbar border style"] = "Balken Rahmenstil"
L["Parrot"] = "Parrot" L["This changes the border style of all statusbar frames"] = "Dies ändert den Rahmenstil aller Balken"
L["Drinking"] = "Trinken" L["Statusbar border offset divider (smaller is higher offset)"] = "Rahmenstil offset Quotient"
L["Announces when enemies sit down to drink"] = "Warnt wenn Gegner sich zum Trinken hinsetzen" L["Offset of border to statusbar (in case statusbar shows beyond the border)"] = "Offset des Rahmens zur Statusbar (falls der Balken hinter dem Rahmen erscheint)"
L["Resurrection"] = "Wiederbelebung" L["Statusbar border color"] = "Balken Rahmenfarbe"
L["Announces when an enemy tries to resurrect a teammate"] = "Warnt wenn Gegner versuchen Teammitglieder wiederzubeleben" L["This changes the border color of all statusbar frames"] = "Dies ändert die Rahmenfarbe aller Balken"
L["New enemies"] = "Neue Gegner"
L["Announces when new enemies are discovered"] = "Gibt an, wenn neue Gegner entdeckt wurden"
L["Spec Detection"] = "Talent Entdeckung"
L["Announces when the spec of an enemy was detected"] = "Gibt an, wenn Talente eines Gegners entdeckt wurden"
L["Low health"] = "Wenig Leben"
L["Announces when an enemy drops below a certain health threshold"] = "Warnt, wenn das Leben eines Gegners unter einen bestimmten Prozentwert fällt"
L["Low health threshold"] = "Prozentwert: Wenig Leben"
L["Choose how low an enemy must be before low health is announced"] = "Bestimme wie wenig Leben ein Gegner haben muss, damit vor wenig Leben gewarnt wird"
L["Trinket used"] = "Insignie benutzt"
L["Announce when an enemy's trinket is used"] = "Warnt, wenn ein Gegner seine Insignie benutzt"
L["Trinket ready"] = "Insignie bereit"
L["Announce when an enemy's trinket is ready again"] = "Warnt wenn die Insignie eines Gegner wieder bereit ist"
L["Destination"] = "Ziel"
L["Choose how your announcements are displayed"] = "Bestimme wo Warnungen dargestellt werden"
-- Auras.lua
L["Font color"] = "Schriftfarbe"
L["Color of the text"] = "Farbe der Schrift"
L["Font size"] = "Schriftgröße"
L["Size of the text"] = "Größe der Schrift"
-- Castbar.lua
L["Bar height"] = "Leistenhöhe"
L["Height of the bar"] = "Höhe der Leiste"
L["Bar texture"] = "Leistentextur"
L["Texture of the bar"] = "Textur der Leiste"
L["Bar color"] = "Leistenfarbe"
L["Color of the cast bar"] = "Farbe der Zauberleiste"
L["Background color"] = "Hintergrundfarbe"
L["Color of the cast bar background"] = "Hintergrundfarbe der Zauberleiste"
L["Icon position"] "Position des Zauberleistensymbols"
-- Clicks.lua
L["Action #%d"] = "Aktion #%d"
L["Left Click Enemy 1"] = "Linksklick Gegner 1"
L["Left Click Enemy 2"] = "Linksklick Gegner 2"
L["Left Click Enemy 3"] = "Linksklick Gegner 3"
L["Left Click Enemy 4"] = "Linksklick Gegner 4"
L["Left Click Enemy 5"] = "Linksklick Gegner 5"
L["Right Click Enemy 1"] = "Rechtsklick Gegner 1"
L["Right Click Enemy 2"] = "Rechtsklick Gegner 2"
L["Right Click Enemy 3"] = "Rechtsklick Gegner 3"
L["Right Click Enemy 4"] = "Rechtsklick Gegner 4"
L["Right Click Enemy 5"] = "Rechtsklick Gegner 5"
L["Left button"] = "Linke Taste"
L["Right button"] = "Rechte Taste"
L["Middle button"] = "Mittlere Taste"
L["Button 4"] = "Maus 4"
L["Button 5"] = "Maus 5"
L["None"] = "Keine"
L["CTRL"] = "STRG"
L["SHIFT"] = "SHIFT"
L["ALT"] = "ALT"
L["Cast Spell"] = "Wirke Zauber"
L["Name"] = "Name"
L["Select the name of the click option"] = "Wähle einen Namen für die Klickoption"
L["Button"] = "Taste"
L["Select which mouse button to use"] = "Wähle welche Maustaste genutzt werden soll"
L["Modifier"] = "Modifier"
L["Select which modifier to use"] = "Wähle welcher Modifier benutzt werdne soll"
L["Action"] = "Aktion"
L["Select what action this mouse button does"] = "Wähle welche Aktion die Maustaste durchführt"
L["Spell name / Macro text"] = "Zaubername / Makrotext"
L["Use *name* as unit's name. Like a '/rofl *name*'"] = "Benutzt *name* als Gegnername. Zum Beispiel '/rofl *name*'"
-- Diminishings.lua
L["DR Cooldown position"] = "Position des DR Cooldowns"
L["Position of the cooldown icons"] = "Position des DR Cooldowns"
L["Left"] = "Links"
L["Right"] = "Rechts"
L["Icon Size"] = "Symbolgröße"
L["Size of the DR Icons"] = "Größe des DR Symbols"
-- Healthbar.lua
L["Show the actual health"] = "Zeige das Leben an"
L["Show the actual health on the health bar"] = "Zeige das Leben auf der Lebensanzeige an"
L["Show max health"] = "Zeige Maximalleben an"
L["Show max health on the health bar"] = "Zeige Maximalleben auf der Lebensanzeige an"
L["Show health percentage"] = "Zeige prozentuales Leben"
L["Show health percentage on the health bar"] = "Zeige prozentuales Leben auf der Lebensanzeige an"
-- Highlight.lua
L["Border size"] = "Rahmengröße"
L["Target border color"] = "Zielrahmenfarbe"
L["Color of the selected targets border"] = "Farbe des Rahmens des gewählten Ziels"
L["Focus border color"] = "Focusrahmenfarbe"
L["Color of the focus border"] = "Farbe des Focusrahmens"
L["Raid leader border color"] = "Schlachtzugleiterrahmenfarbe"
L["Color of the raid leader border"] = "Farbe des Rahmens für den Schlachtzugleiter"
L["Highlight target"] = "Highlight Ziel"
L["Toggle if the selected target should be highlighted"] = "Включите, если необходима подсветка цели"
L["Show border around target"] = "Zeige Rahmen um das Ziel an"
L["Toggle if a border should be shown around the selected target"] = "Auswählen wenn ein Ramhen um das ausgewählte Ziel angezeigt werden soll"
L["Show border around focus"] = "Zeige Rahmen um Focus"
L["Toggle of a border should be shown around the current focus"] = "Auswählen wenn ein Ramhen um das ausgewählte Focusziel angezeigt werden soll"
L["Show border around raid leader"] = "Zeige Rahmen um Schlachtzugleiter"
L["Toggle if a border should be shown around the raid leader"] = "Auswählen wenn ein Ramhen um den ausgewählten SChlachtzugleiter angezeigt werden soll"
-- Powerbar.lua
L["Show the actual power"] = "Zeige genaue Power"
L["Show the actual power on the power bar"] = "Zeige die genaue Power in der Powerleiste "
L["Show max power"] = "Zeige Maximalpower"
L["Show max power on the power bar"] = "Zeige Maximalpower in der Powerbau"
L["Show power percentage"] = "Zeige prozentuale Power"
L["Show power percentage on the power bar"] = "Zeige prozentuale Power in der Powerbau"
L["Color of the status bar background"] = "Hintergrundfarbe der Statusleiste"
-- Trinket.lua
L["No cooldown count (OmniCC)"] = "Keine Cooldownanzeige (OmniCC)"
L["Disable cooldown timers by addons (reload UI to take effect)"] = "Deaktiviere Cooldownanzeige durch Addons (UI neu laden um zu wirken)"
end end
-- Superhack allowing use key as value if not present in table -- Superhack allowing use key as value if not present in table
LibStub("Gladdy").L = setmetatable(L, { LibStub("Gladdy").L = setmetatable(L, {
__index = function(t, k) __index = function(t, k)

View File

@ -206,9 +206,6 @@ function Announcements:GetOptions()
["party"] = L["Party"], ["party"] = L["Party"],
["rw"] = L["Raid Warning"], ["rw"] = L["Raid Warning"],
["fct"] = L["Blizzard's Floating Combat Text"], ["fct"] = L["Blizzard's Floating Combat Text"],
--["msbt"] = L["MikScrollingBattleText"],
--["sct"] = L["Scrolling Combat Text"],
--["parrot"] = L["Parrot"],
} }
return { return {

View File

@ -1,9 +1,11 @@
local floor, str_len, tostring, str_sub, str_find = math.floor, string.len, tostring, string.sub, string.find local floor, str_len, tostring, str_sub, str_find, pairs = math.floor, string.len, tostring, string.sub, string.find, pairs
local CreateFrame = CreateFrame local CreateFrame = CreateFrame
local GetLocale = GetLocale
local GetTime = GetTime
local Gladdy = LibStub("Gladdy") local Gladdy = LibStub("Gladdy")
local L = Gladdy.L local L = Gladdy.L
local ACDFrame = Gladdy:NewModule("Countdown", nil, { local ACDFrame = Gladdy:NewModule("Arena Countdown", nil, {
countdown = true, countdown = true,
arenaCountdownSize = 256 arenaCountdownSize = 256
}) })
@ -13,6 +15,11 @@ function ACDFrame:OnEvent(event, ...)
end end
function ACDFrame:Initialize() function ACDFrame:Initialize()
if ACDFrame.locales[GetLocale()] then
self.locale = ACDFrame.locales[GetLocale()]
else
self.locale = ACDFrame.locales["default"]
end
self.hidden = false self.hidden = false
self.countdown = -1 self.countdown = -1
self.texturePath = "Interface\\AddOns\\Gladdy\\Images\\Countdown\\"; self.texturePath = "Interface\\AddOns\\Gladdy\\Images\\Countdown\\";
@ -44,6 +51,8 @@ function ACDFrame:Initialize()
self.ACDNumOne = ACDNumOne self.ACDNumOne = ACDNumOne
self:RegisterMessage("JOINED_ARENA") self:RegisterMessage("JOINED_ARENA")
self:RegisterMessage("ENEMY_SPOTTED")
self:RegisterMessage("UNIT_SPEC")
end end
function ACDFrame.OnUpdate(self, elapse) function ACDFrame.OnUpdate(self, elapse)
@ -82,50 +91,35 @@ function ACDFrame.OnUpdate(self, elapse)
self.ACDNumOnes:Hide(); self.ACDNumOnes:Hide();
self.ACDNumOne:Hide(); self.ACDNumOne:Hide();
end end
if (GetTime() > self.endTime) then
self:SetScript("OnUpdate", nil)
end
end end
function ACDFrame:JOINED_ARENA() function ACDFrame:JOINED_ARENA()
self:RegisterEvent("CHAT_MSG_BG_SYSTEM_NEUTRAL") self:RegisterEvent("CHAT_MSG_BG_SYSTEM_NEUTRAL")
self:SetScript("OnEvent", ACDFrame.OnEvent) self:SetScript("OnEvent", ACDFrame.OnEvent)
self.endTime = GetTime() + 70
self:SetScript("OnUpdate", ACDFrame.OnUpdate) self:SetScript("OnUpdate", ACDFrame.OnUpdate)
end end
function ACDFrame:ENEMY_SPOTTED()
ACDFrame:Reset()
end
function ACDFrame:UNIT_SPEC()
ACDFrame:Reset()
end
function ACDFrame:CHAT_MSG_BG_SYSTEM_NEUTRAL(msg) function ACDFrame:CHAT_MSG_BG_SYSTEM_NEUTRAL(msg)
if (str_find(msg, "L'ar\195\168ne ouvre ses portes dans 60 secondes !")) then for k,v in pairs(self.locale) do
self.countdown = 61 if str_find(msg, v) then
return if k == 0 then
ACDFrame:Reset()
else
self.countdown = k
end end
if (str_find(msg, "L'ar\195\168ne ouvre ses portes dans 30 secondes !")) then
self.countdown = 31
return
end end
if (str_find(msg, "L'ar\195\168ne ouvre ses portes dans 15 secondes !")) then
self.countdown = 16
return
end
if (str_find(msg, "L'ar\195\168ne ouvre ses portes dans 10 secondes !")) then
self.countdown = 11
return
end
if (str_find(msg, "One minute until the Arena battle begins!")) then
self.countdown = 61
return
end
if (str_find(msg, "Thirty seconds until the Arena battle begins!")) then
self.countdown = 31
return
end
if (str_find(msg, "Fifteen seconds until the Arena battle begins!")) then
self.countdown = 16
return
end
if (str_find(msg, "Ten seconds until the Arena battle begins!")) then
self.countdown = 10
return
end
if (str_find(msg, "The Arena battle has begun!")) then
ACDFrame:SetScript("OnUpdate", nil)
return
end end
end end
@ -153,6 +147,7 @@ function ACDFrame:Test()
end end
function ACDFrame:Reset() function ACDFrame:Reset()
self.endTime = 0
self.countdown = 0 self.countdown = 0
self:UnregisterEvent("CHAT_MSG_BG_SYSTEM_NEUTRAL") self:UnregisterEvent("CHAT_MSG_BG_SYSTEM_NEUTRAL")
self:SetScript("OnUpdate", nil) self:SetScript("OnUpdate", nil)
@ -171,7 +166,7 @@ function ACDFrame:GetOptions()
}, },
countdown = Gladdy:option({ countdown = Gladdy:option({
type = "toggle", type = "toggle",
name = L["Turn on/off"], name = L["Enabled"],
desc = L["Turns countdown before the start of an arena match on/off."], desc = L["Turns countdown before the start of an arena match on/off."],
order = 3, order = 3,
width = "full", width = "full",
@ -186,3 +181,66 @@ function ACDFrame:GetOptions()
}), }),
} }
end end
ACDFrame.locales = {
["default"] = {
[61] = "One minute until the Arena battle begins!",
[31] = "Thirty seconds until the Arena battle begins!",
[16] = "Fifteen seconds until the Arena battle begins!",
[0] = "The Arena battle has begun!",
},
["esES"] = {
[61] = "¡Un minuto hasta que dé comienzo la batalla en arena!",
[31] = "¡Treinta segundos hasta que comience la batalla en arena!",
[16] = "¡Quince segundos hasta que comience la batalla en arena!",
[0] = "¡La batalla en arena ha comenzado!",
},
["ptBR"] = {
[61] = "Um minuto até a batalha na Arena começar!",
[31] = "Trinta segundos até a batalha na Arena começar!",
[16] = "Quinze segundos até a batalha na Arena começar!",
[0] = "A batalha na Arena começou!",
},
["deDE"] = {
[61] = "Noch eine Minute bis der Arenakampf beginnt!",
[31] = "Noch dreißig Sekunden bis der Arenakampf beginnt!",
[16] = "Noch fünfzehn Sekunden bis der Arenakampf beginnt!",
[0] = "Der Arenakampf hat begonnen!",
},
["frFR"] = {
[60] = "Le combat d'arène commence dans une minute\194\160!",
[30] = "Le combat d'arène commence dans trente secondes\194\160!",
[15] = "Le combat d'arène commence dans quinze secondes\194\160!",
[0] = "Le combat d'arène commence\194\160!",
},
["ruRU"] = {
[61] = "Одна минута до начала боя на арене!",
[31] = "Тридцать секунд до начала боя на арене!",
[16] = "До начала боя на арене осталось 15 секунд.",
[0] = "Бой начался!",
},
["itIT"] = { -- TODO
-- Beta has no itIT version available?
},
["koKR"] = {
[61] = "투기장 전투 시작 1분 전입니다!",
[31] = "투기장 전투 시작 30초 전입니다!",
[16] = "투기장 전투 시작 15초 전입니다!",
[0] = "투기장 전투가 시작되었습니다!",
},
["zhCN"] = {
[61] = "竞技场战斗将在一分钟后开始!",
[31] = "竞技场战斗将在三十秒后开始!",
[16] = "竞技场战斗将在十五秒后开始!",
[0] = "竞技场的战斗开始了!",
},
["zhTW"] = {
[61] = "1分鐘後競技場戰鬥開始!",
[31] = "30秒後競技場戰鬥開始!",
[16] = "15秒後競技場戰鬥開始!",
[0] = "競技場戰鬥開始了!",
},
}
ACDFrame.locales["esMX"] = ACDFrame.locales["esES"]
ACDFrame.locales["ptPT"] = ACDFrame.locales["ptBR"]

View File

@ -42,7 +42,7 @@ function Auras:Initialize()
end end
function Auras:CreateFrame(unit) function Auras:CreateFrame(unit)
local auraFrame = CreateFrame("Frame", nil, Gladdy.modules.Classicon.frames[unit]) local auraFrame = CreateFrame("Frame", nil, Gladdy.modules["Class Icon"].frames[unit])
auraFrame:EnableMouse(false) auraFrame:EnableMouse(false)
auraFrame:SetFrameStrata("MEDIUM") auraFrame:SetFrameStrata("MEDIUM")
auraFrame:SetFrameLevel(3) auraFrame:SetFrameLevel(3)
@ -68,7 +68,7 @@ function Auras:CreateFrame(unit)
auraFrame.icon.overlay:SetAllPoints(auraFrame) auraFrame.icon.overlay:SetAllPoints(auraFrame)
auraFrame.icon.overlay:SetTexture(Gladdy.db.buttonBorderStyle) auraFrame.icon.overlay:SetTexture(Gladdy.db.buttonBorderStyle)
local classIcon = Gladdy.modules.Classicon.frames[unit] local classIcon = Gladdy.modules["Class Icon"].frames[unit]
auraFrame:ClearAllPoints() auraFrame:ClearAllPoints()
auraFrame:SetAllPoints(classIcon) auraFrame:SetAllPoints(classIcon)
@ -106,7 +106,7 @@ function Auras:UpdateFrame(unit)
auraFrame:SetWidth(width) auraFrame:SetWidth(width)
auraFrame:SetHeight(height) auraFrame:SetHeight(height)
auraFrame:SetAllPoints(Gladdy.modules.Classicon.frames[unit]) auraFrame:SetAllPoints(Gladdy.modules["Class Icon"].frames[unit])
auraFrame.cooldown:SetWidth(width - width/16) auraFrame.cooldown:SetWidth(width - width/16)
auraFrame.cooldown:SetHeight(height - height/16) auraFrame.cooldown:SetHeight(height - height/16)
@ -238,12 +238,12 @@ function Auras:GetOptions()
group = { group = {
type = "group", type = "group",
childGroups = "tree", childGroups = "tree",
name = "Frame", name = L["Frame"],
order = 3, order = 3,
args = { args = {
cooldown = { cooldown = {
type = "group", type = "group",
name = "Cooldown", name = L["Cooldown"],
order = 1, order = 1,
args = { args = {
headerAuras = { headerAuras = {
@ -272,6 +272,11 @@ function Auras:GetOptions()
name = L["Font"], name = L["Font"],
order = 2, order = 2,
args = { args = {
headerAuras = {
type = "header",
name = L["Font"],
order = 1,
},
auraFont = Gladdy:option({ auraFont = Gladdy:option({
type = "select", type = "select",
name = L["Font"], name = L["Font"],
@ -300,7 +305,7 @@ function Auras:GetOptions()
}, },
border = { border = {
type = "group", type = "group",
name = "Border", name = L["Border"],
order = 3, order = 3,
args = { args = {
headerAuras = { headerAuras = {
@ -356,7 +361,7 @@ function Auras:GetAuraOptions(auraType)
ckeckAll = { ckeckAll = {
order = 1, order = 1,
width = "0.7", width = "0.7",
name = "Check All", name = L["Check All"],
type = "execute", type = "execute",
func = function(info) func = function(info)
for k,v in pairs(defaultSpells(auraType)) do for k,v in pairs(defaultSpells(auraType)) do
@ -367,7 +372,7 @@ function Auras:GetAuraOptions(auraType)
uncheckAll = { uncheckAll = {
order = 2, order = 2,
width = "0.7", width = "0.7",
name = "Uncheck All", name = L["Uncheck All"],
type = "execute", type = "execute",
func = function(info) func = function(info)
for k,v in pairs(defaultSpells(auraType)) do for k,v in pairs(defaultSpells(auraType)) do

View File

@ -25,7 +25,7 @@ local LibClassAuras = LibStub("LibClassAuras-1.0")
local L = Gladdy.L local L = Gladdy.L
local defaultTrackedDebuffs = select(2, Gladdy:GetAuras(AURA_TYPE_DEBUFF)) local defaultTrackedDebuffs = select(2, Gladdy:GetAuras(AURA_TYPE_DEBUFF))
local defaultTrackedBuffs = select(2, Gladdy:GetAuras(AURA_TYPE_BUFF)) local defaultTrackedBuffs = select(2, Gladdy:GetAuras(AURA_TYPE_BUFF))
local BuffsDebuffs = Gladdy:NewModule("BuffsDebuffs", nil, { local BuffsDebuffs = Gladdy:NewModule("Buffs and Debuffs", nil, {
buffsEnabled = true, buffsEnabled = true,
buffsShowAuraDebuffs = false, buffsShowAuraDebuffs = false,
buffsAlpha = 1, buffsAlpha = 1,
@ -623,7 +623,7 @@ function BuffsDebuffs:GetOptions()
}, },
buffsEnabled = Gladdy:option({ buffsEnabled = Gladdy:option({
type = "toggle", type = "toggle",
name = L["Enable"], name = L["Enabled"],
desc = L["Enabled Buffs and Debuffs module"], desc = L["Enabled Buffs and Debuffs module"],
order = 3, order = 3,
}), }),
@ -636,7 +636,7 @@ function BuffsDebuffs:GetOptions()
group = { group = {
type = "group", type = "group",
childGroups = "tree", childGroups = "tree",
name = "Frame", name = L["Frame"],
order = 5, order = 5,
args = { args = {
buffs = { buffs = {
@ -646,7 +646,7 @@ function BuffsDebuffs:GetOptions()
args = { args = {
size = { size = {
type = "group", type = "group",
name = "Size & Padding", name = L["Size & Padding"],
order = 1, order = 1,
args = { args = {
header = { header = {
@ -685,7 +685,7 @@ function BuffsDebuffs:GetOptions()
}, },
position = { position = {
type = "group", type = "group",
name = "Position", name = L["Position"],
order = 3, order = 3,
args = { args = {
header = { header = {
@ -762,7 +762,7 @@ function BuffsDebuffs:GetOptions()
args = { args = {
size = { size = {
type = "group", type = "group",
name = "Size & Padding", name = L["Size & Padding"],
order = 1, order = 1,
args = { args = {
header = { header = {
@ -801,7 +801,7 @@ function BuffsDebuffs:GetOptions()
}, },
position = { position = {
type = "group", type = "group",
name = "Position", name = L["Position"],
order = 3, order = 3,
args = { args = {
header = { header = {
@ -873,7 +873,7 @@ function BuffsDebuffs:GetOptions()
}, },
cooldown = { cooldown = {
type = "group", type = "group",
name = "Cooldown", name = L["Cooldown"],
order = 3, order = 3,
args = { args = {
header = { header = {
@ -885,6 +885,7 @@ function BuffsDebuffs:GetOptions()
type = "toggle", type = "toggle",
name = L["No Cooldown Circle"], name = L["No Cooldown Circle"],
order = 9, order = 9,
width = "full",
}), }),
buffsCooldownAlpha = Gladdy:option({ buffsCooldownAlpha = Gladdy:option({
type = "range", type = "range",

View File

@ -18,7 +18,7 @@ local BackdropTemplateMixin = BackdropTemplateMixin
local Gladdy = LibStub("Gladdy") local Gladdy = LibStub("Gladdy")
local L = Gladdy.L local L = Gladdy.L
local AceGUIWidgetLSMlists = AceGUIWidgetLSMlists local AceGUIWidgetLSMlists = AceGUIWidgetLSMlists
local Castbar = Gladdy:NewModule("Castbar", 70, { local Castbar = Gladdy:NewModule("Cast Bar", 70, {
castBarHeight = 20, castBarHeight = 20,
castBarWidth = 160, castBarWidth = 160,
castBarIconSize = 22, castBarIconSize = 22,
@ -519,7 +519,7 @@ local function option(params)
set = function(info, value) set = function(info, value)
local key = info.arg or info[#info] local key = info.arg or info[#info]
Gladdy.dbi.profile[key] = value Gladdy.dbi.profile[key] = value
Gladdy.options.args.Castbar.args.group.args.barFrame.args.castBarBorderSize.max = Gladdy.db.castBarHeight/2 Gladdy.options.args["Cast Bar"].args.group.args.barFrame.args.castBarBorderSize.max = Gladdy.db.castBarHeight/2
if Gladdy.db.castBarBorderSize > Gladdy.db.castBarHeight/2 then if Gladdy.db.castBarBorderSize > Gladdy.db.castBarHeight/2 then
Gladdy.db.castBarBorderSize = Gladdy.db.castBarHeight/2 Gladdy.db.castBarBorderSize = Gladdy.db.castBarHeight/2
end end
@ -544,12 +544,12 @@ function Castbar:GetOptions()
group = { group = {
type = "group", type = "group",
childGroups = "tree", childGroups = "tree",
name = "Frame", name = L["Frame"],
order = 3, order = 3,
args = { args = {
barFrame = { barFrame = {
type = "group", type = "group",
name = "Bar", name = L["Bar"],
order = 1, order = 1,
args = { args = {
headerSize = { headerSize = {
@ -632,7 +632,7 @@ function Castbar:GetOptions()
}, },
icon = { icon = {
type = "group", type = "group",
name = "Icon", name = L["Icon"],
order = 2, order = 2,
args = { args = {
headerSize = { headerSize = {
@ -669,7 +669,7 @@ function Castbar:GetOptions()
}, },
spark = { spark = {
type = "group", type = "group",
name = "Spark", name = L["Spark"],
order = 3, order = 3,
args = { args = {
header = { header = {
@ -693,7 +693,7 @@ function Castbar:GetOptions()
}, },
font = { font = {
type = "group", type = "group",
name = "Font", name = L["Font"],
order = 4, order = 4,
args = { args = {
header = { header = {
@ -743,7 +743,7 @@ function Castbar:GetOptions()
}, },
position = { position = {
type = "group", type = "group",
name = "Position", name = L["Position"],
order = 5, order = 5,
args = { args = {
header = { header = {

View File

@ -4,7 +4,7 @@ local Gladdy = LibStub("Gladdy")
local CreateFrame = CreateFrame local CreateFrame = CreateFrame
local GetSpellInfo = GetSpellInfo local GetSpellInfo = GetSpellInfo
local L = Gladdy.L local L = Gladdy.L
local Classicon = Gladdy:NewModule("Classicon", 80, { local Classicon = Gladdy:NewModule("Class Icon", 80, {
classIconPos = "LEFT", classIconPos = "LEFT",
classIconSize = 60 + 20 + 1, classIconSize = 60 + 20 + 1,
classIconWidthFactor = 0.9, classIconWidthFactor = 0.9,
@ -195,7 +195,7 @@ function Classicon:GetOptions()
group = { group = {
type = "group", type = "group",
childGroups = "tree", childGroups = "tree",
name = "Frame", name = L["Frame"],
order = 4, order = 4,
args = { args = {
size = { size = {

View File

@ -107,21 +107,21 @@ end
function CombatIndicator:GetOptions() function CombatIndicator:GetOptions()
return { return {
headerTrinket = { header = {
type = "header", type = "header",
name = L["Racial"], name = L["Combat Indicator"],
order = 2, order = 2,
}, },
ciEnabled = Gladdy:option({ ciEnabled = Gladdy:option({
type = "toggle", type = "toggle",
name = L["Enabled"], name = L["Enabled"],
desc = L["Enable ci icon"], desc = L["Enable Combat Indicator icon"],
order = 3, order = 3,
}), }),
group = { group = {
type = "group", type = "group",
childGroups = "tree", childGroups = "tree",
name = "Frame", name = L["Frame"],
order = 4, order = 4,
args = { args = {
general = { general = {

View File

@ -576,14 +576,14 @@ function Cooldowns:GetOptions()
}, },
cooldown = Gladdy:option({ cooldown = Gladdy:option({
type = "toggle", type = "toggle",
name = L["Enable"], name = L["Enabled"],
desc = L["Enabled cooldown module"], desc = L["Enabled cooldown module"],
order = 2, order = 2,
}), }),
group = { group = {
type = "group", type = "group",
childGroups = "tree", childGroups = "tree",
name = "Frame", name = L["Frame"],
order = 3, order = 3,
args = { args = {
icon = { icon = {
@ -646,6 +646,7 @@ function Cooldowns:GetOptions()
type = "toggle", type = "toggle",
name = L["No Cooldown Circle"], name = L["No Cooldown Circle"],
order = 8, order = 8,
width = "full",
}), }),
cooldownCooldownAlpha = Gladdy:option({ cooldownCooldownAlpha = Gladdy:option({
type = "range", type = "range",
@ -778,7 +779,7 @@ function Cooldowns:GetOptions()
cooldowns = { cooldowns = {
type = "group", type = "group",
childGroups = "tree", childGroups = "tree",
name = "Cooldowns", name = L["Cooldowns"],
order = 4, order = 4,
args = Cooldowns:GetCooldownOptions(), args = Cooldowns:GetCooldownOptions(),
}, },

View File

@ -359,14 +359,14 @@ function Diminishings:GetOptions()
}, },
drEnabled = Gladdy:option({ drEnabled = Gladdy:option({
type = "toggle", type = "toggle",
name = L["Enable"], name = L["Enabled"],
desc = L["Enabled DR module"], desc = L["Enabled DR module"],
order = 3, order = 3,
}), }),
group = { group = {
type = "group", type = "group",
childGroups = "tree", childGroups = "tree",
name = "Frame", name = L["Frame"],
order = 4, order = 4,
args = { args = {
icon = { icon = {
@ -422,6 +422,7 @@ function Diminishings:GetOptions()
type = "toggle", type = "toggle",
name = L["No Cooldown Circle"], name = L["No Cooldown Circle"],
order = 8, order = 8,
width = "full",
}), }),
drCooldownAlpha = Gladdy:option({ drCooldownAlpha = Gladdy:option({
type = "range", type = "range",

View File

@ -8,7 +8,7 @@ local RAID_CLASS_COLORS = RAID_CLASS_COLORS
local Gladdy = LibStub("Gladdy") local Gladdy = LibStub("Gladdy")
local L = Gladdy.L local L = Gladdy.L
local AceGUIWidgetLSMlists = AceGUIWidgetLSMlists local AceGUIWidgetLSMlists = AceGUIWidgetLSMlists
local Healthbar = Gladdy:NewModule("Healthbar", 100, { local Healthbar = Gladdy:NewModule("Health Bar", 100, {
healthBarFont = "DorisPP", healthBarFont = "DorisPP",
healthBarHeight = 60, healthBarHeight = 60,
healthBarTexture = "Smooth", healthBarTexture = "Smooth",
@ -98,8 +98,9 @@ function Healthbar.OnEvent(self, event, unit)
if event == "UNIT_HEALTH" then if event == "UNIT_HEALTH" then
local health = UnitHealth(unit) local health = UnitHealth(unit)
local healthMax = UnitHealthMax(unit) local healthMax = UnitHealthMax(unit)
Healthbar:SetHealthText(self, health, healthMax) self.hp:SetMinMaxValues(0, healthMax)
self.hp:SetValue(UnitHealth(unit)) self.hp:SetValue(UnitHealth(unit))
Healthbar:SetHealthText(self, health, healthMax)
elseif event == "UNIT_MAXHEALTH" then elseif event == "UNIT_MAXHEALTH" then
local health = UnitHealth(unit) local health = UnitHealth(unit)
local healthMax = UnitHealthMax(unit) local healthMax = UnitHealthMax(unit)
@ -109,8 +110,10 @@ function Healthbar.OnEvent(self, event, unit)
elseif event == "UNIT_NAME_UPDATE" then elseif event == "UNIT_NAME_UPDATE" then
local name = UnitName(unit) local name = UnitName(unit)
Gladdy.buttons[unit].name = name Gladdy.buttons[unit].name = name
if Gladdy.db.healthName and not Gladdy.db.healthNameToArenaId then
self.nameText:SetText(name) self.nameText:SetText(name)
end end
end
if not Gladdy.buttons[unit].class then if not Gladdy.buttons[unit].class then
Gladdy:SpotEnemy(unit, true) Gladdy:SpotEnemy(unit, true)
end end
@ -316,7 +319,7 @@ local function option(params)
set = function(info, value) set = function(info, value)
local key = info.arg or info[#info] local key = info.arg or info[#info]
Gladdy.dbi.profile[key] = value Gladdy.dbi.profile[key] = value
Gladdy.options.args.Healthbar.args.group.args.border.args.healthBarBorderSize.max = Gladdy.db.healthBarHeight/2 Gladdy.options.args["Health Bar"].args.group.args.border.args.healthBarBorderSize.max = Gladdy.db.healthBarHeight/2
if Gladdy.db.healthBarBorderSize > Gladdy.db.healthBarHeight/2 then if Gladdy.db.healthBarBorderSize > Gladdy.db.healthBarHeight/2 then
Gladdy.db.healthBarBorderSize = Gladdy.db.healthBarHeight/2 Gladdy.db.healthBarBorderSize = Gladdy.db.healthBarHeight/2
end end
@ -344,7 +347,7 @@ function Healthbar:GetOptions()
group = { group = {
type = "group", type = "group",
childGroups = "tree", childGroups = "tree",
name = "Frame", name = L["Frame"],
order = 3, order = 3,
args = { args = {
general = { general = {
@ -478,12 +481,14 @@ function Healthbar:GetOptions()
name = L["Show name text"], name = L["Show name text"],
desc = L["Show the units name"], desc = L["Show the units name"],
order = 2, order = 2,
width = "full",
}), }),
healthNameToArenaId = option({ healthNameToArenaId = option({
type = "toggle", type = "toggle",
name = L["Show ArenaX"], name = L["Show ArenaX"],
desc = L["Show Arena1-5 as name instead"], desc = L["Show Arena1-5 as name instead"],
order = 3, order = 3,
width = "full",
disabled = function() return not Gladdy.db.healthName end disabled = function() return not Gladdy.db.healthName end
}), }),
healthActual = option({ healthActual = option({
@ -491,18 +496,21 @@ function Healthbar:GetOptions()
name = L["Show the actual health"], name = L["Show the actual health"],
desc = L["Show the actual health on the health bar"], desc = L["Show the actual health on the health bar"],
order = 4, order = 4,
width = "full",
}), }),
healthMax = option({ healthMax = option({
type = "toggle", type = "toggle",
name = L["Show max health"], name = L["Show max health"],
desc = L["Show max health on the health bar"], desc = L["Show max health on the health bar"],
order = 5, order = 5,
width = "full",
}), }),
healthPercentage = option({ healthPercentage = option({
type = "toggle", type = "toggle",
name = L["Show health percentage"], name = L["Show health percentage"],
desc = L["Show health percentage on the health bar"], desc = L["Show health percentage on the health bar"],
order = 6, order = 6,
width = "full",
}), }),
}, },
}, },

View File

@ -52,7 +52,7 @@ function Highlight:CreateFrame(unit)
return return
end end
local healthBar = Gladdy.modules.Healthbar.frames[unit] local healthBar = Gladdy.modules["Health Bar"].frames[unit]
local targetBorder = CreateFrame("Frame", nil, button, BackdropTemplateMixin and "BackdropTemplate") local targetBorder = CreateFrame("Frame", nil, button, BackdropTemplateMixin and "BackdropTemplate")
targetBorder:SetBackdrop({ edgeFile = Gladdy.LSM:Fetch("border", Gladdy.db.highlightBorderStyle), edgeSize = Gladdy.db.highlightBorderSize }) targetBorder:SetBackdrop({ edgeFile = Gladdy.LSM:Fetch("border", Gladdy.db.highlightBorderStyle), edgeSize = Gladdy.db.highlightBorderSize })
@ -241,16 +241,9 @@ function Highlight:GetOptions()
order = 8, order = 8,
hasAlpha = true, hasAlpha = true,
}), }),
leaderBorderColor = Gladdy:colorOption({
type = "color",
name = L["Raid leader border color"],
desc = L["Color of the raid leader border"],
order = 9,
hasAlpha = true,
}),
headerEnable = { headerEnable = {
type = "header", type = "header",
name = L["Enable/Disable"], name = L["Enabled"],
order = 10, order = 10,
}, },
highlight = Gladdy:option({ highlight = Gladdy:option({
@ -258,24 +251,21 @@ function Highlight:GetOptions()
name = L["Highlight target"], name = L["Highlight target"],
desc = L["Toggle if the selected target should be highlighted"], desc = L["Toggle if the selected target should be highlighted"],
order = 11, order = 11,
width = "full",
}), }),
targetBorder = Gladdy:option({ targetBorder = Gladdy:option({
type = "toggle", type = "toggle",
name = L["Show border around target"], name = L["Show border around target"],
desc = L["Toggle if a border should be shown around the selected target"], desc = L["Toggle if a border should be shown around the selected target"],
order = 12, order = 12,
width = "full",
}), }),
focusBorder = Gladdy:option({ focusBorder = Gladdy:option({
type = "toggle", type = "toggle",
name = L["Show border around focus"], name = L["Show border around focus"],
desc = L["Toggle of a border should be shown around the current focus"], desc = L["Toggle of a border should be shown around the current focus"],
order = 13, order = 13,
}), width = "full",
leaderBorder = Gladdy:option({
type = "toggle",
name = L["Show border around raid leader"],
desc = L["Toggle if a border should be shown around the raid leader"],
order = 14,
}), }),
} }
end end

View File

@ -333,21 +333,21 @@ end
function Pets:GetOptions() function Pets:GetOptions()
return { return {
headerHealthbar = { header = {
type = "header", type = "header",
name = L["Health Bar"], name = L["Pets"],
order = 2, order = 2,
}, },
petEnabled = Gladdy:option({ petEnabled = Gladdy:option({
type = "toggle", type = "toggle",
name = L["Enable"], name = L["Enabled"],
desc = L["Enabled Pets module"], desc = L["Enables Pets module"],
order = 3, order = 3,
}), }),
group = { group = {
type = "group", type = "group",
childGroups = "tree", childGroups = "tree",
name = "Frame", name = L["Frame"],
order = 3, order = 3,
args = { args = {
general = { general = {

View File

@ -6,7 +6,7 @@ local CreateFrame, UnitPower, UnitPowerType, UnitPowerMax, UnitExists = CreateFr
local Gladdy = LibStub("Gladdy") local Gladdy = LibStub("Gladdy")
local L = Gladdy.L local L = Gladdy.L
local AceGUIWidgetLSMlists = AceGUIWidgetLSMlists local AceGUIWidgetLSMlists = AceGUIWidgetLSMlists
local Powerbar = Gladdy:NewModule("Powerbar", 90, { local Powerbar = Gladdy:NewModule("Power Bar", 90, {
powerBarFont = "DorisPP", powerBarFont = "DorisPP",
powerBarHeight = 20, powerBarHeight = 20,
powerBarTexture = "Smooth", powerBarTexture = "Smooth",
@ -132,7 +132,7 @@ function Powerbar:UpdateFrame(unit)
return return
end end
local healthBar = Gladdy.modules.Healthbar.frames[unit] local healthBar = Gladdy.modules["Health Bar"].frames[unit]
powerBar.bg:SetTexture(Gladdy.LSM:Fetch("statusbar", Gladdy.db.powerBarTexture)) powerBar.bg:SetTexture(Gladdy.LSM:Fetch("statusbar", Gladdy.db.powerBarTexture))
@ -290,7 +290,7 @@ local function option(params)
set = function(info, value) set = function(info, value)
local key = info.arg or info[#info] local key = info.arg or info[#info]
Gladdy.dbi.profile[key] = value Gladdy.dbi.profile[key] = value
Gladdy.options.args.Powerbar.args.group.args.border.args.powerBarBorderSize.max = Gladdy.db.powerBarHeight/2 Gladdy.options.args["Power Bar"].args.group.args.border.args.powerBarBorderSize.max = Gladdy.db.powerBarHeight/2
if Gladdy.db.powerBarBorderSize > Gladdy.db.powerBarHeight/2 then if Gladdy.db.powerBarBorderSize > Gladdy.db.powerBarHeight/2 then
Gladdy.db.powerBarBorderSize = Gladdy.db.powerBarHeight/2 Gladdy.db.powerBarBorderSize = Gladdy.db.powerBarHeight/2
end end
@ -318,7 +318,7 @@ function Powerbar:GetOptions()
group = { group = {
type = "group", type = "group",
childGroups = "tree", childGroups = "tree",
name = "Frame", name = L["Frame"],
order = 3, order = 3,
args = { args = {
general = { general = {

View File

@ -226,7 +226,7 @@ function Racial:GetOptions()
group = { group = {
type = "group", type = "group",
childGroups = "tree", childGroups = "tree",
name = "Frame", name = L["Frame"],
order = 4, order = 4,
args = { args = {
general = { general = {
@ -271,6 +271,7 @@ function Racial:GetOptions()
type = "toggle", type = "toggle",
name = L["No Cooldown Circle"], name = L["No Cooldown Circle"],
order = 7, order = 7,
width = "full",
}), }),
racialCooldownAlpha = Gladdy:option({ racialCooldownAlpha = Gladdy:option({
type = "range", type = "range",
@ -318,7 +319,7 @@ function Racial:GetOptions()
args = { args = {
header = { header = {
type = "header", type = "header",
name = L["Position"], name = L["Icon position"],
order = 4, order = 4,
}, },
racialAnchor = Gladdy:option({ racialAnchor = Gladdy:option({
@ -335,7 +336,7 @@ function Racial:GetOptions()
}), }),
racialPos = Gladdy:option({ racialPos = Gladdy:option({
type = "select", type = "select",
name = L["Position"], name = L["Icon position"],
desc = L["This changes position relative to its anchor of the racial icon"], desc = L["This changes position relative to its anchor of the racial icon"],
order = 21, order = 21,
values = { values = {

View File

@ -77,6 +77,13 @@ local localizedTotemData = {
[string_lower(select(1, GetSpellInfo(3738)))] = totemData[string_lower("Wrath of Air Totem")], -- Wrath of Air Totem [string_lower(select(1, GetSpellInfo(3738)))] = totemData[string_lower("Wrath of Air Totem")], -- Wrath of Air Totem
[string_lower(select(1, GetSpellInfo(25908)))] = totemData[string_lower("Tranquil Air Totem")], -- Tranquil Air Totem [string_lower(select(1, GetSpellInfo(25908)))] = totemData[string_lower("Tranquil Air Totem")], -- Tranquil Air Totem
}, },
["frFR"] = {
[string_lower("Totem d'\195\169lementaire de terre")] = totemData[string_lower("Earth Elemental Totem")], -- Earth Elemental Totem
[string_lower("Totem d'\195\169lementaire de feu")] = totemData[string_lower("Fire Elemental Totem")], -- Fire Elemental Totem
},
["ruRU"] = {
[string_lower("")] = totemData[string_lower("Sentry Totem")], -- Sentry Totem
}
} }
local function GetTotemColorDefaultOptions() local function GetTotemColorDefaultOptions()
@ -106,7 +113,7 @@ local function GetTotemColorDefaultOptions()
}, },
enabled = { enabled = {
order = 2, order = 2,
name = "Enabled", name = L["Enabled"],
desc = "Enable " .. format("|T%s:20|t %s", indexedList[i].texture, select(1, GetSpellInfo(indexedList[i].id))), desc = "Enable " .. format("|T%s:20|t %s", indexedList[i].texture, select(1, GetSpellInfo(indexedList[i].id))),
type = "toggle", type = "toggle",
width = "full", width = "full",
@ -286,7 +293,7 @@ function TotemPlates:NAME_PLATE_UNIT_ADDED(...)
totemName = string_gsub(totemName, "%s+[I,V,X]+$", "") --trim rank totemName = string_gsub(totemName, "%s+[I,V,X]+$", "") --trim rank
totemName = string_lower(totemName) totemName = string_lower(totemName)
local nameplate = C_NamePlate.GetNamePlateForUnit(unitID) local nameplate = C_NamePlate.GetNamePlateForUnit(unitID)
local totemDataEntry = localizedTotemData["default"][totemName] local totemDataEntry = localizedTotemData["default"][totemName] or localizedTotemData["frFR"][totemName] or localizedTotemData["ruRU"][totemName]
if totemDataEntry and Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].enabled then-- modify this nameplates if totemDataEntry and Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].enabled then-- modify this nameplates
if #self.totemPlateCache > 0 then if #self.totemPlateCache > 0 then
@ -384,12 +391,12 @@ function TotemPlates:GetOptions()
return { return {
headerTotems = { headerTotems = {
type = "header", type = "header",
name = L["Totem General"], name = L["Totem Plates"],
order = 2, order = 2,
}, },
npTotems = Gladdy:option({ npTotems = Gladdy:option({
type = "toggle", type = "toggle",
name = L["Totem icons on/off"], name = L["Enabled"],
desc = L["Turns totem icons instead of nameplates on or off. (Requires reload)"], desc = L["Turns totem icons instead of nameplates on or off. (Requires reload)"],
order = 3, order = 3,
width = 0.9, width = 0.9,
@ -411,7 +418,7 @@ function TotemPlates:GetOptions()
group = { group = {
type = "group", type = "group",
childGroups = "tree", childGroups = "tree",
name = "Frame", name = L["Frame"],
order = 4, order = 4,
args = { args = {
icon = { icon = {
@ -590,7 +597,7 @@ function TotemPlates:GetOptions()
}, },
npTotemColors = { npTotemColors = {
order = 50, order = 50,
name = "Customize Totems", name = L["Customize Totems"],
type = "group", type = "group",
childGroups = "tree", childGroups = "tree",
args = select(2, Gladdy:GetTotemColors()) args = select(2, Gladdy:GetTotemColors())

View File

@ -229,7 +229,7 @@ function Trinket:GetOptions()
group = { group = {
type = "group", type = "group",
childGroups = "tree", childGroups = "tree",
name = "Frame", name = L["Frame"],
order = 4, order = 4,
args = { args = {
general = { general = {
@ -240,11 +240,11 @@ function Trinket:GetOptions()
header = { header = {
type = "header", type = "header",
name = L["Size"], name = L["Size"],
order = 4, order = 1,
}, },
trinketSize = Gladdy:option({ trinketSize = Gladdy:option({
type = "range", type = "range",
name = L["Trinket size"], name = L["Size"],
min = 5, min = 5,
max = 100, max = 100,
step = 1, step = 1,
@ -274,6 +274,7 @@ function Trinket:GetOptions()
type = "toggle", type = "toggle",
name = L["No Cooldown Circle"], name = L["No Cooldown Circle"],
order = 7, order = 7,
width = "full",
}), }),
trinketCooldownAlpha = Gladdy:option({ trinketCooldownAlpha = Gladdy:option({
type = "range", type = "range",
@ -321,12 +322,12 @@ function Trinket:GetOptions()
args = { args = {
header = { header = {
type = "header", type = "header",
name = L["Position"], name = L["Icon position"],
order = 4, order = 4,
}, },
trinketPos = Gladdy:option({ trinketPos = Gladdy:option({
type = "select", type = "select",
name = L["Trinket position"], name = L["Icon position"],
desc = L["This changes positions of the trinket"], desc = L["This changes positions of the trinket"],
order = 21, order = 21,
values = { values = {

View File

@ -48,7 +48,7 @@ function XiconProfiles:GetOptions()
return { return {
headerProfileBlizzard = { headerProfileBlizzard = {
type = "header", type = "header",
name = L["Blizzard Profile"], name = "Blizzard " .. L["Profile"],
order = 2, order = 2,
}, },
blizzardProfile = { blizzardProfile = {
@ -58,7 +58,7 @@ function XiconProfiles:GetOptions()
XiconProfiles:ApplyBlizz() XiconProfiles:ApplyBlizz()
end, end,
name = " ", name = " ",
desc = "Blizzard Profile", desc = "Blizzard " .. L["Profile"],
image = "Interface\\AddOns\\Gladdy\\Images\\BasicProfiles\\Blizz1.blp", image = "Interface\\AddOns\\Gladdy\\Images\\BasicProfiles\\Blizz1.blp",
imageWidth = 350, imageWidth = 350,
imageHeight = 175, imageHeight = 175,
@ -67,7 +67,7 @@ function XiconProfiles:GetOptions()
}, },
headerProfileClassic = { headerProfileClassic = {
type = "header", type = "header",
name = L["Classic Profile"], name = "Classic " .. L["Profile"],
order = 4, order = 4,
}, },
classicProfile = { classicProfile = {
@ -77,7 +77,7 @@ function XiconProfiles:GetOptions()
XiconProfiles:ApplyClassic() XiconProfiles:ApplyClassic()
end, end,
name = " ", name = " ",
desc = "Classic Profile", desc = "Classic " .. L["Profile"],
image = "Interface\\AddOns\\Gladdy\\Images\\BasicProfiles\\Classic1.blp", image = "Interface\\AddOns\\Gladdy\\Images\\BasicProfiles\\Classic1.blp",
imageWidth = 350, imageWidth = 350,
imageHeight = 175, imageHeight = 175,
@ -86,7 +86,7 @@ function XiconProfiles:GetOptions()
}, },
headerProfileKnall = { headerProfileKnall = {
type = "header", type = "header",
name = L["Knall's Profile"], name = "Knall's " .. L["Profile"],
order = 6, order = 6,
}, },
knallProfile = { knallProfile = {
@ -96,7 +96,7 @@ function XiconProfiles:GetOptions()
XiconProfiles:ApplyKnall() XiconProfiles:ApplyKnall()
end, end,
name = " ", name = " ",
desc = "Knall's Profile", desc = "Knall's " .. L["Profile"],
image = "Interface\\AddOns\\Gladdy\\Images\\BasicProfiles\\Knall1.blp", image = "Interface\\AddOns\\Gladdy\\Images\\BasicProfiles\\Knall1.blp",
imageWidth = 350, imageWidth = 350,
imageHeight = 175, imageHeight = 175,
@ -105,7 +105,7 @@ function XiconProfiles:GetOptions()
}, },
headerProfileKlimp = { headerProfileKlimp = {
type = "header", type = "header",
name = L["Klimp's Profile"], name = "Klimp's " .. L["Profile"],
order = 8, order = 8,
}, },
klimpProfiles = { klimpProfiles = {
@ -118,7 +118,7 @@ function XiconProfiles:GetOptions()
imageWidth = 350, imageWidth = 350,
imageHeight = 175, imageHeight = 175,
name = " ", name = " ",
desc = "Klimp's Profile", desc = "Klimp's " .. L["Profile"],
width = "full", width = "full",
order = 9, order = 9,
}, },

View File

@ -114,7 +114,7 @@ function Gladdy:SetupModule(name, module, order)
self.options.args[name] = { self.options.args[name] = {
type = "group", type = "group",
name = L[name], name = L[name],
desc = L[name .. " settings"], desc = L[name] .. " " .. L["settings"],
childGroups = "tab", childGroups = "tab",
order = order, order = order,
args = {}, args = {},
@ -152,7 +152,7 @@ local function pairsByKeys(t)
for k in pairs(t) do for k in pairs(t) do
tinsert(a, k) tinsert(a, k)
end end
tsort(a) tsort(a, function(a, b) return L[a] < L[b] end)
local i = 0 local i = 0
return function() return function()
@ -207,7 +207,7 @@ function Gladdy:SetupOptions()
}, },
group = { group = {
type = "group", type = "group",
name = "General", name = L["General"],
order = 4, order = 4,
childGroups = "tree", childGroups = "tree",
args = { args = {

View File

@ -1,7 +1,7 @@
# Gladdy - TBC # Gladdy - TBC
### The most powerful arena addon for WoW TBC 2.5.1 ### The most powerful arena addon for WoW TBC 2.5.1
## [v1.09-Beta Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v1.09-Beta/Gladdy_TBC-Classic_v1.09-Beta.zip) ## [v1.10-Beta Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v1.10-Beta/Gladdy_TBC-Classic_v1.10-Beta.zip)
###### <a target="_blank" rel="noopener noreferrer" href="https://www.paypal.me/xiconqoo/10"><img src="https://raw.githubusercontent.com/XiconQoo/Gladdy/readme-media/Paypal-Donate.png" height="30" style="margin-top:-30px;position:relative;top:20px;"></a> Please consider donating if you like my work ###### <a target="_blank" rel="noopener noreferrer" href="https://www.paypal.me/xiconqoo/10"><img src="https://raw.githubusercontent.com/XiconQoo/Gladdy/readme-media/Paypal-Donate.png" height="30" style="margin-top:-30px;position:relative;top:20px;"></a> Please consider donating if you like my work
@ -39,6 +39,12 @@ The goal is to make Gladdy highly configurable in it's appearance. Everything ca
### Changes ### Changes
### v1.10-Beta
- fix german and russian client not working
- ArenaCountdown loacalization now working for all languages (except itIT...beta has no option to select italian)
- Race and Class localization working for all languages
- Localization finished for German
#### v1.09-Beta #### v1.09-Beta
- fix Blizzard profile not having all modules preconfigured - fix Blizzard profile not having all modules preconfigured