diff --git a/core.lua b/core.lua
index 1f474ca..5d44bf0 100644
--- a/core.lua
+++ b/core.lua
@@ -38,6 +38,7 @@ XIVBar.defaults = {
a = 0.25
},
useCC = false,
+ useTextCC = false,
useHoverCC = true,
hover = {
r = 1,
@@ -399,7 +400,7 @@ function XIVBar:GetGeneralOptions()
set = function(info, val) self.db.profile.general.moduleSpacing = val; self:Refresh(); end
},
ohHide = {
- name = 'Hide order hall bar',
+ name = L['Hide order hall bar'],
type = "toggle",
order = 2,
hidden = function() return self.db.profile.general.barPosition == "BOTTOM" end,
@@ -517,21 +518,37 @@ function XIVBar:GetTextColorOptions()
width = "double",
hasAlpha = true,
set = function(info, r, g, b, a)
+ if self.db.profile.color.useTextCC then
+ r,g,b,_=XIVBar:GetColor('normal')
+ end
XIVBar:SetColor('normal', r, g, b, a)
end,
get = function() return XIVBar:GetColor('normal') end
}, -- normal
+ textCC = {
+ name = L["Use Class Color for Text"],
+ desc = L["Only the alpha can be set with the color picker"],
+ type = "toggle",
+ order = 2,
+ set = function(_,val)
+ if val then
+ XIVBar:SetColor("normal",RAID_CLASS_COLORS[self.constants.playerClass].r,RAID_CLASS_COLORS[self.constants.playerClass].g,RAID_CLASS_COLORS[self.constants.playerClass].b,select(4,XIVBar:GetColor('normal')))
+ end
+ self.db.profile.color.useTextCC = val
+ end,
+ get = function() return self.db.profile.color.useTextCC end
+ },
hoverCC = {
name = L['Use Class Colors for Hover'],
type = "toggle",
- order = 2,
+ order = 3,
set = function(info, val) self.db.profile.color.useHoverCC = val; self:Refresh(); end,
get = function() return self.db.profile.color.useHoverCC end
}, -- normal
inactive = {
name = L['Inactive'],
type = "color",
- order = 3,
+ order = 4,
hasAlpha = true,
width = "double",
set = function(info, r, g, b, a)
@@ -542,7 +559,7 @@ function XIVBar:GetTextColorOptions()
hover = {
name = L['Hover'],
type = "color",
- order = 4,
+ order = 5,
hasAlpha = true,
set = function(info, r, g, b, a)
XIVBar:SetColor('hover', r, g, b, a)
diff --git a/locales/deDE.lua b/locales/deDE.lua
index 1a80392..fa48900 100644
--- a/locales/deDE.lua
+++ b/locales/deDE.lua
@@ -1,6 +1,7 @@
local AddOnName, Engine = ...;
local AceLocale = LibStub:GetLibrary("AceLocale-3.0");
-local L = AceLocale:NewLocale(AddOnName, "deDE", true, false);
+local L = AceLocale:NewLocale(AddOnName, "deDE", false, false);
+if not L then return end
L['Modules'] = "Module";
L['Left-Click'] = "Links-Klick";
@@ -14,6 +15,7 @@ L['Bar Color'] = "Leistenfarbe";
L['Use Class Colors for Bar'] = "Benutze Klassenfarbe für Leiste";
L['Bar Padding'] = "Leistenabstand";
L['Module Spacing'] = "Modulabstand";
+L['Hide order hall bar'] = true;
-- Positioning Options
L['Positioning Options'] = "Positions-Optionen";
@@ -32,6 +34,8 @@ L['Text Style'] = "Schriftstil";
L['Text Colors'] = "Textfarbe";
L['Normal'] = "Normal";
L['Inactive'] = "Inaktiv";
+L["Use Class Color for Text"] = true;
+L["Only the alpha can be set with the color picker"] = true;
L['Use Class Colors for Hover'] = "Benutze Klassenfarbe für Mouseover";
L['Hover'] = "Mouseover";
diff --git a/locales/enUS.lua b/locales/enUS.lua
index adc29a4..e503f27 100644
--- a/locales/enUS.lua
+++ b/locales/enUS.lua
@@ -14,6 +14,7 @@ L['Bar Color'] = true;
L['Use Class Colors for Bar'] = true;
L['Bar Padding'] = true;
L['Module Spacing'] = true;
+L['Hide order hall bar'] = true;
-- Positioning Options
L['Positioning Options'] = true;
@@ -32,6 +33,8 @@ L['Text Style'] = true;
L['Text Colors'] = true;
L['Normal'] = true;
L['Inactive'] = true;
+L["Use Class Color for Text"] = true;
+L["Only the alpha can be set with the color picker"] = true;
L['Use Class Colors for Hover'] = true;
L['Hover'] = true;
diff --git a/locales/frFR.lua b/locales/frFR.lua
new file mode 100644
index 0000000..e606bff
--- /dev/null
+++ b/locales/frFR.lua
@@ -0,0 +1,104 @@
+local AddOnName, Engine = ...;
+local AceLocale = LibStub:GetLibrary("AceLocale-3.0");
+local L = AceLocale:NewLocale(AddOnName, "frFR", false, false);
+if not L then return end
+
+L['Modules'] = "Modules";
+L['Left-Click'] = "Clic gauche";
+L['Right-Click'] = "Clic droit";
+
+-- General
+L['Bar Position'] = "Position de la barre";
+L['Top'] = "Haut";
+L['Bottom'] = "Bas";
+L['Bar Color'] = "Couleur de la barre";
+L['Use Class Colors for Bar'] = "Utiliser la couleur de classe pour la barre";
+L['Bar Padding'] = "Décalage de la barre";
+L['Module Spacing'] = "Espacement des modules";
+L['Hide order hall bar'] = "Cacher la barre du hall de classe";
+
+-- Positioning Options
+L['Positioning Options'] = "Options de positionnement";
+L['Horizontal Position'] = "Horizontal";
+L['Bar Width'] = "Longueur de la barre";
+L['Left'] = "Aligné à gauche";
+L['Center'] = "Centrer";
+L['Right'] = "Aligné à droite";
+
+-- Media
+L['Font'] = "Police";
+L['Small Font Size'] = "Taille de la petite police";
+L['Text Style'] = "Style du texte";
+
+-- Text Colors
+L['Text Colors'] = "Couleur du texte";
+L['Normal'] = "Normale";
+L['Use Class Color for Text'] = "Utiliser la couleur de classe pour le texte";
+L['Only the alpha can be set with the color picker'] = "Seul l'alpha peut être réglé avec la sélection de couleur";
+L['Inactive'] = "Inactif";
+L['Use Class Colors for Hover'] = "Utiliser la couleur de classe lors du survol";
+L['Hover'] = "Survol";
+
+-------------------- MODULES ---------------------------
+
+L['Micromenu'] = "Micro menu";
+L['Show Social Tooltips'] = "Montrer les bulles de contacts";
+L['Main Menu Icon Right Spacing'] = "Décalage à droite du micro menu";
+L['Icon Spacing'] = "Espacement des icônes";
+L['Open Guild Page'] = "Ouvrir la page de guilde";
+L['No Tag'] = "Aucun Tag";
+L['Hide Social Text'] = "Cacher le texte des contacts";
+
+L['Always Show Item Level'] = "Toujours montrer le niveau d'objet";
+L['Minimum Durability to Become Active'] = "Activation au minimum de durabilité";
+L['Maximum Durability to Show Item Level'] = "Durabilité maximum pour montrer le niveau d'item";
+
+L['Time Format'] = "Format de l'heure";
+L['Use Server Time'] = "Utiliser l'heure du serveur";
+L['New Event!'] = "Nouvel événement";
+L['Local Time'] = "Heure locale";
+L['Realm Time'] = "Heure du royaume";
+L['Open Calendar'] = "Ouvrir le calendrier";
+L['Open Clock'] = "Ouvrir l'horloge";
+L['Hide Event Text'] = "Cacher le texte d'événement";
+
+L['Travel'] = "Voyage";
+L['Port Options'] = "Options de téléportation";
+L['Ready'] = "Prêt";
+L['Travel Cooldowns'] = "Temps de recharge des voyages";
+L['Change Port Option'] = "Option de changement de la téléportation";
+
+L['Always Show Silver and Copper'] = "Toujours montrer l'argent et le cuivre";
+L['Shorten Gold'] = "Raccourcir le montant d'or";
+L['Toggle Bags'] = "Ouvrir/Fermer les sacs";
+L['Session Total'] = "Total sur la session";
+
+L['Show XP Bar Below Max Level'] = "Montrer la barre d'XP quand le niveau max n'est pas atteint";
+L['Use Class Colors for XP Bar'] = "Utiliser la couleur de classe pour la barre d'XP";
+L['Show Tooltips'] = "Montrer les bulles";
+L['Text on Right'] = "Texte à droite";
+L['Currency Select'] = "Sélection de la monnaie";
+L['First Currency'] = "Première monnaie";
+L['Second Currency'] = "Seconde monnaie";
+L['Third Currency'] = "Troisième monnaie";
+L['Rested'] = "Reposé";
+
+L['Show World Ping'] = "Montrer la latence monde";
+L['Number of Addons To Show'] = "Nombre d'addon à lister";
+L['Addons to Show in Tooltip'] = "Addon à lister dans la bulle";
+L['Show All Addons in Tooltip with Shift'] = "Lister tous les addons avec Maj";
+L['Memory Usage'] = "Utilisation mémoire";
+L['Garbage Collect'] = "Nettoyer la mémoire";
+L['Cleaned'] = "Nettoyé";
+
+L['Use Class Colors'] = "Utiliser les couleurs de classe";
+L['Cooldowns'] = "Temps de recharge";
+
+L['Set Specialization'] = "Choix de la spécialisation";
+L['Set Loot Specialization'] = "Spécialisation du butin";
+L['Current Specialization'] = "Spécialisation actuelle";
+L['Current Loot Specialization'] = "Spécialisation du butin actuelle";
+L['Talent Minimum Width'] = "Longueur minimum";
+L['Remaining'] = "Restant";
+L['Available Ranks'] = "Rangs disponibles";
+L['Artifact Knowledge'] = "Connaissance de l'arme prodigieuse";
\ No newline at end of file
diff --git a/locales/locales.xml b/locales/locales.xml
index eadcfc3..1bb3fff 100644
--- a/locales/locales.xml
+++ b/locales/locales.xml
@@ -1,4 +1,6 @@
<Ui xmlns="http://www.blizzard.com/wow/ui/">
<Script file="enUS.lua"/>
<Script file="deDE.lua"/>
+ <Script file="frFR.lua"/>
+ <Script file="ruRU.lua"/>
</Ui>
diff --git a/locales/ruRU.lua b/locales/ruRU.lua
new file mode 100644
index 0000000..43cb2c4
--- /dev/null
+++ b/locales/ruRU.lua
@@ -0,0 +1,104 @@
+local AddOnName, Engine = ...;
+local AceLocale = LibStub:GetLibrary("AceLocale-3.0");
+local L = AceLocale:NewLocale(AddOnName, "ruRU", false, false);
+if not L then return end
+
+L['Modules'] = "Модули";
+L['Left-Click'] = "Левая кнопка мыши";
+L['Right-Click'] = "Правая кнопка мыши";
+
+-- General
+L['Bar Position'] = "Положение полосы";
+L['Top'] = "Вверху";
+L['Bottom'] = "Внизу";
+L['Bar Color'] = "Цвет полосы";
+L['Use Class Colors for Bar'] = "Использовать цвет класса для полосы";
+L['Bar Padding'] = "Заполнение";
+L['Module Spacing'] = "Расстояние между модулями";
+L['Hide order hall bar'] = true;
+
+-- Positioning Options
+L['Positioning Options'] = "Настройки позиционированя";
+L['Horizontal Position'] = "Позиция по горизонтали";
+L['Bar Width'] = "Ширина полосы";
+L['Left'] = "Слева";
+L['Center'] = "По центру";
+L['Right'] = "Справа";
+
+-- Media
+L['Font'] = "Шрифт";
+L['Small Font Size'] = "Размер маленького шрифта";
+L['Text Style'] = "Стиль текста";
+
+-- Text Colors
+L['Text Colors'] = "Цвета текста";
+L['Normal'] = "Обычный";
+L['Inactive'] = "Неактивно";
+L["Use Class Color for Text"] = true;
+L["Only the alpha can be set with the color picker"] = true;
+L['Use Class Colors for Hover'] = "Использовать цвет класса при наведении";
+L['Hover'] = "По наведению";
+
+-------------------- MODULES ---------------------------
+
+L['Micromenu'] = "Микроменю";
+L['Show Social Tooltips'] = "Показывать подсказки гильдии и друзей";
+L['Main Menu Icon Right Spacing'] = "Расстояние от кнопки меню до других кнопок";
+L['Icon Spacing'] = "Расстояние между кнопками";
+L['Open Guild Page'] = true;
+L['No Tag'] = true;
+L['Hide Social Text'] = "Скрыть количество онлайна гильдии и друзей";
+
+L['Always Show Item Level'] = "Всегда показывать уровень предметов";
+L['Minimum Durability to Become Active'] = "Прочность, до которой загораются цифры";
+L['Maximum Durability to Show Item Level'] = "Прочность, после которой показывается уровень предметов";
+
+L['Time Format'] = "Формат времени";
+L['Use Server Time'] = "Использовать серверное время";
+L['New Event!'] = "Новое событие!";
+L['Local Time'] = "Местное время";
+L['Realm Time'] = "Серверное время";
+L['Open Calendar'] = "Открыть календарь";
+L['Open Clock'] = "Открыть часы";
+L['Hide Event Text'] = "Скрыть текст событий";
+
+L['Travel'] = "Перемещение";
+L['Port Options'] = "Назначение телепорта";
+L['Ready'] = "Готово";
+L['Travel Cooldowns'] = "Способности для перемещения";
+L['Change Port Option'] = "Изменить назначение телепорта";
+
+L['Always Show Silver and Copper'] = "Всегда показывать серебро и медь";
+L['Shorten Gold'] = "Сокращать число золота";
+L['Toggle Bags'] = "Переключить видимость сумок";
+L['Session Total'] = "Всего за сессию";
+
+L['Show XP Bar Below Max Level'] = "Показывать полоску опыта персонажам, не достигшим максимального уровня";
+L['Use Class Colors for XP Bar'] = "Использовать цвет класса для полоски опыта";
+L['Show Tooltips'] = "Показывать подсказки";
+L['Text on Right'] = "Текст справа";
+L['Currency Select'] = "Выбор валют";
+L['First Currency'] = "Валюта №1";
+L['Second Currency'] = "Валюта №2";
+L['Third Currency'] = "Валюта №3";
+L['Rested'] = "Отдых";
+
+L['Show World Ping'] = "Показывать задержку сервера";
+L['Number of Addons To Show'] = "Сколько аддонов показывать";
+L['Addons to Show in Tooltip'] = "Сколько аддонов показывать";
+L['Show All Addons in Tooltip with Shift'] = "Показывать все аддоны по нажатию кнопки Shift";
+L['Memory Usage'] = "Использование памяти";
+L['Garbage Collect'] = "Очистить память";
+L['Cleaned'] = "Очищено";
+
+L['Use Class Colors'] = "Использовать цвет класса";
+L['Cooldowns'] = "Кулдауны";
+
+L['Set Specialization'] = "Выбрать специализацию";
+L['Set Loot Specialization'] = "Выбрать специализацию для добычи";
+L['Current Specialization'] = "Текущая специализация";
+L['Current Loot Specialization'] = "Текущая специализация для добычи";
+L['Talent Minimum Width'] = "Минимальная ширина модуля талантов";
+L['Remaining'] = "Осталось";
+L['Available Ranks'] = "Доступно уровней";
+L['Artifact Knowledge'] = "Знание артефакта";
\ No newline at end of file
diff --git a/modules/micromenu.lua b/modules/micromenu.lua
index a0e83b5..688cd7a 100644
--- a/modules/micromenu.lua
+++ b/modules/micromenu.lua
@@ -570,7 +570,7 @@ function MenuModule:GuildHover(hoverFunc)
tooltip:AddHeader("[|cff6699FF"..GUILD.."|r]")
tooltip:AddLine(" "," ")
local gName, _, _, _ = GetGuildInfo('player')
- tooltip:AddLine('|cffff00ff'..GUILD..':|r', '|c00ff00ff'..gName..'|r')
+ tooltip:AddLine('|cffffff00'..GUILD..':|r', '|cff00ff00'..gName..'|r')
tooltip:AddLine('|cff00ff00'..GetGuildRosterMOTD()..':|r', ' ')
local totalGuild, _ = GetNumGuildMembers()
@@ -607,8 +607,8 @@ function MenuModule:GuildHover(hoverFunc)
end
end
tooltip:AddLine(' ',' ')
- tooltip:AddLine('|cffff00ff<'..L['Left-Click']..'>|r', '|cffffffff Whisper |r')
- tooltip:AddLine('|cffff00ff<'..self.modifier..' + '..L['Left-Click']..'>|r', '|cffffffff Invite |r')
+ tooltip:AddLine('|cffffff00<'..L['Left-Click']..'>|r', '|cffffffff Whisper |r')
+ tooltip:AddLine('|cffffff00<'..self.modifier..' + '..L['Left-Click']..'>|r', '|cffffffff Invite |r')
tooltip:Show()
hoverFunc()
end