diff --git a/Interface/AddOns/SVUI/assets/artwork/Icons/DOCK-PVP.blp b/Interface/AddOns/SVUI/assets/artwork/Icons/DOCK-PVP.blp new file mode 100644 index 0000000..a51de9a Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Icons/DOCK-PVP.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Icons/PVP-INCOMING.blp b/Interface/AddOns/SVUI/assets/artwork/Icons/PVP-INCOMING.blp new file mode 100644 index 0000000..f72c045 Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Icons/PVP-INCOMING.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Icons/PVP-SAFE.blp b/Interface/AddOns/SVUI/assets/artwork/Icons/PVP-SAFE.blp new file mode 100644 index 0000000..4c84f3e Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Icons/PVP-SAFE.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-TOP.blp b/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-TOP.blp index d1cc8c5..290449e 100644 Binary files a/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-TOP.blp and b/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-TOP.blp differ diff --git a/Interface/AddOns/SVUI/libs/oUF_Plugins/oUF_ActionPanel/oUF_ActionPanel.lua b/Interface/AddOns/SVUI/libs/oUF_Plugins/oUF_ActionPanel/oUF_ActionPanel.lua index 6b436cd..5fd290f 100644 --- a/Interface/AddOns/SVUI/libs/oUF_Plugins/oUF_ActionPanel/oUF_ActionPanel.lua +++ b/Interface/AddOns/SVUI/libs/oUF_Plugins/oUF_ActionPanel/oUF_ActionPanel.lua @@ -1,7 +1,7 @@ local parent, ns = ... local oUF = ns.oUF -local ActionUpdate = function(self, event, unit) +local Update = function(self, event, unit) if(self.unit ~= unit) or not unit then return end local action = self.ActionPanel local border = action.border @@ -9,6 +9,7 @@ local ActionUpdate = function(self, event, unit) local showSpecial = false local r,g,b = 0,0,0; local category = UnitClassification(unit) + if(category == "elite") then r,g,b = 1,0.75,0,0.7; showSpecial = true @@ -33,68 +34,36 @@ local ActionUpdate = function(self, event, unit) special:Hide() end end -end -local StatusUpdate = function(self, event, unit) - if(self.unit ~= unit) or not unit then return end - local action = self.ActionPanel - local border = action.border - local special = action.special - local showSpecial = false - local r,g,b = 0,0,0; - local category = UnitClassification(unit) local status = self.StatusPanel - local texture = status.texture - local media = status.media + if(status) then + local texture = status.texture + local media = status.media - if(category == "elite") then - r,g,b = 1,0.75,0,0.7; - showSpecial = true - elseif(category == "rare" or category == "rareelite") then - r,g,b = 0.59,0.79,1,0.7; - showSpecial = true - end - if(UnitIsDeadOrGhost(unit)) then - r,g,b = 0,0,0 - end - border[1]:SetTexture(r,g,b) - border[2]:SetTexture(r,g,b) - border[3]:SetTexture(r,g,b) - border[4]:SetTexture(r,g,b) - if(special) then - if(showSpecial) then - special[1]:SetVertexColor(r,g,b) - special[2]:SetVertexColor(r,g,b) - special[3]:SetVertexColor(r,g,b) - special:Show() + if(not UnitIsConnected(unit)) then + texture:SetAlpha(1) + texture:SetTexture(media[1]) + texture:SetGradient("VERTICAL",0,1,1,1,1,0) + elseif(UnitIsDeadOrGhost(unit)) then + texture:SetAlpha(1) + texture:SetTexture(media[2]) + texture:SetGradient("VERTICAL",0,0,1,0,1,0) + elseif(UnitIsTapped(unit) and (not UnitIsTappedByPlayer(unit))) then + texture:SetAlpha(1) + texture:SetTexture(media[3]) + texture:SetGradient("VERTICAL",1,1,0,1,0,0) else - special:Hide() + texture:SetAlpha(0) end end - - if(not UnitIsConnected(unit)) then - texture:SetAlpha(1) - texture:SetTexture(media[1]) - texture:SetGradient("VERTICAL",0,1,1,1,1,0) - elseif(UnitIsDeadOrGhost(unit)) then - texture:SetAlpha(1) - texture:SetTexture(media[2]) - texture:SetGradient("VERTICAL",0,0,1,0,1,0) - elseif(UnitIsTapped(unit) and (not UnitIsTappedByPlayer(unit))) then - texture:SetAlpha(1) - texture:SetTexture(media[3]) - texture:SetGradient("VERTICAL",1,1,0,1,0,0) - else - texture:SetAlpha(0) - end end local Path = function(self, ...) - return (self.ActionPanel.Override or ActionUpdate) (self, ...) + return (self.ActionPanel.Override or Update) (self, ...) end local ForceUpdate = function(element) - return Path(element.__owner, 'ForceUpdate') + return Path(element.__owner, 'ForceUpdate', element.__owner.unit) end local Enable = function(self, unit) @@ -104,8 +73,7 @@ local Enable = function(self, unit) action.ForceUpdate = ForceUpdate local status = self.StatusPanel if(status and status.texture) then - action.Override = StatusUpdate - self:RegisterEvent('UNIT_FACTION', Path) + self:RegisterEvent('UNIT_FLAGS', Path) end self:RegisterEvent("UNIT_TARGET", Path, true) self:RegisterEvent("PLAYER_TARGET_CHANGED", Path, true) @@ -118,8 +86,8 @@ local Disable = function(self) if(action) then local status = self.StatusPanel if(status) then - if(self:IsEventRegistered("UNIT_FACTION")) then - self:UnregisterEvent("UNIT_FACTION", Path) + if(self:IsEventRegistered("UNIT_FLAGS")) then + self:UnregisterEvent("UNIT_FLAGS", Path) end end if(self:IsEventRegistered("PLAYER_TARGET_CHANGED")) then diff --git a/Interface/AddOns/SVUI/packages/dock/common/docklets.lua b/Interface/AddOns/SVUI/packages/dock/common/docklets.lua index a8f9b35..99342a7 100644 --- a/Interface/AddOns/SVUI/packages/dock/common/docklets.lua +++ b/Interface/AddOns/SVUI/packages/dock/common/docklets.lua @@ -44,7 +44,7 @@ local MOD = SuperVillain.Registry:Expose('SVDock'); LOCAL VARS ########################################################## ]]-- -local ToggleButton = CreateFrame("Button","ToolBarDockletButton",UIParent); +local AddOnButton = CreateFrame("Button","ToolBarDockletButton",UIParent); local DOCK_HEIGHT,DOCK_WIDTH; local SuperDockletMain = CreateFrame('Frame', 'SuperDockletMain', UIParent); local SuperDockletExtra = CreateFrame('Frame', 'SuperDockletExtra', UIParent); @@ -63,7 +63,7 @@ MOD.CurrentlyDocked = {}; local resizeHook = function() MOD:ReloadDocklets() -end; +end local rightDockSizeHook = function(self,width,height) SuperDockWindowRight:Width(width) @@ -76,7 +76,7 @@ local DockletFrame_OnShow = function(self) if (frameName and _G[frameName]) then _G[frameName]:Show() end -end; +end local Addon_OnEnter=function(b) if not b.IsOpen then @@ -87,7 +87,7 @@ local Addon_OnEnter=function(b) GameTooltip:ClearLines() GameTooltip:AddLine(b.TText,1,1,1) GameTooltip:Show() -end; +end local Addon_OnLeave=function(b) if not b.IsOpen then @@ -95,7 +95,7 @@ local Addon_OnLeave=function(b) b.icon:SetGradient("VERTICAL", 0.5, 0.53, 0.55, 0.8, 0.8, 1) end GameTooltip:Hide() -end; +end local Addon_OnClick=function(b) if SuperDockletMain.FrameName and _G[SuperDockletMain.FrameName] then @@ -117,7 +117,7 @@ local Addon_OnClick=function(b) end else SuperDockletMain.FrameName="None" - if InCombatLockdown()then return end; + if InCombatLockdown()then return end if SuperDockletMain:IsShown()then SuperDockletMain:Hide() else @@ -125,7 +125,7 @@ local Addon_OnClick=function(b) end b:SetPanelColor("special") b.icon:SetGradient("VERTICAL", 0.5, 0.53, 0.55, 0.8, 0.8, 1) - end; + end if SuperVillain.db.SVDock.docklets.enableExtra and SuperDockletExtra.FrameName and _G[SuperDockletExtra.FrameName] then if not _G[SuperDockletExtra.FrameName]:IsShown() then if not InCombatLockdown() and not SuperDockletExtra:IsShown()then @@ -156,7 +156,7 @@ local Addon_OnClick=function(b) else SuperDockletExtra.FrameName="None" end -end; +end --[[ ########################################################## CORE FUNCTIONS @@ -171,10 +171,10 @@ function MOD:DockletShow() if(InCombatLockdown() and (_G[SuperDockWindowRight.SecondName].IsProtected and _G[SuperDockWindowRight.SecondName]:IsProtected())) then return end _G[SuperDockWindowRight.SecondName]:Show() end -end; +end function MOD:DockletHide() - --if InCombatLockdown()then SuperVillain:AddonMessage("Cant close any windows in combat. Try again after combat ends...")return end; + --if InCombatLockdown()then SuperVillain:AddonMessage("Cant close any windows in combat. Try again after combat ends...")return end for i=1, #MOD.DockletList do local f = MOD.DockletList[i] if(not InCombatLockdown() or (InCombatLockdown() and (f.IsProtected and not f:IsProtected()))) then @@ -188,15 +188,15 @@ function MOD:DockletHide() end end -- SuperDockWindowRight:Show() -end; +end function MOD:DockWindowResize() - if InCombatLockdown()then return end; + if InCombatLockdown()then return end local width=RightSuperDock:GetWidth(); local height=RightSuperDock:GetHeight() - 22 SuperDockWindowRight:Size(width,height) SuperDockWindowRight:SetPoint("BOTTOMLEFT", SuperDockAlertRight, "TOPLEFT", 0, 0) -end; +end function MOD:RegisterDocklet(name,tooltip,texture,onclick,isdefault) local frame=_G[name]; @@ -209,14 +209,14 @@ function MOD:RegisterDocklet(name,tooltip,texture,onclick,isdefault) frame.listIndex=#MOD.DockletList; MOD:CreateBasicToolButton(tooltip,texture,onclick,name,isdefault) end -end; +end function MOD:UnregisterDocklet(name) local frame=_G[name]; - if not frame or not frame.listIndex then return end; + if not frame or not frame.listIndex then return end local i=frame.listIndex; tremove(MOD.DockletList,i) -end; +end function MOD:CreateDockWindow() DOCK_HEIGHT,DOCK_WIDTH = SuperVillain.db.SVDock.dockRightHeight, SuperVillain.db.SVDock.dockRightWidth; @@ -225,24 +225,24 @@ function MOD:CreateDockWindow() SuperDockWindowRight:SetScript('OnHide',MOD.DockletHide) if not InCombatLockdown()then MOD:DockletHide() - end; + end hooksecurefunc(RightSuperDock,'SetSize', rightDockSizeHook) -end; +end function MOD:IsDockletReady(arg) local addon = arg; if arg == "DockletMain" or arg == "DockletExtra" then addon = SuperVillain.db.SVDock.docklets[arg] end - if find(addon, "Skada") then addon = "Skada" end; + if find(addon, "Skada") then addon = "Skada" end if addon == nil or addon == 'None' or not IsAddOnLoaded(addon) then return false - end; + end return true -end; +end function MOD:ResizeDocklets() - if InCombatLockdown()then return end; + if InCombatLockdown()then return end local width = SuperVillain.db.SVDock.dockRightWidth or 350; local height = (SuperVillain.db.SVDock.dockRightHeight or 180) - 22 if MOD:IsDockletReady('DockletMain') then @@ -256,15 +256,14 @@ function MOD:ResizeDocklets() SuperDockletExtra:Size(width,height) SuperDockletExtra:Point('BOTTOMLEFT',SuperDockletMain,'BOTTOMRIGHT',0,0) end -end; +end function MOD:UnsetDockletButton() - MOD:RemoveTool(ToggleButton) - ToggleButton.TText=""; - ToggleButton.IsOpen=false; - ToggleButton.IsRegistered=false; - ToggleButton:Hide() -end; + MOD.RemoveTool(AddOnButton) + AddOnButton.TText=""; + AddOnButton.IsOpen=false; + AddOnButton.IsRegistered=false; +end function MOD:RegisterMainDocklet(name) local frame = _G[name]; @@ -277,14 +276,13 @@ function MOD:RegisterMainDocklet(name) frame.ToggleName="ToolBarDockletButton"; tinsert(MOD.DockletList,frame); frame.listIndex=#MOD.DockletList; - MOD:AddTool(ToggleButton) - ToggleButton.TText="Open "..MOD.MainToolTip; - ToggleButton.IsRegistered = true; - MOD.CurrentlyDocked[name] = true; - if not ToggleButton:IsShown() then ToggleButton:Show()end; - if not InCombatLockdown() and frame:IsShown() then frame:Hide() end; + MOD.AddTool(AddOnButton) + AddOnButton.TText="Open "..MOD.MainToolTip; + AddOnButton.IsRegistered = true + MOD.CurrentlyDocked[name] = true + if not InCombatLockdown() and frame:IsShown() then frame:Hide() end end -end; +end function MOD:RegisterExtraDocklet(name) local frame = _G[name]; @@ -297,11 +295,11 @@ function MOD:RegisterExtraDocklet(name) frame.ToggleName="ToolBarDockletButton"; tinsert(MOD.DockletList,frame); frame.listIndex=#MOD.DockletList; - ToggleButton.TText = MOD.MainToolTip.." and "..MOD.ExtraToolTip; + AddOnButton.TText = MOD.MainToolTip.." and "..MOD.ExtraToolTip; MOD.CurrentlyDocked[name] = true; - if not InCombatLockdown() and frame:IsShown() then frame:Hide() end; + if not InCombatLockdown() and frame:IsShown() then frame:Hide() end end -end; +end function MOD:UnregisterDocklets() local frame,i; @@ -312,7 +310,7 @@ function MOD:UnregisterDocklets() MOD:UnregisterDocklet(frame) SuperVillain.db.SVDock.docklets.MainWindow="None" end - elseif ToggleButton.IsRegistered then + elseif AddOnButton.IsRegistered then MOD:UnsetDockletButton() end if MOD:IsDockletReady('DockletExtra') then @@ -324,14 +322,14 @@ function MOD:UnregisterDocklets() end SuperDockletMain.FrameName="None" SuperDockletExtra.FrameName="None" -end; +end function MOD:ReloadDocklets(alert) MOD:UnregisterDocklets() MOD:ResizeDocklets() MOD.MainToolTip = ""; MOD.ExtraToolTip = ""; -end; +end function MOD:DockletEnterCombat(D) MOD.CombatLocked = true; @@ -339,41 +337,41 @@ function MOD:DockletEnterCombat(D) SuperDockletMain:Show() SuperDockletExtra:Show() end -end; +end local timeOutFunc = function() if not MOD.CombatLocked then SuperDockletMain:Hide() SuperDockletExtra:Hide() end -end; +end function MOD:DockletExitCombat(D) MOD.CombatLocked = false; if SuperVillain.db.SVDock.docklets.DockletCombatFade then SuperVillain:ExecuteTimer(timeOutFunc, 10) end -end; +end function MOD:CreateDockletButton() SuperDockletMain:SetFrameLevel(SuperDockWindowRight:GetFrameLevel() + 50) SuperDockletExtra:SetFrameLevel(SuperDockWindowRight:GetFrameLevel() + 50) local size = SuperDockToolBarRight.currentSize; - ToggleButton:SetParent(SuperDockToolBarRight) - ToggleButton:Size(size,size) - ToggleButton:SetFramedButtonTemplate() - ToggleButton.icon=ToggleButton:CreateTexture(nil,"OVERLAY") - ToggleButton.icon:FillInner() - ToggleButton.icon:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Icons\DOCK-ADDON]]) - ToggleButton.icon:SetGradient("VERTICAL", 0.5, 0.53, 0.55, 0.8, 0.8, 1) - ToggleButton.TText=""; - ToggleButton.IsOpen=false; - ToggleButton.IsRegistered=false; - ToggleButton:SetScript("OnEnter",Addon_OnEnter) - ToggleButton:SetScript("OnLeave",Addon_OnLeave) - ToggleButton:SetScript("OnClick",Addon_OnClick) - ToggleButton:Hide() -end; + AddOnButton:SetParent(SuperDockToolBarRight) + AddOnButton:Size(size,size) + AddOnButton:SetFramedButtonTemplate() + AddOnButton.icon=AddOnButton:CreateTexture(nil,"OVERLAY") + AddOnButton.icon:FillInner() + AddOnButton.icon:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Icons\DOCK-ADDON]]) + AddOnButton.icon:SetGradient("VERTICAL", 0.5, 0.53, 0.55, 0.8, 0.8, 1) + AddOnButton.TText=""; + AddOnButton.IsOpen=false; + AddOnButton.IsRegistered=false; + AddOnButton:SetScript("OnEnter",Addon_OnEnter) + AddOnButton:SetScript("OnLeave",Addon_OnLeave) + AddOnButton:SetScript("OnClick",Addon_OnClick) + AddOnButton:Hide() +end function MOD:DockletInit() MOD:CreateDockletButton() @@ -381,4 +379,4 @@ function MOD:DockletInit() SuperDockletMain:SetScript('OnShow', DockletFrame_OnShow) SuperDockletExtra:SetScript('OnShow', DockletFrame_OnShow) hooksecurefunc(MOD,'DockWindowResize', resizeHook) -end; \ No newline at end of file +end \ No newline at end of file diff --git a/Interface/AddOns/SVUI/packages/dock/common/toolbar.lua b/Interface/AddOns/SVUI/packages/dock/common/toolbar.lua index da4d3b2..94bcd91 100644 --- a/Interface/AddOns/SVUI/packages/dock/common/toolbar.lua +++ b/Interface/AddOns/SVUI/packages/dock/common/toolbar.lua @@ -130,36 +130,38 @@ MOD.LastAddedTool = false; CORE FUNCTIONS ########################################################## ]]-- -function MOD:RemoveTool(frame) - if not frame or not frame.listIndex then return end - local name = frame:GetName(); +function MOD:RemoveTool() + if not self or not self.listIndex then return end + local name = self:GetName(); if not MOD.ToolsSafty[name] then return end MOD.ToolsSafty[name] = false; - local i = frame.listIndex; + local i = self.listIndex; tremove(MOD.ToolsList, i) local width; local height = SuperDockToolBarRight.currentSize; MOD.LastAddedTool = MOD.ToolsList[#MOD.ToolsList] width = #MOD.ToolsList * (height + 6) SuperDockToolBarRight:Size(width, height) + self:Hide() end -function MOD:AddTool(frame) - local name = frame:GetName(); +function MOD:AddTool() + local name = self:GetName(); if MOD.ToolsSafty[name] then return end MOD.ToolsSafty[name] = true; local width; local height = SuperDockToolBarRight.currentSize; - if not MOD.LastAddedTool or MOD.LastAddedTool == frame then - frame:Point("RIGHT", SuperDockToolBarRight, "RIGHT", -6, 0); + if not MOD.LastAddedTool or MOD.LastAddedTool == self then + self:Point("RIGHT", SuperDockToolBarRight, "RIGHT", -6, 0); else - frame:Point("RIGHT", MOD.LastAddedTool, "LEFT", -6, 0); + self:Point("RIGHT", MOD.LastAddedTool, "LEFT", -6, 0); end - tinsert(MOD.ToolsList, frame) - frame.listIndex = #MOD.ToolsList; - MOD.LastAddedTool = frame; + tinsert(MOD.ToolsList, self) + self.listIndex = #MOD.ToolsList; + MOD.LastAddedTool = self; width = #MOD.ToolsList * (height + 6) SuperDockToolBarRight:Size(width, height) + self:Show() end function MOD:CreateBasicToolButton(name,texture,onclick,frameName,isdefault) @@ -168,7 +170,7 @@ function MOD:CreateBasicToolButton(name,texture,onclick,frameName,isdefault) local clickFunction = (type(onclick)=="function") and onclick or Button_OnClick; local size = SuperDockToolBarRight.currentSize; local button = _G[fName .. "_ToolBarButton"] or CreateFrame("Button",("%s_ToolBarButton"):format(fName),SuperDockToolBarRight) - MOD:AddTool(button) + MOD.AddTool(button) button:Size(size,size) button:SetFramedButtonTemplate() button.icon = button:CreateTexture(nil,"OVERLAY") @@ -310,24 +312,24 @@ do hearth:SetScript("OnLeave", Hearth_OnLeave) hearth:RegisterForClicks("AnyUp") - hearth:SetAttribute("type","item") - hearth:SetAttribute("item","Hearthstone") + hearth:SetAttribute("type", "item") + hearth:SetAttribute("item", "Hearthstone") if(SuperVillain.class == "SHAMAN") then - hearth:SetAttribute("type2","spell") - hearth:SetAttribute("spell","Astral Recall") + hearth:SetAttribute("type2", "spell") + hearth:SetAttribute("spell", "Astral Recall") hearth.ExtraSpell = "Astral Recall" elseif(SuperVillain.class == "DEATHKNIGHT") then hearth:SetAttribute("type2","spell") hearth:SetAttribute("spell","Death Gate") hearth.ExtraSpell = "Death Gate" elseif(SuperVillain.class == "DRUID") then - hearth:SetAttribute("type2","spell") - hearth:SetAttribute("spell","Teleport: Moonglade") + hearth:SetAttribute("type2", "spell") + hearth:SetAttribute("spell", "Teleport: Moonglade") hearth.ExtraSpell = "Teleport: Moonglade" elseif(SuperVillain.class == "MONK") then - hearth:SetAttribute("type2","spell") - hearth:SetAttribute("spell","Zen Pilgrimage") + hearth:SetAttribute("type2", "spell") + hearth:SetAttribute("spell", "Zen Pilgrimage") hearth.ExtraSpell = "Zen Pilgrimage" end diff --git a/Interface/AddOns/SVUI/packages/map/SVMap.lua b/Interface/AddOns/SVUI/packages/map/SVMap.lua index f6e5c1e..1e6d0cc 100644 --- a/Interface/AddOns/SVUI/packages/map/SVMap.lua +++ b/Interface/AddOns/SVUI/packages/map/SVMap.lua @@ -110,6 +110,7 @@ end; function MOD:RefreshMiniMap() MOD:UpdateSizing() if(SVUI_MinimapFrame and SVUI_MinimapFrame:IsShown()) then + --local minimapRotationEnabled = GetCVar("rotateMinimap") ~= "0" SVUI_MinimapFrame:Size(MM_WIDTH, MM_HEIGHT) SVUI_MinimapFrame.backdrop:SetGradient(unpack(MM_COLOR)) Minimap:Size(MM_SIZE,MM_SIZE) diff --git a/Interface/AddOns/SVUI/packages/stats/common/_load.xml b/Interface/AddOns/SVUI/packages/stats/common/_load.xml index 3b23e75..2d7215c 100644 --- a/Interface/AddOns/SVUI/packages/stats/common/_load.xml +++ b/Interface/AddOns/SVUI/packages/stats/common/_load.xml @@ -10,4 +10,6 @@ <Script file='reputation.lua'/> <Script file='system.lua'/> <Script file='time.lua'/> + <Script file='dps.lua'/> + <Script file='hps.lua'/> </Ui> \ No newline at end of file diff --git a/Interface/AddOns/SVUI/packages/stats/common/dps.lua b/Interface/AddOns/SVUI/packages/stats/common/dps.lua new file mode 100644 index 0000000..bfe856a --- /dev/null +++ b/Interface/AddOns/SVUI/packages/stats/common/dps.lua @@ -0,0 +1,141 @@ +--[[ +############################################################################## +_____/\\\\\\\\\\\____/\\\________/\\\__/\\\________/\\\__/\\\\\\\\\\\_ # + ___/\\\/////////\\\_\/\\\_______\/\\\_\/\\\_______\/\\\_\/////\\\///__ # + __\//\\\______\///__\//\\\______/\\\__\/\\\_______\/\\\_____\/\\\_____ # + ___\////\\\__________\//\\\____/\\\___\/\\\_______\/\\\_____\/\\\_____ # + ______\////\\\________\//\\\__/\\\____\/\\\_______\/\\\_____\/\\\_____ # + _________\////\\\______\//\\\/\\\_____\/\\\_______\/\\\_____\/\\\_____ # + __/\\\______\//\\\______\//\\\\\______\//\\\______/\\\______\/\\\_____ # + _\///\\\\\\\\\\\/________\//\\\________\///\\\\\\\\\/____/\\\\\\\\\\\_# + ___\///////////___________\///___________\/////////_____\///////////_# +############################################################################## +S U P E R - V I L L A I N - U I By: Munglunch # +############################################################################## + +STATS:Extend EXAMPLE USAGE: MOD:Extend(newStat,eventList,onEvents,update,click,focus,blur) + +########################################################## +LOCALIZED LUA FUNCTIONS +########################################################## +]]-- +--[[ GLOBALS ]]-- +local _G = _G; +local unpack = _G.unpack; +local select = _G.select; +local pairs = _G.pairs; +local ipairs = _G.ipairs; +local type = _G.type; +local error = _G.error; +local pcall = _G.pcall; +local assert = _G.assert; +local tostring = _G.tostring; +local tonumber = _G.tonumber; +local tinsert = _G.tinsert; +local string = _G.string; +local math = _G.math; +local table = _G.table; +--[[ STRING METHODS ]]-- +local lower, upper = string.lower, string.upper; +local find, format, len, split = string.find, string.format, string.len, string.split; +local match, sub, join = string.match, string.sub, string.join; +local gmatch, gsub = string.gmatch, string.gsub; +--[[ MATH METHODS ]]-- +local abs, ceil, floor, round = math.abs, math.ceil, math.floor, math.round; -- Basic +--[[ TABLE METHODS ]]-- +local twipe, tsort = table.wipe, table.sort; +--[[ +########################################################## +GET ADDON DATA +########################################################## +]]-- +local SuperVillain, L = unpack(select(2, ...)); +local MOD = SuperVillain.Registry:Expose('SVStats'); +--[[ +########################################################## +CALL TO ARMS STATS +########################################################## +]]-- +local StatEvents = {'PLAYER_ENTERING_WORLD', 'COMBAT_LOG_EVENT_UNFILTERED', "PLAYER_LEAVE_COMBAT", 'PLAYER_REGEN_DISABLED', 'UNIT_PET'}; + +local PlayerEvents = {SWING_DAMAGE = true, RANGE_DAMAGE = true, SPELL_DAMAGE = true, SPELL_PERIODIC_DAMAGE = true, DAMAGE_SHIELD = true, DAMAGE_SPLIT = true, SPELL_EXTRA_ATTACKS = true} +local playerID, petID +local DMGTotal, lastDMGAmount = 0, 0 +local combatTime = 0 +local timeStamp = 0 +local lastSegment = 0 +local lastPanel +local displayString = ''; +local join = string.join + +local function Reset() + timeStamp = 0 + combatTime = 0 + DMGTotal = 0 + lastDMGAmount = 0 +end + +local function GetDPS(self) + local DPS + if DMGTotal == 0 or combatTime == 0 then + DPS = "0.0" + else + DPS = (DMGTotal) / (combatTime) + end + self.text:SetFormattedText(displayString, L["DPS"]..': ', DPS) +end + +local function DPS_OnClick(self) + Reset() + GetDPS(self) +end + +local function DPS_OnEnter(self) + MOD:Tip(self) + MOD.tooltip:AddDoubleLine("Damage Total:", DMGTotal, 1, 1, 1) + MOD:ShowTip() +end + +local function DPS_OnEvent(self, event, ...) + lastPanel = self + + if event == "PLAYER_ENTERING_WORLD" then + playerID = UnitGUID('player') + elseif event == 'PLAYER_REGEN_DISABLED' or event == "PLAYER_LEAVE_COMBAT" then + local now = time() + if now - lastSegment > 20 then --time since the last segment + Reset() + end + lastSegment = now + elseif event == 'COMBAT_LOG_EVENT_UNFILTERED' then + if not PlayerEvents[select(2, ...)] then return end + local id = select(4, ...) + if id == playerID or id == petID then + if timeStamp == 0 then timeStamp = select(1, ...) end + lastSegment = timeStamp + combatTime = select(1, ...) - timeStamp + if select(2, ...) == "SWING_DAMAGE" then + lastDMGAmount = select(12, ...) + else + lastDMGAmount = select(15, ...) + end + DMGTotal = DMGTotal + lastDMGAmount + end + elseif event == UNIT_PET then + petID = UnitGUID("pet") + end + + GetDPS(self) +end + +local DPSColorUpdate = function() + local hexColor = SuperVillain:HexColor("highlight"); + displayString = join("", "%s", hexColor, "%.1f|r") + + if lastPanel ~= nil then + DPS_OnEvent(lastPanel) + end +end + +SuperVillain.Registry:SetCallback(DPSColorUpdate) +MOD:Extend('DPS', StatEvents, DPS_OnEvent, nil, DPS_OnClick, DPS_OnEnter) \ No newline at end of file diff --git a/Interface/AddOns/SVUI/packages/stats/common/hps.lua b/Interface/AddOns/SVUI/packages/stats/common/hps.lua new file mode 100644 index 0000000..485daa8 --- /dev/null +++ b/Interface/AddOns/SVUI/packages/stats/common/hps.lua @@ -0,0 +1,139 @@ +--[[ +############################################################################## +_____/\\\\\\\\\\\____/\\\________/\\\__/\\\________/\\\__/\\\\\\\\\\\_ # + ___/\\\/////////\\\_\/\\\_______\/\\\_\/\\\_______\/\\\_\/////\\\///__ # + __\//\\\______\///__\//\\\______/\\\__\/\\\_______\/\\\_____\/\\\_____ # + ___\////\\\__________\//\\\____/\\\___\/\\\_______\/\\\_____\/\\\_____ # + ______\////\\\________\//\\\__/\\\____\/\\\_______\/\\\_____\/\\\_____ # + _________\////\\\______\//\\\/\\\_____\/\\\_______\/\\\_____\/\\\_____ # + __/\\\______\//\\\______\//\\\\\______\//\\\______/\\\______\/\\\_____ # + _\///\\\\\\\\\\\/________\//\\\________\///\\\\\\\\\/____/\\\\\\\\\\\_# + ___\///////////___________\///___________\/////////_____\///////////_# +############################################################################## +S U P E R - V I L L A I N - U I By: Munglunch # +############################################################################## + +STATS:Extend EXAMPLE USAGE: MOD:Extend(newStat,eventList,onEvents,update,click,focus,blur) + +########################################################## +LOCALIZED LUA FUNCTIONS +########################################################## +]]-- +--[[ GLOBALS ]]-- +local _G = _G; +local unpack = _G.unpack; +local select = _G.select; +local pairs = _G.pairs; +local ipairs = _G.ipairs; +local type = _G.type; +local error = _G.error; +local pcall = _G.pcall; +local assert = _G.assert; +local tostring = _G.tostring; +local tonumber = _G.tonumber; +local tinsert = _G.tinsert; +local string = _G.string; +local math = _G.math; +local table = _G.table; +--[[ STRING METHODS ]]-- +local lower, upper = string.lower, string.upper; +local find, format, len, split = string.find, string.format, string.len, string.split; +local match, sub, join = string.match, string.sub, string.join; +local gmatch, gsub = string.gmatch, string.gsub; +--[[ MATH METHODS ]]-- +local abs, ceil, floor, round = math.abs, math.ceil, math.floor, math.round; -- Basic +--[[ TABLE METHODS ]]-- +local twipe, tsort = table.wipe, table.sort; +--[[ +########################################################## +GET ADDON DATA +########################################################## +]]-- +local SuperVillain, L = unpack(select(2, ...)); +local MOD = SuperVillain.Registry:Expose('SVStats'); +--[[ +########################################################## +CALL TO ARMS STATS +########################################################## +]]-- +local StatEvents = {'PLAYER_ENTERING_WORLD', 'COMBAT_LOG_EVENT_UNFILTERED', "PLAYER_LEAVE_COMBAT", 'PLAYER_REGEN_DISABLED', 'UNIT_PET'}; + +local PlayerEvents = {SPELL_HEAL = true, SPELL_PERIODIC_HEAL = true} +local playerID, petID +local healTotal, lastHealAmount = 0, 0 +local combatTime = 0 +local timeStamp = 0 +local lastSegment = 0 +local lastPanel +local displayString = ''; + +local join = string.join +local max = math.max + +local function Reset() + timeStamp = 0 + combatTime = 0 + healTotal = 0 + lastHealAmount = 0 +end + +local function GetHPS(self) + local HPS + if healTotal == 0 or combatTime == 0 then + HPS = "0.0" + else + HPS = (healTotal) / (combatTime) + end + self.text:SetFormattedText(displayString, L["HPS"]..': ', HPS) +end + +local function HPS_OnClick(self) + Reset() + GetHPS(self) +end + +local function HPS_OnEnter(self) + MOD:Tip(self) + MOD.tooltip:AddDoubleLine("Damage Total:", healTotal, 1, 1, 1) + MOD:ShowTip() +end + +local function HPS_OnEvent(self, event, ...) + lastPanel = self + + if event == "PLAYER_ENTERING_WORLD" then + playerID = UnitGUID('player') + elseif event == 'PLAYER_REGEN_DISABLED' or event == "PLAYER_LEAVE_COMBAT" then + local now = time() + if now - lastSegment > 20 then --time since the last segment + Reset() + end + lastSegment = now + elseif event == 'COMBAT_LOG_EVENT_UNFILTERED' then + if not PlayerEvents[select(2, ...)] then return end + local id = select(4, ...) + if id == playerID or id == petID then + if timeStamp == 0 then timeStamp = select(1, ...) end + lastSegment = timeStamp + combatTime = select(1, ...) - timeStamp + lastHealAmount = select(15, ...) + healTotal = healTotal + max(0, lastHealAmount - overHeal) + end + elseif event == UNIT_PET then + petID = UnitGUID("pet") + end + + GetHPS(self) +end + +local HPSColorUpdate = function() + local hexColor = SuperVillain:HexColor("highlight"); + displayString = join("", "%s", hexColor, "%.1f|r") + + if lastPanel ~= nil then + HPS_OnEvent(lastPanel) + end +end + +SuperVillain.Registry:SetCallback(HPSColorUpdate) +MOD:Extend('HPS', StatEvents, HPS_OnEvent, nil, HPS_OnClick, HPS_OnEnter) \ No newline at end of file diff --git a/Interface/AddOns/SVUI/packages/tip/SVTip.lua b/Interface/AddOns/SVUI/packages/tip/SVTip.lua index 02e41d8..ec44d07 100644 --- a/Interface/AddOns/SVUI/packages/tip/SVTip.lua +++ b/Interface/AddOns/SVUI/packages/tip/SVTip.lua @@ -605,8 +605,8 @@ local _hook_GameTooltip_SetDefaultAnchor = function(self, parent) self:SetOwner(parent, "ANCHOR_CURSOR") if not GameTooltipStatusBar.anchoredToTop then GameTooltipStatusBar:ClearAllPoints() - GameTooltipStatusBar:SetPoint("BOTTOMLEFT", GameTooltip, "TOPLEFT", 1, 3) - GameTooltipStatusBar:SetPoint("BOTTOMRIGHT", GameTooltip, "TOPRIGHT", -1, 3) + GameTooltipStatusBar:SetPoint("TOPLEFT", GameTooltip.SuperBorder, "TOPLEFT", 1, -1) + GameTooltipStatusBar:SetPoint("TOPRIGHT", GameTooltip.SuperBorder, "TOPRIGHT", -1, -1) GameTooltipStatusBar.text:Point("CENTER", GameTooltipStatusBar, 0, 3) GameTooltipStatusBar.anchoredToTop = true end @@ -616,8 +616,8 @@ local _hook_GameTooltip_SetDefaultAnchor = function(self, parent) self:ClearAllPoints() if GameTooltipStatusBar.anchoredToTop then GameTooltipStatusBar:ClearAllPoints() - GameTooltipStatusBar:SetPoint("TOPLEFT", GameTooltip, "BOTTOMLEFT", 1, -3) - GameTooltipStatusBar:SetPoint("TOPRIGHT", GameTooltip, "BOTTOMRIGHT", -1, -3) + GameTooltipStatusBar:SetPoint("BOTTOMLEFT", GameTooltip.SuperBorder, "BOTTOMLEFT", 1, 1) + GameTooltipStatusBar:SetPoint("BOTTOMRIGHT", GameTooltip.SuperBorder, "BOTTOMRIGHT", -1, 1) GameTooltipStatusBar.text:Point("CENTER", GameTooltipStatusBar, 0, -3) GameTooltipStatusBar.anchoredToTop = nil end @@ -664,8 +664,7 @@ local _hook_OnTipShow = function(self) local heightWidth = widthScale * 0.35 self.SuperBorder[1]:SetSize(widthScale,heightWidth) self.SuperBorder[2]:SetSize(heightScale,heightScale) - self.SuperBorder[3]:SetSize(heightScale,heightScale) - self.SuperBorder[4]:SetSize(widthScale,heightWidth) + self.SuperBorder[3]:SetSize(widthScale,heightWidth) end local _hook_OnItemRef = function(link,text,button,chatFrame) @@ -686,15 +685,71 @@ function MOD:Load() BNToastFrame:Point("TOPRIGHT", SVUI_MinimapFrame, "BOTTOMLEFT", 0, -10) SuperVillain:SetSVMovable(BNToastFrame, "BNET_MOVE", L["BNet Frame"]) NewHook(BNToastFrame, "SetPoint", _hook_BNToastOnShow) - if not SuperVillain.db.SVTip.enable then return end - GameTooltipStatusBar:Height(MOD.db.healthBar.height) + if not SuperVillain.db.SVTip.enable then return end + local barHeight = self.db.healthBar.height + local barOffset = barHeight + 6 + for _, tooltip in pairs(tooltips) do + if(tooltip.SuperBorder) then return end + local mask = CreateFrame("Frame", nil, tooltip) + mask:SetPoint("TOPLEFT", tooltip, "TOPLEFT", 0, 0) + mask:SetPoint("BOTTOMRIGHT", tooltip, "BOTTOMRIGHT", 0, -barOffset) + mask:SetFrameLevel(tooltip:GetFrameLevel() - 1) + mask[1] = mask:CreateTexture(nil, "BACKGROUND") + mask[1]:SetPoint("BOTTOMRIGHT", mask, "TOPRIGHT", 0, 0) + mask[1]:SetHeight(mask:GetWidth() * 0.25) + mask[1]:SetWidth(mask:GetWidth() * 0.25) + mask[1]:SetTexture(TT_TOP) + mask[1]:SetVertexColor(0,0,0) + mask[1]:SetBlendMode("BLEND") + mask[1]:SetAlpha(0.8) + mask[2] = mask:CreateTexture(nil, "BACKGROUND") + mask[2]:SetPoint("LEFT", mask, "RIGHT", 0, 0) + mask[2]:SetSize(64,64) + mask[2]:SetTexture(TT_RIGHT) + mask[2]:SetVertexColor(0,0,0) + mask[2]:SetBlendMode("BLEND") + mask[2]:SetAlpha(0.8) + mask[3] = mask:CreateTexture(nil, "BACKGROUND") + mask[3]:SetPoint("TOPRIGHT", mask, "BOTTOMRIGHT", 0, 0) + mask[3]:SetHeight(mask:GetWidth() * 0.25) + mask[3]:SetWidth(mask:GetWidth() * 0.25) + mask[3]:SetTexture(TT_BOTTOM) + mask[3]:SetVertexColor(0,0,0) + mask[3]:SetBlendMode("BLEND") + mask[3]:SetAlpha(0.8) + + tooltip:SetBackdrop({ + bgFile = [[Interface\BUTTONS\WHITE8X8]], + edgeFile = [[Interface\BUTTONS\WHITE8X8]], + tile = false, + edgeSize = 1 + }) + tooltip:SetBackdropColor(0, 0, 0, 0) + tooltip:SetBackdropBorderColor(0, 0, 0, 0) + tooltip.SetBackdrop = function() end + tooltip.SetBackdropColor = function() end + tooltip.SetBackdropBorderColor = function() end + tooltip:HookScript("OnShow", _hook_OnTipShow) + + mask:SetBackdrop({ + bgFile = [[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]], + edgeFile = [[Interface\BUTTONS\WHITE8X8]], + tile = false, + edgeSize = 1 + }) + mask:SetBackdropColor(0, 0, 0, 0.8) + mask:SetBackdropBorderColor(0, 0, 0) + tooltip.SuperBorder = mask + end + + GameTooltipStatusBar:Height(barHeight) GameTooltipStatusBar:SetStatusBarTexture(SuperVillain.Media.bar.default) - GameTooltipStatusBar:SetFixedPanelTemplate("Inset", true) + GameTooltipStatusBar:SetFixedPanelTemplate("Bar", true) GameTooltipStatusBar:ClearAllPoints() - GameTooltipStatusBar:SetPoint("TOPLEFT", GameTooltip, "BOTTOMLEFT", 1, -3) - GameTooltipStatusBar:SetPoint("TOPRIGHT", GameTooltip, "BOTTOMRIGHT", -1, -3) + GameTooltipStatusBar:SetPoint("BOTTOMLEFT", GameTooltip.SuperBorder, "BOTTOMLEFT", 1, 1) + GameTooltipStatusBar:SetPoint("BOTTOMRIGHT", GameTooltip.SuperBorder, "BOTTOMRIGHT", -1, 1) GameTooltipStatusBar.text = GameTooltipStatusBar:CreateFontString(nil, "OVERLAY") - GameTooltipStatusBar.text:Point("CENTER", GameTooltipStatusBar, 0, -3) + GameTooltipStatusBar.text:Point("CENTER", GameTooltipStatusBar, "CENTER", 0, 0) GameTooltipStatusBar.text:SetFontTemplate(SuperVillain.Shared:Fetch("font", MOD.db.healthBar.font), MOD.db.healthBar.fontSize, "OUTLINE") if not GameTooltipStatusBar.border then @@ -730,56 +785,5 @@ function MOD:Load() GameTooltip:HookScript("OnTooltipSetUnit", _hook_GameTooltip_OnTooltipSetUnit) GameTooltipStatusBar:HookScript("OnValueChanged", _hook_GameTooltipStatusBar_OnValueChanged) self:RegisterEvent("MODIFIER_STATE_CHANGED", TooltipModifierChangeHandler) - -- local MINI_BG = [[Interface\Addons\SVUI\assets\artwork\Template\Tooltip\MINITIP-BG]] - -- local MINI_LEFT = [[Interface\Addons\SVUI\assets\artwork\Template\Tooltip\MINITIP-LEFT]] - -- local MINI_RIGHT = [[Interface\Addons\SVUI\assets\artwork\Template\Tooltip\MINITIP-RIGHT]] - for _, tooltip in pairs(tooltips) do - if(tooltip.SuperBorder) then return end - local mask = CreateFrame("Frame", nil, tooltip) - mask:SetAllPoints() - mask[1] = mask:CreateTexture(nil, "BACKGROUND") - mask[1]:SetPoint("BOTTOMLEFT", mask, "TOPLEFT", 0, 0) - mask[1]:SetHeight(mask:GetWidth() * 0.25) - mask[1]:SetWidth(mask:GetWidth() * 0.25) - mask[1]:SetTexture(TT_TOP) - mask[1]:SetVertexColor(0,0,0) - mask[1]:SetBlendMode("BLEND") - mask[1]:SetAlpha(0.65) - mask[2] = mask:CreateTexture(nil, "BACKGROUND") - mask[2]:SetPoint("LEFT", mask, "RIGHT", 0, 0) - mask[2]:SetSize(64,64) - mask[2]:SetTexture(TT_RIGHT) - mask[2]:SetVertexColor(0,0,0) - mask[2]:SetBlendMode("BLEND") - mask[2]:SetAlpha(0.75) - mask[3] = mask:CreateTexture(nil, "BACKGROUND") - mask[3]:SetPoint("RIGHT", mask, "LEFT", 0, 0) - mask[3]:SetSize(64,64) - mask[3]:SetTexture(TT_LEFT) - mask[3]:SetVertexColor(0,0,0) - mask[3]:SetBlendMode("BLEND") - mask[3]:SetAlpha(0.75) - mask[4] = mask:CreateTexture(nil, "BACKGROUND") - mask[4]:SetPoint("TOPRIGHT", mask, "BOTTOMRIGHT", 0, 0) - mask[4]:SetHeight(mask:GetWidth() * 0.25) - mask[4]:SetWidth(mask:GetWidth() * 0.25) - mask[4]:SetTexture(TT_BOTTOM) - mask[4]:SetVertexColor(0,0,0) - mask[4]:SetBlendMode("BLEND") - mask[4]:SetAlpha(0.5) - tooltip.SuperBorder = mask - tooltip:SetBackdrop({ - bgFile = [[Interface\AddOns\SVUI\assets\artwork\Template\Tooltip\TOOLTIP]], - edgeFile = [[Interface\BUTTONS\WHITE8X8]], - tile = false, - edgeSize = 1 - }) - tooltip:SetBackdropColor(0, 0, 0, 0.8) - tooltip:SetBackdropBorderColor(0, 0, 0) - tooltip.SetBackdrop = function() end - tooltip.SetBackdropColor = function() end - tooltip.SetBackdropBorderColor = function() end - tooltip:HookScript("OnShow", _hook_OnTipShow) - end end SuperVillain.Registry:NewPackage(MOD, "SVTip") \ No newline at end of file diff --git a/Interface/AddOns/SVUI/packages/unit/SVUnit.lua b/Interface/AddOns/SVUI/packages/unit/SVUnit.lua index bab35dd..b8bce93 100644 --- a/Interface/AddOns/SVUI/packages/unit/SVUnit.lua +++ b/Interface/AddOns/SVUI/packages/unit/SVUnit.lua @@ -310,7 +310,7 @@ function MOD:RefreshAllUnitMedia() end end for _,group in pairs(self.Headers) do - group:MediaUpdate(true) + group:MediaUpdate() end collectgarbage("collect") end @@ -348,7 +348,7 @@ function MOD:RefreshUnitFrames() collectgarbage("collect") end -function MOD:RefreshUnitMedia(unitName, updateElements) +function MOD:RefreshUnitMedia(unitName) local db = MOD.db local key = unitName or self.___key if(not (db and db.enable) or not self) then return end @@ -425,9 +425,6 @@ function MOD:RefreshUnitMedia(unitName, updateElements) rdebuffs.count:SetFont(CURRENT_AURABAR_FONT, db.auraFontSize, db.auraFontOutline) rdebuffs.time:SetFont(CURRENT_AURABAR_FONT, db.auraFontSize, db.auraFontOutline) end - if(updateElements) then - self:UpdateAllElements() - end end end diff --git a/Interface/AddOns/SVUI/packages/unit/frames/groups.lua b/Interface/AddOns/SVUI/packages/unit/frames/groups.lua index 3d8847e..b938a50 100644 --- a/Interface/AddOns/SVUI/packages/unit/frames/groups.lua +++ b/Interface/AddOns/SVUI/packages/unit/frames/groups.lua @@ -108,18 +108,19 @@ local _GSORT = { ALL UNIT HELPERS ########################################################## ]]-- -local GroupMediaUpdate = function(self, updateElements) - local key = self.___key +local GroupMediaUpdate = function(self) + local key = self.___groupkey local index = 1; local childFrame = self:GetAttribute("child"..index) - while childFrame do - MOD.RefreshUnitMedia(childFrame, key, updateElements) + while childFrame do + MOD.RefreshUnitMedia(childFrame, key) if(_G[childFrame:GetName().."Pet"]) then MOD.RefreshUnitMedia(_G[childFrame:GetName().."Pet"], key, updateElements) end if(_G[childFrame:GetName().."Target"]) then MOD.RefreshUnitMedia(_G[childFrame:GetName().."Target"], key, updateElements) end + childFrame:UpdateAllElements() index = index + 1; childFrame = self:GetAttribute("child"..index) end @@ -1042,6 +1043,12 @@ local GroupHeaderUpdate = function(self) end end +local GroupHeaderMediaUpdate = function(self) + for i=1,#self.groups do + self.groups[i]:MediaUpdate() + end +end + local GroupSetActiveState = function(self) if not self.isForced then local key = self.___groupkey @@ -1087,7 +1094,7 @@ function MOD:SetGroupFrame(key, filter, template1, forceUpdate, template2) frame.groups = {} frame.___groupkey = key; frame.Update = GroupHeaderUpdate - frame.MediaUpdate = GroupMediaUpdate + frame.MediaUpdate = GroupHeaderMediaUpdate frame.SetActiveState = GroupSetActiveState frame.SetConfigEnvironment = GroupSetConfigEnvironment end diff --git a/Interface/AddOns/SVUI/scripts/pvp.lua b/Interface/AddOns/SVUI/scripts/pvp.lua index e9ec5e8..66fc7d7 100644 --- a/Interface/AddOns/SVUI/scripts/pvp.lua +++ b/Interface/AddOns/SVUI/scripts/pvp.lua @@ -31,6 +31,10 @@ local SuperVillain, L = unpack(select(2, ...)); LOCALS ########################################################## ]]-- +local ICON_FILE = [[Interface\AddOns\SVUI\assets\artwork\Icons\DOCK-PVP]] +local PVP_SAFE = [[Interface\AddOns\SVUI\assets\artwork\Icons\PVP-SAFE]] +local PVP_HELP = [[Interface\AddOns\SVUI\assets\artwork\Icons\PVP-INCOMING]] +local PVP_LOST = [[Interface\WorldMap\Skull_64Red]] local PVP_NODES = { [461] = { --Arathi Basin (5) "Stables", "Lumber", "Blacksmith", "Mine", "Farm" @@ -79,41 +83,6 @@ local PVP_NODES = { -- "Horde Flag", "Alliance Flag" -- }, -- } - -local function EnteringBattleGround() - SVUI_PVPComm:Show() - local mapID = GetCurrentMapAreaID() - local points = PVP_NODES[mapID] - if(not points) then - SVUI_PVPComm:Hide() - return - end - for i = 1, #points do - local name = points[i] - local nodeName = ("SVUI_PVPNode%d"):format(i) - local node = _G[nodeName] - local safe = node.Safe - local help = node.Help - safe.name = name - help.name = name - node.Text:SetText(name) - node:Show() - end -end - -local function ExitingBattleGround() - for i = 1, 5 do - local nodeName = ("SVUI_PVPNode%d"):format(i) - local node = _G[nodeName] - local safe = node.Safe - local help = node.Help - safe.name = "" - help.name = "" - node.Text:SetText("") - node:Hide() - end - SVUI_PVPComm:Hide() -end --[[ ########################################################## HANDLERS @@ -167,17 +136,56 @@ local Help_OnClick = function(self) end end -local PVPCommunicator = CreateFrame("Frame", nil) +local EnteringBattleGround = function(self) + local mapID = GetCurrentMapAreaID() + local points = PVP_NODES[mapID] + if(not points) then return end + + for i = 1, 5 do + local nodeName = ("SVUI_PVPNode%d"):format(i) + local node = _G[nodeName] + local safe = node.Safe + local help = node.Help + if(i <= #points) then + local name = points[i] + safe.name = name + help.name = name + node.Text:SetText(name) + node:Show() + else + safe.name = "" + help.name = "" + node.Text:SetText("") + node:Hide() + end + end + self:Enable() +end + +local ExitingBattleGround = function(self) + for i = 1, 5 do + local nodeName = ("SVUI_PVPNode%d"):format(i) + local node = _G[nodeName] + local safe = node.Safe + local help = node.Help + safe.name = "" + help.name = "" + node.Text:SetText("") + node:Hide() + end + self:Disable() +end + local PVPCommunicator_OnEvent = function(self, event, ...) local instance, groupType = IsInInstance() if(instance and groupType == "pvp") then if(not self.InPVP) then - EnteringBattleGround() + self:EnteringBattleGround() self.InPVP = true end else if(self.InPVP) then - ExitingBattleGround() + self:ExitingBattleGround() self.InPVP = nil end end @@ -188,36 +196,41 @@ LOADER ########################################################## ]]-- local function LoadPVPComm() - local width = 156 - local height = 156 - local holder = CreateFrame("Frame", "SVUI_PVPComm", UIParent) - holder:SetSize(width, height) - holder:SetPoint("RIGHT", UIParent, "CENTER", -200, 0) + local DOCK = SuperVillain.Registry:Expose("SVDock") + local holder = CreateFrame("Frame", "SVUI_PVPComm", SuperDockWindowRight) + holder:SetFrameStrata("BACKGROUND") + DOCK:RegisterDocklet("SVUI_PVPComm", "PVP ToolKit", ICON_FILE) + + local width = holder:GetWidth() + local height = holder:GetHeight() + local sectionWidth = (width / 3) - 2 + local sectionHeight = (height / 5) - 2 for i = 1, 5 do local yOffset = (24 * (i - 1)) + 2 local poiName = ("SVUI_PVPNode%d"):format(i) local poi = CreateFrame("Frame", poiName, holder) - poi:SetSize(180, 22) + poi:SetSize((width - 2), sectionHeight) poi:SetPoint("TOP", holder, "TOP", 0, -yOffset) poi:SetPanelTemplate("Transparent") poi.Text = poi:CreateFontString(nil,"OVERLAY") poi.Text:SetFont(SuperVillain.Media.font.roboto, 12, "NONE") poi.Text:SetPoint("LEFT", poi, "LEFT", 2, 0) - poi.Text:SetHeight(22) - poi.Text:SetWidth(130) + poi.Text:SetHeight(sectionHeight) + poi.Text:SetWidth(sectionWidth) poi.Text:SetJustifyH("CENTER") poi.Text:SetText("") local safe = CreateFrame("Button", nil, poi) - safe:SetSize(22, 22) + safe:SetSize(sectionWidth, sectionHeight) safe:SetPoint("RIGHT", poi, "RIGHT", -2, 0) safe:SetButtonTemplate() + safe:SetPanelColor("green") local sicon = safe:CreateTexture(nil, "OVERLAY") sicon:SetAllPoints(safe) sicon:SetTexCoord(0.1, 0.9, 0.1, 0.9) - sicon:SetTexture([[Interface\PaperDollInfoFrame\Character-Plus]]) + sicon:SetTexture(PVP_SAFE) safe:SetScript("OnEnter", Safe_OnEnter) safe:SetScript("OnLeave", Safe_OnLeave) safe:SetScript("OnClick", Safe_OnClick) @@ -225,13 +238,14 @@ local function LoadPVPComm() poi.Safe = safe local help = CreateFrame("Button", nil, poi) - help:SetSize(22, 22) + help:SetSize(sectionWidth, sectionHeight) help:SetPoint("RIGHT", safe, "LEFT", -2, 0) help:SetButtonTemplate() + help:SetPanelColor("red") local hicon = help:CreateTexture(nil, "OVERLAY") hicon:SetAllPoints(help) hicon:SetTexCoord(0.1, 0.9, 0.1, 0.9) - hicon:SetTexture([[Interface\WorldMap\Skull_64Red]]) + hicon:SetTexture(PVP_HELP) help:SetScript("OnEnter", Help_OnEnter) help:SetScript("OnLeave", Help_OnLeave) help:SetScript("OnClick", Help_OnClick) @@ -240,9 +254,15 @@ local function LoadPVPComm() end SuperVillain:SetSVMovable(holder, "SVUI_PVPComm_MOVE", L["PvP Communicator"]) - PVPCommunicator:RegisterEvent("PLAYER_ENTERING_WORLD") - PVPCommunicator:SetScript("OnEvent", PVPCommunicator_OnEvent) - holder:Hide() + local docklet = _G["SVUI_PVPComm_ToolBarButton"] + docklet.Enable = DOCK.AddTool + docklet.Disable = DOCK.RemoveTool + docklet.EnteringBattleGround = EnteringBattleGround + docklet.ExitingBattleGround = ExitingBattleGround + docklet:RegisterEvent("PLAYER_ENTERING_WORLD") + docklet:RegisterEvent("UPDATE_BATTLEFIELD_SCORE") + docklet:SetScript("OnEvent", PVPCommunicator_OnEvent) + docklet:Disable() end SuperVillain.Registry:NewScript(LoadPVPComm) \ No newline at end of file diff --git a/Interface/AddOns/SVUI/system/classes/Database.lua b/Interface/AddOns/SVUI/system/classes/Database.lua index 78d42c2..cac1aff 100644 --- a/Interface/AddOns/SVUI/system/classes/Database.lua +++ b/Interface/AddOns/SVUI/system/classes/Database.lua @@ -805,7 +805,7 @@ local DatabaseDefaults = { }, ["healthBar"] = { ["text"] = true, - ["height"] = 7, + ["height"] = 10, ["font"] = "Roboto", ["fontSize"] = 10, }, @@ -3391,7 +3391,6 @@ local function resetprofile(t) sv[k] = nil end end - ReloadUI() end local function importprofile(t, key) diff --git a/Interface/AddOns/SVUI/system/installer.lua b/Interface/AddOns/SVUI/system/installer.lua index 183f7e2..d709b3f 100644 --- a/Interface/AddOns/SVUI/system/installer.lua +++ b/Interface/AddOns/SVUI/system/installer.lua @@ -813,6 +813,15 @@ local function PreviousPage() end end +local function ResetGlobalVariables() + for k,v in pairs(SVUI_Filters) do + SVUI_Filters[k] = nil + end + for k,v in pairs(SVUI_Cache) do + SVUI_Cache[k] = nil + end +end + function SuperVillain:ResetInstallation() mungs = true; okToResetMOVE = false; @@ -849,7 +858,7 @@ function SuperVillain:ResetInstallation() end SVUI_Profile.SAFEDATA.install_version = SuperVillain.version; - SuperVillain:ResetMovables('') + ResetGlobalVariables() ReloadUI() end diff --git a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua index 915d008..58238fe 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua @@ -38,27 +38,32 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local AddOnName, AddOnObject = ...; +local SVUIAddOnName, SVUIAddOn = ...; +local StyleVillain = SVUI_LIB:SetObject(SVUIAddOnName); + +SVUIAddOn = StyleVillain; + +_G["StyleVillain"] = SVUIAddOn; -local MOD = SVUI_LIB:SetObject(AddOnName); local DOCK = SuperVillain.Registry:Expose('SVDock'); local SuperDockWindow = _G["SuperDockWindow"]; local SuperDockletMain = _G["SuperDockletMain"]; local SuperDockletExtra = _G["SuperDockletExtra"]; local NewHook = hooksecurefunc; +local SVUIAddonEventHandler = CreateFrame("Frame", "SVUIAddonEventHandler") --[[ ########################################################## CORE DATA ########################################################## ]]-- -MOD.DockedParent = {} -MOD.AddOnQueue = {}; -MOD.AddOnEvents = {}; -MOD.BlizzardQueue = {}; -MOD.CustomQueue = {}; -MOD.EventListeners = {}; -MOD.PassiveAddons = {}; -MOD.OptionsCache = { +StyleVillain.DockedParent = {} +StyleVillain.AddOnQueue = {}; +StyleVillain.AddOnEvents = {}; +StyleVillain.BlizzardQueue = {}; +StyleVillain.CustomQueue = {}; +StyleVillain.EventListeners = {}; +StyleVillain.PassiveAddons = {}; +StyleVillain.OptionsCache = { order = 4, type = "group", name = "Addon Styling", @@ -79,24 +84,13 @@ MOD.OptionsCache = { CORE FUNCTIONS ########################################################## ]]-- -function MOD:LoadAlert(MainText, Function) - MOD.Alert.Text:SetText(MainText) - MOD.Alert.Accept:SetScript('OnClick', Function) - MOD.Alert:Show() +function StyleVillain:LoadAlert(MainText, Function) + StyleVillain.Alert.Text:SetText(MainText) + StyleVillain.Alert.Accept:SetScript('OnClick', Function) + StyleVillain.Alert:Show() end -function MOD:ADDON_LOADED(_, addon) - if MOD.PassiveAddons[addon] then - MOD.BlizzardQueue[addon]() - MOD.BlizzardQueue[addon] = nil; - return - end; - if not SuperVillain.CoreEnabled or not MOD.BlizzardQueue[addon] then return end; - MOD.BlizzardQueue[addon]() - MOD.BlizzardQueue[addon] = nil -end; - -function MOD:IsAddonReady(this, ...) +function StyleVillain:IsAddonReady(this, ...) for i = 1, select('#', ...) do local a = select(i, ...) if not a then break end @@ -105,7 +99,7 @@ function MOD:IsAddonReady(this, ...) return SuperVillain.db.SVStyle.addons[this] end -function MOD:SaveAddonStyle(addon, fn, force, passive, ...) +function StyleVillain:SaveAddonStyle(addon, fn, force, passive, ...) local args,hasEvent = {},false; for i=1, select("#",...) do local event = select(i,...) @@ -114,40 +108,40 @@ function MOD:SaveAddonStyle(addon, fn, force, passive, ...) hasEvent = true; end; end; - if passive then MOD.PassiveAddons[addon] = true end; - if not MOD.AddOnEvents[addon] then - MOD.AddOnEvents[addon] = {}; - MOD.AddOnEvents[addon]["complete"] = false; + if passive then StyleVillain.PassiveAddons[addon] = true end; + if not StyleVillain.AddOnEvents[addon] then + StyleVillain.AddOnEvents[addon] = {}; + StyleVillain.AddOnEvents[addon]["complete"] = false; if hasEvent then - MOD.AddOnEvents[addon]["events"] = args; + StyleVillain.AddOnEvents[addon]["events"] = args; end end if force then fn() - MOD.AddOnQueue[addon] = nil + StyleVillain.AddOnQueue[addon] = nil else - MOD.AddOnQueue[addon] = fn + StyleVillain.AddOnQueue[addon] = fn end end; -function MOD:SaveBlizzardStyle(addon, fn, force, passive, preload) - if passive then MOD.PassiveAddons[addon] = true end; +function StyleVillain:SaveBlizzardStyle(addon, fn, force, passive, preload) + if passive then StyleVillain.PassiveAddons[addon] = true end; if force then if(preload and not IsAddOnLoaded(addon)) then LoadAddOn(addon) end fn() - MOD.BlizzardQueue[addon] = nil + StyleVillain.BlizzardQueue[addon] = nil else - MOD.BlizzardQueue[addon] = fn + StyleVillain.BlizzardQueue[addon] = fn end end; -function MOD:SaveCustomStyle(fn) - tinsert(MOD.CustomQueue, fn) +function StyleVillain:SaveCustomStyle(fn) + tinsert(StyleVillain.CustomQueue, fn) end; -function MOD:DefineEventFunction(event,addon) +function StyleVillain:DefineEventFunction(event,addon) if not self[event] then self[event] = function(self, event, ...) for addon,fn in pairs(self.AddOnQueue)do @@ -168,7 +162,7 @@ function MOD:DefineEventFunction(event,addon) end end -function MOD:SafeEventRemoval(addon,event) +function StyleVillain:SafeEventRemoval(addon,event) if not self.EventListeners[event] then return end; if not self.EventListeners[event][addon] then return end; self.EventListeners[event][addon] = nil; @@ -184,7 +178,7 @@ function MOD:SafeEventRemoval(addon,event) end end; -function MOD:RefreshAddonStyles() +function StyleVillain:RefreshAddonStyles() for addon,fn in pairs(self.AddOnQueue) do if(SuperVillain.db.SVStyle.addons[addon] == true) then if IsAddOnLoaded(addon) then @@ -194,7 +188,7 @@ function MOD:RefreshAddonStyles() end end -function MOD:LoadStyles() +function StyleVillain:LoadStyles() for addon,fn in pairs(self.BlizzardQueue) do if IsAddOnLoaded(addon) then fn() @@ -206,7 +200,7 @@ function MOD:LoadStyles() end; twipe(self.CustomQueue) for addon,fn in pairs(self.AddOnQueue)do - MOD:AppendAddonOption(addon) + StyleVillain:AppendAddonOption(addon) if IsAddOnLoaded(addon) then if(SuperVillain.db.SVStyle.addons[addon] == nil) then SuperVillain.db.SVStyle.addons[addon] = true @@ -226,7 +220,7 @@ function MOD:LoadStyles() self:RefreshAddonStyles() end -function MOD:ToggleStyle(addon, value) +function StyleVillain:ToggleStyle(addon, value) SuperVillain.db.SVStyle.addons[addon] = value end; --[[ @@ -234,12 +228,12 @@ end; OPTIONS CREATION ########################################################## ]]-- -function MOD:AppendAddonOption(addon) - MOD.OptionsCache.args[addon] = { +function StyleVillain:AppendAddonOption(addon) + StyleVillain.OptionsCache.args[addon] = { type = "toggle", name = addon, desc = L["Addon Styling"], - get=function(a)return MOD:IsAddonReady(a[#a])end, + get=function(a)return StyleVillain:IsAddonReady(a[#a])end, set=function(a,b)SuperVillain.db.SVStyle.addons[a[#a]] = b;SuperVillain:StaticPopup_Show("RL_CLIENT")end, disabled = function() if addon then @@ -251,7 +245,7 @@ function MOD:AppendAddonOption(addon) } end; -function MOD:SetConfigOptions() +function StyleVillain:SetConfigOptions() SuperVillain.Options.args.SVStyle={ type = "group", name = L["UI Styling"], @@ -557,7 +551,7 @@ function MOD:SetConfigOptions() } } }, - addons = MOD.OptionsCache + addons = StyleVillain.OptionsCache } } end; @@ -570,16 +564,16 @@ local RegisterAddonDocklets = function() if find(main, "Skada") or find(alternate, "Skada") then if DOCK:IsDockletReady("Skada") then - MOD:Docklet_Skada() + StyleVillain:Docklet_Skada() if find(alternate, "Skada") and SuperDockletExtra.FrameName ~= "SkadaHolder2" then DOCK.ExtraToolTip = "Skada"; DOCK:RegisterExtraDocklet("SkadaHolder2") - --MOD.DockedParent["Skada"] = SuperDockletExtra + --StyleVillain.DockedParent["Skada"] = SuperDockletExtra end if find(main, "Skada") and SuperDockletMain.FrameName ~= "SkadaHolder" then DOCK.MainToolTip = "Skada"; DOCK:RegisterMainDocklet("SkadaHolder") - --MOD.DockedParent["Skada"] = SuperDockletMain + --StyleVillain.DockedParent["Skada"] = SuperDockletMain end end; end; @@ -588,13 +582,13 @@ local RegisterAddonDocklets = function() if alternate == "Omen" and SuperDockletExtra.FrameName ~= "OmenAnchor" then DOCK.ExtraToolTip = "Omen"; DOCK:RegisterExtraDocklet("OmenAnchor") - MOD:Docklet_Omen(SuperDockletExtra) - MOD.DockedParent["Omen"] = SuperDockletExtra + StyleVillain:Docklet_Omen(SuperDockletExtra) + StyleVillain.DockedParent["Omen"] = SuperDockletExtra elseif SuperDockletMain.FrameName ~= "OmenAnchor" then DOCK.MainToolTip = "Omen"; DOCK:RegisterMainDocklet("OmenAnchor") - MOD:Docklet_Omen(SuperDockletMain) - MOD.DockedParent["Omen"] = SuperDockletMain + StyleVillain:Docklet_Omen(SuperDockletMain) + StyleVillain.DockedParent["Omen"] = SuperDockletMain end end; end; @@ -603,13 +597,13 @@ local RegisterAddonDocklets = function() if alternate == "Recount" and SuperDockletExtra.FrameName ~= "Recount_MainWindow" then DOCK.ExtraToolTip = "Recount"; DOCK:RegisterExtraDocklet("Recount_MainWindow") - MOD:Docklet_Recount(SuperDockletExtra) - MOD.DockedParent["Recount"] = SuperDockletExtra + StyleVillain:Docklet_Recount(SuperDockletExtra) + StyleVillain.DockedParent["Recount"] = SuperDockletExtra elseif SuperDockletMain.FrameName ~= "Recount_MainWindow" then DOCK.MainToolTip = "Recount"; DOCK:RegisterMainDocklet("Recount_MainWindow") - MOD:Docklet_Recount(SuperDockletMain) - MOD.DockedParent["Recount"] = SuperDockletMain + StyleVillain:Docklet_Recount(SuperDockletMain) + StyleVillain.DockedParent["Recount"] = SuperDockletMain end end; end; @@ -618,13 +612,13 @@ local RegisterAddonDocklets = function() if alternate == "TinyDPS" and SuperDockletExtra.FrameName ~= "tdpsFrame" then DOCK.ExtraToolTip = "TinyDPS"; DOCK:RegisterExtraDocklet("tdpsFrame") - MOD:Docklet_TinyDPS(SuperDockletExtra) - MOD.DockedParent["TinyDPS"] = SuperDockletExtra + StyleVillain:Docklet_TinyDPS(SuperDockletExtra) + StyleVillain.DockedParent["TinyDPS"] = SuperDockletExtra elseif SuperDockletMain.FrameName ~= "tdpsFrame" then DOCK.MainToolTip = "TinyDPS"; DOCK:RegisterMainDocklet("tdpsFrame") - MOD:Docklet_TinyDPS(SuperDockletMain) - MOD.DockedParent["TinyDPS"] = SuperDockletMain + StyleVillain:Docklet_TinyDPS(SuperDockletMain) + StyleVillain.DockedParent["TinyDPS"] = SuperDockletMain end end; end; @@ -633,13 +627,13 @@ local RegisterAddonDocklets = function() if alternate == "alDamageMeter" and SuperDockletExtra.FrameName ~= "alDamagerMeterFrame" then DOCK.ExtraToolTip = "alDamageMeter"; DOCK:RegisterExtraDocklet("alDamagerMeterFrame") - MOD:Docklet_alDamageMeter(SuperDockletExtra) - MOD.DockedParent["alDamageMeter"] = SuperDockletExtra + StyleVillain:Docklet_alDamageMeter(SuperDockletExtra) + StyleVillain.DockedParent["alDamageMeter"] = SuperDockletExtra elseif SuperDockletMain.FrameName ~= "alDamagerMeterFrame" then DOCK.MainToolTip = "alDamageMeter"; DOCK:RegisterMainDocklet("alDamagerMeterFrame") - MOD:Docklet_alDamageMeter(SuperDockletMain) - MOD.DockedParent["alDamageMeter"] = SuperDockletMain + StyleVillain:Docklet_alDamageMeter(SuperDockletMain) + StyleVillain.DockedParent["alDamageMeter"] = SuperDockletMain end end; end; @@ -649,7 +643,7 @@ end; BUILD FUNCTION ########################################################## ]]-- -function MOD:Load() +local function LoadStyleOMatic() local alert = CreateFrame('Frame', nil, UIParent); alert:SetFixedPanelTemplate('Transparent'); alert:SetSize(250, 70); @@ -676,14 +670,28 @@ function MOD:Load() alert.Accept:SetButtonTemplate(); alert.Close:SetButtonTemplate(); alert:Hide(); - self.Alert = alert; + StyleVillain.Alert = alert; - self:LoadStyles(); + StyleVillain:LoadStyles(); NewHook(DOCK, "ReloadDocklets", RegisterAddonDocklets); DOCK:ReloadDocklets(); - SuperVillain.DynamicOptions["SVStyle"] = {key="addons", data=MOD.OptionsCache}; - self:RegisterEvent('ADDON_LOADED'); + SuperVillain.DynamicOptions["SVStyle"] = {key = "addons", data = StyleVillain.OptionsCache}; + SVUIAddonEventHandler:RegisterEvent('ADDON_LOADED'); end -SuperVillain.Registry:NewPackage(MOD, "SVStyle", "post"); -SuperVillain.Registry:NewPlugin(AddOnName, MOD.SetConfigOptions); \ No newline at end of file +SuperVillain.Registry:NewScript(LoadStyleOMatic) +SuperVillain.Registry:NewPlugin(SVUIAddOnName, StyleVillain.SetConfigOptions) + +local Registry_OnEvent = function(self, event, addon) + if(event == "ADDON_LOADED") then + if StyleVillain.PassiveAddons[addon] then + StyleVillain.BlizzardQueue[addon]() + StyleVillain.BlizzardQueue[addon] = nil; + return + end; + if not SuperVillain.CoreEnabled or not StyleVillain.BlizzardQueue[addon] then return end; + StyleVillain.BlizzardQueue[addon]() + StyleVillain.BlizzardQueue[addon] = nil + end +end +SVUIAddonEventHandler:SetScript("OnEvent", Registry_OnEvent) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/achievement.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/achievement.lua index b0993d8..db954e1 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/achievement.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/achievement.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -67,16 +67,16 @@ local function AchievementStyle() AchievementFrameAchievementsContainer:SetPanelTemplate("Default") AchievementFrameAchievementsContainer.Panel:Point("TOPLEFT", 0, 2) AchievementFrameAchievementsContainer.Panel:Point("BOTTOMRIGHT", -3, -3) - MOD:ApplyCloseButtonStyle(AchievementFrameCloseButton, AchievementFrame.Panel) - MOD:ApplyDropdownStyle(AchievementFrameFilterDropDown) + STYLE:ApplyCloseButtonStyle(AchievementFrameCloseButton, AchievementFrame.Panel) + STYLE:ApplyDropdownStyle(AchievementFrameFilterDropDown) AchievementFrameFilterDropDown:Point("TOPRIGHT", AchievementFrame, "TOPRIGHT", -44, 5) - MOD:ApplyScrollStyle(AchievementFrameCategoriesContainerScrollBar, 5) - MOD:ApplyScrollStyle(AchievementFrameAchievementsContainerScrollBar, 5) - MOD:ApplyScrollStyle(AchievementFrameStatsContainerScrollBar, 5) - MOD:ApplyScrollStyle(AchievementFrameComparisonContainerScrollBar, 5) - MOD:ApplyScrollStyle(AchievementFrameComparisonStatsContainerScrollBar, 5) + STYLE:ApplyScrollStyle(AchievementFrameCategoriesContainerScrollBar, 5) + STYLE:ApplyScrollStyle(AchievementFrameAchievementsContainerScrollBar, 5) + STYLE:ApplyScrollStyle(AchievementFrameStatsContainerScrollBar, 5) + STYLE:ApplyScrollStyle(AchievementFrameComparisonContainerScrollBar, 5) + STYLE:ApplyScrollStyle(AchievementFrameComparisonStatsContainerScrollBar, 5) for f = 1, 3 do - MOD:ApplyTabStyle(_G["AchievementFrameTab"..f]) + STYLE:ApplyTabStyle(_G["AchievementFrameTab"..f]) _G["AchievementFrameTab"..f]:SetFrameLevel(_G["AchievementFrameTab"..f]:GetFrameLevel()+2) end; BarStyleHelper(AchievementFrameSummaryCategoriesStatusBar) @@ -101,7 +101,7 @@ local function AchievementStyle() end; for f = 1, 20 do local d = _G["AchievementFrameCategoriesContainerButton"..f] - MOD:ApplyLinkButtonStyle(d) + STYLE:ApplyLinkButtonStyle(d) end; k.containerStyleed = true end) @@ -334,4 +334,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_AchievementUI", AchievementStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle("Blizzard_AchievementUI", AchievementStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/alert.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/alert.lua index 221a03b..99ecfd1 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/alert.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/alert.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -40,7 +40,7 @@ local function AlertStyle() alert.buttons[b]:SetButtonTemplate() end; alert:Formula409() - MOD:ApplyAlertStyle(alert) + STYLE:ApplyAlertStyle(alert) alert.input:SetEditboxTemplate() alert.input.Panel:Point("TOPLEFT", -2, -4) alert.input.Panel:Point("BOTTOMRIGHT", 2, 4) @@ -324,4 +324,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(AlertStyle) \ No newline at end of file +STYLE:SaveCustomStyle(AlertStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/archeology.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/archeology.lua index 170396d..bee6a37 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/archeology.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/archeology.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## ARCHEOLOGYFRAME STYLER @@ -38,9 +38,9 @@ local function ArchaeologyStyle() ArchaeologyFrameArtifactPageSolveFrameSolveButton:SetButtonTemplate() ArchaeologyFrameArtifactPageBackButton:SetButtonTemplate() ArchaeologyFrameRaceFilter:SetFrameLevel(ArchaeologyFrameRaceFilter:GetFrameLevel()+2) - MOD:ApplyDropdownStyle(ArchaeologyFrameRaceFilter, 125) - MOD:ApplyPaginationStyle(ArchaeologyFrameCompletedPageNextPageButton) - MOD:ApplyPaginationStyle(ArchaeologyFrameCompletedPagePrevPageButton) + STYLE:ApplyDropdownStyle(ArchaeologyFrameRaceFilter, 125) + STYLE:ApplyPaginationStyle(ArchaeologyFrameCompletedPageNextPageButton) + STYLE:ApplyPaginationStyle(ArchaeologyFrameCompletedPagePrevPageButton) ArchaeologyFrameRankBar:Formula409() ArchaeologyFrameRankBar:SetStatusBarTexture([[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]]) ArchaeologyFrameRankBar:SetFrameLevel(ArchaeologyFrameRankBar:GetFrameLevel()+2) @@ -68,7 +68,7 @@ local function ArchaeologyStyle() ArchaeologyFrameArtifactPageIcon.backdrop:SetFrameLevel(ArchaeologyFrameArtifactPage:GetFrameLevel()) ArchaeologyFrameArtifactPageIcon:SetParent(ArchaeologyFrameArtifactPageIcon.backdrop) ArchaeologyFrameArtifactPageIcon:SetDrawLayer("OVERLAY") - MOD:ApplyCloseButtonStyle(ArchaeologyFrameCloseButton) + STYLE:ApplyCloseButtonStyle(ArchaeologyFrameCloseButton) ArcheologyDigsiteProgressBar:SetAllPoints(progressBarHolder) progressBarHolder:SetParent(ArcheologyDigsiteProgressBar) end @@ -77,4 +77,4 @@ end STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_ArchaeologyUI", ArchaeologyStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle("Blizzard_ArchaeologyUI", ArchaeologyStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/auctionhouse.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/auctionhouse.lua index 6cb5cd2..329d689 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/auctionhouse.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/auctionhouse.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -80,19 +80,19 @@ AUCTIONFRAME STYLER ]]-- local function AuctionStyle() if(SuperVillain.db.SVStyle.blizzard.enable ~= true or SuperVillain.db.SVStyle.blizzard.auctionhouse ~= true) then return end; - MOD:ApplyCloseButtonStyle(AuctionFrameCloseButton) - MOD:ApplyScrollStyle(AuctionsScrollFrameScrollBar) + STYLE:ApplyCloseButtonStyle(AuctionFrameCloseButton) + STYLE:ApplyScrollStyle(AuctionsScrollFrameScrollBar) AuctionFrame:Formula409(true) AuctionFrame:SetPanelTemplate("Halftone", false, 2) BrowseFilterScrollFrame:Formula409() BrowseScrollFrame:Formula409() AuctionsScrollFrame:Formula409() BidScrollFrame:Formula409() - MOD:ApplyDropdownStyle(BrowseDropDown) - MOD:ApplyDropdownStyle(PriceDropDown) - MOD:ApplyDropdownStyle(DurationDropDown) - MOD:ApplyScrollStyle(BrowseFilterScrollFrameScrollBar) - MOD:ApplyScrollStyle(BrowseScrollFrameScrollBar) + STYLE:ApplyDropdownStyle(BrowseDropDown) + STYLE:ApplyDropdownStyle(PriceDropDown) + STYLE:ApplyDropdownStyle(DurationDropDown) + STYLE:ApplyScrollStyle(BrowseFilterScrollFrameScrollBar) + STYLE:ApplyScrollStyle(BrowseScrollFrameScrollBar) IsUsableCheckButton:SetCheckboxTemplate(true) ShowOnPlayerCheckButton:SetCheckboxTemplate(true) SideDressUpFrame:Formula409(true) @@ -102,7 +102,7 @@ local function AuctionStyle() SideDressUpModel:SetFixedPanelTemplate("Comic") SideDressUpModel:SetPanelColor("special") SideDressUpModelResetButton:SetButtonTemplate() - MOD:ApplyCloseButtonStyle(SideDressUpModelCloseButton) + STYLE:ApplyCloseButtonStyle(SideDressUpModelCloseButton) AuctionProgressFrame:Formula409() AuctionProgressFrame:SetFixedPanelTemplate("Transparent", true) @@ -127,8 +127,8 @@ local function AuctionStyle() AuctionProgressBar:SetStatusBarTexture(SuperVillain.Media.bar.default) AuctionProgressBar:SetStatusBarColor(1, 1, 0) - MOD:ApplyPaginationStyle(BrowseNextPageButton) - MOD:ApplyPaginationStyle(BrowsePrevPageButton) + STYLE:ApplyPaginationStyle(BrowseNextPageButton) + STYLE:ApplyPaginationStyle(BrowsePrevPageButton) for _,button in pairs(AuctionBidButtons) do _G[button]:SetButtonTemplate() @@ -160,9 +160,9 @@ local function AuctionStyle() _G[frame.."Right"]:MUNG() end; - MOD:ApplyTabStyle(_G["AuctionFrameTab1"]) - MOD:ApplyTabStyle(_G["AuctionFrameTab2"]) - MOD:ApplyTabStyle(_G["AuctionFrameTab3"]) + STYLE:ApplyTabStyle(_G["AuctionFrameTab1"]) + STYLE:ApplyTabStyle(_G["AuctionFrameTab2"]) + STYLE:ApplyTabStyle(_G["AuctionFrameTab3"]) for h = 1, NUM_FILTERS_TO_DISPLAY do local i = _G["AuctionFilterButton"..h]i:Formula409() @@ -328,4 +328,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_AuctionUI", AuctionStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle("Blizzard_AuctionUI", AuctionStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/barbershop.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/barbershop.lua index 2659901..4063373 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/barbershop.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/barbershop.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## BARBERSHOP STYLER @@ -31,8 +31,8 @@ local function BarberShopStyle() for b = 1, 4 do local c = _G["BarberShopFrameSelector"..b] local d = _G["BarberShopFrameSelector"..b-1] - MOD:ApplyPaginationStyle(_G["BarberShopFrameSelector"..b.."Prev"]) - MOD:ApplyPaginationStyle(_G["BarberShopFrameSelector"..b.."Next"]) + STYLE:ApplyPaginationStyle(_G["BarberShopFrameSelector"..b.."Prev"]) + STYLE:ApplyPaginationStyle(_G["BarberShopFrameSelector"..b.."Next"]) if b ~= 1 then c:ClearAllPoints()c:Point("TOP", d, "BOTTOM", 0, -3) end; @@ -62,4 +62,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_BarbershopUI",BarberShopStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle("Blizzard_BarbershopUI",BarberShopStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/battlefield.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/battlefield.lua index a7fd892..3e71a7b 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/battlefield.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/battlefield.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## BATTLEFIELD STYLER @@ -34,7 +34,7 @@ local function BattlefieldStyle() BattlefieldMinimap:SetFrameStrata("LOW") BattlefieldMinimapCloseButton:ClearAllPoints() BattlefieldMinimapCloseButton:SetPoint("TOPRIGHT", -4, 0) - MOD:ApplyCloseButtonStyle(BattlefieldMinimapCloseButton) + STYLE:ApplyCloseButtonStyle(BattlefieldMinimapCloseButton) BattlefieldMinimapCloseButton:SetFrameStrata("MEDIUM") BattlefieldMinimap:EnableMouse(true) BattlefieldMinimap:SetMovable(true) @@ -89,4 +89,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_BattlefieldMinimap",BattlefieldStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle("Blizzard_BattlefieldMinimap",BattlefieldStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/blackmarket.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/blackmarket.lua index ad4447e..47780cb 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/blackmarket.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/blackmarket.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## BLACKMARKET STYLER @@ -37,8 +37,8 @@ local function BlackMarketStyle() BlackMarketFrame:SetPanelTemplate("Halftone") BlackMarketFrame.Inset:Formula409() BlackMarketFrame.Inset:SetFixedPanelTemplate("Inset") - MOD:ApplyCloseButtonStyle(BlackMarketFrame.CloseButton) - MOD:ApplyScrollStyle(BlackMarketScrollFrameScrollBar, 4) + STYLE:ApplyCloseButtonStyle(BlackMarketFrame.CloseButton) + STYLE:ApplyScrollStyle(BlackMarketScrollFrameScrollBar, 4) ChangeTab(BlackMarketFrame.ColumnName) ChangeTab(BlackMarketFrame.ColumnLevel) @@ -63,7 +63,7 @@ local function BlackMarketStyle() if not u.styled then u:Formula409() u:SetButtonTemplate() - MOD:ApplyLinkButtonStyle(u.Item) + STYLE:ApplyLinkButtonStyle(u.Item) u.styled = true end; if v <= t then @@ -75,7 +75,7 @@ local function BlackMarketStyle() end end) BlackMarketFrame.HotDeal:Formula409() - MOD:ApplyLinkButtonStyle(BlackMarketFrame.HotDeal.Item) + STYLE:ApplyLinkButtonStyle(BlackMarketFrame.HotDeal.Item) for b = 1, BlackMarketFrame:GetNumRegions()do local y = select(b, BlackMarketFrame:GetRegions()) if y and y:GetObjectType() == "FontString" and y:GetText() == BLACK_MARKET_TITLE then @@ -88,4 +88,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_BlackMarketUI",BlackMarketStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle("Blizzard_BlackMarketUI",BlackMarketStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/calendar.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/calendar.lua index 39dab66..20c48c5 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/calendar.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/calendar.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -37,10 +37,10 @@ local function CalendarStyle() end; _G["CalendarFrame"]:Formula409() CalendarFrame:SetPanelTemplate("Halftone") - MOD:ApplyCloseButtonStyle(CalendarCloseButton) + STYLE:ApplyCloseButtonStyle(CalendarCloseButton) CalendarCloseButton:Point("TOPRIGHT", CalendarFrame, "TOPRIGHT", -4, -4) - MOD:ApplyPaginationStyle(CalendarPrevMonthButton) - MOD:ApplyPaginationStyle(CalendarNextMonthButton) + STYLE:ApplyPaginationStyle(CalendarPrevMonthButton) + STYLE:ApplyPaginationStyle(CalendarNextMonthButton) do local d = CalendarFilterFrame; local e = CalendarFilterButton; @@ -56,7 +56,7 @@ local function CalendarStyle() f:Point("RIGHT", d, "RIGHT", -10, 3) end end) - MOD:ApplyPaginationStyle(e, true) + STYLE:ApplyPaginationStyle(e, true) d:SetPanelTemplate("Default") d.Panel:Point("TOPLEFT", 20, 2) d.Panel:Point("BOTTOMRIGHT", e, "BOTTOMRIGHT", 2, -2) @@ -92,15 +92,15 @@ local function CalendarStyle() CalendarCreateEventInviteList:SetFixedPanelTemplate("Default") CalendarCreateEventInviteEdit:SetEditboxTemplate() CalendarCreateEventTitleEdit:SetEditboxTemplate() - MOD:ApplyDropdownStyle(CalendarCreateEventTypeDropDown, 120) + STYLE:ApplyDropdownStyle(CalendarCreateEventTypeDropDown, 120) CalendarCreateEventDescriptionContainer:Formula409() CalendarCreateEventDescriptionContainer:SetFixedPanelTemplate("Default") - MOD:ApplyCloseButtonStyle(CalendarCreateEventCloseButton) + STYLE:ApplyCloseButtonStyle(CalendarCreateEventCloseButton) CalendarCreateEventLockEventCheck:SetCheckboxTemplate(true) - MOD:ApplyDropdownStyle(CalendarCreateEventHourDropDown, 68) - MOD:ApplyDropdownStyle(CalendarCreateEventMinuteDropDown, 68) - MOD:ApplyDropdownStyle(CalendarCreateEventAMPMDropDown, 68) - MOD:ApplyDropdownStyle(CalendarCreateEventRepeatOptionDropDown, 120) + STYLE:ApplyDropdownStyle(CalendarCreateEventHourDropDown, 68) + STYLE:ApplyDropdownStyle(CalendarCreateEventMinuteDropDown, 68) + STYLE:ApplyDropdownStyle(CalendarCreateEventAMPMDropDown, 68) + STYLE:ApplyDropdownStyle(CalendarCreateEventRepeatOptionDropDown, 120) CalendarCreateEventIcon:SetTexCoord(0.1, 0.9, 0.1, 0.9) hooksecurefunc(CalendarCreateEventIcon, "SetTexCoord", function(f, v, w, x, y) local z, A, B, C = 0.1, 0.9, 0.1, 0.9 @@ -125,7 +125,7 @@ local function CalendarStyle() CalendarTexturePickerFrame:Formula409() CalendarTexturePickerTitleFrame:Formula409() CalendarTexturePickerFrame:SetFixedPanelTemplate("Transparent", true) - MOD:ApplyScrollStyle(CalendarTexturePickerScrollBar) + STYLE:ApplyScrollStyle(CalendarTexturePickerScrollBar) CalendarTexturePickerAcceptButton:SetButtonTemplate() CalendarTexturePickerCancelButton:SetButtonTemplate() CalendarCreateEventInviteButton:SetButtonTemplate() @@ -133,21 +133,21 @@ local function CalendarStyle() CalendarMassInviteFrame:Formula409() CalendarMassInviteFrame:SetFixedPanelTemplate("Transparent", true) CalendarMassInviteTitleFrame:Formula409() - MOD:ApplyCloseButtonStyle(CalendarMassInviteCloseButton) + STYLE:ApplyCloseButtonStyle(CalendarMassInviteCloseButton) CalendarMassInviteGuildAcceptButton:SetButtonTemplate() - MOD:ApplyDropdownStyle(CalendarMassInviteGuildRankMenu, 130) + STYLE:ApplyDropdownStyle(CalendarMassInviteGuildRankMenu, 130) CalendarMassInviteGuildMinLevelEdit:SetEditboxTemplate() CalendarMassInviteGuildMaxLevelEdit:SetEditboxTemplate() CalendarViewRaidFrame:Formula409() CalendarViewRaidFrame:SetFixedPanelTemplate("Transparent", true) CalendarViewRaidFrame:Point("TOPLEFT", CalendarFrame, "TOPRIGHT", 3, -24) CalendarViewRaidTitleFrame:Formula409() - MOD:ApplyCloseButtonStyle(CalendarViewRaidCloseButton) + STYLE:ApplyCloseButtonStyle(CalendarViewRaidCloseButton) CalendarViewHolidayFrame:Formula409(true) CalendarViewHolidayFrame:SetFixedPanelTemplate("Transparent", true) CalendarViewHolidayFrame:Point("TOPLEFT", CalendarFrame, "TOPRIGHT", 3, -24) CalendarViewHolidayTitleFrame:Formula409() - MOD:ApplyCloseButtonStyle(CalendarViewHolidayCloseButton) + STYLE:ApplyCloseButtonStyle(CalendarViewHolidayCloseButton) CalendarViewEventFrame:Formula409() CalendarViewEventFrame:SetFixedPanelTemplate("Transparent", true) CalendarViewEventFrame:Point("TOPLEFT", CalendarFrame, "TOPRIGHT", 3, -24) @@ -157,23 +157,23 @@ local function CalendarStyle() CalendarViewEventInviteList:Formula409() CalendarViewEventInviteList:SetFixedPanelTemplate("Transparent", true) CalendarViewEventInviteListSection:Formula409() - MOD:ApplyCloseButtonStyle(CalendarViewEventCloseButton) - MOD:ApplyScrollStyle(CalendarViewEventInviteListScrollFrameScrollBar) + STYLE:ApplyCloseButtonStyle(CalendarViewEventCloseButton) + STYLE:ApplyScrollStyle(CalendarViewEventInviteListScrollFrameScrollBar) for _,btn in pairs(CalendarButtons)do _G[btn]:SetButtonTemplate() end; CalendarEventPickerFrame:Formula409() CalendarEventPickerTitleFrame:Formula409() CalendarEventPickerFrame:SetFixedPanelTemplate("Transparent", true) - MOD:ApplyScrollStyle(CalendarEventPickerScrollBar) + STYLE:ApplyScrollStyle(CalendarEventPickerScrollBar) CalendarEventPickerCloseButton:SetButtonTemplate() - MOD:ApplyScrollStyle(CalendarCreateEventDescriptionScrollFrameScrollBar) - MOD:ApplyScrollStyle(CalendarCreateEventInviteListScrollFrameScrollBar) - MOD:ApplyScrollStyle(CalendarViewEventDescriptionScrollFrameScrollBar) + STYLE:ApplyScrollStyle(CalendarCreateEventDescriptionScrollFrameScrollBar) + STYLE:ApplyScrollStyle(CalendarCreateEventInviteListScrollFrameScrollBar) + STYLE:ApplyScrollStyle(CalendarViewEventDescriptionScrollFrameScrollBar) end; --[[ ########################################################## STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_Calendar",CalendarStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle("Blizzard_Calendar",CalendarStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/challenges.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/challenges.lua index f7ca8b4..910e142 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/challenges.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/challenges.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## CHALLENGES UI STYLER @@ -55,4 +55,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_ChallengesUI",ChallengesFrameStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle("Blizzard_ChallengesUI",ChallengesFrameStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/character.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/character.lua index 819ab81..aab4126 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/character.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/character.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -181,11 +181,11 @@ local function CharacterFrameStyle() if SuperVillain.db.SVStyle.blizzard.enable ~= true or SuperVillain.db.SVStyle.blizzard.character ~= true then return end; - MOD:ApplyCloseButtonStyle(CharacterFrameCloseButton) - MOD:ApplyScrollStyle(CharacterStatsPaneScrollBar) - MOD:ApplyScrollStyle(ReputationListScrollFrameScrollBar) - MOD:ApplyScrollStyle(TokenFrameContainerScrollBar) - MOD:ApplyScrollStyle(GearManagerDialogPopupScrollFrameScrollBar) + STYLE:ApplyCloseButtonStyle(CharacterFrameCloseButton) + STYLE:ApplyScrollStyle(CharacterStatsPaneScrollBar) + STYLE:ApplyScrollStyle(ReputationListScrollFrameScrollBar) + STYLE:ApplyScrollStyle(TokenFrameContainerScrollBar) + STYLE:ApplyScrollStyle(GearManagerDialogPopupScrollFrameScrollBar) for _,slotName in pairs(CharacterSlotNames) do local charSlot = _G["Character"..slotName] @@ -211,7 +211,7 @@ local function CharacterFrameStyle() StyleCharacterSlots() CharacterFrameExpandButton:Size(CharacterFrameExpandButton:GetWidth() - 7, CharacterFrameExpandButton:GetHeight() - 7) - MOD:ApplyPaginationStyle(CharacterFrameExpandButton) + STYLE:ApplyPaginationStyle(CharacterFrameExpandButton) hooksecurefunc('CharacterFrame_Collapse', function() CharacterFrameExpandButton:SetNormalTexture(nil) @@ -233,8 +233,8 @@ local function CharacterFrameStyle() SquareButton_SetIcon(CharacterFrameExpandButton, 'LEFT') end; - MOD:ApplyCloseButtonStyle(ReputationDetailCloseButton) - MOD:ApplyCloseButtonStyle(TokenFramePopupCloseButton) + STYLE:ApplyCloseButtonStyle(ReputationDetailCloseButton) + STYLE:ApplyCloseButtonStyle(TokenFramePopupCloseButton) ReputationDetailAtWarCheckBox:SetCheckboxTemplate(true) ReputationDetailMainScreenCheckBox:SetCheckboxTemplate(true) ReputationDetailInactiveCheckBox:SetCheckboxTemplate(true) @@ -245,8 +245,8 @@ local function CharacterFrameStyle() EquipmentFlyoutFrame:HookScript("OnShow", EquipmentFlyout_OnShow) hooksecurefunc("EquipmentFlyout_Show", EquipmentFlyout_OnShow) CharacterFramePortrait:MUNG() - MOD:ApplyScrollStyle(_G["PaperDollTitlesPaneScrollBar"], 5) - MOD:ApplyScrollStyle(_G["PaperDollEquipmentManagerPaneScrollBar"], 5) + STYLE:ApplyScrollStyle(_G["PaperDollTitlesPaneScrollBar"], 5) + STYLE:ApplyScrollStyle(_G["PaperDollEquipmentManagerPaneScrollBar"], 5) for _,btn in pairs(CharFrameList)do _G[btn]:Formula409(true) end; @@ -326,7 +326,7 @@ local function CharacterFrameStyle() end end) for i = 1, 4 do - MOD:ApplyTabStyle(_G["CharacterFrameTab"..i]) + STYLE:ApplyTabStyle(_G["CharacterFrameTab"..i]) end; hooksecurefunc("PaperDollFrame_UpdateSidebarTabs", PaperDoll_UpdateTabs) for i = 1, 7 do @@ -370,4 +370,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(CharacterFrameStyle) \ No newline at end of file +STYLE:SaveCustomStyle(CharacterFrameStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/dressup.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/dressup.lua index 595b53b..d9b066f 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/dressup.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/dressup.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## DRESSUP STYLER @@ -40,7 +40,7 @@ local function DressUpStyle() DressUpModel:SetPanelColor("special") DressUpFrameResetButton:SetButtonTemplate() DressUpFrameCancelButton:SetButtonTemplate() - MOD:ApplyCloseButtonStyle(DressUpFrameCloseButton, bg.Panel) + STYLE:ApplyCloseButtonStyle(DressUpFrameCloseButton, bg.Panel) DressUpFrameResetButton:Point("RIGHT", DressUpFrameCancelButton, "LEFT", -2, 0) end; --[[ @@ -48,4 +48,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(DressUpStyle) \ No newline at end of file +STYLE:SaveCustomStyle(DressUpStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/encounterjournal.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/encounterjournal.lua index 032458d..1dc5fa3 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/encounterjournal.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/encounterjournal.lua @@ -14,22 +14,230 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## ENCOUNTERJOURNAL STYLER ########################################################## ]]-- +local PVP_LOST = [[Interface\WorldMap\Skull_64Red]] + +local function Tab_OnEnter(this) + this.backdrop:SetPanelColor("highlight") + this.backdrop:SetBackdropBorderColor(unpack(SuperVillain.Media.color.highlight)) +end + +local function Tab_OnLeave(this) + this.backdrop:SetPanelColor("dark") + this.backdrop:SetBackdropBorderColor(0,0,0,1) +end + +local function ChangeTabHelper(this, x, y) + --this:Formula409() + this:GetNormalTexture():SetTexCoord(0.1, 0.9, 0.1, 0.9) + this:GetNormalTexture():FillInner() + this.backdrop = CreateFrame("Frame", nil, this) + this.backdrop:FillInner(this) + local level = this:GetFrameLevel() + if(level > 0) then + this.backdrop:SetFrameLevel(level - 1) + else + this.backdrop:SetFrameLevel(0) + end + this.backdrop:SetPanelTemplate("Component", true) + this.backdrop:SetPanelColor("dark") + this:HookScript("OnEnter",Tab_OnEnter) + this:HookScript("OnLeave",Tab_OnLeave) + local a,b,c,d,e = this:GetPoint() + this:Point(a,b,c,x or 7,y or e) +end + +local function Outline(frame, noHighlight) + if(frame.Outlined) then return; end + local offset = noHighlight and 30 or 5 + local mod = noHighlight and 50 or 5 + + local panel = CreateFrame('Frame', nil, frame) + panel:Point('TOPLEFT', frame, 'TOPLEFT', 1, -1) + panel:Point('BOTTOMRIGHT', frame, 'BOTTOMRIGHT', -1, 1) + + --[[ UNDERLAY BORDER ]]-- + local borderLeft = panel:CreateTexture(nil, "BORDER") + borderLeft:SetTexture(0, 0, 0) + borderLeft:SetPoint("TOPLEFT") + borderLeft:SetPoint("BOTTOMLEFT") + borderLeft:SetWidth(offset) + + local borderRight = panel:CreateTexture(nil, "BORDER") + borderRight:SetTexture(0, 0, 0) + borderRight:SetPoint("TOPRIGHT") + borderRight:SetPoint("BOTTOMRIGHT") + borderRight:SetWidth(offset) + + local borderTop = panel:CreateTexture(nil, "BORDER") + borderTop:SetTexture(0, 0, 0) + borderTop:SetPoint("TOPLEFT") + borderTop:SetPoint("TOPRIGHT") + borderTop:SetHeight(mod) + + local borderBottom = panel:CreateTexture(nil, "BORDER") + borderBottom:SetTexture(0, 0, 0) + borderBottom:SetPoint("BOTTOMLEFT") + borderBottom:SetPoint("BOTTOMRIGHT") + borderBottom:SetHeight(mod) + + if(not noHighlight) then + local highlight = frame:CreateTexture(nil, "HIGHLIGHT") + highlight:SetTexture(0, 1, 1, 0.35) + highlight:SetAllPoints(panel) + end + + frame.Outlined = true +end + local function EncounterJournalStyle() if SuperVillain.db.SVStyle.blizzard.enable ~= true or SuperVillain.db.SVStyle.blizzard.encounterjournal ~= true then return end; EncounterJournal:Formula409(true) - EncounterJournal:SetPanelTemplate("Pattern") + EncounterJournalInstanceSelect:Formula409(true) + EncounterJournalNavBar:Formula409(true) + EncounterJournalNavBarOverlay:Formula409(true) + EncounterJournalNavBarHomeButton:Formula409(true) + EncounterJournalInset:Formula409(true) + + EncounterJournalEncounterFrame:Formula409(true) + EncounterJournalEncounterFrameInfo:Formula409(true) + EncounterJournalEncounterFrameInfoDifficulty:Formula409(true) + EncounterJournalEncounterFrameInfoLootScrollFrameFilterToggle:Formula409(true) + EncounterJournalEncounterFrameInfoBossesScrollFrame:Formula409(true) + EncounterJournalInstanceSelectDungeonTab:Formula409(true) + EncounterJournalInstanceSelectRaidTab:Formula409(true) + ChangeTabHelper(EncounterJournalEncounterFrameInfoBossTab) + ChangeTabHelper(EncounterJournalEncounterFrameInfoLootTab, 0, -10) + --EncounterJournalEncounterFrameInstanceFrame:Formula409(true) + + EncounterJournalSearchResults:Formula409(true) + + --EncounterJournal:SetPanelTemplate("Halftone") + EncounterJournal:SetPanelTemplate("Action") + EncounterJournal:SetPanelColor("dark") + EncounterJournalInset:SetFixedPanelTemplate("Inset") + + EncounterJournalInstanceSelectScrollFrameScrollChild:SetFixedPanelTemplate("Default") + EncounterJournalInstanceSelectScrollFrameScrollChild:SetPanelColor("dark") + -- EncounterJournalInstanceSelectScrollFrameinstance6 + -- EncounterJournalBossButton1 + EncounterJournalEncounterFrameInstanceFrame:SetFixedPanelTemplate("Inset") + + local comicHolder = CreateFrame('Frame', nil, EncounterJournal.encounter) + comicHolder:SetPoint("TOPLEFT", EncounterJournalEncounterFrameInfoBossesScrollFrame, "TOPLEFT", -20, 40) + comicHolder:SetPoint("BOTTOMRIGHT", EncounterJournalEncounterFrameInfoBossesScrollFrame, "BOTTOMRIGHT", 0, 0) + comicHolder:SetPanelTemplate("Comic") + comicHolder:SetPanelColor("dark") + EncounterJournal.encounter.info.encounterTitle:SetParent(comicHolder) + EncounterJournal.searchResults.TitleText:SetParent(comicHolder) + + EncounterJournalNavBarHomeButton:SetButtonTemplate() + EncounterJournalEncounterFrameInfoDifficulty:SetButtonTemplate() + EncounterJournalEncounterFrameInfoDifficulty:SetFrameLevel(EncounterJournalEncounterFrameInfoDifficulty:GetFrameLevel() + 10) + EncounterJournalEncounterFrameInfoLootScrollFrameFilterToggle:SetButtonTemplate() + EncounterJournalEncounterFrameInfoLootScrollFrameFilterToggle:SetFrameLevel(EncounterJournalEncounterFrameInfoLootScrollFrameFilterToggle:GetFrameLevel() + 10) + + EncounterJournalInstanceSelectDungeonTab:SetButtonTemplate() + EncounterJournalInstanceSelectRaidTab:SetButtonTemplate() + + STYLE:ApplyScrollbarStyle(EncounterJournalEncounterFrameInfoLootScrollBar) + + local bgParent = EncounterJournal.encounter.instance + local loreParent = EncounterJournal.encounter.instance.loreScroll + + -- local lorepanel = CreateFrame('Frame', nil, EncounterJournalEncounterFrame) + -- lorepanel:SetAllPoints(bgParent) + -- local blackout = lorepanel:CreateTexture(nil, "BACKGROUND") + -- blackout:SetAllPoints(lorepanel) + -- blackout:SetTexture(0,0,0) + -- local bigBorder = CreateFrame('Frame', nil, bgParent) + -- bigBorder:SetPoint("TOPLEFT", bgParent, "TOPLEFT", 0, 0) + -- bigBorder:SetPoint("BOTTOMRIGHT", bgParent, "BOTTOMRIGHT", 0, 66) + -- Outline(bigBorder, true) + + --bgParent.loreBG:SetTexCoord(0.07, 0.93, 0.07, 0.7) + bgParent.loreBG:SetPoint("TOPLEFT", bgParent, "TOPLEFT", 0, 0) + bgParent.loreBG:SetPoint("BOTTOMRIGHT", bgParent, "BOTTOMRIGHT", 0, 90) + + loreParent:SetPanelTemplate("Pattern", true, 1, 1, 5) + loreParent:SetPanelColor("dark") + loreParent.child.lore:SetTextColor(1, 1, 1) + EncounterJournal.encounter.infoFrame.description:SetTextColor(1, 1, 1) + + loreParent:SetFrameLevel(loreParent:GetFrameLevel() + 10) + --EncounterJournalSearchResults:SetFixedPanelTemplate("Comic") + + --EncounterJournalNavBarButton2:Formula409(true) + --EncounterJournalNavBarButton2:SetButtonTemplate() + --EncounterJournal_ListInstances + + local frame = EncounterJournal.instanceSelect.scroll.child + local index = 1 + local instanceButton = frame["instance"..index]; + while instanceButton do + Outline(instanceButton) + index = index + 1; + instanceButton = frame["instance"..index] + end + + hooksecurefunc("EncounterJournal_ListInstances", function() + local frame = EncounterJournal.instanceSelect.scroll.child + local index = 1 + local instanceButton = frame["instance"..index]; + while instanceButton do + Outline(instanceButton) + index = index + 1; + instanceButton = frame["instance"..index] + end + end) + + EncounterJournal.instanceSelect.raidsTab:GetFontString():SetTextColor(1, 1, 1); + hooksecurefunc("EncounterJournal_ToggleHeaders", function() + local usedHeaders = EncounterJournal.encounter.usedHeaders + for key,used in pairs(usedHeaders) do + if(not used.button.Panel) then + used:Formula409(true) + used.button:Formula409(true) + used.button:SetButtonTemplate() + end + used.description:SetTextColor(1, 1, 1) + used.button.portrait.icon:Hide() + end + end) + + hooksecurefunc("EncounterJournal_LootUpdate", function() + local scrollFrame = EncounterJournal.encounter.info.lootScroll; + local offset = HybridScrollFrame_GetOffset(scrollFrame); + local items = scrollFrame.buttons; + local item, index; + + local numLoot = EJ_GetNumLoot() + + for i = 1,#items do + item = items[i]; + index = offset + i; + if index <= numLoot then + item.icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) + if(not item.Panel) then + item:SetFixedPanelTemplate("Slot") + end + item.slot:SetTextColor(0.5, 1, 0) + item.armorType:SetTextColor(1, 1, 0) + item.boss:SetTextColor(0.7, 0.08, 0) + end + end + end) end; --[[ ########################################################## STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle('Blizzard_EncounterJournal',EncounterJournalStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle('Blizzard_EncounterJournal',EncounterJournalStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/friends.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/friends.lua index 0094806..29409bb 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/friends.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/friends.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -118,10 +118,10 @@ local function FriendsFrameStyle() if SuperVillain.db.SVStyle.blizzard.enable ~= true or SuperVillain.db.SVStyle.blizzard.friends ~= true then return end; - MOD:ApplyScrollStyle(FriendsFrameFriendsScrollFrameScrollBar, 5) - MOD:ApplyScrollStyle(WhoListScrollFrameScrollBar, 5) - MOD:ApplyScrollStyle(ChannelRosterScrollFrameScrollBar, 5) - MOD:ApplyScrollStyle(FriendsFriendsScrollFrameScrollBar) + STYLE:ApplyScrollStyle(FriendsFrameFriendsScrollFrameScrollBar, 5) + STYLE:ApplyScrollStyle(WhoListScrollFrameScrollBar, 5) + STYLE:ApplyScrollStyle(ChannelRosterScrollFrameScrollBar, 5) + STYLE:ApplyScrollStyle(FriendsFriendsScrollFrameScrollBar) FriendsFrameInset:Formula409() WhoFrameListInset:Formula409() WhoFrameEditBoxInset:Formula409() @@ -154,7 +154,7 @@ local function FriendsFrameStyle() end end; FriendsFrameStatusDropDown:SetPoint('TOPLEFT', FriendsTabHeader, 'TOPLEFT', 0, -27) - MOD:ApplyDropdownStyle(FriendsFrameStatusDropDown, 70) + STYLE:ApplyDropdownStyle(FriendsFrameStatusDropDown, 70) FriendsFrameBattlenetFrame:Formula409() FriendsFrameBattlenetFrame:SetHeight(22) FriendsFrameBattlenetFrame:SetPoint('TOPLEFT', FriendsFrameStatusDropDown, 'TOPRIGHT', 0, -1) @@ -179,7 +179,7 @@ local function FriendsFrameStyle() AddFriendFrame:SetFixedPanelTemplate("Transparent", true) ScrollOfResurrectionSelectionFrame:SetFixedPanelTemplate('Transparent') ScrollOfResurrectionSelectionFrameList:SetFixedPanelTemplate('Default') - MOD:ApplyScrollStyle(ScrollOfResurrectionSelectionFrameListScrollFrameScrollBar, 4) + STYLE:ApplyScrollStyle(ScrollOfResurrectionSelectionFrameListScrollFrameScrollBar, 4) ScrollOfResurrectionSelectionFrameTargetEditBox:SetEditboxTemplate() FriendsFrameBroadcastInput:SetPanelTemplate("Default") ChannelFrameDaughterFrameChannelName:SetPanelTemplate("Default") @@ -198,11 +198,11 @@ local function FriendsFrameStyle() end) ChannelFrameDaughterFrame:SetPanelTemplate("Transparent", true) FriendsFrame:SetPanelTemplate("Halftone") - MOD:ApplyCloseButtonStyle(ChannelFrameDaughterFrameDetailCloseButton, ChannelFrameDaughterFrame) - MOD:ApplyCloseButtonStyle(FriendsFrameCloseButton, FriendsFrame.Panel) - MOD:ApplyDropdownStyle(WhoFrameDropDown, 150) + STYLE:ApplyCloseButtonStyle(ChannelFrameDaughterFrameDetailCloseButton, ChannelFrameDaughterFrame) + STYLE:ApplyCloseButtonStyle(FriendsFrameCloseButton, FriendsFrame.Panel) + STYLE:ApplyDropdownStyle(WhoFrameDropDown, 150) for i = 1, 4 do - MOD:ApplyTabStyle(_G["FriendsFrameTab"..i]) + STYLE:ApplyTabStyle(_G["FriendsFrameTab"..i]) end; for i = 1, 3 do TabCustomHelper(_G["FriendsTabHeaderTab"..i]) @@ -216,7 +216,7 @@ local function FriendsFrameStyle() _G["FriendsFriendsCloseButton"]:SetButtonTemplate() FriendsFriendsList:SetEditboxTemplate() FriendsFriendsNoteFrame:SetEditboxTemplate() - MOD:ApplyDropdownStyle(FriendsFriendsFrameDropDown, 150) + STYLE:ApplyDropdownStyle(FriendsFriendsFrameDropDown, 150) BNConversationInviteDialog:Formula409() BNConversationInviteDialog:SetPanelTemplate('Transparent') BNConversationInviteDialogList:Formula409() @@ -239,9 +239,9 @@ local function FriendsFrameStyle() FriendsTabHeaderRecruitAFriendButtonIcon:FillInner() FriendsTabHeaderRecruitAFriendButton:Point('TOPRIGHT', FriendsTabHeaderSoRButton, 'TOPLEFT', -4, 0) FriendsFrameIgnoreScrollFrame:SetFixedPanelTemplate("Inset") - MOD:ApplyScrollStyle(FriendsFrameIgnoreScrollFrameScrollBar, 4) + STYLE:ApplyScrollStyle(FriendsFrameIgnoreScrollFrameScrollBar, 4) FriendsFramePendingScrollFrame:SetFixedPanelTemplate("Inset") - MOD:ApplyScrollStyle(FriendsFramePendingScrollFrameScrollBar, 4) + STYLE:ApplyScrollStyle(FriendsFramePendingScrollFrameScrollBar, 4) IgnoreListFrame:Formula409() PendingListFrame:Formula409() ScrollOfResurrectionFrame:Formula409() @@ -260,4 +260,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(FriendsFrameStyle) \ No newline at end of file +STYLE:SaveCustomStyle(FriendsFrameStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/gossip.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/gossip.lua index 38d1da4..dda3630 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/gossip.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/gossip.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## GOSSIP STYLER @@ -24,9 +24,9 @@ local function GossipStyle() if SuperVillain.db.SVStyle.blizzard.enable ~= true or SuperVillain.db.SVStyle.blizzard.gossip ~= true then return end; ItemTextFrame:Formula409(true) ItemTextScrollFrame:Formula409() - MOD:ApplyCloseButtonStyle(GossipFrameCloseButton) - MOD:ApplyPaginationStyle(ItemTextPrevPageButton) - MOD:ApplyPaginationStyle(ItemTextNextPageButton) + STYLE:ApplyCloseButtonStyle(GossipFrameCloseButton) + STYLE:ApplyPaginationStyle(ItemTextPrevPageButton) + STYLE:ApplyPaginationStyle(ItemTextNextPageButton) ItemTextPageText:SetTextColor(1, 1, 1) hooksecurefunc(ItemTextPageText, "SetTextColor", function(q, k, l, m) if k ~= 1 or l ~= 1 or m ~= 1 then @@ -35,10 +35,10 @@ local function GossipStyle() end) ItemTextFrame:SetPanelTemplate("Pattern") ItemTextFrameInset:MUNG() - MOD:ApplyScrollStyle(ItemTextScrollFrameScrollBar) - MOD:ApplyCloseButtonStyle(ItemTextFrameCloseButton) + STYLE:ApplyScrollStyle(ItemTextScrollFrameScrollBar) + STYLE:ApplyCloseButtonStyle(ItemTextFrameCloseButton) local r = {"GossipFrameGreetingPanel", "GossipFrame", "GossipFrameInset", "GossipGreetingScrollFrame"} - MOD:ApplyScrollStyle(GossipGreetingScrollFrameScrollBar, 5) + STYLE:ApplyScrollStyle(GossipGreetingScrollFrameScrollBar, 5) for s, t in pairs(r)do _G[t]:Formula409() end; @@ -52,7 +52,7 @@ local function GossipStyle() _G["GossipFramePortrait"]:MUNG() _G["GossipFrameGreetingGoodbyeButton"]:Formula409() _G["GossipFrameGreetingGoodbyeButton"]:SetButtonTemplate() - MOD:ApplyCloseButtonStyle(GossipFrameCloseButton, GossipFrame.Panel) + STYLE:ApplyCloseButtonStyle(GossipFrameCloseButton, GossipFrame.Panel) NPCFriendshipStatusBar:Formula409() NPCFriendshipStatusBar:SetStatusBarTexture([[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]]) NPCFriendshipStatusBar:SetPanelTemplate("Default") @@ -62,4 +62,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(GossipStyle) \ No newline at end of file +STYLE:SaveCustomStyle(GossipStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/guild.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/guild.lua index b124f7e..e61a90b 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/guild.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/guild.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -167,11 +167,11 @@ local function GuildBankStyle() GuildBankFrame:SetPanelTemplate("Halftone") GuildBankEmblemFrame:Formula409(true) GuildBankMoneyFrameBackground:MUNG() - MOD:ApplyScrollStyle(GuildBankPopupScrollFrameScrollBar) + STYLE:ApplyScrollStyle(GuildBankPopupScrollFrameScrollBar) for b = 1, GuildBankFrame:GetNumChildren()do local c = select(b, GuildBankFrame:GetChildren()) if c.GetPushedTexture and c:GetPushedTexture() and not c:GetName() then - MOD:ApplyCloseButtonStyle(c) + STYLE:ApplyCloseButtonStyle(c) end end; GuildBankFrameDepositButton:SetButtonTemplate() @@ -209,7 +209,7 @@ local function GuildBankStyle() texture:SetTexCoord(0.1, 0.9, 0.1, 0.9) end; for b = 1, 4 do - MOD:ApplyTabStyle(_G["GuildBankFrameTab"..b]) + STYLE:ApplyTabStyle(_G["GuildBankFrameTab"..b]) end; hooksecurefunc('GuildBankFrame_Update', function() if GuildBankFrame.mode ~= "bank" then @@ -261,8 +261,8 @@ local function GuildBankStyle() icon:FillInner() icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) end; - MOD:ApplyScrollStyle(GuildBankTransactionsScrollFrameScrollBar) - MOD:ApplyScrollStyle(GuildBankInfoScrollFrameScrollBar) + STYLE:ApplyScrollStyle(GuildBankTransactionsScrollFrameScrollBar) + STYLE:ApplyScrollStyle(GuildBankInfoScrollFrameScrollBar) end; local function GuildFrameStyle() @@ -272,8 +272,8 @@ local function GuildFrameStyle() GuildFrame:Formula409(true) GuildFrame:SetPanelTemplate("Halftone") GuildLevelFrame:MUNG() - MOD:ApplyCloseButtonStyle(GuildMemberDetailCloseButton) - MOD:ApplyCloseButtonStyle(GuildFrameCloseButton) + STYLE:ApplyCloseButtonStyle(GuildMemberDetailCloseButton) + STYLE:ApplyCloseButtonStyle(GuildFrameCloseButton) GuildRewardsFrameVisitText:ClearAllPoints() GuildRewardsFrameVisitText:SetPoint("TOP", GuildRewardsFrame, "TOP", 0, 30) for s, y in pairs(GuildFrameList)do @@ -297,14 +297,14 @@ local function GuildFrameStyle() GuildRecruitmentHealerButton.checkButton:SetCheckboxTemplate(true) GuildRecruitmentDamagerButton.checkButton:SetCheckboxTemplate(true) for b = 1, 5 do - MOD:ApplyTabStyle(_G["GuildFrameTab"..b]) + STYLE:ApplyTabStyle(_G["GuildFrameTab"..b]) if b == 1 then _G["GuildFrameTab"..b]:Point("TOPLEFT", GuildFrame, "BOTTOMLEFT", -10, 3) end; end; GuildXPFrame:ClearAllPoints() GuildXPFrame:Point("TOP", GuildFrame, "TOP", 0, -40) - MOD:ApplyScrollStyle(GuildPerksContainerScrollBar, 4) + STYLE:ApplyScrollStyle(GuildPerksContainerScrollBar, 4) GuildNewPerksFrame:SetFixedPanelTemplate("Pattern") GuildFactionBar:Formula409() GuildFactionBar.progress:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]]) @@ -341,12 +341,12 @@ local function GuildFrameStyle() end end; GuildRosterContainer:SetFixedPanelTemplate("Pattern") - MOD:ApplyScrollStyle(GuildRosterContainerScrollBar, 5) + STYLE:ApplyScrollStyle(GuildRosterContainerScrollBar, 5) GuildRosterShowOfflineButton:SetCheckboxTemplate(true) for b = 1, 4 do _G["GuildRosterColumnButton"..b]:Formula409(true) end; - MOD:ApplyDropdownStyle(GuildRosterViewDropdown, 200) + STYLE:ApplyDropdownStyle(GuildRosterViewDropdown, 200) for b = 1, 14 do _G["GuildRosterContainerButton"..b.."HeaderButton"]:SetButtonTemplate() end; @@ -354,7 +354,7 @@ local function GuildFrameStyle() GuildMemberNoteBackground:SetFixedPanelTemplate("Default") GuildMemberOfficerNoteBackground:SetFixedPanelTemplate("Default") GuildMemberRankDropdown:SetFrameLevel(GuildMemberRankDropdown:GetFrameLevel()+5) - MOD:ApplyDropdownStyle(GuildMemberRankDropdown, 175) + STYLE:ApplyDropdownStyle(GuildMemberRankDropdown, 175) GuildNewsFrame:Formula409() GuildNewsContainer:SetFixedPanelTemplate("Pattern") for b = 1, 17 do @@ -364,13 +364,13 @@ local function GuildFrameStyle() end; GuildNewsFiltersFrame:Formula409() GuildNewsFiltersFrame:SetFixedPanelTemplate("Transparent", true) - MOD:ApplyCloseButtonStyle(GuildNewsFiltersFrameCloseButton) + STYLE:ApplyCloseButtonStyle(GuildNewsFiltersFrameCloseButton) for b = 1, 7 do _G["GuildNewsFilterButton"..b]:SetCheckboxTemplate(true) end; GuildNewsFiltersFrame:Point("TOPLEFT", GuildFrame, "TOPRIGHT", 4, -20) - MOD:ApplyScrollStyle(GuildNewsContainerScrollBar, 4) - MOD:ApplyScrollStyle(GuildInfoDetailsFrameScrollBar, 4) + STYLE:ApplyScrollStyle(GuildNewsContainerScrollBar, 4) + STYLE:ApplyScrollStyle(GuildInfoDetailsFrameScrollBar, 4) for b = 1, 3 do _G["GuildInfoFrameTab"..b]:Formula409() end; @@ -391,28 +391,28 @@ local function GuildFrameStyle() C:Point("BOTTOMRIGHT", GuildInfoFrameInfo, "BOTTOMRIGHT", 0, 3) GuildRecruitmentCommentInputFrame:SetFixedPanelTemplate("Default") GuildTextEditFrame:SetFixedPanelTemplate("Transparent", true) - MOD:ApplyScrollStyle(GuildTextEditScrollFrameScrollBar, 5) + STYLE:ApplyScrollStyle(GuildTextEditScrollFrameScrollBar, 5) GuildTextEditContainer:SetFixedPanelTemplate("Default") for b = 1, GuildTextEditFrame:GetNumChildren()do local c = select(b, GuildTextEditFrame:GetChildren()) if c:GetName() == "GuildTextEditFrameCloseButton"and c:GetWidth() < 33 then - MOD:ApplyCloseButtonStyle(c) + STYLE:ApplyCloseButtonStyle(c) elseif c:GetName() == "GuildTextEditFrameCloseButton" then c:SetButtonTemplate() end end; - MOD:ApplyScrollStyle(GuildLogScrollFrameScrollBar, 4) + STYLE:ApplyScrollStyle(GuildLogScrollFrameScrollBar, 4) GuildLogFrame:SetFixedPanelTemplate("Transparent", true) for b = 1, GuildLogFrame:GetNumChildren()do local c = select(b, GuildLogFrame:GetChildren()) if c:GetName() == "GuildLogFrameCloseButton"and c:GetWidth() < 33 then - MOD:ApplyCloseButtonStyle(c) + STYLE:ApplyCloseButtonStyle(c) elseif c:GetName() == "GuildLogFrameCloseButton" then c:SetButtonTemplate() end end; GuildRewardsFrame:SetFixedPanelTemplate("Pattern") - MOD:ApplyScrollStyle(GuildRewardsContainerScrollBar, 5) + STYLE:ApplyScrollStyle(GuildRewardsContainerScrollBar, 5) for b = 1, 8 do local button = _G["GuildRewardsContainerButton"..b] button:Formula409() @@ -448,13 +448,13 @@ local function GuildControlStyle() GuildControlUI:SetFixedPanelTemplate("Halftone") GuildControlUIRankBankFrameInset:Formula409() GuildControlUIRankBankFrameInsetScrollFrame:Formula409() - MOD:ApplyScrollStyle(GuildControlUIRankBankFrameInsetScrollFrameScrollBar) + STYLE:ApplyScrollStyle(GuildControlUIRankBankFrameInsetScrollFrameScrollBar) hooksecurefunc("GuildControlUI_RankOrder_Update",RankOrder_OnUpdate) GuildControlUIRankOrderFrameNewButton:HookScript("OnClick",function() SuperVillain:ExecuteTimer(1,RankOrder_OnUpdate) end) - MOD:ApplyDropdownStyle(GuildControlUINavigationDropDown) - MOD:ApplyDropdownStyle(GuildControlUIRankSettingsFrameRankDropDown,180) + STYLE:ApplyDropdownStyle(GuildControlUINavigationDropDown) + STYLE:ApplyDropdownStyle(GuildControlUIRankSettingsFrameRankDropDown,180) GuildControlUINavigationDropDownButton:Width(20) GuildControlUIRankSettingsFrameRankDropDownButton:Width(20) for b=1,NUM_RANK_FLAGS do @@ -492,7 +492,7 @@ local function GuildControlStyle() end; Z=true end) - MOD:ApplyDropdownStyle(GuildControlUIRankBankFrameRankDropDown,180) + STYLE:ApplyDropdownStyle(GuildControlUIRankBankFrameRankDropDown,180) GuildControlUIRankBankFrameRankDropDownButton:Width(20) end; @@ -509,7 +509,7 @@ local function GuildRegistrarStyle() GuildRegistrarFrameGoodbyeButton:SetButtonTemplate() GuildRegistrarFrameCancelButton:SetButtonTemplate() GuildRegistrarFramePurchaseButton:SetButtonTemplate() - MOD:ApplyCloseButtonStyle(GuildRegistrarFrameCloseButton) + STYLE:ApplyCloseButtonStyle(GuildRegistrarFrameCloseButton) GuildRegistrarFrameEditBox:SetEditboxTemplate() for b = 1, GuildRegistrarFrameEditBox:GetNumRegions()do local a2 = select(b, GuildRegistrarFrameEditBox:GetRegions()) @@ -540,10 +540,10 @@ local function LFGuildFrameStyle() LookingForGuildFrame:SetPanelTemplate("Action") LookingForGuildBrowseButton_LeftSeparator:MUNG() LookingForGuildRequestButton_RightSeparator:MUNG() - MOD:ApplyScrollStyle(LookingForGuildBrowseFrameContainerScrollBar) + STYLE:ApplyScrollStyle(LookingForGuildBrowseFrameContainerScrollBar) LookingForGuildBrowseButton:SetButtonTemplate() LookingForGuildRequestButton:SetButtonTemplate() - MOD:ApplyCloseButtonStyle(LookingForGuildFrameCloseButton) + STYLE:ApplyCloseButtonStyle(LookingForGuildFrameCloseButton) LookingForGuildCommentInputFrame:SetPanelTemplate("Default") LookingForGuildCommentInputFrame:Formula409(false) for u = 1, 5 do @@ -554,7 +554,7 @@ local function LFGuildFrameStyle() end; for u = 1, 3 do local tab = _G["LookingForGuildFrameTab"..u] - MOD:ApplyTabStyle(tab) + STYLE:ApplyTabStyle(tab) tab:SetFrameStrata("HIGH") tab:SetFrameLevel(99) end; @@ -570,8 +570,8 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_GuildBankUI",GuildBankStyle) -MOD:SaveBlizzardStyle("Blizzard_GuildUI",GuildFrameStyle) -MOD:SaveBlizzardStyle("Blizzard_GuildControlUI",GuildControlStyle) -MOD:SaveCustomStyle(GuildRegistrarStyle) -MOD:SaveBlizzardStyle("Blizzard_LookingForGuildUI",LFGuildFrameStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle("Blizzard_GuildBankUI",GuildBankStyle) +STYLE:SaveBlizzardStyle("Blizzard_GuildUI",GuildFrameStyle) +STYLE:SaveBlizzardStyle("Blizzard_GuildControlUI",GuildControlStyle) +STYLE:SaveCustomStyle(GuildRegistrarStyle) +STYLE:SaveBlizzardStyle("Blizzard_LookingForGuildUI",LFGuildFrameStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/help.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/help.lua index a1841f1..2bee717 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/help.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/help.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -78,7 +78,7 @@ local function HelpFrameStyle() e:Formula409() end end; - MOD:ApplyScrollStyle(HelpFrameReportBugScrollFrameScrollBar) + STYLE:ApplyScrollStyle(HelpFrameReportBugScrollFrameScrollBar) HelpFrameSubmitSuggestionScrollFrame:Formula409() HelpFrameSubmitSuggestionScrollFrame:SetPanelTemplate("Default") HelpFrameSubmitSuggestionScrollFrame.Panel:Point("TOPLEFT", -4, 4) @@ -89,7 +89,7 @@ local function HelpFrameStyle() e:Formula409() end end; - MOD:ApplyScrollStyle(HelpFrameSubmitSuggestionScrollFrameScrollBar) + STYLE:ApplyScrollStyle(HelpFrameSubmitSuggestionScrollFrameScrollBar) HelpFrameTicketScrollFrame:Formula409() HelpFrameTicketScrollFrame:SetPanelTemplate("Default") HelpFrameTicketScrollFrame.Panel:Point("TOPLEFT", -4, 4) @@ -100,7 +100,7 @@ local function HelpFrameStyle() e:Formula409() end end; - MOD:ApplyScrollStyle(HelpFrameKnowledgebaseScrollFrame2ScrollBar) + STYLE:ApplyScrollStyle(HelpFrameKnowledgebaseScrollFrame2ScrollBar) for d = 1, #HelpFrameButtonList do _G[HelpFrameButtonList[d]]:Formula409(true) _G[HelpFrameButtonList[d]]:SetButtonTemplate() @@ -129,10 +129,10 @@ local function HelpFrameStyle() HelpFrame:Formula409(true) HelpFrame:SetPanelTemplate("Halftone") HelpFrameKnowledgebaseSearchBox:SetEditboxTemplate() - MOD:ApplyScrollStyle(HelpFrameKnowledgebaseScrollFrameScrollBar, 5) - MOD:ApplyScrollStyle(HelpFrameTicketScrollFrameScrollBar, 4) - MOD:ApplyCloseButtonStyle(HelpFrameCloseButton, HelpFrame.Panel) - MOD:ApplyCloseButtonStyle(HelpFrameKnowledgebaseErrorFrameCloseButton, HelpFrameKnowledgebaseErrorFrame.Panel) + STYLE:ApplyScrollStyle(HelpFrameKnowledgebaseScrollFrameScrollBar, 5) + STYLE:ApplyScrollStyle(HelpFrameTicketScrollFrameScrollBar, 4) + STYLE:ApplyCloseButtonStyle(HelpFrameCloseButton, HelpFrame.Panel) + STYLE:ApplyCloseButtonStyle(HelpFrameKnowledgebaseErrorFrameCloseButton, HelpFrameKnowledgebaseErrorFrame.Panel) HelpFrameCharacterStuckHearthstone:SetButtonTemplate() HelpFrameCharacterStuckHearthstone:SetFixedPanelTemplate("Default") HelpFrameCharacterStuckHearthstone.IconTexture:FillInner() @@ -164,4 +164,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(HelpFrameStyle) \ No newline at end of file +STYLE:SaveCustomStyle(HelpFrameStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/inspect.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/inspect.lua index e3c231b..58da4cb 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/inspect.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/inspect.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -52,9 +52,9 @@ local function InspectStyle() InspectFrame:Formula409(true) InspectFrameInset:Formula409(true) InspectFrame:SetPanelTemplate('Action') - MOD:ApplyCloseButtonStyle(InspectFrameCloseButton) + STYLE:ApplyCloseButtonStyle(InspectFrameCloseButton) for d = 1, 4 do - MOD:ApplyTabStyle(_G["InspectFrameTab"..d]) + STYLE:ApplyTabStyle(_G["InspectFrameTab"..d]) end; InspectModelFrameBorderTopLeft:MUNG() InspectModelFrameBorderTopRight:MUNG() @@ -95,4 +95,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_InspectUI",InspectStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle("Blizzard_InspectUI",InspectStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/itemsocketing.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/itemsocketing.lua index 242029f..2436a1f 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/itemsocketing.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/itemsocketing.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## ITEMSOCKETING STYLER @@ -27,7 +27,7 @@ local function ItemSocketStyle() ItemSocketingFrameInset:MUNG() ItemSocketingScrollFrame:Formula409() ItemSocketingScrollFrame:SetPanelTemplate("Inset", true) - MOD:ApplyScrollStyle(ItemSocketingScrollFrameScrollBar, 2) + STYLE:ApplyScrollStyle(ItemSocketingScrollFrameScrollBar, 2) for j = 1, MAX_NUM_SOCKETS do local i = _G[("ItemSocketingSocket%d"):format(j)]; local C = _G[("ItemSocketingSocket%dBracketFrame"):format(j)]; @@ -55,11 +55,11 @@ local function ItemSocketStyle() ItemSocketingSocketButton:ClearAllPoints() ItemSocketingSocketButton:Point("BOTTOMRIGHT", ItemSocketingFrame, "BOTTOMRIGHT", -5, 5) ItemSocketingSocketButton:SetButtonTemplate() - MOD:ApplyCloseButtonStyle(ItemSocketingFrameCloseButton) + STYLE:ApplyCloseButtonStyle(ItemSocketingFrameCloseButton) end; --[[ ########################################################## STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_ItemSocketingUI",ItemSocketStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle("Blizzard_ItemSocketingUI",ItemSocketStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/itemupgrade.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/itemupgrade.lua index fe2ce44..250dd27 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/itemupgrade.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/itemupgrade.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## ITEMUPGRADE UI STYLER @@ -26,7 +26,7 @@ local function ItemUpgradeStyle() end; ItemUpgradeFrame:Formula409() ItemUpgradeFrame:SetPanelTemplate("Action") - MOD:ApplyCloseButtonStyle(ItemUpgradeFrameCloseButton) + STYLE:ApplyCloseButtonStyle(ItemUpgradeFrameCloseButton) ItemUpgradeFrameUpgradeButton:SetButtonTemplate() ItemUpgradeFrame.ItemButton:Formula409() ItemUpgradeFrame.ItemButton:SetSlotTemplate(true) @@ -48,4 +48,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_ItemUpgradeUI",ItemUpgradeStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle("Blizzard_ItemUpgradeUI",ItemUpgradeStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/keybinding.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/keybinding.lua index b9fc501..85fafa8 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/keybinding.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/keybinding.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## KEYBINDING STYLER @@ -26,7 +26,7 @@ local function BindingStyle() for l, m in pairs(buttons)do _G[m]:Formula409()_G[m]:SetFixedPanelTemplate("Default") end; - MOD:ApplyScrollStyle(KeyBindingFrameScrollFrameScrollBar) + STYLE:ApplyScrollStyle(KeyBindingFrameScrollFrameScrollBar) KeyBindingFrameCharacterButton:SetCheckboxTemplate(true) KeyBindingFrameHeaderText:ClearAllPoints() KeyBindingFrameHeaderText:Point("TOP", KeyBindingFrame, "TOP", 0, -4) @@ -49,4 +49,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_BindingUI",BindingStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle("Blizzard_BindingUI",BindingStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/lfd.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/lfd.lua index 749b6ba..a44f755 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/lfd.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/lfd.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -123,7 +123,7 @@ local function LFDFrameStyle() LFDQueueFramePartyBackfillNoBackfillButton:SetButtonTemplate() LFDQueueFrameRandomScrollFrameChildFrameBonusRepFrame.ChooseButton:SetButtonTemplate() ScenarioQueueFrameRandomScrollFrameChildFrameBonusRepFrame.ChooseButton:SetButtonTemplate() - MOD:ApplyScrollStyle(ScenarioQueueFrameRandomScrollFrameScrollBar) + STYLE:ApplyScrollStyle(ScenarioQueueFrameRandomScrollFrameScrollBar) GroupFinderFrameGroupButton1.icon:SetTexture("Interface\\Icons\\INV_Helmet_08") GroupFinderFrameGroupButton2.icon:SetTexture("Interface\\Icons\\inv_helmet_06") GroupFinderFrameGroupButton3.icon:SetTexture("Interface\\Icons\\Icon_Scenarios") @@ -131,7 +131,7 @@ local function LFDFrameStyle() LFGDungeonReadyDialogBackground:MUNG() LFGDungeonReadyDialogEnterDungeonButton:SetButtonTemplate() LFGDungeonReadyDialogLeaveQueueButton:SetButtonTemplate() - MOD:ApplyCloseButtonStyle(LFGDungeonReadyDialogCloseButton) + STYLE:ApplyCloseButtonStyle(LFGDungeonReadyDialogCloseButton) LFGDungeonReadyDialog:Formula409() LFGDungeonReadyDialog:SetPanelTemplate("Pattern", true, 2, 4, 4) LFGDungeonReadyStatus:Formula409() @@ -164,7 +164,7 @@ local function LFDFrameStyle() LFDQueueFrameRoleButtonHealer.shortageBorder:MUNG() LFGDungeonReadyDialog.filigree:SetAlpha(0) LFGDungeonReadyDialog.bottomArt:SetAlpha(0) - MOD:ApplyCloseButtonStyle(LFGDungeonReadyStatusCloseButton) + STYLE:ApplyCloseButtonStyle(LFGDungeonReadyStatusCloseButton) for _,name in pairs(LFDFrameList) do local frame = _G[name]; if frame then @@ -221,10 +221,10 @@ local function LFDFrameStyle() v.icon:SetParent(v.border) end; for u = 1, 2 do - MOD:ApplyTabStyle(_G['PVEFrameTab'..u]) + STYLE:ApplyTabStyle(_G['PVEFrameTab'..u]) end; PVEFrameTab1:SetPoint('BOTTOMLEFT', PVEFrame, 'BOTTOMLEFT', 19, -31) - MOD:ApplyCloseButtonStyle(PVEFrameCloseButton) + STYLE:ApplyCloseButtonStyle(PVEFrameCloseButton) LFDParentFrame:Formula409() LFDQueueFrameFindGroupButton:Formula409() LFDParentFrameInset:Formula409() @@ -246,13 +246,13 @@ local function LFDFrameStyle() local v = _G["LFRQueueFrameSpecificListButton"..u].enableButton; v:SetCheckboxTemplate(true) end; - MOD:ApplyDropdownStyle(LFDQueueFrameTypeDropDown) + STYLE:ApplyDropdownStyle(LFDQueueFrameTypeDropDown) FlexRaidFrameScrollFrame:Formula409() FlexRaidFrameBottomInset:Formula409() hooksecurefunc("FlexRaidFrame_Update", function() FlexRaidFrame.ScrollFrame.Background:SetTexture(nil) end) - MOD:ApplyDropdownStyle(FlexRaidFrameSelectionDropDown) + STYLE:ApplyDropdownStyle(FlexRaidFrameSelectionDropDown) FlexRaidFrameStartRaidButton:SetButtonTemplate() RaidFinderFrame:Formula409() RaidFinderFrameBottomInset:Formula409() @@ -260,7 +260,7 @@ local function LFDFrameStyle() RaidFinderFrameBottomInsetBg:Hide() RaidFinderFrameBtnCornerRight:Hide() RaidFinderFrameButtonBottomBorder:Hide() - MOD:ApplyDropdownStyle(RaidFinderQueueFrameSelectionDropDown) + STYLE:ApplyDropdownStyle(RaidFinderQueueFrameSelectionDropDown) RaidFinderFrameFindRaidButton:Formula409() RaidFinderFrameFindRaidButton:SetButtonTemplate() RaidFinderQueueFrame:Formula409() @@ -297,7 +297,7 @@ local function LFDFrameStyle() hooksecurefunc("ScenarioQueueFrameRandom_UpdateFrame", ScenarioQueueRandom_OnUpdate) ScenarioQueueFrameFindGroupButton:Formula409() ScenarioQueueFrameFindGroupButton:SetButtonTemplate() - MOD:ApplyDropdownStyle(ScenarioQueueFrameTypeDropDown) + STYLE:ApplyDropdownStyle(ScenarioQueueFrameTypeDropDown) LFRBrowseFrameRoleInset:DisableDrawLayer("BORDER") RaidBrowserFrameBg:Hide() LFRQueueFrameSpecificListScrollFrameScrollBackgroundTopLeft:Hide() @@ -309,15 +309,15 @@ local function LFDFrameStyle() end end; RaidBrowserFrame:SetPanelTemplate('Pattern') - MOD:ApplyCloseButtonStyle(RaidBrowserFrameCloseButton) + STYLE:ApplyCloseButtonStyle(RaidBrowserFrameCloseButton) LFRQueueFrameFindGroupButton:SetButtonTemplate() LFRQueueFrameAcceptCommentButton:SetButtonTemplate() - MOD:ApplyScrollStyle(LFRQueueFrameCommentScrollFrameScrollBar) - MOD:ApplyScrollStyle(LFDQueueFrameSpecificListScrollFrameScrollBar) + STYLE:ApplyScrollStyle(LFRQueueFrameCommentScrollFrameScrollBar) + STYLE:ApplyScrollStyle(LFDQueueFrameSpecificListScrollFrameScrollBar) LFDQueueFrameSpecificListScrollFrame:Formula409() RaidBrowserFrame:HookScript('OnShow', function() if not LFRQueueFrameSpecificListScrollFrameScrollBar.styled then - MOD:ApplyScrollStyle(LFRQueueFrameSpecificListScrollFrameScrollBar) + STYLE:ApplyScrollStyle(LFRQueueFrameSpecificListScrollFrameScrollBar) local list = {LFRQueueFrameRoleButtonHealer, LFRQueueFrameRoleButtonDPS, LFRQueueFrameRoleButtonTank} LFRBrowseFrame:Formula409() for _,s in pairs(list) do @@ -348,7 +348,7 @@ local function LFDFrameStyle() local C = _G['LFRBrowseFrameColumnHeader'..u] C:DisableDrawLayer('BACKGROUND') end; - MOD:ApplyDropdownStyle(LFRBrowseFrameRaidDropDown) + STYLE:ApplyDropdownStyle(LFRBrowseFrameRaidDropDown) LFRBrowseFrameRefreshButton:SetButtonTemplate() LFRBrowseFrameInviteButton:SetButtonTemplate() LFRBrowseFrameSendMessageButton:SetButtonTemplate() @@ -367,8 +367,8 @@ local function LFDFrameStyle() _G[ScenarioQueueFrame.PartyBackfill:GetName().."NoBackfillButton"]:SetButtonTemplate() LFDQueueFrameRandomScrollFrameScrollBar:Formula409() ScenarioQueueFrameSpecificScrollFrame:Formula409() - MOD:ApplyScrollStyle(LFDQueueFrameRandomScrollFrameScrollBar) - MOD:ApplyScrollStyle(ScenarioQueueFrameSpecificScrollFrameScrollBar) + STYLE:ApplyScrollStyle(LFDQueueFrameRandomScrollFrameScrollBar) + STYLE:ApplyScrollStyle(ScenarioQueueFrameSpecificScrollFrameScrollBar) LFDQueueFrameRandomScrollFrame:SetFixedPanelTemplate("Inset") ScenarioQueueFrameRandomScrollFrame:SetFixedPanelTemplate("Inset") RaidFinderQueueFrameScrollFrame:SetFixedPanelTemplate("Inset") @@ -379,4 +379,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(LFDFrameStyle) \ No newline at end of file +STYLE:SaveCustomStyle(LFDFrameStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/loothistory.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/loothistory.lua index 4bea8ea..fafc02a 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/loothistory.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/loothistory.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -25,7 +25,7 @@ local MissingLootFrame_OnShow = function() for u = 1, N do local O = _G["MissingLootFrameItem"..u] local icon = O.icon; - MOD:ApplyLinkButtonStyle(O, true) + STYLE:ApplyLinkButtonStyle(O, true) local g, f, y, P = GetMissingLootItemInfo(u) local color = GetItemQualityColor(P) or 0,0,0,1 icon:SetTexture(g) @@ -62,13 +62,13 @@ local function LootHistoryStyle() local M = MissingLootFrame; M:Formula409() M:SetPanelTemplate("Pattern") - MOD:ApplyCloseButtonStyle(MissingLootFramePassButton) + STYLE:ApplyCloseButtonStyle(MissingLootFramePassButton) hooksecurefunc("MissingLootFrame_Show", MissingLootFrame_OnShow) LootHistoryFrame:Formula409() - MOD:ApplyCloseButtonStyle(LootHistoryFrame.CloseButton) + STYLE:ApplyCloseButtonStyle(LootHistoryFrame.CloseButton) LootHistoryFrame:Formula409() LootHistoryFrame:SetFixedPanelTemplate('Transparent') - MOD:ApplyCloseButtonStyle(LootHistoryFrame.ResizeButton) + STYLE:ApplyCloseButtonStyle(LootHistoryFrame.ResizeButton) LootHistoryFrame.ResizeButton:SetFixedPanelTemplate() LootHistoryFrame.ResizeButton:Width(LootHistoryFrame:GetWidth()) LootHistoryFrame.ResizeButton:Height(19) @@ -83,7 +83,7 @@ local function LootHistoryStyle() txt:SetText("RESIZE") LootHistoryFrameScrollFrame:Formula409() - MOD:ApplyScrollStyle(LootHistoryFrameScrollFrameScrollBar) + STYLE:ApplyScrollStyle(LootHistoryFrameScrollFrameScrollBar) hooksecurefunc("LootHistoryFrame_FullUpdate", LootHistoryFrame_OnUpdate) MasterLooterFrame:Formula409() MasterLooterFrame:SetFixedPanelTemplate() @@ -106,7 +106,7 @@ local function LootHistoryStyle() if T and not T.isStyled and not T:GetName() then if T:GetObjectType() == "Button" then if T:GetPushedTexture() then - MOD:ApplyCloseButtonStyle(T) + STYLE:ApplyCloseButtonStyle(T) else T:SetFixedPanelTemplate() T:SetButtonTemplate() @@ -117,7 +117,7 @@ local function LootHistoryStyle() end end) BonusRollFrame:Formula409() - MOD:ApplyAlertStyle(BonusRollFrame) + STYLE:ApplyAlertStyle(BonusRollFrame) BonusRollFrame.PromptFrame.Icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) BonusRollFrame.PromptFrame.IconBackdrop = CreateFrame("Frame", nil, BonusRollFrame.PromptFrame) BonusRollFrame.PromptFrame.IconBackdrop:SetFrameLevel(BonusRollFrame.PromptFrame.IconBackdrop:GetFrameLevel()-1) @@ -131,4 +131,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(LootHistoryStyle) \ No newline at end of file +STYLE:SaveCustomStyle(LootHistoryStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/lossofcontrol.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/lossofcontrol.lua index b0fdb7b..880b3ad 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/lossofcontrol.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/lossofcontrol.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## LOSSOFCONTROL STYLER @@ -58,4 +58,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(LossOfControlStyle) \ No newline at end of file +STYLE:SaveCustomStyle(LossOfControlStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/macro.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/macro.lua index a1cf5bf..c6989a5 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/macro.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/macro.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -33,10 +33,10 @@ MACRO UI STYLER ]]-- local function MacroUIStyle() if SuperVillain.db.SVStyle.blizzard.enable ~= true or SuperVillain.db.SVStyle.blizzard.macro ~= true then return end; - MOD:ApplyCloseButtonStyle(MacroFrameCloseButton) - MOD:ApplyScrollStyle(MacroButtonScrollFrameScrollBar) - MOD:ApplyScrollStyle(MacroFrameScrollFrameScrollBar) - MOD:ApplyScrollStyle(MacroPopupScrollFrameScrollBar) + STYLE:ApplyCloseButtonStyle(MacroFrameCloseButton) + STYLE:ApplyScrollStyle(MacroButtonScrollFrameScrollBar) + STYLE:ApplyScrollStyle(MacroFrameScrollFrameScrollBar) + STYLE:ApplyScrollStyle(MacroPopupScrollFrameScrollBar) MacroFrame:Width(360) for b = 1, #MacroButtonList do _G[MacroButtonList[b]]:Formula409() @@ -73,7 +73,7 @@ local function MacroUIStyle() MacroFrameInset:MUNG() MacroEditButton:ClearAllPoints() MacroEditButton:Point("BOTTOMLEFT", MacroFrameSelectedMacroButton, "BOTTOMRIGHT", 10, 0) - MOD:ApplyScrollStyle(MacroButtonScrollFrame) + STYLE:ApplyScrollStyle(MacroButtonScrollFrame) MacroPopupFrame:HookScript("OnShow", function(c) c:ClearAllPoints() c:Point("TOPLEFT", MacroFrame, "TOPRIGHT", 5, -2) @@ -122,4 +122,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_MacroUI", MacroUIStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle("Blizzard_MacroUI", MacroUIStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/mailbox.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/mailbox.lua index b02c74a..d6f8527 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/mailbox.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/mailbox.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -57,16 +57,16 @@ local function MailBoxStyle() e:SetTexCoord(0.1, 0.9, 0.1, 0.9) e:FillInner() end; - MOD:ApplyCloseButtonStyle(MailFrameCloseButton) - MOD:ApplyPaginationStyle(InboxPrevPageButton) - MOD:ApplyPaginationStyle(InboxNextPageButton) + STYLE:ApplyCloseButtonStyle(MailFrameCloseButton) + STYLE:ApplyPaginationStyle(InboxPrevPageButton) + STYLE:ApplyPaginationStyle(InboxNextPageButton) MailFrameTab1:Formula409() MailFrameTab2:Formula409() - MOD:ApplyTabStyle(MailFrameTab1) - MOD:ApplyTabStyle(MailFrameTab2) + STYLE:ApplyTabStyle(MailFrameTab1) + STYLE:ApplyTabStyle(MailFrameTab2) SendMailScrollFrame:Formula409(true) SendMailScrollFrame:SetFixedPanelTemplate("Inset") - MOD:ApplyScrollStyle(SendMailScrollFrameScrollBar) + STYLE:ApplyScrollStyle(SendMailScrollFrameScrollBar) SendMailNameEditBox:SetEditboxTemplate() SendMailSubjectEditBox:SetEditboxTemplate() SendMailMoneyGold:SetEditboxTemplate() @@ -95,7 +95,7 @@ local function MailBoxStyle() OpenMailFrame:Formula409(true) OpenMailFrame:SetFixedPanelTemplate("Transparent", true) OpenMailFrameInset:MUNG() - MOD:ApplyCloseButtonStyle(OpenMailFrameCloseButton) + STYLE:ApplyCloseButtonStyle(OpenMailFrameCloseButton) OpenMailReportSpamButton:SetButtonTemplate() OpenMailReplyButton:SetButtonTemplate() OpenMailDeleteButton:SetButtonTemplate() @@ -104,7 +104,7 @@ local function MailBoxStyle() MailFrameInset:MUNG() OpenMailScrollFrame:Formula409(true) OpenMailScrollFrame:SetFixedPanelTemplate("Default") - MOD:ApplyScrollStyle(OpenMailScrollFrameScrollBar) + STYLE:ApplyScrollStyle(OpenMailScrollFrameScrollBar) SendMailBodyEditBox:SetTextColor(1, 1, 1) OpenMailBodyText:SetTextColor(1, 1, 1) InvoiceTextFontNormal:SetTextColor(1, 1, 1) @@ -138,4 +138,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(MailBoxStyle) \ No newline at end of file +STYLE:SaveCustomStyle(MailBoxStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/merchant.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/merchant.lua index 1441a1c..cb83a27 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/merchant.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/merchant.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## FRAME STYLER @@ -42,9 +42,9 @@ local function MerchantStyle() MerchantMoneyInset:Formula409() MerchantFrameInset:SetPanelTemplate("Inset") MerchantFrameInset.Panel:SetFrameLevel(MerchantFrameInset.Panel:GetFrameLevel() + 1) - MOD:ApplyDropdownStyle(MerchantFrameLootFilter) + STYLE:ApplyDropdownStyle(MerchantFrameLootFilter) for b = 1, 2 do - MOD:ApplyTabStyle(_G["MerchantFrameTab"..b]) + STYLE:ApplyTabStyle(_G["MerchantFrameTab"..b]) end; for b = 1, 12 do local d = _G["MerchantItem"..b.."ItemButton"] @@ -77,13 +77,13 @@ local function MerchantStyle() MerchantRepairAllIcon:SetTexCoord(0.34, 0.1, 0.34, 0.535, 0.535, 0.1, 0.535, 0.535) MerchantRepairAllIcon:FillInner() MerchantFrame:Width(360) - MOD:ApplyCloseButtonStyle(MerchantFrameCloseButton, MerchantFrame.Panel) - MOD:ApplyPaginationStyle(MerchantNextPageButton) - MOD:ApplyPaginationStyle(MerchantPrevPageButton) + STYLE:ApplyCloseButtonStyle(MerchantFrameCloseButton, MerchantFrame.Panel) + STYLE:ApplyPaginationStyle(MerchantNextPageButton) + STYLE:ApplyPaginationStyle(MerchantPrevPageButton) end; --[[ ########################################################## STYLE LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(MerchantStyle) \ No newline at end of file +STYLE:SaveCustomStyle(MerchantStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/petbattle.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/petbattle.lua index 1414506..f3265aa 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/petbattle.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/petbattle.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -67,7 +67,7 @@ local function PetBattleStyle() local ActiveFramesList = { PetBattleFrame.ActiveAlly, PetBattleFrame.ActiveEnemy } local StandardFramesList = { PetBattleFrame.Ally2, PetBattleFrame.Ally3, PetBattleFrame.Enemy2, PetBattleFrame.Enemy3 } - MOD:ApplyCloseButtonStyle(FloatingBattlePetTooltip.CloseButton) + STYLE:ApplyCloseButtonStyle(FloatingBattlePetTooltip.CloseButton) PetBattleFrame:Formula409() for i, frame in pairs(ActiveFramesList) do if(not frame.isStyled) then @@ -371,4 +371,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(PetBattleStyle) \ No newline at end of file +STYLE:SaveCustomStyle(PetBattleStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/petition.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/petition.lua index 8fb1371..4897c43 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/petition.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/petition.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## PETITIONFRAME STYLER @@ -31,7 +31,7 @@ local function PetitionFrameStyle() PetitionFrameRequestButton:SetButtonTemplate() PetitionFrameRenameButton:SetButtonTemplate() PetitionFrameCancelButton:SetButtonTemplate() - MOD:ApplyCloseButtonStyle(PetitionFrameCloseButton) + STYLE:ApplyCloseButtonStyle(PetitionFrameCloseButton) PetitionFrameCharterTitle:SetTextColor(1, 1, 0) PetitionFrameCharterName:SetTextColor(1, 1, 1) PetitionFrameMasterTitle:SetTextColor(1, 1, 0) @@ -49,4 +49,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(PetitionFrameStyle) \ No newline at end of file +STYLE:SaveCustomStyle(PetitionFrameStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/petjournal.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/petjournal.lua index 7793206..919155c 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/petjournal.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/petjournal.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -91,9 +91,9 @@ local function PetJournalStyle() PetJournalParent:Formula409() PetJournalParent:SetPanelTemplate("Halftone") PetJournalParentPortrait:Hide() - MOD:ApplyTabStyle(PetJournalParentTab1) - MOD:ApplyTabStyle(PetJournalParentTab2) - MOD:ApplyCloseButtonStyle(PetJournalParentCloseButton) + STYLE:ApplyTabStyle(PetJournalParentTab1) + STYLE:ApplyTabStyle(PetJournalParentTab2) + STYLE:ApplyCloseButtonStyle(PetJournalParentCloseButton) MountJournal:Formula409() MountJournal.LeftInset:Formula409() MountJournal.RightInset:Formula409() @@ -103,10 +103,10 @@ local function PetJournalStyle() MountJournalListScrollFrame:Formula409() MountJournalMountButton:SetButtonTemplate() MountJournalSearchBox:SetEditboxTemplate() - MOD:ApplyScrollStyle(MountJournalListScrollFrameScrollBar) + STYLE:ApplyScrollStyle(MountJournalListScrollFrameScrollBar) MountJournal.MountDisplay:SetFixedPanelTemplate("Comic") for b = 1, #MountJournal.ListScrollFrame.buttons do - MOD:ApplyLinkButtonStyle(_G["MountJournalListScrollFrameButton"..b], false, true) + STYLE:ApplyLinkButtonStyle(_G["MountJournalListScrollFrameButton"..b], false, true) end; hooksecurefunc("MountJournal_UpdateMountList", PetJournal_UpdateMounts) @@ -129,12 +129,12 @@ local function PetJournalStyle() PetJournalFilterButton:Formula409(true) PetJournalFilterButton:SetButtonTemplate() PetJournalListScrollFrame:Formula409() - MOD:ApplyScrollStyle(PetJournalListScrollFrameScrollBar) + STYLE:ApplyScrollStyle(PetJournalListScrollFrameScrollBar) for b = 1, #PetJournal.listScroll.buttons do local d = _G["PetJournalListScrollFrameButton"..b] local f = _G["PetJournalListScrollFrameButton"..b.."Favorite"] - MOD:ApplyLinkButtonStyle(d, false, true) + STYLE:ApplyLinkButtonStyle(d, false, true) if(f) then local fg = CreateFrame("Frame", nil, d) fg:SetSize(40,40) @@ -151,7 +151,7 @@ local function PetJournalStyle() PetJournalListScrollFrame:HookScript("OnVerticalScroll", PetJournal_UpdatePets) PetJournalListScrollFrame:HookScript("OnMouseWheel", PetJournal_UpdatePets) PetJournalAchievementStatus:DisableDrawLayer('BACKGROUND') - MOD:ApplyLinkButtonStyle(PetJournalHealPetButton, true) + STYLE:ApplyLinkButtonStyle(PetJournalHealPetButton, true) PetJournalHealPetButton.texture:SetTexture([[Interface\Icons\spell_magic_polymorphrabbit]]) PetJournalLoadoutBorder:Formula409() @@ -170,7 +170,7 @@ local function PetJournalStyle() pjPet.hover = true; pjPet.pushed = true; pjPet.checked = true; - MOD:ApplyLinkButtonStyle(pjPet) + STYLE:ApplyLinkButtonStyle(pjPet) pjPet.setButton:Formula409() _G['PetJournalLoadoutPet'..b..'HealthFrame'].healthBar:Formula409() _G['PetJournalLoadoutPet'..b..'HealthFrame'].healthBar:SetPanelTemplate('Default') @@ -181,7 +181,7 @@ local function PetJournalStyle() _G['PetJournalLoadoutPet'..b..'XPBar']:SetFrameLevel(_G['PetJournalLoadoutPet'..b..'XPBar']:GetFrameLevel()+2) for v = 1, 3 do local s = _G['PetJournalLoadoutPet'..b..'Spell'..v] - MOD:ApplyLinkButtonStyle(s) + STYLE:ApplyLinkButtonStyle(s) s.FlyoutArrow:SetTexture([[Interface\Buttons\ActionBarFlyoutButton]]) _G['PetJournalLoadoutPet'..b..'Spell'..v..'Icon']:FillInner(s) s.Panel:SetFrameLevel(s:GetFrameLevel() + 1) @@ -193,7 +193,7 @@ local function PetJournalStyle() for b = 1, 2 do local Q = _G['PetJournalSpellSelectSpell'..b] - MOD:ApplyLinkButtonStyle(Q) + STYLE:ApplyLinkButtonStyle(Q) _G['PetJournalSpellSelectSpell'..b..'Icon']:FillInner(Q) _G['PetJournalSpellSelectSpell'..b..'Icon']:SetDrawLayer('BORDER') end; @@ -253,4 +253,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_PetJournal", PetJournalStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle("Blizzard_PetJournal", PetJournalStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/petstable.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/petstable.lua index 0dbe7a1..8fe11da 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/petstable.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/petstable.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## PETSTABLE STYLER @@ -28,16 +28,16 @@ local function PetStableStyle() PetStableBottomInset:Formula409() PetStableFrame:SetPanelTemplate("Halftone") PetStableFrameInset:SetFixedPanelTemplate('Inset') - MOD:ApplyCloseButtonStyle(PetStableFrameCloseButton) + STYLE:ApplyCloseButtonStyle(PetStableFrameCloseButton) PetStablePrevPageButton:SetButtonTemplate() PetStableNextPageButton:SetButtonTemplate() - MOD:ApplyPaginationStyle(PetStablePrevPageButton) - MOD:ApplyPaginationStyle(PetStableNextPageButton) + STYLE:ApplyPaginationStyle(PetStablePrevPageButton) + STYLE:ApplyPaginationStyle(PetStableNextPageButton) for j = 1, NUM_PET_ACTIVE_SLOTS do - MOD:ApplyLinkButtonStyle(_G['PetStableActivePet'..j], true) + STYLE:ApplyLinkButtonStyle(_G['PetStableActivePet'..j], true) end; for j = 1, NUM_PET_STABLE_SLOTS do - MOD:ApplyLinkButtonStyle(_G['PetStableStabledPet'..j], true) + STYLE:ApplyLinkButtonStyle(_G['PetStableStabledPet'..j], true) end; PetStableSelectedPetIcon:SetTexCoord(0.1, 0.9, 0.1, 0.9) end; @@ -46,4 +46,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(PetStableStyle) \ No newline at end of file +STYLE:SaveCustomStyle(PetStableStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua index e9a05a0..20c3297 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## PVP STYLER @@ -29,9 +29,9 @@ local function PVPFrameStyle() PVPUIFrame:Formula409() PVPUIFrame:SetPanelTemplate("Action") PVPUIFrame.Shadows:Formula409() - MOD:ApplyCloseButtonStyle(PVPUIFrameCloseButton) + STYLE:ApplyCloseButtonStyle(PVPUIFrameCloseButton) for g = 1, 2 do - MOD:ApplyTabStyle(_G["PVPUIFrameTab"..g]) + STYLE:ApplyTabStyle(_G["PVPUIFrameTab"..g]) end; for g = 1, 3 do local M = _G["PVPQueueFrameCategoryButton"..g]M:SetFixedPanelTemplate("Button") @@ -44,10 +44,10 @@ local function PVPFrameStyle() M.Icon:SetDrawLayer("OVERLAY", nil, 7) M:SetButtonTemplate() end; - MOD:ApplyDropdownStyle(HonorFrameTypeDropDown) + STYLE:ApplyDropdownStyle(HonorFrameTypeDropDown) HonorFrame.Inset:Formula409() HonorFrame.Inset:SetFixedPanelTemplate("Inset") - MOD:ApplyScrollStyle(HonorFrameSpecificFrameScrollBar) + STYLE:ApplyScrollStyle(HonorFrameSpecificFrameScrollBar) HonorFrameSoloQueueButton:Formula409() HonorFrameGroupQueueButton:Formula409() HonorFrameSoloQueueButton:SetButtonTemplate() @@ -113,15 +113,15 @@ local function PVPFrameStyle() WarGamesFrameInfoScrollFrameScrollBar:Formula409() WarGameStartButton:Formula409() WarGameStartButton:SetButtonTemplate() - MOD:ApplyScrollStyle(WarGamesFrameScrollFrameScrollBar) - MOD:ApplyScrollStyle(WarGamesFrameInfoScrollFrameScrollBar) + STYLE:ApplyScrollStyle(WarGamesFrameScrollFrameScrollBar) + STYLE:ApplyScrollStyle(WarGamesFrameInfoScrollFrameScrollBar) WarGamesFrame.HorizontalBar:Formula409() PVPUIFrame.LeftInset:Formula409() PVPReadyDialog:Formula409() PVPReadyDialog:SetPanelTemplate("Pattern") PVPReadyDialogEnterBattleButton:SetButtonTemplate() PVPReadyDialogLeaveQueueButton:SetButtonTemplate() - MOD:ApplyCloseButtonStyle(PVPReadyDialogCloseButton) + STYLE:ApplyCloseButtonStyle(PVPReadyDialogCloseButton) PVPReadyDialogRoleIcon.texture:SetTexture("Interface\\LFGFrame\\UI-LFG-ICONS-ROLEBACKGROUNDS") PVPReadyDialogRoleIcon.texture:SetAlpha(0.5) @@ -146,6 +146,6 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle('Blizzard_PVPUI', PVPFrameStyle, true, nil, true) +STYLE:SaveBlizzardStyle('Blizzard_PVPUI', PVPFrameStyle, true, nil, true) -- /script StaticPopupSpecial_Show(PVPReadyDialog) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/quest.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/quest.lua index beb9d80..0fa3b3b 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/quest.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/quest.lua @@ -16,7 +16,7 @@ credit: Elv. original logic from ElvUI. Adapted to SVUI # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -78,11 +78,11 @@ end; local function QuestFrameStyle() if SuperVillain.db.SVStyle.blizzard.enable ~= true or SuperVillain.db.SVStyle.blizzard.quest ~= true then return end; - MOD:ApplyCloseButtonStyle(QuestLogFrameCloseButton) - MOD:ApplyScrollStyle(QuestLogDetailScrollFrameScrollBar) - MOD:ApplyScrollStyle(QuestLogScrollFrameScrollBar, 5) - MOD:ApplyScrollStyle(QuestProgressScrollFrameScrollBar) - MOD:ApplyScrollStyle(QuestRewardScrollFrameScrollBar) + STYLE:ApplyCloseButtonStyle(QuestLogFrameCloseButton) + STYLE:ApplyScrollStyle(QuestLogDetailScrollFrameScrollBar) + STYLE:ApplyScrollStyle(QuestLogScrollFrameScrollBar, 5) + STYLE:ApplyScrollStyle(QuestProgressScrollFrameScrollBar) + STYLE:ApplyScrollStyle(QuestRewardScrollFrameScrollBar) QuestLogScrollFrame:Formula409() QuestLogFrame:Formula409() QuestLogFrame:SetPanelTemplate("Halftone") @@ -90,7 +90,7 @@ local function QuestFrameStyle() QuestLogCount:SetFixedPanelTemplate("Default") EmptyQuestLogFrame:Formula409() QuestLogDetailFrameInset:MUNG() - MOD:ApplyScrollStyle(QuestDetailScrollFrameScrollBar) + STYLE:ApplyScrollStyle(QuestDetailScrollFrameScrollBar) QuestProgressScrollFrame:Formula409() QuestLogFrameShowMapButton:Formula409() QuestLogFrameShowMapButton:SetButtonTemplate() @@ -98,7 +98,7 @@ local function QuestFrameStyle() QuestLogFrameShowMapButton.text:SetPoint("CENTER") QuestLogFrameShowMapButton:Size(QuestLogFrameShowMapButton:GetWidth()-30, QuestLogFrameShowMapButton:GetHeight(), -40) QuestGreetingScrollFrame:Formula409() - MOD:ApplyScrollStyle(QuestGreetingScrollFrameScrollBar) + STYLE:ApplyScrollStyle(QuestGreetingScrollFrameScrollBar) QuestLogFrameInset:MUNG() QuestLogFrameCompleteButton:Formula409() for _,i in pairs(QuestFrameList)do @@ -117,7 +117,7 @@ local function QuestFrameStyle() _G["QuestInfoItem"..j.."IconTexture"]:SetDrawLayer("OVERLAY",1) _G["QuestInfoItem"..j.."IconTexture"]:Point("TOPLEFT", 2, -2) _G["QuestInfoItem"..j.."IconTexture"]:Size(_G["QuestInfoItem"..j.."IconTexture"]:GetWidth()-2, _G["QuestInfoItem"..j.."IconTexture"]:GetHeight()-2) - MOD:ApplyLinkButtonStyle(_G["QuestInfoItem"..j]) + STYLE:ApplyLinkButtonStyle(_G["QuestInfoItem"..j]) end; QuestInfoSkillPointFrame:Formula409() QuestInfoSkillPointFrame:Width(QuestInfoSkillPointFrame:GetWidth()-4) @@ -206,7 +206,7 @@ local function QuestFrameStyle() QuestFrameCompleteButton:SetButtonTemplate() QuestFrameGoodbyeButton:SetButtonTemplate() QuestFrameCompleteQuestButton:SetButtonTemplate() - MOD:ApplyCloseButtonStyle(QuestFrameCloseButton, QuestFrame.Panel) + STYLE:ApplyCloseButtonStyle(QuestFrameCloseButton, QuestFrame.Panel) for j = 1, 6 do local i = _G["QuestProgressItem"..j] local texture = _G["QuestProgressItem"..j.."IconTexture"] @@ -228,7 +228,7 @@ local function QuestFrameStyle() QuestLogDetailFrame:Formula409() QuestLogDetailFrame:SetPanelTemplate("Action") QuestLogDetailScrollFrame:Formula409() - MOD:ApplyCloseButtonStyle(QuestLogDetailFrameCloseButton) + STYLE:ApplyCloseButtonStyle(QuestLogDetailFrameCloseButton) hooksecurefunc("QuestFrame_ShowQuestPortrait", function(m, t, text, u, r, s) QuestNPCModel:ClearAllPoints() QuestNPCModel:SetPoint("TOPLEFT", m, "TOPRIGHT", r+18, s) @@ -244,5 +244,5 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(QuestFrameStyle) -MOD:SaveCustomStyle(QuestGreetingStyle) \ No newline at end of file +STYLE:SaveCustomStyle(QuestFrameStyle) +STYLE:SaveCustomStyle(QuestGreetingStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/raid.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/raid.lua index 1753356..82f29d4 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/raid.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/raid.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -80,8 +80,8 @@ local function RaidInfoStyle() RaidInfoFrame:SetPanelTemplate("Transparent", true) RaidInfoFrame.Panel:Point("TOPLEFT", RaidInfoFrame, "TOPLEFT") RaidInfoFrame.Panel:Point("BOTTOMRIGHT", RaidInfoFrame, "BOTTOMRIGHT") - MOD:ApplyCloseButtonStyle(RaidInfoCloseButton, RaidInfoFrame) - MOD:ApplyScrollStyle(RaidInfoScrollFrameScrollBar) + STYLE:ApplyCloseButtonStyle(RaidInfoCloseButton, RaidInfoFrame) + STYLE:ApplyScrollStyle(RaidInfoScrollFrameScrollBar) RaidFrameRaidBrowserButton:SetButtonTemplate() RaidFrameAllAssistCheckButton:SetCheckboxTemplate(true) end; @@ -90,5 +90,5 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_RaidUI",RaidUIStyle) -MOD:SaveCustomStyle(RaidInfoStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle("Blizzard_RaidUI",RaidUIStyle) +STYLE:SaveCustomStyle(RaidInfoStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/reforging.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/reforging.lua index 94ea431..990e6fe 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/reforging.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/reforging.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## REFORGING STYLER @@ -42,11 +42,11 @@ local function ReforgingStyle() ReforgingFrame.ItemButton.IconTexture:SetTexture(nil) end end) - MOD:ApplyCloseButtonStyle(ReforgingFrameCloseButton) + STYLE:ApplyCloseButtonStyle(ReforgingFrameCloseButton) end; --[[ ########################################################## STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_ReforgingUI",ReforgingStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle("Blizzard_ReforgingUI",ReforgingStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/spellbook.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/spellbook.lua index 69c2959..c6249b4 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/spellbook.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/spellbook.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -165,7 +165,7 @@ SPELLBOOK STYLER ]]-- local function SpellBookStyle() if SuperVillain.db.SVStyle.blizzard.enable ~= true or SuperVillain.db.SVStyle.blizzard.spellbook ~= true then return end; - MOD:ApplyCloseButtonStyle(SpellBookFrameCloseButton) + STYLE:ApplyCloseButtonStyle(SpellBookFrameCloseButton) local J = { "SpellBookFrame", "SpellBookFrameInset", "SpellBookSpellIconsFrame", "SpellBookSideTabsFrame", "SpellBookPageNavigationFrame" } @@ -182,8 +182,8 @@ local function SpellBookStyle() for j = 1, 2 do _G['SpellBookPage'..j]:SetDrawLayer('BORDER', 3) end; - MOD:ApplyPaginationStyle(SpellBookPrevPageButton) - MOD:ApplyPaginationStyle(SpellBookNextPageButton) + STYLE:ApplyPaginationStyle(SpellBookPrevPageButton) + STYLE:ApplyPaginationStyle(SpellBookNextPageButton) ButtonUpdateHelper(nil, true) hooksecurefunc("SpellButton_UpdateButton", ButtonUpdateHelper) hooksecurefunc("SpellBook_GetCoreAbilityButton", AbilityButtonHelper) @@ -229,7 +229,7 @@ local function SpellBookStyle() a5.rankText:SetPoint("CENTER") end; for j = 1, 5 do - MOD:ApplyTabStyle(_G["SpellBookFrameTabButton"..j]) + STYLE:ApplyTabStyle(_G["SpellBookFrameTabButton"..j]) end; SpellBookFrameTabButton1:ClearAllPoints() SpellBookFrameTabButton1:SetPoint('TOPLEFT', SpellBookFrame, 'BOTTOMLEFT', 0, 2) @@ -239,4 +239,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(SpellBookStyle) \ No newline at end of file +STYLE:SaveCustomStyle(SpellBookStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/supervillain.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/supervillain.lua index e0abcb8..2f7b651 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/supervillain.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/supervillain.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## ALERTFRAME STYLER @@ -28,7 +28,7 @@ local function SVUICoreStyle() alert.buttons[b]:SetButtonTemplate() end; alert:Formula409() - MOD:ApplyAlertStyle(alert) + STYLE:ApplyAlertStyle(alert) alert.input:SetEditboxTemplate() alert.input.Panel:Point("TOPLEFT", -2, -4) alert.input.Panel:Point("BOTTOMRIGHT", 2, 4) @@ -43,4 +43,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(SVUICoreStyle) \ No newline at end of file +STYLE:SaveCustomStyle(SVUICoreStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua index a4a5d86..ce4a778 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; local ceil = math.ceil --[[ ########################################################## @@ -481,7 +481,47 @@ local function forceBackdropColor(self, r, g, b, a) GhostFrame:SetBackdropColor(0,0,0,0) GhostFrame:SetBackdropBorderColor(0,0,0,0) end -end; +end + +local originalNavBar_AddButton = _G.NavBar_AddButton + +local function newNavBar_AddButton(self, buttonData) + local navButton = self.freeButtons[#self.freeButtons]; + if navButton then + self.freeButtons[#self.freeButtons] = nil; + end + + if not navButton then + navButton = CreateFrame("BUTTON", self:GetName().."Button"..(#self.navList+1), self, self.template); + navButton.oldClick = navButton:GetScript("OnClick"); + navButton:SetScript("OnClick", NavBar_ButtonOnClick); + navButton:RegisterForClicks("LeftButtonUp", "RightButtonUp"); + + if not navButton:GetScript("OnEnter") then + navButton:SetScript("OnEnter", NavBar_ButtonOnEnter); + end + + if not navButton:GetScript("OnLeave") then + navButton:SetScript("OnLeave", NavBar_ButtonOnLeave); + end + end + + + --Set up the button + local navParent = self.navList[#self.navList]; + self.navList[#self.navList+1] = navButton; + + navButton:SetText(buttonData.name); + navButton:SetWidth(navButton.text:GetStringWidth()+30); + + navButton.myclick = buttonData.OnClick; + navButton.listFunc = buttonData.listFunc; + navButton.id = buttonData.id; + navButton.data = buttonData; + navButton:SetButtonTemplate(); + navButton:Show(); + NavBar_CheckLength(self); +end --[[ ########################################################## SYSTEM WIDGET STYLERS @@ -497,7 +537,7 @@ local function SystemPanelQue() local this = _G[SystemPopList[i]] if(this) then this:Formula409() - MOD:ApplyAlertStyle(this) + STYLE:ApplyAlertStyle(this) this:SetBackdropColor(0.8, 0.2, 0.2) end end @@ -802,7 +842,7 @@ local function SystemPanelQue() for i = 1,#COMBAT_CONFIG_TABS do local this = _G["CombatConfigTab"..i] if(this) then - MOD:ApplyTabStyle(this) + STYLE:ApplyTabStyle(this) this:SetHeight(this:GetHeight()-2) this:SetWidth(ceil(this:GetWidth()+1.6)) _G["CombatConfigTab"..i.."Text"]:SetPoint("BOTTOM",0,10) @@ -828,8 +868,8 @@ local function SystemPanelQue() this:SetCheckboxTemplate(true) end end - MOD:ApplyPaginationStyle(ChatConfigMoveFilterUpButton,true) - MOD:ApplyPaginationStyle(ChatConfigMoveFilterDownButton,true) + STYLE:ApplyPaginationStyle(ChatConfigMoveFilterUpButton,true) + STYLE:ApplyPaginationStyle(ChatConfigMoveFilterDownButton,true) ChatConfigMoveFilterUpButton:ClearAllPoints() ChatConfigMoveFilterDownButton:ClearAllPoints() ChatConfigMoveFilterUpButton:SetPoint("TOPLEFT",ChatConfigCombatSettingsFilters,"BOTTOMLEFT",3,0) @@ -883,7 +923,7 @@ local function SystemPanelQue() local this = _G[SystemFrameList14[i]] if(this) then this:Formula409() - MOD:ApplyTabStyle(this) + STYLE:ApplyTabStyle(this) end end InterfaceOptionsFrameTab1:ClearAllPoints() @@ -903,7 +943,7 @@ local function SystemPanelQue() for i = 1, #SystemFrameList16 do local this = _G["InterfaceOptions"..SystemFrameList16[i]] if(this) then - MOD:ApplyDropdownStyle(this) + STYLE:ApplyDropdownStyle(this) DropDownList1:SetFixedPanelTemplate("Default", true) end end @@ -917,7 +957,7 @@ local function SystemPanelQue() for i = 1, #SystemFrameList18 do local this = _G[SystemFrameList18[i]] if(this) then - MOD:ApplyDropdownStyle(this,165) + STYLE:ApplyDropdownStyle(this,165) DropDownList1:SetFixedPanelTemplate("Default", true) end end @@ -942,7 +982,7 @@ local function SystemPanelQue() for i = 1, #SystemFrameList21 do local this = _G[SystemFrameList21[i]] if(this) then - MOD:ApplyScrollbarStyle(this) + STYLE:ApplyScrollbarStyle(this) end end MacOptionsFrame:Formula409() @@ -955,10 +995,10 @@ local function SystemPanelQue() MacOptionsFrameMovieRecording:Formula409() MacOptionsITunesRemote:Formula409() MacOptionsFrameMisc:Formula409() - MOD:ApplyDropdownStyle(MacOptionsFrameResolutionDropDown) - MOD:ApplyDropdownStyle(MacOptionsFrameFramerateDropDown) - MOD:ApplyDropdownStyle(MacOptionsFrameCodecDropDown) - MOD:ApplyScrollbarStyle(MacOptionsFrameQualitySlider) + STYLE:ApplyDropdownStyle(MacOptionsFrameResolutionDropDown) + STYLE:ApplyDropdownStyle(MacOptionsFrameFramerateDropDown) + STYLE:ApplyDropdownStyle(MacOptionsFrameCodecDropDown) + STYLE:ApplyScrollbarStyle(MacOptionsFrameQualitySlider) for i = 1, 11 do local this = _G["MacOptionsFrameCheckButton"..i] if(this) then @@ -984,15 +1024,16 @@ local function SystemPanelQue() ReportPlayerNameDialog:SetFixedPanelTemplate("Transparent", true) ReportPlayerNameDialogReportButton:SetButtonTemplate() ReportPlayerNameDialogCancelButton:SetButtonTemplate() - MOD:ApplyCloseButtonStyle(SideDressUpModelCloseButton) + STYLE:ApplyCloseButtonStyle(SideDressUpModelCloseButton) SideDressUpFrame:Formula409() SideDressUpFrame.BGTopLeft:Hide() SideDressUpFrame.BGBottomLeft:Hide() SideDressUpModelResetButton:SetButtonTemplate() + _G.NavBar_AddButton = newNavBar_AddButton end --[[ ########################################################## STYLE LOADING ########################################################## ]]-- -MOD:SaveCustomStyle( SystemPanelQue) \ No newline at end of file +STYLE:SaveCustomStyle(SystemPanelQue) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/tabard.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/tabard.lua index cb5e2cc..ea094ec 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/tabard.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/tabard.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -52,7 +52,7 @@ local function TabardFrameStyle() TabardModel:SetFixedPanelTemplate("Transparent") TabardFrameCancelButton:SetButtonTemplate() TabardFrameAcceptButton:SetButtonTemplate() - MOD:ApplyCloseButtonStyle(TabardFrameCloseButton) + STYLE:ApplyCloseButtonStyle(TabardFrameCloseButton) TabardFrameCostFrame:Formula409() TabardFrameCustomizationFrame:Formula409() TabardFrameInset:MUNG() @@ -60,8 +60,8 @@ local function TabardFrameStyle() TabardFrameMoneyBg:Formula409() for b = 1, 5 do local c = "TabardFrameCustomization"..b;_G[c]:Formula409() - MOD:ApplyPaginationStyle(_G[c.."LeftButton"]) - MOD:ApplyPaginationStyle(_G[c.."RightButton"]) + STYLE:ApplyPaginationStyle(_G[c.."LeftButton"]) + STYLE:ApplyPaginationStyle(_G[c.."RightButton"]) if b>1 then _G[c]:ClearAllPoints() _G[c]:Point("TOP", _G["TabardFrameCustomization"..b-1], "BOTTOM", 0, -6) @@ -88,4 +88,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(TabardFrameStyle) \ No newline at end of file +STYLE:SaveCustomStyle(TabardFrameStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/talents.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/talents.lua index 185721a..41dba3a 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/talents.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/talents.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -110,7 +110,7 @@ local function TalentFrameStyle() PlayerTalentFrameSpecializationTutorialButton:MUNG() PlayerTalentFrameTalentsTutorialButton:MUNG() PlayerTalentFramePetSpecializationTutorialButton:MUNG() - MOD:ApplyCloseButtonStyle(PlayerTalentFrameCloseButton) + STYLE:ApplyCloseButtonStyle(PlayerTalentFrameCloseButton) PlayerTalentFrameActivateButton:SetButtonTemplate() for _,name in pairs(SpecButtonList)do local button = _G[name]; @@ -127,7 +127,7 @@ local function TalentFrameStyle() PlayerTalentFrameTalentsClearInfoFrame.icon:Size(PlayerTalentFrameTalentsClearInfoFrame:GetSize()) PlayerTalentFrameTalentsClearInfoFrame:Point('TOPLEFT', PlayerTalentFrameTalents, 'BOTTOMLEFT', 8, -8) for b = 1, 4 do - MOD:ApplyTabStyle(_G['PlayerTalentFrameTab'..b]) + STYLE:ApplyTabStyle(_G['PlayerTalentFrameTab'..b]) if b == 1 then local d, e, k, g = _G['PlayerTalentFrameTab'..b]:GetPoint() _G['PlayerTalentFrameTab'..b]:Point(d, e, k, g, -4) @@ -317,7 +317,7 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_TalentUI",TalentFrameStyle) +STYLE:SaveBlizzardStyle("Blizzard_TalentUI",TalentFrameStyle) local function GlyphStyle() GlyphFrame.background:ClearAllPoints() @@ -330,15 +330,15 @@ local function GlyphStyle() GlyphFrameClearInfoFrame:Height(GlyphFrameClearInfoFrame:GetHeight()-2) GlyphFrameClearInfoFrame.icon:Size(GlyphFrameClearInfoFrame:GetSize()) GlyphFrameClearInfoFrame:Point("TOPLEFT", GlyphFrame, "BOTTOMLEFT", 6, -10) - MOD:ApplyDropdownStyle(GlyphFrameFilterDropDown, 212) + STYLE:ApplyDropdownStyle(GlyphFrameFilterDropDown, 212) GlyphFrameSearchBox:SetEditboxTemplate() - MOD:ApplyScrollStyle(GlyphFrameScrollFrameScrollBar, 5) + STYLE:ApplyScrollStyle(GlyphFrameScrollFrameScrollBar, 5) for b = 1, 10 do local e = _G["GlyphFrameScrollFrameButton"..b] local icon = _G["GlyphFrameScrollFrameButton"..b.."Icon"] e:Formula409() - MOD:ApplyLinkButtonStyle(e) + STYLE:ApplyLinkButtonStyle(e) icon:SetTexCoord(0.1, 0.9, 0.1, 0.9 ) end; @@ -359,4 +359,4 @@ local function GlyphStyle() GlyphFrameScrollFrame:SetPanelTemplate("Inset", false, 3, 2, 2) end; -MOD:SaveBlizzardStyle("Blizzard_GlyphUI",GlyphStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle("Blizzard_GlyphUI",GlyphStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/taxi.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/taxi.lua index 353e120..b00d89e 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/taxi.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/taxi.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## TAXIFRAME STYLER @@ -29,11 +29,11 @@ local function TaxiStyle() TaxiRouteMap:SetPanelTemplate("Transparent", false, 3, 3, 3) TaxiRouteMap.Panel:WrapOuter(TaxiRouteMap, 4, 4) TaxiFrame.Panel:SetFrameLevel(0) - MOD:ApplyCloseButtonStyle(TaxiFrame.CloseButton) + STYLE:ApplyCloseButtonStyle(TaxiFrame.CloseButton) end; --[[ ########################################################## STYLE LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(TaxiStyle) \ No newline at end of file +STYLE:SaveCustomStyle(TaxiStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/ACP.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/ACP.lua index a320d47..d4a3c0a 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/ACP.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/ACP.lua @@ -27,7 +27,7 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## ACP @@ -64,12 +64,12 @@ local function StyleACP() end end end; - MOD:ApplyFrameStyle(ACP_AddonList) - MOD:ApplyFrameStyle(ACP_AddonList_ScrollFrame) + STYLE:ApplyFrameStyle(ACP_AddonList) + STYLE:ApplyFrameStyle(ACP_AddonList_ScrollFrame) local h={"ACP_AddonListSetButton","ACP_AddonListDisableAll","ACP_AddonListEnableAll","ACP_AddonList_ReloadUI","ACP_AddonListBottomClose"} for i,j in pairs(h)do _G[j]:SetButtonTemplate()end; for c=1,20 do _G["ACP_AddonListEntry"..c.."LoadNow"]:SetButtonTemplate()end; - MOD:ApplyCloseButtonStyle(ACP_AddonListCloseButton) + STYLE:ApplyCloseButtonStyle(ACP_AddonListCloseButton) for c=1,20,1 do local k=_G["ACP_AddonList"] k.timeLapse = 0 @@ -77,8 +77,8 @@ local function StyleACP() end; for c=1,20 do _G["ACP_AddonListEntry"..c.."Enabled"]:SetCheckboxTemplate(true)end; ACP_AddonList_NoRecurse:SetCheckboxTemplate(true) - MOD:ApplyScrollStyle(ACP_AddonList_ScrollFrameScrollBar) - MOD:ApplyDropdownStyle(ACP_AddonListSortDropDown) + STYLE:ApplyScrollStyle(ACP_AddonList_ScrollFrameScrollBar) + STYLE:ApplyDropdownStyle(ACP_AddonListSortDropDown) ACP_AddonListSortDropDown:Width(130) ACP_AddonList_ScrollFrame:SetWidth(590) ACP_AddonList_ScrollFrame:SetHeight(412) @@ -96,4 +96,4 @@ local function StyleACP() ACP_AddonListBottomClose:Point("BOTTOMRIGHT",ACP_AddonList,"BOTTOMRIGHT",-50,8) ACP_AddonListBottomClose:SetHeight(25)ACP_AddonList:SetParent(UIParent) end -MOD:SaveAddonStyle("ACP", StyleACP) \ No newline at end of file +STYLE:SaveAddonStyle("ACP", StyleACP) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Ace3.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Ace3.lua index ebfa937..06f180e 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Ace3.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Ace3.lua @@ -15,7 +15,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; local AceGUI = LibStub("AceGUI-3.0", true); local NOOP = function() end; local function Ace3_OnEnter(b) @@ -39,13 +39,13 @@ local function Ace3_ScrollStyle(e, f) if _G[e:GetName().."ScrollUpButton"] and _G[e:GetName().."ScrollDownButton"] then _G[e:GetName().."ScrollUpButton"]:Formula409() if not _G[e:GetName().."ScrollUpButton"].icon then - MOD:ApplyPaginationStyle(_G[e:GetName().."ScrollUpButton"]) + STYLE:ApplyPaginationStyle(_G[e:GetName().."ScrollUpButton"]) SquareButton_SetIcon(_G[e:GetName().."ScrollUpButton"], "UP") _G[e:GetName().."ScrollUpButton"]:Size(_G[e:GetName().."ScrollUpButton"]:GetWidth()+7, _G[e:GetName().."ScrollUpButton"]:GetHeight()+7) end; _G[e:GetName().."ScrollDownButton"]:Formula409() if not _G[e:GetName().."ScrollDownButton"].icon then - MOD:ApplyPaginationStyle(_G[e:GetName().."ScrollDownButton"]) + STYLE:ApplyPaginationStyle(_G[e:GetName().."ScrollDownButton"]) SquareButton_SetIcon(_G[e:GetName().."ScrollDownButton"], "DOWN") _G[e:GetName().."ScrollDownButton"]:Size(_G[e:GetName().."ScrollDownButton"]:GetWidth()+7, _G[e:GetName().."ScrollDownButton"]:GetHeight()+7) end; @@ -78,7 +78,7 @@ local function Ace3_ButtonStyle(h, i, j) end; local function Ace3_PaginationStyle(...) - MOD:ApplyPaginationStyle(...) + STYLE:ApplyPaginationStyle(...) end; local function StyleAce3() @@ -306,4 +306,4 @@ if not AceGUI then return end; -MOD:SaveBlizzardStyle('Ace3', StyleAce3, true) \ No newline at end of file +STYLE:SaveBlizzardStyle('Ace3', StyleAce3, true) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AtlasLoot.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AtlasLoot.lua index 3563fc2..bcc38f9 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AtlasLoot.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AtlasLoot.lua @@ -27,7 +27,7 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## ATLASLOOT @@ -90,7 +90,7 @@ local function StyleAtlasLoot() end for i = 1, 9 do local f = _G["AtlasLootCompareFrameSortButton_"..i]f:SetWidth(44.44)end; local nineisthere={"AtlasLootCompareFrameSortButton_7","AtlasLootCompareFrameSortButton_8","AtlasLootCompareFrameSortButton_9"} - for _, object in pairs(nineisthere) do MOD:ApplyFrameStyle(_G[object])end; + for _, object in pairs(nineisthere) do STYLE:ApplyFrameStyle(_G[object])end; AtlasLootCompareFrameSortButton_7:Point("LEFT", AtlasLootCompareFrameSortButton_6, "RIGHT", 1, 0) AtlasLootCompareFrameSortButton_8:Point("LEFT", AtlasLootCompareFrameSortButton_7, "RIGHT", 1, 0) AtlasLootCompareFrameSortButton_9:Point("LEFT", AtlasLootCompareFrameSortButton_8, "RIGHT", 1, 0) @@ -107,12 +107,12 @@ local function StyleAtlasLoot() local SetTemplateDefault={"AtlasLootCompareFrameSortButton_Name","AtlasLootCompareFrameSortButton_Rarity","AtlasLootCompareFrameSortButton_1","AtlasLootCompareFrameSortButton_2","AtlasLootCompareFrameSortButton_3","AtlasLootCompareFrameSortButton_4","AtlasLootCompareFrameSortButton_5","AtlasLootCompareFrameSortButton_6"} local buttons={"AtlasLoot_AtlasInfoFrame_ToggleALButton","AtlasLootPanelSearch_SearchButton","AtlasLootDefaultFrame_CompareFrame","AtlasLootPanelSearch_ClearButton","AtlasLootPanelSearch_LastResultButton","AtlasLoot10Man25ManSwitch","AtlasLootItemsFrame_BACK","AtlasLootCompareFrameSearch_ClearButton","AtlasLootCompareFrameSearch_SearchButton","AtlasLootCompareFrame_WishlistButton","AtlasLootCompareFrame_CloseButton2"} for _, object in pairs(StripAllTextures) do _G[object]:Formula409()end; - for _, object in pairs(SetTemplateDefault) do MOD:ApplyFrameStyle(_G[object], "Default")end; + for _, object in pairs(SetTemplateDefault) do STYLE:ApplyFrameStyle(_G[object], "Default")end; for _, button in pairs(buttons) do _G[button]:SetButtonTemplate()end; -- Manipulate the main frames - MOD:ApplyFrameStyle(_G["AtlasLootDefaultFrame"], "Action"); - MOD:ApplyFrameStyle(_G["AtlasLootItemsFrame"], "Button"); - MOD:ApplyFrameStyle(_G["AtlasLootPanel"], "Transparent"); + STYLE:ApplyFrameStyle(_G["AtlasLootDefaultFrame"], "Action"); + STYLE:ApplyFrameStyle(_G["AtlasLootItemsFrame"], "Button"); + STYLE:ApplyFrameStyle(_G["AtlasLootPanel"], "Transparent"); hooksecurefunc(_G["AtlasLootPanel"],"SetPoint",function(self,_,parent,_,_,_,breaker) if not breaker then self:ClearAllPoints() @@ -121,7 +121,7 @@ local function StyleAtlasLoot() end); _G["AtlasLootPanel"]:SetPoint("TOP",_G["AtlasLootDefaultFrame"],"BOTTOM",0,-1); -- Back to the rest - MOD:ApplyFrameStyle(_G["AtlasLootCompareFrame"], "Transparent"); + STYLE:ApplyFrameStyle(_G["AtlasLootCompareFrame"], "Transparent"); if AtlasLoot_PanelButton_1 then AtlasLoot_PanelButton_1:SetButtonTemplate() end if AtlasLoot_PanelButton_2 then AtlasLoot_PanelButton_2:SetButtonTemplate() end if AtlasLoot_PanelButton_3 then AtlasLoot_PanelButton_3:SetButtonTemplate() end @@ -135,26 +135,26 @@ local function StyleAtlasLoot() if AtlasLoot_PanelButton_11 then AtlasLoot_PanelButton_11:SetButtonTemplate() end if AtlasLoot_PanelButton_12 then AtlasLoot_PanelButton_12:SetButtonTemplate() end for i = 1, 15 do local f = _G["AtlasLootCompareFrameMainFilterButton"..i]f:Formula409()end; - MOD:ApplyCloseButtonStyle(AtlasLootDefaultFrame_CloseButton) - MOD:ApplyCloseButtonStyle(AtlasLootCompareFrame_CloseButton) - MOD:ApplyCloseButtonStyle(AtlasLootCompareFrame_CloseButton_Wishlist) - MOD:ApplyPaginationStyle(AtlasLootQuickLooksButton) - MOD:ApplyPaginationStyle(AtlasLootItemsFrame_NEXT) + STYLE:ApplyCloseButtonStyle(AtlasLootDefaultFrame_CloseButton) + STYLE:ApplyCloseButtonStyle(AtlasLootCompareFrame_CloseButton) + STYLE:ApplyCloseButtonStyle(AtlasLootCompareFrame_CloseButton_Wishlist) + STYLE:ApplyPaginationStyle(AtlasLootQuickLooksButton) + STYLE:ApplyPaginationStyle(AtlasLootItemsFrame_NEXT) AtlasLootItemsFrame_NEXT:SetWidth(25) AtlasLootItemsFrame_NEXT:SetHeight(25) - MOD:ApplyPaginationStyle(AtlasLootItemsFrame_PREV) + STYLE:ApplyPaginationStyle(AtlasLootItemsFrame_PREV) AtlasLootItemsFrame_PREV:SetWidth(25) AtlasLootItemsFrame_PREV:SetHeight(25) - MOD:ApplyPaginationStyle(AtlasLootPanelSearch_SelectModuel) - MOD:ApplyPaginationStyle(AtlasLootCompareFrameSearch_SelectModuel) - MOD:ApplyDropdownStyle(AtlasLootDefaultFrame_PackageSelect) + STYLE:ApplyPaginationStyle(AtlasLootPanelSearch_SelectModuel) + STYLE:ApplyPaginationStyle(AtlasLootCompareFrameSearch_SelectModuel) + STYLE:ApplyDropdownStyle(AtlasLootDefaultFrame_PackageSelect) AtlasLootDefaultFrame_PackageSelect:SetWidth(240) AtlasLootDefaultFrame_PackageSelect:SetPoint("TOPLEFT", AtlasLootDefaultFrame, "TOPLEFT", 50, -50) - MOD:ApplyDropdownStyle(AtlasLootDefaultFrame_InstanceSelect,240) + STYLE:ApplyDropdownStyle(AtlasLootDefaultFrame_InstanceSelect,240) --AtlasLootDefaultFrame_InstanceSelect:SetWidth(240) - MOD:ApplyDropdownStyle(AtlasLootCompareFrameSearch_StatsListDropDown) + STYLE:ApplyDropdownStyle(AtlasLootCompareFrameSearch_StatsListDropDown) AtlasLootCompareFrameSearch_StatsListDropDown:SetWidth(240) - MOD:ApplyDropdownStyle(AtlasLootCompareFrame_WishlistDropDown) + STYLE:ApplyDropdownStyle(AtlasLootCompareFrame_WishlistDropDown) AtlasLootCompareFrame_WishlistDropDown:SetWidth(240) AtlasLootPanelSearch_Box:SetEditboxTemplate() AtlasLootCompareFrameSearch_Box:SetEditboxTemplate() @@ -165,8 +165,8 @@ local function StyleAtlasLoot() if AtlasLootItemsFrame_Thunderforged then AtlasLootItemsFrame_Thunderforged:SetCheckboxTemplate(true) end AtlasLootPanel.Titel:SetTextColor(23/255, 132/255, 209/255) AtlasLootPanel.Titel:SetPoint("BOTTOM", AtlasLootPanel.TitelBg, "BOTTOM", 0, 40) - MOD:ApplyScrollStyle(AtlasLootCompareFrame_ScrollFrameItemFrameScrollBar) - MOD:ApplyScrollStyle(AtlasLootCompareFrame_WishlistScrollFrameScrollBar) + STYLE:ApplyScrollStyle(AtlasLootCompareFrame_ScrollFrameItemFrameScrollBar) + STYLE:ApplyScrollStyle(AtlasLootCompareFrame_WishlistScrollFrameScrollBar) AtlasLootDefaultFrame:HookScript("OnShow", AL_OnShow) AtlasLootCompareFrame:HookScript("OnShow", Compare_OnShow) AtlasLootPanel.timeLapse = 0; @@ -179,6 +179,6 @@ local function StyleAtlasLoot() end self:SetWidth(AtlasLootDefaultFrame:GetWidth()) end) - if AtlasLootTooltip:GetName() ~= "GameTooltip" then MOD:ApplyTooltipStyle(AtlasLootTooltip) end + if AtlasLootTooltip:GetName() ~= "GameTooltip" then STYLE:ApplyTooltipStyle(AtlasLootTooltip) end end -MOD:SaveAddonStyle("AtlasLoot", StyleAtlasLoot) \ No newline at end of file +STYLE:SaveAddonStyle("AtlasLoot", StyleAtlasLoot) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/BigWigs.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/BigWigs.lua index 1d9b989..6053b25 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/BigWigs.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/BigWigs.lua @@ -26,7 +26,7 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; local NOOP = function() end; --[[ ########################################################## @@ -132,8 +132,8 @@ local function StyleBigWigs(event, addon) GetStyleName = function() return "SVUI" end, }) BigWigsBars:SetBarStyle("SVUI") - MOD:SafeEventRemoval("BigWigs", "ADDON_LOADED") - MOD:SafeEventRemoval("BigWigs", "PLAYER_ENTERING_WORLD") + STYLE:SafeEventRemoval("BigWigs", "ADDON_LOADED") + STYLE:SafeEventRemoval("BigWigs", "PLAYER_ENTERING_WORLD") end end -MOD:SaveAddonStyle("BigWigs", StyleBigWigs, "ADDON_LOADED") \ No newline at end of file +STYLE:SaveAddonStyle("BigWigs", StyleBigWigs, "ADDON_LOADED") \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Clique.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Clique.lua index 079f437..c6527af 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Clique.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Clique.lua @@ -30,7 +30,7 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## CLIQUE @@ -45,7 +45,7 @@ local function StyleClique() "CliqueClickGrabber", } for _, object in pairs(Frames) do - MOD:ApplyFrameStyle(_G[object],"Transparent") + STYLE:ApplyFrameStyle(_G[object],"Transparent") if _G[object] == CliqueConfig then _G[object].Panel:SetPoint("TOPLEFT",0,0) _G[object].Panel:SetPoint("BOTTOMRIGHT",0,-5) @@ -71,7 +71,7 @@ local function StyleClique() for _, object in pairs(CliqueButtons) do _G[object]:SetButtonTemplate() end - MOD:ApplyCloseButtonStyle(CliqueDialog.CloseButton) + STYLE:ApplyCloseButtonStyle(CliqueDialog.CloseButton) local CliqueTabs = { "CliqueConfigPage1Column1", "CliqueConfigPage1Column2", @@ -109,8 +109,8 @@ local function StyleClique() CliqueSpellTab:GetNormalTexture():SetTexCoord(0.1,0.9,0.1,0.9) CliqueSpellTab:GetNormalTexture():ClearAllPoints() CliqueSpellTab:GetNormalTexture():FillInner() - MOD:ApplyFrameStyle(CliqueSpellTab,"Transparent") + STYLE:ApplyFrameStyle(CliqueSpellTab,"Transparent") CliqueSpellTab.Panel:SetAllPoints() CliqueSpellTab:SetButtonTemplate() end -MOD:SaveAddonStyle("Clique", StyleClique) \ No newline at end of file +STYLE:SaveAddonStyle("Clique", StyleClique) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Cooline.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Cooline.lua index ca3c349..cb2ce77 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Cooline.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Cooline.lua @@ -30,7 +30,7 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## COOLINE @@ -40,15 +40,15 @@ local function StyleCoolLine() CoolLineDB.bgcolor = { r = 0, g = 0, b = 0, a = 0, } CoolLineDB.border = "None" CoolLine.updatelook() - MOD:ApplyFrameStyle(CoolLine,"Transparent") + STYLE:ApplyFrameStyle(CoolLine,"Transparent") CoolLine.Panel:SetAllPoints(CoolLine) SuperVillain:AddToDisplayAudit(CoolLine) - if MOD:IsAddonReady("DockletCoolLine") then + if STYLE:IsAddonReady("DockletCoolLine") then if not CoolLineDB.vertical then CoolLine:SetPoint('BOTTOMRIGHT', SVUI_ActionBar1, 'TOPRIGHT', 0, 4) CoolLine:SetPoint("BOTTOMLEFT", SVUI_ActionBar1, "TOPLEFT", 0, 4) end end end -MOD:SaveAddonStyle("CoolLine", StyleCoolLine) \ No newline at end of file +STYLE:SaveAddonStyle("CoolLine", StyleCoolLine) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/DBM.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/DBM.lua index 381b89a..a6eab61 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/DBM.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/DBM.lua @@ -30,7 +30,7 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## DBM @@ -203,17 +203,17 @@ local function StyleDBM(event, addon) end if addon == 'DBM-GUI' then DBM_GUI_OptionsFrame:HookScript('OnShow', function() - MOD:ApplyFrameStyle(DBM_GUI_OptionsFrame) - MOD:ApplyFrameStyle(DBM_GUI_OptionsFrameBossMods) - MOD:ApplyFrameStyle(DBM_GUI_OptionsFrameDBMOptions) - MOD:ApplyFrameStyle(DBM_GUI_OptionsFramePanelContainer, 'Transparent', true) + STYLE:ApplyFrameStyle(DBM_GUI_OptionsFrame) + STYLE:ApplyFrameStyle(DBM_GUI_OptionsFrameBossMods) + STYLE:ApplyFrameStyle(DBM_GUI_OptionsFrameDBMOptions) + STYLE:ApplyFrameStyle(DBM_GUI_OptionsFramePanelContainer, 'Transparent', true) end) - MOD:ApplyTabStyle(DBM_GUI_OptionsFrameTab1) - MOD:ApplyTabStyle(DBM_GUI_OptionsFrameTab2) + STYLE:ApplyTabStyle(DBM_GUI_OptionsFrameTab1) + STYLE:ApplyTabStyle(DBM_GUI_OptionsFrameTab2) DBM_GUI_OptionsFrameOkay:SetButtonTemplate() DBM_GUI_OptionsFrameWebsiteButton:SetButtonTemplate() - MOD:ApplyScrollStyle(DBM_GUI_OptionsFramePanelContainerFOVScrollBar) - MOD:SafeEventRemoval("DBM", event) + STYLE:ApplyScrollStyle(DBM_GUI_OptionsFramePanelContainerFOVScrollBar) + STYLE:SafeEventRemoval("DBM", event) end end -MOD:SaveAddonStyle("DBM", StyleDBM, 'ADDON_LOADED') \ No newline at end of file +STYLE:SaveAddonStyle("DBM", StyleDBM, 'ADDON_LOADED') \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/DXE.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/DXE.lua index a8a5a9e..c17e6c8 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/DXE.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/DXE.lua @@ -30,7 +30,7 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## DXE @@ -117,4 +117,4 @@ local function StyleDXE() DXEDB["profiles"][SuperVillain.name.." - "..SuperVillain.realm]["Globals"]["Font"] = SuperVillain.Media.font.default DXEDB["profiles"][SuperVillain.name.." - "..SuperVillain.realm]["Globals"]["TimerFont"] = SuperVillain.Media.font.default end -MOD:SaveAddonStyle("DXE", StyleDXE) \ No newline at end of file +STYLE:SaveAddonStyle("DXE", StyleDXE) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/LightHeaded.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/LightHeaded.lua index dee7953..697364e 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/LightHeaded.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/LightHeaded.lua @@ -30,7 +30,7 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## LIGHTHEADED @@ -52,25 +52,25 @@ local function DoDis(self, elapsed) end local function StyleLightHeaded() - MOD:ApplyFrameStyle(LightHeadedFrame) - MOD:ApplyFrameStyle(LightHeadedFrameSub) - MOD:ApplyFrameStyle(LightHeadedSearchBox) - MOD:ApplyTooltipStyle(LightHeadedTooltip) + STYLE:ApplyFrameStyle(LightHeadedFrame) + STYLE:ApplyFrameStyle(LightHeadedFrameSub) + STYLE:ApplyFrameStyle(LightHeadedSearchBox) + STYLE:ApplyTooltipStyle(LightHeadedTooltip) LightHeadedScrollFrame:Formula409() local lhframe = LightHeadedFrame lhframe.close:Hide() - MOD:ApplyCloseButtonStyle(lhframe.close) + STYLE:ApplyCloseButtonStyle(lhframe.close) lhframe.handle:Hide() local lhframe = LightHeadedFrameSub - MOD:ApplyPaginationStyle(lhframe.prev) - MOD:ApplyPaginationStyle(lhframe.next) + STYLE:ApplyPaginationStyle(lhframe.prev) + STYLE:ApplyPaginationStyle(lhframe.next) lhframe.prev:SetWidth(16) lhframe.prev:SetHeight(16) lhframe.next:SetWidth(16) lhframe.next:SetHeight(16) lhframe.prev:SetPoint("RIGHT", lhframe.page, "LEFT", -25, 0) lhframe.next:SetPoint("LEFT", lhframe.page, "RIGHT", 25, 0) - MOD:ApplyScrollStyle(LightHeadedScrollFrameScrollBar, 5) + STYLE:ApplyScrollStyle(LightHeadedScrollFrameScrollBar, 5) lhframe.title:SetTextColor(23/255, 132/255, 209/255) local LH_OnLoad = _G["LightHeadedFrame"] LH_OnLoad.timeLapse = 0; @@ -93,4 +93,4 @@ local function StyleLightHeaded() LightHeaded_Panel_Button2:Disable() end end -MOD:SaveAddonStyle("Lightheaded", StyleLightHeaded) \ No newline at end of file +STYLE:SaveAddonStyle("Lightheaded", StyleLightHeaded) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Mogit.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Mogit.lua index d6f84d1..e64eb74 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Mogit.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Mogit.lua @@ -30,16 +30,16 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## MOGIT ########################################################## ]]-- local function StyleMogIt() - MOD:ApplyFrameStyle(MogItFrame) + STYLE:ApplyFrameStyle(MogItFrame) MogItFrameInset:Formula409(true) - MOD:ApplyFrameStyle(MogItFilters) + STYLE:ApplyFrameStyle(MogItFilters) MogItFiltersInset:Formula409(true) local function StyleMogItPreview() for i = 1, 99 do @@ -60,24 +60,24 @@ local function StyleMogIt() } for _, object in pairs(MogItGearSlots) do if _G["MogItPreview"..i..object] then - MOD:ApplyLinkButtonStyle(_G["MogItPreview"..i..object]) + STYLE:ApplyLinkButtonStyle(_G["MogItPreview"..i..object]) _G["MogItPreview"..i..object]:SetPushedTexture(nil) _G["MogItPreview"..i..object]:SetHighlightTexture(nil) end end - if _G["MogItPreview"..i] then MOD:ApplyFrameStyle(_G["MogItPreview"..i]) end - if _G["MogItPreview"..i.."CloseButton"] then MOD:ApplyCloseButtonStyle(_G["MogItPreview"..i.."CloseButton"]) end + if _G["MogItPreview"..i] then STYLE:ApplyFrameStyle(_G["MogItPreview"..i]) end + if _G["MogItPreview"..i.."CloseButton"] then STYLE:ApplyCloseButtonStyle(_G["MogItPreview"..i.."CloseButton"]) end if _G["MogItPreview"..i.."Inset"] then _G["MogItPreview"..i.."Inset"]:Formula409(true) end if _G["MogItPreview"..i.."Activate"] then _G["MogItPreview"..i.."Activate"]:SetButtonTemplate() end end end hooksecurefunc(MogIt, "CreatePreview", StyleMogItPreview) - MOD:ApplyTooltipStyle(MogItTooltip) - MOD:ApplyCloseButtonStyle(MogItFrameCloseButton) - MOD:ApplyCloseButtonStyle(MogItFiltersCloseButton) + STYLE:ApplyTooltipStyle(MogItTooltip) + STYLE:ApplyCloseButtonStyle(MogItFrameCloseButton) + STYLE:ApplyCloseButtonStyle(MogItFiltersCloseButton) MogItFrameFiltersDefaults:Formula409(true) MogItFrameFiltersDefaults:SetButtonTemplate() - MOD:ApplyScrollStyle(MogItScroll) - MOD:ApplyScrollStyle(MogItFiltersScrollScrollBar) + STYLE:ApplyScrollStyle(MogItScroll) + STYLE:ApplyScrollStyle(MogItFiltersScrollScrollBar) end -MOD:SaveAddonStyle("MogIt", StyleMogIt) \ No newline at end of file +STYLE:SaveAddonStyle("MogIt", StyleMogIt) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Omen.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Omen.lua index 0cfbb6d..cd2801c 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Omen.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Omen.lua @@ -30,7 +30,7 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; local DOCK = SuperVillain.Registry:Expose('SVDock'); --[[ ########################################################## @@ -46,7 +46,7 @@ local function StyleOmen() hooksecurefunc(Omen, 'UpdateBackdrop', function(self) if not DOCK.CurrentlyDocked["OmenAnchor"] then - MOD:ApplyFrameStyle(self.BarList, 'Transparent') + STYLE:ApplyFrameStyle(self.BarList, 'Transparent') self.Title:Formula409() self.Title:SetPanelTemplate("Default") self.Title:SetPanelColor("class") @@ -68,9 +68,9 @@ local function StyleOmen() Omen:ReAnchorBars() Omen:ResizeBars() end -MOD:SaveAddonStyle("Omen", StyleOmen) +STYLE:SaveAddonStyle("Omen", StyleOmen) -function MOD:Docklet_Omen(parent) +function STYLE:Docklet_Omen(parent) if not Omen then return end; local db=Omen.db; db.profile.Scale=1; diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Outfitter.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Outfitter.lua index c68fe05..5ffb382 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Outfitter.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Outfitter.lua @@ -30,7 +30,7 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## OUTFITTER @@ -39,7 +39,7 @@ OUTFITTER local function StyleOutfitter() CharacterFrame:HookScript("OnShow", function(self) PaperDollSidebarTabs:SetPoint("BOTTOMRIGHT", CharacterFrameInsetRight, "TOPRIGHT", -14, 0) end) OutfitterFrame:HookScript("OnShow", function(self) - MOD:ApplyFrameStyle(OutfitterFrame) + STYLE:ApplyFrameStyle(OutfitterFrame) OutfitterFrameTab1:Size(60, 25) OutfitterFrameTab2:Size(60, 25) OutfitterFrameTab3:Size(60, 25) @@ -63,8 +63,8 @@ local function StyleOutfitter() OutfitterFrameTab1:SetButtonTemplate() OutfitterFrameTab2:SetButtonTemplate() OutfitterFrameTab3:SetButtonTemplate() - MOD:ApplyScrollStyle(OutfitterMainFrameScrollFrameScrollBar) - MOD:ApplyCloseButtonStyle(OutfitterCloseButton) + STYLE:ApplyScrollStyle(OutfitterMainFrameScrollFrameScrollBar) + STYLE:ApplyCloseButtonStyle(OutfitterCloseButton) OutfitterNewButton:SetButtonTemplate() OutfitterEnableNone:SetButtonTemplate() OutfitterEnableAll:SetButtonTemplate() @@ -105,11 +105,11 @@ local function StyleOutfitter() OutfitterShowOutfitBar:Point("TOPLEFT", OutfitterAutoSwitch, "BOTTOMLEFT", 0, -5) OutfitterEditScriptDialogDoneButton:SetButtonTemplate() OutfitterEditScriptDialogCancelButton:SetButtonTemplate() - MOD:ApplyScrollStyle(OutfitterEditScriptDialogSourceScriptScrollBar) - MOD:ApplyFrameStyle(OutfitterEditScriptDialogSourceScript,"Transparent") - MOD:ApplyFrameStyle(OutfitterEditScriptDialog) - MOD:ApplyCloseButtonStyle(OutfitterEditScriptDialog.CloseButton) - MOD:ApplyTabStyle(OutfitterEditScriptDialogTab1) - MOD:ApplyTabStyle(OutfitterEditScriptDialogTab2) + STYLE:ApplyScrollStyle(OutfitterEditScriptDialogSourceScriptScrollBar) + STYLE:ApplyFrameStyle(OutfitterEditScriptDialogSourceScript,"Transparent") + STYLE:ApplyFrameStyle(OutfitterEditScriptDialog) + STYLE:ApplyCloseButtonStyle(OutfitterEditScriptDialog.CloseButton) + STYLE:ApplyTabStyle(OutfitterEditScriptDialogTab1) + STYLE:ApplyTabStyle(OutfitterEditScriptDialogTab2) end -MOD:SaveAddonStyle("Outfitter", StyleOutfitter) \ No newline at end of file +STYLE:SaveAddonStyle("Outfitter", StyleOutfitter) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Postal.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Postal.lua index 775b9bd..189ed2a 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Postal.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Postal.lua @@ -30,7 +30,7 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## POSTAL @@ -56,7 +56,7 @@ local function StylePostal() PostalSelectOpenButton:Point("RIGHT", InboxFrame, "TOP", -41, -48) end if Postal_OpenAllMenuButton and not Postal_OpenAllMenuButton.handled then - MOD:ApplyPaginationStyle(Postal_OpenAllMenuButton, true) + STYLE:ApplyPaginationStyle(Postal_OpenAllMenuButton, true) Postal_OpenAllMenuButton:SetPoint('LEFT', PostalOpenAllButton, 'RIGHT', 5, 0) Postal_OpenAllMenuButton.handled = true end @@ -71,14 +71,14 @@ local function StylePostal() PostalSelectReturnButton:Point("LEFT", InboxFrame, "TOP", -5, -48) end if Postal_PackageMenuButton and not Postal_PackageMenuButton.handled then - MOD:ApplyPaginationStyle(Postal_PackageMenuButton, true) + STYLE:ApplyPaginationStyle(Postal_PackageMenuButton, true) Postal_PackageMenuButton.handled = true Postal_PackageMenuButton:SetPoint('TOPRIGHT', MailFrame, -53, -6) end if Postal_BlackBookButton and not Postal_BlackBookButton.handled then - MOD:ApplyPaginationStyle(Postal_BlackBookButton, true) + STYLE:ApplyPaginationStyle(Postal_BlackBookButton, true) Postal_BlackBookButton.handled = true Postal_BlackBookButton:SetPoint('LEFT', SendMailNameEditBox, 'RIGHT', 5, 2) end end -MOD:SaveAddonStyle("Postal", StylePostal, 'MAIL_SHOW') \ No newline at end of file +STYLE:SaveAddonStyle("Postal", StylePostal, 'MAIL_SHOW') \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Quartz.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Quartz.lua index d8b5ff6..5e7587e 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Quartz.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Quartz.lua @@ -30,7 +30,7 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## QUARTZ @@ -43,10 +43,10 @@ local function StyleQuartz() local function StyleQuartzBar(self) if not self.isStyled then self.IconBorder = CreateFrame("Frame", nil, self) - MOD:ApplyFrameStyle(self.IconBorder,"Transparent") + STYLE:ApplyFrameStyle(self.IconBorder,"Transparent") self.IconBorder:SetFrameLevel(0) self.IconBorder:WrapOuter(self.Icon) - MOD:ApplyFrameStyle(self.Bar,"Transparent",true) + STYLE:ApplyFrameStyle(self.Bar,"Transparent",true) self.isStyled = true end if self.config.hideicon then @@ -61,9 +61,9 @@ local function StyleQuartz() if GCD then hooksecurefunc(GCD, 'CheckGCD', function() if not Quartz3GCDBar.backdrop then - MOD:ApplyFrameStyle(Quartz3GCDBar,"Transparent",true) + STYLE:ApplyFrameStyle(Quartz3GCDBar,"Transparent",true) end end) end end -MOD:SaveAddonStyle("Quartz", StyleQuartz) \ No newline at end of file +STYLE:SaveAddonStyle("Quartz", StyleQuartz) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Recount.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Recount.lua index d5289ba..a661858 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Recount.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Recount.lua @@ -30,7 +30,7 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; local DOCK = SuperVillain.Registry:Expose('SVDock'); --[[ ########################################################## @@ -53,11 +53,11 @@ end; local function StyleRecount() function Recount:ShowReset() - MOD:LoadAlert(L['Reset Recount?'], function(self) Recount:ResetData() self:GetParent():Hide() end) + STYLE:LoadAlert(L['Reset Recount?'], function(self) Recount:ResetData() self:GetParent():Hide() end) end local function StyleFrame(frame) - MOD:ApplyFrameStyle(frame,"Transparent") + STYLE:ApplyFrameStyle(frame,"Transparent") frame.Panel:SetAllPoints() frame.Panel:SetPoint('TOPLEFT', frame, 'TOPLEFT', 0, -6) frame.CloseButton:SetPoint('TOPRIGHT', frame, 'TOPRIGHT', -1, -9) @@ -102,10 +102,10 @@ local function StyleRecount() end end - MOD:ApplyScrollStyle(Recount_MainWindow_ScrollBarScrollBar) + STYLE:ApplyScrollStyle(Recount_MainWindow_ScrollBarScrollBar) Recount_MainWindow:HookScript('OnShow', function(self) if InCombatLockdown() then return end;if DOCK.CurrentlyDocked["Recount_MainWindow"] then SuperDockWindowRight:Show() end end) - Recount.MainWindow.FileButton:HookScript('OnClick', function(self) if LibDropdownFrame0 then MOD:ApplyFrameStyle(LibDropdownFrame0) end end) + Recount.MainWindow.FileButton:HookScript('OnClick', function(self) if LibDropdownFrame0 then STYLE:ApplyFrameStyle(LibDropdownFrame0) end end) hooksecurefunc(Recount, 'ShowScrollbarElements', function(self, name) Recount_MainWindow_ScrollBarScrollBar:Show() end) hooksecurefunc(Recount, 'HideScrollbarElements', function(self, name) Recount_MainWindow_ScrollBarScrollBar:Hide() end) @@ -114,15 +114,15 @@ local function StyleRecount() hooksecurefunc(Recount, 'ShowReport', function(self) if Recount_ReportWindow.isStyled then return end Recount_ReportWindow.isStyled = true - MOD:ApplyFrameStyle(Recount_ReportWindow.Whisper) + STYLE:ApplyFrameStyle(Recount_ReportWindow.Whisper) Recount_ReportWindow.ReportButton:SetButtonTemplate() - MOD:ApplyScrollbarStyle(Recount_ReportWindow_Slider) + STYLE:ApplyScrollbarStyle(Recount_ReportWindow_Slider) Recount_ReportWindow_Slider:GetThumbTexture():Size(6,6) end) end -MOD:SaveAddonStyle("Recount", StyleRecount) +STYLE:SaveAddonStyle("Recount", StyleRecount) -function MOD:Docklet_Recount(parent) +function STYLE:Docklet_Recount(parent) if not Recount then return end; local n=Recount.MainWindow.Panel; if n and not n.Panel then diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/SexyCooldown.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/SexyCooldown.lua index 5905a21..90e55f8 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/SexyCooldown.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/SexyCooldown.lua @@ -30,7 +30,7 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## SEXYCOOLDOWN @@ -53,9 +53,9 @@ local function StyleSexyCooldown() end local function StyleSexyCooldownBar(bar) SCDStripStyleSettings(bar) - MOD:ApplyFrameStyle(bar) + STYLE:ApplyFrameStyle(bar) SuperVillain:AddToDisplayAudit(bar) - if MOD:IsAddonReady("DockletSexyCooldown") then + if STYLE:IsAddonReady("DockletSexyCooldown") then bar:ClearAllPoints() bar:Point('BOTTOMRIGHT', SVUI_ActionBar1, 'TOPRIGHT', 0, 2) bar:Point("BOTTOMLEFT", SVUI_ActionBar1, "TOPLEFT", 0, 2) @@ -64,8 +64,8 @@ local function StyleSexyCooldown() end local function StyleSexyCooldownIcon(bar, icon) if not icon.styled then - MOD:ApplyFrameStyle(icon, false, true) - MOD:ApplyFrameStyle(icon.overlay,"Transparent",true) + STYLE:ApplyFrameStyle(icon, false, true) + STYLE:ApplyFrameStyle(icon.overlay,"Transparent",true) icon.styled = true end icon.overlay.tex:SetTexCoord(0.1,0.9,0.1,0.9) @@ -93,4 +93,4 @@ local function StyleSexyCooldown() end end) end -MOD:SaveAddonStyle("SexyCooldown", StyleSexyCooldown) \ No newline at end of file +STYLE:SaveAddonStyle("SexyCooldown", StyleSexyCooldown) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Skada.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Skada.lua index 6eb1941..10e8df3 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Skada.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Skada.lua @@ -31,7 +31,7 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; local DOCK = SuperVillain.Registry:Expose('SVDock'); local activePanels = {}; --[[ @@ -47,7 +47,7 @@ eFrame:SetAllPoints() local function StyleSkada() function Skada:ShowPopup() - MOD:LoadAlert(L['Do you want to reset Skada?'], function(self) Skada:Reset() self:GetParent():Hide() end) + STYLE:LoadAlert(L['Do you want to reset Skada?'], function(self) Skada:Reset() self:GetParent():Hide() end) end local SkadaDisplayBar = Skada.displays['bar'] @@ -70,7 +70,7 @@ local function StyleSkada() skada.button:SetFixedPanelTemplate('Default', true) end if(not skada.Panel) then - MOD:ApplyFrameStyle(skada) + STYLE:ApplyFrameStyle(skada) end if(skada.Panel) then skada.Panel:ClearAllPoints() @@ -93,24 +93,24 @@ local function StyleSkada() hooksecurefunc(Skada, 'CreateWindow', function() if DOCK.CurrentlyDocked["SkadaHolder"] or DOCK.CurrentlyDocked["SkadaHolder2"] then - MOD:Docklet_Skada() + STYLE:Docklet_Skada() end end) hooksecurefunc(Skada, 'DeleteWindow', function() if DOCK.CurrentlyDocked["SkadaHolder"] or DOCK.CurrentlyDocked["SkadaHolder2"] then - MOD:Docklet_Skada() + STYLE:Docklet_Skada() end end) hooksecurefunc(Skada, 'UpdateDisplay', function() if DOCK.CurrentlyDocked["SkadaHolder"] or DOCK.CurrentlyDocked["SkadaHolder2"] then - MOD:Docklet_Skada() + STYLE:Docklet_Skada() end end) end -MOD:SaveAddonStyle("Skada", StyleSkada) +STYLE:SaveAddonStyle("Skada", StyleSkada) -function MOD:Docklet_Skada() +function STYLE:Docklet_Skada() if not Skada then return end; local function skada_panel_loader(holder, window, width, height, parent) diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TinyDPS.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TinyDPS.lua index eb7b1bc..b814e53 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TinyDPS.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TinyDPS.lua @@ -30,7 +30,7 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; local DOCK = SuperVillain.Registry:Expose('SVDock'); --[[ ########################################################## @@ -38,7 +38,7 @@ TINYDPS ########################################################## ]]-- local function StyleTinyDPS() - MOD:ApplyFrameStyle(tdpsFrame) + STYLE:ApplyFrameStyle(tdpsFrame) tdpsFrame:HookScript('OnShow', function() if InCombatLockdown() then return end; @@ -54,9 +54,9 @@ local function StyleTinyDPS() tdpsRefresh() end -MOD:SaveAddonStyle("TinyDPS", StyleTinyDPS) +STYLE:SaveAddonStyle("TinyDPS", StyleTinyDPS) -function MOD:Docklet_TinyDPS(parent) +function STYLE:Docklet_TinyDPS(parent) if not tdpsFrame then return end; tdpsFrame:SetFixedPanelTemplate('Transparent',true) tdpsFrame:SetFrameStrata('LOW') diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TomTom.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TomTom.lua index dcb00f6..3d35340 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TomTom.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TomTom.lua @@ -30,7 +30,7 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## TOMTOM @@ -38,7 +38,7 @@ TOMTOM ]]-- local function StyleTomTom() if TomTomBlock then - MOD:ApplyFrameStyle(TomTomBlock) + STYLE:ApplyFrameStyle(TomTomBlock) end end -MOD:SaveAddonStyle("TomTom", StyleTomTom) \ No newline at end of file +STYLE:SaveAddonStyle("TomTom", StyleTomTom) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TradeSkillDW.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TradeSkillDW.lua index c06d07a..73c6b44 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TradeSkillDW.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TradeSkillDW.lua @@ -30,7 +30,7 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## TSDW @@ -44,17 +44,17 @@ local function StyleTradeSkillDW() TradeSkillExpandButtonFrame:Formula409(true) TradeSkillDetailScrollChildFrame:Formula409(true) TradeSkillListScrollFrame:Formula409(true) - MOD:ApplyFrameStyle(TradeSkillGuildFrame,"Transparent") - MOD:ApplyFrameStyle(TradeSkillGuildFrameContainer,"Transparent") + STYLE:ApplyFrameStyle(TradeSkillGuildFrame,"Transparent") + STYLE:ApplyFrameStyle(TradeSkillGuildFrameContainer,"Transparent") TradeSkillGuildFrame:Point("BOTTOMLEFT", TradeSkillFrame, "BOTTOMRIGHT", 3, 19) - MOD:ApplyCloseButtonStyle(TradeSkillGuildFrameCloseButton) + STYLE:ApplyCloseButtonStyle(TradeSkillGuildFrameCloseButton) TradeSkillFrame:HookScript("OnShow", function() - MOD:ApplyFrameStyle(TradeSkillFrame) + STYLE:ApplyFrameStyle(TradeSkillFrame) TradeSkillListScrollFrame:Formula409() if not TradeSkillDWExpandButton then return end if not TradeSkillDWExpandButton.styled then - MOD:ApplyPaginationStyle(TradeSkillDWExpandButton) + STYLE:ApplyPaginationStyle(TradeSkillDWExpandButton) TradeSkillDWExpandButton.styled = true end end) @@ -70,14 +70,14 @@ local function StyleTradeSkillDW() TradeSkillLinkButton:GetNormalTexture():SetTexCoord(0.25, 0.7, 0.37, 0.75) TradeSkillLinkButton:GetPushedTexture():SetTexCoord(0.25, 0.7, 0.45, 0.8) TradeSkillLinkButton:GetHighlightTexture():MUNG() - MOD:ApplyFrameStyle(TradeSkillLinkButton,"Transparent") + STYLE:ApplyFrameStyle(TradeSkillLinkButton,"Transparent") TradeSkillLinkButton:Size(17, 14) TradeSkillLinkButton:Point("LEFT", TradeSkillLinkFrame, "LEFT", 5, -1) TradeSkillFrameSearchBox:SetEditboxTemplate() TradeSkillInputBox:SetEditboxTemplate() TradeSkillIncrementButton:Point("RIGHT", TradeSkillCreateButton, "LEFT", -13, 0) - MOD:ApplyCloseButtonStyle(TradeSkillFrameCloseButton) - MOD:ApplyScrollStyle(TradeSkillDetailScrollFrameScrollBar) + STYLE:ApplyCloseButtonStyle(TradeSkillFrameCloseButton) + STYLE:ApplyScrollStyle(TradeSkillDetailScrollFrameScrollBar) local once = false hooksecurefunc("TradeSkillFrame_SetSelection", function(id) TradeSkillSkillIcon:SetButtonTemplate() @@ -98,7 +98,7 @@ local function StyleTradeSkillDW() if not icon.backdrop then icon.backdrop = CreateFrame("Frame", nil, button) icon.backdrop:SetFrameLevel(button:GetFrameLevel() - 1) - MOD:ApplyFrameStyle(icon.backdrop,"Transparent") + STYLE:ApplyFrameStyle(icon.backdrop,"Transparent") icon.backdrop:Point("TOPLEFT", icon, "TOPLEFT", -2, 2) icon.backdrop:Point("BOTTOMRIGHT", icon, "BOTTOMRIGHT", 2, -2) end @@ -114,8 +114,8 @@ local function StyleTradeSkillDW() _G["TradeSkillReagent"..i.."NameFrame"]:MUNG() end end) - TradeSkillDW_QueueFrame:HookScript("OnShow", function() MOD:ApplyFrameStyle(TradeSkillDW_QueueFrame,"Transparent") end) - MOD:ApplyCloseButtonStyle(TradeSkillDW_QueueFrameCloseButton) + TradeSkillDW_QueueFrame:HookScript("OnShow", function() STYLE:ApplyFrameStyle(TradeSkillDW_QueueFrame,"Transparent") end) + STYLE:ApplyCloseButtonStyle(TradeSkillDW_QueueFrameCloseButton) TradeSkillDW_QueueFrameInset:Formula409() TradeSkillDW_QueueFrameClear:SetButtonTemplate() TradeSkillDW_QueueFrameDown:SetButtonTemplate() @@ -131,7 +131,7 @@ local function StyleTradeSkillDW() TradeSkillDW_QueueFrameDetailScrollFrameChildFrameReagent6:Formula409() TradeSkillDW_QueueFrameDetailScrollFrameChildFrameReagent7:Formula409() TradeSkillDW_QueueFrameDetailScrollFrameChildFrameReagent8:Formula409() - MOD:ApplyScrollStyle(TradeSkillDW_QueueFrameDetailScrollFrameScrollBar) + STYLE:ApplyScrollStyle(TradeSkillDW_QueueFrameDetailScrollFrameScrollBar) TradeSkillListScrollFrame:Formula409() end -MOD:SaveAddonStyle("TradeSkillDW", StyleTradeSkillDW) \ No newline at end of file +STYLE:SaveAddonStyle("TradeSkillDW", StyleTradeSkillDW) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/VEM.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/VEM.lua index 843e5a6..598c158 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/VEM.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/VEM.lua @@ -30,7 +30,7 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## VEM @@ -99,7 +99,7 @@ local function StyleVEM(event, addon) timer:ClearAllPoints() timer:SetJustifyH('RIGHT') timer:SetShadowColor(0, 0, 0, 0) - if MOD:IsAddonReady('DBMHalfBar') then + if STYLE:IsAddonReady('DBMHalfBar') then frame:SetHeight(buttonsize / 3) name:Point('BOTTOMLEFT', frame, 'TOPLEFT', 0, 4) timer:Point('BOTTOMRIGHT', frame, 'TOPRIGHT', -1, 2) @@ -174,7 +174,7 @@ local function StyleVEM(event, addon) timer:ClearAllPoints() timer:SetJustifyH('RIGHT') timer:SetShadowColor(0, 0, 0, 0) - if MOD:IsAddonReady('DBMHalfBar') then + if STYLE:IsAddonReady('DBMHalfBar') then bar:SetHeight(buttonsize / 3) name:Point('BOTTOMLEFT', bar, 'TOPLEFT', 4, 0) timer:Point('BOTTOMRIGHT', bar, 'TOPRIGHT', -4, 0) @@ -215,17 +215,17 @@ local function StyleVEM(event, addon) end if addon == 'VEM-GUI' then VEM_GUI_OptionsFrame:HookScript('OnShow', function() - MOD:ApplyFrameStyle(VEM_GUI_OptionsFrame) - MOD:ApplyFrameStyle(VEM_GUI_OptionsFrameBossMods) - MOD:ApplyFrameStyle(VEM_GUI_OptionsFrameVEMOptions) - MOD:ApplyFrameStyle(VEM_GUI_OptionsFramePanelContainer, 'Transparent', true) + STYLE:ApplyFrameStyle(VEM_GUI_OptionsFrame) + STYLE:ApplyFrameStyle(VEM_GUI_OptionsFrameBossMods) + STYLE:ApplyFrameStyle(VEM_GUI_OptionsFrameVEMOptions) + STYLE:ApplyFrameStyle(VEM_GUI_OptionsFramePanelContainer, 'Transparent', true) end) - MOD:ApplyTabStyle(VEM_GUI_OptionsFrameTab1) - MOD:ApplyTabStyle(VEM_GUI_OptionsFrameTab2) + STYLE:ApplyTabStyle(VEM_GUI_OptionsFrameTab1) + STYLE:ApplyTabStyle(VEM_GUI_OptionsFrameTab2) VEM_GUI_OptionsFrameOkay:SetButtonTemplate() VEM_GUI_OptionsFrameWebsiteButton:SetButtonTemplate() - MOD:ApplyScrollStyle(VEM_GUI_OptionsFramePanelContainerFOVScrollBar) - MOD:SafeEventRemoval("VEM", event) + STYLE:ApplyScrollStyle(VEM_GUI_OptionsFramePanelContainerFOVScrollBar) + STYLE:SafeEventRemoval("VEM", event) end end -MOD:SaveAddonStyle("VEM", StyleVEM, 'ADDON_LOADED') \ No newline at end of file +STYLE:SaveAddonStyle("VEM", StyleVEM, 'ADDON_LOADED') \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/WeakAuras.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/WeakAuras.lua index f5f4d84..446a05f 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/WeakAuras.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/WeakAuras.lua @@ -30,7 +30,7 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## WEAKAURAS @@ -39,7 +39,7 @@ WEAKAURAS local function StyleWeakAuras() local function Style_WeakAuras(frame) if not frame.Panel then - MOD:ApplyFrameStyle(frame,"Transparent") + STYLE:ApplyFrameStyle(frame,"Transparent") frame.icon.OldAlpha = frame.icon.SetAlpha frame.icon.SetAlpha = function(self, ...) frame.icon.OldAlpha(self, ...) @@ -69,4 +69,4 @@ local function StyleWeakAuras() end end end -MOD:SaveAddonStyle("WeakAuras", StyleWeakAuras) \ No newline at end of file +STYLE:SaveAddonStyle("WeakAuras", StyleWeakAuras) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/alDamageMeter.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/alDamageMeter.lua index 840c6d2..5a16e81 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/alDamageMeter.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/alDamageMeter.lua @@ -30,7 +30,7 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; local DOCK = SuperVillain.Registry:Expose('SVDock'); --[[ ########################################################## @@ -39,7 +39,7 @@ ALDAMAGEMETER ]]-- local function StyleALDamageMeter() alDamageMeterFrame.bg:MUNG() - MOD:ApplyFrameStyle(alDamageMeterFrame) + STYLE:ApplyFrameStyle(alDamageMeterFrame) alDamageMeterFrame:HookScript('OnShow', function() if InCombatLockdown() then return end; if DOCK.CurrentlyDocked["alDamagerMeterFrame"] then @@ -47,9 +47,9 @@ local function StyleALDamageMeter() end end) end -MOD:SaveAddonStyle("alDamageMeter", StyleALDamageMeter) +STYLE:SaveAddonStyle("alDamageMeter", StyleALDamageMeter) -function MOD:Docklet_alDamageMeter(parent) +function STYLE:Docklet_alDamageMeter(parent) if not _G['alDamagerMeterFrame'] then return end; local parentFrame=_G['alDamagerMeterFrame']:GetParent(); dmconf.barheight=floor(parentFrame:GetHeight()/dmconf.maxbars-dmconf.spacing) diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/timemanager.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/timemanager.lua index d03a0c9..7317137 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/timemanager.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/timemanager.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## TIMEMANAGER STYLER @@ -26,11 +26,11 @@ local function TimeManagerStyle() end; TimeManagerFrame:Formula409() TimeManagerFrame:SetPanelTemplate("Action", false) - MOD:ApplyCloseButtonStyle(TimeManagerFrameCloseButton) + STYLE:ApplyCloseButtonStyle(TimeManagerFrameCloseButton) TimeManagerFrameInset:MUNG() - MOD:ApplyDropdownStyle(TimeManagerAlarmHourDropDown, 80) - MOD:ApplyDropdownStyle(TimeManagerAlarmMinuteDropDown, 80) - MOD:ApplyDropdownStyle(TimeManagerAlarmAMPMDropDown, 80) + STYLE:ApplyDropdownStyle(TimeManagerAlarmHourDropDown, 80) + STYLE:ApplyDropdownStyle(TimeManagerAlarmMinuteDropDown, 80) + STYLE:ApplyDropdownStyle(TimeManagerAlarmAMPMDropDown, 80) TimeManagerAlarmMessageEditBox:SetEditboxTemplate() TimeManagerAlarmEnabledButton:SetCheckboxTemplate(true) TimeManagerMilitaryTimeCheck:SetCheckboxTemplate(true) @@ -49,9 +49,9 @@ local function TimeManagerStyle() StopwatchFrame.Panel:Point("TOPLEFT", 0, -17) StopwatchFrame.Panel:Point("BOTTOMRIGHT", 0, 2) StopwatchTabFrame:Formula409() - MOD:ApplyCloseButtonStyle(StopwatchCloseButton) - MOD:ApplyPaginationStyle(StopwatchPlayPauseButton) - MOD:ApplyPaginationStyle(StopwatchResetButton) + STYLE:ApplyCloseButtonStyle(StopwatchCloseButton) + STYLE:ApplyPaginationStyle(StopwatchPlayPauseButton) + STYLE:ApplyPaginationStyle(StopwatchResetButton) StopwatchPlayPauseButton:Point("RIGHT", StopwatchResetButton, "LEFT", -4, 0) StopwatchResetButton:Point("BOTTOMRIGHT", StopwatchFrame, "BOTTOMRIGHT", -4, 6) end; @@ -60,4 +60,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_TimeManager",TimeManagerStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle("Blizzard_TimeManager",TimeManagerStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/trade.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/trade.lua index 9595004..0acff18 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/trade.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/trade.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## TRADEFRAME STYLER @@ -30,7 +30,7 @@ local function TradeFrameStyle() TradeFrameInset:MUNG() TradeFrameTradeButton:SetButtonTemplate() TradeFrameCancelButton:SetButtonTemplate() - MOD:ApplyCloseButtonStyle(TradeFrameCloseButton, TradeFrame.Panel) + STYLE:ApplyCloseButtonStyle(TradeFrameCloseButton, TradeFrame.Panel) TradePlayerInputMoneyFrameGold:SetEditboxTemplate() TradePlayerInputMoneyFrameSilver:SetEditboxTemplate() TradePlayerInputMoneyFrameCopper:SetEditboxTemplate() @@ -107,4 +107,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(TradeFrameStyle) \ No newline at end of file +STYLE:SaveCustomStyle(TradeFrameStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/tradeskill.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/tradeskill.lua index 036cc04..ffc78dd 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/tradeskill.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/tradeskill.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## TRADESKILL STYLER @@ -43,8 +43,8 @@ local function TradeSkillStyle() TradeSkillFilterButton.Panel:SetAllPoints() TradeSkillCreateAllButton:SetButtonTemplate() TradeSkillViewGuildCraftersButton:SetButtonTemplate() - MOD:ApplyScrollStyle(TradeSkillListScrollFrameScrollBar) - MOD:ApplyScrollStyle(TradeSkillDetailScrollFrameScrollBar) + STYLE:ApplyScrollStyle(TradeSkillListScrollFrameScrollBar) + STYLE:ApplyScrollStyle(TradeSkillDetailScrollFrameScrollBar) TradeSkillLinkButton:GetNormalTexture():SetTexCoord(0.25, 0.7, 0.37, 0.75) TradeSkillLinkButton:GetPushedTexture():SetTexCoord(0.25, 0.7, 0.45, 0.8) TradeSkillLinkButton:GetHighlightTexture():MUNG() @@ -53,10 +53,10 @@ local function TradeSkillStyle() TradeSkillLinkButton:Point("LEFT", TradeSkillLinkFrame, "LEFT", 5, -1) TradeSkillFrameSearchBox:SetEditboxTemplate() TradeSkillInputBox:SetEditboxTemplate() - MOD:ApplyPaginationStyle(TradeSkillDecrementButton) - MOD:ApplyPaginationStyle(TradeSkillIncrementButton) + STYLE:ApplyPaginationStyle(TradeSkillDecrementButton) + STYLE:ApplyPaginationStyle(TradeSkillIncrementButton) TradeSkillIncrementButton:Point("RIGHT", TradeSkillCreateButton, "LEFT", -13, 0) - MOD:ApplyCloseButtonStyle(TradeSkillFrameCloseButton) + STYLE:ApplyCloseButtonStyle(TradeSkillFrameCloseButton) local internalTest = false; hooksecurefunc("TradeSkillFrame_SetSelection", function(_) if TradeSkillSkillIcon:GetNormalTexture() then @@ -100,11 +100,11 @@ local function TradeSkillStyle() TradeSkillGuildFrame:Point("BOTTOMLEFT", TradeSkillFrame, "BOTTOMRIGHT", 3, 19) TradeSkillGuildFrameContainer:Formula409() TradeSkillGuildFrameContainer:SetPanelTemplate("Inset") - MOD:ApplyCloseButtonStyle(TradeSkillGuildFrameCloseButton) + STYLE:ApplyCloseButtonStyle(TradeSkillGuildFrameCloseButton) end; --[[ ########################################################## STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_TradeSkillUI",TradeSkillStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle("Blizzard_TradeSkillUI",TradeSkillStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/trainer.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/trainer.lua index d8575c3..50b2469 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/trainer.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/trainer.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -51,7 +51,7 @@ local function TrainerStyle() _G["ClassTrainerScrollFrameButton"..i].selectedTex:SetTexture(1, 1, 1, 0.3) _G["ClassTrainerScrollFrameButton"..i].selectedTex:FillInner() end; - MOD:ApplyScrollStyle(ClassTrainerScrollFrameScrollBar, 5) + STYLE:ApplyScrollStyle(ClassTrainerScrollFrameScrollBar, 5) for _,frame in pairs(ClassTrainerFrameList)do _G[frame]:Formula409() end; @@ -60,11 +60,11 @@ local function TrainerStyle() end; _G["ClassTrainerTrainButton"]:Formula409() _G["ClassTrainerTrainButton"]:SetButtonTemplate() - MOD:ApplyDropdownStyle(ClassTrainerFrameFilterDropDown, 155) + STYLE:ApplyDropdownStyle(ClassTrainerFrameFilterDropDown, 155) ClassTrainerFrame:SetHeight(ClassTrainerFrame:GetHeight()+42) ClassTrainerFrame:SetPanelTemplate("Halftone") ClassTrainerScrollFrame:SetFixedPanelTemplate("Inset") - MOD:ApplyCloseButtonStyle(ClassTrainerFrameCloseButton, ClassTrainerFrame) + STYLE:ApplyCloseButtonStyle(ClassTrainerFrameCloseButton, ClassTrainerFrame) ClassTrainerFrameSkillStepButton.icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) ClassTrainerFrameSkillStepButton:SetFixedPanelTemplate("Button", true) --ClassTrainerFrameSkillStepButton.Panel:WrapOuter(ClassTrainerFrameSkillStepButton.icon) @@ -82,4 +82,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_TrainerUI",TrainerStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle("Blizzard_TrainerUI",TrainerStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/transmog.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/transmog.lua index 1358ca7..9c8f398 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/transmog.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/transmog.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -60,7 +60,7 @@ local function TransmogStyle() TransmogrifyFrameButtonFrame:GetRegions():MUNG() TransmogrifyApplyButton:SetButtonTemplate() TransmogrifyApplyButton:Point("BOTTOMRIGHT", TransmogrifyFrame, "BOTTOMRIGHT", -4, 4) - MOD:ApplyCloseButtonStyle(TransmogrifyArtFrameCloseButton) + STYLE:ApplyCloseButtonStyle(TransmogrifyArtFrameCloseButton) TransmogrifyArtFrame:Formula409() for p, a9 in pairs(TransmogSlotList)do local icon = _G["TransmogrifyFrame"..a9 .."SlotIconTexture"] @@ -81,12 +81,12 @@ local function TransmogStyle() TransmogrifyConfirmationPopup:SetPanelTemplate("Pattern") TransmogrifyConfirmationPopup.Button1:SetButtonTemplate() TransmogrifyConfirmationPopup.Button2:SetButtonTemplate() - MOD:ApplyLinkButtonStyle(TransmogrifyConfirmationPopupItemFrame1, true) - MOD:ApplyLinkButtonStyle(TransmogrifyConfirmationPopupItemFrame2, true) + STYLE:ApplyLinkButtonStyle(TransmogrifyConfirmationPopupItemFrame1, true) + STYLE:ApplyLinkButtonStyle(TransmogrifyConfirmationPopupItemFrame2, true) end; --[[ ########################################################## STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_ItemAlterationUI",TransmogStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle("Blizzard_ItemAlterationUI",TransmogStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/voidstorage.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/voidstorage.lua index 6ce61fa..5c3e725 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/voidstorage.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/voidstorage.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -50,7 +50,7 @@ local function VoidStorageStyle() VoidStoragePurchaseButton:SetButtonTemplate() VoidStorageHelpBoxButton:SetButtonTemplate() VoidStorageTransferButton:SetButtonTemplate() - MOD:ApplyCloseButtonStyle(VoidStorageBorderFrame.CloseButton) + STYLE:ApplyCloseButtonStyle(VoidStorageBorderFrame.CloseButton) VoidItemSearchBox:SetPanelTemplate("Inset") VoidItemSearchBox.Panel:Point("TOPLEFT", 10, -1) VoidItemSearchBox.Panel:Point("BOTTOMRIGHT", 4, 1) @@ -82,4 +82,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveBlizzardStyle("Blizzard_VoidStorageUI",VoidStorageStyle) \ No newline at end of file +STYLE:SaveBlizzardStyle("Blizzard_VoidStorageUI",VoidStorageStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/worldmap.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/worldmap.lua index 85dd9e4..a069454 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/worldmap.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/worldmap.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## HELPERS @@ -113,9 +113,9 @@ WORLDMAP STYLER local function WorldMapQuestStyle() if SuperVillain.db.SVStyle.blizzard.enable ~= true or SuperVillain.db.SVStyle.blizzard.worldmap ~= true then return end WorldMapFrame:SetFrameLevel(2) - MOD:ApplyScrollStyle(WorldMapQuestScrollFrameScrollBar) - MOD:ApplyScrollStyle(WorldMapQuestDetailScrollFrameScrollBar, 4) - MOD:ApplyScrollStyle(WorldMapQuestRewardScrollFrameScrollBar, 4) + STYLE:ApplyScrollStyle(WorldMapQuestScrollFrameScrollBar) + STYLE:ApplyScrollStyle(WorldMapQuestDetailScrollFrameScrollBar, 4) + STYLE:ApplyScrollStyle(WorldMapQuestRewardScrollFrameScrollBar, 4) WorldMapFrame:SetPanelTemplate("Transparent") WorldMapFrame.Panel:SetFrameLevel(1) WorldMapFrame.backdrop = CreateFrame("Frame", nil, WorldMapFrame) @@ -126,17 +126,17 @@ local function WorldMapQuestStyle() WorldMapArchaeologyDigSites:SetFrameLevel(6) WorldMapDetailFrame:SetPanelTemplate("Inset") WorldMapDetailFrame.Panel:SetFrameLevel(3) - MOD:ApplyCloseButtonStyle(WorldMapFrameCloseButton) - MOD:ApplyCloseButtonStyle(WorldMapFrameSizeDownButton) - MOD:ApplyCloseButtonStyle(WorldMapFrameSizeUpButton) + STYLE:ApplyCloseButtonStyle(WorldMapFrameCloseButton) + STYLE:ApplyCloseButtonStyle(WorldMapFrameSizeDownButton) + STYLE:ApplyCloseButtonStyle(WorldMapFrameSizeUpButton) WorldMapFrameSizeDownButton:SetFrameLevel(50) WorldMapFrameSizeUpButton:SetFrameLevel(50) WorldMapFrameCloseButton:SetFrameLevel(50) - MOD:ApplyDropdownStyle(WorldMapLevelDropDown) - MOD:ApplyDropdownStyle(WorldMapZoneMinimapDropDown) - MOD:ApplyDropdownStyle(WorldMapContinentDropDown) - MOD:ApplyDropdownStyle(WorldMapZoneDropDown) - MOD:ApplyDropdownStyle(WorldMapShowDropDown) + STYLE:ApplyDropdownStyle(WorldMapLevelDropDown) + STYLE:ApplyDropdownStyle(WorldMapZoneMinimapDropDown) + STYLE:ApplyDropdownStyle(WorldMapContinentDropDown) + STYLE:ApplyDropdownStyle(WorldMapZoneDropDown) + STYLE:ApplyDropdownStyle(WorldMapShowDropDown) WorldMapZoomOutButton:SetButtonTemplate() WorldMapTrackQuest:SetCheckboxTemplate(true) WorldMapFrame:HookScript("OnShow", WorldMap_OnShow) @@ -150,7 +150,7 @@ end STYLE LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(WorldMapQuestStyle) +STYLE:SaveCustomStyle(WorldMapQuestStyle) --[[ function ArchaeologyDigSiteFrame_OnUpdate() diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/worldstate.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/worldstate.lua index 80f0710..1f809df 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/worldstate.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/worldstate.lua @@ -14,7 +14,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## --]] local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose("SVStyle"); +local STYLE = _G.StyleVillain; --[[ ########################################################## WORLDSTATE STYLER @@ -25,12 +25,12 @@ local function WorldStateStyle() WorldStateScoreScrollFrame:Formula409() WorldStateScoreFrame:Formula409() WorldStateScoreFrame:SetPanelTemplate("Halftone") - MOD:ApplyCloseButtonStyle(WorldStateScoreFrameCloseButton) - MOD:ApplyScrollStyle(WorldStateScoreScrollFrameScrollBar) + STYLE:ApplyCloseButtonStyle(WorldStateScoreFrameCloseButton) + STYLE:ApplyScrollStyle(WorldStateScoreScrollFrameScrollBar) WorldStateScoreFrameInset:SetAlpha(0) WorldStateScoreFrameLeaveButton:SetButtonTemplate() for b = 1, 3 do - MOD:ApplyTabStyle(_G["WorldStateScoreFrameTab"..b]) + STYLE:ApplyTabStyle(_G["WorldStateScoreFrameTab"..b]) end end; --[[ @@ -38,4 +38,4 @@ end; STYLE LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(WorldStateStyle) \ No newline at end of file +STYLE:SaveCustomStyle(WorldStateStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/common/methods.lua b/Interface/AddOns/SVUI_StyleOMatic/common/methods.lua index 3aa2298..69f5831 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/common/methods.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/common/methods.lua @@ -36,7 +36,7 @@ GET ADDON DATA ########################################################## ]]-- local SuperVillain, L = unpack(SVUI); -local MOD = SuperVillain.Registry:Expose('SVStyle'); +local STYLE = _G.StyleVillain; --[[ ########################################################## LOCAL FUNCTIONS @@ -95,7 +95,7 @@ end CORE FUNCTIONS ########################################################## ]]-- -function MOD:ApplyCloseButtonStyle(this, anchor) +function STYLE:ApplyCloseButtonStyle(this, anchor) if not this then return end; if not this.hookedColors then this:HookScript("OnEnter", CloseButton_OnEnter) @@ -107,7 +107,7 @@ function MOD:ApplyCloseButtonStyle(this, anchor) end end; -function MOD:ApplyScrollStyle(this) +function STYLE:ApplyScrollStyle(this) if(not this or (this and this.appliedStyle)) then return end; if _G[this:GetName().."BG"]then _G[this:GetName().."BG"]:SetTexture(nil) @@ -127,13 +127,13 @@ function MOD:ApplyScrollStyle(this) if _G[this:GetName().."ScrollUpButton"] and _G[this:GetName().."ScrollDownButton"]then _G[this:GetName().."ScrollUpButton"]:Formula409() if not _G[this:GetName().."ScrollUpButton"].icon then - MOD:ApplyPaginationStyle(_G[this:GetName().."ScrollUpButton"]) + STYLE:ApplyPaginationStyle(_G[this:GetName().."ScrollUpButton"]) SquareButton_SetIcon(_G[this:GetName().."ScrollUpButton"], "UP") _G[this:GetName().."ScrollUpButton"]:Size(_G[this:GetName().."ScrollUpButton"]:GetWidth() + 7, _G[this:GetName().."ScrollUpButton"]:GetHeight() + 7) end; _G[this:GetName().."ScrollDownButton"]:Formula409() if not _G[this:GetName().."ScrollDownButton"].icon then - MOD:ApplyPaginationStyle(_G[this:GetName().."ScrollDownButton"]) + STYLE:ApplyPaginationStyle(_G[this:GetName().."ScrollDownButton"]) SquareButton_SetIcon(_G[this:GetName().."ScrollDownButton"], "DOWN") _G[this:GetName().."ScrollDownButton"]:Size(_G[this:GetName().."ScrollDownButton"]:GetWidth() + 7, _G[this:GetName().."ScrollDownButton"]:GetHeight() + 7) end; @@ -148,7 +148,7 @@ function MOD:ApplyScrollStyle(this) this.appliedStyle = true end; -function MOD:ApplyScrollbarStyle(this) +function STYLE:ApplyScrollbarStyle(this) if(not this or (this and this.appliedStyle)) then return end; this:Formula409() this:SetFixedPanelTemplate("Inset") @@ -175,7 +175,7 @@ function MOD:ApplyScrollbarStyle(this) this.appliedStyle = true end; -function MOD:ApplyTabStyle(this) +function STYLE:ApplyTabStyle(this) if(not this or (this and this.appliedStyle)) then return end; local tab = this:GetName(); @@ -205,7 +205,7 @@ function MOD:ApplyTabStyle(this) this.appliedStyle = true end; -function MOD:ApplyPaginationStyle(button, isVertical) +function STYLE:ApplyPaginationStyle(button, isVertical) if(not button or not button:GetName() or (button and button.appliedStyle)) then return end; local c,d,e; local leftDown = (button:GetName() and find(button:GetName():lower(),'left')) or find(button:GetName():lower(),'prev') or find(button:GetName():lower(),'decrement') @@ -250,7 +250,7 @@ function MOD:ApplyPaginationStyle(button, isVertical) button.appliedStyle = true end; -function MOD:ApplyDropdownStyle(this, width) +function STYLE:ApplyDropdownStyle(this, width) if(not this or (this and this.appliedStyle)) then return end; local ddname = this:GetName(); local button = _G[this:GetName().."Button"] @@ -267,7 +267,7 @@ function MOD:ApplyDropdownStyle(this, width) button:Point("RIGHT", this, "RIGHT", -10, 3, true) end end) - MOD:ApplyPaginationStyle(button, true) + STYLE:ApplyPaginationStyle(button, true) local bg = CreateFrame("Frame", nil, this) bg:Point("TOPLEFT", this, "TOPLEFT", 20, -2) bg:Point("BOTTOMRIGHT", button, "BOTTOMRIGHT", 2, -2) @@ -275,7 +275,7 @@ function MOD:ApplyDropdownStyle(this, width) this.appliedStyle = true end; -function MOD:ApplyLinkButtonStyle(this, adjust, shrink) +function STYLE:ApplyLinkButtonStyle(this, adjust, shrink) if(not this or (this and this.appliedStyle)) then return end; local link = this:GetName() @@ -323,7 +323,7 @@ function MOD:ApplyLinkButtonStyle(this, adjust, shrink) this.appliedStyle = true end; -function MOD:ApplyTooltipStyle(frame) +function STYLE:ApplyTooltipStyle(frame) if(not frame or (frame and frame.appliedStyle)) then return end; frame:HookScript('OnShow',function(this) this:SetBackdrop({ @@ -338,7 +338,7 @@ function MOD:ApplyTooltipStyle(frame) frame.appliedStyle = true end; -function MOD:ApplyFrameStyle(frame,template,noStripping,fullStripping) +function STYLE:ApplyFrameStyle(frame,template,noStripping,fullStripping) if(not frame or (frame and frame.appliedStyle)) then return end; if not template then template = 'Transparent' end; if not noStripping then frame:Formula409(fullStripping) end; @@ -346,7 +346,7 @@ function MOD:ApplyFrameStyle(frame,template,noStripping,fullStripping) frame.appliedStyle = true end; -function MOD:ApplyAlertStyle(frame) +function STYLE:ApplyAlertStyle(frame) if(not frame or (frame and frame.appliedStyle)) then return end; local alertpanel = CreateFrame("Frame", nil, frame) alertpanel:SetAllPoints(frame) diff --git a/Interface/HelpFrame/CS_HELPTEXTURES.blp b/Interface/HelpFrame/CS_HELPTEXTURES.blp new file mode 100644 index 0000000..02105f5 Binary files /dev/null and b/Interface/HelpFrame/CS_HELPTEXTURES.blp differ