From 41653e445f22c9ff3247fe1a8b97103afb6aee0e Mon Sep 17 00:00:00 2001 From: shagu Date: Tue, 8 Nov 2016 22:09:13 +0100 Subject: [PATCH] add possibility to exchange the default fonts --- env/colors.lua | 40 ++++++----- env/fonts.lua | 84 ++++++++++++++--------- fonts/{combat_font.ttf => diediedie.ttf} | Bin modules/actionbar.lua | 12 ++-- modules/bags.lua | 16 ++--- modules/castbar.lua | 8 +-- modules/chat.lua | 10 +-- modules/config.lua | 3 + modules/cooldown.lua | 2 +- modules/group.lua | 2 +- modules/gui.lua | 12 ++-- modules/loot.lua | 4 +- modules/minimap.lua | 2 +- modules/panel.lua | 14 ++-- 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 | 2 +- modules/tooltip.lua | 2 +- pfUI.lua | 33 +++++---- 23 files changed, 159 insertions(+), 121 deletions(-) rename fonts/{combat_font.ttf => diediedie.ttf} (100%) diff --git a/env/colors.lua b/env/colors.lua index 7bd6c3b5..87b468b7 100644 --- a/env/colors.lua +++ b/env/colors.lua @@ -1,18 +1,24 @@ -ManaBarColor = {} -ManaBarColor[0] = { r = 0.00, g = 0.00, b = 1.00, prefix = TEXT(MANA) }; -ManaBarColor[1] = { r = 1.00, g = 0.00, b = 0.00, prefix = TEXT(RAGE_POINTS) }; -ManaBarColor[2] = { r = 1.00, g = 0.50, b = 0.25, prefix = TEXT(FOCUS_POINTS) }; -ManaBarColor[3] = { r = 1.00, g = 1.00, b = 0.00, prefix = TEXT(ENERGY_POINTS) }; -ManaBarColor[4] = { r = 0.00, g = 1.00, b = 1.00, prefix = TEXT(HAPPINESS_POINTS) }; +-- override and set some default colors +function pfUI.environment:UpdateColors() + ManaBarColor = {} + ManaBarColor[0] = { r = 0.00, g = 0.00, b = 1.00, prefix = TEXT(MANA) }; + ManaBarColor[1] = { r = 1.00, g = 0.00, b = 0.00, prefix = TEXT(RAGE_POINTS) }; + ManaBarColor[2] = { r = 1.00, g = 0.50, b = 0.25, prefix = TEXT(FOCUS_POINTS) }; + ManaBarColor[3] = { r = 1.00, g = 1.00, b = 0.00, prefix = TEXT(ENERGY_POINTS) }; + ManaBarColor[4] = { r = 0.00, g = 1.00, b = 1.00, prefix = TEXT(HAPPINESS_POINTS) }; -RAID_CLASS_COLORS = { - ["WARRIOR"] = { r = 0.78, g = 0.61, b = 0.43, colorStr = "ffc79c6e" }, - ["MAGE"] = { r = 0.41, g = 0.8, b = 0.94, colorStr = "ff69ccf0" }, - ["ROGUE"] = { r = 1, g = 0.96, b = 0.41, colorStr = "fffff569" }, - ["DRUID"] = { r = 1, g = 0.49, b = 0.04, colorStr = "ffff7d0a" }, - ["HUNTER"] = { r = 0.67, g = 0.83, b = 0.45, colorStr = "ffabd473" }, - ["SHAMAN"] = { r = 0.14, g = 0.35, b = 1.0, colorStr = "ff0070de" }, - ["PRIEST"] = { r = 1, g = 1, b = 1, colorStr = "ffffffff" }, - ["WARLOCK"] = { r = 0.58, g = 0.51, b = 0.79, colorStr = "ff9482c9" }, - ["PALADIN"] = { r = 0.96, g = 0.55, b = 0.73, colorStr = "fff58cba" } -} + RAID_CLASS_COLORS = { + ["WARRIOR"] = { r = 0.78, g = 0.61, b = 0.43, colorStr = "ffc79c6e" }, + ["MAGE"] = { r = 0.41, g = 0.8, b = 0.94, colorStr = "ff69ccf0" }, + ["ROGUE"] = { r = 1, g = 0.96, b = 0.41, colorStr = "fffff569" }, + ["DRUID"] = { r = 1, g = 0.49, b = 0.04, colorStr = "ffff7d0a" }, + ["HUNTER"] = { r = 0.67, g = 0.83, b = 0.45, colorStr = "ffabd473" }, + ["SHAMAN"] = { r = 0.14, g = 0.35, b = 1.0, colorStr = "ff0070de" }, + ["PRIEST"] = { r = 1, g = 1, b = 1, colorStr = "ffffffff" }, + ["WARLOCK"] = { r = 0.58, g = 0.51, b = 0.79, colorStr = "ff9482c9" }, + ["PALADIN"] = { r = 0.96, g = 0.55, b = 0.73, colorStr = "fff58cba" } + } +end + +-- run environment update +pfUI.environment:UpdateColors() diff --git a/env/fonts.lua b/env/fonts.lua index 8eff7c2e..247fbbcd 100644 --- a/env/fonts.lua +++ b/env/fonts.lua @@ -1,36 +1,52 @@ -local font = "Interface\\AddOns\\pfUI\\fonts\\arial.ttf" -local combat_font = "Interface\\AddOns\\pfUI\\fonts\\combat_font.ttf" +-- this must be set during the initial execution +STANDARD_TEXT_FONT = "Interface\\AddOns\\pfUI\\fonts\\arial.ttf" -STANDARD_TEXT_FONT = font; -UNIT_NAME_FONT = font; -DAMAGE_TEXT_FONT = combat_font; -NAMEPLATE_FONT = font; +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" -SystemFont:SetFont(font, 15) -GameFontNormal:SetFont(font, 12) -GameFontBlack:SetFont(font, 12) -GameFontNormalSmall:SetFont(font, 10) -GameFontNormalLarge:SetFont(font, 16) -GameFontNormalHuge:SetFont(font, 20) -NumberFontNormal:SetFont(font, 14, "OUTLINE") -NumberFontNormalSmall:SetFont(font, 14, "OUTLINE") -NumberFontNormalLarge:SetFont(font, 16, "OUTLINE") -NumberFontNormalHuge:SetFont(font, 30, "OUTLINE") -QuestTitleFont:SetFont(font, 18) -QuestFont:SetFont(font, 13) -QuestFontHighlight:SetFont(font, 14) -ItemTextFontNormal:SetFont(font, 15) -MailTextFontNormal:SetFont(font, 15) -SubSpellFont:SetFont(font, 10) -DialogButtonNormalText:SetFont(font, 16) -ZoneTextFont:SetFont(font, 48, "OUTLINE") -SubZoneTextFont:SetFont(font, 24, "OUTLINE") -TextStatusBarTextSmall:SetFont(font, 12, "NORMAL") -GameTooltipText:SetFont(font, 12) -GameTooltipTextSmall:SetFont(font, 10) -GameTooltipHeaderText:SetFont(font, 14) -WorldMapTextFont:SetFont(font, 102, "THICK") -InvoiceTextFontNormal:SetFont(font, 12) -InvoiceTextFontSmall:SetFont(font, 10) -CombatTextFont:SetFont(font, 25) -ChatFontNormal:SetFont(font, 12, "NORMAL") + 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" + end + + STANDARD_TEXT_FONT = default; + UNIT_NAME_FONT = default; + DAMAGE_TEXT_FONT = combat; + NAMEPLATE_FONT = default; + + SystemFont:SetFont(default, 15) + GameFontNormal:SetFont(default, 12) + GameFontBlack:SetFont(default, 12) + GameFontNormalSmall:SetFont(default, 10) + 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, 10) + 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, 10) + GameTooltipHeaderText:SetFont(default, 14) + WorldMapTextFont:SetFont(default, 102, "THICK") + InvoiceTextFontNormal:SetFont(default, 12) + InvoiceTextFontSmall:SetFont(default, 10) + CombatTextFont:SetFont(default, 25) + ChatFontNormal:SetFont(default, 12, "NORMAL") +end + +-- run environment update +pfUI.environment:UpdateFonts() diff --git a/fonts/combat_font.ttf b/fonts/diediedie.ttf similarity index 100% rename from fonts/combat_font.ttf rename to fonts/diediedie.ttf diff --git a/modules/actionbar.lua b/modules/actionbar.lua index 582bcc5f..b5dbf7fa 100644 --- a/modules/actionbar.lua +++ b/modules/actionbar.lua @@ -336,12 +336,12 @@ pfUI:RegisterModule("actionbar", function () getglobal("ShapeshiftButton"..i..'Border'):SetPoint("BOTTOMRIGHT", getglobal("ShapeshiftButton"..i) ,"BOTTOMRIGHT", -1, 1) getglobal("ShapeshiftButton"..i..'HotKey'):SetPoint("TOPLEFT", getglobal("ShapeshiftButton"..i) ,"TOPLEFT", 1, -1) getglobal("ShapeshiftButton"..i..'HotKey'):SetPoint("BOTTOMRIGHT", getglobal("ShapeshiftButton"..i) ,"BOTTOMRIGHT", -1, 1) - getglobal("ShapeshiftButton"..i..'HotKey'):SetFont("Interface\\AddOns\\pfUI\\fonts\\homespun.ttf", pfUI_config.global.font_size - 2, "OUTLINE") + getglobal("ShapeshiftButton"..i..'HotKey'):SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size - 2, "OUTLINE") getglobal("ShapeshiftButton"..i..'HotKey'):SetJustifyH("RIGHT") getglobal("ShapeshiftButton"..i..'HotKey'):SetJustifyV("TOP") getglobal("ShapeshiftButton"..i..'Name'):SetPoint("TOPLEFT", getglobal("ShapeshiftButton"..i) ,"TOPLEFT", 1, -1) getglobal("ShapeshiftButton"..i..'Name'):SetPoint("BOTTOMRIGHT", getglobal("ShapeshiftButton"..i) ,"BOTTOMRIGHT", -1, 1) - getglobal("ShapeshiftButton"..i..'Name'):SetFont("Interface\\AddOns\\pfUI\\fonts\\homespun.ttf", pfUI_config.global.font_size - 2, "OUTLINE") + getglobal("ShapeshiftButton"..i..'Name'):SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size - 2, "OUTLINE") getglobal("ShapeshiftButton"..i..'Name'):SetJustifyH("CENTER") getglobal("ShapeshiftButton"..i..'Name'):SetJustifyV("BOTTOM") end @@ -365,12 +365,12 @@ pfUI:RegisterModule("actionbar", function () getglobal("PetActionButton"..i..'Border'):SetPoint("BOTTOMRIGHT", getglobal("PetActionButton"..i) ,"BOTTOMRIGHT", -1, 1) getglobal("PetActionButton"..i..'HotKey'):SetPoint("TOPLEFT", getglobal("PetActionButton"..i) ,"TOPLEFT", 1, -1) getglobal("PetActionButton"..i..'HotKey'):SetPoint("BOTTOMRIGHT", getglobal("PetActionButton"..i) ,"BOTTOMRIGHT", -1, 1) - getglobal("PetActionButton"..i..'HotKey'):SetFont("Interface\\AddOns\\pfUI\\fonts\\homespun.ttf", pfUI_config.global.font_size - 2, "OUTLINE") + getglobal("PetActionButton"..i..'HotKey'):SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size - 2, "OUTLINE") getglobal("PetActionButton"..i..'HotKey'):SetJustifyH("RIGHT") getglobal("PetActionButton"..i..'HotKey'):SetJustifyV("TOP") getglobal("PetActionButton"..i..'Name'):SetPoint("TOPLEFT", getglobal("PetActionButton"..i) ,"TOPLEFT", 1, -1) getglobal("PetActionButton"..i..'Name'):SetPoint("BOTTOMRIGHT", getglobal("PetActionButton"..i) ,"BOTTOMRIGHT", -1, 1) - getglobal("PetActionButton"..i..'Name'):SetFont("Interface\\AddOns\\pfUI\\fonts\\homespun.ttf", pfUI_config.global.font_size - 2, "OUTLINE") + getglobal("PetActionButton"..i..'Name'):SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size - 2, "OUTLINE") getglobal("PetActionButton"..i..'Name'):SetJustifyH("CENTER") getglobal("PetActionButton"..i..'Name'):SetJustifyV("BOTTOM") end @@ -398,12 +398,12 @@ pfUI:RegisterModule("actionbar", function () getglobal(button..i..'Border'):SetPoint("BOTTOMRIGHT", getglobal(button..i) ,"BOTTOMRIGHT", -1, 1) getglobal(button..i..'HotKey'):SetPoint("TOPLEFT", getglobal(button..i) ,"TOPLEFT", 1, -1) getglobal(button..i..'HotKey'):SetPoint("BOTTOMRIGHT", getglobal(button..i) ,"BOTTOMRIGHT", -1, 1) - getglobal(button..i..'HotKey'):SetFont("Interface\\AddOns\\pfUI\\fonts\\homespun.ttf", pfUI_config.global.font_size - 2, "OUTLINE") + 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'):SetJustifyH("RIGHT") getglobal(button..i..'HotKey'):SetJustifyV("TOP") getglobal(button..i..'Name'):SetPoint("TOPLEFT", getglobal(button..i) ,"TOPLEFT", 1, -1) getglobal(button..i..'Name'):SetPoint("BOTTOMRIGHT", getglobal(button..i) ,"BOTTOMRIGHT", -1, 1) - getglobal(button..i..'Name'):SetFont("Interface\\AddOns\\pfUI\\fonts\\homespun.ttf", pfUI_config.global.font_size - 2, "OUTLINE") + 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'):SetJustifyH("CENTER") getglobal(button..i..'Name'):SetJustifyV("BOTTOM") end diff --git a/modules/bags.lua b/modules/bags.lua index d9d802fe..da7fb310 100644 --- a/modules/bags.lua +++ b/modules/bags.lua @@ -252,7 +252,7 @@ pfUI:RegisterModule("bags", function () end local count = getglobal(pfUI.bags[bag].slots[slot].frame:GetName() .. "Count") - count:SetFont("Interface\\AddOns\\pfUI\\fonts\\homespun.ttf", pfUI_config.global.font_size, "OUTLINE") + count:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size, "OUTLINE") count:SetAllPoints() count:SetJustifyH("RIGHT") count:SetJustifyV("BOTTOM") @@ -383,7 +383,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\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + frame.bagslots.buy:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") frame.bagslots.buy:SetScript("OnEnter", function () frame.bagslots.buy:SetTextColor(1,1,1,1) end) @@ -406,11 +406,11 @@ pfUI:RegisterModule("bags", function () frame.money:ClearAllPoints() frame.money:SetPoint("TOPRIGHT", frame, "TOPRIGHT", -40, -6) - pfUIBagsMoneyGoldButton:SetFont("Interface\\AddOns\\pfUI\\fonts\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + pfUIBagsMoneyGoldButton:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") for i,v in ipairs({pfUIBagsMoneyGoldButton:GetRegions()}) do if i == 1 then v:SetHeight(10); v:SetWidth(10) end end - pfUIBagsMoneySilverButton:SetFont("Interface\\AddOns\\pfUI\\fonts\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + pfUIBagsMoneySilverButton:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") for i,v in ipairs({pfUIBagsMoneySilverButton:GetRegions()}) do if i == 1 then v:SetHeight(10); v:SetWidth(10) end end - pfUIBagsMoneyCopperButton:SetFont("Interface\\AddOns\\pfUI\\fonts\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + pfUIBagsMoneyCopperButton:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") for i,v in ipairs({pfUIBagsMoneyCopperButton:GetRegions()}) do if i == 1 then v:SetHeight(10); v:SetWidth(10) end end end @@ -452,7 +452,7 @@ pfUI:RegisterModule("bags", function () frame.bags:SetHeight(15) frame.bags:SetWidth(15) frame.bags:SetTextColor(1,1,.25,1) - frame.bags:SetFont("Interface\\AddOns\\pfUI\\fonts\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + frame.bags:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", 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() @@ -492,7 +492,7 @@ pfUI:RegisterModule("bags", function () frame.keys:SetHeight(15) frame.keys:SetWidth(15) frame.keys:SetTextColor(1,1,.25,1) - frame.keys:SetFont("Interface\\AddOns\\pfUI\\fonts\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + frame.keys:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", 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() @@ -540,7 +540,7 @@ pfUI:RegisterModule("bags", function () frame.search.edit:SetPoint("TOPLEFT", frame.search, "TOPLEFT", pfUI_config.bars.border*2, 0) frame.search.edit:SetPoint("BOTTOMRIGHT", frame.search, "BOTTOMRIGHT", -pfUI_config.bars.border*2, 0) - frame.search.edit:SetFont("Interface\\AddOns\\pfUI\\fonts\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + frame.search.edit:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") frame.search.edit:SetAutoFocus(false) frame.search.edit:SetText("Search") frame.search.edit:SetTextColor(.5,.5,.5,1) diff --git a/modules/castbar.lua b/modules/castbar.lua index 6a7ef3ec..0291f45c 100644 --- a/modules/castbar.lua +++ b/modules/castbar.lua @@ -36,7 +36,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\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + 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:SetText("left") pfUI.castbar.player.bar.left:SetJustifyH("left") @@ -48,7 +48,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\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + 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:SetText("right") pfUI.castbar.player.bar.right:SetJustifyH("right") @@ -216,7 +216,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\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + 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:SetText("left") pfUI.castbar.target.bar.left:SetJustifyH("left") @@ -228,7 +228,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\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + 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:SetText("right") pfUI.castbar.target.bar.right:SetJustifyH("right") diff --git a/modules/chat.lua b/modules/chat.lua index dfe9b2f0..978ab89e 100644 --- a/modules/chat.lua +++ b/modules/chat.lua @@ -93,7 +93,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\\arial.ttf", pfUI_config.global.font_size + 2, "OUTLINE") + 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:SetPoint("TOP", 0, -20) pfUI.chat.left.panelTop.proxyName.caption:SetFontObject(GameFontWhite) pfUI.chat.left.panelTop.proxyName.caption:SetJustifyH("CENTER") @@ -118,7 +118,7 @@ pfUI:RegisterModule("chat", function () pfUI.chat.left.panelTop.proxyName.okay:SetPoint("BOTTOMRIGHT", -10, 10) pfUI.chat.left.panelTop.proxyName.okay:SetBackdrop(pfUI.backdrop) 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\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + 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: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) @@ -138,7 +138,7 @@ pfUI:RegisterModule("chat", function () pfUI.chat.left.panelTop.proxyName.abort:SetPoint("BOTTOMLEFT", 10, 10) pfUI.chat.left.panelTop.proxyName.abort:SetBackdrop(pfUI.backdrop) 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\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + 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: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) @@ -226,7 +226,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\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + getglobal("ChatFrame" .. i .. "TabText"):SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") if getglobal("ChatFrame" .. i).isDocked or getglobal("ChatFrame" .. i):IsVisible() then getglobal("ChatFrame" .. i .. "Tab"):Show() @@ -482,7 +482,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\\arial.ttf", pfUI_config.global.font_size + 1, "OUTLINE") + v:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size + 1, "OUTLINE") end end ChatFrameEditBox:SetAltArrowKeyMode(false) diff --git a/modules/config.lua b/modules/config.lua index 34bde9ae..97d99241 100644 --- a/modules/config.lua +++ b/modules/config.lua @@ -4,6 +4,9 @@ pfUI_config = {} function pfUI:LoadConfig() -- MODULE SUBGROUP ENTRY VALUE pfUI:UpdateConfig("global", nil, "font_size", "10") + pfUI:UpdateConfig("global", nil, "font_default", "arial") + pfUI:UpdateConfig("global", nil, "font_square", "homespun") + pfUI:UpdateConfig("global", nil, "font_combat", "diediedie") pfUI:UpdateConfig("unitframes", nil, "animation_speed", "5") pfUI:UpdateConfig("unitframes", nil, "portrait", "1") pfUI:UpdateConfig("unitframes", nil, "buff_size", "22") diff --git a/modules/cooldown.lua b/modules/cooldown.lua index e8692e94..31b638ef 100644 --- a/modules/cooldown.lua +++ b/modules/cooldown.lua @@ -21,7 +21,7 @@ pfUI:RegisterModule("cooldown", function () this.cd.back:SetAllPoints(this) this.cd.text = this.cd:CreateFontString("Status", "HIGH", "GameFontNormal") - this.cd.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\homespun.ttf", pfUI_config.global.font_size, "OUTLINE") + this.cd.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf", pfUI_config.global.font_size, "OUTLINE") this.cd.text:ClearAllPoints() this.cd.text:SetParent(this) this.cd.text:SetAllPoints(this) diff --git a/modules/group.lua b/modules/group.lua index 04eb241b..5cf48317 100644 --- a/modules/group.lua +++ b/modules/group.lua @@ -109,7 +109,7 @@ pfUI:RegisterModule("group", function () pfUI.uf.group[i].power.bar:SetValue(i*20) pfUI.uf.group[i].caption = pfUI.uf.group[i]:CreateFontString("Status", "HIGH", "GameFontNormal") - pfUI.uf.group[i].caption:SetFont("Interface\\AddOns\\pfUI\\fonts\\homespun.ttf", pfUI_config.global.font_size, "OUTLINE") + 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: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 abc9633c..1817419f 100644 --- a/modules/gui.lua +++ b/modules/gui.lua @@ -176,7 +176,7 @@ pfUI:RegisterModule("gui", function () frame.drag:SetBackdropColor(1,1,1,.75) frame.drag:EnableMouseWheel(1) frame.drag.text = frame.drag:CreateFontString("Status", "LOW", "GameFontNormal") - frame.drag.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + frame.drag.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") frame.drag.text:ClearAllPoints() frame.drag.text:SetAllPoints(frame.drag) frame.drag.text:SetPoint("CENTER", 0, 0) @@ -288,7 +288,7 @@ pfUI:RegisterModule("gui", function () end frame.switch:SetBackdrop(pfUI.backdrop) frame.switch.text = frame.switch:CreateFontString("Status", "LOW", "GameFontNormal") - frame.switch.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + frame.switch.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") frame.switch.text:ClearAllPoints() frame.switch.text:SetAllPoints(frame.switch) frame.switch.text:SetPoint("CENTER", 0, 0) @@ -305,7 +305,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\\arial.ttf", pfUI_config.global.font_size + 2, "OUTLINE") + frame.title:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size + 2, "OUTLINE") frame.title:SetPoint("TOP", 0, -10) frame.title:SetTextColor(.2,1,.8) frame.title:SetText(text) @@ -332,7 +332,7 @@ pfUI:RegisterModule("gui", function () -- caption frame.caption = frame:CreateFontString("Status", "LOW", "GameFontNormal") - frame.caption:SetFont("Interface\\AddOns\\pfUI\\fonts\\arial.ttf", pfUI_config.global.font_size + 2, "OUTLINE") + frame.caption:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size + 2, "OUTLINE") frame.caption:SetAllPoints(frame) frame.caption:SetFontObject(GameFontWhite) frame.caption:SetJustifyH("LEFT") @@ -552,7 +552,11 @@ pfUI:RegisterModule("gui", function () -- global pfUI.gui.global = pfUI.gui:CreateConfigTab("Global Settings") + local values = { "arial", "homespun", "diediedie" } pfUI.gui:CreateConfig(pfUI.gui.global, "Fontsize", pfUI_config.global, "font_size") + 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) -- modules pfUI.gui.modules = pfUI.gui:CreateConfigTab("Modules") diff --git a/modules/loot.lua b/modules/loot.lua index 36e15003..55c2ec8a 100644 --- a/modules/loot.lua +++ b/modules/loot.lua @@ -71,7 +71,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\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + frame.count:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") frame.count:SetText(1) frame.name = frame:CreateFontString(nil, "OVERLAY") @@ -79,7 +79,7 @@ pfUI:RegisterModule("loot", function () frame.name:ClearAllPoints() frame.name:SetAllPoints(frame) frame.name:SetNonSpaceWrap(true) - frame.name:SetFont("Interface\\AddOns\\pfUI\\fonts\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + frame.name:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", 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 bbcd9e4f..5da245f8 100644 --- a/modules/minimap.lua +++ b/modules/minimap.lua @@ -47,7 +47,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\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + pfUI.minimapCoordinates.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", 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 59fec12c..85874e8c 100644 --- a/modules/panel.lua +++ b/modules/panel.lua @@ -206,7 +206,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\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + 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:ClearAllPoints() pfUI.panel.left.left.text:SetAllPoints(pfUI.panel.left.left) pfUI.panel.left.left.text:SetPoint("CENTER", 0, 0) @@ -219,7 +219,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\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + 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:ClearAllPoints() pfUI.panel.left.center.text:SetAllPoints(pfUI.panel.left.center) pfUI.panel.left.center.text:SetPoint("CENTER", 0, 0) @@ -232,7 +232,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\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + 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:ClearAllPoints() pfUI.panel.left.right.text:SetAllPoints(pfUI.panel.left.right) pfUI.panel.left.right.text:SetPoint("CENTER", 0, 0) @@ -271,7 +271,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\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + 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:ClearAllPoints() pfUI.panel.right.left.text:SetAllPoints(pfUI.panel.right.left) pfUI.panel.right.left.text:SetPoint("CENTER", 0, 0) @@ -284,7 +284,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\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + 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:ClearAllPoints() pfUI.panel.right.center.text:SetAllPoints(pfUI.panel.right.center) pfUI.panel.right.center.text:SetPoint("CENTER", 0, 0) @@ -297,7 +297,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\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + 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:ClearAllPoints() pfUI.panel.right.right.text:SetAllPoints(pfUI.panel.right.right) pfUI.panel.right.right.text:SetPoint("CENTER", 0, 0) @@ -312,7 +312,7 @@ pfUI:RegisterModule("panel", function () pfUI.panel.minimap:SetWidth(Minimap:GetWidth() + 5) 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\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + 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:SetPoint("CENTER", 0, 0) pfUI.panel.minimap.text:SetFontObject(GameFontWhite) pfUI.panel.minimap.text:SetText("[DUMMY]") diff --git a/modules/pet.lua b/modules/pet.lua index 722291b1..28d4e868 100644 --- a/modules/pet.lua +++ b/modules/pet.lua @@ -140,7 +140,7 @@ pfUI:RegisterModule("pet", function () pfUI.uf.pet.power.bar:SetValue(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\\homespun.ttf", pfUI_config.global.font_size - 2, "OUTLINE") + 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:ClearAllPoints() pfUI.uf.pet.hp.text:SetAllPoints(pfUI.uf.pet.hp.bar) pfUI.uf.pet.hp.text:SetPoint("CENTER", 0, 0) @@ -166,7 +166,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\\homespun.ttf", pfUI_config.global.font_size, "OUTLINE") + 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: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) @@ -225,7 +225,7 @@ pfUI:RegisterModule("pet", function () local id = i 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\\homespun.ttf", pfUI_config.global.font_size, "OUTLINE") + 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: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 d843069b..460dca2b 100644 --- a/modules/player.lua +++ b/modules/player.lua @@ -232,14 +232,14 @@ pfUI:RegisterModule("player", function () pfUI.uf.player.power.bar:SetMinMaxValues(0, 100) pfUI.uf.player.hpText = pfUI.uf.player:CreateFontString("Status", "HIGH", "GameFontNormal") - pfUI.uf.player.hpText:SetFont("Interface\\AddOns\\pfUI\\fonts\\homespun.ttf", pfUI_config.global.font_size, "OUTLINE") + 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: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\\homespun.ttf", pfUI_config.global.font_size, "OUTLINE") + 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:ClearAllPoints() pfUI.uf.player.powerText:SetJustifyH("LEFT") pfUI.uf.player.powerText:SetFontObject(GameFontWhite) @@ -264,14 +264,14 @@ pfUI:RegisterModule("player", function () pfUI.uf.player.buff.buffs[i] = CreateFrame("Button", "pfUIPlayerBuff" .. i, pfUI.uf.player) 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\\homespun.ttf", pfUI_config.global.font_size, "OUTLINE") + 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: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\\homespun.ttf", pfUI_config.global.font_size, "OUTLINE") + 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: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) @@ -355,14 +355,14 @@ pfUI:RegisterModule("player", function () local id = i pfUI.uf.player.debuff.debuffs[i] = CreateFrame("Button", "pfUIPlayerDebuff" .. i, pfUI.uf.player) 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\\homespun.ttf", pfUI_config.global.font_size, "OUTLINE") + 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: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\\homespun.ttf", pfUI_config.global.font_size, "OUTLINE") + 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: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 aae68ee7..c7b4baa7 100644 --- a/modules/raid.lua +++ b/modules/raid.lua @@ -73,7 +73,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\\homespun.ttf", pfUI_config.global.font_size, "OUTLINE") + 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: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 7e04c95a..e44ceec8 100644 --- a/modules/skin.lua +++ b/modules/skin.lua @@ -60,7 +60,7 @@ pfUI:RegisterModule("skin", function () b:SetBackdrop(pfUI.backdrop) b:SetBackdropBorderColor(1,1,1,1) end) - b:SetFont("Interface\\AddOns\\pfUI\\fonts\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + b:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size, "OUTLINE") end for _, box in pairs(boxes) do @@ -73,7 +73,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\\arial.ttf", pfUI_config.global.font_size + 2, "OUTLINE") + v:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size + 2, "OUTLINE") end end diff --git a/modules/target.lua b/modules/target.lua index d65e8820..1c5115a3 100644 --- a/modules/target.lua +++ b/modules/target.lua @@ -270,7 +270,7 @@ pfUI:RegisterModule("target", function () pfUI.uf.target.power.bar:SetValue(100) pfUI.uf.target.hpText = pfUI.uf.target:CreateFontString("Status", "HIGH", "GameFontNormal") - pfUI.uf.target.hpText:SetFont("Interface\\AddOns\\pfUI\\fonts\\homespun.ttf", pfUI_config.global.font_size, "OUTLINE") + 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: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) @@ -279,7 +279,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\\homespun.ttf", pfUI_config.global.font_size, "OUTLINE") + 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: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) @@ -354,7 +354,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\\homespun.ttf", pfUI_config.global.font_size, "OUTLINE") + 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: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) @@ -412,7 +412,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\\homespun.ttf", pfUI_config.global.font_size, "OUTLINE") + 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: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 f3733e62..781139c0 100644 --- a/modules/targettarget.lua +++ b/modules/targettarget.lua @@ -144,7 +144,7 @@ pfUI:RegisterModule("targettarget", function () pfUI.uf.targettarget.power.bar:SetValue(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\\homespun.ttf", pfUI_config.global.font_size - 2, "OUTLINE") + 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: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 40a11585..a3b5b620 100644 --- a/modules/thirdparty.lua +++ b/modules/thirdparty.lua @@ -299,7 +299,7 @@ pfUI:RegisterModule("thirdparty", function () pfUI.bag.right.sort:SetHeight(15) pfUI.bag.right.sort:SetWidth(15) pfUI.bag.right.sort:SetTextColor(1,1,.25,1) - pfUI.bag.right.sort:SetFont("Interface\\AddOns\\pfUI\\fonts\\arial.ttf", pfUI_config.global.font_size, "OUTLINE") + 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.texture = pfUI.bag.right.sort:CreateTexture("pfBagArrowUp") pfUI.bag.right.sort.texture:SetTexture("Interface\\AddOns\\pfUI\\img\\sort") pfUI.bag.right.sort.texture:ClearAllPoints() diff --git a/modules/tooltip.lua b/modules/tooltip.lua index e9d772a5..a27f7b74 100644 --- a/modules/tooltip.lua +++ b/modules/tooltip.lua @@ -126,7 +126,7 @@ pfUI:RegisterModule("tooltip", function () 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\\arial.ttf", pfUI_config.global.font_size + 2, "OUTLINE") + pfUI.tooltipStatusBar.HP:SetFont("Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf", pfUI_config.global.font_size + 2, "OUTLINE") end if hp and hpm then diff --git a/pfUI.lua b/pfUI.lua index 3e2c3558..6325cc4d 100644 --- a/pfUI.lua +++ b/pfUI.lua @@ -19,8 +19,22 @@ end pfUI = CreateFrame("Frame",nil,UIParent) pfUI:RegisterEvent("ADDON_LOADED") -pfUI:SetScript("OnEvent", function() +--pfUI:RegisterEvent("PLAYER_ENTERING_WORLD") +-- initialize default variables +pfUI.cache = {} +pfUI.module = {} +pfUI.modules = {} +pfUI.environment = {} + +pfLocaleClass = {} +pfLocaleBagtypes = {} +pfLocaleShift = {} +pfLocaleSpells = {} +pfLocaleSpellEvents = {} +pfLocaleSpellInterrupts = {} + +pfUI:SetScript("OnEvent", function() pfUI.cache["locale"] = GetLocale() if pfUI.cache["locale"] ~= "enUS" and pfUI.cache["locale"] ~= "frFR" and @@ -35,6 +49,11 @@ pfUI:SetScript("OnEvent", function() end pfUI:LoadConfig() + + -- reload environment + pfUI.environment:UpdateFonts() + pfUI.environment:UpdateColors() + if arg1 == "pfUI" then for i,m in pairs(this.modules) do -- do not load disabled modules @@ -47,16 +66,6 @@ pfUI:SetScript("OnEvent", function() end end) -pfUI.cache = {} -pfUI.module = {} -pfUI.modules = {} -pfLocaleClass = {} -pfLocaleBagtypes = {} -pfLocaleShift = {} -pfLocaleSpells = {} -pfLocaleSpellEvents = {} -pfLocaleSpellInterrupts = {} - function pfUI:RegisterModule(n, f) pfUI.module[n] = f table.insert(pfUI.modules, n) @@ -109,7 +118,6 @@ pfUI.info = CreateFrame("Button", "pfInfoBox", UIParent) pfUI.info:Hide() pfUI.info.text = pfUI.info:CreateFontString("Status", "HIGH", "GameFontNormal") -pfUI.info.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\arial.ttf", 14, "OUTLINE") pfUI.info.text:ClearAllPoints() pfUI.info.text:SetFontObject(GameFontWhite) @@ -127,6 +135,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:SetWidth(pfUI.info.text:GetStringWidth() + 50) pfUI.info:SetHeight(height)