From 77f02d96743bc2ede861c697ca8c4e62578e8448 Mon Sep 17 00:00:00 2001 From: shagu Date: Mon, 19 Dec 2016 18:46:46 +0100 Subject: [PATCH] fonts: support for non latin gameclients --- env/fonts.lua | 93 ++++++++++++++++++++++------------------ modules/actionbar.lua | 4 +- modules/addons.lua | 4 +- modules/bags.lua | 12 +++--- modules/castbar.lua | 8 ++-- modules/chat.lua | 10 ++--- modules/config.lua | 1 + modules/cooldown.lua | 2 +- modules/group.lua | 2 +- modules/gui.lua | 9 ++-- modules/loot.lua | 4 +- modules/minimap.lua | 2 +- modules/panel.lua | 16 +++---- modules/pet.lua | 6 +-- modules/player.lua | 12 +++--- modules/raid.lua | 2 +- modules/skin.lua | 4 +- modules/target.lua | 8 ++-- modules/targettarget.lua | 2 +- modules/thirdparty.lua | 4 +- modules/tooltip.lua | 2 +- pfUI.lua | 2 +- 22 files changed, 111 insertions(+), 98 deletions(-) diff --git a/env/fonts.lua b/env/fonts.lua index 9da24827..ad8e989e 100644 --- a/env/fonts.lua +++ b/env/fonts.lua @@ -1,51 +1,62 @@ -- this must be set during the initial execution -STANDARD_TEXT_FONT = "Interface\\AddOns\\pfUI\\fonts\\arial.ttf" +if GetLocale() == "zhCN" then + STANDARD_TEXT_FONT = "Fonts\\FZXHLJW.TTF" +else + STANDARD_TEXT_FONT = "Interface\\AddOns\\pfUI\\fonts\\arial.ttf" +end function pfUI.environment:UpdateFonts() -- load config if available - local default = "Interface\\AddOns\\pfUI\\fonts\\arial.ttf" - local square = "Interface\\AddOns\\pfUI\\fonts\\homespun.ttf" - local combat = "Interface\\AddOns\\pfUI\\fonts\\diediedie.ttf" - - if pfUI_config and pfUI_config.global.font_default then - default = "Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf" - combat = "Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_combat .. ".ttf" - square = "Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf" + if pfUI_config and pfUI_config.global.force_region == "1" then + -- force locale based fonts + if GetLocale() == "zhCN" then + pfUI.font_default = "Fonts\\FZXHLJW.TTF" + pfUI.font_combat = "Fonts\\FZXHLJW.TTF" + pfUI.font_square = "Fonts\\FZXHLJW.TTF" + end + elseif pfUI_config and pfUI_config.global.font_default then + pfUI.font_default = "Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf" + pfUI.font_combat = "Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_combat .. ".ttf" + pfUI.font_square = "Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf" + else + pfUI.font_default = "Interface\\AddOns\\pfUI\\fonts\\arial.ttf" + pfUI.font_square = "Interface\\AddOns\\pfUI\\fonts\\homespun.ttf" + pfUI.font_combat = "Interface\\AddOns\\pfUI\\fonts\\diediedie.ttf" end - STANDARD_TEXT_FONT = default; - UNIT_NAME_FONT = default; - DAMAGE_TEXT_FONT = combat; - NAMEPLATE_FONT = default; + STANDARD_TEXT_FONT = pfUI.font_default; + UNIT_NAME_FONT = pfUI.font_default; + DAMAGE_TEXT_FONT = pfUI.font_combat; + NAMEPLATE_FONT = pfUI.font_default; - SystemFont:SetFont(default, 15) - GameFontNormal:SetFont(default, 12) - GameFontBlack:SetFont(default, 12) - GameFontNormalSmall:SetFont(default, 12) - GameFontNormalLarge:SetFont(default, 16) - GameFontNormalHuge:SetFont(default, 20) - NumberFontNormal:SetFont(default, 14, "OUTLINE") - NumberFontNormalSmall:SetFont(default, 14, "OUTLINE") - NumberFontNormalLarge:SetFont(default, 16, "OUTLINE") - NumberFontNormalHuge:SetFont(default, 30, "OUTLINE") - QuestTitleFont:SetFont(default, 18) - QuestFont:SetFont(default, 13) - QuestFontHighlight:SetFont(default, 14) - ItemTextFontNormal:SetFont(default, 15) - MailTextFontNormal:SetFont(default, 15) - SubSpellFont:SetFont(default, 12) - DialogButtonNormalText:SetFont(default, 16) - ZoneTextFont:SetFont(default, 48, "OUTLINE") - SubZoneTextFont:SetFont(default, 24, "OUTLINE") - TextStatusBarTextSmall:SetFont(default, 12, "NORMAL") - GameTooltipText:SetFont(default, 12) - GameTooltipTextSmall:SetFont(default, 12) - GameTooltipHeaderText:SetFont(default, 14) - WorldMapTextFont:SetFont(default, 102, "THICK") - InvoiceTextFontNormal:SetFont(default, 12) - InvoiceTextFontSmall:SetFont(default, 12) - CombatTextFont:SetFont(default, 25) - ChatFontNormal:SetFont(default, 12, "NORMAL") + SystemFont:SetFont(pfUI.font_default, 15) + GameFontNormal:SetFont(pfUI.font_default, 12) + GameFontBlack:SetFont(pfUI.font_default, 12) + GameFontNormalSmall:SetFont(pfUI.font_default, 12) + GameFontNormalLarge:SetFont(pfUI.font_default, 16) + GameFontNormalHuge:SetFont(pfUI.font_default, 20) + NumberFontNormal:SetFont(pfUI.font_default, 14, "OUTLINE") + NumberFontNormalSmall:SetFont(pfUI.font_default, 14, "OUTLINE") + NumberFontNormalLarge:SetFont(pfUI.font_default, 16, "OUTLINE") + NumberFontNormalHuge:SetFont(pfUI.font_default, 30, "OUTLINE") + QuestTitleFont:SetFont(pfUI.font_default, 18) + QuestFont:SetFont(pfUI.font_default, 13) + QuestFontHighlight:SetFont(pfUI.font_default, 14) + ItemTextFontNormal:SetFont(pfUI.font_default, 15) + MailTextFontNormal:SetFont(pfUI.font_default, 15) + SubSpellFont:SetFont(pfUI.font_default, 12) + DialogButtonNormalText:SetFont(pfUI.font_default, 16) + ZoneTextFont:SetFont(pfUI.font_default, 48, "OUTLINE") + SubZoneTextFont:SetFont(pfUI.font_default, 24, "OUTLINE") + TextStatusBarTextSmall:SetFont(pfUI.font_default, 12, "NORMAL") + GameTooltipText:SetFont(pfUI.font_default, 12) + GameTooltipTextSmall:SetFont(pfUI.font_default, 12) + GameTooltipHeaderText:SetFont(pfUI.font_default, 14) + WorldMapTextFont:SetFont(pfUI.font_default, 102, "THICK") + InvoiceTextFontNormal:SetFont(pfUI.font_default, 12) + InvoiceTextFontSmall:SetFont(pfUI.font_default, 12) + CombatTextFont:SetFont(pfUI.font_default, 25) + ChatFontNormal:SetFont(pfUI.font_default, 12, "NORMAL") end -- run environment update diff --git a/modules/actionbar.lua b/modules/actionbar.lua index e109e023..7b21e8dd 100644 --- a/modules/actionbar.lua +++ b/modules/actionbar.lua @@ -425,11 +425,11 @@ pfUI:RegisterModule("actionbar", function () getglobal(button..i..'NormalTexture'):SetTexCoord(.08, .92, .08, .92) getglobal(button..i..'Border'):SetTexture(0,0,0,0) getglobal(button..i..'HotKey'):SetAllPoints(getglobal(button..i)) - getglobal(button..i..'HotKey'):SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size -2, "OUTLINE") + getglobal(button..i..'HotKey'):SetFont(pfUI.font_square, pfUI_config.global.font_size -2, "OUTLINE") getglobal(button..i..'HotKey'):SetJustifyH("RIGHT") getglobal(button..i..'HotKey'):SetJustifyV("TOP") getglobal(button..i..'Name'):SetAllPoints(getglobal(button..i)) - getglobal(button..i..'Name'):SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size -2, "OUTLINE") + getglobal(button..i..'Name'):SetFont(pfUI.font_square, pfUI_config.global.font_size -2, "OUTLINE") getglobal(button..i..'Name'):SetJustifyH("CENTER") getglobal(button..i..'Name'):SetJustifyV("BOTTOM") end diff --git a/modules/addons.lua b/modules/addons.lua index 4ad42462..f68caf31 100644 --- a/modules/addons.lua +++ b/modules/addons.lua @@ -26,7 +26,7 @@ pfUI:RegisterModule("addons", function () -- title pfUI.addons.caption = pfUI.addons:CreateFontString("Status", "LOW", "GameFontNormal") - pfUI.addons.caption:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size + 4, "OUTLINE") + pfUI.addons.caption:SetFont(pfUI.font_default, pfUI_config.global.font_size + 4, "OUTLINE") pfUI.addons.caption:SetTextColor(.2, 1, .8, 1) pfUI.addons.caption:SetPoint("TOP", 0, -10) pfUI.addons.caption:SetJustifyH("LEFT") @@ -76,7 +76,7 @@ pfUI:RegisterModule("addons", function () -- caption frame.caption = frame:CreateFontString("Status", "LOW", "GameFontNormal") - frame.caption:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size + 2, "OUTLINE") + frame.caption:SetFont(pfUI.font_default, pfUI_config.global.font_size + 2, "OUTLINE") frame.caption:SetAllPoints(frame) frame.caption:SetFontObject(GameFontWhite) frame.caption:SetJustifyH("LEFT") diff --git a/modules/bags.lua b/modules/bags.lua index b782f40f..3855ef52 100644 --- a/modules/bags.lua +++ b/modules/bags.lua @@ -278,7 +278,7 @@ pfUI:RegisterModule("bags", function () end local count = getglobal(pfUI.bags[bag].slots[slot].frame:GetName() .. "Count") - count:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + count:SetFont(pfUI.font_square, pfUI_config.global.font_size, "OUTLINE") count:SetAllPoints() count:SetJustifyH("RIGHT") count:SetJustifyV("BOTTOM") @@ -421,7 +421,7 @@ pfUI:RegisterModule("bags", function () frame.bagslots.buy:SetWidth(pfUI.bag.button_size/5*4) frame.bagslots.buy:SetText("+") frame.bagslots.buy:SetTextColor(.5,.5,1,1) - frame.bagslots.buy:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + frame.bagslots.buy:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") frame.bagslots.buy:SetScript("OnEnter", function () frame.bagslots.buy:SetTextColor(1,1,1,1) end) @@ -476,7 +476,7 @@ pfUI:RegisterModule("bags", function () frame.bags:SetHeight(12) frame.bags:SetWidth(12) frame.bags:SetTextColor(1,1,.25,1) - frame.bags:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + frame.bags:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") frame.bags.texture = frame.bags:CreateTexture("pfBagArrowUp") frame.bags.texture:SetTexture("Interface\\AddOns\\pfUI\\img\\up") frame.bags.texture:ClearAllPoints() @@ -512,7 +512,7 @@ pfUI:RegisterModule("bags", function () frame.keys:SetHeight(12) frame.keys:SetWidth(12) frame.keys:SetTextColor(1,1,.25,1) - frame.keys:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + frame.keys:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") frame.keys.texture = frame.keys:CreateTexture("pfBagArrowUp") frame.keys.texture:SetTexture("Interface\\AddOns\\pfUI\\img\\key") frame.keys.texture:ClearAllPoints() @@ -557,7 +557,7 @@ pfUI:RegisterModule("bags", function () frame.search.edit:SetPoint("TOPLEFT", frame.search, "TOPLEFT", default_border*2, 0) frame.search.edit:SetPoint("BOTTOMRIGHT", frame.search, "BOTTOMRIGHT", -default_border*2, 0) - frame.search.edit:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + frame.search.edit:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") frame.search.edit:SetAutoFocus(false) frame.search.edit:SetText("Search") frame.search.edit:SetTextColor(.5,.5,.5,1) @@ -639,7 +639,7 @@ pfUI:RegisterModule("bags", function () frame.bags:SetHeight(12) frame.bags:SetWidth(12) frame.bags:SetTextColor(1,1,.25,1) - frame.bags:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + frame.bags:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") frame.bags.texture = frame.bags:CreateTexture("pfBagArrowUp") frame.bags.texture:SetTexture("Interface\\AddOns\\pfUI\\img\\up") frame.bags.texture:ClearAllPoints() diff --git a/modules/castbar.lua b/modules/castbar.lua index aad94ae6..57ebb376 100644 --- a/modules/castbar.lua +++ b/modules/castbar.lua @@ -42,7 +42,7 @@ pfUI:RegisterModule("castbar", function () pfUI.castbar.player.bar.left:SetNonSpaceWrap(false) pfUI.castbar.player.bar.left:SetFontObject(GameFontWhite) pfUI.castbar.player.bar.left:SetTextColor(1,1,1,1) - pfUI.castbar.player.bar.left:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.castbar.player.bar.left:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") pfUI.castbar.player.bar.left:SetText("left") pfUI.castbar.player.bar.left:SetJustifyH("left") @@ -54,7 +54,7 @@ pfUI:RegisterModule("castbar", function () pfUI.castbar.player.bar.right:SetNonSpaceWrap(false) pfUI.castbar.player.bar.right:SetFontObject(GameFontWhite) pfUI.castbar.player.bar.right:SetTextColor(1,1,1,1) - pfUI.castbar.player.bar.right:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.castbar.player.bar.right:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") pfUI.castbar.player.bar.right:SetText("right") pfUI.castbar.player.bar.right:SetJustifyH("right") @@ -225,7 +225,7 @@ pfUI:RegisterModule("castbar", function () pfUI.castbar.target.bar.left:SetNonSpaceWrap(false) pfUI.castbar.target.bar.left:SetFontObject(GameFontWhite) pfUI.castbar.target.bar.left:SetTextColor(1,1,1,1) - pfUI.castbar.target.bar.left:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.castbar.target.bar.left:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") pfUI.castbar.target.bar.left:SetText("left") pfUI.castbar.target.bar.left:SetJustifyH("left") @@ -237,7 +237,7 @@ pfUI:RegisterModule("castbar", function () pfUI.castbar.target.bar.right:SetNonSpaceWrap(false) pfUI.castbar.target.bar.right:SetFontObject(GameFontWhite) pfUI.castbar.target.bar.right:SetTextColor(1,1,1,1) - pfUI.castbar.target.bar.right:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.castbar.target.bar.right:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") pfUI.castbar.target.bar.right:SetText("right") pfUI.castbar.target.bar.right:SetJustifyH("right") diff --git a/modules/chat.lua b/modules/chat.lua index ac170a9b..ed69ec50 100644 --- a/modules/chat.lua +++ b/modules/chat.lua @@ -100,7 +100,7 @@ pfUI:RegisterModule("chat", function () end) pfUI.chat.left.panelTop.proxyName.caption = pfUI.chat.left.panelTop.proxyName:CreateFontString("Status", "LOW", "GameFontNormal") - pfUI.chat.left.panelTop.proxyName.caption:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size + 2, "OUTLINE") + pfUI.chat.left.panelTop.proxyName.caption:SetFont(pfUI.font_default, pfUI_config.global.font_size + 2, "OUTLINE") pfUI.chat.left.panelTop.proxyName.caption:SetPoint("TOP", 0, -20) pfUI.chat.left.panelTop.proxyName.caption:SetFontObject(GameFontWhite) pfUI.chat.left.panelTop.proxyName.caption:SetJustifyH("CENTER") @@ -125,7 +125,7 @@ pfUI:RegisterModule("chat", function () pfUI.chat.left.panelTop.proxyName.okay:SetPoint("BOTTOMRIGHT", -10, 10) pfUI.utils:CreateBackdrop(pfUI.chat.left.panelTop.proxyName.okay, default_border) pfUI.chat.left.panelTop.proxyName.okay.text = pfUI.chat.left.panelTop.proxyName.okay:CreateFontString("Status", "LOW", "GameFontNormal") - pfUI.chat.left.panelTop.proxyName.okay.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.chat.left.panelTop.proxyName.okay.text:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") pfUI.chat.left.panelTop.proxyName.okay.text:ClearAllPoints() pfUI.chat.left.panelTop.proxyName.okay.text:SetAllPoints(pfUI.chat.left.panelTop.proxyName.okay) pfUI.chat.left.panelTop.proxyName.okay.text:SetPoint("CENTER", 0, 0) @@ -145,7 +145,7 @@ pfUI:RegisterModule("chat", function () pfUI.chat.left.panelTop.proxyName.abort:SetPoint("BOTTOMLEFT", 10, 10) pfUI.utils:CreateBackdrop(pfUI.chat.left.panelTop.proxyName.abort, default_border) pfUI.chat.left.panelTop.proxyName.abort.text = pfUI.chat.left.panelTop.proxyName.abort:CreateFontString("Status", "LOW", "GameFontNormal") - pfUI.chat.left.panelTop.proxyName.abort.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.chat.left.panelTop.proxyName.abort.text:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") pfUI.chat.left.panelTop.proxyName.abort.text:ClearAllPoints() pfUI.chat.left.panelTop.proxyName.abort.text:SetAllPoints(pfUI.chat.left.panelTop.proxyName.abort) pfUI.chat.left.panelTop.proxyName.abort.text:SetPoint("CENTER", 0, 0) @@ -239,7 +239,7 @@ pfUI:RegisterModule("chat", function () getglobal("ChatFrame" .. i .. "TabFlash"):SetAlpha(0) local _, class = UnitClass("player") getglobal("ChatFrame" .. i .. "TabText"):SetTextColor(RAID_CLASS_COLORS[class].r + .3 * .5, RAID_CLASS_COLORS[class].g + .3 * .5, RAID_CLASS_COLORS[class].b + .3 * .5, 1) - getglobal("ChatFrame" .. i .. "TabText"):SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + getglobal("ChatFrame" .. i .. "TabText"):SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") if getglobal("ChatFrame" .. i).isDocked or getglobal("ChatFrame" .. i):IsVisible() then getglobal("ChatFrame" .. i .. "Tab"):Show() @@ -496,7 +496,7 @@ pfUI:RegisterModule("chat", function () for i,v in ipairs({ChatFrameEditBox:GetRegions()}) do if i==6 or i==7 or i==8 then v:Hide() end if v.SetFont then - v:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size + 1, "OUTLINE") + v:SetFont(pfUI.font_default, pfUI_config.global.font_size + 1, "OUTLINE") end end ChatFrameEditBox:SetAltArrowKeyMode(false) diff --git a/modules/config.lua b/modules/config.lua index 01dd060d..f1fff3fb 100644 --- a/modules/config.lua +++ b/modules/config.lua @@ -8,6 +8,7 @@ function pfUI:LoadConfig() pfUI:UpdateConfig("global", nil, "font_default", "arial") pfUI:UpdateConfig("global", nil, "font_square", "homespun") pfUI:UpdateConfig("global", nil, "font_combat", "diediedie") + pfUI:UpdateConfig("global", nil, "force_region", "1") pfUI:UpdateConfig("global", nil, "errors_limit", "1") pfUI:UpdateConfig("global", nil, "errors_hide", "0") pfUI:UpdateConfig("global", nil, "hidebuff", "0") diff --git a/modules/cooldown.lua b/modules/cooldown.lua index a4837daa..a8486df1 100644 --- a/modules/cooldown.lua +++ b/modules/cooldown.lua @@ -5,7 +5,7 @@ pfUI:RegisterModule("cooldown", function () cooldown.cd:SetFrameLevel(cooldown.cd:GetFrameLevel() + 1) cooldown.cd.text = cooldown.cd:CreateFontString("pfCooldownFrameText", "OVERLAY") - cooldown.cd.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + cooldown.cd.text:SetFont(pfUI.font_square, pfUI_config.global.font_size, "OUTLINE") cooldown.cd.text:SetPoint("CENTER", cooldown.cd, "CENTER", 0, 1) cooldown.cd:SetScript("OnUpdate", function() diff --git a/modules/group.lua b/modules/group.lua index 29a1517e..a802803f 100644 --- a/modules/group.lua +++ b/modules/group.lua @@ -115,7 +115,7 @@ pfUI:RegisterModule("group", function () pfUI.uf.group[i].power.bar:SetMinMaxValues(0, 100) pfUI.uf.group[i].caption = pfUI.uf.group[i]:CreateFontString("Status", "HIGH", "GameFontNormal") - pfUI.uf.group[i].caption:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.uf.group[i].caption:SetFont(pfUI.font_square, pfUI_config.global.font_size, "OUTLINE") pfUI.uf.group[i].caption:ClearAllPoints() pfUI.uf.group[i].caption:SetParent(pfUI.uf.group[i].hp.bar) pfUI.uf.group[i].caption:SetPoint("LEFT",pfUI.uf.group[i].hp.bar, "LEFT", 10, 0) diff --git a/modules/gui.lua b/modules/gui.lua index 9eb59833..ccf22b55 100644 --- a/modules/gui.lua +++ b/modules/gui.lua @@ -161,7 +161,7 @@ pfUI:RegisterModule("gui", function () frame.drag.backdrop:SetBackdropBorderColor(.2, 1, .8) frame.drag:EnableMouseWheel(1) frame.drag.text = frame.drag:CreateFontString("Status", "LOW", "GameFontNormal") - frame.drag.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + frame.drag.text:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") frame.drag.text:ClearAllPoints() frame.drag.text:SetAllPoints(frame.drag) frame.drag.text:SetPoint("CENTER", 0, 0) @@ -344,7 +344,7 @@ pfUI:RegisterModule("gui", function () end pfUI.utils:CreateBackdrop(frame.switch, nil, true) frame.switch.text = frame.switch:CreateFontString("Status", "LOW", "GameFontNormal") - frame.switch.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + frame.switch.text:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") frame.switch.text:SetAllPoints(frame.switch) frame.switch.text:SetPoint("CENTER", 0, 0) frame.switch.text:SetFontObject(GameFontWhite) @@ -360,7 +360,7 @@ pfUI:RegisterModule("gui", function () -- do not show title on bottom buttons if not bottom and not func then frame.title = frame:CreateFontString("Status", "LOW", "GameFontNormal") - frame.title:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size + 2, "OUTLINE") + frame.title:SetFont(pfUI.font_default, pfUI_config.global.font_size + 2, "OUTLINE") frame.title:SetPoint("TOP", 0, -10) frame.title:SetTextColor(.2,1,.8) frame.title:SetText(text) @@ -387,7 +387,7 @@ pfUI:RegisterModule("gui", function () -- caption frame.caption = frame:CreateFontString("Status", "LOW", "GameFontNormal") - frame.caption:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size + 2, "OUTLINE") + frame.caption:SetFont(pfUI.font_default, pfUI_config.global.font_size + 2, "OUTLINE") frame.caption:SetAllPoints(frame) frame.caption:SetFontObject(GameFontWhite) frame.caption:SetJustifyH("LEFT") @@ -665,6 +665,7 @@ pfUI:RegisterModule("gui", function () pfUI.gui:CreateConfig(pfUI.gui.global, "Default Font", pfUI_config.global, "font_default", "dropdown", values) pfUI.gui:CreateConfig(pfUI.gui.global, "Square Font", pfUI_config.global, "font_square", "dropdown", values) pfUI.gui:CreateConfig(pfUI.gui.global, "Combat Font", pfUI_config.global, "font_combat", "dropdown", values) + pfUI.gui:CreateConfig(pfUI.gui.global, "Force region compatible font", pfUI_config.global, "force_region", "checkbox") pfUI.gui:CreateConfig(pfUI.gui.global, "Limit UIErrors to one line", pfUI_config.global, "errors_limit", "checkbox") pfUI.gui:CreateConfig(pfUI.gui.global, "Disable UIErrors", pfUI_config.global, "errors_hide", "checkbox") pfUI.gui:CreateConfig(pfUI.gui.global, "Hide Buffs", pfUI_config.global, "hidebuff", "checkbox") diff --git a/modules/loot.lua b/modules/loot.lua index 8ccc91bf..db6c223c 100644 --- a/modules/loot.lua +++ b/modules/loot.lua @@ -147,7 +147,7 @@ pfUI:RegisterModule("loot", function () frame.count:ClearAllPoints() frame.count:SetJustifyH"RIGHT" frame.count:SetPoint("BOTTOMRIGHT", frame.ficon, 2, 2) - frame.count:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + frame.count:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") frame.count:SetText(1) frame.name = frame:CreateFontString(nil, "OVERLAY") @@ -155,7 +155,7 @@ pfUI:RegisterModule("loot", function () frame.name:ClearAllPoints() frame.name:SetAllPoints(frame) frame.name:SetNonSpaceWrap(true) - frame.name:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + frame.name:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") frame.rarity = frame:CreateTexture(nil, "ARTWORK") frame.rarity:SetTexture"Interface\\AddOns\\pfUI\\img\\bar" diff --git a/modules/minimap.lua b/modules/minimap.lua index 187cf475..b5573d4b 100644 --- a/modules/minimap.lua +++ b/modules/minimap.lua @@ -75,7 +75,7 @@ pfUI:RegisterModule("minimap", function () pfUI.minimapCoordinates:SetFrameStrata("BACKGROUND") -- Create text pfUI.minimapCoordinates.text = pfUI.minimapCoordinates:CreateFontString("MinimapCoordinatesText", "LOW", "GameFontNormal") - pfUI.minimapCoordinates.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.minimapCoordinates.text:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") pfUI.minimapCoordinates.text:SetPoint("LEFT", 4, 0) pfUI.minimapCoordinates.text:SetFontObject(GameFontWhite) pfUI.minimapCoordinates.text:SetText("X, Y") diff --git a/modules/panel.lua b/modules/panel.lua index 5439bf6a..a2e4918a 100644 --- a/modules/panel.lua +++ b/modules/panel.lua @@ -55,7 +55,7 @@ pfUI:RegisterModule("panel", function () pfUI.panel.clock.timerFrame.text = pfUI.panel.clock.timerFrame:CreateFontString("Status", "LOW", "GameFontNormal") pfUI.panel.clock.timerFrame.text:SetFontObject(GameFontWhite) - pfUI.panel.clock.timerFrame.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.panel.clock.timerFrame.text:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") pfUI.panel.clock.timerFrame.text:SetAllPoints(pfUI.panel.clock.timerFrame) pfUI.panel.clock.timerFrame:SetScript("OnUpdate", function() @@ -390,7 +390,7 @@ pfUI:RegisterModule("panel", function () pfUI.panel.left.left:SetHeight(pfUI.panel.left:GetHeight()) pfUI.panel.left.left:SetPoint("LEFT", 0, 0) pfUI.panel.left.left.text = pfUI.panel.left.left:CreateFontString("Status", "LOW", "GameFontNormal") - pfUI.panel.left.left.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.panel.left.left.text:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") pfUI.panel.left.left.text:ClearAllPoints() pfUI.panel.left.left.text:SetAllPoints(pfUI.panel.left.left) pfUI.panel.left.left.text:SetPoint("CENTER", 0, 0) @@ -402,7 +402,7 @@ pfUI:RegisterModule("panel", function () pfUI.panel.left.center:SetHeight(pfUI.panel.left:GetHeight()) pfUI.panel.left.center:SetPoint("CENTER", 0, 0) pfUI.panel.left.center.text = pfUI.panel.left.center:CreateFontString("Status", "LOW", "GameFontNormal") - pfUI.panel.left.center.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.panel.left.center.text:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") pfUI.panel.left.center.text:ClearAllPoints() pfUI.panel.left.center.text:SetAllPoints(pfUI.panel.left.center) pfUI.panel.left.center.text:SetPoint("CENTER", 0, 0) @@ -414,7 +414,7 @@ pfUI:RegisterModule("panel", function () pfUI.panel.left.right:SetHeight(pfUI.panel.left:GetHeight()) pfUI.panel.left.right:SetPoint("RIGHT", 0, 0) pfUI.panel.left.right.text = pfUI.panel.left.right:CreateFontString("Status", "LOW", "GameFontNormal") - pfUI.panel.left.right.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.panel.left.right.text:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") pfUI.panel.left.right.text:ClearAllPoints() pfUI.panel.left.right.text:SetAllPoints(pfUI.panel.left.right) pfUI.panel.left.right.text:SetPoint("CENTER", 0, 0) @@ -456,7 +456,7 @@ pfUI:RegisterModule("panel", function () pfUI.panel.right.left:SetHeight(pfUI.panel.right:GetHeight()) pfUI.panel.right.left:SetPoint("LEFT", 0, 0) pfUI.panel.right.left.text = pfUI.panel.right.left:CreateFontString("Status", "LOW", "GameFontNormal") - pfUI.panel.right.left.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.panel.right.left.text:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") pfUI.panel.right.left.text:ClearAllPoints() pfUI.panel.right.left.text:SetAllPoints(pfUI.panel.right.left) pfUI.panel.right.left.text:SetPoint("CENTER", 0, 0) @@ -468,7 +468,7 @@ pfUI:RegisterModule("panel", function () pfUI.panel.right.center:SetHeight(pfUI.panel.right:GetHeight()) pfUI.panel.right.center:SetPoint("CENTER", 0, 0) pfUI.panel.right.center.text = pfUI.panel.right.center:CreateFontString("Status", "LOW", "GameFontNormal") - pfUI.panel.right.center.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.panel.right.center.text:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") pfUI.panel.right.center.text:ClearAllPoints() pfUI.panel.right.center.text:SetAllPoints(pfUI.panel.right.center) pfUI.panel.right.center.text:SetPoint("CENTER", 0, 0) @@ -480,7 +480,7 @@ pfUI:RegisterModule("panel", function () pfUI.panel.right.right:SetHeight(pfUI.panel.right:GetHeight()) pfUI.panel.right.right:SetPoint("RIGHT", 0, 0) pfUI.panel.right.right.text = pfUI.panel.right.right:CreateFontString("Status", "LOW", "GameFontNormal") - pfUI.panel.right.right.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.panel.right.right.text:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") pfUI.panel.right.right.text:ClearAllPoints() pfUI.panel.right.right.text:SetAllPoints(pfUI.panel.right.right) pfUI.panel.right.right.text:SetPoint("CENTER", 0, 0) @@ -499,7 +499,7 @@ pfUI:RegisterModule("panel", function () end pfUI.panel.minimap:SetFrameStrata("BACKGROUND") pfUI.panel.minimap.text = pfUI.panel.minimap:CreateFontString("MinimapZoneText", "LOW", "GameFontNormal") - pfUI.panel.minimap.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.panel.minimap.text:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") pfUI.panel.minimap.text:SetPoint("CENTER", 0, 0) pfUI.panel.minimap.text:SetFontObject(GameFontWhite) diff --git a/modules/pet.lua b/modules/pet.lua index d7346d8b..4f1d118c 100644 --- a/modules/pet.lua +++ b/modules/pet.lua @@ -170,7 +170,7 @@ pfUI:RegisterModule("pet", function () pfUI.uf.pet.power.bar:SetMinMaxValues(0, 100) pfUI.uf.pet.hp.text = pfUI.uf.pet.hp.bar:CreateFontString("Status", "LOW", "GameFontNormal") - pfUI.uf.pet.hp.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size - 2, "OUTLINE") + pfUI.uf.pet.hp.text:SetFont(pfUI.font_square, pfUI_config.global.font_size - 2, "OUTLINE") pfUI.uf.pet.hp.text:ClearAllPoints() pfUI.uf.pet.hp.text:SetAllPoints(pfUI.uf.pet.hp.bar) pfUI.uf.pet.hp.text:SetPoint("CENTER", 0, 0) @@ -196,7 +196,7 @@ pfUI:RegisterModule("pet", function () pfUI.uf.pet.buff.buffs[i] = CreateFrame("Button", "pfUITargetBuff" .. i, pfUI.uf.pet) pfUI.uf.pet.buff.buffs[i].stacks = pfUI.uf.pet.buff.buffs[i]:CreateFontString(nil, "OVERLAY", pfUI.uf.pet.buff.buffs[i]) - pfUI.uf.pet.buff.buffs[i].stacks:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.uf.pet.buff.buffs[i].stacks:SetFont(pfUI.font_square, pfUI_config.global.font_size, "OUTLINE") pfUI.uf.pet.buff.buffs[i].stacks:SetPoint("BOTTOMRIGHT", pfUI.uf.pet.buff.buffs[i], 2, -2) pfUI.uf.pet.buff.buffs[i].stacks:SetJustifyH("LEFT") pfUI.uf.pet.buff.buffs[i].stacks:SetShadowColor(0, 0, 0) @@ -259,7 +259,7 @@ pfUI:RegisterModule("pet", function () pfUI.uf.pet.debuff.debuffs[i] = CreateFrame("Button", "pfUITargetDebuff" .. i, pfUI.uf.pet) pfUI.uf.pet.debuff.debuffs[i].stacks = pfUI.uf.pet.debuff.debuffs[i]:CreateFontString(nil, "OVERLAY", pfUI.uf.pet.debuff.debuffs[i]) - pfUI.uf.pet.debuff.debuffs[i].stacks:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.uf.pet.debuff.debuffs[i].stacks:SetFont(pfUI.font_square, pfUI_config.global.font_size, "OUTLINE") pfUI.uf.pet.debuff.debuffs[i].stacks:SetPoint("BOTTOMRIGHT", pfUI.uf.pet.debuff.debuffs[i], 2, -2) pfUI.uf.pet.debuff.debuffs[i].stacks:SetJustifyH("LEFT") pfUI.uf.pet.debuff.debuffs[i].stacks:SetShadowColor(0, 0, 0) diff --git a/modules/player.lua b/modules/player.lua index 0b9b561c..2a1f3f7a 100644 --- a/modules/player.lua +++ b/modules/player.lua @@ -345,14 +345,14 @@ pfUI:RegisterModule("player", function () end pfUI.uf.player.hpText = pfUI.uf.player:CreateFontString("Status", "HIGH", "GameFontNormal") - pfUI.uf.player.hpText:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.uf.player.hpText:SetFont(pfUI.font_square, pfUI_config.global.font_size, "OUTLINE") pfUI.uf.player.hpText:ClearAllPoints() pfUI.uf.player.hpText:SetJustifyH("RIGHT") pfUI.uf.player.hpText:SetFontObject(GameFontWhite) pfUI.uf.player.hpText:SetText("5000") pfUI.uf.player.powerText = pfUI.uf.player:CreateFontString("Status", "HIGH", "GameFontNormal") - pfUI.uf.player.powerText:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.uf.player.powerText:SetFont(pfUI.font_square, pfUI_config.global.font_size, "OUTLINE") pfUI.uf.player.powerText:ClearAllPoints() pfUI.uf.player.powerText:SetJustifyH("LEFT") pfUI.uf.player.powerText:SetFontObject(GameFontWhite) @@ -379,14 +379,14 @@ pfUI:RegisterModule("player", function () pfUI.uf.player.buff.buffs[i]:SetID(i) pfUI.uf.player.buff.buffs[i].stacks = pfUI.uf.player.buff.buffs[i]:CreateFontString(nil, "OVERLAY", pfUI.uf.player.buff.buffs[i]) - pfUI.uf.player.buff.buffs[i].stacks:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.uf.player.buff.buffs[i].stacks:SetFont(pfUI.font_square, pfUI_config.global.font_size, "OUTLINE") pfUI.uf.player.buff.buffs[i].stacks:SetPoint("BOTTOMRIGHT", pfUI.uf.player.buff.buffs[i], 2, -2) pfUI.uf.player.buff.buffs[i].stacks:SetJustifyH("LEFT") pfUI.uf.player.buff.buffs[i].stacks:SetShadowColor(0, 0, 0) pfUI.uf.player.buff.buffs[i].stacks:SetShadowOffset(0.8, -0.8) pfUI.uf.player.buff.buffs[i].stacks:SetTextColor(1,1,.5) pfUI.uf.player.buff.buffs[i].cd = pfUI.uf.player.buff.buffs[i]:CreateFontString(nil, "OVERLAY", pfUI.uf.player.buff.buffs[i]) - pfUI.uf.player.buff.buffs[i].cd:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.uf.player.buff.buffs[i].cd:SetFont(pfUI.font_square, pfUI_config.global.font_size, "OUTLINE") pfUI.uf.player.buff.buffs[i].cd:SetPoint("CENTER", pfUI.uf.player.buff.buffs[i], 0, 0) pfUI.uf.player.buff.buffs[i].cd:SetJustifyH("LEFT") pfUI.uf.player.buff.buffs[i].cd:SetShadowColor(0, 0, 0) @@ -490,14 +490,14 @@ pfUI:RegisterModule("player", function () pfUI.uf.player.debuff.debuffs[i] = CreateFrame("Button", "pfUIPlayerDebuff" .. i, pfUI.uf.player) pfUI.uf.player.debuff.debuffs[i]:SetID(i) pfUI.uf.player.debuff.debuffs[i].stacks = pfUI.uf.player.debuff.debuffs[i]:CreateFontString(nil, "OVERLAY", pfUI.uf.player.debuff.debuffs[i]) - pfUI.uf.player.debuff.debuffs[i].stacks:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.uf.player.debuff.debuffs[i].stacks:SetFont(pfUI.font_square, pfUI_config.global.font_size, "OUTLINE") pfUI.uf.player.debuff.debuffs[i].stacks:SetPoint("BOTTOMRIGHT", pfUI.uf.player.debuff.debuffs[i], 2, -2) pfUI.uf.player.debuff.debuffs[i].stacks:SetJustifyH("LEFT") pfUI.uf.player.debuff.debuffs[i].stacks:SetShadowColor(0, 0, 0) pfUI.uf.player.debuff.debuffs[i].stacks:SetShadowOffset(0.8, -0.8) pfUI.uf.player.debuff.debuffs[i].stacks:SetTextColor(1,1,.5) pfUI.uf.player.debuff.debuffs[i].cd = pfUI.uf.player.debuff.debuffs[i]:CreateFontString(nil, "OVERLAY", pfUI.uf.player.debuff.debuffs[i]) - pfUI.uf.player.debuff.debuffs[i].cd:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.uf.player.debuff.debuffs[i].cd:SetFont(pfUI.font_square, pfUI_config.global.font_size, "OUTLINE") pfUI.uf.player.debuff.debuffs[i].cd:SetPoint("CENTER", pfUI.uf.player.debuff.debuffs[i], 0, 0) pfUI.uf.player.debuff.debuffs[i].cd:SetJustifyH("LEFT") pfUI.uf.player.debuff.debuffs[i].cd:SetShadowColor(0, 0, 0) diff --git a/modules/raid.lua b/modules/raid.lua index eed70e46..6ae1f70d 100644 --- a/modules/raid.lua +++ b/modules/raid.lua @@ -71,7 +71,7 @@ pfUI:RegisterModule("raid", function () pfUI.uf.raid[i].power.bar:SetMinMaxValues(0, 100) pfUI.uf.raid[i].caption = pfUI.uf.raid[i]:CreateFontString("Status", "HIGH", "GameFontNormal") - pfUI.uf.raid[i].caption:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.uf.raid[i].caption:SetFont(pfUI.font_square, pfUI_config.global.font_size, "OUTLINE") pfUI.uf.raid[i].caption:SetAllPoints(pfUI.uf.raid[i].hp.bar) pfUI.uf.raid[i].caption:ClearAllPoints() pfUI.uf.raid[i].caption:SetParent(pfUI.uf.raid[i].hp.bar) diff --git a/modules/skin.lua b/modules/skin.lua index 8aa662ec..4ed4313c 100644 --- a/modules/skin.lua +++ b/modules/skin.lua @@ -59,7 +59,7 @@ pfUI:RegisterModule("skin", function () b:SetScript("OnLeave", function() pfUI.utils:CreateBackdrop(b, nil, true) end) - b:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + b:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") end for _, box in pairs(boxes) do @@ -71,7 +71,7 @@ pfUI:RegisterModule("skin", function () if v.SetTextColor then v:SetTextColor(1,1,1,1) v:SetPoint("TOP", GameMenuFrame, "TOP", 0, 16) - v:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size + 2, "OUTLINE") + v:SetFont(pfUI.font_default, pfUI_config.global.font_size + 2, "OUTLINE") end end diff --git a/modules/target.lua b/modules/target.lua index a45169b1..810dbc33 100644 --- a/modules/target.lua +++ b/modules/target.lua @@ -336,7 +336,7 @@ pfUI:RegisterModule("target", function () pfUI.uf.target.power.bar:SetMinMaxValues(0, 100) pfUI.uf.target.hpText = pfUI.uf.target:CreateFontString("Status", "HIGH", "GameFontNormal") - pfUI.uf.target.hpText:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.uf.target.hpText:SetFont(pfUI.font_square, pfUI_config.global.font_size, "OUTLINE") pfUI.uf.target.hpText:ClearAllPoints() pfUI.uf.target.hpText:SetParent(pfUI.uf.target.hp.bar) pfUI.uf.target.hpText:SetPoint("RIGHT",pfUI.uf.target.hp.bar, "RIGHT", -10, 0) @@ -345,7 +345,7 @@ pfUI:RegisterModule("target", function () pfUI.uf.target.hpText:SetText("5000") pfUI.uf.target.powerText = pfUI.uf.target:CreateFontString("Status", "HIGH", "GameFontNormal") - pfUI.uf.target.powerText:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.uf.target.powerText:SetFont(pfUI.font_square, pfUI_config.global.font_size, "OUTLINE") pfUI.uf.target.powerText:ClearAllPoints() pfUI.uf.target.powerText:SetParent(pfUI.uf.target.hp.bar) pfUI.uf.target.powerText:SetPoint("LEFT",pfUI.uf.target.hp.bar, "LEFT", 10, 0) @@ -421,7 +421,7 @@ pfUI:RegisterModule("target", function () pfUI.uf.target.buff.buffs[i] = CreateFrame("Button", "pfUITargetBuff" .. i, pfUI.uf.target) pfUI.uf.target.buff.buffs[i].stacks = pfUI.uf.target.buff.buffs[i]:CreateFontString(nil, "OVERLAY", pfUI.uf.target.buff.buffs[i]) - pfUI.uf.target.buff.buffs[i].stacks:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.uf.target.buff.buffs[i].stacks:SetFont(pfUI.font_square, pfUI_config.global.font_size, "OUTLINE") pfUI.uf.target.buff.buffs[i].stacks:SetPoint("BOTTOMRIGHT", pfUI.uf.target.buff.buffs[i], 2, -2) pfUI.uf.target.buff.buffs[i].stacks:SetJustifyH("LEFT") pfUI.uf.target.buff.buffs[i].stacks:SetShadowColor(0, 0, 0) @@ -502,7 +502,7 @@ pfUI:RegisterModule("target", function () local id = i pfUI.uf.target.debuff.debuffs[i] = CreateFrame("Button", "pfUITargetDebuff" .. i, pfUI.uf.target) pfUI.uf.target.debuff.debuffs[i].stacks = pfUI.uf.target.debuff.debuffs[i]:CreateFontString(nil, "OVERLAY", pfUI.uf.target.debuff.debuffs[i]) - pfUI.uf.target.debuff.debuffs[i].stacks:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.uf.target.debuff.debuffs[i].stacks:SetFont(pfUI.font_square, pfUI_config.global.font_size, "OUTLINE") pfUI.uf.target.debuff.debuffs[i].stacks:SetPoint("BOTTOMRIGHT", pfUI.uf.target.debuff.debuffs[i], 2, -2) pfUI.uf.target.debuff.debuffs[i].stacks:SetJustifyH("LEFT") pfUI.uf.target.debuff.debuffs[i].stacks:SetShadowColor(0, 0, 0) diff --git a/modules/targettarget.lua b/modules/targettarget.lua index 3f08b3e4..c1f361c1 100644 --- a/modules/targettarget.lua +++ b/modules/targettarget.lua @@ -208,7 +208,7 @@ pfUI:RegisterModule("targettarget", function () pfUI.uf.targettarget.power.bar:SetMinMaxValues(0, 100) pfUI.uf.targettarget.hp.text = pfUI.uf.targettarget.hp.bar:CreateFontString("Status", "LOW", "GameFontNormal") - pfUI.uf.targettarget.hp.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size - 2, "OUTLINE") + pfUI.uf.targettarget.hp.text:SetFont(pfUI.font_square, pfUI_config.global.font_size - 2, "OUTLINE") pfUI.uf.targettarget.hp.text:ClearAllPoints() pfUI.uf.targettarget.hp.text:SetAllPoints(pfUI.uf.targettarget.hp.bar) pfUI.uf.targettarget.hp.text:SetPoint("CENTER", 0, 0) diff --git a/modules/thirdparty.lua b/modules/thirdparty.lua index 350aab20..6b7bf501 100644 --- a/modules/thirdparty.lua +++ b/modules/thirdparty.lua @@ -316,7 +316,7 @@ pfUI:RegisterModule("thirdparty", function () pfUI.bag.right.sort:SetHeight(12) pfUI.bag.right.sort:SetWidth(12) pfUI.bag.right.sort:SetTextColor(1,1,.25,1) - pfUI.bag.right.sort:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.bag.right.sort:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") pfUI.bag.right.sort.texture = pfUI.bag.right.sort:CreateTexture("pfBagArrowUp") pfUI.bag.right.sort.texture:SetTexture("Interface\\AddOns\\pfUI\\img\\sort") pfUI.bag.right.sort.texture:ClearAllPoints() @@ -354,7 +354,7 @@ pfUI:RegisterModule("thirdparty", function () pfUI.bag.left.sort:SetHeight(12) pfUI.bag.left.sort:SetWidth(12) pfUI.bag.left.sort:SetTextColor(1,1,.25,1) - pfUI.bag.left.sort:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.bag.left.sort:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") pfUI.bag.left.sort.texture = pfUI.bag.left.sort:CreateTexture("pfBagArrowUp") pfUI.bag.left.sort.texture:SetTexture("Interface\\AddOns\\pfUI\\img\\sort") pfUI.bag.left.sort.texture:ClearAllPoints() diff --git a/modules/tooltip.lua b/modules/tooltip.lua index eaeed29a..104aeaa4 100644 --- a/modules/tooltip.lua +++ b/modules/tooltip.lua @@ -128,7 +128,7 @@ pfUI.utils:CreateBackdrop(GameTooltip) pfUI.tooltipStatusBar.HP:SetPoint("TOP", 0,8) pfUI.tooltipStatusBar.HP:SetNonSpaceWrap(false) pfUI.tooltipStatusBar.HP:SetFontObject(GameFontWhite) - pfUI.tooltipStatusBar.HP:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size + 2, "OUTLINE") + pfUI.tooltipStatusBar.HP:SetFont(pfUI.font_default, pfUI_config.global.font_size + 2, "OUTLINE") end if hp and hpm then diff --git a/pfUI.lua b/pfUI.lua index 8cc392e5..e31769d9 100644 --- a/pfUI.lua +++ b/pfUI.lua @@ -203,7 +203,7 @@ function pfUI.info:ShowInfoBox(text, time, parent, height) pfUI.info:ClearAllPoints() pfUI.info.text:SetAllPoints(pfUI.info) pfUI.info.text:SetText(text) - pfUI.info.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", 14, "OUTLINE") + pfUI.info.text:SetFont(pfUI.font_default, 14, "OUTLINE") pfUI.info:SetWidth(pfUI.info.text:GetStringWidth() + 50) pfUI.info:SetHeight(height)