From 509d60ef6e0dfbb9269b8999893a2fac314dd1a1 Mon Sep 17 00:00:00 2001 From: shagu Date: Fri, 8 Sep 2017 17:56:06 +0200 Subject: [PATCH] unitframes: add option to show group in raidframes --- api/config.lua | 1 + api/unitframes.lua | 20 ++++++++++++++++++++ env/translations_deDE.lua | 5 +++-- env/translations_enUS.lua | 5 +++-- env/translations_frFR.lua | 7 ++++--- env/translations_koKR.lua | 5 +++-- env/translations_ruRU.lua | 5 +++-- env/translations_zhCN.lua | 5 +++-- env/translations_zhTW.lua | 5 +++-- modules/gui.lua | 5 +++-- 10 files changed, 46 insertions(+), 17 deletions(-) diff --git a/api/config.lua b/api/config.lua index e6c78795..9a04a549 100644 --- a/api/config.lua +++ b/api/config.lua @@ -88,6 +88,7 @@ function pfUI:LoadConfig() pfUI:UpdateConfig("unitframes", nil, "abbrevnum", "1") pfUI:UpdateConfig("unitframes", nil, "selfingroup", "0") + pfUI:UpdateConfig("unitframes", nil, "raidforgroup", "0") pfUI:UpdateConfig("unitframes", nil, "show_hots", "0") pfUI:UpdateConfig("unitframes", nil, "all_hots", "0") pfUI:UpdateConfig("unitframes", nil, "show_procs", "0") diff --git a/api/unitframes.lua b/api/unitframes.lua index 91642897..37d656b2 100644 --- a/api/unitframes.lua +++ b/api/unitframes.lua @@ -543,6 +543,26 @@ function pfUI.uf:RefreshUnit(unit, component) if pfScanActive == true then return end end + -- show groupframes as raid + if pfUI_config["unitframes"]["raidforgroup"] == "1" then + if GetNumPartyMembers() > 0 and strsub(unit:GetName(),0,6) == "pfRaid" then + local id = tonumber(strsub(unit:GetName(),7,8)) + + if not UnitInRaid("player") then + if id == 1 then + unit.id = "" + unit.label = "player" + elseif id < 5 then + unit.id = id - 1 + unit.label = "party" + end + elseif unit.label == "party" or unit.label == "player" then + unit.id = id + unit.label = "raid" + end + end + end + local default_border = pfUI_config.appearance.border.default if pfUI_config.appearance.border.unitframes ~= "-1" then default_border = pfUI_config.appearance.border.unitframes diff --git a/env/translations_deDE.lua b/env/translations_deDE.lua index 13e13d24..7201fb16 100644 --- a/env/translations_deDE.lua +++ b/env/translations_deDE.lua @@ -199,7 +199,7 @@ pfUI_translation["deDE"] = { ["Hide Channel Names"] = nil, ["Hide Combat Log"] = nil, ["Hide Critters"] = nil, - ["Hide Group Frames When In A Raid"] = nil, + ["Hide Group Frames While In Raid"] = nil, ["Hoverbind"] = nil, ["Icon Size"] = nil, ["Incoming Whispers Color"] = nil, @@ -307,7 +307,7 @@ pfUI_translation["deDE"] = { ["Show Procs as Buff Indicators"] = nil, ["Show Procs of all Classes"] = nil, ["Show PvP Icon"] = nil, - ["Show Self as Group Member"] = nil, + ["Show Self in Group Frames"] = nil, ["Slow"] = nil, ["Some settings need to reload the UI to take effect.\nDo you want to reloadUI now?"] = nil, ["Soulshard Counter"] = nil, @@ -339,6 +339,7 @@ pfUI_translation["deDE"] = { ["Unit String"] = nil, ["Unlock"] = nil, ["Use Defaults"] = nil, + ["Use Raid Frames To Display Group Members"] = nil, ["Use Unit Fonts"] = nil, ["Vertical Actionbar (TwoRight)"] = nil, ["Vertical Position"] = nil, diff --git a/env/translations_enUS.lua b/env/translations_enUS.lua index c0f4349d..b78ee8d8 100644 --- a/env/translations_enUS.lua +++ b/env/translations_enUS.lua @@ -199,7 +199,7 @@ pfUI_translation["enUS"] = { ["Hide Channel Names"] = nil, ["Hide Combat Log"] = nil, ["Hide Critters"] = nil, - ["Hide Group Frames When In A Raid"] = nil, + ["Hide Group Frames While In Raid"] = nil, ["Hoverbind"] = nil, ["Icon Size"] = nil, ["Incoming Whispers Color"] = nil, @@ -307,7 +307,7 @@ pfUI_translation["enUS"] = { ["Show Procs as Buff Indicators"] = nil, ["Show Procs of all Classes"] = nil, ["Show PvP Icon"] = nil, - ["Show Self as Group Member"] = nil, + ["Show Self in Group Frames"] = nil, ["Slow"] = nil, ["Some settings need to reload the UI to take effect.\nDo you want to reloadUI now?"] = nil, ["Soulshard Counter"] = nil, @@ -339,6 +339,7 @@ pfUI_translation["enUS"] = { ["Unit String"] = nil, ["Unlock"] = nil, ["Use Defaults"] = nil, + ["Use Raid Frames To Display Group Members"] = nil, ["Use Unit Fonts"] = nil, ["Vertical Actionbar (TwoRight)"] = nil, ["Vertical Position"] = nil, diff --git a/env/translations_frFR.lua b/env/translations_frFR.lua index 598b5d06..d3de5032 100644 --- a/env/translations_frFR.lua +++ b/env/translations_frFR.lua @@ -199,7 +199,7 @@ pfUI_translation["frFR"] = { ["Hide Channel Names"] = "Cacher le nom des canaux", ["Hide Combat Log"] = "Cacher le journal de combat", ["Hide Critters"] = "Cacher les Bestioles", - ["Hide Group Frames When In A Raid"] = "Cacher le cadre de Groupe en raid", + ["Hide Group Frames While In Raid"] = nil, ["Hoverbind"] = "Mode Raccourcis", ["Icon Size"] = "Taille des icônes", ["Incoming Whispers Color"] = "Couleur des chuchotements entrants", @@ -284,8 +284,8 @@ pfUI_translation["frFR"] = { ["Right Panel: Right"] = "Panneau de droite : texte de droite", ["Right Text"] = "Texte de droite", ["Save current settings to profile"] = "Enregistrer les paramètres actuels au profil", - ["Save"] = "Sauvegarder", ["Save profile"] = "Enregistrer un profil", + ["Save"] = "Sauvegarder", ["Screen Resolution"] = "Résolution d'écran", ["Scrolling Combat Text Font"] = "Police du texte de combat flottant", ["Second Actionbar (BottomLeft)"] = "Barre d'action secondaire (bas gauche)", @@ -307,7 +307,7 @@ pfUI_translation["frFR"] = { ["Show Procs as Buff Indicators"] = "Afficher les procs en tant qu'indicateur d'amélioration", ["Show Procs of all Classes"] = "Afficher les procs de chaque classe", ["Show PvP Icon"] = "Afficher l'icône JcJ", - ["Show Self as Group Member"] = "Se montrer comme Membre d'un Groupe", + ["Show Self in Group Frames"] = nil, ["Slow"] = "Doucement", ["Some settings need to reload the UI to take effect.\nDo you want to reloadUI now?"] = "Quelques options nécessitent le relancement de l'interface pour prendre effet\nSouhaitez-vous relancer votre interface maintenant?", ["Soulshard Counter"] = "Compteur des éclats d'âme", @@ -339,6 +339,7 @@ pfUI_translation["frFR"] = { ["Unit String"] = "Texte des cadres d'unité", ["Unlock"] = "Débloquer l'interface", ["Use Defaults"] = "Utiliser le défaut", + ["Use Raid Frames To Display Group Members"] = nil, ["Use Unit Fonts"] = "Utiliser les polices d'unité", ["Vertical Actionbar (TwoRight)"] = "Barre d'action verticale droite 2", ["Vertical Position"] = "Position verticale", diff --git a/env/translations_koKR.lua b/env/translations_koKR.lua index 808c7bba..1195279c 100644 --- a/env/translations_koKR.lua +++ b/env/translations_koKR.lua @@ -199,7 +199,7 @@ pfUI_translation["koKR"] = { ["Hide Channel Names"] = "채널 이름 숨기기", ["Hide Combat Log"] = nil, ["Hide Critters"] = "동물 가리기", - ["Hide Group Frames When In A Raid"] = "레이드 전환시 파티프레임 숨기기", + ["Hide Group Frames While In Raid"] = nil, ["Hoverbind"] = "단축키 설정", ["Icon Size"] = "아이콘 크기", ["Incoming Whispers Color"] = "귓속말 텍스트 색상", @@ -307,7 +307,7 @@ pfUI_translation["koKR"] = { ["Show Procs as Buff Indicators"] = "무기활성화버프 버프표시기에 보기", ["Show Procs of all Classes"] = "모든 클래스 무기활성화 버프 보기", ["Show PvP Icon"] = "PvP아이콘 표시", - ["Show Self as Group Member"] = nil, + ["Show Self in Group Frames"] = nil, ["Slow"] = "느린", ["Some settings need to reload the UI to take effect.\nDo you want to reloadUI now?"] = "일부 설정을 적용하려면 UI를 리로드 해야합니다.\n지금 리로드 하시겠습니까?", ["Soulshard Counter"] = "영혼조각 갯수", @@ -339,6 +339,7 @@ pfUI_translation["koKR"] = { ["Unit String"] = "단위 문자열", ["Unlock"] = "잠그 해체", ["Use Defaults"] = nil, + ["Use Raid Frames To Display Group Members"] = nil, ["Use Unit Fonts"] = "사용자 유닛 폰트", ["Vertical Actionbar (TwoRight)"] = "세로 액션바(오른쪽 두개)", ["Vertical Position"] = "세로 위치", diff --git a/env/translations_ruRU.lua b/env/translations_ruRU.lua index 417e86d1..85d1df44 100644 --- a/env/translations_ruRU.lua +++ b/env/translations_ruRU.lua @@ -199,7 +199,7 @@ pfUI_translation["ruRU"] = { ["Hide Channel Names"] = "Скрыть названия каналов", ["Hide Combat Log"] = "Скрыть журнал боя", ["Hide Critters"] = "Скрыть существ", - ["Hide Group Frames When In A Raid"] = "Скрыть окно группы в рейде", + ["Hide Group Frames While In Raid"] = nil, ["Hoverbind"] = "Назначение клавиш", ["Icon Size"] = "Размер иконки", ["Incoming Whispers Color"] = "Цвет входящего шепота", @@ -307,7 +307,7 @@ pfUI_translation["ruRU"] = { ["Show Procs as Buff Indicators"] = "Показать проки (Procs) как индикаторы баффов", ["Show Procs of all Classes"] = "Показать проки (Procs) всех классов", ["Show PvP Icon"] = "Показать PvP иконку", - ["Show Self as Group Member"] = nil, + ["Show Self in Group Frames"] = nil, ["Slow"] = "Медленно", ["Some settings need to reload the UI to take effect.\nDo you want to reloadUI now?"] = "Некоторым настройкам необходимо перезагрузить пользовательский интерфейс, чтобы вступить в силу.\nВы хотите перезагрузить UI сейчас?", ["Soulshard Counter"] = "Счетчик камней душ", @@ -339,6 +339,7 @@ pfUI_translation["ruRU"] = { ["Unit String"] = "Строка юнита", ["Unlock"] = "Разблокировать", ["Use Defaults"] = "По умолчанию", + ["Use Raid Frames To Display Group Members"] = nil, ["Use Unit Fonts"] = "Использовать шрифт окна юнита", ["Vertical Actionbar (TwoRight)"] = "Вторая панель действий справа (BarTwoRight)", ["Vertical Position"] = "Вертикальное расположение", diff --git a/env/translations_zhCN.lua b/env/translations_zhCN.lua index 910aead1..f5787d3b 100644 --- a/env/translations_zhCN.lua +++ b/env/translations_zhCN.lua @@ -199,7 +199,7 @@ pfUI_translation["zhCN"] = { ["Hide Channel Names"] = "隐藏频道名称", ["Hide Combat Log"] = "隐藏战斗日志", ["Hide Critters"] = "隐藏小动物", - ["Hide Group Frames When In A Raid"] = "在团队框架下隐藏小队框架", + ["Hide Group Frames While In Raid"] = nil, ["Hoverbind"] = "悬停设置", ["Icon Size"] = "图标大小", ["Incoming Whispers Color"] = "私聊颜色设置", @@ -307,7 +307,7 @@ pfUI_translation["zhCN"] = { ["Show Procs as Buff Indicators"] = "在框架的Buff指示器显示触发效果", ["Show Procs of all Classes"] = "显示所有职业的触发效果", ["Show PvP Icon"] = "显示PVP图标", - ["Show Self as Group Member"] = nil, + ["Show Self in Group Frames"] = nil, ["Slow"] = "慢速", ["Some settings need to reload the UI to take effect.\nDo you want to reloadUI now?"] = "有些设置需要重新加载UI生效。\n您要重新载入UI吗？", ["Soulshard Counter"] = "灵魂碎片", @@ -339,6 +339,7 @@ pfUI_translation["zhCN"] = { ["Unit String"] = "等级和名字", ["Unlock"] = "解锁排版", ["Use Defaults"] = "使用默认值", + ["Use Raid Frames To Display Group Members"] = nil, ["Use Unit Fonts"] = "切换插件字体", ["Vertical Actionbar (TwoRight)"] = "右侧动作条2", ["Vertical Position"] = "垂直偏移", diff --git a/env/translations_zhTW.lua b/env/translations_zhTW.lua index a5248d14..a9284291 100644 --- a/env/translations_zhTW.lua +++ b/env/translations_zhTW.lua @@ -199,7 +199,7 @@ pfUI_translation["zhTW"] = { ["Hide Channel Names"] = "隱藏頻道名稱", ["Hide Combat Log"] = "隱藏戰鬥日誌", ["Hide Critters"] = "隱藏小動物", - ["Hide Group Frames When In A Raid"] = "在團隊框架下隱藏小隊框架", + ["Hide Group Frames While In Raid"] = nil, ["Hoverbind"] = "懸停設置", ["Icon Size"] = "圖示大小", ["Incoming Whispers Color"] = "私聊顏色設置", @@ -307,7 +307,7 @@ pfUI_translation["zhTW"] = { ["Show Procs as Buff Indicators"] = "在框架的Buff指示器顯示觸發效果", ["Show Procs of all Classes"] = "顯示所有職業的觸發效果", ["Show PvP Icon"] = "顯示PVP圖示", - ["Show Self as Group Member"] = nil, + ["Show Self in Group Frames"] = nil, ["Slow"] = "慢速", ["Some settings need to reload the UI to take effect.\nDo you want to reloadUI now?"] = "有些設置需要重新載入UI生效。\n您要重新載入UI嗎？", ["Soulshard Counter"] = "靈魂碎片", @@ -339,6 +339,7 @@ pfUI_translation["zhTW"] = { ["Unit String"] = "等級和名字", ["Unlock"] = "解鎖排版", ["Use Defaults"] = "使用預設值", + ["Use Raid Frames To Display Group Members"] = nil, ["Use Unit Fonts"] = "切換外掛程式字體", ["Vertical Actionbar (TwoRight)"] = "右側動作條2", ["Vertical Position"] = "垂直偏移", diff --git a/modules/gui.lua b/modules/gui.lua index de6a20f1..543c6ce1 100644 --- a/modules/gui.lua +++ b/modules/gui.lua @@ -1119,7 +1119,9 @@ pfUI:RegisterModule("gui", function () pfUI.gui.tabs.gf.tabs.general = pfUI.gui.tabs.gf.tabs:CreateChildFrame(T["General"], 70) pfUI.gui.tabs.gf.tabs.general:SetScript("OnShow", function() if not this.setup then - CreateConfig(this, T["Show Self as Group Member"], C.unitframes, "selfingroup", "checkbox") + CreateConfig(this, T["Show Self in Group Frames"], C.unitframes, "selfingroup", "checkbox") + CreateConfig(this, T["Hide Group Frames While In Raid"], C.unitframes.group, "hide_in_raid", "checkbox") + CreateConfig(this, T["Use Raid Frames To Display Group Members"], C.unitframes, "raidforgroup", "checkbox") CreateConfig(this, T["Show Hots as Buff Indicators"], C.unitframes, "show_hots", "checkbox") CreateConfig(this, T["Show Hots of all Classes"], C.unitframes, "all_hots", "checkbox") CreateConfig(this, T["Show Procs as Buff Indicators"], C.unitframes, "show_procs", "checkbox") @@ -1196,7 +1198,6 @@ pfUI:RegisterModule("gui", function () CreateConfig(this, T["Enable Debuff Indicators"], C.unitframes.group, "debuff_indicator", "checkbox") CreateConfig(this, T["Enable Clickcast"], C.unitframes.group, "clickcast", "checkbox") CreateConfig(this, T["Enable Range Fading"], C.unitframes.group, "faderange", "checkbox") - CreateConfig(this, T["Hide Group Frames When In A Raid"], C.unitframes.group, "hide_in_raid", "checkbox") CreateConfig(this, T["Enable Health Color in Text"], C.unitframes.group, "healthcolor", "checkbox") CreateConfig(this, T["Enable Power Color in Text"], C.unitframes.group, "powercolor", "checkbox") CreateConfig(this, T["Enable Level Color in Text"], C.unitframes.group, "levelcolor", "checkbox")