diff --git a/ElvUI_SLE/core/media.lua b/ElvUI_SLE/core/media.lua index f6d5985..8454c44 100644 --- a/ElvUI_SLE/core/media.lua +++ b/ElvUI_SLE/core/media.lua @@ -1,6 +1,5 @@ local SLE, T, E, L, V, P, G = unpack(select(2, ...)) local M = SLE:NewModule('Media', 'AceHook-3.0') -local LSM = LibStub("LibSharedMedia-3.0") --GLOBALS: hooksecurefunc local _G = _G local FadingFrame_Show = FadingFrame_Show @@ -40,16 +39,16 @@ function M:SetBlizzFonts() if E.private.general.replaceBlizzFonts then local db = E.db.sle.media.fonts -- print(E.db.sle.media, db) - _G["ZoneTextString"]:SetFont(LSM:Fetch('font', db.zone.font), db.zone.size, db.zone.outline) -- Main zone name - _G["PVPInfoTextString"]:SetFont(LSM:Fetch('font', db.pvp.font), db.pvp.size, db.pvp.outline) -- PvP status for main zone - _G["PVPArenaTextString"]:SetFont(LSM:Fetch('font', db.pvp.font), db.pvp.size, db.pvp.outline) -- PvP status for subzone - _G["SubZoneTextString"]:SetFont(LSM:Fetch('font', db.subzone.font), db.subzone.size, db.subzone.outline) -- Subzone name - - _G["SendMailBodyEditBox"]:SetFont(LSM:Fetch('font', db.mail.font), db.mail.size, db.mail.outline) --Writing letter text - _G["OpenMailBodyText"]:SetFont(LSM:Fetch('font', db.mail.font), db.mail.size, db.mail.outline) --Received letter text - _G["QuestFont"]:SetFont(LSM:Fetch('font', db.gossip.font), db.gossip.size, db.gossip.outline) -- Font in Quest Log/Petitions and shit. It's fucking hedious with any outline so fuck it. - --QuestFont_Large:SetFont(LSM:Fetch('font', "Homespun"), 12, "") -- No idea what that is for - _G["NumberFont_Shadow_Med"]:SetFont(LSM:Fetch('font', db.editbox.font), db.editbox.size, db.editbox.outline) --Chat editbox + _G["ZoneTextString"]:SetFont(E.LSM:Fetch('font', db.zone.font), db.zone.size, db.zone.outline) -- Main zone name + _G["PVPInfoTextString"]:SetFont(E.LSM:Fetch('font', db.pvp.font), db.pvp.size, db.pvp.outline) -- PvP status for main zone + _G["PVPArenaTextString"]:SetFont(E.LSM:Fetch('font', db.pvp.font), db.pvp.size, db.pvp.outline) -- PvP status for subzone + _G["SubZoneTextString"]:SetFont(E.LSM:Fetch('font', db.subzone.font), db.subzone.size, db.subzone.outline) -- Subzone name + + _G["SendMailBodyEditBox"]:SetFont(E.LSM:Fetch('font', db.mail.font), db.mail.size, db.mail.outline) --Writing letter text + _G["OpenMailBodyText"]:SetFont(E.LSM:Fetch('font', db.mail.font), db.mail.size, db.mail.outline) --Received letter text + _G["QuestFont"]:SetFont(E.LSM:Fetch('font', db.gossip.font), db.gossip.size, db.gossip.outline) -- Font in Quest Log/Petitions and shit. It's fucking hedious with any outline so fuck it. + --QuestFont_Large:SetFont(E.LSM:Fetch('font', "Homespun"), 12, "") -- No idea what that is for + _G["NumberFont_Shadow_Med"]:SetFont(E.LSM:Fetch('font', db.editbox.font), db.editbox.size, db.editbox.outline) --Chat editbox --Objective Frame if SLE._Compatibility["QuestKing"] and E.private.sle.skins.QuestKing.enable then _G["QuestKing"]:UpdateTrackerQuests() @@ -62,18 +61,18 @@ function M:SetBlizzFonts() else COLOR = E.db.sle.skins.objectiveTracker.colorHeader end - _G["ObjectiveTrackerFrame"].HeaderMenu.Title:SetFont(LSM:Fetch('font', db.objectiveHeader.font), db.objectiveHeader.size, db.objectiveHeader.outline) - _G["ObjectiveTrackerBlocksFrame"].QuestHeader.Text:SetFont(LSM:Fetch('font', db.objectiveHeader.font), db.objectiveHeader.size, db.objectiveHeader.outline) - _G["ObjectiveTrackerBlocksFrame"].AchievementHeader.Text:SetFont(LSM:Fetch('font', db.objectiveHeader.font), db.objectiveHeader.size, db.objectiveHeader.outline) - _G["ObjectiveTrackerBlocksFrame"].ScenarioHeader.Text:SetFont(LSM:Fetch('font', db.objectiveHeader.font), db.objectiveHeader.size, db.objectiveHeader.outline) - _G["BONUS_OBJECTIVE_TRACKER_MODULE"].Header.Text:SetFont(LSM:Fetch('font', db.objectiveHeader.font), db.objectiveHeader.size, db.objectiveHeader.outline) + _G["ObjectiveTrackerFrame"].HeaderMenu.Title:SetFont(E.LSM:Fetch('font', db.objectiveHeader.font), db.objectiveHeader.size, db.objectiveHeader.outline) + _G["ObjectiveTrackerBlocksFrame"].QuestHeader.Text:SetFont(E.LSM:Fetch('font', db.objectiveHeader.font), db.objectiveHeader.size, db.objectiveHeader.outline) + _G["ObjectiveTrackerBlocksFrame"].AchievementHeader.Text:SetFont(E.LSM:Fetch('font', db.objectiveHeader.font), db.objectiveHeader.size, db.objectiveHeader.outline) + _G["ObjectiveTrackerBlocksFrame"].ScenarioHeader.Text:SetFont(E.LSM:Fetch('font', db.objectiveHeader.font), db.objectiveHeader.size, db.objectiveHeader.outline) + _G["BONUS_OBJECTIVE_TRACKER_MODULE"].Header.Text:SetFont(E.LSM:Fetch('font', db.objectiveHeader.font), db.objectiveHeader.size, db.objectiveHeader.outline) _G["ObjectiveTrackerFrame"].HeaderMenu.Title:SetTextColor(COLOR.r, COLOR.g, COLOR.b) _G["ObjectiveTrackerBlocksFrame"].QuestHeader.Text:SetTextColor(COLOR.r, COLOR.g, COLOR.b) _G["ObjectiveTrackerBlocksFrame"].AchievementHeader.Text:SetTextColor(COLOR.r, COLOR.g, COLOR.b) _G["ObjectiveTrackerBlocksFrame"].ScenarioHeader.Text:SetTextColor(COLOR.r, COLOR.g, COLOR.b) _G["BONUS_OBJECTIVE_TRACKER_MODULE"].Header.Text:SetTextColor(COLOR.r, COLOR.g, COLOR.b) - MakeFont(_G["ObjectiveFont"], LSM:Fetch('font', db.objective.font), db.objective.size, db.objective.outline) - if M.BonusObjectiveBarText then M.BonusObjectiveBarText:SetFont(LSM:Fetch('font', db.objective.font), db.objective.size, db.objective.outline) end + MakeFont(_G["ObjectiveFont"], E.LSM:Fetch('font', db.objective.font), db.objective.size, db.objective.outline) + if M.BonusObjectiveBarText then M.BonusObjectiveBarText:SetFont(E.LSM:Fetch('font', db.objective.font), db.objective.size, db.objective.outline) end end end end diff --git a/ElvUI_SLE/modules/actionbars.lua b/ElvUI_SLE/modules/actionbars.lua index 1615fb1..28ca013 100644 --- a/ElvUI_SLE/modules/actionbars.lua +++ b/ElvUI_SLE/modules/actionbars.lua @@ -1,5 +1,4 @@ local SLE, T, E, L, V, P, G = unpack(select(2, ...)) -local LSM = LibStub("LibSharedMedia-3.0") local A = SLE:NewModule("Actionbars", 'AceHook-3.0', 'AceEvent-3.0') local AB = E:GetModule('ActionBars'); --GLOBALS: hooksecurefunc, LibStub diff --git a/ElvUI_SLE/modules/afk.lua b/ElvUI_SLE/modules/afk.lua index 96d5ad1..029c6d5 100644 --- a/ElvUI_SLE/modules/afk.lua +++ b/ElvUI_SLE/modules/afk.lua @@ -1,5 +1,4 @@ local SLE, T, E, L, V, P, G = unpack(select(2, ...)) -local LSM = LibStub("LibSharedMedia-3.0") local AFK = E:GetModule("AFK") local S = SLE:NewModule("Screensaver", 'AceHook-3.0', 'AceEvent-3.0') S.Animations = {} @@ -25,16 +24,16 @@ local PVEFrame_ToggleFrame = PVEFrame_ToggleFrame function S:Media() --Updating all the shits! - SS.AFKtitle:SetFont(LSM:Fetch('font', S.db.title.font), S.db.title.size, S.db.title.outline) - SS.timePassed:SetFont(LSM:Fetch('font', S.db.title.font), S.db.title.size, S.db.title.outline) - SS.Subtitle:SetFont(LSM:Fetch('font', S.db.subtitle.font), S.db.subtitle.size, S.db.subtitle.outline) - SS.Date:SetFont(LSM:Fetch('font', S.db.date.font), S.db.date.size, S.db.date.outline) - SS.Time:SetFont(LSM:Fetch('font', S.db.date.font), S.db.date.size, S.db.date.outline) - SS.PlayerName:SetFont(LSM:Fetch('font', S.db.player.font), S.db.player.size, S.db.player.outline) - SS.PlayerInfo:SetFont(LSM:Fetch('font', S.db.player.font), S.db.player.size, S.db.player.outline) - SS.GuildRank:SetFont(LSM:Fetch('font', S.db.player.font), S.db.player.size, S.db.player.outline) - SS.Guild:SetFont(LSM:Fetch('font', S.db.player.font), S.db.player.size, S.db.player.outline) - SS.ScrollFrame:SetFont(LSM:Fetch('font', S.db.tips.font), S.db.tips.size, S.db.tips.outline) + SS.AFKtitle:SetFont(E.LSM:Fetch('font', S.db.title.font), S.db.title.size, S.db.title.outline) + SS.timePassed:SetFont(E.LSM:Fetch('font', S.db.title.font), S.db.title.size, S.db.title.outline) + SS.Subtitle:SetFont(E.LSM:Fetch('font', S.db.subtitle.font), S.db.subtitle.size, S.db.subtitle.outline) + SS.Date:SetFont(E.LSM:Fetch('font', S.db.date.font), S.db.date.size, S.db.date.outline) + SS.Time:SetFont(E.LSM:Fetch('font', S.db.date.font), S.db.date.size, S.db.date.outline) + SS.PlayerName:SetFont(E.LSM:Fetch('font', S.db.player.font), S.db.player.size, S.db.player.outline) + SS.PlayerInfo:SetFont(E.LSM:Fetch('font', S.db.player.font), S.db.player.size, S.db.player.outline) + SS.GuildRank:SetFont(E.LSM:Fetch('font', S.db.player.font), S.db.player.size, S.db.player.outline) + SS.Guild:SetFont(E.LSM:Fetch('font', S.db.player.font), S.db.player.size, S.db.player.outline) + SS.ScrollFrame:SetFont(E.LSM:Fetch('font', S.db.tips.font), S.db.tips.size, S.db.tips.outline) SS.timePassed:SetTextColor(1, 1, 1) diff --git a/ElvUI_SLE/modules/chat/chat.lua b/ElvUI_SLE/modules/chat/chat.lua index c1d469c..ebab828 100644 --- a/ElvUI_SLE/modules/chat/chat.lua +++ b/ElvUI_SLE/modules/chat/chat.lua @@ -1,7 +1,6 @@ local SLE, T, E, L, V, P, G = unpack(select(2, ...)) local CH, LO = SLE:GetElvModules("Chat", "Layout") local C = SLE:NewModule("Chat", 'AceHook-3.0', 'AceEvent-3.0', 'AceTimer-3.0') -local LSM = LibStub("LibSharedMedia-3.0") --GLOBALS: UIParent, LeftChatPanel, LeftChatDataPanel, LeftChatToggleButton, LeftChatTab, RightChatPanel, --GLOBALS: RightChatDataPanel, RightChatToggleButton, RightChatTab, hooksecurefunc diff --git a/ElvUI_SLE/modules/minimap/instance.lua b/ElvUI_SLE/modules/minimap/instance.lua index dbfcbd4..d0f01c5 100644 --- a/ElvUI_SLE/modules/minimap/instance.lua +++ b/ElvUI_SLE/modules/minimap/instance.lua @@ -1,7 +1,6 @@ local SLE, T, E, L, V, P, G = unpack(select(2, ...)) local I = SLE:NewModule("InstDif",'AceHook-3.0', 'AceEvent-3.0') local sub = string.utf8sub -local LSM = LibStub("LibSharedMedia-3.0") --GLOBALS: CreateFrame local _G = _G @@ -37,8 +36,8 @@ function I:CreateText() end function I:SetFonts() - I.frame.text:SetFont(LSM:Fetch('font', I.db.font), I.db.fontSize, I.db.fontOutline) - I.frame.icon:SetFont(LSM:Fetch('font', I.db.font), I.db.fontSize, I.db.fontOutline) + I.frame.text:SetFont(E.LSM:Fetch('font', I.db.font), I.db.fontSize, I.db.fontOutline) + I.frame.icon:SetFont(E.LSM:Fetch('font', I.db.font), I.db.fontSize, I.db.fontOutline) end diff --git a/ElvUI_SLE/modules/minimap/locationbar.lua b/ElvUI_SLE/modules/minimap/locationbar.lua index db0351d..0e1f6b5 100644 --- a/ElvUI_SLE/modules/minimap/locationbar.lua +++ b/ElvUI_SLE/modules/minimap/locationbar.lua @@ -2,7 +2,6 @@ local M = E:GetModule('Minimap') local MM, DD = SLE:GetModules("Minimap", "Dropdowns") local LP = SLE:NewModule("LocationPanel", "AceTimer-3.0") -local LSM = LibStub("LibSharedMedia-3.0"); local loc_panel local COORDS_WIDTH = 35 -- Coord panels width @@ -260,9 +259,9 @@ function LP:Resize() end function LP:Fonts() - loc_panel.Text:SetFont(LSM:Fetch('font', LP.db.font), LP.db.fontSize, LP.db.fontOutline) - loc_panel.Xcoord.Text:SetFont(LSM:Fetch('font', LP.db.font), LP.db.fontSize, LP.db.fontOutline) - loc_panel.Ycoord.Text:SetFont(LSM:Fetch('font', LP.db.font), LP.db.fontSize, LP.db.fontOutline) + loc_panel.Text:SetFont(E.LSM:Fetch('font', LP.db.font), LP.db.fontSize, LP.db.fontOutline) + loc_panel.Xcoord.Text:SetFont(E.LSM:Fetch('font', LP.db.font), LP.db.fontSize, LP.db.fontOutline) + loc_panel.Ycoord.Text:SetFont(E.LSM:Fetch('font', LP.db.font), LP.db.fontSize, LP.db.fontOutline) end function LP:Template() diff --git a/ElvUI_SLE/modules/minimap/minimapcoords.lua b/ElvUI_SLE/modules/minimap/minimapcoords.lua index 5a62a62..861ac34 100644 --- a/ElvUI_SLE/modules/minimap/minimapcoords.lua +++ b/ElvUI_SLE/modules/minimap/minimapcoords.lua @@ -1,7 +1,6 @@ local SLE, T, E, L, V, P, G = unpack(select(2, ...)) local M = E:GetModule('Minimap') local MM = SLE:NewModule("Minimap", 'AceHook-3.0', 'AceEvent-3.0') -local LSM = LibStub("LibSharedMedia-3.0"); --GLOBALS: CreateFrame, hooksecurefunc local _G = _G local cluster = _G["MinimapCluster"] @@ -48,7 +47,7 @@ function MM:HideMinimapRegister() end function MM:CoordFont() - MM.coordspanel.Text:SetFont(LSM:Fetch('font', E.db.sle.minimap.coords.font), E.db.sle.minimap.coords.fontSize, E.db.sle.minimap.coords.fontOutline) + MM.coordspanel.Text:SetFont(E.LSM:Fetch('font', E.db.sle.minimap.coords.font), E.db.sle.minimap.coords.fontSize, E.db.sle.minimap.coords.fontOutline) end function MM:CoordsSize() diff --git a/ElvUI_SLE/modules/nameplates.lua b/ElvUI_SLE/modules/nameplates.lua index f04550e..bdc4418 100644 --- a/ElvUI_SLE/modules/nameplates.lua +++ b/ElvUI_SLE/modules/nameplates.lua @@ -1,6 +1,5 @@ local SLE, T, E, L, V, P, G = unpack(select(2, ...)) local NP = E:GetModule('NamePlates') -local LSM = LibStub("LibSharedMedia-3.0") local N = SLE:NewModule("Nameplates", 'AceHook-3.0', 'AceEvent-3.0', 'AceTimer-3.0') local rosterTimer N.targetCount = 0 @@ -22,14 +21,14 @@ hooksecurefunc(NP, 'NAME_PLATE_CREATED', function(self, event, frame) myPlate.threatInfo:SetPoint("BOTTOMLEFT", myPlate.HealthBar, "BOTTOMLEFT", 1, 2) myPlate.threatInfo:SetJustifyH("LEFT") end - if not frame.targetcount then + if not myPlate.targetcount then myPlate.targetcount = myPlate.HealthBar:CreateFontString(nil, "OVERLAY") myPlate.targetcount:SetPoint('BOTTOMRIGHT', myPlate.HealthBar, 'BOTTOMRIGHT', 1, 2) myPlate.targetcount:SetJustifyH("RIGHT") myPlate.targetCount = 0 end - myPlate.threatInfo:FontTemplate(LSM:Fetch("font", NP.db.font), NP.db.fontSize, NP.db.fontOutline) - myPlate.targetcount:FontTemplate(LSM:Fetch("font", NP.db.font), NP.db.fontSize, NP.db.fontOutline) + myPlate.threatInfo:FontTemplate(E.LSM:Fetch("font", NP.db.font), NP.db.fontSize, NP.db.fontOutline) + myPlate.targetcount:FontTemplate(E.LSM:Fetch("font", NP.db.font), NP.db.fontSize, NP.db.fontOutline) myPlate.targetcount:SetText() end) diff --git a/ElvUI_SLE/modules/quests/questking/buttons/challengetimer.lua b/ElvUI_SLE/modules/quests/questking/buttons/challengetimer.lua index 987d731..49c4ab8 100644 --- a/ElvUI_SLE/modules/quests/questking/buttons/challengetimer.lua +++ b/ElvUI_SLE/modules/quests/questking/buttons/challengetimer.lua @@ -4,8 +4,6 @@ local _G = _G if not SLE._Compatibility["QuestKing"] then return end -local LSM = LibStub("LibSharedMedia-3.0") - local function Replace() local QuestKing = _G["QuestKing"] local WatchButton = QuestKing.WatchButton @@ -37,7 +35,7 @@ local function Replace() local challengeBar if (not cachedChallengeBar) then challengeBar = CreateFrame("StatusBar", "QuestKing_ChallengeBar", QuestKing.Tracker) - challengeBar:SetStatusBarTexture(LSM:Fetch('statusbar', E.private.sle.skins.objectiveTracker.texture)) + challengeBar:SetStatusBarTexture(E.LSM:Fetch('statusbar', E.private.sle.skins.objectiveTracker.texture)) challengeBar:GetStatusBarTexture():SetHorizTile(false) SetProgressBarsColor(challengeBar) challengeBar:SetMinMaxValues(0, 1) diff --git a/ElvUI_SLE/modules/quests/questking/ui/progressbar.lua b/ElvUI_SLE/modules/quests/questking/ui/progressbar.lua index 3e56afc..61af603 100644 --- a/ElvUI_SLE/modules/quests/questking/ui/progressbar.lua +++ b/ElvUI_SLE/modules/quests/questking/ui/progressbar.lua @@ -4,7 +4,6 @@ local _G = _G if not SLE._Compatibility["QuestKing"] then return end -local LSM = LibStub("LibSharedMedia-3.0") local classColor = RAID_CLASS_COLORS[E.myclass] local progressBarPool = {} QK.numProgressBars = 0 @@ -54,7 +53,7 @@ local function Replace() QK.numProgressBars = QK.numProgressBars + 1 progressBar = CreateFrame("StatusBar", "QuestKing_ProgressBar"..QK.numProgressBars, QuestKing.Tracker) - progressBar:SetStatusBarTexture(LSM:Fetch('statusbar', E.private.sle.skins.objectiveTracker.texture)) + progressBar:SetStatusBarTexture(E.LSM:Fetch('statusbar', E.private.sle.skins.objectiveTracker.texture)) progressBar:GetStatusBarTexture():SetHorizTile(false) SetProgressBarsColor(progressBar) progressBar:SetMinMaxValues(0, 100) @@ -171,7 +170,7 @@ local function Replace() local progressBar = _G["QuestKing_ProgressBar"..i] if progressBar and not progressBar.sle_skinned then progressBar:StripTextures() - progressBar:SetStatusBarTexture(LSM:Fetch('statusbar', E.private.sle.skins.objectiveTracker.texture)) + progressBar:SetStatusBarTexture(E.LSM:Fetch('statusbar', E.private.sle.skins.objectiveTracker.texture)) progressBar:SetWidth(opt_buttonWidth - 36) SetProgressBarsColor(progressBar) progressBar:CreateBackdrop("Transparent") diff --git a/ElvUI_SLE/modules/quests/questking/ui/timerbar.lua b/ElvUI_SLE/modules/quests/questking/ui/timerbar.lua index 7226b7a..ac5fc38 100644 --- a/ElvUI_SLE/modules/quests/questking/ui/timerbar.lua +++ b/ElvUI_SLE/modules/quests/questking/ui/timerbar.lua @@ -4,7 +4,6 @@ local _G = _G if not SLE._Compatibility["QuestKing"] then return end -local LSM = LibStub("LibSharedMedia-3.0") local classColor = RAID_CLASS_COLORS[E.myclass] -- local functions @@ -75,7 +74,7 @@ local function Replace() numTimerBars = numTimerBars + 1 timerBar = CreateFrame("StatusBar", "QuestKing_TimerBar"..numTimerBars, QuestKing.Tracker) - timerBar:SetStatusBarTexture(LSM:Fetch('statusbar', E.private.sle.skins.objectiveTracker.texture)) + timerBar:SetStatusBarTexture(E.LSM:Fetch('statusbar', E.private.sle.skins.objectiveTracker.texture)) timerBar:GetStatusBarTexture():SetHorizTile(false) SetProgressBarsColor(timerBar) timerBar:SetMinMaxValues(0, 100) diff --git a/ElvUI_SLE/modules/unitframes/statusbars.lua b/ElvUI_SLE/modules/unitframes/statusbars.lua index 2ed380a..f627411 100644 --- a/ElvUI_SLE/modules/unitframes/statusbars.lua +++ b/ElvUI_SLE/modules/unitframes/statusbars.lua @@ -1,7 +1,6 @@ local SLE, T, E, L, V, P, G = unpack(select(2, ...)) local SUF = SLE:GetModule("UnitFrames") local UF = E:GetModule('UnitFrames'); -local LSM = LibStub("LibSharedMedia-3.0"); --GLOBALS: hooksecurefunc local _G = _G local MAX_BOSS_FRAMES = MAX_BOSS_FRAMES @@ -31,7 +30,7 @@ end --Castbar function SUF:PostCast(unit) - local castTexture = LSM:Fetch("statusbar", E.db.sle.unitframes.statusTextures.castTexture) + local castTexture = E.LSM:Fetch("statusbar", E.db.sle.unitframes.statusTextures.castTexture) self:SetStatusBarTexture(castTexture) end @@ -68,7 +67,7 @@ end --Aurabars function SUF:AuraHook() - local auraTexture = LSM:Fetch("statusbar", E.db.sle.unitframes.statusTextures.auraTexture) + local auraTexture = E.LSM:Fetch("statusbar", E.db.sle.unitframes.statusTextures.auraTexture) local bars = self.bars if not bars then return end for index = 1, #bars do @@ -80,7 +79,7 @@ end --Classbars function SUF:UpdateClass(frame) local bars = frame[frame.ClassBar] - local texture = LSM:Fetch("statusbar", E.db.sle.unitframes.statusTextures.classTexture) + local texture = E.LSM:Fetch("statusbar", E.db.sle.unitframes.statusTextures.classTexture) if (frame.ClassBar == 'ClassIcons' or frame.ClassBar == 'Runes') then for i = 1, (UF.classMaxResourceBar[E.myclass] or 0) do if i <= frame.MAX_CLASS_BAR then @@ -94,7 +93,7 @@ end function SUF:UpdateStatusBars() if E.private.sle.unitframe.statusbarTextures.power then - local powerTexture = LSM:Fetch("statusbar", E.db.sle.unitframes.statusTextures.powerTexture) + local powerTexture = E.LSM:Fetch("statusbar", E.db.sle.unitframes.statusTextures.powerTexture) for powerbar in T.pairs(SUF.powerbars) do if powerbar and powerbar:GetObjectType() == "StatusBar" and not powerbar.isTransparent then diff --git a/ElvUI_SLE/skins/blizzard/objectiveTracker.lua b/ElvUI_SLE/skins/blizzard/objectiveTracker.lua index dab3431..c9fd9e3 100644 --- a/ElvUI_SLE/skins/blizzard/objectiveTracker.lua +++ b/ElvUI_SLE/skins/blizzard/objectiveTracker.lua @@ -1,7 +1,6 @@ local SLE, T, E, L, V, P, G = unpack(select(2, ...)) local S = E:GetModule('Skins'); local Sk = SLE:GetModule("Skins") -local LSM = LibStub("LibSharedMedia-3.0") local _G = _G -- Cache global variables -- GLOBALS: C_Scenario, BonusObjectiveTrackerProgressBar_PlayFlareAnim, hooksecurefunc, CreateFrame @@ -54,7 +53,7 @@ local function skinObjectiveBar(self, block, line) bar.BarGlow:Kill() bar:SetSize(225, 18) - bar:SetStatusBarTexture(LSM:Fetch('statusbar', E.private.sle.skins.objectiveTracker.texture)) + bar:SetStatusBarTexture(E.LSM:Fetch('statusbar', E.private.sle.skins.objectiveTracker.texture)) local COLOR if E.private.sle.skins.objectiveTracker.class then COLOR = classColor @@ -69,7 +68,7 @@ local function skinObjectiveBar(self, block, line) label:ClearAllPoints() label:SetPoint("CENTER", bar, "CENTER", 0, -1) - label:FontTemplate(LSM:Fetch('font', E.db.sle.media.fonts.objective.font), E.db.sle.media.fonts.objective.size, E.db.sle.media.fonts.objective.outline) + label:FontTemplate(E.LSM:Fetch('font', E.db.sle.media.fonts.objective.font), E.db.sle.media.fonts.objective.size, E.db.sle.media.fonts.objective.outline) SLE:GetModule("Media").BonusObjectiveBarText = label BonusObjectiveTrackerProgressBar_PlayFlareAnim = dummy @@ -90,7 +89,7 @@ local function SkinTimerBar(self, block, line, duration, startTime) tb.Bar.BorderMid:Hide() tb.Bar:StripTextures() tb.Bar:CreateBackdrop('Transparent') - tb.Bar:SetStatusBarTexture(LSM:Fetch('statusbar', E.private.sle.skins.objectiveTracker.texture)) + tb.Bar:SetStatusBarTexture(E.LSM:Fetch('statusbar', E.private.sle.skins.objectiveTracker.texture)) local COLOR if E.private.sle.skins.objectiveTracker.class then COLOR = classColor @@ -152,7 +151,7 @@ local function SkinProvingGroundButtons() -- Timer sb:StripTextures() sb:CreateBackdrop('Transparent') - sb:SetStatusBarTexture(LSM:Fetch('statusbar', E.private.sle.skins.objectiveTracker.texture)) + sb:SetStatusBarTexture(E.LSM:Fetch('statusbar', E.private.sle.skins.objectiveTracker.texture)) local COLOR if E.private.sle.skins.objectiveTracker.class then COLOR = classColor @@ -168,7 +167,7 @@ local function SkinProvingGroundButtons() local sb2 = sb:GetParent():CreateTexture(nil, 'BACKGROUND') sb2:SetPoint('TOPLEFT', sb, -1, 1) sb2:SetPoint('BOTTOMRIGHT', sb, 1, -1) - sb2:SetTexture(LSM:Fetch('statusbar', E.private.sle.skins.objectiveTracker.texture)) + sb2:SetTexture(E.LSM:Fetch('statusbar', E.private.sle.skins.objectiveTracker.texture)) sb2:SetAlpha(0.5) sb2:SetVertexColor(unpack(E.media.backdropcolor)) end diff --git a/ElvUI_SLE/skins/skins.lua b/ElvUI_SLE/skins/skins.lua index 4d1a0ee..2769ede 100644 --- a/ElvUI_SLE/skins/skins.lua +++ b/ElvUI_SLE/skins/skins.lua @@ -1,7 +1,6 @@ local SLE, T, E, L, V, P, G = unpack(select(2, ...)) local S = E:GetModule('Skins'); local Sk = SLE:NewModule("Skins") -local LSM = LibStub("LibSharedMedia-3.0") --GLOBALS: CreateFrame local _G = _G @@ -29,8 +28,8 @@ function Sk:Media() for i = 1, 10 do local button = _G["SLE_ListMerchantFrame_Button"..i] if not button then break end - button.itemname:SetFont(LSM:Fetch('font', E.db.sle.skins.merchant.list.nameFont), E.db.sle.skins.merchant.list.nameSize, E.db.sle.skins.merchant.list.nameOutline) - button.iteminfo:SetFont(LSM:Fetch('font', E.db.sle.skins.merchant.list.subFont), E.db.sle.skins.merchant.list.subSize, E.db.sle.skins.merchant.list.subOutline) + button.itemname:SetFont(E.LSM:Fetch('font', E.db.sle.skins.merchant.list.nameFont), E.db.sle.skins.merchant.list.nameSize, E.db.sle.skins.merchant.list.nameOutline) + button.iteminfo:SetFont(E.LSM:Fetch('font', E.db.sle.skins.merchant.list.subFont), E.db.sle.skins.merchant.list.subSize, E.db.sle.skins.merchant.list.subOutline) end end end