diff --git a/Interface/AddOns/SVUI/assets/artwork/Icons/COUNT-1.blp b/Interface/AddOns/SVUI/assets/artwork/Icons/COUNT-1.blp deleted file mode 100644 index 32efb88..0000000 Binary files a/Interface/AddOns/SVUI/assets/artwork/Icons/COUNT-1.blp and /dev/null differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Icons/COUNT-2.blp b/Interface/AddOns/SVUI/assets/artwork/Icons/COUNT-2.blp deleted file mode 100644 index bef839f..0000000 Binary files a/Interface/AddOns/SVUI/assets/artwork/Icons/COUNT-2.blp and /dev/null differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Icons/COUNT-3.blp b/Interface/AddOns/SVUI/assets/artwork/Icons/COUNT-3.blp deleted file mode 100644 index a46772e..0000000 Binary files a/Interface/AddOns/SVUI/assets/artwork/Icons/COUNT-3.blp and /dev/null differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Icons/DOCK-RAIDTOOL.blp b/Interface/AddOns/SVUI/assets/artwork/Icons/DOCK-RAIDTOOL.blp new file mode 100644 index 0000000..7d2a6a4 Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Icons/DOCK-RAIDTOOL.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Icons/NUMBER-1.blp b/Interface/AddOns/SVUI/assets/artwork/Icons/NUMBER-1.blp new file mode 100644 index 0000000..c0ebd6f Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Icons/NUMBER-1.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Icons/NUMBER-2.blp b/Interface/AddOns/SVUI/assets/artwork/Icons/NUMBER-2.blp new file mode 100644 index 0000000..1111dff Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Icons/NUMBER-2.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Icons/NUMBER-3.blp b/Interface/AddOns/SVUI/assets/artwork/Icons/NUMBER-3.blp new file mode 100644 index 0000000..04b5d3e Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Icons/NUMBER-3.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Icons/NUMBER-4.blp b/Interface/AddOns/SVUI/assets/artwork/Icons/NUMBER-4.blp new file mode 100644 index 0000000..957ee6c Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Icons/NUMBER-4.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Icons/NUMBER-5.blp b/Interface/AddOns/SVUI/assets/artwork/Icons/NUMBER-5.blp new file mode 100644 index 0000000..4d5323c Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Icons/NUMBER-5.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Icons/Thumbs.db b/Interface/AddOns/SVUI/assets/artwork/Icons/Thumbs.db new file mode 100644 index 0000000..15d6ea3 Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Icons/Thumbs.db differ diff --git a/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/LibSuperVillain-1.0.lua b/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/LibSuperVillain-1.0.lua index 3b5b808..b7e8b1c 100644 --- a/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/LibSuperVillain-1.0.lua +++ b/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/LibSuperVillain-1.0.lua @@ -402,35 +402,35 @@ local function removedefaults(db, src, nometa) end --DATABASE META METHODS -local meta_database = { - __index = function(t, k) - if(not k or k == "") then return end - local sv = rawget(t, "data") - local dv = rawget(t, "defaults") - local src = dv and dv[k] - - if(src ~= nil) then - if(type(src) == "table") then - if(sv[k] == nil or (sv[k] ~= nil and type(sv[k]) ~= "table")) then sv[k] = {} end - tablecopy(sv[k], src) - else - if(sv[k] == nil or (sv[k] ~= nil and type(sv[k]) ~= type(src))) then sv[k] = src end +local meta_transdata = { + __index = function(t, k) + if(not k or k == "") then return end + local sv = rawget(t, "data") + local dv = rawget(t, "defaults") + local src = dv and dv[k] + + if(src ~= nil) then + if(type(src) == "table") then + if(sv[k] == nil or (sv[k] ~= nil and type(sv[k]) ~= "table")) then sv[k] = {} end + tablecopy(sv[k], src) + else + if(sv[k] == nil or (sv[k] ~= nil and type(sv[k]) ~= type(src))) then sv[k] = src end + end end - end - rawset(t, k, sv[k]) - return rawget(t, k) - end, + rawset(t, k, sv[k]) + return rawget(t, k) + end, } -local meta_cache = { - __index = function(t, k) - if(not k or k == "") then return end - local sv = rawget(t, "data") - if(not sv[k]) then sv[k] = {} end - rawset(t, k, sv[k]) - return rawget(t, k) - end, +local meta_database = { + __index = function(t, k) + if(not k or k == "") then return end + local sv = rawget(t, "data") + if(not sv[k]) then sv[k] = {} end + rawset(t, k, sv[k]) + return rawget(t, k) + end, } --DATABASE PUBLIC METHODS @@ -571,7 +571,7 @@ local function HandleErrors(schema, action, catch) local timestamp = date("%m/%d/%y %H:%M:%S") local err_message = ("%s [%s] - (%s) %s"):format(schema, action, timestamp, catch) tinsert(ERROR_CACHE.FOUND, err_message) - ScriptErrorsFrame_OnError(catch, false, true) + --ScriptErrorsFrame_OnError(catch, false, true) CoreObject:Debugger(err_message) end end @@ -616,6 +616,23 @@ local changeDBVar = function(self, value, key, sub1, sub2, sub3) end end +local changePluginDBVar = function(self, value, key, sub1, sub2, sub3) + local db = self.db + if((sub1 and sub2 and sub3) and (db[sub1] and db[sub1][sub2] and db[sub1][sub2][sub3])) then + db[sub1][sub2][sub3][key] = value + elseif((sub1 and sub2) and (db[sub1] and db[sub1][sub2])) then + db[sub1][sub2][key] = value + elseif(sub1 and db[sub1]) then + db[sub1][key] = value + else + db[key] = value + end + + if(self.UpdateLocals) then + self:UpdateLocals() + end +end + local innerOnEvent = function(self, event, ...) local obj = self.___owner local fn = self[event] @@ -736,7 +753,7 @@ function lib:RefreshAll() LoadingProxy(schema, obj) end - for _,schema in pairs(PLUGINS) do + for schema,_ in pairs(PLUGINS) do local obj = _G[schema] LoadingProxy(schema, obj) end @@ -776,10 +793,10 @@ function lib:LoadQueuedModules() for i=1,#MODULES do local schema = MODULES[i] local obj = CoreObject[schema] - if obj and not obj.initialized then + local data = CoreObject.db[schema] + if(obj and data and data.enable and (not obj.initialized)) then local halt = false - local data = CoreObject.db[schema] - if(data and data.incompatible) then + if(data.incompatible) then for addon,_ in pairs(data.incompatible) do if IsAddOnLoaded(addon) then halt = true end end @@ -787,24 +804,44 @@ function lib:LoadQueuedModules() if(not halt) then LoadingProxy(schema, obj) end - end + end end end end function lib:LoadQueuedPlugins() if PLUGINS then - for i=1,#PLUGINS do - local schema = PLUGINS[i] + for schema,files in pairs(PLUGINS) do local obj = _G[schema] - if obj and not obj.initialized then + local enabled = PROFILE_SV.SAFEDATA[schema].enable + if(obj and enabled and (not obj.initialized)) then local halt = false - local data = CoreObject.db[schema] - if(data and data.incompatible) then - for addon,_ in pairs(data.incompatible) do + + if((not obj.db) and files.PROFILE and _G[files.PROFILE]) then + local db = setmetatable({}, meta_transdata) + db.data = _G[files.PROFILE] + db.defaults = obj.configs + obj.db = db + end + + if((not obj.cache) and files.CACHE and _G[files.CACHE]) then + local cache = setmetatable({}, meta_database) + cache.data = _G[files.CACHE] + obj.cache = cache + end + + if((not obj.public) and files.GLOBAL and _G[files.GLOBAL]) then + local public = setmetatable({}, meta_database) + public.data = _G[files.GLOBAL] + obj.public = public + end + + if(obj.db and obj.db.incompatible) then + for addon,_ in pairs(obj.db.incompatible) do if IsAddOnLoaded(addon) then halt = true end end end + if(not halt) then LoadingProxy(schema, obj) end @@ -815,12 +852,14 @@ end --[[ CONSTRUCTORS ]]-- -function lib:NewPlugin(addonName, addonObject) +function lib:NewPlugin(addonName, addonObject, pfile, gfile, cfile) local version = GetAddOnMetadata(addonName, "Version") local header = GetAddOnMetadata(addonName, HeaderFromMeta) local schema = GetAddOnMetadata(addonName, SchemaFromMeta) local lod = IsAddOnLoadOnDemand(addonName) + PROFILE_SV.SAFEDATA[schema] = PROFILE_SV.SAFEDATA[schema] or {["enable"] = true} + local addonmeta = {} local oldmeta = getmetatable(addonObject) if oldmeta then @@ -836,7 +875,7 @@ function lib:NewPlugin(addonName, addonObject) addonObject.LoD = lod addonObject.initialized = false addonObject.CombatLocked = false - addonObject.ChangeDBVar = changeDBVar + addonObject.ChangeDBVar = changePluginDBVar addonObject.RegisterEvent = registerEvent addonObject.UnregisterEvent = unregisterEvent addonObject.RegisterUpdate = registerUpdate @@ -853,10 +892,10 @@ function lib:NewPlugin(addonName, addonObject) type = "toggle", name = "Enable", get = function() - return CoreObject.db[schema].enable + return PROFILE_SV.SAFEDATA[schema].enable end, set = function(key, value) - addonObject:ChangeDBVar(value, "enable"); + PROFILE_SV.SAFEDATA[schema].enable = value; CoreObject:StaticPopup_Show("RL_CLIENT") end, } @@ -868,8 +907,11 @@ function lib:NewPlugin(addonName, addonObject) if(not PLUGINS) then PLUGINS = {} end - PLUGINS[#PLUGINS+1] = schema - AllowedIndexes[schema] = schema + PLUGINS[schema] = { + ["GLOBAL"] = gfile, + ["PROFILE"] = pfile, + ["CACHE"] = cfile, + }; local infoString = SetPluginString(addonName) local oldString = PluginString @@ -881,7 +923,6 @@ end local function NewLoadOnDemand(addonName, schema, header) LoadOnDemand[schema] = addonName; PROFILE_SV.SAFEDATA[schema] = PROFILE_SV.SAFEDATA[schema] or {["enable"] = false} - CoreObject.configs[schema] = {["enable"] = false} CoreObject.Options.args.plugins.args.pluginOptions.args[schema] = { type = "group", name = header, @@ -1200,12 +1241,12 @@ function lib:Initialize() end --construct core dataset - local db = setmetatable({}, meta_database) + local db = setmetatable({}, meta_transdata) db.data = PROFILE_SV.STORED[SOURCE_KEY] db.defaults = CoreObject.configs CoreObject.db = db - local cache = setmetatable({}, meta_cache) + local cache = setmetatable({}, meta_database) cache.data = CACHE_SV.STORED[SOURCE_KEY] CoreObject.cache = cache @@ -1229,7 +1270,6 @@ function lib:Launch() for schema,name in pairs(LoadOnDemand) do local db = PROFILE_SV.SAFEDATA[schema] if(db and (db.enable or db.enable ~= false)) then - CoreObject.db[schema].enable = PROFILE_SV.SAFEDATA[schema].enable if(not IsAddOnLoaded(name)) then local loaded, reason = LoadAddOn(name) end diff --git a/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_ActionPanel/oUF_ActionPanel.lua b/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_ActionPanel/oUF_ActionPanel.lua index df3321e..dc40134 100644 --- a/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_ActionPanel/oUF_ActionPanel.lua +++ b/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_ActionPanel/oUF_ActionPanel.lua @@ -17,11 +17,14 @@ local UnitClassification = _G.UnitClassification; local parent, ns = ... local oUF = ns.oUF +local textureCopy; + local Update = 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 class = action.class local showSpecial = false local r,g,b = 0,0,0; local category = UnitClassification(unit) @@ -51,6 +54,17 @@ local Update = function(self, event, unit) end end + if(class and class:IsShown()) then + local className, classFileName = UnitClass(unit) + local coords = CLASS_ICON_TCOORDS[classFileName] + if(coords) then + class:Show() + class.texture:SetTexCoord(unpack(coords)) + else + class:Hide() + end + end + local status = self.StatusPanel if(status) then local texture = status.texture diff --git a/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_HyperCombo/oUF_HyperCombo.lua b/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_HyperCombo/oUF_HyperCombo.lua index efbd5fd..99c60be 100644 --- a/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_HyperCombo/oUF_HyperCombo.lua +++ b/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_HyperCombo/oUF_HyperCombo.lua @@ -111,9 +111,6 @@ local Update = function(self, event, unit) tracker.Text:SetText(current) tracker.Text:SetTextColor(unpack(TextColors[current])) FivePointsAlarm(tracker, current) - elseif(bar.LAST_COMBO_POINTS > 0) then - tracker.Text:SetText(bar.LAST_COMBO_POINTS) - tracker.Text:SetTextColor(0.5,0.5,1) else tracker.Text:SetText("0") tracker.Text:SetTextColor(0.3,0.3,0.3) @@ -147,9 +144,6 @@ local Update = function(self, event, unit) tracker.Text:SetText(current) tracker.Text:SetTextColor(unpack(TextColors[current])) FivePointsAlarm(tracker, current) - elseif(bar.LAST_COMBO_POINTS > 0) then - tracker.Text:SetText(bar.LAST_COMBO_POINTS) - tracker.Text:SetTextColor(0.5,0.5,1) else tracker.Text:SetText("0") tracker.Text:SetTextColor(0.3,0.3,0.3) @@ -169,15 +163,15 @@ local Path = function(self, ...) return (self.HyperCombo.Override or Update) (self, ...) end -local Tracker = function(self, ...) - local bar = self.HyperCombo - if(UnitHasVehicleUI'player') then - bar.LAST_COMBO_POINTS = GetComboPoints('vehicle', 'target') - else - bar.LAST_COMBO_POINTS = GetComboPoints('player', 'target') - end - return Path(self, ...) -end +-- local Tracker = function(self, ...) +-- local bar = self.HyperCombo +-- if(UnitHasVehicleUI'player') then +-- bar.LAST_COMBO_POINTS = GetComboPoints('vehicle', 'target') +-- else +-- bar.LAST_COMBO_POINTS = GetComboPoints('player', 'target') +-- end +-- return Path(self, ...) +-- end local ForceUpdate = function(element) return Path(element.__owner, 'ForceUpdate', element.__owner.unit) @@ -191,7 +185,7 @@ local Enable = function(self) bar.EXISTING_COMBO_POINTS = 0 bar.LAST_COMBO_POINTS = 0 - self:RegisterEvent('UNIT_COMBO_POINTS', Tracker, true) + self:RegisterEvent('UNIT_COMBO_POINTS', Path, true) self:RegisterEvent('PLAYER_TARGET_CHANGED', Path, true) self:RegisterEvent('UNIT_AURA', Path, true) @@ -218,7 +212,7 @@ local Disable = function(self) cpoints[index]:Hide() end end - self:UnregisterEvent('UNIT_COMBO_POINTS', Tracker) + self:UnregisterEvent('UNIT_COMBO_POINTS', Path) self:UnregisterEvent('PLAYER_TARGET_CHANGED', Path) self:UnregisterEvent('UNIT_AURA', Path) end diff --git a/Interface/AddOns/SVUI/packages/bag/SVBag.lua b/Interface/AddOns/SVUI/packages/bag/SVBag.lua index d12aa4d..0eb6db2 100644 --- a/Interface/AddOns/SVUI/packages/bag/SVBag.lua +++ b/Interface/AddOns/SVUI/packages/bag/SVBag.lua @@ -352,7 +352,7 @@ local BagMenu_OnEnter = function(self) end end - if(select(4, GetBuildInfo()) >= 60000) then GameTooltip:AppendText(" |cff00FF11[SHIFT-CLICK] To Set Filters|r") end + GameTooltip:AppendText(" |cff00FF11[SHIFT-CLICK] To Set Filters|r") end local BagMenu_OnLeave = function(self) @@ -489,10 +489,10 @@ local ContainerFrame_UpdateLayout = function(self) end if(isBank) then - if(select(4, GetBuildInfo()) >= 60000) then bagSlot:SetID(bagID - 4) else bagSlot:SetID(bagID) end + bagSlot:SetID(bagID - 4) bagSlot.id = bagID; else - if(select(4, GetBuildInfo()) >= 60000) then bagSlot:HookScript("OnClick", BagMenu_OnClick) end + bagSlot:HookScript("OnClick", BagMenu_OnClick) bagSlot.id = (bagID + 1); end @@ -1450,8 +1450,6 @@ do frame.sortButton.altText = L["Filtered Cleanup"] frame.sortButton:SetScript("OnEnter", Tooltip_Show) frame.sortButton:SetScript("OnLeave", Tooltip_Hide) - local Sort_OnClick = MOD:RunSortingProcess(MOD.Sort, "bank", SortBankBags) - frame.sortButton:SetScript("OnClick", Sort_OnClick) frame.stackButton = CreateFrame("Button", nil, frame) frame.stackButton:Point("LEFT", frame.sortButton, "RIGHT", 10, 0) @@ -1461,8 +1459,6 @@ do frame.stackButton.ttText = L["Stack Items"] frame.stackButton:SetScript("OnEnter", Tooltip_Show) frame.stackButton:SetScript("OnLeave", Tooltip_Hide) - local Stack_OnClick = MOD:RunSortingProcess(MOD.Stack, "bank") - frame.stackButton:SetScript("OnClick", Stack_OnClick) if(not isReagent) then frame.BagMenu = CreateFrame("Button", bagName.."BagMenu", frame) @@ -1470,6 +1466,11 @@ do frame.BagMenu:SetFixedPanelTemplate("Transparent") frame.BagMenu:Hide() + local Sort_OnClick = MOD:RunSortingProcess(MOD.Sort, "bank", SortBankBags) + frame.sortButton:SetScript("OnClick", Sort_OnClick) + local Stack_OnClick = MOD:RunSortingProcess(MOD.Stack, "bank") + frame.stackButton:SetScript("OnClick", Stack_OnClick) + frame.transferButton = CreateFrame("Button", nil, frame) frame.transferButton:Point("LEFT", frame.stackButton, "RIGHT", 10, 0) frame.transferButton:Size(25, 25) @@ -1527,43 +1528,45 @@ do end frame.purchaseBagButton:SetScript("OnClick", PurchaseBtn_OnClick) - if(SV.GameVersion >= 60000) then - local active_icon = IsReagentBankUnlocked() and ICON_REAGENTS or ICON_PURCHASE - frame.swapButton = CreateFrame("Button", nil, frame) - frame.swapButton:Point("TOPRIGHT", frame, "TOPRIGHT", -40, -10) - frame.swapButton:Size(25, 25) - frame.swapButton:SetNormalTexture(active_icon) - StyleBagToolButton(frame.swapButton) - frame.swapButton.ttText = L["Toggle Reagents Bank"] - frame.swapButton:SetScript("OnEnter", function(self) - GameTooltip:SetOwner(self:GetParent(),"ANCHOR_TOP",0,4) - GameTooltip:ClearLines() - if(not IsReagentBankUnlocked()) then - GameTooltip:AddDoubleLine("Purchase Reagents Bank", FormatCurrency(GetReagentBankCost()), 0.1,1,0.1, 1,1,1) + local active_icon = IsReagentBankUnlocked() and ICON_REAGENTS or ICON_PURCHASE + frame.swapButton = CreateFrame("Button", nil, frame) + frame.swapButton:Point("TOPRIGHT", frame, "TOPRIGHT", -40, -10) + frame.swapButton:Size(25, 25) + frame.swapButton:SetNormalTexture(active_icon) + StyleBagToolButton(frame.swapButton) + frame.swapButton.ttText = L["Toggle Reagents Bank"] + frame.swapButton:SetScript("OnEnter", function(self) + GameTooltip:SetOwner(self:GetParent(),"ANCHOR_TOP",0,4) + GameTooltip:ClearLines() + if(not IsReagentBankUnlocked()) then + GameTooltip:AddDoubleLine("Purchase Reagents Bank", FormatCurrency(GetReagentBankCost()), 0.1,1,0.1, 1,1,1) + else + GameTooltip:AddLine(self.ttText) + end + self:GetNormalTexture():SetGradient(unpack(SV.Media.gradient.highlight)) + GameTooltip:Show() + end) + frame.swapButton:SetScript("OnLeave", Tooltip_Hide) + frame.swapButton:SetScript("OnClick", function() + if(not IsReagentBankUnlocked()) then + SV:StaticPopup_Show("CONFIRM_BUY_REAGENTBANK_TAB"); + else + PlaySound("igMainMenuOption"); + if(_G["SVUI_ReagentContainerFrame"]:IsShown()) then + _G["SVUI_ReagentContainerFrame"]:Hide() else - GameTooltip:AddLine(self.ttText) + _G["SVUI_ReagentContainerFrame"]:Show() end - self:GetNormalTexture():SetGradient(unpack(SV.Media.gradient.highlight)) - GameTooltip:Show() - end) - frame.swapButton:SetScript("OnLeave", Tooltip_Hide) - frame.swapButton:SetScript("OnClick", function() - if(not IsReagentBankUnlocked()) then - SV:StaticPopup_Show("CONFIRM_BUY_REAGENTBANK_TAB"); - else - PlaySound("igMainMenuOption"); - if(_G["SVUI_ReagentContainerFrame"]:IsShown()) then - _G["SVUI_ReagentContainerFrame"]:Hide() - else - _G["SVUI_ReagentContainerFrame"]:Show() - end - end - end) - end + end + end) frame:SetScript("OnHide", CloseBankFrame) self.BankFrame = frame else - --DepositReagentBank() + local Sort_OnClick = MOD:RunSortingProcess(MOD.Sort, "reagent", SortBankBags) + frame.sortButton:SetScript("OnClick", Sort_OnClick) + local Stack_OnClick = MOD:RunSortingProcess(MOD.Stack, "reagent") + frame.stackButton:SetScript("OnClick", Stack_OnClick) + frame.transferButton = CreateFrame("Button", nil, frame) frame.transferButton:Point("LEFT", frame.stackButton, "RIGHT", 10, 0) frame.transferButton:Size(25, 25) @@ -1677,15 +1680,16 @@ local function _toggleBackpack() end function MOD:BANKFRAME_OPENED() - if not self.BankFrame then + if(not self.BankFrame) then self:MakeBankOrReagent() end self.BankFrame:UpdateLayout() - if((SV.GameVersion >= 60000) and not self.ReagentFrame) then + if(not self.ReagentFrame) then self:MakeBankOrReagent(true) - self.ReagentFrame:UpdateLayout() end + self.ReagentFrame:UpdateLayout() + if(self.ReagentFrame) then self.ReagentFrame:UpdateLayout() end @@ -1750,79 +1754,68 @@ function MOD:Load() BagFilters:SetFrameStrata("DIALOG") BagFilters:SetClampedToScreen(true) - if(select(4, GetBuildInfo()) >= 60000) then + for i = LE_BAG_FILTER_FLAG_EQUIPMENT, NUM_LE_BAG_FILTER_FLAGS do + BagFilters.buttons[i] = CreateFrame("Button", nil, BagFilters) - for i = LE_BAG_FILTER_FLAG_EQUIPMENT, NUM_LE_BAG_FILTER_FLAGS do - BagFilters.buttons[i] = CreateFrame("Button", nil, BagFilters) + BagFilters.buttons[i].hoverTex = BagFilters.buttons[i]:CreateTexture(nil, 'OVERLAY') + BagFilters.buttons[i].hoverTex:SetAllPoints() + BagFilters.buttons[i].hoverTex:SetTexture([[Interface\QuestFrame\UI-QuestTitleHighlight]]) + BagFilters.buttons[i].hoverTex:SetBlendMode("ADD") + BagFilters.buttons[i].hoverTex:Hide() - BagFilters.buttons[i].hoverTex = BagFilters.buttons[i]:CreateTexture(nil, 'OVERLAY') - BagFilters.buttons[i].hoverTex:SetAllPoints() - BagFilters.buttons[i].hoverTex:SetTexture([[Interface\QuestFrame\UI-QuestTitleHighlight]]) - BagFilters.buttons[i].hoverTex:SetBlendMode("ADD") - BagFilters.buttons[i].hoverTex:Hide() + BagFilters.buttons[i].activeTex = BagFilters.buttons[i]:CreateTexture(nil, 'OVERLAY') + BagFilters.buttons[i].activeTex:SetAllPoints() + BagFilters.buttons[i].activeTex:SetTexture([[Interface\QuestFrame\UI-QuestTitleHighlight]]) + BagFilters.buttons[i].activeTex:SetVertexColor(0,0.7,0) + BagFilters.buttons[i].activeTex:SetBlendMode("ADD") + BagFilters.buttons[i].activeTex:Hide() - BagFilters.buttons[i].activeTex = BagFilters.buttons[i]:CreateTexture(nil, 'OVERLAY') - BagFilters.buttons[i].activeTex:SetAllPoints() - BagFilters.buttons[i].activeTex:SetTexture([[Interface\QuestFrame\UI-QuestTitleHighlight]]) - BagFilters.buttons[i].activeTex:SetVertexColor(0,0.7,0) - BagFilters.buttons[i].activeTex:SetBlendMode("ADD") - BagFilters.buttons[i].activeTex:Hide() + BagFilters.buttons[i].text = BagFilters.buttons[i]:CreateFontString(nil, 'BORDER') + BagFilters.buttons[i].text:SetAllPoints() + BagFilters.buttons[i].text:SetFont(SV.Media.font.roboto,12,"OUTLINE") + BagFilters.buttons[i].text:SetJustifyH("LEFT") + BagFilters.buttons[i].text:SetText(BAG_FILTER_LABELS[i]) - BagFilters.buttons[i].text = BagFilters.buttons[i]:CreateFontString(nil, 'BORDER') - BagFilters.buttons[i].text:SetAllPoints() - BagFilters.buttons[i].text:SetFont(SV.Media.font.roboto,12,"OUTLINE") - BagFilters.buttons[i].text:SetJustifyH("LEFT") - BagFilters.buttons[i].text:SetText(BAG_FILTER_LABELS[i]) + BagFilters.buttons[i]:SetScript("OnEnter", DD_OnEnter) + BagFilters.buttons[i]:SetScript("OnLeave", DD_OnLeave) - BagFilters.buttons[i]:SetScript("OnEnter", DD_OnEnter) - BagFilters.buttons[i]:SetScript("OnLeave", DD_OnLeave) + BagFilters.buttons[i]:SetHeight(16) + BagFilters.buttons[i]:SetWidth(115) - BagFilters.buttons[i]:SetHeight(16) - BagFilters.buttons[i]:SetWidth(115) + BagFilters.buttons[i].FilterID = i + BagFilters.buttons[i]:SetScript("OnClick", DD_OnClick) - BagFilters.buttons[i].FilterID = i - BagFilters.buttons[i]:SetScript("OnClick", DD_OnClick) - - if i == LE_BAG_FILTER_FLAG_EQUIPMENT then - BagFilters.buttons[i]:SetPoint("TOPLEFT", BagFilters, "TOPLEFT", 10, -10) - else - BagFilters.buttons[i]:SetPoint("TOPLEFT", BagFilters.buttons[i - 1], "BOTTOMLEFT", 0, 0) - end - - BagFilters.buttons[i]:Show() + if i == LE_BAG_FILTER_FLAG_EQUIPMENT then + BagFilters.buttons[i]:SetPoint("TOPLEFT", BagFilters, "TOPLEFT", 10, -10) + else + BagFilters.buttons[i]:SetPoint("TOPLEFT", BagFilters.buttons[i - 1], "BOTTOMLEFT", 0, 0) end - local clearID = NUM_LE_BAG_FILTER_FLAGS + 1 - - BagFilters.buttons[clearID] = CreateFrame("Button", nil, BagFilters) - - BagFilters.buttons[clearID].hoverTex = BagFilters.buttons[clearID]:CreateTexture(nil, 'OVERLAY') - BagFilters.buttons[clearID].hoverTex:SetAllPoints() - BagFilters.buttons[clearID].hoverTex:SetTexture([[Interface\QuestFrame\UI-QuestTitleHighlight]]) - BagFilters.buttons[clearID].hoverTex:SetBlendMode("ADD") - BagFilters.buttons[clearID].hoverTex:Hide() - - BagFilters.buttons[clearID].text = BagFilters.buttons[clearID]:CreateFontString(nil, 'BORDER') - BagFilters.buttons[clearID].text:SetAllPoints() - BagFilters.buttons[clearID].text:SetFont(SV.Media.font.roboto,12,"OUTLINE") - BagFilters.buttons[clearID].text:SetJustifyH("LEFT") - BagFilters.buttons[clearID].text:SetText(CLEAR_ALL .. " " .. FILTERS) - - BagFilters.buttons[clearID]:SetScript("OnEnter", DD_OnEnter) - BagFilters.buttons[clearID]:SetScript("OnLeave", DD_OnLeave) - - BagFilters.buttons[clearID]:SetHeight(16) - BagFilters.buttons[clearID]:SetWidth(115) - - BagFilters.buttons[clearID].FilterID = 0 - BagFilters.buttons[clearID]:SetScript("OnClick", DDClear_OnClick) - - BagFilters.buttons[clearID]:SetPoint("TOPLEFT", BagFilters.buttons[NUM_LE_BAG_FILTER_FLAGS], "BOTTOMLEFT", 0, -10) + BagFilters.buttons[i]:Show() + end - BagFilters.buttons[clearID]:Show() + local clearID = NUM_LE_BAG_FILTER_FLAGS + 1 + + BagFilters.buttons[clearID] = CreateFrame("Button", nil, BagFilters) + BagFilters.buttons[clearID].hoverTex = BagFilters.buttons[clearID]:CreateTexture(nil, 'OVERLAY') + BagFilters.buttons[clearID].hoverTex:SetAllPoints() + BagFilters.buttons[clearID].hoverTex:SetTexture([[Interface\QuestFrame\UI-QuestTitleHighlight]]) + BagFilters.buttons[clearID].hoverTex:SetBlendMode("ADD") + BagFilters.buttons[clearID].hoverTex:Hide() + BagFilters.buttons[clearID].text = BagFilters.buttons[clearID]:CreateFontString(nil, 'BORDER') + BagFilters.buttons[clearID].text:SetAllPoints() + BagFilters.buttons[clearID].text:SetFont(SV.Media.font.roboto,12,"OUTLINE") + BagFilters.buttons[clearID].text:SetJustifyH("LEFT") + BagFilters.buttons[clearID].text:SetText(CLEAR_ALL .. " " .. FILTERS) + BagFilters.buttons[clearID]:SetScript("OnEnter", DD_OnEnter) + BagFilters.buttons[clearID]:SetScript("OnLeave", DD_OnLeave) + BagFilters.buttons[clearID]:SetHeight(16) + BagFilters.buttons[clearID]:SetWidth(115) + BagFilters.buttons[clearID].FilterID = 0 + BagFilters.buttons[clearID]:SetScript("OnClick", DDClear_OnClick) + BagFilters.buttons[clearID]:SetPoint("TOPLEFT", BagFilters.buttons[NUM_LE_BAG_FILTER_FLAGS], "BOTTOMLEFT", 0, -10) + BagFilters.buttons[clearID]:Show() - self:RegisterEvent("PLAYERREAGENTBANKSLOTS_CHANGED") - end BagFilters:Hide() SV:AddToDisplayAudit(BagFilters) @@ -1850,6 +1843,7 @@ function MOD:Load() self:RegisterEvent("PLAYER_TRADE_MONEY", "UpdateGoldText") self:RegisterEvent("TRADE_MONEY_CHANGED", "UpdateGoldText") self:RegisterEvent("PLAYERBANKBAGSLOTS_CHANGED") + self:RegisterEvent("PLAYERREAGENTBANKSLOTS_CHANGED") StackSplitFrame:SetFrameStrata("DIALOG") diff --git a/Interface/AddOns/SVUI/packages/bag/tools/sorting.lua b/Interface/AddOns/SVUI/packages/bag/tools/sorting.lua index 3a5d27d..a43490f 100644 --- a/Interface/AddOns/SVUI/packages/bag/tools/sorting.lua +++ b/Interface/AddOns/SVUI/packages/bag/tools/sorting.lua @@ -117,6 +117,7 @@ local scanningCache = { ["all"] = {}, ["bags"] = {}, ["bank"] = {BANK_CONTAINER}, + ["reagent"] = {REAGENTBANK_CONTAINER}, ["guild"] = {51,52,53,54,55,56,57,58}, } @@ -132,6 +133,9 @@ end for _,i in ipairs(scanningCache.bank) do tinsert(scanningCache.all, i) end +for _,i in ipairs(scanningCache.reagent) do + tinsert(scanningCache.all, i) +end for _,i in ipairs(scanningCache.guild) do tinsert(scanningCache.all, i) end @@ -400,7 +404,7 @@ do end local function IsSpecialtyBag(bagID) - if bagID == BANK_CONTAINER or bagID == 0 or (bagID > 50 and bagID <= 58) then return false end + if bagID == BANK_CONTAINER or bagID == REAGENTBANK_CONTAINER or bagID == 0 or (bagID > 50 and bagID <= 58) then return false end local inventorySlot = ContainerIDToInventoryID(bagID) if not inventorySlot then return false end local bag = GetInventoryItemLink("player", inventorySlot) diff --git a/Interface/AddOns/SVUI/packages/dock/SVDock.lua b/Interface/AddOns/SVUI/packages/dock/SVDock.lua index 5018ff0..767c479 100644 --- a/Interface/AddOns/SVUI/packages/dock/SVDock.lua +++ b/Interface/AddOns/SVUI/packages/dock/SVDock.lua @@ -78,6 +78,7 @@ local PREV_TOOL, DEFAULT_DOCKLET; local AddOnButton = CreateFrame("Button", "SVUI_AddonDocklet", UIParent); local SuperDockletMain = CreateFrame('Frame', 'SuperDockletMain', UIParent); local SuperDockletExtra = CreateFrame('Frame', 'SuperDockletExtra', UIParent); +local DockletMenu = CreateFrame("Frame", "SVUI_DockletMenu", UIParent); SuperDockletMain.FrameName = "None"; SuperDockletExtra.FrameName = "None"; local ICONFILE = [[Interface\AddOns\SVUI\assets\artwork\Icons\DOCK-BAG-MICRO]]; @@ -106,6 +107,25 @@ local defaultStatBarWidth = min(bw, 800) PRE VARS/FUNCTIONS ########################################################## ]]-- +local DD_OnClick = function(self) + -- DO STUFF + self:GetParent():Hide() +end + +local DD_OnEnter = function(self) + self.hoverTex:Show() +end + +local DD_OnLeave = function(self) + self.hoverTex:Hide() +end + +local function SetFilterMenu(self) + DockletMenu:ClearAllPoints() + DockletMenu:SetPoint("TOPLEFT", self, "BOTTOMLEFT", 0, -8) + ToggleFrame(DockletMenu) +end + local function CycleDocklets() for i=1, #DOCKLET_CACHE do local f = DOCKLET_CACHE[i] @@ -228,23 +248,27 @@ local DockletButton_OnLeave = function(self, ...) GameTooltip:Hide() end -local DockletButton_OnClick = function(self) +local DockletButton_OnClick = function(self, button) if InCombatLockdown() then return end - local linkedFrame = self.FrameName - if linkedFrame and _G[linkedFrame] then - SuperDockWindowRight.FrameName = linkedFrame - if not _G[linkedFrame]:IsShown() then - CycleDocklets() - end - if not SuperDockWindowRight:IsShown()then - SuperDockWindowRight:Show() - end - _G[linkedFrame]:Show() - self:Activate() + if button == "RightButton" then + SetFilterMenu(self); else - self:Deactivate() - GetDefaultWindow() - end + local linkedFrame = self.FrameName + if linkedFrame and _G[linkedFrame] then + SuperDockWindowRight.FrameName = linkedFrame + if not _G[linkedFrame]:IsShown() then + CycleDocklets() + end + if not SuperDockWindowRight:IsShown()then + SuperDockWindowRight:Show() + end + _G[linkedFrame]:Show() + self:Activate() + else + self:Deactivate() + GetDefaultWindow() + end + end end local DockletFrame_OnShow = function(self) @@ -568,7 +592,7 @@ function MOD:CreateDockPanels() local toolbarTop = CreateFrame("Frame", "SuperDockToolBarTop", SV.UIParent) toolbarTop:Point("TOPLEFT", SV.UIParent, "TOPLEFT", 2, -4) toolbarTop:Size(1, buttonsize - 12) - toolbarTop.openWidth = (leftWidth - 1) / 3; + toolbarTop.openWidth = buttonsize + 12; --TOP STAT HOLDERS local topWidth = (leftWidth + rightWidth) * 0.8 @@ -602,6 +626,54 @@ function MOD:CreateDockPanels() bottomrightdata:Size((statBarWidth * 0.5) - 1, buttonsize - 8) bottomrightdata:Point("RIGHT", bottomanchor, "RIGHT", 0, 0) STATS:NewAnchor(bottomrightdata, 3, "ANCHOR_CURSOR") + + --RIGHT CLICK MENU + DockletMenu:SetParent(SV.UIParent) + DockletMenu:SetPanelTemplate("Default") + DockletMenu.buttons = {} + DockletMenu:SetFrameStrata("DIALOG") + DockletMenu:SetClampedToScreen(true) + + for i = 1, 4 do + DockletMenu.buttons[i] = CreateFrame("Button", nil, DockletMenu) + + DockletMenu.buttons[i].hoverTex = DockletMenu.buttons[i]:CreateTexture(nil, 'OVERLAY') + DockletMenu.buttons[i].hoverTex:SetAllPoints() + DockletMenu.buttons[i].hoverTex:SetTexture([[Interface\QuestFrame\UI-QuestTitleHighlight]]) + DockletMenu.buttons[i].hoverTex:SetBlendMode("ADD") + DockletMenu.buttons[i].hoverTex:Hide() + + DockletMenu.buttons[i].activeTex = DockletMenu.buttons[i]:CreateTexture(nil, 'OVERLAY') + DockletMenu.buttons[i].activeTex:SetAllPoints() + DockletMenu.buttons[i].activeTex:SetTexture([[Interface\QuestFrame\UI-QuestTitleHighlight]]) + DockletMenu.buttons[i].activeTex:SetVertexColor(0,0.7,0) + DockletMenu.buttons[i].activeTex:SetBlendMode("ADD") + DockletMenu.buttons[i].activeTex:Hide() + + DockletMenu.buttons[i].text = DockletMenu.buttons[i]:CreateFontString(nil, 'BORDER') + DockletMenu.buttons[i].text:SetAllPoints() + DockletMenu.buttons[i].text:SetFont(SV.Media.font.roboto,12,"OUTLINE") + DockletMenu.buttons[i].text:SetJustifyH("LEFT") + DockletMenu.buttons[i].text:SetText(("Option %d"):format(i)) + + DockletMenu.buttons[i]:SetHeight(16) + DockletMenu.buttons[i]:SetWidth(115) + + DockletMenu.buttons[i]:SetScript("OnEnter", DD_OnEnter) + DockletMenu.buttons[i]:SetScript("OnLeave", DD_OnLeave) + DockletMenu.buttons[i]:SetScript("OnClick", DD_OnClick) + + if i == 1 then + DockletMenu.buttons[i]:SetPoint("TOPLEFT", DockletMenu, "TOPLEFT", 10, -10) + else + DockletMenu.buttons[i]:SetPoint("TOPLEFT", DockletMenu.buttons[i - 1], "BOTTOMLEFT", 0, 0) + end + + DockletMenu.buttons[i]:Show() + end + DockletMenu:SetSize(135, 94) + DockletMenu:Hide() + SV:AddToDisplayAudit(DockletMenu) end do diff --git a/Interface/AddOns/SVUI/packages/override/SVOverride.lua b/Interface/AddOns/SVUI/packages/override/SVOverride.lua index ecd51cf..fdfdb68 100644 --- a/Interface/AddOns/SVUI/packages/override/SVOverride.lua +++ b/Interface/AddOns/SVUI/packages/override/SVOverride.lua @@ -1075,11 +1075,7 @@ function MOD:Load() self:RegisterEvent("CONFIRM_LOOT_ROLL", AutoConfirmLoot) self:RegisterEvent("LOOT_BIND_CONFIRM", AutoConfirmLoot) - if(SV.GameVersion < 60000) then - self:RegisterEvent("LOOT_OPENED", OpenedLootHandler) - else - self:RegisterEvent("LOOT_READY", OpenedLootHandler) - end + self:RegisterEvent("LOOT_READY", OpenedLootHandler) self:RegisterEvent("LOOT_SLOT_CLEARED", LootSimpleEventsHandler); self:RegisterEvent("LOOT_CLOSED", LootSimpleEventsHandler); diff --git a/Interface/AddOns/SVUI/packages/plates/SVPlate.lua b/Interface/AddOns/SVUI/packages/plates/SVPlate.lua index 1e9548a..175740d 100644 --- a/Interface/AddOns/SVUI/packages/plates/SVPlate.lua +++ b/Interface/AddOns/SVUI/packages/plates/SVPlate.lua @@ -598,16 +598,16 @@ function MOD:UpdateAuras(plate) end end UpdateAuraIconGrid(plate) - if(self.UseCombo) then - local numPoints = GetComboPoints(UnitHasVehicleUI("player") and "vehicle" or "player", "target") - for i = 1, MAX_COMBO_POINTS do - if(i <= numPoints) then - frame.combo[i]:Show() - else - frame.combo[i]:Hide() - end - end - end + -- if(self.UseCombo) then + -- local numPoints = GetComboPoints(UnitHasVehicleUI("player") and "vehicle" or "player", "target") + -- for i = 1, MAX_COMBO_POINTS do + -- if(i <= numPoints) then + -- frame.combo[i]:Show() + -- else + -- frame.combo[i]:Hide() + -- end + -- end + -- end end function MOD:UpdateAurasByUnitID(unitid) @@ -681,9 +681,9 @@ do TARGET_CHECKS = -1 end MOD:UpdateAurasByUnitID('target') - if MOD.UseCombo then - UpdateComboPoints() - end + -- if MOD.UseCombo then + -- UpdateComboPoints() + -- end PLATE_ARGS.allowed = nil end elseif PLATE_REF.highlight:IsShown() and UnitExists("mouseover") and (UnitName("mouseover") == plateName) then @@ -691,9 +691,9 @@ do SVUI_PLATE:SetFrameLevel(1) SVUI_PLATE.highlight:Show() MOD:UpdateAurasByUnitID('mouseover') - if MOD.UseCombo then - UpdateComboPoints() - end + -- if MOD.UseCombo then + -- UpdateComboPoints() + -- end PLATE_ARGS.allowed = nil end BLIZZ_PLATE.guid = UnitGUID("mouseover") @@ -1088,11 +1088,11 @@ do RegisterAuraClock(PLATE_AURAICONS[index], 0) end end - if MOD.UseCombo then - for i=1, MAX_COMBO_POINTS do - SVUI_PLATE.combo[i]:Hide() - end - end + -- if MOD.UseCombo then + -- for i=1, MAX_COMBO_POINTS do + -- SVUI_PLATE.combo[i]:Hide() + -- end + -- end SVUI_PLATE:SetPoint("BOTTOMLEFT", plate, "BOTTOMLEFT") end @@ -1126,11 +1126,11 @@ do end end - if(MOD.UseCombo and not SVUI_PLATE.combo:IsShown()) then - SVUI_PLATE.combo:Show() - elseif(SVUI_PLATE.combo:IsShown()) then - SVUI_PLATE.combo:Hide() - end + -- if(MOD.UseCombo and not SVUI_PLATE.combo:IsShown()) then + -- SVUI_PLATE.combo:Show() + -- elseif(SVUI_PLATE.combo:IsShown()) then + -- SVUI_PLATE.combo:Hide() + -- end ShowThisPlate(plate) HealthBarSizeChanged(SVUI_PLATE.health, SVUI_PLATE.health:GetSize()) @@ -1286,20 +1286,20 @@ do frame.combo:SetSize(68, 1) frame.combo:Hide() - if MOD.UseCombo then - for i = 1, MAX_COMBO_POINTS do - frame.combo[i] = frame.combo:CreateTexture(nil, 'OVERLAY') - frame.combo[i]:SetTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Unitframe\\Class\\COMBO-POINT-SMALL") - frame.combo[i]:SetSize(12, 12) - frame.combo[i]:SetVertexColor(unpack(NPComboColor[i])) - if(i == 1) then - frame.combo[i]:SetPoint("TOPLEFT", frame.combo, "TOPLEFT") - else - frame.combo[i]:SetPoint("LEFT", frame.combo[i-1], "RIGHT", 2, 0) - end - frame.combo[i]:Hide() - end - end + -- if MOD.UseCombo then + -- for i = 1, MAX_COMBO_POINTS do + -- frame.combo[i] = frame.combo:CreateTexture(nil, 'OVERLAY') + -- frame.combo[i]:SetTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Unitframe\\Class\\COMBO-POINT-SMALL") + -- frame.combo[i]:SetSize(12, 12) + -- frame.combo[i]:SetVertexColor(unpack(NPComboColor[i])) + -- if(i == 1) then + -- frame.combo[i]:SetPoint("TOPLEFT", frame.combo, "TOPLEFT") + -- else + -- frame.combo[i]:SetPoint("LEFT", frame.combo[i-1], "RIGHT", 2, 0) + -- end + -- frame.combo[i]:Hide() + -- end + -- end frame.auras = CreateFrame("Frame", nil, frame) frame.auras:SetHeight(32); frame.auras:Show() @@ -1533,13 +1533,13 @@ function MOD:UpdateLocals() AuraFilterName = db.auras.additionalFilter AuraFilter = SV.db.filter[AuraFilterName] - if (db.comboPoints and (SV.class == 'ROGUE' or SV.class == 'DRUID')) then - self.UseCombo = true - self:RegisterEvent("UNIT_COMBO_POINTS") - else - self.UseCombo = false - self:UnregisterEvent("UNIT_COMBO_POINTS") - end + -- if (db.comboPoints and (SV.class == 'ROGUE' or SV.class == 'DRUID')) then + -- self.UseCombo = true + -- self:RegisterEvent("UNIT_COMBO_POINTS") + -- else + -- self.UseCombo = false + -- self:UnregisterEvent("UNIT_COMBO_POINTS") + -- end end function MOD:CombatToggle(noToggle) diff --git a/Interface/AddOns/SVUI/packages/unit/SVUnit.lua b/Interface/AddOns/SVUI/packages/unit/SVUnit.lua index 4370a86..f6de03b 100644 --- a/Interface/AddOns/SVUI/packages/unit/SVUnit.lua +++ b/Interface/AddOns/SVUI/packages/unit/SVUnit.lua @@ -1050,6 +1050,23 @@ function MOD:RefreshUnitLayout(frame, template) if db.icons then local ico = db.icons; + --[[ CLASS ICON ]]-- + + if(ico.classIcon and frame.ActionPanel.class) then + local classIcon = frame.ActionPanel.class; + if ico.classIcon.enable then + classIcon:Show() + local size = ico.classIcon.size; + classIcon:ClearAllPoints() + + classIcon:SetAlpha(1) + classIcon:Size(size) + SV:ReversePoint(classIcon, ico.classIcon.attachTo, healthPanel, ico.classIcon.xOffset, ico.classIcon.yOffset) + else + classIcon:Hide() + end + end + --[[ RAIDICON ]]-- if(ico.raidicon and frame.RaidIcon) then diff --git a/Interface/AddOns/SVUI/packages/unit/elements/castbar.lua b/Interface/AddOns/SVUI/packages/unit/elements/castbar.lua index f0d1e4d..8aab0aa 100644 --- a/Interface/AddOns/SVUI/packages/unit/elements/castbar.lua +++ b/Interface/AddOns/SVUI/packages/unit/elements/castbar.lua @@ -70,7 +70,7 @@ local ticks = {} local function SpellName(id) local name, _, _, _, _, _, _, _, _ = GetSpellInfo(id) if not name then - SV:Debugger('|cffFF9900SVUI:|r Spell not found: (#ID) '..id) + --SV:Debugger('|cffFF9900SVUI:|r Spell not found: (#ID) '..id) name = "Voodoo Doll"; end return name @@ -104,8 +104,8 @@ local CustomTickData = { }, ["ChannelTicksSize"] = { --Warlock - [SpellName(1120)] = 2, --"Drain Soul" - [SpellName(689)] = 1, -- "Drain Life" + [SpellName(1120)] = 2, --"Drain Soul" + [SpellName(689)] = 1, -- "Drain Life" [SpellName(108371)] = 1, -- "Harvest Life" [SpellName(103103)] = 1, -- "Malefic Grasp" }, diff --git a/Interface/AddOns/SVUI/packages/unit/elements/essentials.lua b/Interface/AddOns/SVUI/packages/unit/elements/essentials.lua index 74282de..467a40c 100644 --- a/Interface/AddOns/SVUI/packages/unit/elements/essentials.lua +++ b/Interface/AddOns/SVUI/packages/unit/elements/essentials.lua @@ -78,6 +78,7 @@ local ELITE_TOP = [[Interface\Addons\SVUI\assets\artwork\Unitframe\Border\ELITE- local ELITE_BOTTOM = [[Interface\Addons\SVUI\assets\artwork\Unitframe\Border\ELITE-BOTTOM]] local ELITE_RIGHT = [[Interface\Addons\SVUI\assets\artwork\Unitframe\Border\ELITE-RIGHT]] local STUNNED_ANIM = [[Interface\Addons\SVUI\assets\artwork\Unitframe\UNIT-STUNNED]] +local borderTex = [[Interface\Addons\SVUI\assets\artwork\Template\ROUND]] local token = {[0] = "MANA", [1] = "RAGE", [2] = "FOCUS", [3] = "ENERGY", [6] = "RUNIC_POWER"} local Anim_OnUpdate = function(self) @@ -344,7 +345,7 @@ local function CreateNameText(frame, unitName) name:SetJustifyV("MIDDLE") end return name; -end +end function MOD:SetActionPanel(frame, unit, noHealthText, noPowerText, noMiscText) if(unit and (unit == "target" or unit == "player")) then @@ -397,6 +398,39 @@ function MOD:SetActionPanel(frame, unit, noHealthText, noPowerText, noMiscText) frame.ActionPanel.special[3]:SetBlendMode("BLEND") frame.ActionPanel.special:SetAlpha(0.7) frame.ActionPanel.special:Hide() + + frame.ActionPanel.class = CreateFrame("Frame", nil, frame.InfoPanel) + frame.ActionPanel.class:Size(18) + frame.ActionPanel.class:Point("TOPLEFT", frame.ActionPanel, "TOPLEFT", 2, -2) + frame.ActionPanel.class:SetPanelTemplate("", true, 2, 0, 0) + + frame.ActionPanel.class.texture = frame.ActionPanel.class.Panel:CreateTexture(nil, "BORDER") + frame.ActionPanel.class.texture:SetAllPoints(frame.ActionPanel.class.Panel) + frame.ActionPanel.class.texture:SetTexture([[Interface\Glues\CharacterCreate\UI-CharacterCreate-Classes]]) + + local border1 = frame.ActionPanel.class:CreateTexture(nil, "OVERLAY") + border1:SetTexture(0, 0, 0) + border1:SetPoint("TOPLEFT") + border1:SetPoint("TOPRIGHT") + border1:SetHeight(2) + + local border2 = frame.ActionPanel.class:CreateTexture(nil, "OVERLAY") + border2:SetTexture(0, 0, 0) + border2:SetPoint("BOTTOMLEFT") + border2:SetPoint("BOTTOMRIGHT") + border2:SetHeight(2) + + local border3 = frame.ActionPanel.class:CreateTexture(nil, "OVERLAY") + border3:SetTexture(0, 0, 0) + border3:SetPoint("TOPRIGHT") + border3:SetPoint("BOTTOMRIGHT") + border3:SetWidth(2) + + local border4 = frame.ActionPanel.class:CreateTexture(nil, "OVERLAY") + border4:SetTexture(0, 0, 0) + border4:SetPoint("TOPLEFT") + border4:SetPoint("BOTTOMLEFT") + border4:SetWidth(2) else frame.LossOfControl = CreateFrame("Frame", nil, frame.InfoPanel) frame.LossOfControl:SetAllPoints(frame) diff --git a/Interface/AddOns/SVUI/packages/unit/frames.lua b/Interface/AddOns/SVUI/packages/unit/frames.lua index 8f7ee76..aaefd68 100644 --- a/Interface/AddOns/SVUI/packages/unit/frames.lua +++ b/Interface/AddOns/SVUI/packages/unit/frames.lua @@ -366,6 +366,7 @@ local UpdateTargetFrame = function(self) if not self:IsElementEnabled("ActionPanel")then self:EnableElement("ActionPanel") end + if not self:IsElementEnabled("Friendship")then self:EnableElement("Friendship") end @@ -440,7 +441,6 @@ CONSTRUCTORS["target"] = function(self, unit) self.Afflicted = MOD:CreateAfflicted(self) tinsert(self.__elements, MOD.SmartAuraDisplay) self:RegisterEvent("PLAYER_TARGET_CHANGED", MOD.SmartAuraDisplay) - self.RaidIcon = MOD:CreateRaidIcon(self) local isSmall = SV.db.SVUnit[key].combobar.smallIcons if(SV.class == "ROGUE") then @@ -1127,7 +1127,7 @@ local Raid10Visibility = function(self, event) self:UnregisterEvent("PLAYER_REGEN_ENABLED") end if not InCombatLockdown() then - if(instance and (instanceType == "raid" or instanceType == "pvp")) then + if(instance and (instanceType == "raid")) then UnregisterStateDriver(self, "visibility") if(maxPlayers == 10) then self:Show() @@ -1153,7 +1153,7 @@ local Raid25Visibility = function(self, event) self:UnregisterEvent("PLAYER_REGEN_ENABLED") end if not InCombatLockdown()then - if(instance and (instanceType == "raid" or instanceType == "pvp")) then + if(instance and (instanceType == "raid")) then UnregisterStateDriver(self, "visibility") if(maxPlayers > 10 and maxPlayers < 40) then self:Show() @@ -1179,7 +1179,7 @@ local Raid40Visibility = function(self, event) self:UnregisterEvent("PLAYER_REGEN_ENABLED") end if not InCombatLockdown()then - if(instance and (instanceType == "raid" or instanceType == "pvp")) then + if(instance and (instanceType == "raid")) then UnregisterStateDriver(self, "visibility") if(maxPlayers == 40) then self:Show() diff --git a/Interface/AddOns/SVUI/scripts/comix.lua b/Interface/AddOns/SVUI/scripts/comix.lua index c00c9d1..cfac32f 100644 --- a/Interface/AddOns/SVUI/scripts/comix.lua +++ b/Interface/AddOns/SVUI/scripts/comix.lua @@ -101,11 +101,17 @@ function Comix:LaunchPopup(comicType) ComixPremiumPanelBG.anim[3]:SetOffset(0,0) ComixPremiumPanel.anim:Play() ComixPremiumPanelBG.anim:Play() + elseif(comicType == "DELUXE") then + local frame = ComixDeluxePanel + local step1_x = random(-100, 100); + if(step1_x > -30 and step1_x < 30) then step1_x = step1_x * 3 end + local step1_y = random(-100, 100); + if(step1_y > -30 and step1_y < 30) then step1_y = step1_y * 3 end + frame.tex:SetTexCoord(coords[1],coords[2],coords[3],coords[4]) + frame:Point("CENTER", SV.UIParent, "CENTER", step1_x, step1_y) + frame.anim:Play() else local frame = ComixBasicPanel - if(comicType == "DELUXE") then - frame = ComixDeluxePanel - end local step1_x = random(-280, 280); if(step1_x > -30 and step1_x < 30) then step1_x = 150 end local step2_x = step1_x * 0.5; @@ -137,6 +143,10 @@ local Comix_OnEvent = function(self, event, ...) end end +function ComixPop() + Comix:LaunchPopup("DELUXE") +end +-- /script ComixPop() function SV:ToggleComix() if not SV.db.general.comix then Comix:UnregisterEvent("COMBAT_LOG_EVENT_UNFILTERED") @@ -156,7 +166,7 @@ function SV:ToastyKombat() end local Comix_OnUpdate = function() Comix:ReadyState(true) end -local Toasty_OnUpdate = function(self) Comix:ReadyState(true);self.parent:SetAlpha(0) end +local Toasty_OnUpdate = function(self) Comix:ReadyState(true); self.parent:SetAlpha(0) end local function LoadSVComix() local basic = CreateFrame("Frame", "ComixBasicPanel", SV.UIParent) @@ -179,9 +189,9 @@ local function LoadSVComix() deluxe.tex:FillInner(deluxe) deluxe.tex:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Doodads\COMICS-TYPE2]]) deluxe.tex:SetTexCoord(0,0.25,0,0.25) - SV.Animate:RandomSlide(deluxe, true) + SV.Animate:Kapow(deluxe, true) deluxe:SetAlpha(0) - deluxe.anim[3]:SetScript("OnFinished", Comix_OnUpdate) + deluxe.anim[2]:SetScript("OnFinished", Comix_OnUpdate) local premium = CreateFrame("Frame", "ComixPremiumPanel", SV.UIParent) premium:SetSize(100, 100) diff --git a/Interface/AddOns/SVUI/scripts/misc.lua b/Interface/AddOns/SVUI/scripts/misc.lua index 8465157..03dc85a 100644 --- a/Interface/AddOns/SVUI/scripts/misc.lua +++ b/Interface/AddOns/SVUI/scripts/misc.lua @@ -358,7 +358,7 @@ local function RaidMarkShowIcons() if not UnitExists("target") or UnitIsDead("target") then return end local x,y = GetCursorPosition() local scale = SV.UIParent:GetEffectiveScale() - RaidMarkFrame:SetPoint("CENTER",SV.UIParent,"BOTTOMLEFT", (x / scale), (y / scale)) + RaidMarkFrame:SetPoint("CENTER", SV.UIParent, "BOTTOMLEFT", (x / scale), (y / scale)) RaidMarkFrame:Show() end @@ -374,7 +374,7 @@ _G.RaidMark_HotkeyPressed = function(button) end RaidMarkFrame:RegisterEvent("PLAYER_TARGET_CHANGED") -RaidMarkFrame:SetScript("OnEvent",function(self, event) +RaidMarkFrame:SetScript("OnEvent", function(self, event) if ButtonIsDown then RaidMarkShowIcons() end diff --git a/Interface/AddOns/SVUI/scripts/mounts.lua b/Interface/AddOns/SVUI/scripts/mounts.lua index 0f139d5..0271bdc 100644 --- a/Interface/AddOns/SVUI/scripts/mounts.lua +++ b/Interface/AddOns/SVUI/scripts/mounts.lua @@ -359,9 +359,7 @@ local function SetMountCheckButtons() -- scrollBar:HookScript("OnValueChanged", Update_MountCheckButtons) UpdateCurrentMountSelection() - if(SV.GameVersion >= 60000) then - MountListener:RegisterEvent("MOUNT_JOURNAL_USABILITY_CHANGED") - end + MountListener:RegisterEvent("MOUNT_JOURNAL_USABILITY_CHANGED") MountListener:RegisterEvent("COMPANION_LEARNED") MountListener:RegisterEvent("COMPANION_UNLEARNED") diff --git a/Interface/AddOns/SVUI/scripts/questwatch.lua b/Interface/AddOns/SVUI/scripts/questwatch.lua index c200206..ac584d2 100644 --- a/Interface/AddOns/SVUI/scripts/questwatch.lua +++ b/Interface/AddOns/SVUI/scripts/questwatch.lua @@ -105,12 +105,23 @@ local function CreateQuestFrame() ObjectiveTrackerFrame.SetAllPoints = SV.fubar; ObjectiveTrackerFrame.BlocksFrame:RemoveTextures(true) - ObjectiveTrackerFrame.BlocksFrame.QuestHeader:RemoveTextures(true) - ObjectiveTrackerFrame.BlocksFrame.AchievementHeader:RemoveTextures(true) - ObjectiveTrackerFrame.BlocksFrame.ScenarioHeader:RemoveTextures(true) ObjectiveTrackerFrame.HeaderMenu:RemoveTextures(true) ObjectiveTrackerFrame.BlockDropDown:RemoveTextures(true) + if(SV.db.general.questHeaders) then + ObjectiveTrackerFrame.BlocksFrame.QuestHeader:RemoveTextures(true) + ObjectiveTrackerFrame.BlocksFrame.QuestHeader:SetFixedPanelTemplate("Headline", true) + ObjectiveTrackerFrame.BlocksFrame.QuestHeader:SetBackdropColor(0, 0, 0, 0.5) + + ObjectiveTrackerFrame.BlocksFrame.AchievementHeader:RemoveTextures(true) + ObjectiveTrackerFrame.BlocksFrame.AchievementHeader:SetFixedPanelTemplate("Headline", true) + ObjectiveTrackerFrame.BlocksFrame.AchievementHeader:SetBackdropColor(0, 0, 0, 0.5) + + ObjectiveTrackerFrame.BlocksFrame.ScenarioHeader:RemoveTextures(true) + ObjectiveTrackerFrame.BlocksFrame.ScenarioHeader:SetFixedPanelTemplate("Headline", true) + ObjectiveTrackerFrame.BlocksFrame.ScenarioHeader:SetBackdropColor(0, 0, 0, 0.5) + end + SV.Mentalo:Add(QuestFrame, "Quest Watch"); else local bgTex = [[Interface\BUTTONS\WHITE8X8]] @@ -173,6 +184,14 @@ local function CreateQuestFrame() ObjectiveTrackerFrame.SetPoint = SV.fubar; ObjectiveTrackerFrame.SetWidth = SV.fubar; + ObjectiveTrackerFrame.HeaderMenu.MinimizeButton:Hide() + + ObjectiveTrackerFrame.BlocksFrame:RemoveTextures(true) + ObjectiveTrackerFrame.BlocksFrame:SetPoint("TOPLEFT", ObjectiveTrackerFrame, "TOPLEFT", 87, 0) + ObjectiveTrackerFrame.BlocksFrame:SetPoint("BOTTOMLEFT", ObjectiveTrackerFrame, "BOTTOMLEFT", 87, 0) + ObjectiveTrackerFrame.BlocksFrame:SetWidth(WIDTH) + ObjectiveTrackerFrame.BlocksFrame.SetWidth = SV.fubar; + ObjectiveTrackerFrame.BlocksFrame.QuestHeader:SetWidth((WIDTH - 60)) ObjectiveTrackerFrame.BlocksFrame.AchievementHeader:SetWidth((WIDTH - 60)) ObjectiveTrackerFrame.BlocksFrame.ScenarioHeader:SetWidth((WIDTH - 60)) @@ -191,15 +210,6 @@ local function CreateQuestFrame() ObjectiveTrackerFrame.BlocksFrame.ScenarioHeader:SetBackdropColor(0, 0, 0, 0.5) end - - ObjectiveTrackerFrame.HeaderMenu.MinimizeButton:Hide() - - ObjectiveTrackerFrame.BlocksFrame:RemoveTextures(true) - ObjectiveTrackerFrame.BlocksFrame:SetPoint("TOPLEFT", ObjectiveTrackerFrame, "TOPLEFT", 87, 0) - ObjectiveTrackerFrame.BlocksFrame:SetPoint("BOTTOMLEFT", ObjectiveTrackerFrame, "BOTTOMLEFT", 87, 0) - ObjectiveTrackerFrame.BlocksFrame:SetWidth(WIDTH) - ObjectiveTrackerFrame.BlocksFrame.SetWidth = SV.fubar; - local eventHandler = CreateFrame("Frame") eventHandler:RegisterEvent("QUEST_AUTOCOMPLETE") eventHandler:SetScript("OnEvent", QuestFrame_OnEvent) diff --git a/Interface/AddOns/SVUI/scripts/raid.lua b/Interface/AddOns/SVUI/scripts/raid.lua index 6278c36..1be6a0c 100644 --- a/Interface/AddOns/SVUI/scripts/raid.lua +++ b/Interface/AddOns/SVUI/scripts/raid.lua @@ -48,10 +48,19 @@ end local function ButtonEnter(self) self:SetPanelColor("highlight") + self.icon:SetGradient(unpack(SV.Media.gradient.inverse)) + if(self.TText) then + GameTooltip:SetOwner(self, "ANCHOR_TOPLEFT", 0, 4) + GameTooltip:ClearLines() + GameTooltip:AddLine(self.TText, 1, 1, 1) + GameTooltip:Show() + end end local function ButtonLeave(self) self:SetPanelColor("inverse") + self.icon:SetGradient(unpack(SV.Media.gradient.icon)) + GameTooltip:Hide() end local function CreateUtilButton(name, parent, template, width, height, point, relativeto, point2, xOfs, yOfs, text, texture) @@ -78,7 +87,7 @@ local function CreateUtilButton(name, parent, template, width, height, point, re end local function ToggleRaidUtil(event) - if(not RaidUtility_ShowButton) then return end + if(not SVUI_RaidTools) then return end if InCombatLockdown() then RaidUtilFrame:RegisterEvent("PLAYER_REGEN_ENABLED") return @@ -88,15 +97,15 @@ local function ToggleRaidUtil(event) local width = SuperDockToolBarTop.openWidth SuperDockToolBarTop:SetWidth(width) if RaidUtilityPanel.toggled == true then - RaidUtility_ShowButton:Hide() + SVUI_RaidTools:Hide() RaidUtilityPanel:Show() else - RaidUtility_ShowButton:Show() + SVUI_RaidTools:Show() RaidUtilityPanel:Hide() end else SuperDockToolBarTop:SetWidth(1) - RaidUtility_ShowButton:Hide() + SVUI_RaidTools:Hide() RaidUtilityPanel:Hide() end @@ -110,6 +119,7 @@ RaidUtilFrame:RegisterEvent("PLAYER_ENTERING_WORLD") RaidUtilFrame:SetScript("OnEvent", ToggleRaidUtil) local function LoadRaidUtility() + local buttonsize = SV.db.SVDock.buttonSize or 22; --Create main frame local RaidUtilityPanel = CreateFrame("Frame", "RaidUtilityPanel", SV.UIParent, "SecureHandlerClickTemplate") RaidUtilityPanel:SetPanelTemplate('Transparent') @@ -122,9 +132,21 @@ local function LoadRaidUtility() SV:AddToDisplayAudit(RaidUtilityPanel) --Show Button - CreateUtilButton("RaidUtility_ShowButton", SV.UIParent, "UIMenuButtonStretchTemplate, SecureHandlerClickTemplate", SuperDockToolBarTop.openWidth, SuperDockToolBarTop:GetHeight(), "CENTER", SuperDockToolBarTop, "CENTER", 0, 0, RAID_CONTROL, nil) - RaidUtility_ShowButton:SetFrameRef("RaidUtilityPanel", RaidUtilityPanel) - RaidUtility_ShowButton:SetAttribute("_onclick", [=[ + local SVUI_RaidTools = CreateFrame("Button", "SVUI_RaidTools", SV.UIParent, "UIMenuButtonStretchTemplate, SecureHandlerClickTemplate") + SVUI_RaidTools:Size(buttonsize, buttonsize) + SVUI_RaidTools:Point("CENTER", SuperDockToolBarTop, "CENTER", 0, 0) + SVUI_RaidTools.icon = SVUI_RaidTools:CreateTexture(nil,"OVERLAY",nil) + SVUI_RaidTools.icon:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Icons\DOCK-RAIDTOOL]]) + SVUI_RaidTools.icon:Point("TOPLEFT", SVUI_RaidTools, "TOPLEFT", 1, -1) + SVUI_RaidTools.icon:Point("BOTTOMRIGHT", SVUI_RaidTools, "BOTTOMRIGHT", -1, 1) + + SVUI_RaidTools.TText = RAID_CONTROL .. " [Click to Open]" + + SVUI_RaidTools:HookScript("OnEnter", ButtonEnter) + SVUI_RaidTools:HookScript("OnLeave", ButtonLeave) + + SVUI_RaidTools:SetFrameRef("RaidUtilityPanel", RaidUtilityPanel) + SVUI_RaidTools:SetAttribute("_onclick", [=[ local raidUtil = self:GetFrameRef("RaidUtilityPanel") local closeButton = raidUtil:GetFrameRef("RaidUtility_CloseButton") self:Hide(); @@ -151,18 +173,20 @@ local function LoadRaidUtility() raidUtil:SetPoint(raidUtilPoint, self, raidUtilRelative, 2, -2) closeButton:SetPoint(closeButtonRelative, raidUtil, closeButtonPoint, 0, yOffset) ]=]) - RaidUtility_ShowButton:SetScript("OnMouseUp", function(self) RaidUtilityPanel.toggled = true end) - RaidUtility_ShowButton:SetMovable(true) - RaidUtility_ShowButton:SetClampedToScreen(true) - RaidUtility_ShowButton:SetClampRectInsets(0, 0, -1, 1) - RaidUtility_ShowButton:RegisterForDrag("RightButton") - RaidUtility_ShowButton:SetFrameStrata("HIGH") - RaidUtility_ShowButton:SetScript("OnDragStart", function(self) + + SVUI_RaidTools:SetScript("OnMouseUp", function(self) RaidUtilityPanel.toggled = true end) + SVUI_RaidTools:SetMovable(true) + SVUI_RaidTools:SetClampedToScreen(true) + SVUI_RaidTools:SetClampRectInsets(0, 0, -1, 1) + SVUI_RaidTools:RegisterForDrag("RightButton") + SVUI_RaidTools:SetFrameStrata("HIGH") + SVUI_RaidTools:SetScript("OnDragStart", function(self) self:StartMoving() end) - SV:AddToDisplayAudit(RaidUtility_ShowButton) + + SV:AddToDisplayAudit(SVUI_RaidTools) - RaidUtility_ShowButton:SetScript("OnDragStop", function(self) + SVUI_RaidTools:SetScript("OnDragStop", function(self) self:StopMovingOrSizing() local point = self:GetPoint() local xOffset = self:GetCenter() @@ -178,8 +202,8 @@ local function LoadRaidUtility() --Close Button CreateUtilButton("RaidUtility_CloseButton", RaidUtilityPanel, "UIMenuButtonStretchTemplate, SecureHandlerClickTemplate", 30, 18, "TOP", RaidUtilityPanel, "BOTTOM", 0, -1, "X", nil) - RaidUtility_CloseButton:SetFrameRef("RaidUtility_ShowButton", RaidUtility_ShowButton) - RaidUtility_CloseButton:SetAttribute("_onclick", [=[self:GetParent():Hide(); self:GetFrameRef("RaidUtility_ShowButton"):Show();]=]) + RaidUtility_CloseButton:SetFrameRef("SVUI_RaidTools", SVUI_RaidTools) + RaidUtility_CloseButton:SetAttribute("_onclick", [=[self:GetParent():Hide(); self:GetFrameRef("SVUI_RaidTools"):Show();]=]) RaidUtility_CloseButton:SetScript("OnMouseUp", function(self) RaidUtilityPanel.toggled = false end) RaidUtilityPanel:SetFrameRef("RaidUtility_CloseButton", RaidUtility_CloseButton) @@ -244,7 +268,7 @@ local function LoadRaidUtility() "RoleCheckButton", "ReadyCheckButton", "RaidControlButton", - "RaidUtility_ShowButton", + "SVUI_RaidTools", "RaidUtility_CloseButton" } diff --git a/Interface/AddOns/SVUI/system/animate.lua b/Interface/AddOns/SVUI/system/animate.lua index c5e5d0a..d6e3252 100644 --- a/Interface/AddOns/SVUI/system/animate.lua +++ b/Interface/AddOns/SVUI/system/animate.lua @@ -68,15 +68,18 @@ local Anim_OnStop = function(self) local parent = self.parent if self.fadeOnFinished then parent:SetAlpha(0) - else - parent:SetAlpha(1) end if self.hideOnFinished and parent:IsShown() then parent:Hide() end - if self.savedFrameLevel then + if self.savedFrameLevel or self.startscale then parent:SetScale(1) - parent:SetFrameLevel(self.savedFrameLevel) + if self.startscale then + self.startscale = 1 + end + if self.savedFrameLevel then + parent:SetFrameLevel(self.savedFrameLevel) + end end end @@ -141,6 +144,34 @@ local PulseOut_OnUpdate = function(self) parent:SetScale(1 + (1.05 * (1 - step))) end +local Kapow_OnPlay = function(self) + local parent = self.parent + if(not parent.startscale) then + parent.startscale = parent:GetScale() + end + parent:SetAlpha(1) + parent:SetScale(parent.startscale or 1) +end + +local Kapow_OnFinished = function(self) + self.parent:SetAlpha(0) +end + +local Kapow_OnUpdate = function(self) + local parent = self.parent + local step = self:GetProgress() + local scale = 1 + if(parent.startscale) then + scale = scale * parent.startscale + end + parent:SetScale(scale + (1.05 * step)) +end + +local Kapow_OnUpdate2 = function(self) + local parent = self.parent + _G.UIFrameFadeOut(parent, 0.3, 1, 0) +end + local Slide_OnUpdate = function(self) local parent = self.parent local step = self:GetProgress() @@ -178,7 +209,7 @@ function Animate:SetTemplate(frame, animType, hideOnFinished, speed, special, sc frame.anim = frame:CreateAnimationGroup(animType) frame.anim.parent = frame; frame.anim.hideOnFinished = hideOnFinished - if animType ~= 'Flash' then + if animType ~= 'Flash' and animType ~= 'Kapow' then frame.anim:SetScript("OnPlay", Anim_OnPlay) frame.anim:SetScript("OnFinished", Anim_OnFinished) frame.anim:SetScript("OnStop", Anim_OnStop) @@ -200,12 +231,12 @@ function Animate:SetTemplate(frame, animType, hideOnFinished, speed, special, sc frame.anim.fadeOnFinished = true if not speed then speed = 0.33 end - frame.anim[1] = SetNewAnimation(frame.anim, "ALPHA", "FadeIn") + frame.anim[1] = SetNewAnimation(frame.anim, "Alpha", "FadeIn") frame.anim[1]:SetChange(1) frame.anim[1]:SetOrder(2) frame.anim[1]:SetDuration(speed) - frame.anim[2] = SetNewAnimation(frame.anim, "ALPHA","FadeOut") + frame.anim[2] = SetNewAnimation(frame.anim, "Alpha", "FadeOut") frame.anim[2]:SetChange(-1) frame.anim[2]:SetOrder(1) frame.anim[2]:SetDuration(speed) @@ -316,6 +347,21 @@ function Animate:SetTemplate(frame, animType, hideOnFinished, speed, special, sc frame.anim[2]:SetDuration(0.6) frame.anim[2]:SetOrder(2) frame.anim[2]:SetScript("OnUpdate", PulseOut_OnUpdate) + elseif animType == 'Kapow' then + frame.anim:SetScript("OnPlay", Kapow_OnPlay) + + frame.anim.startscale = frame:GetScale() + + frame.anim[1] = SetNewAnimation(frame.anim, "Rotation") + frame.anim[1]:SetDuration(0.2) + frame.anim[1]:SetOrder(1) + frame.anim[1]:SetDegrees(360) + frame.anim[1]:SetScript("OnUpdate", Kapow_OnUpdate) + + frame.anim[2] = SetNewAnimation(frame.anim) + frame.anim[2]:SetDuration(0.3) + frame.anim[2]:SetOrder(2) + frame.anim[2]:SetScript("OnUpdate", Kapow_OnUpdate2) end end @@ -332,6 +378,11 @@ function Animate:Pulse(frame, hideOnFinished) self:SetTemplate(frame, 'Pulse', hideOnFinished) end +function Animate:Kapow(frame, hideOnFinished) + if not frame then return end + self:SetTemplate(frame, 'Kapow', hideOnFinished) +end + --[[ ANIMATED SPRITES ]]-- function Animate:Sprite(frame, speed, fadeTime, scriptToParent) diff --git a/Interface/AddOns/SVUI/system/configs.lua b/Interface/AddOns/SVUI/system/configs.lua index f5e1f41..f49ae4e 100644 --- a/Interface/AddOns/SVUI/system/configs.lua +++ b/Interface/AddOns/SVUI/system/configs.lua @@ -28,7 +28,7 @@ local function safename(id) if type(id) == "string" then n = id else - SV:Debugger('|cffFF9900SVUI:|r Spell not found: (#ID) '..id) + --SV:Debugger('|cffFF9900SVUI:|r Spell not found: (#ID) '..id) n = "Voodoo Doll"; end end @@ -138,7 +138,7 @@ SV.configs["media"] = { [safename(32182)] = {0.98, 0.57, 0.11}, --Heroism [safename(80353)] = {0.98, 0.57, 0.11}, --Time Warp [safename(90355)] = {0.98, 0.57, 0.11}, --Ancient Hysteria - [safename(84963)] = {0.98, 0.57, 0.11}, --Inquisition + --[safename(84963)] = {0.98, 0.57, 0.11}, --Inquisition [safename(86659)] = {0.98, 0.57, 0.11}, --Guardian of Ancient Kings } } @@ -1134,6 +1134,14 @@ SV.configs["SVUnit"] = { }, ["icons"] = { + ["classIcon"] = + { + ["enable"] = false, + ["size"] = 26, + ["attachTo"] = "INNERBOTTOMLEFT", + ["xOffset"] = 0, + ["yOffset"] = 0, + }, ["raidicon"] = { ["enable"] = true, diff --git a/Interface/AddOns/SVUI_ChatOMatic/Loader.lua b/Interface/AddOns/SVUI_ChatOMatic/Loader.lua index fc761df..41cf0e5 100644 --- a/Interface/AddOns/SVUI_ChatOMatic/Loader.lua +++ b/Interface/AddOns/SVUI_ChatOMatic/Loader.lua @@ -27,7 +27,7 @@ local AddonName, AddonObject = ... assert(_G.LibSuperVillain, AddonName .. " requires LibSuperVillain") -local PLUGIN = _G.LibSuperVillain:NewPlugin(AddonName, AddonObject) +local PLUGIN = _G.LibSuperVillain:NewPlugin(AddonName, AddonObject, "ChatOMatic_Profile", nil, "ChatOMatic_Cache") local Schema = PLUGIN.Schema; local SV = _G["SVUI"]; @@ -37,13 +37,14 @@ local L = SV.L CONFIG DATA ########################################################## ]]-- -SV.configs[Schema] = { - ["enable"] = true, +PLUGIN.configs = { ["saveChats"] = true, ["service"] = true, ["autoAnswer"] = false, ["prefix"] = true } + +PLUGIN.db = PLUGIN.configs; --[[ ########################################################## CONFIG OPTIONS @@ -53,30 +54,30 @@ SV.Options.args.plugins.args.pluginOptions.args[Schema].args["saveChats"] = { order = 2, name = "Save Chat History", type = "toggle", - get = function(key) return SV.db[Schema][key[#key]] end, - set = function(key,value) SV.db[Schema][key[#key]] = value end + get = function(key) return PLUGIN.db[key[#key]] end, + set = function(key,value) PLUGIN.db[key[#key]] = value end } SV.Options.args.plugins.args.pluginOptions.args[Schema].args["service"] = { order = 3, name = "Answering Service", type = "toggle", - get = function(key) return SV.db[Schema][key[#key]] end, - set = function(key,value) SV.db[Schema][key[#key]] = value end + get = function(key) return PLUGIN.db[key[#key]] end, + set = function(key,value) PLUGIN.db[key[#key]] = value end } SV.Options.args.plugins.args.pluginOptions.args[Schema].args["autoAnswer"] = { order = 4, name = "Auto Answer", type = "toggle", - get = function(key) return SV.db[Schema][key[#key]] end, - set = function(key,value) SV.db[Schema][key[#key]] = value end + get = function(key) return PLUGIN.db[key[#key]] end, + set = function(key,value) PLUGIN.db[key[#key]] = value end } SV.Options.args.plugins.args.pluginOptions.args[Schema].args["prefix"] = { order = 5, name = "Prefix Messages", type = "toggle", - get = function(key) return SV.db[Schema][key[#key]] end, - set = function(key,value) SV.db[Schema][key[#key]] = value end + get = function(key) return PLUGIN.db[key[#key]] end, + set = function(key,value) PLUGIN.db[key[#key]] = value end } \ No newline at end of file diff --git a/Interface/AddOns/SVUI_ChatOMatic/SVUI_ChatOMatic.lua b/Interface/AddOns/SVUI_ChatOMatic/SVUI_ChatOMatic.lua index b4360ed..df4bfdd 100644 --- a/Interface/AddOns/SVUI_ChatOMatic/SVUI_ChatOMatic.lua +++ b/Interface/AddOns/SVUI_ChatOMatic/SVUI_ChatOMatic.lua @@ -35,19 +35,19 @@ EVENTS ########################################################## ]]-- function PLUGIN:CHAT_MSG_WHISPER(event, ...) - if(SV.db.SVChat.enable and SV.db[Schema].saveChats) then + if(SV.db.SVChat.enable and self.db.saveChats) then self:SAVE_CHAT_HISTORY(event, ...) end - if(SV.db[Schema].service) then + if(self.db.service) then self:AUTO_MSG_WHISPER(event, ...) end end function PLUGIN:CHAT_MSG_BN_WHISPER(event, ...) - if(SV.db.SVChat.enable and SV.db[Schema].saveChats) then + if(SV.db.SVChat.enable and self.db.saveChats) then self:SAVE_CHAT_HISTORY(event, ...) end - if(SV.db[Schema].service and self.ServiceEnabled) then + if(self.db.service and self.ServiceEnabled) then self:AUTO_MSG_BN_WHISPER(event, ...) end end @@ -57,14 +57,11 @@ LOAD AND CONSTRUCT ########################################################## ]]-- function PLUGIN:Load() - if not ChatOMatic_Cache then ChatOMatic_Cache = {} end - if(not SV.db[Schema].enable) then return end - - if(SV.db.SVChat.enable and SV.db[Schema].saveChats) then + if(SV.db.SVChat.enable and self.db.saveChats) then self:EnableChatHistory() end - if(SV.db[Schema].service) then + if(self.db.service) then self:EnableAnsweringService() end diff --git a/Interface/AddOns/SVUI_ChatOMatic/SVUI_ChatOMatic.toc b/Interface/AddOns/SVUI_ChatOMatic/SVUI_ChatOMatic.toc index f2775bd..371c392 100644 --- a/Interface/AddOns/SVUI_ChatOMatic/SVUI_ChatOMatic.toc +++ b/Interface/AddOns/SVUI_ChatOMatic/SVUI_ChatOMatic.toc @@ -4,7 +4,7 @@ ## Title: |cffFF9900SVUI |r|cffFFEF00Chat-O-Matic|r ## Notes: Supervillain UI [|cff9911FFVarious Chat Gadgets|r] ## SavedVariables: ChatOMatic_Data -## SavedVariablesPerCharacter: ChatOMatic_Cache +## SavedVariablesPerCharacter: ChatOMatic_Profile, ChatOMatic_Cache ## RequiredDeps: SVUI ## LoadOnDemand: 1 ## X-Email: munglunch@gmail.com diff --git a/Interface/AddOns/SVUI_ChatOMatic/components/answering_service.lua b/Interface/AddOns/SVUI_ChatOMatic/components/answering_service.lua index d1ce46c..705452a 100644 --- a/Interface/AddOns/SVUI_ChatOMatic/components/answering_service.lua +++ b/Interface/AddOns/SVUI_ChatOMatic/components/answering_service.lua @@ -446,7 +446,7 @@ LOCAL FUNCTIONS ########################################################## ]]-- local function ServiceMessage(msg) - local msgFrom = SV.db[Schema].prefix == true and "Minion Answering Service" or ""; + local msgFrom = PLUGIN.db.prefix == true and "Minion Answering Service" or ""; print("|cffffcc1a" .. msgFrom .. ":|r", msg) end @@ -694,7 +694,7 @@ do if(not outbound) then outbound = PhraseSearch(sInput, mapkey, data) end - if(SV.db[Schema].prefix == true) then + if(PLUGIN.db.prefix == true) then return ("%s's Answering Service: %s"):format(PlayersName, outbound) else return outbound @@ -737,7 +737,7 @@ function PLUGIN:AddCaller(caller) btn.Text:SetText(caller); PhoneLines[caller].Line = x call_answered = true - if SV.db[Schema].autoAnswer == true then + if self.db.autoAnswer == true then PhoneLines[caller].InUse = true; btn:SetPanelColor("green"); self.Docklet:SetPanelColor("green"); @@ -969,7 +969,7 @@ function PLUGIN:EnableAnsweringService() self.Window:Hide() local strMsg - if SV.db[Schema].autoAnswer == true then + if self.db.autoAnswer == true then strMsg = "The Henchmen Operators Are Screening Your Calls.." else strMsg = "The Henchmen Operators Are Standing By.." diff --git a/Interface/AddOns/SVUI_ChatOMatic/components/chat_history.lua b/Interface/AddOns/SVUI_ChatOMatic/components/chat_history.lua index 378ff4c..76b9b2e 100644 --- a/Interface/AddOns/SVUI_ChatOMatic/components/chat_history.lua +++ b/Interface/AddOns/SVUI_ChatOMatic/components/chat_history.lua @@ -73,10 +73,9 @@ function PLUGIN:SAVE_CHAT_HISTORY(event, ...) local timestamp = MessageTimeStamp() local lineNum, lineID = 0 - self.ChatHistory[timestamp] = temp_cache + self.cache.chat[timestamp] = temp_cache - local history = self.ChatHistory - for id, data in pairs(history) do + for id, data in pairs(self.cache.chat) do lineNum = lineNum + 1 if((not lineID) or lineID > id) then lineID = id @@ -84,36 +83,14 @@ function PLUGIN:SAVE_CHAT_HISTORY(event, ...) end if(lineNum > 128) then - self.ChatHistory[lineID] = nil - end - end - temp_cache = nil -end - -function PLUGIN:PLAYER_ENTERING_WORLD() - local history = self.ChatHistory - local temp_cache, data_cache = {} - for id, _ in pairs(history) do - tinsert(temp_cache, tonumber(id)) - end - tsort(temp_cache, function(a, b) - return a < b - end) - for i = 1, #temp_cache do - data_cache = history[tostring(temp_cache[i])] - if type(data_cache) == "table" and data_cache[20] ~= nil then - ChatFrame_MessageEventHandler(DEFAULT_CHAT_FRAME, data_cache[20], unpack(data_cache)) + self.cache.chat[lineID] = nil end end temp_cache = nil - data_cache = nil - self:UnregisterEvent("PLAYER_ENTERING_WORLD") -end +end function PLUGIN:EnableChatHistory() - if not ChatOMatic_Cache["chat"] then ChatOMatic_Cache["chat"] = {} end - - self.ChatHistory = ChatOMatic_Cache["chat"] + if not self.cache["chat"] then self.cache["chat"] = {} end self:RegisterEvent("CHAT_MSG_CHANNEL", "SAVE_CHAT_HISTORY") self:RegisterEvent("CHAT_MSG_EMOTE", "SAVE_CHAT_HISTORY") @@ -132,7 +109,30 @@ function PLUGIN:EnableChatHistory() self:RegisterEvent("CHAT_MSG_INSTANCE_CHAT_LEADER", "SAVE_CHAT_HISTORY") self:RegisterEvent("CHAT_MSG_BN_CONVERSATION", "SAVE_CHAT_HISTORY") self:RegisterEvent("CHAT_MSG_BN_WHISPER_INFORM", "SAVE_CHAT_HISTORY") - self:RegisterEvent("PLAYER_ENTERING_WORLD") + + local temp_cache, data_cache = {} + for id, _ in pairs(self.cache.chat) do + tinsert(temp_cache, tonumber(id)) + end + tsort(temp_cache, function(a, b) + return a < b + end) + for i = 1, #temp_cache do + local lineID = tostring(temp_cache[i]) + data_cache = self.cache.chat[lineID] + local GUID = data_cache[12] + if(data_cache and (type(data_cache) == "table") and data_cache[20] ~= nil and (GUID and type(GUID) == "string")) then + if(not GUID:find("Player-")) then + self.cache.chat[lineID] = nil + else + ChatFrame_MessageEventHandler(DEFAULT_CHAT_FRAME, data_cache[20], unpack(data_cache)) + end + end + end + + temp_cache = nil + data_cache = nil + wipe(self.cache.chat) end function PLUGIN:DisableChatHistory() @@ -153,5 +153,4 @@ function PLUGIN:DisableChatHistory() self:UnregisterEvent("CHAT_MSG_INSTANCE_CHAT_LEADER") self:UnregisterEvent("CHAT_MSG_BN_CONVERSATION") self:UnregisterEvent("CHAT_MSG_BN_WHISPER_INFORM") - self:UnregisterEvent("PLAYER_ENTERING_WORLD") end \ No newline at end of file diff --git a/Interface/AddOns/SVUI_ConfigOMatic/components/units/core.lua b/Interface/AddOns/SVUI_ConfigOMatic/components/units/core.lua index 78806be..eb128dc 100644 --- a/Interface/AddOns/SVUI_ConfigOMatic/components/units/core.lua +++ b/Interface/AddOns/SVUI_ConfigOMatic/components/units/core.lua @@ -1009,6 +1009,30 @@ function ns:SetIconConfigGroup(updateFunction, unitName, count) args = {} }; + if(iconGroup["classIcon"]) then + k.args.classIcon = { + order = grouporder, + type = "group", + guiInline = true, + name = L["Class Icons"], + get = function(key) + return SV.db.SVUnit[unitName]["icons"]["classIcon"][key[#key]] + end, + set = function(key, value) + MOD:ChangeDBVar(value, key[#key], unitName, "icons", "classIcon") + updateFunction(MOD, unitName, count) + end, + args = { + enable = {type = "toggle", order = 1, name = L["Enable"]}, + attachTo = {type = "select", order = 2, name = L["Position"], values = SV.PointIndexes}, + size = {type = "range", name = L["Size"], width = "full", order = 3, min = 8, max = 60, step = 1}, + xOffset = {order = 4, type = "range", name = L["xOffset"], width = "full", min = -300, max = 300, step = 1}, + yOffset = {order = 5, type = "range", name = L["yOffset"], width = "full", min = -300, max = 300, step = 1} + } + } + grouporder = grouporder + 1 + end + if(iconGroup["raidicon"]) then k.args.raidicon = { order = grouporder, diff --git a/Interface/AddOns/SVUI_CraftOMatic/Loader.lua b/Interface/AddOns/SVUI_CraftOMatic/Loader.lua index 06b83d3..c826b73 100644 --- a/Interface/AddOns/SVUI_CraftOMatic/Loader.lua +++ b/Interface/AddOns/SVUI_CraftOMatic/Loader.lua @@ -27,7 +27,7 @@ local AddonName, AddonObject = ... assert(_G.LibSuperVillain, AddonName .. " requires LibSuperVillain") -local PLUGIN = _G.LibSuperVillain:NewPlugin(AddonName, AddonObject) +local PLUGIN = _G.LibSuperVillain:NewPlugin(AddonName, AddonObject, "CraftOMatic_Profile", nil, "CraftOMatic_Cache") local Schema = PLUGIN.Schema; local SV = _G["SVUI"]; @@ -37,8 +37,7 @@ local L = SV.L CONFIG DATA ########################################################## ]]-- -SV.configs[Schema] = { - ["enable"] = true, +PLUGIN.configs = { ["fontSize"] = 12, ["farming"] = { ["buttonsize"] = 35, @@ -54,6 +53,8 @@ SV.configs[Schema] = { ["autoequip"] = true, }, } + +PLUGIN.db = table.copy(PLUGIN.configs); --[[ ########################################################## CONFIG OPTIONS @@ -67,7 +68,7 @@ SV.Options.args.plugins.args.pluginOptions.args[Schema].args["fontSize"] = { min = 6, max = 22, step = 1, - get = function(key) return SV.db[Schema][key[#key]] end, + get = function(key) return PLUGIN.db[key[#key]] end, set = function(key,value) PLUGIN:ChangeDBVar(value, key[#key]); PLUGIN:UpdateLogWindow() end } @@ -82,7 +83,7 @@ SV.Options.args.plugins.args.pluginOptions.args[Schema].args["fishing"] = { order = 1, name = L['AutoEquip'], desc = L['Enable/Disable automatically equipping fishing gear.'], - get = function(key)return SV.db[Schema].fishing[key[#key]] end, + get = function(key)return PLUGIN.db.fishing[key[#key]] end, set = function(key, value)PLUGIN:ChangeDBVar(value, key[#key], "fishing") end } } @@ -99,7 +100,7 @@ SV.Options.args.plugins.args.pluginOptions.args[Schema].args["cooking"] = { order = 1, name = L['AutoEquip'], desc = L['Enable/Disable automatically equipping cooking gear.'], - get = function(key)return SV.db[Schema].cooking[key[#key]]end, + get = function(key)return PLUGIN.db.cooking[key[#key]]end, set = function(key, value)PLUGIN:ChangeDBVar(value, key[#key], "cooking")end } } @@ -110,8 +111,8 @@ SV.Options.args.plugins.args.pluginOptions.args[Schema].args["farming"] = { type = "group", name = L["Farming Mode Settings"], guiInline = true, - get = function(key)return SV.db[Schema].farming[key[#key]]end, - set = function(key, value)SV.db[Schema].farming[key[#key]] = value end, + get = function(key)return PLUGIN.db.farming[key[#key]]end, + set = function(key, value)PLUGIN.db.farming[key[#key]] = value end, args = { buttonsize = { type = 'range', diff --git a/Interface/AddOns/SVUI_CraftOMatic/SVUI_CraftOMatic.lua b/Interface/AddOns/SVUI_CraftOMatic/SVUI_CraftOMatic.lua index be81afe..61ad8ba 100644 --- a/Interface/AddOns/SVUI_CraftOMatic/SVUI_CraftOMatic.lua +++ b/Interface/AddOns/SVUI_CraftOMatic/SVUI_CraftOMatic.lua @@ -306,7 +306,7 @@ function PLUGIN:ChangeModeGear() end function PLUGIN:UpdateLogWindow() - self.LogWindow:SetFont(SV.Media.font.system, SV.db[Schema].fontSize, "OUTLINE") + self.LogWindow:SetFont(SV.Media.font.system, self.db.fontSize, "OUTLINE") end function PLUGIN:SKILL_LINES_CHANGED() @@ -387,28 +387,6 @@ BUILD FUNCTION ########################################################## ]]-- function PLUGIN:Load() - if(not SV.db[Schema].enable) then return end - - if((not SV.db[Schema].farming) or (not SV.db[Schema].fishing) or (not SV.db[Schema].cooking)) then - SV.db[Schema] = { - ["enable"] = true, - ["fontSize"] = 12, - ["farming"] = { - ["buttonsize"] = 35, - ["buttonspacing"] = 3, - ["onlyactive"] = false, - ["droptools"] = true, - ["toolbardirection"] = "HORIZONTAL", - }, - ["fishing"] = { - ["autoequip"] = true, - }, - ["cooking"] = { - ["autoequip"] = true, - }, - } - end - lastClickTime = nil; self.WornItems = {}; self.InModeGear = false; @@ -546,7 +524,7 @@ function PLUGIN:Load() log:SetFrameStrata("MEDIUM") log:SetPoint("TOPLEFT",title,"BOTTOMLEFT",0,0) log:SetPoint("BOTTOMRIGHT",ModeLogsFrame,"BOTTOMRIGHT",0,0) - log:SetFontTemplate(nil, SV.db[Schema].fontSize, "OUTLINE") + log:SetFontTemplate(nil, self.db.fontSize, "OUTLINE") log:SetJustifyH("CENTER") log:SetJustifyV("MIDDLE") log:SetShadowColor(0, 0, 0, 0) diff --git a/Interface/AddOns/SVUI_CraftOMatic/SVUI_CraftOMatic.toc b/Interface/AddOns/SVUI_CraftOMatic/SVUI_CraftOMatic.toc index f50e954..a86cba0 100644 --- a/Interface/AddOns/SVUI_CraftOMatic/SVUI_CraftOMatic.toc +++ b/Interface/AddOns/SVUI_CraftOMatic/SVUI_CraftOMatic.toc @@ -3,7 +3,7 @@ ## Version: 5.0 ## Title: |cffFF9900SVUI |r|cffFFEF00Craft-O-Matic|r ## Notes: Supervillain UI [|cff9911FFProfession Tools|r]. -## Interface: 60000 +## SavedVariablesPerCharacter: CraftOMatic_Profile, CraftOMatic_Cache ## RequiredDeps: SVUI ## LoadOnDemand: 1 ## X-Email: munglunch@gmail.com diff --git a/Interface/AddOns/SVUI_CraftOMatic/components/archaeology.lua b/Interface/AddOns/SVUI_CraftOMatic/components/archaeology.lua index 6030eff..416bc1d 100644 --- a/Interface/AddOns/SVUI_CraftOMatic/components/archaeology.lua +++ b/Interface/AddOns/SVUI_CraftOMatic/components/archaeology.lua @@ -56,7 +56,7 @@ local GetContainerItemInfo = GetContainerItemInfo local GetContainerItemID = GetContainerItemID local ModeLogsFrame; -local COUNT_TEX = [[Interface\AddOns\SVUI\assets\artwork\icons\COUNT-]] +local COUNT_TEX = [[Interface\AddOns\SVUI\assets\artwork\icons\NUMBER-]] local refArtifacts = {}; for i = 1, 12 do @@ -224,9 +224,9 @@ EVENT HANDLER do local SURVEYCDFONT = SV.Media.font.numbers local SURVEYCOLOR = { - {0.1, 1, 0.1, 0.2}, - {1, 0.5, 0.1, 0.4}, - {1, 0.1, 0, 0.6} + {0.1, 1, 0.1}, + {1, 0.5, 0.1}, + {1, 0.1, 0} } local SURVEYSCALE = {3, 2, 1} local last = 0 @@ -237,12 +237,13 @@ do local ArchSiteFound; local ArchCanSurvey, ArchWillSurvey = false, false; - SurveyCooldown:SetPoint("TOP", UIParent, "CENTER", 0, 0) + SurveyCooldown:SetPoint("CENTER", UIParent, "CENTER", 0, 0) SurveyCooldown:SetSize(50, 50) SurveyCooldown.text = SurveyCooldown:CreateTexture(nil, "OVERLAY") SurveyCooldown.text:SetAllPoints(SurveyCooldown) SurveyCooldown.text:SetVertexColor(0,1,0.12,0.5) SurveyCooldown:SetScale(1) + SV.Animate:Kapow(SurveyCooldown, true) local Arch_OnEvent = function(self, event, ...) if(InCombatLockdown() or not archSpell) then return end @@ -305,8 +306,11 @@ do self.text:SetTexture(img) self.text:SetVertexColor(unpack(SURVEYCOLOR[time])) self:SetScale(SURVEYSCALE[time]) + self.anim:Play() end last = 0 + else + self:SetScript("OnUpdate", nil) end end diff --git a/Interface/AddOns/SVUI_CraftOMatic/components/cooking.lua b/Interface/AddOns/SVUI_CraftOMatic/components/cooking.lua index 99c5696..0b7f3ff 100644 --- a/Interface/AddOns/SVUI_CraftOMatic/components/cooking.lua +++ b/Interface/AddOns/SVUI_CraftOMatic/components/cooking.lua @@ -172,7 +172,7 @@ CORE METHODS function PLUGIN.Cooking:Enable() PLUGIN.Cooking:Update() if(not PLUGIN.Docklet:IsShown()) then PLUGIN.Docklet.ToolbarButton:Click() end - if(SV.db[Schema].cooking.autoequip) then + if(PLUGIN.db.cooking.autoequip) then UpdateChefWear(); end PlaySoundFile("Sound\\Spells\\Tradeskills\\CookingPrepareA.wav") diff --git a/Interface/AddOns/SVUI_CraftOMatic/components/farming.lua b/Interface/AddOns/SVUI_CraftOMatic/components/farming.lua index a2efd8b..365a57c 100644 --- a/Interface/AddOns/SVUI_CraftOMatic/components/farming.lua +++ b/Interface/AddOns/SVUI_CraftOMatic/components/farming.lua @@ -157,7 +157,7 @@ do if(InCombatLockdown()) then return end if(event == "ZONE_CHANGED") then local inZone = InFarmZone() - if not inZone and SV.db[Schema].farming.droptools then + if not inZone and PLUGIN.db.farming.droptools then for k, v in pairs(refTools) do local container, slot = FindItemInBags(k) if container and slot then @@ -318,7 +318,7 @@ do PLUGIN.TitleWindow:AddMessage("|cffffff11Loading Farm Tools...|r|cffff1111PLEASE WAIT|r") PLUGIN.FarmLoadTimer = SV.Timers:ExecuteTimer(LoadFarmingModeTools, 5) else - local horizontal = SV.db[Schema].farming.toolbardirection == 'HORIZONTAL' + local horizontal = PLUGIN.db.farming.toolbardirection == 'HORIZONTAL' local seeds, farmtools, portals = {},{},{} @@ -406,7 +406,7 @@ function PLUGIN.Farming:Disable() DisableListener() return end - if SV.db[Schema].farming.droptools then + if PLUGIN.db.farming.droptools then for k, v in pairs(refTools) do local container, slot = FindItemInBags(k) if container and slot then @@ -425,8 +425,8 @@ CORE FUNCTIONS ########################################################## ]]-- function PLUGIN:RefreshFarmingTools() - local count, horizontal = 0, SV.db[Schema].farming.toolbardirection == 'HORIZONTAL' - local BUTTONSPACE = SV.db[Schema].farming.buttonspacing or 2; + local count, horizontal = 0, self.db.farming.toolbardirection == 'HORIZONTAL' + local BUTTONSPACE = self.db.farming.buttonspacing or 2; local lastBar; if not FarmToolBar:IsShown() then _G["FarmSeedBarAnchor"]:SetPoint("TOPLEFT", _G["FarmModeFrameSlots"], "TOPLEFT", 0, 0) @@ -441,10 +441,10 @@ function PLUGIN:RefreshFarmingTools() local BUTTONSIZE = seedBar.ButtonSize; button:Point("TOPLEFT", seedBar, "TOPLEFT", horizontal and (count * (BUTTONSIZE + BUTTONSPACE) + 1) or 1, horizontal and -1 or -(count * (BUTTONSIZE + BUTTONSPACE) + 1)) button:Size(BUTTONSIZE,BUTTONSIZE) - if (not SV.db[Schema].farming.onlyactive or (SV.db[Schema].farming.onlyactive and button.items > 0)) then + if (not self.db.farming.onlyactive or (self.db.farming.onlyactive and button.items > 0)) then button.icon:SetVertexColor(1,1,1) count = count + 1 - elseif (not SV.db[Schema].farming.onlyactive and button.items <= 0) then + elseif (not self.db.farming.onlyactive and button.items <= 0) then button:Show() button.icon:SetVertexColor(0.25,0.25,0.25) count = count + 1 @@ -452,7 +452,7 @@ function PLUGIN:RefreshFarmingTools() button:Hide() end end - if(SV.db[Schema].farming.onlyactive and not SV.db[Schema].farming.undocked) then + if(self.db.farming.onlyactive and not self.db.farming.undocked) then if count==0 then seedBar:Hide() else @@ -474,11 +474,11 @@ function PLUGIN:RefreshFarmingTools() local BUTTONSIZE = FarmToolBar.ButtonSize; button:Point("TOPLEFT", FarmToolBar, "TOPLEFT", horizontal and (count * (BUTTONSIZE + BUTTONSPACE) + 1) or 1, horizontal and -1 or -(count * (BUTTONSIZE + BUTTONSPACE) + 1)) button:Size(BUTTONSIZE,BUTTONSIZE) - if (not SV.db[Schema].farming.onlyactive or (SV.db[Schema].farming.onlyactive and button.items > 0)) then + if (not self.db.farming.onlyactive or (self.db.farming.onlyactive and button.items > 0)) then button:Show() button.icon:SetVertexColor(1,1,1) count = count + 1 - elseif (not SV.db[Schema].farming.onlyactive and button.items == 0) then + elseif (not self.db.farming.onlyactive and button.items == 0) then button:Show() button.icon:SetVertexColor(0.25,0.25,0.25) count = count + 1 @@ -486,7 +486,7 @@ function PLUGIN:RefreshFarmingTools() button:Hide() end end - if(SV.db[Schema].farming.onlyactive and not SV.db[Schema].farming.undocked) then + if(self.db.farming.onlyactive and not self.db.farming.undocked) then if count==0 then FarmToolBarAnchor:Hide() FarmPortalBar:SetPoint("TOPLEFT", FarmModeFrameSlots, "TOPLEFT", 0, 0) @@ -502,11 +502,11 @@ function PLUGIN:RefreshFarmingTools() local BUTTONSIZE = FarmPortalBar.ButtonSize; button:Point("TOPLEFT", FarmPortalBar, "TOPLEFT", horizontal and (count * (BUTTONSIZE + BUTTONSPACE) + 1) or 1, horizontal and -1 or -(count * (BUTTONSIZE + BUTTONSPACE) + 1)) button:Size(BUTTONSIZE,BUTTONSIZE) - if (not SV.db[Schema].farming.onlyactive or (SV.db[Schema].farming.onlyactive and button.items > 0)) then + if (not self.db.farming.onlyactive or (self.db.farming.onlyactive and button.items > 0)) then button:Show() button.icon:SetVertexColor(1,1,1) count = count + 1 - elseif (not SV.db[Schema].farming.onlyactive and button.items == 0) then + elseif (not self.db.farming.onlyactive and button.items == 0) then button:Show() button.icon:SetVertexColor(0.25,0.25,0.25) count = count + 1 @@ -514,7 +514,7 @@ function PLUGIN:RefreshFarmingTools() button:Hide() end end - if(SV.db[Schema].farming.onlyactive) then + if(self.db.farming.onlyactive) then if count==0 then FarmPortalBar:Hide() else @@ -524,13 +524,13 @@ function PLUGIN:RefreshFarmingTools() end function PLUGIN:PrepareFarmingTools() - local horizontal = SV.db[Schema].farming.toolbardirection == "HORIZONTAL" - local BUTTONSPACE = SV.db[Schema].farming.buttonspacing or 2; + local horizontal = self.db.farming.toolbardirection == "HORIZONTAL" + local BUTTONSPACE = self.db.farming.buttonspacing or 2; ModeLogsFrame = self.LogWindow; DockButton = self.Docklet.ToolbarButton - if not SV.db[Schema].farming.undocked then + if not self.db.farming.undocked then local bgTex = [[Interface\BUTTONS\WHITE8X8]] local bdTex = SV.Media.bar.glow local farmingDocklet = CreateFrame("ScrollFrame", "FarmModeFrame", ModeLogsFrame); @@ -605,7 +605,7 @@ function PLUGIN:PrepareFarmingTools() farmingDocklet:Hide() else - local BUTTONSIZE = SV.db[Schema].farming.buttonsize or 35; + local BUTTONSIZE = self.db.farming.buttonsize or 35; -- SEEDS local farmSeedBarAnchor = CreateFrame("Frame", "FarmSeedBarAnchor", SV.UIParent) diff --git a/Interface/AddOns/SVUI_CraftOMatic/components/fishing.lua b/Interface/AddOns/SVUI_CraftOMatic/components/fishing.lua index 00caa78..542449f 100644 --- a/Interface/AddOns/SVUI_CraftOMatic/components/fishing.lua +++ b/Interface/AddOns/SVUI_CraftOMatic/components/fishing.lua @@ -334,7 +334,7 @@ CORE METHODS function PLUGIN.Fishing:Enable() PLUGIN:UpdateFishingMode() if(not PLUGIN.Docklet:IsShown()) then PLUGIN.Docklet.ToolbarButton:Click() end - UpdateFishingGear(SV.db[Schema].fishing.autoequip); + UpdateFishingGear(PLUGIN.db.fishing.autoequip); PlaySoundFile("Sound\\Spells\\Tradeskills\\FishCast.wav") PLUGIN.ModeAlert:SetBackdropColor(0.25, 0.52, 0.1) if(not IsSpellKnown(131474)) then diff --git a/Interface/AddOns/SVUI_FightOMatic/Loader.lua b/Interface/AddOns/SVUI_FightOMatic/Loader.lua index 488d0ef..408d9c5 100644 --- a/Interface/AddOns/SVUI_FightOMatic/Loader.lua +++ b/Interface/AddOns/SVUI_FightOMatic/Loader.lua @@ -27,7 +27,7 @@ local AddonName, AddonObject = ... assert(_G.LibSuperVillain, AddonName .. " requires LibSuperVillain") -local PLUGIN = _G.LibSuperVillain:NewPlugin(AddonName, AddonObject) +local PLUGIN = _G.LibSuperVillain:NewPlugin(AddonName, AddonObject, "FightOMatic_Profile", nil, "FightOMatic_Cache") local Schema = PLUGIN.Schema; local SV = _G["SVUI"]; @@ -37,19 +37,21 @@ local L = SV.L CONFIG DATA ########################################################## ]]-- -SV.configs[Schema] = { - ["enable"] = true, +PLUGIN.configs = { + ["annoyingEmotes"] = false, } + +PLUGIN.db = table.copy(PLUGIN.configs); --[[ ########################################################## CONFIG OPTIONS ########################################################## ]]-- --- SV.Options.args.plugins.args.pluginOptions.args[Schema].args[""] = { --- order = 2, --- name = L[""], --- desc = L[""], --- type = "toggle", --- get = function(key) return SV.db[Schema][key[#key]] end, --- set = function(key,value) PLUGIN:ChangeDBVar(value, key[#key]) end --- } \ No newline at end of file +SV.Options.args.plugins.args.pluginOptions.args[Schema].args["annoyingEmotes"] = { + order = 2, + name = L["Annoying Emotes"], + desc = L["Aggravate your opponents (and team-mates) with incessant emotes"], + type = "toggle", + get = function(key) return PLUGIN.db.annoyingEmotes end, + set = function(key,value) PLUGIN:ChangeDBVar(value, key[#key]); PLUGIN:UpdateLogWindow() end +} \ No newline at end of file diff --git a/Interface/AddOns/SVUI_FightOMatic/SVUI_FightOMatic.lua b/Interface/AddOns/SVUI_FightOMatic/SVUI_FightOMatic.lua index 22fc309..494635c 100644 --- a/Interface/AddOns/SVUI_FightOMatic/SVUI_FightOMatic.lua +++ b/Interface/AddOns/SVUI_FightOMatic/SVUI_FightOMatic.lua @@ -332,7 +332,7 @@ end local function SaveEnemyScan(guid, timestamp) local enemy = EnemyCache[guid] if(not enemy) then enemy = AddEnemyScan(guid, timestamp) end - FightOMatic_Cache[guid] = { + PLUGIN.cache[guid] = { ["name"] = enemy.name, ["realm"] = enemy.realm, ["class"] = enemy.class, @@ -347,7 +347,7 @@ local function SaveEnemyScan(guid, timestamp) end local function KilledEnemyHandler(guid) - local enemy = FightOMatic_Cache[guid] + local enemy = PLUGIN.cache[guid] if(enemy) then HeadsUpAlarm(("Killed Mortal Enemy: %s"):format(enemy.name), CombatText_StandardScroll, 0.2, 1, 0.1, "sticky"); end @@ -364,7 +364,7 @@ local function ClearCacheScans() end local function ClearSavedScans() - FightOMatic_Cache = {} + PLUGIN.cache = {} end local function EnemyAlarm(name, class, colors, kos) @@ -387,12 +387,14 @@ local function StealthAlarm(spell, name) local msg = ("%s Detected!"):format(spell); HeadsUpAlarm(msg, CombatText_StandardScroll, 1, 0.5, 0); print(("%s has %sed nearby!"):format(name, spell)) - --Stealth_Emote(name) + if(self.db.annoyingEmotes) then + Stealth_Emote(name) + end end function PLUGIN:UpdateSummary() self.Summary:Clear(); - local stored = FightOMatic_Cache; + local stored = self.cache; local amount = 0 for _,data in pairs(stored) do if type(data) == "table" and data.name and data.class then @@ -409,7 +411,7 @@ function PLUGIN:ResetLogs() self.LOG.Output:Clear(); self.Title:AddMessage(("Scanning %s"):format(ACTIVE_ZONE), 1, 1, 0); self.Switch:Show() - local stored = FightOMatic_Cache; + local stored = self.cache; local amount = 0 for _,data in pairs(stored) do if type(data) == "table" and data.name and data.class then @@ -426,7 +428,7 @@ function PLUGIN:PopulateKOS() self.LOG.Output:Clear(); self.Title:AddMessage(("Scanning %s"):format(ACTIVE_ZONE), 1, 1, 0); self.Switch:Show() - local stored = FightOMatic_Cache; + local stored = self.cache; local amount = 0 for _,data in pairs(stored) do if type(data) == "table" and data.name and data.class and data.race then @@ -446,7 +448,7 @@ function PLUGIN:PopulateScans() self.LOG.Output:Clear(); self.Title:AddMessage(("Scanning %s"):format(ACTIVE_ZONE), 1, 1, 0); self.Switch:Show() - local stored = FightOMatic_Cache; + local stored = self.cache; local amount = 0 for _,data in pairs(stored) do if type(data) == "table" and data.name and data.class then @@ -574,7 +576,7 @@ function PLUGIN:UpdateZoneStatus() end local function ParseIncomingLog(timestamp, event, eGuid, eName, pGuid) - local cached = FightOMatic_Cache[eGuid] + local cached = PLUGIN.cache[eGuid] local kos, needsUpdate = false, false if(cached) then @@ -667,9 +669,11 @@ function PLUGIN:EventDistributor(event, ...) local timestamp = time() AddEnemyScan(guid, timestamp) end - if(FightOMatic_Cache[guid]) then + if(self.cache[guid]) then HeadsUpAlarm("Kill On Sight!", CombatText_StandardScroll, 1, 0, 0, "crit") - --KOS_Emote() + if(self.db.annoyingEmotes) then + KOS_Emote() + end end end elseif(event == "PLAYER_DEAD") then @@ -990,18 +994,10 @@ BUILD FUNCTION ########################################################## ]]-- function PLUGIN:Load() - if SVAOW_Data then SVAOW_Data = nil end - if SVAOW_Cache then SVAOW_Cache = nil end - - if(not SV.db[Schema].enable) then return end - local ALERT_HEIGHT = 60; local DOCK_WIDTH = SuperDockWindowRight:GetWidth(); local DOCK_HEIGHT = SuperDockWindowRight:GetHeight(); local BUTTON_SIZE = (DOCK_HEIGHT * 0.25) - 4; - - if(not FightOMatic_Data) then FightOMatic_Data = {} end - if(not FightOMatic_Cache) then FightOMatic_Cache = {} end self.HitBy = false; self.Scanning = false; @@ -1160,6 +1156,8 @@ function PLUGIN:Load() self:RegisterEvent("PLAYER_ENTERING_WORLD", "UpdateCommunicator") self:RegisterEvent("UPDATE_BATTLEFIELD_SCORE", "UpdateCommunicator") - --SVUI_Player.Health.LowAlertFunc = LowHealth_PlayerEmote - --SVUI_Target.Health.LowAlertFunc = LowHealth_TargetEmote + if(self.db.annoyingEmotes) then + SVUI_Player.Health.LowAlertFunc = LowHealth_PlayerEmote + SVUI_Target.Health.LowAlertFunc = LowHealth_TargetEmote + end end \ No newline at end of file diff --git a/Interface/AddOns/SVUI_FightOMatic/SVUI_FightOMatic.toc b/Interface/AddOns/SVUI_FightOMatic/SVUI_FightOMatic.toc index c1d3f7e..a95517c 100644 --- a/Interface/AddOns/SVUI_FightOMatic/SVUI_FightOMatic.toc +++ b/Interface/AddOns/SVUI_FightOMatic/SVUI_FightOMatic.toc @@ -3,8 +3,7 @@ ## Version: 5.0 ## Title: |cffFF9900SVUI |r|cffFFEF00Fight-O-Matic|r ## Notes: Supervillain UI [|cff9911FFPvP Tools|r]. -## SavedVariables: FightOMatic_Data -## SavedVariablesPerCharacter: FightOMatic_Cache +## SavedVariablesPerCharacter: FightOMatic_Profile, FightOMatic_Cache ## RequiredDeps: SVUI ## LoadOnDemand: 1 ## X-Email: munglunch@gmail.com diff --git a/Interface/AddOns/SVUI_LogOMatic/Loader.lua b/Interface/AddOns/SVUI_LogOMatic/Loader.lua index 81ea16f..08cb432 100644 --- a/Interface/AddOns/SVUI_LogOMatic/Loader.lua +++ b/Interface/AddOns/SVUI_LogOMatic/Loader.lua @@ -27,16 +27,16 @@ local AddonName, AddonObject = ... assert(_G.LibSuperVillain, AddonName .. " requires LibSuperVillain") -local PLUGIN = _G.LibSuperVillain:NewPlugin(AddonName, AddonObject) - -local Schema = PLUGIN.Schema; -local SV = _G["SVUI"]; -local L = SV.L +local PLUGIN = _G.LibSuperVillain:NewPlugin(AddonName, AddonObject, "LogOMatic_Profile") --[[ ########################################################## CONFIG DATA ########################################################## ]]-- -SV.configs[Schema] = { - ["enable"] = true, -} \ No newline at end of file +PLUGIN.configs = { + ["incompatible"] = { + ["Altoholic"] = true, + }, +} + +PLUGIN.db = table.copy(PLUGIN.configs); \ No newline at end of file diff --git a/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.lua b/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.lua index a55841e..a6010a9 100644 --- a/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.lua +++ b/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.lua @@ -182,7 +182,6 @@ local function ResetAllLogs() if LogOMatic_Data[realmKey]["bags"] and LogOMatic_Data[realmKey]["bags"][nameKey] then LogOMatic_Data[realmKey]["bags"][nameKey] = {} end if LogOMatic_Data[realmKey]["gold"] and LogOMatic_Data[realmKey]["gold"][nameKey] then LogOMatic_Data[realmKey]["gold"][nameKey] = 0 end end - if LogOMatic_Cache then LogOMatic_Cache = {} end end --[[ ########################################################## @@ -192,13 +191,11 @@ BUILD FUNCTION function PLUGIN:Load() if SVLOG_Data then SVLOG_Data = nil end if SVLOG_Cache then SVLOG_Cache = nil end - - if IsAddOnLoaded("Altoholic") or not SV.db[Schema].enable then return end + if LogOMatic_Cache then LogOMatic_Cache = nil end local toonClass = select(2,UnitClass("player")); local r,g,b = RAID_CLASS_COLORS[toonClass].r, RAID_CLASS_COLORS[toonClass].g, RAID_CLASS_COLORS[toonClass].b local hexString = ("|cff%02x%02x%02x"):format(r * 255, g * 255, b * 255) - if not LogOMatic_Cache then LogOMatic_Cache = {} end LogOMatic_Data = LogOMatic_Data or {} LogOMatic_Data[realmKey] = LogOMatic_Data[realmKey] or {} LogOMatic_Data[realmKey]["bags"] = LogOMatic_Data[realmKey]["bags"] or {}; diff --git a/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.toc b/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.toc index de8f577..87c5626 100644 --- a/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.toc +++ b/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.toc @@ -4,7 +4,7 @@ ## Title: |cffFF9900SVUI |r|cffFFEF00Log-O-Matic|r ## Notes: Supervillain UI [|cff9911FFData Logging|r]. ## SavedVariables: LogOMatic_Data -## SavedVariablesPerCharacter: LogOMatic_Cache +## SavedVariablesPerCharacter: LogOMatic_Profile ## RequiredDeps: SVUI ## LoadOnDemand: 1 ## X-Email: munglunch@gmail.com diff --git a/Interface/AddOns/SVUI_StyleOMatic/Loader.lua b/Interface/AddOns/SVUI_StyleOMatic/Loader.lua index 9814082..1fdb879 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/Loader.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/Loader.lua @@ -27,7 +27,7 @@ local AddonName, AddonObject = ... assert(_G.LibSuperVillain, AddonName .. " requires LibSuperVillain") -local PLUGIN = _G.LibSuperVillain:NewPlugin(AddonName, AddonObject) +local PLUGIN = _G.LibSuperVillain:NewPlugin(AddonName, AddonObject, "StyleOMatic_Profile", "StyleOMatic_Global") local Schema = PLUGIN.Schema; local SV = _G["SVUI"]; @@ -37,8 +37,7 @@ local L = SV.L CONFIG DATA ########################################################## ]]-- -SV.configs[Schema] = { - ["enable"] = true, +PLUGIN.configs = { ["blizzard"] = { ["enable"] = true, ["bags"] = true, @@ -122,6 +121,8 @@ SV.configs[Schema] = { ["TradeSkillDW"] = true, } }; + +PLUGIN.db = table.copy(PLUGIN.configs); --[[ ########################################################## CONFIG OPTIONS @@ -131,23 +132,23 @@ SV.Options.args.plugins.args.pluginOptions.args[Schema].args["blizzardEnable"] = order = 2, name = "Standard UI Styling", type = "toggle", - get = function(key) return SV.db[Schema].blizzard.enable end, - set = function(key,value) SV.db[Schema].blizzard.enable = value; SV:StaticPopup_Show("RL_CLIENT") end + get = function(key) return PLUGIN.db.blizzard.enable end, + set = function(key,value) PLUGIN.db.blizzard.enable = value; SV:StaticPopup_Show("RL_CLIENT") end } SV.Options.args.plugins.args.pluginOptions.args[Schema].args["addonEnable"] = { order = 3, name = "Addon Styling", type = "toggle", - get = function(key) return SV.db[Schema].addons.enable end, - set = function(key,value) SV.db[Schema].addons.enable = value; SV:StaticPopup_Show("RL_CLIENT") end + get = function(key) return PLUGIN.db.addons.enable end, + set = function(key,value) PLUGIN.db.addons.enable = value; SV:StaticPopup_Show("RL_CLIENT") end } SV.Options.args.plugins.args.pluginOptions.args[Schema].args["addons"] = { order = 4, type = "group", name = "Addon Styling", - get = function(key) return SV.db[Schema].addons[key[#key]] end, - set = function(key,value) SV.db[Schema].addons[key[#key]] = value; SV:StaticPopup_Show("RL_CLIENT")end, - disabled = function() return not SV.db[Schema].addons.enable end, + get = function(key) return PLUGIN.db.addons[key[#key]] end, + set = function(key,value) PLUGIN.db.addons[key[#key]] = value; SV:StaticPopup_Show("RL_CLIENT")end, + disabled = function() return not PLUGIN.db.addons.enable end, guiInline = true, args = { ace3 = { @@ -161,9 +162,9 @@ SV.Options.args.plugins.args.pluginOptions.args[Schema].args["blizzard"] = { order = 300, type = "group", name = "Individual Mods", - get = function(key) return SV.db[Schema].blizzard[key[#key]] end, - set = function(key,value) SV.db[Schema].blizzard[key[#key]] = value; SV:StaticPopup_Show("RL_CLIENT") end, - disabled = function() return not SV.db[Schema].blizzard.enable end, + get = function(key) return PLUGIN.db.blizzard[key[#key]] end, + set = function(key,value) PLUGIN.db.blizzard[key[#key]] = value; SV:StaticPopup_Show("RL_CLIENT") end, + disabled = function() return not PLUGIN.db.blizzard.enable end, guiInline = true, args = { bmah = { diff --git a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua index 5656547..9782850 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua @@ -112,14 +112,14 @@ function PLUGIN:Style(style, fn, ...) end function PLUGIN:IsAddonReady(addon, ...) - if not SV.db[Schema].addons then return end + if not self.db.addons then return end for i = 1, select('#', ...) do local a = select(i, ...) if not a then break end if not IsAddOnLoaded(a) then return false end end - return SV.db[Schema].addons[addon] + return self.db.addons[addon] end function PLUGIN:SaveAddonStyle(addon, fn, force, passive, ...) @@ -133,8 +133,8 @@ function PLUGIN:SaveAddonStyle(addon, fn, force, passive, ...) self:DefineEventFunction(event, addon) end end - if(SV.db[Schema].addons and SV.db[Schema].addons[addon] == nil) then - SV.db[Schema].addons[addon] = true + if(self.db.addons and self.db.addons[addon] == nil) then + self.db.addons[addon] = true end if force then @@ -203,10 +203,10 @@ end function PLUGIN:PLAYER_ENTERING_WORLD(event, ...) for addonName,fn in pairs(self.OnLoadAddons) do - if(SV.db[Schema].blizzard[addonName] == nil) then - SV.db[Schema].blizzard[addonName] = true + if(self.db.blizzard[addonName] == nil) then + self.db.blizzard[addonName] = true end - if(IsAddOnLoaded(addonName) and (SV.db[Schema].blizzard[addonName] or SV.db[Schema].addons[addonName])) then + if(IsAddOnLoaded(addonName) and (self.db.blizzard[addonName] or self.db.addons[addonName])) then self:Style(addonName, fn, event, ...) self.OnLoadAddons[addonName] = nil end @@ -236,8 +236,8 @@ function PLUGIN:PLAYER_ENTERING_WORLD(event, ...) end } end - if(SV.db[Schema].addons[addonName] == nil) then - SV.db[Schema].addons[addonName] = true + if(self.db.addons[addonName] == nil) then + self.db.addons[addonName] = true end if(listener[addonName] and self:IsAddonReady(addonName)) then self:Style(addonName, fn, event, ...) @@ -362,8 +362,6 @@ BUILD FUNCTION ########################################################## ]]-- function PLUGIN:Load() - if(not SV.db[Schema].enable) then return end - local alert = CreateFrame('Frame', nil, UIParent); alert:SetFixedPanelTemplate('Transparent'); alert:SetSize(250, 70); diff --git a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.toc b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.toc index adcc9be..21def20 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.toc +++ b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.toc @@ -3,6 +3,8 @@ ## Version: 5.0 ## Title: |cffFF9900SVUI |r|cffFFEF00Style-O-Matic|r ## Notes: Supervillain UI [|cff9911FFAddon Skins|r]. +## SavedVariables: StyleOMatic_Global +## SavedVariablesPerCharacter: StyleOMatic_Profile ## RequiredDeps: SVUI ## OptionalDeps: Blizzard_DebugTools, Blizzard_PetJournal, SharedMedia ## X-Email: munglunch@gmail.com diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/ACP.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/ACP.lua index 63c6fc2..43f80ff 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/ACP.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/ACP.lua @@ -28,8 +28,8 @@ GET ADDON DATA ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## ACP @@ -69,12 +69,12 @@ end local function StyleACP() assert(ACP_AddonList, "AddOn Not Loaded") - STYLE:ApplyFrameStyle(ACP_AddonList) - STYLE:ApplyFrameStyle(ACP_AddonList_ScrollFrame) + PLUGIN:ApplyFrameStyle(ACP_AddonList) + PLUGIN: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 - STYLE:ApplyCloseButtonStyle(ACP_AddonListCloseButton) + PLUGIN:ApplyCloseButtonStyle(ACP_AddonListCloseButton) for c=1,20,1 do local k=_G["ACP_AddonList"] k.timeLapse = 0 @@ -82,8 +82,8 @@ local function StyleACP() end for c=1,20 do _G["ACP_AddonListEntry"..c.."Enabled"]:SetCheckboxTemplate(true)end ACP_AddonList_NoRecurse:SetCheckboxTemplate(true) - STYLE:ApplyScrollFrameStyle(ACP_AddonList_ScrollFrameScrollBar) - STYLE:ApplyDropdownStyle(ACP_AddonListSortDropDown) + PLUGIN:ApplyScrollFrameStyle(ACP_AddonList_ScrollFrameScrollBar) + PLUGIN:ApplyDropdownStyle(ACP_AddonListSortDropDown) ACP_AddonListSortDropDown:Width(130) ACP_AddonList_ScrollFrame:SetWidth(590) ACP_AddonList_ScrollFrame:SetHeight(412) @@ -102,4 +102,4 @@ local function StyleACP() ACP_AddonListBottomClose:SetHeight(25)ACP_AddonList:SetParent(UIParent) end -STYLE:SaveAddonStyle("ACP", StyleACP) \ No newline at end of file +PLUGIN:SaveAddonStyle("ACP", StyleACP) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Ace3.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Ace3.lua index b01fd8b..b066c8f 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Ace3.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Ace3.lua @@ -20,8 +20,8 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -54,7 +54,7 @@ local function Widget_OnLeave(b) end local function Widget_ScrollStyle(frame, arg) - return STYLE:ApplyScrollFrameStyle(frame) + return PLUGIN:ApplyScrollFrameStyle(frame) end local function Widget_ButtonStyle(frame, strip, bypass) @@ -72,7 +72,7 @@ local function Widget_ButtonStyle(frame, strip, bypass) end local function Widget_PaginationStyle(...) - STYLE:ApplyPaginationStyle(...) + PLUGIN:ApplyPaginationStyle(...) end local NOOP = SV.fubar @@ -95,7 +95,7 @@ local WidgetDropButton_OnClick = function(self) end --[[ ########################################################## -AceGUI STYLE +AceGUI PLUGIN ########################################################## ]]-- local function StyleAceGUI(event, addon) @@ -117,7 +117,7 @@ local function StyleAceGUI(event, addon) widget.scrollBG:SetBasicPanel() end Widget_ButtonStyle(widget.button) - STYLE:ApplyScrollFrameStyle(widget.scrollBar) + PLUGIN:ApplyScrollFrameStyle(widget.scrollBar) widget.scrollBar:SetPoint("RIGHT", widgetFrame, "RIGHT", -4) widget.scrollBG:SetPoint("TOPRIGHT", widget.scrollBar, "TOPLEFT", -2, 19) widget.scrollBG:SetPoint("BOTTOMLEFT", widget.button, "TOPLEFT") @@ -220,7 +220,7 @@ local function StyleAceGUI(event, addon) -- print("RegisterAsContainer: " .. widgetType); local widgetParent = widget.content:GetParent() if widgetType == "ScrollFrame" then - STYLE:ApplyScrollFrameStyle(widget.scrollBar) + PLUGIN:ApplyScrollFrameStyle(widget.scrollBar) elseif widgetType == "Frame" then widgetParent:RemoveTextures() for i = 1, widgetParent:GetNumChildren()do @@ -264,7 +264,7 @@ local function StyleAceGUI(event, addon) end if widget.scrollbar then - STYLE:ApplyScrollFrameStyle(widget.scrollBar) + PLUGIN:ApplyScrollFrameStyle(widget.scrollBar) end end return regContainer(self, widget) @@ -272,7 +272,7 @@ local function StyleAceGUI(event, addon) end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveAddonStyle("AceGUI", StyleAceGUI, nil, true) \ No newline at end of file +PLUGIN:SaveAddonStyle("SVUI_ConfigOMatic", StyleAceGUI, nil, true) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/AdiBags.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/AdiBags.lua index b5c95cd..3d54a55 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/AdiBags.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/AdiBags.lua @@ -31,8 +31,8 @@ GET ADDON DATA ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## ADIBAGS @@ -65,10 +65,10 @@ local function StyleAdiBags(event) SV.Timers:ExecuteTimer(function() if AdiBagsContainer2 then SkinFrame(AdiBagsContainer2) - STYLE:SafeEventRemoval("AdiBags", event) + PLUGIN:SafeEventRemoval("AdiBags", event) end end, 1) end end -STYLE:SaveAddonStyle("AdiBags", StyleAdiBags, nil, nil, 'BANKFRAME_OPENED') \ No newline at end of file +PLUGIN:SaveAddonStyle("AdiBags", StyleAdiBags, nil, nil, 'BANKFRAME_OPENED') \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Altoholic.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Altoholic.lua index a6ca1d9..b483641 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Altoholic.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Altoholic.lua @@ -31,8 +31,8 @@ GET ADDON DATA ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## ALTOHOLIC @@ -51,18 +51,18 @@ local function StyleAltoholic(event, addon) assert(AltoholicFrame, "AddOn Not Loaded") if event == "PLAYER_ENTERING_WORLD" then - STYLE:ApplyTooltipStyle(AltoTooltip) + PLUGIN:ApplyTooltipStyle(AltoTooltip) AltoholicFramePortrait:Die() - STYLE:ApplyFrameStyle(AltoholicFrame, "Action", false, true) - STYLE:ApplyFrameStyle(AltoMsgBox) - STYLE:ApplyButtonStyle(AltoMsgBoxYesButton) - STYLE:ApplyButtonStyle(AltoMsgBoxNoButton) - STYLE:ApplyCloseButtonStyle(AltoholicFrameCloseButton) - STYLE:ApplyEditBoxStyle(AltoholicFrame_SearchEditBox, 175, 15) - STYLE:ApplyButtonStyle(AltoholicFrame_ResetButton) - STYLE:ApplyButtonStyle(AltoholicFrame_SearchButton) + PLUGIN:ApplyFrameStyle(AltoholicFrame, "Action", false, true) + PLUGIN:ApplyFrameStyle(AltoMsgBox) + PLUGIN:ApplyButtonStyle(AltoMsgBoxYesButton) + PLUGIN:ApplyButtonStyle(AltoMsgBoxNoButton) + PLUGIN:ApplyCloseButtonStyle(AltoholicFrameCloseButton) + PLUGIN:ApplyEditBoxStyle(AltoholicFrame_SearchEditBox, 175, 15) + PLUGIN:ApplyButtonStyle(AltoholicFrame_ResetButton) + PLUGIN:ApplyButtonStyle(AltoholicFrame_SearchButton) AltoholicFrameTab1:Point("TOPLEFT", AltoholicFrame, "BOTTOMLEFT", -5, 2) AltoholicFrame_ResetButton:Point("TOPLEFT", AltoholicFrame, "TOPLEFT", 25, -77) @@ -72,15 +72,15 @@ local function StyleAltoholic(event, addon) end if addon == "Altoholic_Summary" then - STYLE:ApplyFrameStyle(AltoholicFrameSummary) - STYLE:ApplyFrameStyle(AltoholicFrameBagUsage) - STYLE:ApplyFrameStyle(AltoholicFrameSkills) - STYLE:ApplyFrameStyle(AltoholicFrameActivity) - STYLE:ApplyScrollBarStyle(AltoholicFrameSummaryScrollFrameScrollBar) - STYLE:ApplyScrollBarStyle(AltoholicFrameBagUsageScrollFrameScrollBar) - STYLE:ApplyScrollBarStyle(AltoholicFrameSkillsScrollFrameScrollBar) - STYLE:ApplyScrollBarStyle(AltoholicFrameActivityScrollFrameScrollBar) - STYLE:ApplyDropdownStyle(AltoholicTabSummary_SelectLocation, 200) + PLUGIN:ApplyFrameStyle(AltoholicFrameSummary) + PLUGIN:ApplyFrameStyle(AltoholicFrameBagUsage) + PLUGIN:ApplyFrameStyle(AltoholicFrameSkills) + PLUGIN:ApplyFrameStyle(AltoholicFrameActivity) + PLUGIN:ApplyScrollBarStyle(AltoholicFrameSummaryScrollFrameScrollBar) + PLUGIN:ApplyScrollBarStyle(AltoholicFrameBagUsageScrollFrameScrollBar) + PLUGIN:ApplyScrollBarStyle(AltoholicFrameSkillsScrollFrameScrollBar) + PLUGIN:ApplyScrollBarStyle(AltoholicFrameActivityScrollFrameScrollBar) + PLUGIN:ApplyDropdownStyle(AltoholicTabSummary_SelectLocation, 200) if(AltoholicFrameSummaryScrollFrame) then AltoholicFrameSummaryScrollFrame:RemoveTextures(true) @@ -98,47 +98,47 @@ local function StyleAltoholic(event, addon) AltoholicFrameActivityScrollFrame:RemoveTextures(true) end - STYLE:ApplyButtonStyle(AltoholicTabSummary_RequestSharing) - STYLE:ApplyTextureStyle(AltoholicTabSummary_RequestSharingIconTexture) - STYLE:ApplyButtonStyle(AltoholicTabSummary_Options) - STYLE:ApplyTextureStyle(AltoholicTabSummary_OptionsIconTexture) - STYLE:ApplyButtonStyle(AltoholicTabSummary_OptionsDataStore) - STYLE:ApplyTextureStyle(AltoholicTabSummary_OptionsDataStoreIconTexture) + PLUGIN:ApplyButtonStyle(AltoholicTabSummary_RequestSharing) + PLUGIN:ApplyTextureStyle(AltoholicTabSummary_RequestSharingIconTexture) + PLUGIN:ApplyButtonStyle(AltoholicTabSummary_Options) + PLUGIN:ApplyTextureStyle(AltoholicTabSummary_OptionsIconTexture) + PLUGIN:ApplyButtonStyle(AltoholicTabSummary_OptionsDataStore) + PLUGIN:ApplyTextureStyle(AltoholicTabSummary_OptionsDataStoreIconTexture) for i = 1, 5 do - STYLE:ApplyButtonStyle(_G["AltoholicTabSummaryMenuItem"..i], true) + PLUGIN:ApplyButtonStyle(_G["AltoholicTabSummaryMenuItem"..i], true) end for i = 1, 8 do - STYLE:ApplyButtonStyle(_G["AltoholicTabSummary_Sort"..i], true) + PLUGIN:ApplyButtonStyle(_G["AltoholicTabSummary_Sort"..i], true) end for i = 1, 7 do - STYLE:ApplyTabStyle(_G["AltoholicFrameTab"..i], true) + PLUGIN:ApplyTabStyle(_G["AltoholicFrameTab"..i], true) end end if IsAddOnLoaded("Altoholic_Characters") or addon == "Altoholic_Characters" then - STYLE:ApplyFrameStyle(AltoholicFrameContainers) - STYLE:ApplyFrameStyle(AltoholicFrameRecipes) - STYLE:ApplyFrameStyle(AltoholicFrameQuests) - STYLE:ApplyFrameStyle(AltoholicFrameGlyphs) - STYLE:ApplyFrameStyle(AltoholicFrameMail) - STYLE:ApplyFrameStyle(AltoholicFrameSpellbook) - STYLE:ApplyFrameStyle(AltoholicFramePets) - STYLE:ApplyFrameStyle(AltoholicFrameAuctions) - STYLE:ApplyScrollBarStyle(AltoholicFrameContainersScrollFrameScrollBar) - STYLE:ApplyScrollBarStyle(AltoholicFrameQuestsScrollFrameScrollBar) - STYLE:ApplyScrollBarStyle(AltoholicFrameRecipesScrollFrameScrollBar) - STYLE:ApplyDropdownStyle(AltoholicFrameTalents_SelectMember) - STYLE:ApplyDropdownStyle(AltoholicTabCharacters_SelectRealm) - STYLE:ApplyPaginationStyle(AltoholicFrameSpellbookPrevPage) - STYLE:ApplyPaginationStyle(AltoholicFrameSpellbookNextPage) - STYLE:ApplyPaginationStyle(AltoholicFramePetsNormalPrevPage) - STYLE:ApplyPaginationStyle(AltoholicFramePetsNormalNextPage) - STYLE:ApplyRotateStyle(AltoholicFramePetsNormal_ModelFrameRotateLeftButton) - STYLE:ApplyRotateStyle(AltoholicFramePetsNormal_ModelFrameRotateRightButton) - STYLE:ApplyButtonStyle(AltoholicTabCharacters_Sort1) - STYLE:ApplyButtonStyle(AltoholicTabCharacters_Sort2) - STYLE:ApplyButtonStyle(AltoholicTabCharacters_Sort3) + PLUGIN:ApplyFrameStyle(AltoholicFrameContainers) + PLUGIN:ApplyFrameStyle(AltoholicFrameRecipes) + PLUGIN:ApplyFrameStyle(AltoholicFrameQuests) + PLUGIN:ApplyFrameStyle(AltoholicFrameGlyphs) + PLUGIN:ApplyFrameStyle(AltoholicFrameMail) + PLUGIN:ApplyFrameStyle(AltoholicFrameSpellbook) + PLUGIN:ApplyFrameStyle(AltoholicFramePets) + PLUGIN:ApplyFrameStyle(AltoholicFrameAuctions) + PLUGIN:ApplyScrollBarStyle(AltoholicFrameContainersScrollFrameScrollBar) + PLUGIN:ApplyScrollBarStyle(AltoholicFrameQuestsScrollFrameScrollBar) + PLUGIN:ApplyScrollBarStyle(AltoholicFrameRecipesScrollFrameScrollBar) + PLUGIN:ApplyDropdownStyle(AltoholicFrameTalents_SelectMember) + PLUGIN:ApplyDropdownStyle(AltoholicTabCharacters_SelectRealm) + PLUGIN:ApplyPaginationStyle(AltoholicFrameSpellbookPrevPage) + PLUGIN:ApplyPaginationStyle(AltoholicFrameSpellbookNextPage) + PLUGIN:ApplyPaginationStyle(AltoholicFramePetsNormalPrevPage) + PLUGIN:ApplyPaginationStyle(AltoholicFramePetsNormalNextPage) + PLUGIN:ApplyRotateStyle(AltoholicFramePetsNormal_ModelFrameRotateLeftButton) + PLUGIN:ApplyRotateStyle(AltoholicFramePetsNormal_ModelFrameRotateRightButton) + PLUGIN:ApplyButtonStyle(AltoholicTabCharacters_Sort1) + PLUGIN:ApplyButtonStyle(AltoholicTabCharacters_Sort2) + PLUGIN:ApplyButtonStyle(AltoholicTabCharacters_Sort3) AltoholicFrameContainersScrollFrame:RemoveTextures(true) AltoholicFrameQuestsScrollFrame:RemoveTextures(true) AltoholicFrameRecipesScrollFrame:RemoveTextures(true) @@ -156,64 +156,64 @@ local function StyleAltoholic(event, addon) } for _, object in pairs(Buttons) do - STYLE:ApplyTextureStyle(_G[object..'IconTexture']) - STYLE:ApplyTextureStyle(_G[object]) + PLUGIN:ApplyTextureStyle(_G[object..'IconTexture']) + PLUGIN:ApplyTextureStyle(_G[object]) end for i = 1, 7 do for j = 1, 14 do - STYLE:ApplyItemButtonStyle(_G["AltoholicFrameContainersEntry"..i.."Item"..j]) + PLUGIN:ApplyItemButtonStyle(_G["AltoholicFrameContainersEntry"..i.."Item"..j]) _G["AltoholicFrameContainersEntry"..i.."Item"..j]:HookScript('OnShow', ColorAltoBorder) end end end if IsAddOnLoaded("Altoholic_Achievements") or addon == "Altoholic_Achievements" then - STYLE:ApplyUnderlayStyle(AltoholicFrameAchievements) + PLUGIN:ApplyUnderlayStyle(AltoholicFrameAchievements) AltoholicFrameAchievementsScrollFrame:RemoveTextures(true) AltoholicAchievementsMenuScrollFrame:RemoveTextures(true) - STYLE:ApplyScrollBarStyle(AltoholicFrameAchievementsScrollFrameScrollBar) - STYLE:ApplyScrollBarStyle(AltoholicAchievementsMenuScrollFrameScrollBar) - STYLE:ApplyDropdownStyle(AltoholicTabAchievements_SelectRealm) + PLUGIN:ApplyScrollBarStyle(AltoholicFrameAchievementsScrollFrameScrollBar) + PLUGIN:ApplyScrollBarStyle(AltoholicAchievementsMenuScrollFrameScrollBar) + PLUGIN:ApplyDropdownStyle(AltoholicTabAchievements_SelectRealm) AltoholicTabAchievements_SelectRealm:Point("TOPLEFT", AltoholicFrame, "TOPLEFT", 205, -57) for i = 1, 15 do - STYLE:ApplyButtonStyle(_G["AltoholicTabAchievementsMenuItem"..i], true) + PLUGIN:ApplyButtonStyle(_G["AltoholicTabAchievementsMenuItem"..i], true) end for i = 1, 8 do for j = 1, 10 do - STYLE:ApplyUnderlayStyle(_G["AltoholicFrameAchievementsEntry"..i.."Item"..j]) + PLUGIN:ApplyUnderlayStyle(_G["AltoholicFrameAchievementsEntry"..i.."Item"..j]) local Backdrop = _G["AltoholicFrameAchievementsEntry"..i.."Item"..j].backdrop or _G["AltoholicFrameAchievementsEntry"..i.."Item"..j].Backdrop - STYLE:ApplyTextureStyle(_G["AltoholicFrameAchievementsEntry"..i.."Item"..j..'_Background']) + PLUGIN:ApplyTextureStyle(_G["AltoholicFrameAchievementsEntry"..i.."Item"..j..'_Background']) _G["AltoholicFrameAchievementsEntry"..i.."Item"..j..'_Background']:SetInside(Backdrop) end end end if IsAddOnLoaded("Altoholic_Agenda") or addon == "Altoholic_Agenda" then - STYLE:ApplyFrameStyle(AltoholicFrameCalendarScrollFrame) - STYLE:ApplyFrameStyle(AltoholicTabAgendaMenuItem1) - STYLE:ApplyScrollBarStyle(AltoholicFrameCalendarScrollFrameScrollBar) - STYLE:ApplyPaginationStyle(AltoholicFrameCalendar_NextMonth) - STYLE:ApplyPaginationStyle(AltoholicFrameCalendar_PrevMonth) - STYLE:ApplyButtonStyle(AltoholicTabAgendaMenuItem1, true) + PLUGIN:ApplyFrameStyle(AltoholicFrameCalendarScrollFrame) + PLUGIN:ApplyFrameStyle(AltoholicTabAgendaMenuItem1) + PLUGIN:ApplyScrollBarStyle(AltoholicFrameCalendarScrollFrameScrollBar) + PLUGIN:ApplyPaginationStyle(AltoholicFrameCalendar_NextMonth) + PLUGIN:ApplyPaginationStyle(AltoholicFrameCalendar_PrevMonth) + PLUGIN:ApplyButtonStyle(AltoholicTabAgendaMenuItem1, true) for i = 1, 14 do - STYLE:ApplyFrameStyle(_G["AltoholicFrameCalendarEntry"..i]) + PLUGIN:ApplyFrameStyle(_G["AltoholicFrameCalendarEntry"..i]) end end if IsAddOnLoaded("Altoholic_Grids") or addon == "Altoholic_Grids" then AltoholicFrameGridsScrollFrame:RemoveTextures(true) - STYLE:ApplyUnderlayStyle(AltoholicFrameGrids) - STYLE:ApplyScrollBarStyle(AltoholicFrameGridsScrollFrameScrollBar) - STYLE:ApplyDropdownStyle(AltoholicTabGrids_SelectRealm) - STYLE:ApplyDropdownStyle(AltoholicTabGrids_SelectView) + PLUGIN:ApplyUnderlayStyle(AltoholicFrameGrids) + PLUGIN:ApplyScrollBarStyle(AltoholicFrameGridsScrollFrameScrollBar) + PLUGIN:ApplyDropdownStyle(AltoholicTabGrids_SelectRealm) + PLUGIN:ApplyDropdownStyle(AltoholicTabGrids_SelectView) for i = 1, 8 do for j = 1, 10 do - STYLE:ApplyUnderlayStyle(_G["AltoholicFrameGridsEntry"..i.."Item"..j], nil, nil, nil, true) + PLUGIN:ApplyUnderlayStyle(_G["AltoholicFrameGridsEntry"..i.."Item"..j], nil, nil, nil, true) _G["AltoholicFrameGridsEntry"..i.."Item"..j]:HookScript('OnShow', ColorAltoBorder) end end @@ -231,53 +231,53 @@ local function StyleAltoholic(event, addon) end if IsAddOnLoaded("Altoholic_Guild") or addon == "Altoholic_Guild" then - STYLE:ApplyFrameStyle(AltoholicFrameGuildMembers) - STYLE:ApplyFrameStyle(AltoholicFrameGuildBank) - STYLE:ApplyScrollBarStyle(AltoholicFrameGuildMembersScrollFrameScrollBar) + PLUGIN:ApplyFrameStyle(AltoholicFrameGuildMembers) + PLUGIN:ApplyFrameStyle(AltoholicFrameGuildBank) + PLUGIN:ApplyScrollBarStyle(AltoholicFrameGuildMembersScrollFrameScrollBar) AltoholicFrameGuildMembersScrollFrame:RemoveTextures(true) for i = 1, 2 do - STYLE:ApplyButtonStyle(_G["AltoholicTabGuildMenuItem"..i]) + PLUGIN:ApplyButtonStyle(_G["AltoholicTabGuildMenuItem"..i]) end for i = 1, 7 do for j = 1, 14 do - STYLE:ApplyItemButtonStyle(_G["AltoholicFrameGuildBankEntry"..i.."Item"..j]) + PLUGIN:ApplyItemButtonStyle(_G["AltoholicFrameGuildBankEntry"..i.."Item"..j]) end end for i = 1, 19 do - STYLE:ApplyItemButtonStyle(_G["AltoholicFrameGuildMembersItem"..i]) + PLUGIN:ApplyItemButtonStyle(_G["AltoholicFrameGuildMembersItem"..i]) end for i = 1, 5 do - STYLE:ApplyButtonStyle(_G["AltoholicTabGuild_Sort"..i]) + PLUGIN:ApplyButtonStyle(_G["AltoholicTabGuild_Sort"..i]) end end if IsAddOnLoaded("Altoholic_Search") or addon == "Altoholic_Search" then - STYLE:ApplyUnderlayStyle(AltoholicFrameSearch, true) + PLUGIN:ApplyUnderlayStyle(AltoholicFrameSearch, true) AltoholicFrameSearchScrollFrame:RemoveTextures(true) AltoholicSearchMenuScrollFrame:RemoveTextures(true) - STYLE:ApplyScrollBarStyle(AltoholicFrameSearchScrollFrameScrollBar) - STYLE:ApplyScrollBarStyle(AltoholicSearchMenuScrollFrameScrollBar) - STYLE:ApplyDropdownStyle(AltoholicTabSearch_SelectRarity) - STYLE:ApplyDropdownStyle(AltoholicTabSearch_SelectSlot) - STYLE:ApplyDropdownStyle(AltoholicTabSearch_SelectLocation) + PLUGIN:ApplyScrollBarStyle(AltoholicFrameSearchScrollFrameScrollBar) + PLUGIN:ApplyScrollBarStyle(AltoholicSearchMenuScrollFrameScrollBar) + PLUGIN:ApplyDropdownStyle(AltoholicTabSearch_SelectRarity) + PLUGIN:ApplyDropdownStyle(AltoholicTabSearch_SelectSlot) + PLUGIN:ApplyDropdownStyle(AltoholicTabSearch_SelectLocation) AltoholicTabSearch_SelectRarity:Size(125, 32) AltoholicTabSearch_SelectSlot:Size(125, 32) AltoholicTabSearch_SelectLocation:Size(175, 32) - STYLE:ApplyEditBoxStyle(_G["AltoholicTabSearch_MinLevel"]) - STYLE:ApplyEditBoxStyle(_G["AltoholicTabSearch_MaxLevel"]) + PLUGIN:ApplyEditBoxStyle(_G["AltoholicTabSearch_MinLevel"]) + PLUGIN:ApplyEditBoxStyle(_G["AltoholicTabSearch_MaxLevel"]) for i = 1, 15 do - STYLE:ApplyButtonStyle(_G["AltoholicTabSearchMenuItem"..i]) + PLUGIN:ApplyButtonStyle(_G["AltoholicTabSearchMenuItem"..i]) end for i = 1, 8 do - STYLE:ApplyButtonStyle(_G["AltoholicTabSearch_Sort"..i]) + PLUGIN:ApplyButtonStyle(_G["AltoholicTabSearch_Sort"..i]) end end end -STYLE:SaveAddonStyle("Altoholic", StyleAltoholic, nil, true) \ No newline at end of file +PLUGIN:SaveAddonStyle("Altoholic", StyleAltoholic, nil, true) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/AtlasLoot.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/AtlasLoot.lua index 9ae8e8c..1f635f5 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/AtlasLoot.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/AtlasLoot.lua @@ -28,8 +28,8 @@ GET ADDON DATA ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## ATLASLOOT @@ -100,7 +100,7 @@ local function Nine_IsThere(self, elapsed) self.timeLapse = 0 end for i = 1, 9 do local f = _G["AtlasLootCompareFrameSortButton_"..i]f:SetWidth(44.44)end - for _, object in pairs(nineisthere) do STYLE:ApplyFrameStyle(_G[object]) end + for _, object in pairs(nineisthere) do PLUGIN: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) @@ -137,18 +137,18 @@ local function StyleAtlasLoot(event, addon) assert(AtlasLootPanel, "AddOn Not Loaded") for _, object in pairs(StripAllTextures) do _G[object]:RemoveTextures()end - for _, object in pairs(SetTemplateDefault) do STYLE:ApplyFrameStyle(_G[object], "Default")end + for _, object in pairs(SetTemplateDefault) do PLUGIN:ApplyFrameStyle(_G[object], "Default")end for _, button in pairs(buttons) do _G[button]:SetButtonTemplate()end -- Manipulate the main frames - STYLE:ApplyFrameStyle(_G["AtlasLootDefaultFrame"], "Action"); - STYLE:ApplyUnderlayStyle(_G["AtlasLootItemsFrame"], "Inset"); - STYLE:ApplyFrameStyle(_G["AtlasLootPanel"], "Default"); + PLUGIN:ApplyFrameStyle(_G["AtlasLootDefaultFrame"], "Action"); + PLUGIN:ApplyUnderlayStyle(_G["AtlasLootItemsFrame"], "Inset"); + PLUGIN:ApplyFrameStyle(_G["AtlasLootPanel"], "Default"); hooksecurefunc(_G["AtlasLootPanel"], "SetPoint", _hook_ALPanel); _G["AtlasLootPanel"]:SetPoint("TOP",_G["AtlasLootDefaultFrame"],"BOTTOM",0,-1); -- Back to the rest - STYLE:ApplyFrameStyle(_G["AtlasLootCompareFrame"], "Transparent"); + PLUGIN: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 @@ -164,31 +164,31 @@ local function StyleAtlasLoot(event, addon) for i = 1, 15 do local f = _G["AtlasLootCompareFrameMainFilterButton"..i]f:RemoveTextures() end - STYLE:ApplyCloseButtonStyle(AtlasLootDefaultFrame_CloseButton) - STYLE:ApplyCloseButtonStyle(AtlasLootCompareFrame_CloseButton) - STYLE:ApplyCloseButtonStyle(AtlasLootCompareFrame_CloseButton_Wishlist) - STYLE:ApplyPaginationStyle(AtlasLootQuickLooksButton) - STYLE:ApplyPaginationStyle(AtlasLootItemsFrame_NEXT) + PLUGIN:ApplyCloseButtonStyle(AtlasLootDefaultFrame_CloseButton) + PLUGIN:ApplyCloseButtonStyle(AtlasLootCompareFrame_CloseButton) + PLUGIN:ApplyCloseButtonStyle(AtlasLootCompareFrame_CloseButton_Wishlist) + PLUGIN:ApplyPaginationStyle(AtlasLootQuickLooksButton) + PLUGIN:ApplyPaginationStyle(AtlasLootItemsFrame_NEXT) AtlasLootItemsFrame_NEXT:SetWidth(25) AtlasLootItemsFrame_NEXT:SetHeight(25) - STYLE:ApplyPaginationStyle(AtlasLootItemsFrame_PREV) + PLUGIN:ApplyPaginationStyle(AtlasLootItemsFrame_PREV) AtlasLootItemsFrame_PREV:SetWidth(25) AtlasLootItemsFrame_PREV:SetHeight(25) - STYLE:ApplyPaginationStyle(AtlasLootPanelSearch_SelectModuel) - STYLE:ApplyPaginationStyle(AtlasLootCompareFrameSearch_SelectModuel) + PLUGIN:ApplyPaginationStyle(AtlasLootPanelSearch_SelectModuel) + PLUGIN:ApplyPaginationStyle(AtlasLootCompareFrameSearch_SelectModuel) if(AtlasLootDefaultFrame_PackageSelect) then - STYLE:ApplyDropdownStyle(AtlasLootDefaultFrame_PackageSelect) + PLUGIN:ApplyDropdownStyle(AtlasLootDefaultFrame_PackageSelect) AtlasLootDefaultFrame_PackageSelect:SetWidth(240) AtlasLootDefaultFrame_PackageSelect:SetPoint("TOPLEFT", AtlasLootDefaultFrame, "TOPLEFT", 50, -50) end - STYLE:ApplyDropdownStyle(AtlasLootDefaultFrame_ModuleSelect,240) - STYLE:ApplyDropdownStyle(AtlasLootDefaultFrame_InstanceSelect,240) + PLUGIN:ApplyDropdownStyle(AtlasLootDefaultFrame_ModuleSelect,240) + PLUGIN:ApplyDropdownStyle(AtlasLootDefaultFrame_InstanceSelect,240) - STYLE:ApplyDropdownStyle(AtlasLootCompareFrameSearch_StatsListDropDown) + PLUGIN:ApplyDropdownStyle(AtlasLootCompareFrameSearch_StatsListDropDown) AtlasLootCompareFrameSearch_StatsListDropDown:SetWidth(240) - STYLE:ApplyDropdownStyle(AtlasLootCompareFrame_WishlistDropDown) + PLUGIN:ApplyDropdownStyle(AtlasLootCompareFrame_WishlistDropDown) AtlasLootCompareFrame_WishlistDropDown:SetWidth(240) AtlasLootPanelSearch_Box:SetEditboxTemplate() AtlasLootCompareFrameSearch_Box:SetEditboxTemplate() @@ -210,8 +210,8 @@ local function StyleAtlasLoot(event, addon) AtlasLootPanel.Titel:SetTextColor(23/255, 132/255, 209/255) AtlasLootPanel.Titel:SetPoint("BOTTOM", AtlasLootPanel.TitelBg, "BOTTOM", 0, 40) - STYLE:ApplyScrollFrameStyle(AtlasLootCompareFrame_ScrollFrameItemFrameScrollBar) - STYLE:ApplyScrollFrameStyle(AtlasLootCompareFrame_WishlistScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(AtlasLootCompareFrame_ScrollFrameItemFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(AtlasLootCompareFrame_WishlistScrollFrameScrollBar) AtlasLootDefaultFrame:HookScript("OnShow", AL_OnShow) AtlasLootCompareFrame:HookScript("OnShow", Compare_OnShow) AtlasLootPanel.timeLapse = 0; @@ -219,7 +219,7 @@ local function StyleAtlasLoot(event, addon) --AtlasLootPanel:HookScript("OnUpdate", _hook_OnUpdate) if(AtlasLootTooltip:GetName() ~= "GameTooltip") then - STYLE:ApplyTooltipStyle(AtlasLootTooltip) + PLUGIN:ApplyTooltipStyle(AtlasLootTooltip) end end -STYLE:SaveAddonStyle("AtlasLoot", StyleAtlasLoot, nil, true) \ No newline at end of file +PLUGIN:SaveAddonStyle("AtlasLoot", StyleAtlasLoot, nil, true) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/AuctionLite.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/AuctionLite.lua index 3fe7bb3..f505a7e 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/AuctionLite.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/AuctionLite.lua @@ -31,8 +31,8 @@ GET ADDON DATA ]]-- local SV = _G["SVUI"]; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## AUCTIONLITE @@ -69,11 +69,11 @@ local function StyleAuctionLite(event, ...) BuyScanButton:SetButtonTemplate() SellCreateAuctionButton:SetButtonTemplate() - STYLE:ApplyPaginationStyle(BuyAdvancedButton) - STYLE:ApplyPaginationStyle(SellRememberButton) + PLUGIN:ApplyPaginationStyle(BuyAdvancedButton) + PLUGIN:ApplyPaginationStyle(SellRememberButton) - STYLE:ApplyTabStyle(AuctionFrameTab4) - STYLE:ApplyTabStyle(AuctionFrameTab5) + PLUGIN:ApplyTabStyle(AuctionFrameTab4) + PLUGIN:ApplyTabStyle(AuctionFrameTab5) if(_G["AuctionFrameBuy"]) then BGHelper(_G["AuctionFrameBuy"]) @@ -82,7 +82,7 @@ local function StyleAuctionLite(event, ...) BGHelper(_G["AuctionFrameSell"]) end - STYLE:SafeEventRemoval("AuctionLite", event) + PLUGIN:SafeEventRemoval("AuctionLite", event) end -STYLE:SaveAddonStyle("AuctionLite", StyleAuctionLite, nil, nil, "AUCTION_HOUSE_SHOW") \ No newline at end of file +PLUGIN:SaveAddonStyle("AuctionLite", StyleAuctionLite, nil, nil, "AUCTION_HOUSE_SHOW") \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/BigWigs.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/BigWigs.lua index f005058..39ad236 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/BigWigs.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/BigWigs.lua @@ -27,8 +27,8 @@ GET ADDON DATA ]]-- local SV = _G["SVUI"]; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## BIGWIGS @@ -139,9 +139,9 @@ local function StyleBigWigs(event, addon) GetStyleName = function() return styleName end, }) BigWigsBars:SetBarStyle(styleName) - STYLE:SafeEventRemoval("BigWigs", "ADDON_LOADED") - STYLE:SafeEventRemoval("BigWigs", "PLAYER_ENTERING_WORLD") + PLUGIN:SafeEventRemoval("BigWigs", "ADDON_LOADED") + PLUGIN:SafeEventRemoval("BigWigs", "PLAYER_ENTERING_WORLD") end end -STYLE:SaveAddonStyle("BigWigs", StyleBigWigs, nil, true) \ No newline at end of file +PLUGIN:SaveAddonStyle("BigWigs", StyleBigWigs, nil, true) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Bugsack.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Bugsack.lua index 502fb49..5f5b832 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Bugsack.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Bugsack.lua @@ -31,8 +31,8 @@ GET ADDON DATA ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## BUGSACK @@ -44,15 +44,15 @@ local function StyleBugSack(event, addon) if BugSackFrame.Panel then return end BugSackFrame:RemoveTextures() BugSackFrame:SetBasicPanel() - STYLE:ApplyTabStyle(BugSackTabAll) + PLUGIN:ApplyTabStyle(BugSackTabAll) BugSackTabAll:SetPoint("TOPLEFT", BugSackFrame, "BOTTOMLEFT", 0, 1) - STYLE:ApplyTabStyle(BugSackTabSession) - STYLE:ApplyTabStyle(BugSackTabLast) + PLUGIN:ApplyTabStyle(BugSackTabSession) + PLUGIN:ApplyTabStyle(BugSackTabLast) BugSackNextButton:SetButtonTemplate() BugSackSendButton:SetButtonTemplate() BugSackPrevButton:SetButtonTemplate() - STYLE:ApplyScrollBarStyle(BugSackScrollScrollBar) + PLUGIN:ApplyScrollBarStyle(BugSackScrollScrollBar) end) end -STYLE:SaveAddonStyle("Bugsack", StyleBugSack) \ No newline at end of file +PLUGIN:SaveAddonStyle("Bugsack", StyleBugSack) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Clique.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Clique.lua index be6254d..5378487 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Clique.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Clique.lua @@ -31,8 +31,8 @@ GET ADDON DATA ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## CLIQUE @@ -97,7 +97,7 @@ local function StyleClique() for _, gName in pairs(CliqueFrames) do local frame = _G[gName] if(frame) then - STYLE:ApplyFrameStyle(frame, "Transparent") + PLUGIN:ApplyFrameStyle(frame, "Transparent") if(gName == "CliqueConfig") then frame.Panel:SetPoint("TOPLEFT",0,0) frame.Panel:SetPoint("BOTTOMRIGHT",0,-5) @@ -125,7 +125,7 @@ local function StyleClique() end end - STYLE:ApplyCloseButtonStyle(CliqueDialog.CloseButton) + PLUGIN:ApplyCloseButtonStyle(CliqueDialog.CloseButton) CliqueConfigPage1:SetScript("OnShow", CliqueConfigPage1_OnShow) @@ -149,4 +149,4 @@ local function StyleClique() CliqueSpellTab:GetNormalTexture():FillInner() end -STYLE:SaveAddonStyle("Clique", StyleClique) \ No newline at end of file +PLUGIN:SaveAddonStyle("Clique", StyleClique) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Cooline.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Cooline.lua index 807be7f..3184111 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Cooline.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Cooline.lua @@ -31,8 +31,8 @@ GET ADDON DATA ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## COOLINE @@ -44,15 +44,15 @@ local function StyleCoolLine() CoolLineDB.bgcolor = { r = 0, g = 0, b = 0, a = 0, } CoolLineDB.border = "None" CoolLine.updatelook() - STYLE:ApplyFrameStyle(CoolLine,"Transparent") + PLUGIN:ApplyFrameStyle(CoolLine,"Transparent") CoolLine.Panel:SetAllPoints(CoolLine) SV:AddToDisplayAudit(CoolLine) - if STYLE:IsAddonReady("DockletCoolLine") then + if PLUGIN: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 -STYLE:SaveAddonStyle("CoolLine", StyleCoolLine) \ No newline at end of file +PLUGIN:SaveAddonStyle("CoolLine", StyleCoolLine) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/DBM.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/DBM.lua index d89d5fb..054a27e 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/DBM.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/DBM.lua @@ -31,8 +31,8 @@ GET ADDON DATA ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## DBM @@ -206,7 +206,7 @@ local function StyleDBM(event, addon) return RaidNotice_AddMessage_(noticeFrame, textString, colorInfo) end - STYLE:SafeEventRemoval("DBM", event) + PLUGIN:SafeEventRemoval("DBM", event) end -STYLE:SaveAddonStyle("DBM", StyleDBM, false, true) \ No newline at end of file +PLUGIN:SaveAddonStyle("DBM", StyleDBM, false, true) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/DXE.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/DXE.lua index 95a0088..0b2c9c5 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/DXE.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/DXE.lua @@ -31,8 +31,8 @@ GET ADDON DATA ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; local playerName = UnitName("player"); local playerRealm = GetRealmName(); local playerKey = ("%s - %s"):format(playerName, playerRealm) @@ -132,4 +132,4 @@ local function StyleDXE() DXEDB["profiles"][playerKey]["Globals"]["Font"] = SV.Media.font.default DXEDB["profiles"][playerKey]["Globals"]["TimerFont"] = SV.Media.font.default end -STYLE:SaveAddonStyle("DXE", StyleDXE) \ No newline at end of file +PLUGIN:SaveAddonStyle("DXE", StyleDXE) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/LightHeaded.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/LightHeaded.lua index 24d67c3..7773676 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/LightHeaded.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/LightHeaded.lua @@ -31,8 +31,8 @@ GET ADDON DATA ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## LIGHTHEADED @@ -60,25 +60,25 @@ local function StyleLightHeaded() local lhsub = _G["LightHeadedFrameSub"] local lhopts = _G["LightHeaded_Panel"] - STYLE:ApplyFrameStyle(LightHeadedFrame) - STYLE:ApplyFrameStyle(LightHeadedFrameSub) - STYLE:ApplyFrameStyle(LightHeadedSearchBox) - STYLE:ApplyTooltipStyle(LightHeadedTooltip) + PLUGIN:ApplyFrameStyle(LightHeadedFrame) + PLUGIN:ApplyFrameStyle(LightHeadedFrameSub) + PLUGIN:ApplyFrameStyle(LightHeadedSearchBox) + PLUGIN:ApplyTooltipStyle(LightHeadedTooltip) LightHeadedScrollFrame:RemoveTextures() lhframe.close:Hide() - STYLE:ApplyCloseButtonStyle(lhframe.close) + PLUGIN:ApplyCloseButtonStyle(lhframe.close) lhframe.handle:Hide() - STYLE:ApplyPaginationStyle(lhsub.prev) - STYLE:ApplyPaginationStyle(lhsub.next) + PLUGIN:ApplyPaginationStyle(lhsub.prev) + PLUGIN:ApplyPaginationStyle(lhsub.next) lhsub.prev:SetWidth(16) lhsub.prev:SetHeight(16) lhsub.next:SetWidth(16) lhsub.next:SetHeight(16) lhsub.prev:SetPoint("RIGHT", lhsub.page, "LEFT", -25, 0) lhsub.next:SetPoint("LEFT", lhsub.page, "RIGHT", 25, 0) - STYLE:ApplyScrollFrameStyle(LightHeadedScrollFrameScrollBar, 5) + PLUGIN:ApplyScrollFrameStyle(LightHeadedScrollFrameScrollBar, 5) lhsub.title:SetTextColor(23/255, 132/255, 209/255) lhframe.timeLapse = 0; @@ -101,4 +101,4 @@ local function StyleLightHeaded() LightHeaded_Panel_Button2:Disable() end end -STYLE:SaveAddonStyle("Lightheaded", StyleLightHeaded) \ No newline at end of file +PLUGIN:SaveAddonStyle("Lightheaded", StyleLightHeaded) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Mogit.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Mogit.lua index 7489024..82430b7 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Mogit.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Mogit.lua @@ -31,8 +31,8 @@ GET ADDON DATA ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## MOGIT @@ -57,13 +57,13 @@ local function StyleMogItPreview() } for _, object in pairs(MogItGearSlots) do if _G["MogItPreview"..i..object] then - STYLE:ApplyItemButtonStyle(_G["MogItPreview"..i..object]) + PLUGIN:ApplyItemButtonStyle(_G["MogItPreview"..i..object]) _G["MogItPreview"..i..object]:SetPushedTexture(nil) _G["MogItPreview"..i..object]:SetHighlightTexture(nil) end 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] then PLUGIN:ApplyFrameStyle(_G["MogItPreview"..i]) end + if _G["MogItPreview"..i.."CloseButton"] then PLUGIN:ApplyCloseButtonStyle(_G["MogItPreview"..i.."CloseButton"]) end if _G["MogItPreview"..i.."Inset"] then _G["MogItPreview"..i.."Inset"]:RemoveTextures(true) end if _G["MogItPreview"..i.."Activate"] then _G["MogItPreview"..i.."Activate"]:SetButtonTemplate() end end @@ -72,18 +72,18 @@ end local function StyleMogIt() assert(MogItFrame, "AddOn Not Loaded") - STYLE:ApplyFrameStyle(MogItFrame) + PLUGIN:ApplyFrameStyle(MogItFrame) MogItFrameInset:RemoveTextures(true) - STYLE:ApplyFrameStyle(MogItFilters) + PLUGIN:ApplyFrameStyle(MogItFilters) MogItFiltersInset:RemoveTextures(true) hooksecurefunc(MogIt, "CreatePreview", StyleMogItPreview) - STYLE:ApplyTooltipStyle(MogItTooltip) - STYLE:ApplyCloseButtonStyle(MogItFrameCloseButton) - STYLE:ApplyCloseButtonStyle(MogItFiltersCloseButton) + PLUGIN:ApplyTooltipStyle(MogItTooltip) + PLUGIN:ApplyCloseButtonStyle(MogItFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(MogItFiltersCloseButton) MogItFrameFiltersDefaults:RemoveTextures(true) MogItFrameFiltersDefaults:SetButtonTemplate() - STYLE:ApplyScrollFrameStyle(MogItScroll) - STYLE:ApplyScrollFrameStyle(MogItFiltersScrollScrollBar) + PLUGIN:ApplyScrollFrameStyle(MogItScroll) + PLUGIN:ApplyScrollFrameStyle(MogItFiltersScrollScrollBar) end -STYLE:SaveAddonStyle("MogIt", StyleMogIt) \ No newline at end of file +PLUGIN:SaveAddonStyle("MogIt", StyleMogIt) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Omen.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Omen.lua index 7d03c80..a79bd40 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Omen.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Omen.lua @@ -29,8 +29,8 @@ local format = string.format; GET ADDON DATA ########################################################## ]]-- -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## OMEN @@ -49,7 +49,7 @@ local function StyleOmen() hooksecurefunc(Omen, 'UpdateBackdrop', function(self) if not SVUI.CurrentlyDocked["OmenAnchor"] then - STYLE:ApplyFrameStyle(self.BarList, 'Transparent') + PLUGIN:ApplyFrameStyle(self.BarList, 'Transparent') self.Title:RemoveTextures() self.Title:SetPanelTemplate("Default") self.Title:SetPanelColor("class") @@ -61,9 +61,9 @@ local function StyleOmen() Omen:ReAnchorBars() Omen:ResizeBars() end -STYLE:SaveAddonStyle("Omen", StyleOmen, nil, true) +PLUGIN:SaveAddonStyle("Omen", StyleOmen, nil, true) -function STYLE:Docklet_Omen(parent) +function PLUGIN:Docklet_Omen(parent) if not Omen then return end local db=Omen.db; db.profile.Scale=1; diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Outfitter.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Outfitter.lua index 6b08d87..dd0b0f7 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Outfitter.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Outfitter.lua @@ -31,8 +31,8 @@ GET ADDON DATA ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## OUTFITTER @@ -43,7 +43,7 @@ local function StyleOutfitter() CharacterFrame:HookScript("OnShow", function(self) PaperDollSidebarTabs:SetPoint("BOTTOMRIGHT", CharacterFrameInsetRight, "TOPRIGHT", -14, 0) end) OutfitterFrame:HookScript("OnShow", function(self) - STYLE:ApplyFrameStyle(OutfitterFrame) + PLUGIN:ApplyFrameStyle(OutfitterFrame) OutfitterFrameTab1:Size(60, 25) OutfitterFrameTab2:Size(60, 25) OutfitterFrameTab3:Size(60, 25) @@ -67,8 +67,8 @@ local function StyleOutfitter() OutfitterFrameTab1:SetButtonTemplate() OutfitterFrameTab2:SetButtonTemplate() OutfitterFrameTab3:SetButtonTemplate() - STYLE:ApplyScrollFrameStyle(OutfitterMainFrameScrollFrameScrollBar) - STYLE:ApplyCloseButtonStyle(OutfitterCloseButton) + PLUGIN:ApplyScrollFrameStyle(OutfitterMainFrameScrollFrameScrollBar) + PLUGIN:ApplyCloseButtonStyle(OutfitterCloseButton) OutfitterNewButton:SetButtonTemplate() OutfitterEnableNone:SetButtonTemplate() OutfitterEnableAll:SetButtonTemplate() @@ -109,11 +109,11 @@ local function StyleOutfitter() OutfitterShowOutfitBar:Point("TOPLEFT", OutfitterAutoSwitch, "BOTTOMLEFT", 0, -5) OutfitterEditScriptDialogDoneButton:SetButtonTemplate() OutfitterEditScriptDialogCancelButton:SetButtonTemplate() - STYLE:ApplyScrollFrameStyle(OutfitterEditScriptDialogSourceScriptScrollBar) - STYLE:ApplyFrameStyle(OutfitterEditScriptDialogSourceScript,"Transparent") - STYLE:ApplyFrameStyle(OutfitterEditScriptDialog) - STYLE:ApplyCloseButtonStyle(OutfitterEditScriptDialog.CloseButton) - STYLE:ApplyTabStyle(OutfitterEditScriptDialogTab1) - STYLE:ApplyTabStyle(OutfitterEditScriptDialogTab2) + PLUGIN:ApplyScrollFrameStyle(OutfitterEditScriptDialogSourceScriptScrollBar) + PLUGIN:ApplyFrameStyle(OutfitterEditScriptDialogSourceScript,"Transparent") + PLUGIN:ApplyFrameStyle(OutfitterEditScriptDialog) + PLUGIN:ApplyCloseButtonStyle(OutfitterEditScriptDialog.CloseButton) + PLUGIN:ApplyTabStyle(OutfitterEditScriptDialogTab1) + PLUGIN:ApplyTabStyle(OutfitterEditScriptDialogTab2) end -STYLE:SaveAddonStyle("Outfitter", StyleOutfitter) \ No newline at end of file +PLUGIN:SaveAddonStyle("Outfitter", StyleOutfitter) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Postal.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Postal.lua index a5ace41..294c5f0 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Postal.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Postal.lua @@ -31,8 +31,8 @@ GET ADDON DATA ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## POSTAL @@ -61,7 +61,7 @@ local function StylePostal() PostalSelectOpenButton:Point("RIGHT", InboxFrame, "TOP", -41, -48) end if Postal_OpenAllMenuButton and not Postal_OpenAllMenuButton.handled then - STYLE:ApplyPaginationStyle(Postal_OpenAllMenuButton, true) + PLUGIN:ApplyPaginationStyle(Postal_OpenAllMenuButton, true) Postal_OpenAllMenuButton:SetPoint('LEFT', PostalOpenAllButton, 'RIGHT', 5, 0) Postal_OpenAllMenuButton.handled = true end @@ -76,14 +76,14 @@ local function StylePostal() PostalSelectReturnButton:Point("LEFT", InboxFrame, "TOP", -5, -48) end if Postal_PackageMenuButton and not Postal_PackageMenuButton.handled then - STYLE:ApplyPaginationStyle(Postal_PackageMenuButton, true) + PLUGIN: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 - STYLE:ApplyPaginationStyle(Postal_BlackBookButton, true) + PLUGIN:ApplyPaginationStyle(Postal_BlackBookButton, true) Postal_BlackBookButton.handled = true Postal_BlackBookButton:SetPoint('LEFT', SendMailNameEditBox, 'RIGHT', 5, 2) end end -STYLE:SaveAddonStyle("Postal", StylePostal, nil, nil, 'MAIL_SHOW') \ No newline at end of file +PLUGIN:SaveAddonStyle("Postal", StylePostal, nil, nil, 'MAIL_SHOW') \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Quartz.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Quartz.lua index 48d8db9..fd3c1b7 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Quartz.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Quartz.lua @@ -31,8 +31,8 @@ GET ADDON DATA ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## QUARTZ @@ -50,10 +50,10 @@ local function StyleQuartz() local function StyleQuartzBar(self) if not self.isStyled then self.IconBorder = CreateFrame("Frame", nil, self) - STYLE:ApplyFrameStyle(self.IconBorder,"Transparent") + PLUGIN:ApplyFrameStyle(self.IconBorder,"Transparent") self.IconBorder:SetFrameLevel(0) self.IconBorder:WrapOuter(self.Icon) - STYLE:ApplyFrameStyle(self.Bar,"Transparent",true) + PLUGIN:ApplyFrameStyle(self.Bar,"Transparent",true) self.isStyled = true end if self.config.hideicon then @@ -70,9 +70,9 @@ local function StyleQuartz() if GCD then hooksecurefunc(GCD, 'CheckGCD', function() if not Quartz3GCDBar.backdrop then - STYLE:ApplyFrameStyle(Quartz3GCDBar,"Transparent",true) + PLUGIN:ApplyFrameStyle(Quartz3GCDBar,"Transparent",true) end end) end end -STYLE:SaveAddonStyle("Quartz", StyleQuartz) \ No newline at end of file +PLUGIN:SaveAddonStyle("Quartz", StyleQuartz) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Recount.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Recount.lua index bc14641..0389f0b 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Recount.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Recount.lua @@ -31,8 +31,8 @@ GET ADDON DATA ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## RECOUNT @@ -55,11 +55,11 @@ local function StyleRecount() assert(Recount, "AddOn Not Loaded") function Recount:ShowReset() - STYLE:LoadAlert(L['Reset Recount?'], function(self) Recount:ResetData() self:GetParent():Hide() end) + PLUGIN:LoadAlert(L['Reset Recount?'], function(self) Recount:ResetData() self:GetParent():Hide() end) end local function StyleFrame(frame) - STYLE:ApplyFrameStyle(frame,"Transparent") + PLUGIN:ApplyFrameStyle(frame,"Transparent") frame.Panel:SetAllPoints() frame.Panel:SetPoint('TOPLEFT', frame, 'TOPLEFT', 0, -6) frame.CloseButton:SetPoint('TOPRIGHT', frame, 'TOPRIGHT', -1, -9) @@ -104,10 +104,10 @@ local function StyleRecount() end end - STYLE:ApplyScrollFrameStyle(Recount_MainWindow_ScrollBarScrollBar) + PLUGIN:ApplyScrollFrameStyle(Recount_MainWindow_ScrollBarScrollBar) Recount_MainWindow:HookScript('OnShow', function(self) if InCombatLockdown() then return end if SV.CurrentlyDocked["Recount_MainWindow"] then SuperDockWindowRight:Show() end end) - Recount.MainWindow.FileButton:HookScript('OnClick', function(self) if LibDropdownFrame0 then STYLE:ApplyFrameStyle(LibDropdownFrame0) end end) + Recount.MainWindow.FileButton:HookScript('OnClick', function(self) if LibDropdownFrame0 then PLUGIN: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) @@ -116,15 +116,15 @@ local function StyleRecount() hooksecurefunc(Recount, 'ShowReport', function(self) if Recount_ReportWindow.isStyled then return end Recount_ReportWindow.isStyled = true - STYLE:ApplyFrameStyle(Recount_ReportWindow.Whisper) + PLUGIN:ApplyFrameStyle(Recount_ReportWindow.Whisper) Recount_ReportWindow.ReportButton:SetButtonTemplate() - STYLE:ApplyScrollBarStyle(Recount_ReportWindow_Slider) + PLUGIN:ApplyScrollBarStyle(Recount_ReportWindow_Slider) Recount_ReportWindow_Slider:GetThumbTexture():Size(6,6) end) end -STYLE:SaveAddonStyle("Recount", StyleRecount) +PLUGIN:SaveAddonStyle("Recount", StyleRecount) -function STYLE:Docklet_Recount(parent) +function PLUGIN: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/components/addons/SexyCooldown.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/SexyCooldown.lua index ad5fd29..38d77fc 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/SexyCooldown.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/SexyCooldown.lua @@ -31,8 +31,8 @@ GET ADDON DATA ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## SEXYCOOLDOWN @@ -55,9 +55,9 @@ end local function StyleSexyCooldownBar(bar) SCDStripStyleSettings(bar) - STYLE:ApplyFrameStyle(bar) + PLUGIN:ApplyFrameStyle(bar) SV:AddToDisplayAudit(bar) - if STYLE:IsAddonReady("DockletSexyCooldown") then + if PLUGIN:IsAddonReady("DockletSexyCooldown") then bar:ClearAllPoints() bar:Point('BOTTOMRIGHT', SVUI_ActionBar1, 'TOPRIGHT', 0, 2) bar:Point("BOTTOMLEFT", SVUI_ActionBar1, "TOPLEFT", 0, 2) @@ -67,8 +67,8 @@ end local function StyleSexyCooldownIcon(bar, icon) if not icon.styled then - STYLE:ApplyFrameStyle(icon, false, true) - STYLE:ApplyFrameStyle(icon.overlay,"Transparent",true) + PLUGIN:ApplyFrameStyle(icon, false, true) + PLUGIN:ApplyFrameStyle(icon.overlay,"Transparent",true) icon.styled = true end icon.overlay.tex:SetTexCoord(0.1,0.9,0.1,0.9) @@ -102,4 +102,4 @@ local function StyleSexyCooldown() end end) end -STYLE:SaveAddonStyle("SexyCooldown", StyleSexyCooldown) \ No newline at end of file +PLUGIN:SaveAddonStyle("SexyCooldown", StyleSexyCooldown) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Skada.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Skada.lua index b13fdd8..b0342b3 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Skada.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Skada.lua @@ -30,8 +30,8 @@ local twipe = table.wipe; GET ADDON DATA ########################################################## ]]-- -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; local activePanels = {}; local SkadaHolder, SkadaHolder2 --[[ @@ -79,7 +79,7 @@ local function skada_panel_loader(holder, window) window.bargroup:SetParent(holder) end -function STYLE:Docklet_Skada() +function PLUGIN:Docklet_Skada() if not Skada then return end CheckForHolders() for index,window in pairs(Skada:GetWindows()) do @@ -96,7 +96,7 @@ function STYLE:Docklet_Skada() end local function Skada_ShowPopup(self) - STYLE:LoadAlert('Do you want to reset Skada?', function(self) Skada:Reset() self:GetParent():Hide() end) + PLUGIN:LoadAlert('Do you want to reset Skada?', function(self) Skada:Reset() self:GetParent():Hide() end) end local function StyleSkada() @@ -140,15 +140,15 @@ local function StyleSkada() hooksecurefunc(Skada, 'CreateWindow', function() if SVUI.CurrentlyDocked["SkadaHolder"] or SVUI.CurrentlyDocked["SkadaHolder2"] then - STYLE:Docklet_Skada() + PLUGIN:Docklet_Skada() end end) hooksecurefunc(Skada, 'DeleteWindow', function() if SVUI.CurrentlyDocked["SkadaHolder"] or SVUI.CurrentlyDocked["SkadaHolder2"] then - STYLE:Docklet_Skada() + PLUGIN:Docklet_Skada() end end) end -STYLE:SaveAddonStyle("Skada", StyleSkada, nil, true) \ No newline at end of file +PLUGIN:SaveAddonStyle("Skada", StyleSkada, nil, true) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/TinyDPS.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/TinyDPS.lua index ec46d7d..4d120e5 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/TinyDPS.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/TinyDPS.lua @@ -31,8 +31,8 @@ GET ADDON DATA ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## TINYDPS @@ -41,7 +41,7 @@ TINYDPS local function StyleTinyDPS() assert(tdpsFrame, "AddOn Not Loaded") - STYLE:ApplyFrameStyle(tdpsFrame) + PLUGIN:ApplyFrameStyle(tdpsFrame) tdpsFrame:HookScript("OnShow", function() if InCombatLockdown() then return end @@ -58,9 +58,9 @@ local function StyleTinyDPS() tdpsRefresh() end -STYLE:SaveAddonStyle("TinyDPS", StyleTinyDPS) +PLUGIN:SaveAddonStyle("TinyDPS", StyleTinyDPS) -function STYLE:Docklet_TinyDPS(parent) +function PLUGIN:Docklet_TinyDPS(parent) if not tdpsFrame then return end tdpsFrame:SetFixedPanelTemplate("Transparent", true) tdpsFrame:SetFrameStrata("LOW") diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/TomTom.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/TomTom.lua index 52397c3..ac2599f 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/TomTom.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/TomTom.lua @@ -31,8 +31,8 @@ GET ADDON DATA ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## TOMTOM @@ -40,6 +40,6 @@ TOMTOM ]]-- local function StyleTomTom() assert(TomTomBlock, "AddOn Not Loaded") - STYLE:ApplyFrameStyle(TomTomBlock) + PLUGIN:ApplyFrameStyle(TomTomBlock) end -STYLE:SaveAddonStyle("TomTom", StyleTomTom) \ No newline at end of file +PLUGIN:SaveAddonStyle("TomTom", StyleTomTom) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/TradeSkillDW.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/TradeSkillDW.lua index f904b36..b4cfdcf 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/TradeSkillDW.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/TradeSkillDW.lua @@ -31,8 +31,8 @@ GET ADDON DATA ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## TSDW @@ -48,17 +48,17 @@ local function StyleTradeSkillDW() TradeSkillExpandButtonFrame:RemoveTextures(true) TradeSkillDetailScrollChildFrame:RemoveTextures(true) TradeSkillListScrollFrame:RemoveTextures(true) - STYLE:ApplyFrameStyle(TradeSkillGuildFrame,"Transparent") - STYLE:ApplyFrameStyle(TradeSkillGuildFrameContainer,"Transparent") + PLUGIN:ApplyFrameStyle(TradeSkillGuildFrame,"Transparent") + PLUGIN:ApplyFrameStyle(TradeSkillGuildFrameContainer,"Transparent") TradeSkillGuildFrame:Point("BOTTOMLEFT", TradeSkillFrame, "BOTTOMRIGHT", 3, 19) - STYLE:ApplyCloseButtonStyle(TradeSkillGuildFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(TradeSkillGuildFrameCloseButton) TradeSkillFrame:HookScript("OnShow", function() - STYLE:ApplyFrameStyle(TradeSkillFrame) + PLUGIN:ApplyFrameStyle(TradeSkillFrame) TradeSkillListScrollFrame:RemoveTextures() if not TradeSkillDWExpandButton then return end if not TradeSkillDWExpandButton.styled then - STYLE:ApplyPaginationStyle(TradeSkillDWExpandButton) + PLUGIN:ApplyPaginationStyle(TradeSkillDWExpandButton) TradeSkillDWExpandButton.styled = true end end) @@ -74,14 +74,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():Die() - STYLE:ApplyFrameStyle(TradeSkillLinkButton,"Transparent") + PLUGIN: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) - STYLE:ApplyCloseButtonStyle(TradeSkillFrameCloseButton) - STYLE:ApplyScrollFrameStyle(TradeSkillDetailScrollFrameScrollBar) + PLUGIN:ApplyCloseButtonStyle(TradeSkillFrameCloseButton) + PLUGIN:ApplyScrollFrameStyle(TradeSkillDetailScrollFrameScrollBar) local once = false hooksecurefunc("TradeSkillFrame_SetSelection", function(id) TradeSkillSkillIcon:SetButtonTemplate() @@ -102,7 +102,7 @@ local function StyleTradeSkillDW() if not icon.backdrop then icon.backdrop = CreateFrame("Frame", nil, button) icon.backdrop:SetFrameLevel(button:GetFrameLevel() - 1) - STYLE:ApplyFrameStyle(icon.backdrop,"Transparent") + PLUGIN:ApplyFrameStyle(icon.backdrop,"Transparent") icon.backdrop:Point("TOPLEFT", icon, "TOPLEFT", -2, 2) icon.backdrop:Point("BOTTOMRIGHT", icon, "BOTTOMRIGHT", 2, -2) end @@ -119,9 +119,9 @@ local function StyleTradeSkillDW() end end) - TradeSkillDW_QueueFrame:HookScript("OnShow", function() STYLE:ApplyFrameStyle(TradeSkillDW_QueueFrame,"Transparent") end) + TradeSkillDW_QueueFrame:HookScript("OnShow", function() PLUGIN:ApplyFrameStyle(TradeSkillDW_QueueFrame,"Transparent") end) - STYLE:ApplyCloseButtonStyle(TradeSkillDW_QueueFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(TradeSkillDW_QueueFrameCloseButton) TradeSkillDW_QueueFrameInset:RemoveTextures() TradeSkillDW_QueueFrameClear:SetButtonTemplate() @@ -138,7 +138,7 @@ local function StyleTradeSkillDW() TradeSkillDW_QueueFrameDetailScrollFrameChildFrameReagent6:RemoveTextures() TradeSkillDW_QueueFrameDetailScrollFrameChildFrameReagent7:RemoveTextures() TradeSkillDW_QueueFrameDetailScrollFrameChildFrameReagent8:RemoveTextures() - STYLE:ApplyScrollFrameStyle(TradeSkillDW_QueueFrameDetailScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(TradeSkillDW_QueueFrameDetailScrollFrameScrollBar) TradeSkillListScrollFrame:RemoveTextures() end -STYLE:SaveAddonStyle("TradeSkillDW", StyleTradeSkillDW) \ No newline at end of file +PLUGIN:SaveAddonStyle("TradeSkillDW", StyleTradeSkillDW) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/VEM.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/VEM.lua index 5942c5f..419539a 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/VEM.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/VEM.lua @@ -31,8 +31,8 @@ GET ADDON DATA ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## VEM @@ -234,17 +234,17 @@ local function StyleVEM(event, addon) if addon == 'VEM-GUI' then VEM_GUI_OptionsFrame:HookScript('OnShow', function() - STYLE:ApplyFrameStyle(VEM_GUI_OptionsFrame) - STYLE:ApplyFrameStyle(VEM_GUI_OptionsFrameBossMods) - STYLE:ApplyFrameStyle(VEM_GUI_OptionsFrameVEMOptions) - STYLE:ApplyFrameStyle(VEM_GUI_OptionsFramePanelContainer, 'Transparent', true) + PLUGIN:ApplyFrameStyle(VEM_GUI_OptionsFrame) + PLUGIN:ApplyFrameStyle(VEM_GUI_OptionsFrameBossMods) + PLUGIN:ApplyFrameStyle(VEM_GUI_OptionsFrameVEMOptions) + PLUGIN:ApplyFrameStyle(VEM_GUI_OptionsFramePanelContainer, 'Transparent', true) end) - STYLE:ApplyTabStyle(VEM_GUI_OptionsFrameTab1) - STYLE:ApplyTabStyle(VEM_GUI_OptionsFrameTab2) + PLUGIN:ApplyTabStyle(VEM_GUI_OptionsFrameTab1) + PLUGIN:ApplyTabStyle(VEM_GUI_OptionsFrameTab2) VEM_GUI_OptionsFrameOkay:SetButtonTemplate() VEM_GUI_OptionsFrameWebsiteButton:SetButtonTemplate() - STYLE:ApplyScrollFrameStyle(VEM_GUI_OptionsFramePanelContainerFOVScrollBar) - STYLE:SafeEventRemoval("VEM", event) + PLUGIN:ApplyScrollFrameStyle(VEM_GUI_OptionsFramePanelContainerFOVScrollBar) + PLUGIN:SafeEventRemoval("VEM", event) end end -STYLE:SaveAddonStyle("VEM", StyleVEM, nil, true) \ No newline at end of file +PLUGIN:SaveAddonStyle("VEM", StyleVEM, nil, true) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/alDamageMeter.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/alDamageMeter.lua index dc09a34..d0b6fb0 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/alDamageMeter.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/alDamageMeter.lua @@ -31,8 +31,8 @@ GET ADDON DATA ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## ALDAMAGEMETER @@ -42,7 +42,7 @@ local function StyleALDamageMeter() assert(_G['alDamagerMeterFrame'], "AddOn Not Loaded") alDamageMeterFrame.bg:Die() - STYLE:ApplyFrameStyle(alDamageMeterFrame) + PLUGIN:ApplyFrameStyle(alDamageMeterFrame) alDamageMeterFrame:HookScript('OnShow', function() if InCombatLockdown() then return end if SV.CurrentlyDocked["alDamagerMeterFrame"] then @@ -50,9 +50,9 @@ local function StyleALDamageMeter() end end) end -STYLE:SaveAddonStyle("alDamageMeter", StyleALDamageMeter) +PLUGIN:SaveAddonStyle("alDamageMeter", StyleALDamageMeter) -function STYLE:Docklet_alDamageMeter(parent) +function PLUGIN: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/components/blizzard/achievement.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/achievement.lua index 4d28483..273f8b8 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/achievement.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/achievement.lua @@ -27,8 +27,8 @@ local pairs = _G.pairs; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -143,11 +143,11 @@ local function BarStyleHelper(bar) end --[[ ########################################################## -ACHIEVEMENTFRAME STYLER +ACHIEVEMENTFRAME PLUGINR ########################################################## ]]-- local function AchievementStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.achievement ~= true then + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.achievement ~= true then return end @@ -171,7 +171,7 @@ local function AchievementStyle() end end - STYLE:ApplyWindowStyle(AchievementFrame) + PLUGIN:ApplyWindowStyle(AchievementFrame) AchievementFrameSummaryAchievements:RemoveTextures(true) AchievementFrameSummaryAchievements:SetBasicPanel() @@ -183,20 +183,20 @@ local function AchievementStyle() AchievementFrameAchievementsContainer:SetPanelTemplate("Default") AchievementFrameAchievementsContainer.Panel:Point("TOPLEFT", 0, 2) AchievementFrameAchievementsContainer.Panel:Point("BOTTOMRIGHT", -3, -3) - STYLE:ApplyCloseButtonStyle(AchievementFrameCloseButton, AchievementFrame.Panel) - STYLE:ApplyDropdownStyle(AchievementFrameFilterDropDown) + PLUGIN:ApplyCloseButtonStyle(AchievementFrameCloseButton, AchievementFrame.Panel) + PLUGIN:ApplyDropdownStyle(AchievementFrameFilterDropDown) AchievementFrameFilterDropDown:Point("TOPRIGHT", AchievementFrame, "TOPRIGHT", -44, 5) - STYLE:ApplyScrollFrameStyle(AchievementFrameCategoriesContainerScrollBar, 5) - STYLE:ApplyScrollFrameStyle(AchievementFrameAchievementsContainerScrollBar, 5) - STYLE:ApplyScrollFrameStyle(AchievementFrameStatsContainerScrollBar, 5) - STYLE:ApplyScrollFrameStyle(AchievementFrameComparisonContainerScrollBar, 5) - STYLE:ApplyScrollFrameStyle(AchievementFrameComparisonStatsContainerScrollBar, 5) + PLUGIN:ApplyScrollFrameStyle(AchievementFrameCategoriesContainerScrollBar, 5) + PLUGIN:ApplyScrollFrameStyle(AchievementFrameAchievementsContainerScrollBar, 5) + PLUGIN:ApplyScrollFrameStyle(AchievementFrameStatsContainerScrollBar, 5) + PLUGIN:ApplyScrollFrameStyle(AchievementFrameComparisonContainerScrollBar, 5) + PLUGIN:ApplyScrollFrameStyle(AchievementFrameComparisonStatsContainerScrollBar, 5) for i = 1, 3 do local tab = _G["AchievementFrameTab"..i] if(tab) then - STYLE:ApplyTabStyle(tab) + PLUGIN:ApplyTabStyle(tab) tab:SetFrameLevel(tab:GetFrameLevel() + 2) end end @@ -229,7 +229,7 @@ local function AchievementStyle() AchievementFrame:HookScript("OnShow", function(self) if(self.containerStyled) then return end for i = 1, 20 do - STYLE:ApplyItemButtonStyle(_G["AchievementFrameCategoriesContainerButton"..i]) + PLUGIN:ApplyItemButtonStyle(_G["AchievementFrameCategoriesContainerButton"..i]) end self.containerStyled = true end) @@ -464,7 +464,7 @@ local function AchievementStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle("Blizzard_AchievementUI", AchievementStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_AchievementUI", AchievementStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/alert.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/alert.lua index 023d1a7..bd8271f 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/alert.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/alert.lua @@ -20,8 +20,8 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -34,11 +34,11 @@ local AlphaHelper = function(self, value, flag) end --[[ ########################################################## -ALERTFRAME STYLER +ALERTFRAME PLUGINR ########################################################## ]]-- local function AlertStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.alertframes ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.alertframes ~= true then return end for i = 1, 4 do local alert = _G["SVUI_SystemAlert"..i]; @@ -47,7 +47,7 @@ local function AlertStyle() alert.buttons[b]:SetButtonTemplate() end alert:RemoveTextures() - STYLE:ApplyAlertStyle(alert) + PLUGIN:ApplyAlertStyle(alert) alert.input:SetEditboxTemplate() alert.input.Panel:Point("TOPLEFT", -2, -4) alert.input.Panel:Point("BOTTOMRIGHT", 2, 4) @@ -342,7 +342,7 @@ local function AlertStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(AlertStyle) \ No newline at end of file +PLUGIN:SaveCustomStyle(AlertStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/archeology.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/archeology.lua index a1c720e..b7510d1 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/archeology.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/archeology.lua @@ -20,11 +20,11 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## -ARCHEOLOGYFRAME STYLER +ARCHEOLOGYFRAME PLUGINR ########################################################## ]]-- --240 24 @@ -34,7 +34,7 @@ progressBarHolder:SetPoint("BOTTOM", CastingBarFrame, "TOP", 0, 10) SV.Mentalo:Add(progressBarHolder, "Archeology Progress Bar") local function ArchaeologyStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.archaeology ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.archaeology ~= true then return end ArchaeologyFrame:RemoveTextures() ArchaeologyFrameInset:RemoveTextures() @@ -47,9 +47,9 @@ local function ArchaeologyStyle() ArchaeologyFrameArtifactPageSolveFrameSolveButton:SetButtonTemplate() ArchaeologyFrameArtifactPageBackButton:SetButtonTemplate() ArchaeologyFrameRaceFilter:SetFrameLevel(ArchaeologyFrameRaceFilter:GetFrameLevel()+2) - STYLE:ApplyDropdownStyle(ArchaeologyFrameRaceFilter, 125) - STYLE:ApplyPaginationStyle(ArchaeologyFrameCompletedPageNextPageButton) - STYLE:ApplyPaginationStyle(ArchaeologyFrameCompletedPagePrevPageButton) + PLUGIN:ApplyDropdownStyle(ArchaeologyFrameRaceFilter, 125) + PLUGIN:ApplyPaginationStyle(ArchaeologyFrameCompletedPageNextPageButton) + PLUGIN:ApplyPaginationStyle(ArchaeologyFrameCompletedPagePrevPageButton) ArchaeologyFrameRankBar:RemoveTextures() ArchaeologyFrameRankBar:SetStatusBarTexture([[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]]) ArchaeologyFrameRankBar:SetFrameLevel(ArchaeologyFrameRankBar:GetFrameLevel()+2) @@ -81,13 +81,13 @@ local function ArchaeologyStyle() ArchaeologyFrameArtifactPageIcon.backdrop:SetFrameLevel(ArchaeologyFrameArtifactPage:GetFrameLevel()) ArchaeologyFrameArtifactPageIcon:SetParent(ArchaeologyFrameArtifactPageIcon.backdrop) ArchaeologyFrameArtifactPageIcon:SetDrawLayer("OVERLAY") - STYLE:ApplyCloseButtonStyle(ArchaeologyFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(ArchaeologyFrameCloseButton) ArcheologyDigsiteProgressBar:SetAllPoints(progressBarHolder) progressBarHolder:SetParent(ArcheologyDigsiteProgressBar) end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle("Blizzard_ArchaeologyUI", ArchaeologyStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_ArchaeologyUI", ArchaeologyStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/auctionhouse.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/auctionhouse.lua index f5c07ea..79944d8 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/auctionhouse.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/auctionhouse.lua @@ -21,8 +21,8 @@ local pairs = _G.pairs; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -82,28 +82,28 @@ local AuctionTextFields = { } --[[ ########################################################## -AUCTIONFRAME STYLER +AUCTIONFRAME PLUGINR ########################################################## ]]-- local function AuctionStyle() - --STYLE.Debugging = true - if(SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.auctionhouse ~= true) then return end + --PLUGIN.Debugging = true + if(PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.auctionhouse ~= true) then return end - STYLE:ApplyWindowStyle(AuctionFrame, false, true) + PLUGIN:ApplyWindowStyle(AuctionFrame, false, true) BrowseFilterScrollFrame:RemoveTextures() BrowseScrollFrame:RemoveTextures() AuctionsScrollFrame:RemoveTextures() BidScrollFrame:RemoveTextures() - STYLE:ApplyCloseButtonStyle(AuctionFrameCloseButton) - STYLE:ApplyScrollFrameStyle(AuctionsScrollFrameScrollBar) + PLUGIN:ApplyCloseButtonStyle(AuctionFrameCloseButton) + PLUGIN:ApplyScrollFrameStyle(AuctionsScrollFrameScrollBar) - STYLE:ApplyDropdownStyle(BrowseDropDown) - STYLE:ApplyDropdownStyle(PriceDropDown) - STYLE:ApplyDropdownStyle(DurationDropDown) - STYLE:ApplyScrollFrameStyle(BrowseFilterScrollFrameScrollBar) - STYLE:ApplyScrollFrameStyle(BrowseScrollFrameScrollBar) + PLUGIN:ApplyDropdownStyle(BrowseDropDown) + PLUGIN:ApplyDropdownStyle(PriceDropDown) + PLUGIN:ApplyDropdownStyle(DurationDropDown) + PLUGIN:ApplyScrollFrameStyle(BrowseFilterScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(BrowseScrollFrameScrollBar) IsUsableCheckButton:SetCheckboxTemplate(true) ShowOnPlayerCheckButton:SetCheckboxTemplate(true) @@ -118,7 +118,7 @@ local function AuctionStyle() SideDressUpModel:SetFixedPanelTemplate("ModelComic") SideDressUpModelResetButton:SetButtonTemplate() SideDressUpModelResetButton:SetPoint("BOTTOM", SideDressUpModel, "BOTTOM", 0, 20) - STYLE:ApplyCloseButtonStyle(SideDressUpModelCloseButton) + PLUGIN:ApplyCloseButtonStyle(SideDressUpModelCloseButton) AuctionProgressFrame:RemoveTextures() AuctionProgressFrame:SetFixedPanelTemplate("Transparent", true) @@ -143,8 +143,8 @@ local function AuctionStyle() AuctionProgressBar:SetStatusBarTexture(SV.Media.bar.default) AuctionProgressBar:SetStatusBarColor(1, 1, 0) - STYLE:ApplyPaginationStyle(BrowseNextPageButton) - STYLE:ApplyPaginationStyle(BrowsePrevPageButton) + PLUGIN:ApplyPaginationStyle(BrowseNextPageButton) + PLUGIN:ApplyPaginationStyle(BrowsePrevPageButton) for _,gName in pairs(AuctionBidButtons) do if(_G[gName]) then @@ -177,9 +177,9 @@ local function AuctionStyle() _G[frame.."Right"]:Die() end - STYLE:ApplyTabStyle(_G["AuctionFrameTab1"]) - STYLE:ApplyTabStyle(_G["AuctionFrameTab2"]) - STYLE:ApplyTabStyle(_G["AuctionFrameTab3"]) + PLUGIN:ApplyTabStyle(_G["AuctionFrameTab1"]) + PLUGIN:ApplyTabStyle(_G["AuctionFrameTab2"]) + PLUGIN:ApplyTabStyle(_G["AuctionFrameTab3"]) AuctionFrameBrowse.bg1 = CreateFrame("Frame", nil, AuctionFrameBrowse) AuctionFrameBrowse.bg1:Point("TOPLEFT", 20, -103) @@ -331,7 +331,7 @@ local function AuctionStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle("Blizzard_AuctionUI", AuctionStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_AuctionUI", AuctionStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/barbershop.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/barbershop.lua index fd5bae3..7ffaf5b 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/barbershop.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/barbershop.lua @@ -20,15 +20,15 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## -BARBERSHOP STYLER +BARBERSHOP PLUGINR ########################################################## ]]-- local function BarberShopStyle() - if SV.db[Schema].blizzard.enable~=true or SV.db[Schema].blizzard.barber~=true then return end + if PLUGIN.db.blizzard.enable~=true or PLUGIN.db.blizzard.barber~=true then return end local buttons = {"BarberShopFrameOkayButton", "BarberShopFrameCancelButton", "BarberShopFrameResetButton"} @@ -47,8 +47,8 @@ local function BarberShopStyle() for i = 1, 5 do local selector = _G["BarberShopFrameSelector"..i] if selector then - STYLE:ApplyPaginationStyle(_G["BarberShopFrameSelector"..i.."Prev"]) - STYLE:ApplyPaginationStyle(_G["BarberShopFrameSelector"..i.."Next"]) + PLUGIN:ApplyPaginationStyle(_G["BarberShopFrameSelector"..i.."Prev"]) + PLUGIN:ApplyPaginationStyle(_G["BarberShopFrameSelector"..i.."Next"]) selector:ClearAllPoints() if lastframe then @@ -82,7 +82,7 @@ local function BarberShopStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle("Blizzard_BarbershopUI",BarberShopStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_BarbershopUI",BarberShopStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/battlefield.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/battlefield.lua index a44b939..da1a42d 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/battlefield.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/battlefield.lua @@ -20,15 +20,15 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## -BATTLEFIELD STYLER +BATTLEFIELD PLUGINR ########################################################## ]]-- local function BattlefieldStyle() - if SV.db[Schema].blizzard.enable~=true or SV.db[Schema].blizzard.bgmap~=true then return end + if PLUGIN.db.blizzard.enable~=true or PLUGIN.db.blizzard.bgmap~=true then return end BattlefieldMinimap:SetClampedToScreen(true) BattlefieldMinimapCorner:Die() BattlefieldMinimapBackground:Die() @@ -41,7 +41,7 @@ local function BattlefieldStyle() BattlefieldMinimap:SetFrameStrata("LOW") BattlefieldMinimapCloseButton:ClearAllPoints() BattlefieldMinimapCloseButton:SetPoint("TOPRIGHT", -4, 0) - STYLE:ApplyCloseButtonStyle(BattlefieldMinimapCloseButton) + PLUGIN:ApplyCloseButtonStyle(BattlefieldMinimapCloseButton) BattlefieldMinimapCloseButton:SetFrameStrata("MEDIUM") BattlefieldMinimap:EnableMouse(true) BattlefieldMinimap:SetMovable(true) @@ -93,7 +93,7 @@ local function BattlefieldStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle("Blizzard_BattlefieldMinimap",BattlefieldStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_BattlefieldMinimap",BattlefieldStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/blackmarket.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/blackmarket.lua index 21ff8b3..79ef869 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/blackmarket.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/blackmarket.lua @@ -20,15 +20,15 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## -BLACKMARKET STYLER +BLACKMARKET PLUGINR ########################################################## ]]-- local function BlackMarketStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.bmah ~= true then + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.bmah ~= true then return end @@ -44,8 +44,8 @@ local function BlackMarketStyle() BlackMarketFrame:SetPanelTemplate("Halftone") BlackMarketFrame.Inset:RemoveTextures() BlackMarketFrame.Inset:SetFixedPanelTemplate("Inset") - STYLE:ApplyCloseButtonStyle(BlackMarketFrame.CloseButton) - STYLE:ApplyScrollFrameStyle(BlackMarketScrollFrameScrollBar, 4) + PLUGIN:ApplyCloseButtonStyle(BlackMarketFrame.CloseButton) + PLUGIN:ApplyScrollFrameStyle(BlackMarketScrollFrameScrollBar, 4) ChangeTab(BlackMarketFrame.ColumnName) ChangeTab(BlackMarketFrame.ColumnLevel) @@ -70,7 +70,7 @@ local function BlackMarketStyle() if not u.styled then u:RemoveTextures() u:SetButtonTemplate() - STYLE:ApplyItemButtonStyle(u.Item) + PLUGIN:ApplyItemButtonStyle(u.Item) u.styled = true end if v <= t then @@ -82,7 +82,7 @@ local function BlackMarketStyle() end end) BlackMarketFrame.HotDeal:RemoveTextures() - STYLE:ApplyItemButtonStyle(BlackMarketFrame.HotDeal.Item) + PLUGIN:ApplyItemButtonStyle(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 @@ -92,7 +92,7 @@ local function BlackMarketStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle("Blizzard_BlackMarketUI",BlackMarketStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_BlackMarketUI",BlackMarketStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/calendar.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/calendar.lua index 9a999ed..c1c40a6 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/calendar.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/calendar.lua @@ -22,8 +22,8 @@ local pairs = _G.pairs; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -37,20 +37,20 @@ local CalendarButtons = { }; --[[ ########################################################## -CALENDAR STYLER +CALENDAR PLUGINR ########################################################## ]]-- local function CalendarStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.calendar ~= true then + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.calendar ~= true then return end - STYLE:ApplyWindowStyle(CalendarFrame) + PLUGIN:ApplyWindowStyle(CalendarFrame) - STYLE:ApplyCloseButtonStyle(CalendarCloseButton) + PLUGIN:ApplyCloseButtonStyle(CalendarCloseButton) CalendarCloseButton:SetPoint("TOPRIGHT", CalendarFrame, "TOPRIGHT", -4, -4) - STYLE:ApplyPaginationStyle(CalendarPrevMonthButton) - STYLE:ApplyPaginationStyle(CalendarNextMonthButton) + PLUGIN:ApplyPaginationStyle(CalendarPrevMonthButton) + PLUGIN:ApplyPaginationStyle(CalendarNextMonthButton) do local cfframe = _G["CalendarFilterFrame"]; @@ -64,7 +64,7 @@ local function CalendarStyle() if(cfbutton) then cfbutton:ClearAllPoints() cfbutton:SetPoint("RIGHT", cfframe, "RIGHT", -10, 3) - STYLE:ApplyPaginationStyle(cfbutton, true) + PLUGIN:ApplyPaginationStyle(cfbutton, true) cfframe.Panel:SetPoint("TOPLEFT", 20, 2) cfframe.Panel:SetPoint("BOTTOMRIGHT", cfbutton, "BOTTOMRIGHT", 2, -2) @@ -108,15 +108,15 @@ local function CalendarStyle() CalendarCreateEventInviteList:SetFixedPanelTemplate("Default") CalendarCreateEventInviteEdit:SetEditboxTemplate() CalendarCreateEventTitleEdit:SetEditboxTemplate() - STYLE:ApplyDropdownStyle(CalendarCreateEventTypeDropDown, 120) + PLUGIN:ApplyDropdownStyle(CalendarCreateEventTypeDropDown, 120) CalendarCreateEventDescriptionContainer:RemoveTextures() CalendarCreateEventDescriptionContainer:SetFixedPanelTemplate("Default") - STYLE:ApplyCloseButtonStyle(CalendarCreateEventCloseButton) + PLUGIN:ApplyCloseButtonStyle(CalendarCreateEventCloseButton) CalendarCreateEventLockEventCheck:SetCheckboxTemplate(true) - STYLE:ApplyDropdownStyle(CalendarCreateEventHourDropDown, 68) - STYLE:ApplyDropdownStyle(CalendarCreateEventMinuteDropDown, 68) - STYLE:ApplyDropdownStyle(CalendarCreateEventAMPMDropDown, 68) - STYLE:ApplyDropdownStyle(CalendarCreateEventRepeatOptionDropDown, 120) + PLUGIN:ApplyDropdownStyle(CalendarCreateEventHourDropDown, 68) + PLUGIN:ApplyDropdownStyle(CalendarCreateEventMinuteDropDown, 68) + PLUGIN:ApplyDropdownStyle(CalendarCreateEventAMPMDropDown, 68) + PLUGIN: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 @@ -141,7 +141,7 @@ local function CalendarStyle() CalendarTexturePickerFrame:RemoveTextures() CalendarTexturePickerTitleFrame:RemoveTextures() CalendarTexturePickerFrame:SetFixedPanelTemplate("Transparent", true) - STYLE:ApplyScrollFrameStyle(CalendarTexturePickerScrollBar) + PLUGIN:ApplyScrollFrameStyle(CalendarTexturePickerScrollBar) CalendarTexturePickerAcceptButton:SetButtonTemplate() CalendarTexturePickerCancelButton:SetButtonTemplate() CalendarCreateEventInviteButton:SetButtonTemplate() @@ -149,21 +149,21 @@ local function CalendarStyle() CalendarMassInviteFrame:RemoveTextures() CalendarMassInviteFrame:SetFixedPanelTemplate("Transparent", true) CalendarMassInviteTitleFrame:RemoveTextures() - STYLE:ApplyCloseButtonStyle(CalendarMassInviteCloseButton) + PLUGIN:ApplyCloseButtonStyle(CalendarMassInviteCloseButton) CalendarMassInviteGuildAcceptButton:SetButtonTemplate() - STYLE:ApplyDropdownStyle(CalendarMassInviteGuildRankMenu, 130) + PLUGIN:ApplyDropdownStyle(CalendarMassInviteGuildRankMenu, 130) CalendarMassInviteGuildMinLevelEdit:SetEditboxTemplate() CalendarMassInviteGuildMaxLevelEdit:SetEditboxTemplate() CalendarViewRaidFrame:RemoveTextures() CalendarViewRaidFrame:SetFixedPanelTemplate("Transparent", true) CalendarViewRaidFrame:SetPoint("TOPLEFT", CalendarFrame, "TOPRIGHT", 3, -24) CalendarViewRaidTitleFrame:RemoveTextures() - STYLE:ApplyCloseButtonStyle(CalendarViewRaidCloseButton) + PLUGIN:ApplyCloseButtonStyle(CalendarViewRaidCloseButton) CalendarViewHolidayFrame:RemoveTextures(true) CalendarViewHolidayFrame:SetFixedPanelTemplate("Transparent", true) CalendarViewHolidayFrame:SetPoint("TOPLEFT", CalendarFrame, "TOPRIGHT", 3, -24) CalendarViewHolidayTitleFrame:RemoveTextures() - STYLE:ApplyCloseButtonStyle(CalendarViewHolidayCloseButton) + PLUGIN:ApplyCloseButtonStyle(CalendarViewHolidayCloseButton) CalendarViewEventFrame:RemoveTextures() CalendarViewEventFrame:SetFixedPanelTemplate("Transparent", true) CalendarViewEventFrame:SetPoint("TOPLEFT", CalendarFrame, "TOPRIGHT", 3, -24) @@ -173,23 +173,23 @@ local function CalendarStyle() CalendarViewEventInviteList:RemoveTextures() CalendarViewEventInviteList:SetFixedPanelTemplate("Transparent", true) CalendarViewEventInviteListSection:RemoveTextures() - STYLE:ApplyCloseButtonStyle(CalendarViewEventCloseButton) - STYLE:ApplyScrollFrameStyle(CalendarViewEventInviteListScrollFrameScrollBar) + PLUGIN:ApplyCloseButtonStyle(CalendarViewEventCloseButton) + PLUGIN:ApplyScrollFrameStyle(CalendarViewEventInviteListScrollFrameScrollBar) for _,btn in pairs(CalendarButtons)do _G[btn]:SetButtonTemplate() end CalendarEventPickerFrame:RemoveTextures() CalendarEventPickerTitleFrame:RemoveTextures() CalendarEventPickerFrame:SetFixedPanelTemplate("Transparent", true) - STYLE:ApplyScrollFrameStyle(CalendarEventPickerScrollBar) + PLUGIN:ApplyScrollFrameStyle(CalendarEventPickerScrollBar) CalendarEventPickerCloseButton:SetButtonTemplate() - STYLE:ApplyScrollFrameStyle(CalendarCreateEventDescriptionScrollFrameScrollBar) - STYLE:ApplyScrollFrameStyle(CalendarCreateEventInviteListScrollFrameScrollBar) - STYLE:ApplyScrollFrameStyle(CalendarViewEventDescriptionScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(CalendarCreateEventDescriptionScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(CalendarCreateEventInviteListScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(CalendarViewEventDescriptionScrollFrameScrollBar) end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle("Blizzard_Calendar",CalendarStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_Calendar",CalendarStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/challenges.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/challenges.lua index a3e6805..24995dc 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/challenges.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/challenges.lua @@ -20,15 +20,15 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## -CHALLENGES UI STYLER +CHALLENGES UI PLUGINR ########################################################## ]]-- local function ChallengesFrameStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.lfg ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.lfg ~= true then return end ChallengesFrameInset:RemoveTextures() ChallengesFrameInsetBg:Hide() ChallengesFrameDetails.bg:Hide() @@ -60,7 +60,7 @@ local function ChallengesFrameStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle("Blizzard_ChallengesUI",ChallengesFrameStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_ChallengesUI",ChallengesFrameStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/character.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/character.lua index 5fa7f77..fe96f80 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/character.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/character.lua @@ -22,8 +22,8 @@ local pairs = _G.pairs; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -183,21 +183,21 @@ local function Reputation_OnShow() end --[[ ########################################################## -CHARACTERFRAME STYLER +CHARACTERFRAME PLUGINR ########################################################## ]]-- local function CharacterFrameStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.character ~= true then + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.character ~= true then return end - STYLE:ApplyWindowStyle(CharacterFrame, true) + PLUGIN:ApplyWindowStyle(CharacterFrame, true) - STYLE:ApplyCloseButtonStyle(CharacterFrameCloseButton) - STYLE:ApplyScrollFrameStyle(CharacterStatsPaneScrollBar) - STYLE:ApplyScrollFrameStyle(ReputationListScrollFrameScrollBar) - STYLE:ApplyScrollFrameStyle(TokenFrameContainerScrollBar) - STYLE:ApplyScrollFrameStyle(GearManagerDialogPopupScrollFrameScrollBar) + PLUGIN:ApplyCloseButtonStyle(CharacterFrameCloseButton) + PLUGIN:ApplyScrollFrameStyle(CharacterStatsPaneScrollBar) + PLUGIN:ApplyScrollFrameStyle(ReputationListScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(TokenFrameContainerScrollBar) + PLUGIN:ApplyScrollFrameStyle(GearManagerDialogPopupScrollFrameScrollBar) for _,slotName in pairs(CharacterSlotNames) do local charSlot = _G["Character"..slotName] @@ -223,7 +223,7 @@ local function CharacterFrameStyle() StyleCharacterSlots() CharacterFrameExpandButton:Size(CharacterFrameExpandButton:GetWidth() - 7, CharacterFrameExpandButton:GetHeight() - 7) - STYLE:ApplyPaginationStyle(CharacterFrameExpandButton) + PLUGIN:ApplyPaginationStyle(CharacterFrameExpandButton) hooksecurefunc('CharacterFrame_Collapse', function() CharacterFrameExpandButton:SetNormalTexture(nil) @@ -245,8 +245,8 @@ local function CharacterFrameStyle() SquareButton_SetIcon(CharacterFrameExpandButton, 'LEFT') end - STYLE:ApplyCloseButtonStyle(ReputationDetailCloseButton) - STYLE:ApplyCloseButtonStyle(TokenFramePopupCloseButton) + PLUGIN:ApplyCloseButtonStyle(ReputationDetailCloseButton) + PLUGIN:ApplyCloseButtonStyle(TokenFramePopupCloseButton) ReputationDetailAtWarCheckBox:SetCheckboxTemplate(true) ReputationDetailMainScreenCheckBox:SetCheckboxTemplate(true) ReputationDetailInactiveCheckBox:SetCheckboxTemplate(true) @@ -257,8 +257,8 @@ local function CharacterFrameStyle() EquipmentFlyoutFrame:HookScript("OnShow", EquipmentFlyout_OnShow) hooksecurefunc("EquipmentFlyout_Show", EquipmentFlyout_OnShow) CharacterFramePortrait:Die() - STYLE:ApplyScrollFrameStyle(_G["PaperDollTitlesPaneScrollBar"], 5) - STYLE:ApplyScrollFrameStyle(_G["PaperDollEquipmentManagerPaneScrollBar"], 5) + PLUGIN:ApplyScrollFrameStyle(_G["PaperDollTitlesPaneScrollBar"], 5) + PLUGIN:ApplyScrollFrameStyle(_G["PaperDollEquipmentManagerPaneScrollBar"], 5) for _,btn in pairs(CharFrameList)do _G[btn]:RemoveTextures(true) end @@ -334,7 +334,7 @@ local function CharacterFrameStyle() end) for i = 1, 4 do - STYLE:ApplyTabStyle(_G["CharacterFrameTab"..i]) + PLUGIN:ApplyTabStyle(_G["CharacterFrameTab"..i]) end hooksecurefunc("PaperDollFrame_UpdateSidebarTabs", PaperDoll_UpdateTabs) @@ -383,7 +383,7 @@ local function CharacterFrameStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(CharacterFrameStyle) \ No newline at end of file +PLUGIN:SaveCustomStyle(CharacterFrameStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/chat.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/chat.lua index 6b4d917..8e68933 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/chat.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/chat.lua @@ -27,8 +27,8 @@ local ceil = math.ceil; -- Basic --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## FRAME LISTS @@ -357,11 +357,11 @@ local ChatConfigBackgroundFrame_OnShow = function(self) end --[[ ########################################################## -CHAT STYLER +CHAT PLUGINR ########################################################## ]]-- local function ChatStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.chat ~= true then + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.chat ~= true then return end @@ -444,7 +444,7 @@ local function ChatStyle() for i = 1, #COMBAT_CONFIG_TABS do local this = _G["CombatConfigTab"..i] if(this) then - STYLE:ApplyTabStyle(this) + PLUGIN:ApplyTabStyle(this) this:SetHeight(this:GetHeight()-2) this:SetWidth(ceil(this:GetWidth()+1.6)) _G["CombatConfigTab"..i.."Text"]:SetPoint("BOTTOM", 0, 10) @@ -475,8 +475,8 @@ local function ChatStyle() end end - STYLE:ApplyPaginationStyle(ChatConfigMoveFilterUpButton,true) - STYLE:ApplyPaginationStyle(ChatConfigMoveFilterDownButton,true) + PLUGIN:ApplyPaginationStyle(ChatConfigMoveFilterUpButton,true) + PLUGIN:ApplyPaginationStyle(ChatConfigMoveFilterDownButton,true) ChatConfigMoveFilterUpButton:ClearAllPoints() ChatConfigMoveFilterDownButton:ClearAllPoints() @@ -496,7 +496,7 @@ local function ChatStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(ChatStyle) \ No newline at end of file +PLUGIN:SaveCustomStyle(ChatStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/dressup.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/dressup.lua index df512dd..b9b3c6e 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/dressup.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/dressup.lua @@ -20,19 +20,19 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## -DRESSUP STYLER +DRESSUP PLUGINR ########################################################## ]]-- local function DressUpStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.dressingroom ~= true then + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.dressingroom ~= true then return end - STYLE:ApplyWindowStyle(DressUpFrame, true, true) + PLUGIN:ApplyWindowStyle(DressUpFrame, true, true) DressUpModel:ClearAllPoints() DressUpModel:SetPoint("TOPLEFT", DressUpFrame, "TOPLEFT", 12, -76) @@ -46,11 +46,11 @@ local function DressUpStyle() DressUpFrameResetButton:Point("RIGHT", DressUpFrameCancelButton, "LEFT", -12, 0) DressUpFrameResetButton:SetButtonTemplate() - STYLE:ApplyCloseButtonStyle(DressUpFrameCloseButton, DressUpFrame.Panel) + PLUGIN:ApplyCloseButtonStyle(DressUpFrameCloseButton, DressUpFrame.Panel) end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(DressUpStyle) \ No newline at end of file +PLUGIN:SaveCustomStyle(DressUpStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/encounterjournal.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/encounterjournal.lua index 07ce3ac..8293e08 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/encounterjournal.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/encounterjournal.lua @@ -22,11 +22,11 @@ local pairs = _G.pairs; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## -ENCOUNTERJOURNAL STYLER +ENCOUNTERJOURNAL PLUGINR ########################################################## ]]-- local PVP_LOST = [[Interface\WorldMap\Skull_64Red]] @@ -107,7 +107,7 @@ local function Outline(frame, noHighlight) end local function EncounterJournalStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.encounterjournal ~= true then + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.encounterjournal ~= true then return end @@ -158,7 +158,7 @@ local function EncounterJournalStyle() EncounterJournalInstanceSelectDungeonTab:SetButtonTemplate() EncounterJournalInstanceSelectRaidTab:SetButtonTemplate() - STYLE:ApplyScrollBarStyle(EncounterJournalEncounterFrameInfoLootScrollBar) + PLUGIN:ApplyScrollBarStyle(EncounterJournalEncounterFrameInfoLootScrollBar) local bgParent = EncounterJournal.encounter.instance local loreParent = EncounterJournal.encounter.instance.loreScroll @@ -232,7 +232,7 @@ local function EncounterJournalStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle('Blizzard_EncounterJournal', EncounterJournalStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle('Blizzard_EncounterJournal', EncounterJournalStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/friends.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/friends.lua index bfa7b46..fe93f6c 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/friends.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/friends.lua @@ -22,8 +22,8 @@ local pairs = _G.pairs; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -120,24 +120,24 @@ local function ChannelList_OnUpdate() end --[[ ########################################################## -FRIENDSFRAME STYLER +FRIENDSFRAME PLUGINR ########################################################## ]]--FriendsFrameBattlenetFrameScrollFrame local function FriendsFrameStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.friends ~= true then + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.friends ~= true then return end - STYLE:ApplyWindowStyle(FriendsFrame) + PLUGIN:ApplyWindowStyle(FriendsFrame) - STYLE:ApplyScrollFrameStyle(FriendsFrameFriendsScrollFrameScrollBar, 5) - STYLE:ApplyScrollFrameStyle(WhoListScrollFrameScrollBar, 5) - STYLE:ApplyScrollFrameStyle(ChannelRosterScrollFrameScrollBar, 5) - STYLE:ApplyScrollFrameStyle(FriendsFriendsScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(FriendsFrameFriendsScrollFrameScrollBar, 5) + PLUGIN:ApplyScrollFrameStyle(WhoListScrollFrameScrollBar, 5) + PLUGIN:ApplyScrollFrameStyle(ChannelRosterScrollFrameScrollBar, 5) + PLUGIN:ApplyScrollFrameStyle(FriendsFriendsScrollFrameScrollBar) FriendsFrameInset:RemoveTextures() WhoFrameListInset:RemoveTextures() WhoFrameEditBoxInset:RemoveTextures() - STYLE:ApplyEditBoxStyle(WhoFrameEditBoxInset) + PLUGIN:ApplyEditBoxStyle(WhoFrameEditBoxInset) ChannelFrameRightInset:RemoveTextures() ChannelFrameLeftInset:RemoveTextures() ChannelFrameRightInset:SetFixedPanelTemplate("Inset", true) @@ -171,7 +171,7 @@ local function FriendsFrameStyle() end FriendsFrameStatusDropDown:SetPoint('TOPLEFT', FriendsTabHeader, 'TOPLEFT', 0, -27) - STYLE:ApplyDropdownStyle(FriendsFrameStatusDropDown, 70) + PLUGIN:ApplyDropdownStyle(FriendsFrameStatusDropDown, 70) FriendsFrameBattlenetFrame:RemoveTextures() FriendsFrameBattlenetFrame:SetHeight(22) FriendsFrameBattlenetFrame:SetPoint('TOPLEFT', FriendsFrameStatusDropDown, 'TOPRIGHT', 0, -1) @@ -196,7 +196,7 @@ local function FriendsFrameStyle() AddFriendFrame:SetFixedPanelTemplate("Transparent", true) ScrollOfResurrectionSelectionFrame:SetFixedPanelTemplate('Transparent') ScrollOfResurrectionSelectionFrameList:SetFixedPanelTemplate('Default') - STYLE:ApplyScrollFrameStyle(ScrollOfResurrectionSelectionFrameListScrollFrameScrollBar, 4) + PLUGIN:ApplyScrollFrameStyle(ScrollOfResurrectionSelectionFrameListScrollFrameScrollBar, 4) ScrollOfResurrectionSelectionFrameTargetEditBox:SetEditboxTemplate() FriendsFrameBroadcastInput:SetPanelTemplate("Default") ChannelFrameDaughterFrameChannelName:SetPanelTemplate("Default") @@ -219,12 +219,12 @@ local function FriendsFrameStyle() end) ChannelFrameDaughterFrame:SetBasicPanel() - STYLE:ApplyCloseButtonStyle(ChannelFrameDaughterFrameDetailCloseButton, ChannelFrameDaughterFrame) - STYLE:ApplyCloseButtonStyle(FriendsFrameCloseButton, FriendsFrame.Panel) - STYLE:ApplyDropdownStyle(WhoFrameDropDown, 150) + PLUGIN:ApplyCloseButtonStyle(ChannelFrameDaughterFrameDetailCloseButton, ChannelFrameDaughterFrame) + PLUGIN:ApplyCloseButtonStyle(FriendsFrameCloseButton, FriendsFrame.Panel) + PLUGIN:ApplyDropdownStyle(WhoFrameDropDown, 150) for i = 1, 4 do - STYLE:ApplyTabStyle(_G["FriendsFrameTab"..i]) + PLUGIN:ApplyTabStyle(_G["FriendsFrameTab"..i]) end for i = 1, 3 do @@ -243,7 +243,7 @@ local function FriendsFrameStyle() FriendsFriendsList:SetEditboxTemplate() FriendsFriendsNoteFrame:SetEditboxTemplate() - STYLE:ApplyDropdownStyle(FriendsFriendsFrameDropDown, 150) + PLUGIN:ApplyDropdownStyle(FriendsFriendsFrameDropDown, 150) BNConversationInviteDialog:RemoveTextures() BNConversationInviteDialog:SetPanelTemplate('Transparent') BNConversationInviteDialogList:RemoveTextures() @@ -266,9 +266,9 @@ local function FriendsFrameStyle() FriendsTabHeaderRecruitAFriendButtonIcon:FillInner() FriendsFrameIgnoreScrollFrame:SetFixedPanelTemplate("Inset") - STYLE:ApplyScrollFrameStyle(FriendsFrameIgnoreScrollFrameScrollBar, 4) + PLUGIN:ApplyScrollFrameStyle(FriendsFrameIgnoreScrollFrameScrollBar, 4) FriendsFramePendingScrollFrame:SetFixedPanelTemplate("Inset") - STYLE:ApplyScrollFrameStyle(FriendsFramePendingScrollFrameScrollBar, 4) + PLUGIN:ApplyScrollFrameStyle(FriendsFramePendingScrollFrameScrollBar, 4) IgnoreListFrame:RemoveTextures() PendingListFrame:RemoveTextures() ScrollOfResurrectionFrame:RemoveTextures() @@ -284,7 +284,7 @@ local function FriendsFrameStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(FriendsFrameStyle) \ No newline at end of file +PLUGIN:SaveCustomStyle(FriendsFrameStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/gossip.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/gossip.lua index d76c24a..78471b7 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/gossip.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/gossip.lua @@ -22,20 +22,23 @@ local pairs = _G.pairs; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## -GOSSIP STYLER +GOSSIP PLUGINR ########################################################## ]]-- local function GossipStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.gossip ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.gossip ~= true then return end + + PLUGIN:ApplyWindowStyle(GossipFrame, true, true) + ItemTextFrame:RemoveTextures(true) ItemTextScrollFrame:RemoveTextures() - STYLE:ApplyCloseButtonStyle(GossipFrameCloseButton) - STYLE:ApplyPaginationStyle(ItemTextPrevPageButton) - STYLE:ApplyPaginationStyle(ItemTextNextPageButton) + PLUGIN:ApplyCloseButtonStyle(GossipFrameCloseButton) + PLUGIN:ApplyPaginationStyle(ItemTextPrevPageButton) + PLUGIN: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 @@ -44,10 +47,10 @@ local function GossipStyle() end) ItemTextFrame:SetPanelTemplate("Pattern") ItemTextFrameInset:Die() - STYLE:ApplyScrollFrameStyle(ItemTextScrollFrameScrollBar) - STYLE:ApplyCloseButtonStyle(ItemTextFrameCloseButton) - local r = {"GossipFrameGreetingPanel", "GossipFrame", "GossipFrameInset", "GossipGreetingScrollFrame"} - STYLE:ApplyScrollFrameStyle(GossipGreetingScrollFrameScrollBar, 5) + PLUGIN:ApplyScrollFrameStyle(ItemTextScrollFrameScrollBar) + PLUGIN:ApplyCloseButtonStyle(ItemTextFrameCloseButton) + local r = {"GossipFrameGreetingPanel", "GossipFrameInset", "GossipGreetingScrollFrame"} + PLUGIN:ApplyScrollFrameStyle(GossipGreetingScrollFrameScrollBar, 5) for s, t in pairs(r)do _G[t]:RemoveTextures() end @@ -61,14 +64,14 @@ local function GossipStyle() _G["GossipFramePortrait"]:Die() _G["GossipFrameGreetingGoodbyeButton"]:RemoveTextures() _G["GossipFrameGreetingGoodbyeButton"]:SetButtonTemplate() - STYLE:ApplyCloseButtonStyle(GossipFrameCloseButton, GossipFrame.Panel) + PLUGIN:ApplyCloseButtonStyle(GossipFrameCloseButton, GossipFrame.Panel) NPCFriendshipStatusBar:RemoveTextures() NPCFriendshipStatusBar:SetStatusBarTexture([[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]]) NPCFriendshipStatusBar:SetPanelTemplate("Default") end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(GossipStyle) \ No newline at end of file +PLUGIN:SaveCustomStyle(GossipStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/guild.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/guild.lua index 43a78af..b12e734 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/guild.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/guild.lua @@ -26,8 +26,8 @@ local ceil, modf = math.ceil, math.modf; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -251,24 +251,24 @@ local _hook_BankTabPermissions = function(self) end --[[ ########################################################## -GUILDFRAME STYLERS +GUILDFRAME PLUGINRS ########################################################## ]]-- local function GuildBankStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.gbank ~= true then + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.gbank ~= true then return end - STYLE:ApplyWindowStyle(GuildBankFrame) + PLUGIN:ApplyWindowStyle(GuildBankFrame) GuildBankEmblemFrame:RemoveTextures(true) GuildBankMoneyFrameBackground:Die() - STYLE:ApplyScrollFrameStyle(GuildBankPopupScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(GuildBankPopupScrollFrameScrollBar) for i = 1, GuildBankFrame:GetNumChildren() do local child = select(i, GuildBankFrame:GetChildren()) if(child and child.GetPushedTexture and child:GetPushedTexture() and not child:GetName()) then - STYLE:ApplyCloseButtonStyle(child) + PLUGIN:ApplyCloseButtonStyle(child) end end @@ -333,7 +333,7 @@ local function GuildBankStyle() local baseName = ("GuildBankFrameTab%d"):format(i) local frame = _G[baseName] if(frame) then - STYLE:ApplyTabStyle(_G[baseName]) + PLUGIN:ApplyTabStyle(_G[baseName]) end end @@ -370,19 +370,19 @@ local function GuildBankStyle() end end - STYLE:ApplyScrollFrameStyle(GuildBankTransactionsScrollFrameScrollBar) - STYLE:ApplyScrollFrameStyle(GuildBankInfoScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(GuildBankTransactionsScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(GuildBankInfoScrollFrameScrollBar) end local function GuildFrameStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.guild ~= true then + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.guild ~= true then return end - STYLE:ApplyWindowStyle(GuildFrame) + PLUGIN:ApplyWindowStyle(GuildFrame) - STYLE:ApplyCloseButtonStyle(GuildMemberDetailCloseButton) - STYLE:ApplyCloseButtonStyle(GuildFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(GuildMemberDetailCloseButton) + PLUGIN:ApplyCloseButtonStyle(GuildFrameCloseButton) GuildRewardsFrameVisitText:ClearAllPoints() GuildRewardsFrameVisitText:SetPoint("TOP", GuildRewardsFrame, "TOP", 0, 30) @@ -409,7 +409,7 @@ local function GuildFrameStyle() for i = 1, 5 do local tab = _G["GuildFrameTab"..i] if(tab) then - STYLE:ApplyTabStyle(tab) + PLUGIN:ApplyTabStyle(tab) if i == 1 then tab:Point("TOPLEFT", GuildFrame, "BOTTOMLEFT", -10, 3) end @@ -431,19 +431,6 @@ local function GuildFrameStyle() GuildFactionBar.Panel:Point("TOPLEFT", GuildFactionBar.progress, "TOPLEFT", -1, 1) GuildFactionBar.Panel:Point("BOTTOMRIGHT", GuildFactionBar, "BOTTOMRIGHT", 1, 1) - if(SV.GameVersion < 60000) then - GuildLevelFrame:Die() - - GuildXPFrame:ClearAllPoints() - GuildXPFrame:Point("TOP", GuildFrame, "TOP", 0, -40) - - GuildXPBar:RemoveTextures() - GuildXPBar.progress:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]]) - GuildXPBar:SetPanelTemplate("Inset") - GuildXPBar.Panel:Point("TOPLEFT", GuildXPBar, "TOPLEFT", -1, -3) - GuildXPBar.Panel:Point("BOTTOMRIGHT", GuildXPBar, "BOTTOMRIGHT", 0, 1) - end - GuildLatestPerkButton:RemoveTextures() GuildLatestPerkButtonIconTexture:SetTexCoord(0.1, 0.9, 0.1, 0.9) GuildLatestPerkButtonIconTexture:ClearAllPoints() @@ -459,7 +446,7 @@ local function GuildFrameStyle() GuildNextPerkButton.Panel:WrapOuter(GuildNextPerkButtonIconTexture) GuildRosterContainer:SetBasicPanel(-2, 2, -1, -2) - STYLE:ApplyScrollFrameStyle(GuildRosterContainerScrollBar, 4, -4) + PLUGIN:ApplyScrollFrameStyle(GuildRosterContainerScrollBar, 4, -4) GuildRosterShowOfflineButton:SetCheckboxTemplate(true) for i = 1, 4 do @@ -469,7 +456,7 @@ local function GuildFrameStyle() end end - STYLE:ApplyDropdownStyle(GuildRosterViewDropdown, 200) + PLUGIN:ApplyDropdownStyle(GuildRosterViewDropdown, 200) for i = 1, 14 do local btn = _G["GuildRosterContainerButton"..i.."HeaderButton"] @@ -484,7 +471,7 @@ local function GuildFrameStyle() GuildMemberOfficerNoteBackground:SetBasicPanel() GuildMemberRankDropdown:SetFrameLevel(GuildMemberRankDropdown:GetFrameLevel()+5) - STYLE:ApplyDropdownStyle(GuildMemberRankDropdown, 182) + PLUGIN:ApplyDropdownStyle(GuildMemberRankDropdown, 182) GuildMemberRankDropdown.Panel:SetBackdropColor(0,0,0,1) GuildNewsFrame:RemoveTextures() GuildNewsContainer:SetBasicPanel(-2, 2, 0, -2) @@ -500,7 +487,7 @@ local function GuildFrameStyle() GuildNewsFiltersFrame:RemoveTextures() GuildNewsFiltersFrame:SetFixedPanelTemplate("Transparent", true) - STYLE:ApplyCloseButtonStyle(GuildNewsFiltersFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(GuildNewsFiltersFrameCloseButton) for i = 1, 7 do local btn = _G["GuildNewsFilterButton"..i] @@ -510,8 +497,8 @@ local function GuildFrameStyle() end GuildNewsFiltersFrame:Point("TOPLEFT", GuildFrame, "TOPRIGHT", 4, -20) - STYLE:ApplyScrollFrameStyle(GuildNewsContainerScrollBar, 4, 4) - STYLE:ApplyScrollFrameStyle(GuildInfoDetailsFrameScrollBar, 4, 4) + PLUGIN:ApplyScrollFrameStyle(GuildNewsContainerScrollBar, 4, 4) + PLUGIN:ApplyScrollFrameStyle(GuildInfoDetailsFrameScrollBar, 4, 4) for i = 1, 3 do local tab = _G["GuildInfoFrameTab"..i] @@ -537,7 +524,7 @@ local function GuildFrameStyle() GuildRecruitmentCommentInputFrame:SetFixedPanelTemplate("Default") GuildTextEditFrame:SetFixedPanelTemplate("Transparent", true) - STYLE:ApplyScrollFrameStyle(GuildTextEditScrollFrameScrollBar, 4, 4) + PLUGIN:ApplyScrollFrameStyle(GuildTextEditScrollFrameScrollBar, 4, 4) GuildTextEditContainer:SetFixedPanelTemplate("Default") local editChildren = GuildTextEditFrame:GetNumChildren() @@ -546,14 +533,14 @@ local function GuildFrameStyle() local child = select(i, GuildTextEditFrame:GetChildren()) if(child:GetName() == "GuildTextEditFrameCloseButton") then if(child:GetWidth() < 33) then - STYLE:ApplyCloseButtonStyle(child) + PLUGIN:ApplyCloseButtonStyle(child) else child:SetButtonTemplate() end end end - STYLE:ApplyScrollFrameStyle(GuildLogScrollFrameScrollBar, 4, 4) + PLUGIN:ApplyScrollFrameStyle(GuildLogScrollFrameScrollBar, 4, 4) GuildLogFrame:SetBasicPanel() local logChildren = GuildLogFrame:GetNumChildren() @@ -562,7 +549,7 @@ local function GuildFrameStyle() local child = select(i, GuildLogFrame:GetChildren()) if child:GetName() == "GuildLogFrameCloseButton" then if(child:GetWidth() < 33) then - STYLE:ApplyCloseButtonStyle(child) + PLUGIN:ApplyCloseButtonStyle(child) else child:SetButtonTemplate() end @@ -570,19 +557,19 @@ local function GuildFrameStyle() end GuildRewardsFrame:SetBasicPanel(2, 0, -22, 18) - STYLE:ApplyScrollFrameStyle(GuildRewardsContainerScrollBar, 4, -4) + PLUGIN:ApplyScrollFrameStyle(GuildRewardsContainerScrollBar, 4, -4) GuildNewPerksFrame:SetBasicPanel(-1, 0, 1, 0) GuildPerksContainer:SetBasicPanel(-3, 0, 26, -3) - STYLE:ApplyScrollFrameStyle(GuildPerksContainerScrollBar, 4, 2) + PLUGIN:ApplyScrollFrameStyle(GuildPerksContainerScrollBar, 4, 2) for i = 1, 8 do local button = _G["GuildPerksContainerButton"..i] if button then button:RemoveTextures() if button.icon then - STYLE:ApplyItemButtonStyle(button, nil, true) + PLUGIN:ApplyItemButtonStyle(button, nil, true) button.icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) button.icon:ClearAllPoints() button.icon:Point("TOPLEFT", button, "TOPLEFT", 2, -2) @@ -621,22 +608,22 @@ local function GuildFrameStyle() end local function GuildControlStyle() - if SV.db[Schema].blizzard.enable~=true or SV.db[Schema].blizzard.guildcontrol~=true then return end + if PLUGIN.db.blizzard.enable~=true or PLUGIN.db.blizzard.guildcontrol~=true then return end GuildControlUI:RemoveTextures() GuildControlUIHbar:RemoveTextures() GuildControlUIRankBankFrameInset:RemoveTextures() GuildControlUIRankBankFrameInsetScrollFrame:RemoveTextures() - STYLE:ApplyWindowStyle(GuildControlUI) + PLUGIN:ApplyWindowStyle(GuildControlUI) - STYLE:ApplyScrollFrameStyle(GuildControlUIRankBankFrameInsetScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(GuildControlUIRankBankFrameInsetScrollFrameScrollBar) hooksecurefunc("GuildControlUI_RankOrder_Update", _hook_RankOrder_OnUpdate) GuildControlUIRankOrderFrameNewButton:HookScript("OnClick", _hook_UIRankOrder) - STYLE:ApplyDropdownStyle(GuildControlUINavigationDropDown) - STYLE:ApplyDropdownStyle(GuildControlUIRankSettingsFrameRankDropDown,180) + PLUGIN:ApplyDropdownStyle(GuildControlUINavigationDropDown) + PLUGIN:ApplyDropdownStyle(GuildControlUIRankSettingsFrameRankDropDown,180) GuildControlUINavigationDropDownButton:Width(20) GuildControlUIRankSettingsFrameRankDropDownButton:Width(20) @@ -654,18 +641,18 @@ local function GuildControlStyle() hooksecurefunc("GuildControlUI_BankTabPermissions_Update", _hook_BankTabPermissions) - STYLE:ApplyDropdownStyle(GuildControlUIRankBankFrameRankDropDown, 180) + PLUGIN:ApplyDropdownStyle(GuildControlUIRankBankFrameRankDropDown, 180) GuildControlUIRankBankFrameRankDropDownButton:Width(20) end local function GuildRegistrarStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.guildregistrar ~= true then + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.guildregistrar ~= true then return end - STYLE:ApplyWindowStyle(GuildRegistrarFrame, true, true) + PLUGIN:ApplyWindowStyle(GuildRegistrarFrame, true, true) GuildRegistrarFrameInset:Die() GuildRegistrarFrameEditBox:RemoveTextures() @@ -674,7 +661,7 @@ local function GuildRegistrarStyle() GuildRegistrarFrameGoodbyeButton:SetButtonTemplate() GuildRegistrarFrameCancelButton:SetButtonTemplate() GuildRegistrarFramePurchaseButton:SetButtonTemplate() - STYLE:ApplyCloseButtonStyle(GuildRegistrarFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(GuildRegistrarFrameCloseButton) GuildRegistrarFrameEditBox:SetEditboxTemplate() for b = 1, GuildRegistrarFrameEditBox:GetNumRegions()do @@ -700,9 +687,9 @@ local function GuildRegistrarStyle() end local function LFGuildFrameStyle() - if(SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.lfguild ~= true) then return end + if(PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.lfguild ~= true) then return end - STYLE:ApplyWindowStyle(LookingForGuildFrame, true) + PLUGIN:ApplyWindowStyle(LookingForGuildFrame, true) for i = 1, #LFGFrameList do local check = _G[LFGFrameList[i]] @@ -716,11 +703,11 @@ local function LFGuildFrameStyle() LookingForGuildBrowseButton_LeftSeparator:Die() LookingForGuildRequestButton_RightSeparator:Die() - STYLE:ApplyScrollFrameStyle(LookingForGuildBrowseFrameContainerScrollBar) + PLUGIN:ApplyScrollFrameStyle(LookingForGuildBrowseFrameContainerScrollBar) LookingForGuildBrowseButton:SetButtonTemplate() LookingForGuildRequestButton:SetButtonTemplate() - STYLE:ApplyCloseButtonStyle(LookingForGuildFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(LookingForGuildFrameCloseButton) LookingForGuildCommentInputFrame:SetPanelTemplate("Default") LookingForGuildCommentInputFrame:RemoveTextures(false) @@ -733,7 +720,7 @@ local function LFGuildFrameStyle() for u = 1, 3 do local tab = _G["LookingForGuildFrameTab"..u] - STYLE:ApplyTabStyle(tab) + PLUGIN:ApplyTabStyle(tab) tab:SetFrameStrata("HIGH") tab:SetFrameLevel(99) end @@ -747,11 +734,11 @@ local function LFGuildFrameStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -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 +PLUGIN:SaveBlizzardStyle("Blizzard_GuildBankUI",GuildBankStyle) +PLUGIN:SaveBlizzardStyle("Blizzard_GuildUI",GuildFrameStyle) +PLUGIN:SaveBlizzardStyle("Blizzard_GuildControlUI",GuildControlStyle) +PLUGIN:SaveCustomStyle(GuildRegistrarStyle) +PLUGIN:SaveBlizzardStyle("Blizzard_LookingForGuildUI",LFGuildFrameStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/help.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/help.lua index 9b05609..a79059b 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/help.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/help.lua @@ -21,8 +21,8 @@ local tinsert = _G.tinsert; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -66,11 +66,11 @@ local function NavBarHelper(button) end --[[ ########################################################## -HELPFRAME STYLER +HELPFRAME PLUGINR ########################################################## ]]-- local function HelpFrameStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.help ~= true then + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.help ~= true then return end tinsert(HelpFrameButtonList, "HelpFrameButton16") @@ -92,7 +92,7 @@ local function HelpFrameStyle() e:RemoveTextures() end end - STYLE:ApplyScrollFrameStyle(HelpFrameReportBugScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(HelpFrameReportBugScrollFrameScrollBar) HelpFrameSubmitSuggestionScrollFrame:RemoveTextures() HelpFrameSubmitSuggestionScrollFrame:SetPanelTemplate("Default") HelpFrameSubmitSuggestionScrollFrame.Panel:Point("TOPLEFT", -4, 4) @@ -103,7 +103,7 @@ local function HelpFrameStyle() e:RemoveTextures() end end - STYLE:ApplyScrollFrameStyle(HelpFrameSubmitSuggestionScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(HelpFrameSubmitSuggestionScrollFrameScrollBar) HelpFrameTicketScrollFrame:RemoveTextures() HelpFrameTicketScrollFrame:SetPanelTemplate("Default") HelpFrameTicketScrollFrame.Panel:Point("TOPLEFT", -4, 4) @@ -114,7 +114,7 @@ local function HelpFrameStyle() e:RemoveTextures() end end - STYLE:ApplyScrollFrameStyle(HelpFrameKnowledgebaseScrollFrame2ScrollBar) + PLUGIN:ApplyScrollFrameStyle(HelpFrameKnowledgebaseScrollFrame2ScrollBar) for d = 1, #HelpFrameButtonList do _G[HelpFrameButtonList[d]]:RemoveTextures(true) _G[HelpFrameButtonList[d]]:SetButtonTemplate() @@ -143,10 +143,10 @@ local function HelpFrameStyle() HelpFrame:RemoveTextures(true) HelpFrame:SetPanelTemplate("Halftone") HelpFrameKnowledgebaseSearchBox:SetEditboxTemplate() - STYLE:ApplyScrollFrameStyle(HelpFrameKnowledgebaseScrollFrameScrollBar, 5) - STYLE:ApplyScrollFrameStyle(HelpFrameTicketScrollFrameScrollBar, 4) - STYLE:ApplyCloseButtonStyle(HelpFrameCloseButton, HelpFrame.Panel) - STYLE:ApplyCloseButtonStyle(HelpFrameKnowledgebaseErrorFrameCloseButton, HelpFrameKnowledgebaseErrorFrame.Panel) + PLUGIN:ApplyScrollFrameStyle(HelpFrameKnowledgebaseScrollFrameScrollBar, 5) + PLUGIN:ApplyScrollFrameStyle(HelpFrameTicketScrollFrameScrollBar, 4) + PLUGIN:ApplyCloseButtonStyle(HelpFrameCloseButton, HelpFrame.Panel) + PLUGIN:ApplyCloseButtonStyle(HelpFrameKnowledgebaseErrorFrameCloseButton, HelpFrameKnowledgebaseErrorFrame.Panel) HelpFrameCharacterStuckHearthstone:SetButtonTemplate() HelpFrameCharacterStuckHearthstone:SetFixedPanelTemplate("Default") HelpFrameCharacterStuckHearthstone.IconTexture:FillInner() @@ -175,7 +175,7 @@ local function HelpFrameStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(HelpFrameStyle) \ No newline at end of file +PLUGIN:SaveCustomStyle(HelpFrameStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/inspect.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/inspect.lua index 24543de..56889c8 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/inspect.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/inspect.lua @@ -22,8 +22,8 @@ local pairs = _G.pairs; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -51,19 +51,19 @@ local InspectSlotList = { }; --[[ ########################################################## -INSPECT UI STYLER +INSPECT UI PLUGINR ########################################################## ]]-- local function InspectStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.inspect ~= true then + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.inspect ~= true then return end InspectFrame:RemoveTextures(true) InspectFrameInset:RemoveTextures(true) InspectFrame:SetPanelTemplate('Action') - STYLE:ApplyCloseButtonStyle(InspectFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(InspectFrameCloseButton) for d = 1, 4 do - STYLE:ApplyTabStyle(_G["InspectFrameTab"..d]) + PLUGIN:ApplyTabStyle(_G["InspectFrameTab"..d]) end InspectModelFrameBorderTopLeft:Die() InspectModelFrameBorderTopRight:Die() @@ -101,7 +101,7 @@ local function InspectStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle("Blizzard_InspectUI",InspectStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_InspectUI",InspectStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/itemsocketing.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/itemsocketing.lua index a81c81d..ab6da42 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/itemsocketing.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/itemsocketing.lua @@ -20,21 +20,21 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## -ITEMSOCKETING STYLER +ITEMSOCKETING PLUGINR ########################################################## ]]-- local function ItemSocketStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.socket ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.socket ~= true then return end ItemSocketingFrame:RemoveTextures() ItemSocketingFrame:SetPanelTemplate("Action") ItemSocketingFrameInset:Die() ItemSocketingScrollFrame:RemoveTextures() ItemSocketingScrollFrame:SetPanelTemplate("Inset", true) - STYLE:ApplyScrollFrameStyle(ItemSocketingScrollFrameScrollBar, 2) + PLUGIN:ApplyScrollFrameStyle(ItemSocketingScrollFrameScrollBar, 2) for j = 1, MAX_NUM_SOCKETS do local i = _G[("ItemSocketingSocket%d"):format(j)]; local C = _G[("ItemSocketingSocket%dBracketFrame"):format(j)]; @@ -62,11 +62,11 @@ local function ItemSocketStyle() ItemSocketingSocketButton:ClearAllPoints() ItemSocketingSocketButton:Point("BOTTOMRIGHT", ItemSocketingFrame, "BOTTOMRIGHT", -5, 5) ItemSocketingSocketButton:SetButtonTemplate() - STYLE:ApplyCloseButtonStyle(ItemSocketingFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(ItemSocketingFrameCloseButton) end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle("Blizzard_ItemSocketingUI",ItemSocketStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_ItemSocketingUI",ItemSocketStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/itemupgrade.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/itemupgrade.lua index d6d8d32..ff5a0c5 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/itemupgrade.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/itemupgrade.lua @@ -20,21 +20,21 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## -ITEMUPGRADE UI STYLER +ITEMUPGRADE UI PLUGINR ########################################################## ]]-- local function ItemUpgradeStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.itemUpgrade ~= true then + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.itemUpgrade ~= true then return end - STYLE:ApplyWindowStyle(ItemUpgradeFrame, true) + PLUGIN:ApplyWindowStyle(ItemUpgradeFrame, true) - STYLE:ApplyCloseButtonStyle(ItemUpgradeFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(ItemUpgradeFrameCloseButton) ItemUpgradeFrameUpgradeButton:RemoveTextures() ItemUpgradeFrameUpgradeButton:SetButtonTemplate() ItemUpgradeFrame.ItemButton:RemoveTextures() @@ -54,7 +54,7 @@ local function ItemUpgradeStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle("Blizzard_ItemUpgradeUI",ItemUpgradeStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_ItemUpgradeUI",ItemUpgradeStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/keybinding.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/keybinding.lua index d7f88b7..62e6577 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/keybinding.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/keybinding.lua @@ -22,11 +22,11 @@ local pairs = _G.pairs; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## -KEYBINDING STYLER +KEYBINDING PLUGINR ########################################################## ]]-- local BindButtons = { @@ -37,7 +37,7 @@ local BindButtons = { } local function BindingStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.binding ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.binding ~= true then return end for _, gName in pairs(BindButtons)do local btn = _G[gName] @@ -61,13 +61,13 @@ local function BindingStyle() end end - STYLE:ApplyScrollFrameStyle(KeyBindingFrameScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(KeyBindingFrameScrollFrameScrollBar) KeyBindingFrame:RemoveTextures() KeyBindingFrame:SetPanelTemplate("Halftone") end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle("Blizzard_BindingUI", BindingStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_BindingUI", BindingStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lfd.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lfd.lua index a5cd206..84a2f06 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lfd.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lfd.lua @@ -22,8 +22,8 @@ local pairs = _G.pairs; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -119,13 +119,13 @@ local ScenarioQueueRandom_OnUpdate = function() end --[[ ########################################################## -LFD STYLER +LFD PLUGINR ########################################################## ]]-- local function LFDFrameStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.lfg ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.lfg ~= true then return end - STYLE:ApplyWindowStyle(PVEFrame, true) + PLUGIN:ApplyWindowStyle(PVEFrame, true) PVEFrameLeftInset:RemoveTextures() RaidFinderQueueFrame:RemoveTextures(true) @@ -143,7 +143,7 @@ local function LFDFrameStyle() LFDQueueFrameRandomScrollFrameChildFrameBonusRepFrame.ChooseButton:SetButtonTemplate() ScenarioQueueFrameRandomScrollFrameChildFrameBonusRepFrame.ChooseButton:SetButtonTemplate() - STYLE:ApplyScrollFrameStyle(ScenarioQueueFrameRandomScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(ScenarioQueueFrameRandomScrollFrameScrollBar) GroupFinderFrameGroupButton1.icon:SetTexture("Interface\\Icons\\INV_Helmet_08") GroupFinderFrameGroupButton2.icon:SetTexture("Interface\\Icons\\inv_helmet_06") @@ -153,7 +153,7 @@ local function LFDFrameStyle() LFGDungeonReadyDialogBackground:Die() LFGDungeonReadyDialogEnterDungeonButton:SetButtonTemplate() LFGDungeonReadyDialogLeaveQueueButton:SetButtonTemplate() - STYLE:ApplyCloseButtonStyle(LFGDungeonReadyDialogCloseButton) + PLUGIN:ApplyCloseButtonStyle(LFGDungeonReadyDialogCloseButton) LFGDungeonReadyDialog:RemoveTextures() LFGDungeonReadyDialog:SetPanelTemplate("Pattern", true, 2, 4, 4) @@ -189,7 +189,7 @@ local function LFDFrameStyle() LFDQueueFrameRoleButtonHealer.shortageBorder:Die() LFGDungeonReadyDialog.filigree:SetAlpha(0) LFGDungeonReadyDialog.bottomArt:SetAlpha(0) - STYLE:ApplyCloseButtonStyle(LFGDungeonReadyStatusCloseButton) + PLUGIN:ApplyCloseButtonStyle(LFGDungeonReadyStatusCloseButton) for _,name in pairs(LFDFrameList) do local frame = _G[name]; @@ -263,11 +263,11 @@ local function LFDFrameStyle() end for u = 1, 2 do - STYLE:ApplyTabStyle(_G['PVEFrameTab'..u]) + PLUGIN:ApplyTabStyle(_G['PVEFrameTab'..u]) end PVEFrameTab1:SetPoint('BOTTOMLEFT', PVEFrame, 'BOTTOMLEFT', 19, -31) - STYLE:ApplyCloseButtonStyle(PVEFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(PVEFrameCloseButton) LFDParentFrame:RemoveTextures() LFDQueueFrameFindGroupButton:RemoveTextures() LFDParentFrameInset:RemoveTextures() @@ -285,7 +285,7 @@ local function LFDFrameStyle() end end) - STYLE:ApplyDropdownStyle(LFDQueueFrameTypeDropDown) + PLUGIN:ApplyDropdownStyle(LFDQueueFrameTypeDropDown) RaidFinderFrame:RemoveTextures() RaidFinderFrameBottomInset:RemoveTextures() @@ -295,7 +295,7 @@ local function LFDFrameStyle() RaidFinderFrameBottomInsetBg:Hide() RaidFinderFrameBtnCornerRight:Hide() RaidFinderFrameButtonBottomBorder:Hide() - STYLE:ApplyDropdownStyle(RaidFinderQueueFrameSelectionDropDown) + PLUGIN:ApplyDropdownStyle(RaidFinderQueueFrameSelectionDropDown) RaidFinderFrameFindRaidButton:RemoveTextures() RaidFinderFrameFindRaidButton:SetButtonTemplate() RaidFinderQueueFrame:RemoveTextures() @@ -337,7 +337,7 @@ local function LFDFrameStyle() hooksecurefunc("ScenarioQueueFrameRandom_UpdateFrame", ScenarioQueueRandom_OnUpdate) ScenarioQueueFrameFindGroupButton:RemoveTextures() ScenarioQueueFrameFindGroupButton:SetButtonTemplate() - STYLE:ApplyDropdownStyle(ScenarioQueueFrameTypeDropDown) + PLUGIN:ApplyDropdownStyle(ScenarioQueueFrameTypeDropDown) LFRBrowseFrameRoleInset:DisableDrawLayer("BORDER") RaidBrowserFrameBg:Hide() LFRQueueFrameSpecificListScrollFrameScrollBackgroundTopLeft:Hide() @@ -351,15 +351,15 @@ local function LFDFrameStyle() end RaidBrowserFrame:SetPanelTemplate('Pattern') - STYLE:ApplyCloseButtonStyle(RaidBrowserFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(RaidBrowserFrameCloseButton) LFRQueueFrameFindGroupButton:SetButtonTemplate() LFRQueueFrameAcceptCommentButton:SetButtonTemplate() - STYLE:ApplyScrollFrameStyle(LFRQueueFrameCommentScrollFrameScrollBar) - STYLE:ApplyScrollFrameStyle(LFDQueueFrameSpecificListScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(LFRQueueFrameCommentScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(LFDQueueFrameSpecificListScrollFrameScrollBar) RaidBrowserFrame:HookScript('OnShow', function() if not LFRQueueFrameSpecificListScrollFrameScrollBar.styled then - STYLE:ApplyScrollFrameStyle(LFRQueueFrameSpecificListScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(LFRQueueFrameSpecificListScrollFrameScrollBar) LFRBrowseFrame:RemoveTextures() for u = 1, 2 do local C = _G['LFRParentFrameSideTab'..u] @@ -385,7 +385,7 @@ local function LFDFrameStyle() local C = _G['LFRBrowseFrameColumnHeader'..u] C:DisableDrawLayer('BACKGROUND') end - STYLE:ApplyDropdownStyle(LFRBrowseFrameRaidDropDown) + PLUGIN:ApplyDropdownStyle(LFRBrowseFrameRaidDropDown) LFRBrowseFrameRefreshButton:SetButtonTemplate() LFRBrowseFrameInviteButton:SetButtonTemplate() LFRBrowseFrameSendMessageButton:SetButtonTemplate() @@ -405,8 +405,8 @@ local function LFDFrameStyle() _G[ScenarioQueueFrame.PartyBackfill:GetName().."BackfillButton"]:SetButtonTemplate() _G[ScenarioQueueFrame.PartyBackfill:GetName().."NoBackfillButton"]:SetButtonTemplate() - STYLE:ApplyScrollFrameStyle(LFDQueueFrameRandomScrollFrameScrollBar) - STYLE:ApplyScrollFrameStyle(ScenarioQueueFrameSpecificScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(LFDQueueFrameRandomScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(ScenarioQueueFrameSpecificScrollFrameScrollBar) LFDQueueFrameRandomScrollFrame:SetBasicPanel() ScenarioQueueFrameRandomScrollFrame:SetBasicPanel() RaidFinderQueueFrameScrollFrame:SetBasicPanel() @@ -431,7 +431,7 @@ local function LFDFrameStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(LFDFrameStyle) \ No newline at end of file +PLUGIN:SaveCustomStyle(LFDFrameStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/loothistory.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/loothistory.lua index 06b03ea..96cf282 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/loothistory.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/loothistory.lua @@ -23,8 +23,8 @@ local ceil = math.ceil; -- Basic --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -35,7 +35,7 @@ local MissingLootFrame_OnShow = function(self) for i = 1, numMissing do local slot = _G["MissingLootFrameItem"..i] local icon = slot.icon; - STYLE:ApplyItemButtonStyle(slot, true) + PLUGIN:ApplyItemButtonStyle(slot, true) local texture, name, count, quality = GetMissingLootItemInfo(i); local r,g,b,hex = GetItemQualityColor(quality) if(not r) then @@ -87,7 +87,7 @@ local _hook_MasterLootFrame_OnShow = function() if child and not child.isStyled and not child:GetName() then if child:GetObjectType() == "Button" then if child:GetPushedTexture() then - STYLE:ApplyCloseButtonStyle(child) + PLUGIN:ApplyCloseButtonStyle(child) else child:SetFixedPanelTemplate() child:SetButtonTemplate() @@ -99,11 +99,11 @@ local _hook_MasterLootFrame_OnShow = function() end --[[ ########################################################## -LOOTHISTORY STYLER +LOOTHISTORY PLUGINR ########################################################## ]]-- local function LootHistoryStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.loot ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.loot ~= true then return end local MasterLooterFrame = _G.MasterLooterFrame; local MissingLootFrame = _G.MissingLootFrame; @@ -116,13 +116,13 @@ local function LootHistoryStyle() MissingLootFrame:RemoveTextures() MissingLootFrame:SetPanelTemplate("Pattern") - STYLE:ApplyCloseButtonStyle(MissingLootFramePassButton) + PLUGIN:ApplyCloseButtonStyle(MissingLootFramePassButton) hooksecurefunc("MissingLootFrame_Show", MissingLootFrame_OnShow) LootHistoryFrame:RemoveTextures() - STYLE:ApplyCloseButtonStyle(LootHistoryFrame.CloseButton) + PLUGIN:ApplyCloseButtonStyle(LootHistoryFrame.CloseButton) LootHistoryFrame:RemoveTextures() LootHistoryFrame:SetFixedPanelTemplate('Transparent') - STYLE:ApplyCloseButtonStyle(LootHistoryFrame.ResizeButton) + PLUGIN:ApplyCloseButtonStyle(LootHistoryFrame.ResizeButton) LootHistoryFrame.ResizeButton:SetFixedPanelTemplate() LootHistoryFrame.ResizeButton:Width(LootHistoryFrame:GetWidth()) LootHistoryFrame.ResizeButton:Height(19) @@ -137,7 +137,7 @@ local function LootHistoryStyle() txt:SetText("RESIZE") LootHistoryFrameScrollFrame:RemoveTextures() - STYLE:ApplyScrollFrameStyle(LootHistoryFrameScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(LootHistoryFrameScrollFrameScrollBar) hooksecurefunc("LootHistoryFrame_FullUpdate", LootHistoryFrame_OnUpdate) MasterLooterFrame:RemoveTextures() @@ -147,14 +147,14 @@ local function LootHistoryStyle() hooksecurefunc("MasterLooterFrame_Show", _hook_MasterLootFrame_OnShow) BonusRollFrame:RemoveTextures() - STYLE:ApplyAlertStyle(BonusRollFrame) + PLUGIN:ApplyAlertStyle(BonusRollFrame) BonusRollFrame.PromptFrame.Icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) BonusRollFrame.PromptFrame.Timer.Bar:SetTexture(SV.Media.bar.default) BonusRollFrame.PromptFrame.Timer.Bar:SetVertexColor(0.1, 1, 0.1) end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(LootHistoryStyle) \ No newline at end of file +PLUGIN:SaveCustomStyle(LootHistoryStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lossofcontrol.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lossofcontrol.lua index 82793a8..532dfb5 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lossofcontrol.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lossofcontrol.lua @@ -20,11 +20,11 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## -LOSSOFCONTROL STYLER +LOSSOFCONTROL PLUGINR ########################################################## ]]-- local _hook_LossOfControl = function(self, ...) @@ -48,7 +48,7 @@ local _hook_LossOfControl = function(self, ...) end local function LossOfControlStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.losscontrol ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.losscontrol ~= true then return end local IconBackdrop = CreateFrame("Frame", nil, LossOfControlFrame) IconBackdrop:WrapOuter(LossOfControlFrame.Icon) IconBackdrop:SetFrameLevel(LossOfControlFrame:GetFrameLevel()-1) @@ -62,7 +62,7 @@ local function LossOfControlStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(LossOfControlStyle) \ No newline at end of file +PLUGIN:SaveCustomStyle(LossOfControlStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/macro.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/macro.lua index b3eb9c1..29b68b4 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/macro.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/macro.lua @@ -20,8 +20,8 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -35,11 +35,11 @@ local MacroButtonList2 = { } --[[ ########################################################## -MACRO UI STYLER +MACRO UI PLUGINR ########################################################## ]]-- local function MacroUIStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.macro ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.macro ~= true then return end local MacroFrame = _G.MacroFrame; local MacroFrameCloseButton = _G.MacroFrameCloseButton; @@ -52,10 +52,10 @@ local function MacroUIStyle() local MacroFrameSelectedMacroButton = _G.MacroFrameSelectedMacroButton; local MacroFrameSelectedMacroButtonIcon = _G.MacroFrameSelectedMacroButtonIcon; - STYLE:ApplyCloseButtonStyle(MacroFrameCloseButton) - STYLE:ApplyScrollFrameStyle(MacroButtonScrollFrameScrollBar) - STYLE:ApplyScrollFrameStyle(MacroFrameScrollFrameScrollBar) - STYLE:ApplyScrollFrameStyle(MacroPopupScrollFrameScrollBar) + PLUGIN:ApplyCloseButtonStyle(MacroFrameCloseButton) + PLUGIN:ApplyScrollFrameStyle(MacroButtonScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(MacroFrameScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(MacroPopupScrollFrameScrollBar) MacroFrame:Width(360) @@ -113,7 +113,7 @@ local function MacroUIStyle() MacroEditButton:ClearAllPoints() MacroEditButton:Point("BOTTOMLEFT", MacroFrameSelectedMacroButton, "BOTTOMRIGHT", 10, 0) - STYLE:ApplyScrollFrameStyle(MacroButtonScrollFrame) + PLUGIN:ApplyScrollFrameStyle(MacroButtonScrollFrame) MacroPopupFrame:HookScript("OnShow", function(c) c:ClearAllPoints() @@ -162,7 +162,7 @@ end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle("Blizzard_MacroUI", MacroUIStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_MacroUI", MacroUIStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/mailbox.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/mailbox.lua index c05a651..4ed6ebc 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/mailbox.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/mailbox.lua @@ -20,8 +20,8 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -44,13 +44,13 @@ local function MailFrame_OnUpdate() end --[[ ########################################################## -MAILBOX STYLER +MAILBOX PLUGINR ########################################################## ]]-- local function MailBoxStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.mail ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.mail ~= true then return end - STYLE:ApplyWindowStyle(MailFrame) + PLUGIN:ApplyWindowStyle(MailFrame) for b = 1, INBOXITEMS_TO_DISPLAY do local i = _G["MailItem"..b] @@ -65,16 +65,16 @@ local function MailBoxStyle() e:SetTexCoord(0.1, 0.9, 0.1, 0.9) e:FillInner() end - STYLE:ApplyCloseButtonStyle(MailFrameCloseButton) - STYLE:ApplyPaginationStyle(InboxPrevPageButton) - STYLE:ApplyPaginationStyle(InboxNextPageButton) + PLUGIN:ApplyCloseButtonStyle(MailFrameCloseButton) + PLUGIN:ApplyPaginationStyle(InboxPrevPageButton) + PLUGIN:ApplyPaginationStyle(InboxNextPageButton) MailFrameTab1:RemoveTextures() MailFrameTab2:RemoveTextures() - STYLE:ApplyTabStyle(MailFrameTab1) - STYLE:ApplyTabStyle(MailFrameTab2) + PLUGIN:ApplyTabStyle(MailFrameTab1) + PLUGIN:ApplyTabStyle(MailFrameTab2) SendMailScrollFrame:RemoveTextures(true) SendMailScrollFrame:SetFixedPanelTemplate("Inset") - STYLE:ApplyScrollFrameStyle(SendMailScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(SendMailScrollFrameScrollBar) SendMailNameEditBox:SetEditboxTemplate() SendMailSubjectEditBox:SetEditboxTemplate() SendMailMoneyGold:SetEditboxTemplate() @@ -103,7 +103,7 @@ local function MailBoxStyle() OpenMailFrame:RemoveTextures(true) OpenMailFrame:SetFixedPanelTemplate("Transparent", true) OpenMailFrameInset:Die() - STYLE:ApplyCloseButtonStyle(OpenMailFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(OpenMailFrameCloseButton) OpenMailReportSpamButton:SetButtonTemplate() OpenMailReplyButton:SetButtonTemplate() OpenMailDeleteButton:SetButtonTemplate() @@ -112,7 +112,7 @@ local function MailBoxStyle() MailFrameInset:Die() OpenMailScrollFrame:RemoveTextures(true) OpenMailScrollFrame:SetFixedPanelTemplate("Default") - STYLE:ApplyScrollFrameStyle(OpenMailScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(OpenMailScrollFrameScrollBar) SendMailBodyEditBox:SetTextColor(1, 1, 1) OpenMailBodyText:SetTextColor(1, 1, 1) InvoiceTextFontNormal:SetTextColor(1, 1, 1) @@ -143,7 +143,7 @@ local function MailBoxStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(MailBoxStyle) \ No newline at end of file +PLUGIN:SaveCustomStyle(MailBoxStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/merchant.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/merchant.lua index 532e3bc..95a6525 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/merchant.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/merchant.lua @@ -20,15 +20,15 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## -FRAME STYLER +FRAME PLUGINR ########################################################## ]]-- local function MerchantStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.merchant ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.merchant ~= true then return end MerchantFrame:RemoveTextures(true) MerchantFrame:SetPanelTemplate("Halftone", false, nil, 2, 4) local level = MerchantFrame:GetFrameLevel() @@ -49,9 +49,9 @@ local function MerchantStyle() MerchantMoneyInset:RemoveTextures() MerchantFrameInset:SetPanelTemplate("Inset") MerchantFrameInset.Panel:SetFrameLevel(MerchantFrameInset.Panel:GetFrameLevel() + 1) - STYLE:ApplyDropdownStyle(MerchantFrameLootFilter) + PLUGIN:ApplyDropdownStyle(MerchantFrameLootFilter) for b = 1, 2 do - STYLE:ApplyTabStyle(_G["MerchantFrameTab"..b]) + PLUGIN:ApplyTabStyle(_G["MerchantFrameTab"..b]) end for b = 1, 12 do local d = _G["MerchantItem"..b.."ItemButton"] @@ -84,13 +84,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) - STYLE:ApplyCloseButtonStyle(MerchantFrameCloseButton, MerchantFrame.Panel) - STYLE:ApplyPaginationStyle(MerchantNextPageButton) - STYLE:ApplyPaginationStyle(MerchantPrevPageButton) + PLUGIN:ApplyCloseButtonStyle(MerchantFrameCloseButton, MerchantFrame.Panel) + PLUGIN:ApplyPaginationStyle(MerchantNextPageButton) + PLUGIN:ApplyPaginationStyle(MerchantPrevPageButton) end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(MerchantStyle) \ No newline at end of file +PLUGIN:SaveCustomStyle(MerchantStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petbattle.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petbattle.lua index d0bfb87..7e8956b 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petbattle.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petbattle.lua @@ -23,8 +23,8 @@ local hooksecurefunc = _G.hooksecurefunc; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -198,11 +198,11 @@ local _hook_UpdateActionBarLayout = function(self) end --[[ ########################################################## -PETBATTLE STYLER +PETBATTLE PLUGINR ########################################################## ]]-- local function PetBattleStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.petbattleui ~= true then + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.petbattleui ~= true then return end @@ -211,7 +211,7 @@ local function PetBattleStyle() local ActiveFramesList = { PetBattleFrame.ActiveAlly, PetBattleFrame.ActiveEnemy } local StandardFramesList = { PetBattleFrame.Ally2, PetBattleFrame.Ally3, PetBattleFrame.Enemy2, PetBattleFrame.Enemy3 } - STYLE:ApplyCloseButtonStyle(FloatingBattlePetTooltip.CloseButton) + PLUGIN:ApplyCloseButtonStyle(FloatingBattlePetTooltip.CloseButton) PetBattleFrame:RemoveTextures() for i, frame in pairs(ActiveFramesList) do @@ -411,7 +411,7 @@ local function PetBattleStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(PetBattleStyle) \ No newline at end of file +PLUGIN:SaveCustomStyle(PetBattleStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petition.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petition.lua index 94233ab..c22e847 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petition.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petition.lua @@ -20,15 +20,15 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## -PETITIONFRAME STYLER +PETITIONFRAME PLUGINR ########################################################## ]]-- local function PetitionFrameStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.petition ~= true then + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.petition ~= true then return end PetitionFrame:RemoveTextures(true) @@ -38,7 +38,7 @@ local function PetitionFrameStyle() PetitionFrameRequestButton:SetButtonTemplate() PetitionFrameRenameButton:SetButtonTemplate() PetitionFrameCancelButton:SetButtonTemplate() - STYLE:ApplyCloseButtonStyle(PetitionFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(PetitionFrameCloseButton) PetitionFrameCharterTitle:SetTextColor(1, 1, 0) PetitionFrameCharterName:SetTextColor(1, 1, 1) PetitionFrameMasterTitle:SetTextColor(1, 1, 0) @@ -53,7 +53,7 @@ local function PetitionFrameStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(PetitionFrameStyle) \ No newline at end of file +PLUGIN:SaveCustomStyle(PetitionFrameStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petjournal.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petjournal.lua index b368c05..af9fd67 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petjournal.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petjournal.lua @@ -20,8 +20,8 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -92,18 +92,18 @@ local function PetJournal_UpdatePets() end --[[ ########################################################## -FRAME STYLER +FRAME PLUGINR ########################################################## ]]-- local function PetJournalStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.mounts ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.mounts ~= true then return end - STYLE:ApplyWindowStyle(PetJournalParent) + PLUGIN:ApplyWindowStyle(PetJournalParent) PetJournalParentPortrait:Hide() - STYLE:ApplyTabStyle(PetJournalParentTab1) - STYLE:ApplyTabStyle(PetJournalParentTab2) - STYLE:ApplyCloseButtonStyle(PetJournalParentCloseButton) + PLUGIN:ApplyTabStyle(PetJournalParentTab1) + PLUGIN:ApplyTabStyle(PetJournalParentTab2) + PLUGIN:ApplyCloseButtonStyle(PetJournalParentCloseButton) MountJournal:RemoveTextures() MountJournal.LeftInset:RemoveTextures() @@ -116,24 +116,22 @@ local function PetJournalStyle() MountJournalMountButton:SetButtonTemplate() MountJournalSearchBox:SetEditboxTemplate() - STYLE:ApplyScrollFrameStyle(MountJournalListScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(MountJournalListScrollFrameScrollBar) MountJournal.MountDisplay:SetFixedPanelTemplate("ModelComic") local buttons = MountJournal.ListScrollFrame.buttons for i = 1, #buttons do local button = buttons[i] if(button) then - STYLE:ApplyItemButtonStyle(button, nil, true, true) + PLUGIN:ApplyItemButtonStyle(button, nil, true, true) local bar = _G["SVUI_MountSelectBar"..i] if(bar) then bar:SetParent(button.Panel) end - if(SV.GameVersion >= 60000) then - if(button.favorite) then - local fg = CreateFrame("Frame", nil, button) - fg:SetAllPoints(favorite) - fg:SetFrameLevel(button:GetFrameLevel() + 30) - button.favorite:SetParent(fg) - button.favorite:SetTexture([[Interface\Addons\SVUI\assets\artwork\Icons\GENERIC-STAR]]) - end + if(button.favorite) then + local fg = CreateFrame("Frame", nil, button) + fg:SetAllPoints(favorite) + fg:SetFrameLevel(button:GetFrameLevel() + 30) + button.favorite:SetParent(fg) + button.favorite:SetTexture([[Interface\Addons\SVUI\assets\artwork\Icons\GENERIC-STAR]]) end end end @@ -159,12 +157,12 @@ local function PetJournalStyle() PetJournalFilterButton:RemoveTextures(true) PetJournalFilterButton:SetButtonTemplate() PetJournalListScrollFrame:RemoveTextures() - STYLE:ApplyScrollFrameStyle(PetJournalListScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(PetJournalListScrollFrameScrollBar) for i = 1, #PetJournal.listScroll.buttons do local button = _G["PetJournalListScrollFrameButton" .. i] local favorite = _G["PetJournalListScrollFrameButton" .. i .. "Favorite"] - STYLE:ApplyItemButtonStyle(button, false, true) + PLUGIN:ApplyItemButtonStyle(button, false, true) if(favorite) then local fg = CreateFrame("Frame", nil, button) fg:SetAllPoints(favorite) @@ -184,7 +182,7 @@ local function PetJournalStyle() PetJournalListScrollFrame:HookScript("OnVerticalScroll", PetJournal_UpdatePets) PetJournalListScrollFrame:HookScript("OnMouseWheel", PetJournal_UpdatePets) PetJournalAchievementStatus:DisableDrawLayer('BACKGROUND') - STYLE:ApplyItemButtonStyle(PetJournalHealPetButton, true) + PLUGIN:ApplyItemButtonStyle(PetJournalHealPetButton, true) PetJournalHealPetButton.texture:SetTexture([[Interface\Icons\spell_magic_polymorphrabbit]]) PetJournalLoadoutBorder:RemoveTextures() @@ -196,7 +194,7 @@ local function PetJournalStyle() pjPet.hover = true; pjPet.pushed = true; pjPet.checked = true; - STYLE:ApplyItemButtonStyle(pjPet, nil, nil, true) + PLUGIN:ApplyItemButtonStyle(pjPet, nil, nil, true) pjPet.setButton:RemoveTextures() _G['PetJournalLoadoutPet'..b..'HealthFrame'].healthBar:RemoveTextures() _G['PetJournalLoadoutPet'..b..'HealthFrame'].healthBar:SetPanelTemplate('Default') @@ -207,7 +205,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] - STYLE:ApplyItemButtonStyle(s) + PLUGIN:ApplyItemButtonStyle(s) s.FlyoutArrow:SetTexture([[Interface\Buttons\ActionBarFlyoutButton]]) _G['PetJournalLoadoutPet'..b..'Spell'..v..'Icon']:FillInner(s) s.Panel:SetFrameLevel(s:GetFrameLevel() + 1) @@ -219,17 +217,17 @@ local function PetJournalStyle() for b = 1, 2 do local Q = _G['PetJournalSpellSelectSpell'..b] - STYLE:ApplyItemButtonStyle(Q) + PLUGIN:ApplyItemButtonStyle(Q) _G['PetJournalSpellSelectSpell'..b..'Icon']:FillInner(Q) _G['PetJournalSpellSelectSpell'..b..'Icon']:SetDrawLayer('BORDER') end PetJournalPetCard:RemoveTextures() - STYLE:ApplyItemButtonStyle(PetJournalPetCard, nil, nil, true) + PLUGIN:ApplyItemButtonStyle(PetJournalPetCard, nil, nil, true) PetJournalPetCardInset:RemoveTextures() PetJournalPetCardPetInfo.levelBG:SetAlpha(0) PetJournalPetCardPetInfoIcon:SetTexCoord(0.1, 0.9, 0.1, 0.9) - STYLE:ApplyItemButtonStyle(PetJournalPetCardPetInfo, nil, true, true) + PLUGIN:ApplyItemButtonStyle(PetJournalPetCardPetInfo, nil, true, true) local fg = CreateFrame("Frame", nil, PetJournalPetCardPetInfo) fg:SetSize(40,40) @@ -274,36 +272,34 @@ local function PetJournalStyle() PetJournalPetCardXPBar:SetPanelTemplate('Default') PetJournalPetCardXPBar:SetStatusBarTexture([[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]]) - if(SV.GameVersion >= 60000) then - STYLE:ApplyTabStyle(PetJournalParentTab3) - ToyBox:RemoveTextures() - ToyBoxProgressBar:SetPanelTemplate("Bar", true) - ToyBoxSearchBox:SetEditboxTemplate() - ToyBoxFilterButton:RemoveTextures() - ToyBoxFilterButton:SetButtonTemplate() - ToyBoxIconsFrame:RemoveTextures() - ToyBoxIconsFrame:SetFixedPanelTemplate('ModelComic') + PLUGIN:ApplyTabStyle(PetJournalParentTab3) + ToyBox:RemoveTextures() + ToyBoxProgressBar:SetPanelTemplate("Bar", true) + ToyBoxSearchBox:SetEditboxTemplate() + ToyBoxFilterButton:RemoveTextures() + ToyBoxFilterButton:SetButtonTemplate() + ToyBoxIconsFrame:RemoveTextures() + ToyBoxIconsFrame:SetFixedPanelTemplate('ModelComic') - MountJournalFilterButton:RemoveTextures() - MountJournalFilterButton:SetButtonTemplate() + MountJournalFilterButton:RemoveTextures() + MountJournalFilterButton:SetButtonTemplate() - MountJournal.SummonRandomFavoriteButton:RemoveTextures() - MountJournal.SummonRandomFavoriteButton:SetSlotTemplate(true, 2, 0, 0, true) - MountJournal.SummonRandomFavoriteButton.texture:SetTexture([[Interface\ICONS\ACHIEVEMENT_GUILDPERK_MOUNTUP]]) - MountJournal.SummonRandomFavoriteButton.texture:SetTexCoord(0.1, 0.9, 0.1, 0.9) + MountJournal.SummonRandomFavoriteButton:RemoveTextures() + MountJournal.SummonRandomFavoriteButton:SetSlotTemplate(true, 2, 0, 0, true) + MountJournal.SummonRandomFavoriteButton.texture:SetTexture([[Interface\ICONS\ACHIEVEMENT_GUILDPERK_MOUNTUP]]) + MountJournal.SummonRandomFavoriteButton.texture:SetTexCoord(0.1, 0.9, 0.1, 0.9) - for i = 1, 18 do - local gName = ("ToySpellButton%d"):format(i) - local button = _G[gName] - if(button) then - button:SetButtonTemplate() - end + for i = 1, 18 do + local gName = ("ToySpellButton%d"):format(i) + local button = _G[gName] + if(button) then + button:SetButtonTemplate() end end end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle("Blizzard_PetJournal", PetJournalStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_PetJournal", PetJournalStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petstable.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petstable.lua index c874d6e..f78daef 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petstable.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petstable.lua @@ -20,37 +20,37 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## -PETSTABLE STYLER +PETSTABLE PLUGINR ########################################################## ]]-- local function PetStableStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.stable ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.stable ~= true then return end PetStableFrame:RemoveTextures() PetStableFrameInset:RemoveTextures() PetStableLeftInset:RemoveTextures() PetStableBottomInset:RemoveTextures() PetStableFrame:SetPanelTemplate("Halftone") PetStableFrameInset:SetFixedPanelTemplate('Inset') - STYLE:ApplyCloseButtonStyle(PetStableFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(PetStableFrameCloseButton) PetStablePrevPageButton:SetButtonTemplate() PetStableNextPageButton:SetButtonTemplate() - STYLE:ApplyPaginationStyle(PetStablePrevPageButton) - STYLE:ApplyPaginationStyle(PetStableNextPageButton) + PLUGIN:ApplyPaginationStyle(PetStablePrevPageButton) + PLUGIN:ApplyPaginationStyle(PetStableNextPageButton) for j = 1, NUM_PET_ACTIVE_SLOTS do - STYLE:ApplyItemButtonStyle(_G['PetStableActivePet'..j], true) + PLUGIN:ApplyItemButtonStyle(_G['PetStableActivePet'..j], true) end for j = 1, NUM_PET_STABLE_SLOTS do - STYLE:ApplyItemButtonStyle(_G['PetStableStabledPet'..j], true) + PLUGIN:ApplyItemButtonStyle(_G['PetStableStabledPet'..j], true) end PetStableSelectedPetIcon:SetTexCoord(0.1, 0.9, 0.1, 0.9) end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(PetStableStyle) \ No newline at end of file +PLUGIN:SaveCustomStyle(PetStableStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/pvp.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/pvp.lua index b0248a2..5ca7300 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/pvp.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/pvp.lua @@ -20,11 +20,11 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## -PVP STYLER +PVP PLUGINR ########################################################## ]]-- local _hook_PVPReadyDialogDisplay = function(self, _, _, _, queueType, _, queueRole) @@ -41,7 +41,7 @@ local _hook_PVPReadyDialogDisplay = function(self, _, _, _, queueType, _, queueR end local function PVPFrameStyle() - if (SV.db[Schema] and (SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.pvp ~= true)) then + if (PLUGIN.db and (PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.pvp ~= true)) then return end @@ -51,12 +51,12 @@ local function PVPFrameStyle() local WarGamesFrame = _G.WarGamesFrame; local PVPReadyDialog = _G.PVPReadyDialog; - STYLE:ApplyWindowStyle(PVPUIFrame, true) + PLUGIN:ApplyWindowStyle(PVPUIFrame, true) - STYLE:ApplyCloseButtonStyle(PVPUIFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(PVPUIFrameCloseButton) for g = 1, 2 do - STYLE:ApplyTabStyle(_G["PVPUIFrameTab"..g]) + PLUGIN:ApplyTabStyle(_G["PVPUIFrameTab"..g]) end for i = 1, 4 do @@ -72,10 +72,10 @@ local function PVPFrameStyle() end end - STYLE:ApplyDropdownStyle(HonorFrameTypeDropDown) + PLUGIN:ApplyDropdownStyle(HonorFrameTypeDropDown) HonorFrame.Inset:RemoveTextures() HonorFrame.Inset:SetFixedPanelTemplate("Inset") - STYLE:ApplyScrollFrameStyle(HonorFrameSpecificFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(HonorFrameSpecificFrameScrollBar) HonorFrameSoloQueueButton:RemoveTextures() HonorFrameGroupQueueButton:RemoveTextures() HonorFrameSoloQueueButton:SetButtonTemplate() @@ -87,24 +87,6 @@ local function PVPFrameStyle() HonorFrame.BonusFrame.RandomBGButton:SetButtonTemplate() HonorFrame.BonusFrame.RandomBGButton.SelectedTexture:FillInner() HonorFrame.BonusFrame.RandomBGButton.SelectedTexture:SetTexture(1, 1, 0, 0.1) - - if(SV.GameVersion < 60000) then - PVPUIFrame.Shadows:RemoveTextures() - HonorFrame.BonusFrame.CallToArmsButton:RemoveTextures() - HonorFrame.BonusFrame.CallToArmsButton:SetFixedPanelTemplate("Button") - HonorFrame.BonusFrame.CallToArmsButton:SetButtonTemplate() - HonorFrame.BonusFrame.CallToArmsButton.SelectedTexture:FillInner() - HonorFrame.BonusFrame.CallToArmsButton.SelectedTexture:SetTexture(1, 1, 0, 0.1) - for g = 1, 2 do - local I = HonorFrame.BonusFrame["WorldPVP"..g.."Button"] - I:RemoveTextures() - I:SetFixedPanelTemplate("Button", true) - I:SetButtonTemplate() - I.SelectedTexture:FillInner() - I.SelectedTexture:SetTexture(1, 1, 0, 0.1) - end - PVPUIFrame.LeftInset:RemoveTextures() - end HonorFrame.BonusFrame.DiceButton:DisableDrawLayer("ARTWORK") HonorFrame.BonusFrame.DiceButton:SetHighlightTexture("") @@ -150,15 +132,15 @@ local function PVPFrameStyle() WarGamesFrameInfoScrollFrameScrollBar:RemoveTextures() WarGameStartButton:RemoveTextures() WarGameStartButton:SetButtonTemplate() - STYLE:ApplyScrollFrameStyle(WarGamesFrameScrollFrameScrollBar) - STYLE:ApplyScrollFrameStyle(WarGamesFrameInfoScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(WarGamesFrameScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(WarGamesFrameInfoScrollFrameScrollBar) WarGamesFrame.HorizontalBar:RemoveTextures() PVPReadyDialog:RemoveTextures() PVPReadyDialog:SetPanelTemplate("Pattern") PVPReadyDialogEnterBattleButton:SetButtonTemplate() PVPReadyDialogLeaveQueueButton:SetButtonTemplate() - STYLE:ApplyCloseButtonStyle(PVPReadyDialogCloseButton) + PLUGIN:ApplyCloseButtonStyle(PVPReadyDialogCloseButton) PVPReadyDialogRoleIcon.texture:SetTexture("Interface\\LFGFrame\\UI-LFG-ICONS-ROLEBACKGROUNDS") PVPReadyDialogRoleIcon.texture:SetAlpha(0.5) @@ -169,9 +151,9 @@ local function PVPFrameStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle('Blizzard_PVPUI', PVPFrameStyle, true) +PLUGIN:SaveBlizzardStyle('Blizzard_PVPUI', PVPFrameStyle, true) -- /script StaticPopupSpecial_Show(PVPReadyDialog) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/quest.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/quest.lua index 2b07918..4ad2612 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/quest.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/quest.lua @@ -24,8 +24,8 @@ local pairs = _G.pairs; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -86,7 +86,7 @@ local Hook_QuestInfo_Display = function(self, ...) item:RemoveTextures() item:Width(item:GetWidth() - 4) item:SetFrameLevel(cLvl) - STYLE:ApplyItemButtonStyle(item, false, true) + PLUGIN:ApplyItemButtonStyle(item, false, true) item.isStyled = true end local tex = _G["QuestInfoRewardsFrameQuestInfoItem"..i.."IconTexture"] @@ -142,21 +142,21 @@ local _hook_QuestLogPopupDetailFrameShow = function(self) end --[[ ########################################################## -QUEST STYLERS +QUEST PLUGINRS ########################################################## ]]-- local function QuestGreetingStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.greeting ~= true then + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.greeting ~= true then return end _G.QuestFrameGreetingPanel:HookScript("OnShow", _hook_GreetingPanelShow) end local function QuestFrameStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.quest ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.quest ~= true then return end - STYLE:ApplyWindowStyle(QuestLogPopupDetailFrame, true, true) - STYLE:ApplyWindowStyle(QuestFrame, true, true) + PLUGIN:ApplyWindowStyle(QuestLogPopupDetailFrame, true, true) + PLUGIN:ApplyWindowStyle(QuestFrame, true, true) QuestLogPopupDetailFrameScrollFrame:RemoveTextures() QuestProgressScrollFrame:RemoveTextures() @@ -164,7 +164,7 @@ local function QuestFrameStyle() QuestLogPopupDetailFrame.ShowMapButton:SetWidth(width) QuestLogPopupDetailFrame.ShowMapButton:SetButtonTemplate() - STYLE:ApplyWindowStyle(QuestLogPopupDetailFrame) + PLUGIN:ApplyWindowStyle(QuestLogPopupDetailFrame) QuestLogPopupDetailFrameInset:Die() @@ -177,12 +177,12 @@ local function QuestFrameStyle() QuestLogPopupDetailFrameScrollFrame:HookScript('OnShow', _hook_DetailScrollShow) QuestLogPopupDetailFrame:HookScript("OnShow", _hook_QuestLogPopupDetailFrameShow) - STYLE:ApplyCloseButtonStyle(QuestLogPopupDetailFrameCloseButton) - STYLE:ApplyScrollFrameStyle(QuestLogPopupDetailFrameScrollFrameScrollBar, 5) - STYLE:ApplyScrollFrameStyle(QuestRewardScrollFrameScrollBar) + PLUGIN:ApplyCloseButtonStyle(QuestLogPopupDetailFrameCloseButton) + PLUGIN:ApplyScrollFrameStyle(QuestLogPopupDetailFrameScrollFrameScrollBar, 5) + PLUGIN:ApplyScrollFrameStyle(QuestRewardScrollFrameScrollBar) QuestGreetingScrollFrame:RemoveTextures() - STYLE:ApplyScrollFrameStyle(QuestGreetingScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(QuestGreetingScrollFrameScrollBar) for i = 1, MAX_NUM_ITEMS do local item = _G["QuestInfoRewardsFrameQuestInfoItem"..i] @@ -199,7 +199,7 @@ local function QuestFrameStyle() tex:SetPoint("TOPLEFT", 2, -2) tex:Size(tex:GetWidth() - 2, tex:GetHeight() - 2) end - STYLE:ApplyItemButtonStyle(item, false, true) + PLUGIN:ApplyItemButtonStyle(item, false, true) item.isStyled = true end end @@ -247,7 +247,7 @@ local function QuestFrameStyle() QuestFrameGoodbyeButton:SetButtonTemplate() QuestFrameCompleteQuestButton:SetButtonTemplate() - STYLE:ApplyCloseButtonStyle(QuestFrameCloseButton, QuestFrame.Panel) + PLUGIN:ApplyCloseButtonStyle(QuestFrameCloseButton, QuestFrame.Panel) for j = 1, 6 do local i = _G["QuestProgressItem"..j] @@ -274,8 +274,8 @@ local function QuestFrameStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(QuestFrameStyle) -STYLE:SaveCustomStyle(QuestGreetingStyle) \ No newline at end of file +PLUGIN:SaveCustomStyle(QuestFrameStyle) +PLUGIN:SaveCustomStyle(QuestGreetingStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/raid.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/raid.lua index 4679348..ec2db63 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/raid.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/raid.lua @@ -22,8 +22,8 @@ local pairs = _G.pairs; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -49,12 +49,12 @@ local RaidInfoFrameList = { }; --[[ ########################################################## -RAID STYLERS +RAID PLUGINRS ########################################################## ]]-- local function RaidUIStyle() if InCombatLockdown() then return end - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.raid ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.raid ~= true then return end for _,group in pairs(RaidGroupList)do if _G[group] then _G[group]:RemoveTextures() @@ -71,7 +71,7 @@ local function RaidUIStyle() end local function RaidInfoStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.nonraid ~= true then + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.nonraid ~= true then return end @@ -94,16 +94,16 @@ local function RaidInfoStyle() RaidInfoFrame.Panel:Point("TOPLEFT", RaidInfoFrame, "TOPLEFT") RaidInfoFrame.Panel:Point("BOTTOMRIGHT", RaidInfoFrame, "BOTTOMRIGHT") - STYLE:ApplyCloseButtonStyle(RaidInfoCloseButton, RaidInfoFrame) - STYLE:ApplyScrollFrameStyle(RaidInfoScrollFrameScrollBar) + PLUGIN:ApplyCloseButtonStyle(RaidInfoCloseButton, RaidInfoFrame) + PLUGIN:ApplyScrollFrameStyle(RaidInfoScrollFrameScrollBar) if RaidFrameRaidBrowserButton then RaidFrameRaidBrowserButton:SetButtonTemplate() end RaidFrameAllAssistCheckButton:SetCheckboxTemplate(true) end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle("Blizzard_RaidUI", RaidUIStyle) -STYLE:SaveCustomStyle(RaidInfoStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_RaidUI", RaidUIStyle) +PLUGIN:SaveCustomStyle(RaidInfoStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/reforging.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/reforging.lua index cf8d20c..b536414 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/reforging.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/reforging.lua @@ -20,17 +20,17 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## -REFORGING STYLER +REFORGING PLUGINR ########################################################## ]]-- local function ReforgingStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.reforge ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.reforge ~= true then return end - STYLE:ApplyWindowStyle(ReforgingFrame, true) + PLUGIN:ApplyWindowStyle(ReforgingFrame, true) ReforgingFrame.ButtonFrame:RemoveTextures() ReforgingFrameReforgeButton:ClearAllPoints() @@ -54,11 +54,11 @@ local function ReforgingStyle() ReforgingFrame.ItemButton.IconTexture:SetTexture(0,0,0,0) end end) - STYLE:ApplyCloseButtonStyle(ReforgingFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(ReforgingFrameCloseButton) end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle("Blizzard_ReforgingUI",ReforgingStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_ReforgingUI",ReforgingStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/spellbook.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/spellbook.lua index b111159..430744f 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/spellbook.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/spellbook.lua @@ -22,8 +22,8 @@ local pairs = _G.pairs; local SV = _G["SVUI"]; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## FRAME LISTS @@ -226,14 +226,14 @@ local function ButtonUpdateHelper(self, strip) end --[[ ########################################################## -SPELLBOOK STYLER +SPELLBOOK PLUGINR ########################################################## ]]-- local function SpellBookStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.spellbook ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.spellbook ~= true then return end - STYLE:ApplyWindowStyle(SpellBookFrame) - STYLE:ApplyCloseButtonStyle(SpellBookFrameCloseButton) + PLUGIN:ApplyWindowStyle(SpellBookFrame) + PLUGIN:ApplyCloseButtonStyle(SpellBookFrameCloseButton) for _, gName in pairs(bookFrames) do local frame = _G[gName] @@ -256,8 +256,8 @@ local function SpellBookStyle() end end - STYLE:ApplyPaginationStyle(SpellBookPrevPageButton) - STYLE:ApplyPaginationStyle(SpellBookNextPageButton) + PLUGIN:ApplyPaginationStyle(SpellBookPrevPageButton) + PLUGIN:ApplyPaginationStyle(SpellBookNextPageButton) ButtonUpdateHelper(nil, true) @@ -322,7 +322,7 @@ local function SpellBookStyle() for i = 1, 5 do local frame = _G[("SpellBookFrameTabButton%d"):format(i)] if(frame) then - STYLE:ApplyTabStyle(frame) + PLUGIN:ApplyTabStyle(frame) end end @@ -331,7 +331,7 @@ local function SpellBookStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(SpellBookStyle) \ No newline at end of file +PLUGIN:SaveCustomStyle(SpellBookStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/store.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/store.lua index c0ba879..1f16259 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/store.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/store.lua @@ -20,24 +20,24 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## -TAXIFRAME STYLER +TAXIFRAME PLUGINR ########################################################## ]]-- local function StoreStyle() - -- if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.store ~= true then + -- if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.store ~= true then -- return -- end - --STYLE:ApplyWindowStyle(StoreFrame) - STYLE:ApplyTooltipStyle(_G.StoreTooltip) + --PLUGIN:ApplyWindowStyle(StoreFrame) + PLUGIN:ApplyTooltipStyle(_G.StoreTooltip) end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle("Blizzard_StoreUI", StoreStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_StoreUI", StoreStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/system.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/system.lua index e31e70d..44a6456 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/system.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/system.lua @@ -20,8 +20,8 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; local ceil = math.ceil --[[ ########################################################## @@ -402,11 +402,11 @@ local _hook_GhostFrameBackdropColor = function(self, r, g, b, a) end --[[ ########################################################## -SYSTEM WIDGET STYLERS +SYSTEM WIDGET PLUGINRS ########################################################## ]]-- local function SystemPanelQue() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.misc ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.misc ~= true then return end local GhostFrame = _G.GhostFrame; local ReadyCheckFrame = _G.ReadyCheckFrame; @@ -422,7 +422,7 @@ local function SystemPanelQue() local this = _G[SystemPopList[i]] if(this) then this:RemoveTextures() - STYLE:ApplyAlertStyle(this) + PLUGIN:ApplyAlertStyle(this) this:SetBackdropColor(0.8, 0.2, 0.2) end end @@ -436,7 +436,7 @@ local function SystemPanelQue() for i = 1, #SystemFrameList1 do local this = _G[SystemFrameList1[i]] if(this) then - STYLE:ApplyWindowStyle(this) + PLUGIN:ApplyWindowStyle(this) end end @@ -591,25 +591,6 @@ local function SystemPanelQue() end end) - if(SV.GameVersion < 60000) then - GuildInviteFrame:RemoveTextures() - GuildInviteFrame:SetFixedPanelTemplate('Transparent') - GuildInviteFrameLevel:RemoveTextures() - GuildInviteFrameLevel:ClearAllPoints() - GuildInviteFrameLevel:SetPoint('TOP', GuildInviteFrame, 'CENTER', -15, -25) - GuildInviteFrameJoinButton:SetButtonTemplate() - GuildInviteFrameDeclineButton:SetButtonTemplate() - GuildInviteFrame:Height(225) - GuildInviteFrame:HookScript("OnEvent", function() - GuildInviteFrame:Height(225) - end) - - GuildInviteFrameWarningText:Die() - BattleTagInviteFrame:RemoveTextures() - BattleTagInviteFrame:SetFixedPanelTemplate('Transparent') - end - --BattleTagInviteFrameScrollFrame:SetEditboxTemplate() - for i=1, BattleTagInviteFrame:GetNumChildren() do local child = select(i, BattleTagInviteFrame:GetChildren()) if child:GetObjectType() == 'Button' then @@ -629,7 +610,7 @@ local function SystemPanelQue() local this = _G[SystemFrameList14[i]] if(this) then this:RemoveTextures() - STYLE:ApplyTabStyle(this) + PLUGIN:ApplyTabStyle(this) end end @@ -650,7 +631,7 @@ local function SystemPanelQue() for i = 1, #SystemFrameList16 do local this = _G["InterfaceOptions"..SystemFrameList16[i]] if(this) then - STYLE:ApplyDropdownStyle(this) + PLUGIN:ApplyDropdownStyle(this) end end InterfaceOptionsHelpPanelResetTutorials:SetButtonTemplate() @@ -663,7 +644,7 @@ local function SystemPanelQue() for i = 1, #SystemFrameList18 do local this = _G[SystemFrameList18[i]] if(this) then - STYLE:ApplyDropdownStyle(this, 165) + PLUGIN:ApplyDropdownStyle(this, 165) end end for i = 1, #SystemFrameList19 do @@ -688,7 +669,7 @@ local function SystemPanelQue() for i = 1, #SystemFrameList21 do local this = _G[SystemFrameList21[i]] if(this) then - STYLE:ApplyScrollBarStyle(this) + PLUGIN:ApplyScrollBarStyle(this) end end Graphics_RightQuality:SetBackdrop(nil) @@ -704,10 +685,10 @@ local function SystemPanelQue() MacOptionsFrameMovieRecording:RemoveTextures() MacOptionsITunesRemote:RemoveTextures() MacOptionsFrameMisc:RemoveTextures() - STYLE:ApplyDropdownStyle(MacOptionsFrameResolutionDropDown) - STYLE:ApplyDropdownStyle(MacOptionsFrameFramerateDropDown) - STYLE:ApplyDropdownStyle(MacOptionsFrameCodecDropDown) - STYLE:ApplyScrollBarStyle(MacOptionsFrameQualitySlider) + PLUGIN:ApplyDropdownStyle(MacOptionsFrameResolutionDropDown) + PLUGIN:ApplyDropdownStyle(MacOptionsFrameFramerateDropDown) + PLUGIN:ApplyDropdownStyle(MacOptionsFrameCodecDropDown) + PLUGIN:ApplyScrollBarStyle(MacOptionsFrameQualitySlider) for i = 1, 11 do local this = _G["MacOptionsFrameCheckButton"..i] if(this) then @@ -733,7 +714,7 @@ local function SystemPanelQue() ReportPlayerNameDialog:SetFixedPanelTemplate("Transparent", true) ReportPlayerNameDialogReportButton:SetButtonTemplate() ReportPlayerNameDialogCancelButton:SetButtonTemplate() - STYLE:ApplyCloseButtonStyle(SideDressUpModelCloseButton) + PLUGIN:ApplyCloseButtonStyle(SideDressUpModelCloseButton) SideDressUpFrame:RemoveTextures() SideDressUpFrame.BGTopLeft:Hide() SideDressUpFrame.BGBottomLeft:Hide() @@ -741,7 +722,7 @@ local function SystemPanelQue() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(SystemPanelQue) \ No newline at end of file +PLUGIN:SaveCustomStyle(SystemPanelQue) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/tabard.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/tabard.lua index a371433..c13fc8c 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/tabard.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/tabard.lua @@ -23,8 +23,8 @@ local type = _G.type; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -50,11 +50,11 @@ local function cleanT(a,b) end --[[ ########################################################## -TABARDFRAME STYLER +TABARDFRAME PLUGINR ########################################################## ]]-- local function TabardFrameStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.tabard ~= true then + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.tabard ~= true then return end cleanT(TabardFrame, true) @@ -62,7 +62,7 @@ local function TabardFrameStyle() TabardModel:SetFixedPanelTemplate("Transparent") TabardFrameCancelButton:SetButtonTemplate() TabardFrameAcceptButton:SetButtonTemplate() - STYLE:ApplyCloseButtonStyle(TabardFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(TabardFrameCloseButton) TabardFrameCostFrame:RemoveTextures() TabardFrameCustomizationFrame:RemoveTextures() TabardFrameInset:Die() @@ -70,8 +70,8 @@ local function TabardFrameStyle() TabardFrameMoneyBg:RemoveTextures() for b = 1, 5 do local c = "TabardFrameCustomization"..b;_G[c]:RemoveTextures() - STYLE:ApplyPaginationStyle(_G[c.."LeftButton"]) - STYLE:ApplyPaginationStyle(_G[c.."RightButton"]) + PLUGIN:ApplyPaginationStyle(_G[c.."LeftButton"]) + PLUGIN:ApplyPaginationStyle(_G[c.."RightButton"]) if b > 1 then _G[c]:ClearAllPoints() _G[c]:Point("TOP", _G["TabardFrameCustomization"..b-1], "BOTTOM", 0, -6) @@ -95,7 +95,7 @@ local function TabardFrameStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(TabardFrameStyle) \ No newline at end of file +PLUGIN:SaveCustomStyle(TabardFrameStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/talents.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/talents.lua index 9d68137..d7fcee7 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/talents.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/talents.lua @@ -23,8 +23,8 @@ local type = _G.type; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -111,13 +111,13 @@ local function StyleGlyphHolder(holder, offset) end --[[ ########################################################## -TALENTFRAME STYLER +TALENTFRAME PLUGINR ########################################################## ]]-- local function TalentFrameStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.talent ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.talent ~= true then return end - STYLE:ApplyWindowStyle(PlayerTalentFrame) + PLUGIN:ApplyWindowStyle(PlayerTalentFrame) PlayerTalentFrameInset:RemoveTextures() PlayerTalentFrameTalents:RemoveTextures() @@ -127,7 +127,7 @@ local function TalentFrameStyle() PlayerTalentFrameSpecializationTutorialButton:Die() PlayerTalentFrameTalentsTutorialButton:Die() PlayerTalentFramePetSpecializationTutorialButton:Die() - STYLE:ApplyCloseButtonStyle(PlayerTalentFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(PlayerTalentFrameCloseButton) PlayerTalentFrameActivateButton:SetButtonTemplate() for _,name in pairs(SpecButtonList)do @@ -148,7 +148,7 @@ local function TalentFrameStyle() PlayerTalentFrameTalentsClearInfoFrame:Point('TOPLEFT', PlayerTalentFrameTalents, 'BOTTOMLEFT', 8, -8) for i = 1, 4 do - STYLE:ApplyTabStyle(_G["PlayerTalentFrameTab"..i]) + PLUGIN:ApplyTabStyle(_G["PlayerTalentFrameTab"..i]) if i == 1 then local d, e, k, g = _G["PlayerTalentFrameTab"..i]:GetPoint() _G["PlayerTalentFrameTab"..i]:Point(d, e, k, g, -4) @@ -176,7 +176,7 @@ local function TalentFrameStyle() PlayerSpecTab1:Point(d, x, f, -1, h) end) - local maxTiers = (SV.GameVersion >= 60000) and MAX_TALENT_TIERS or MAX_NUM_TALENT_TIERS + local maxTiers = MAX_TALENT_TIERS for i = 1, maxTiers do local gName = ("PlayerTalentFrameTalentsTalentRow%d"):format(i) @@ -193,7 +193,7 @@ local function TalentFrameStyle() for z = 1, NUM_TALENT_COLUMNS do local talentItem = _G[("%sTalent%d"):format(gName, z)] if(talentItem) then - STYLE:ApplyItemButtonStyle(talentItem, false, true) + PLUGIN:ApplyItemButtonStyle(talentItem, false, true) end end end @@ -347,10 +347,10 @@ local function TalentFrameStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle("Blizzard_TalentUI", TalentFrameStyle) +PLUGIN:SaveBlizzardStyle("Blizzard_TalentUI", TalentFrameStyle) local function GlyphStyle() GlyphFrame:RemoveTextures() @@ -364,15 +364,15 @@ local function GlyphStyle() GlyphFrameClearInfoFrame:Height(GlyphFrameClearInfoFrame:GetHeight()-2) GlyphFrameClearInfoFrame.icon:Size(GlyphFrameClearInfoFrame:GetSize()) GlyphFrameClearInfoFrame:Point("TOPLEFT", GlyphFrame, "BOTTOMLEFT", 6, -10) - STYLE:ApplyDropdownStyle(GlyphFrameFilterDropDown, 212) + PLUGIN:ApplyDropdownStyle(GlyphFrameFilterDropDown, 212) GlyphFrameSearchBox:SetEditboxTemplate() - STYLE:ApplyScrollFrameStyle(GlyphFrameScrollFrameScrollBar, 5) + PLUGIN:ApplyScrollFrameStyle(GlyphFrameScrollFrameScrollBar, 5) for b = 1, 10 do local e = _G["GlyphFrameScrollFrameButton"..b] local icon = _G["GlyphFrameScrollFrameButton"..b.."Icon"] e:RemoveTextures() - STYLE:ApplyItemButtonStyle(e) + PLUGIN:ApplyItemButtonStyle(e) icon:SetTexCoord(0.1, 0.9, 0.1, 0.9 ) end @@ -393,4 +393,4 @@ local function GlyphStyle() GlyphFrameScrollFrame:SetPanelTemplate("Inset", false, 3, 2, 2) end -STYLE:SaveBlizzardStyle("Blizzard_GlyphUI", GlyphStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_GlyphUI", GlyphStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/taxi.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/taxi.lua index 45a33d1..71e8412 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/taxi.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/taxi.lua @@ -20,28 +20,28 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## -TAXIFRAME STYLER +TAXIFRAME PLUGINR ########################################################## ]]-- local function TaxiStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.taxi ~= true then + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.taxi ~= true then return end - STYLE:ApplyWindowStyle(TaxiFrame) + PLUGIN:ApplyWindowStyle(TaxiFrame) TaxiRouteMap:SetPanelTemplate("Blackout") --TaxiRouteMap.Panel:WrapOuter(TaxiRouteMap, 4, 4) - STYLE:ApplyCloseButtonStyle(TaxiFrame.CloseButton) + PLUGIN:ApplyCloseButtonStyle(TaxiFrame.CloseButton) end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(TaxiStyle) \ No newline at end of file +PLUGIN:SaveCustomStyle(TaxiStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/timemanager.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/timemanager.lua index 5c3e9df..261a7a4 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/timemanager.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/timemanager.lua @@ -20,25 +20,25 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## -TIMEMANAGER STYLER +TIMEMANAGER PLUGINR ########################################################## ]]-- local function TimeManagerStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.timemanager ~= true then + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.timemanager ~= true then return end - STYLE:ApplyWindowStyle(TimeManagerFrame, true) + PLUGIN:ApplyWindowStyle(TimeManagerFrame, true) - STYLE:ApplyCloseButtonStyle(TimeManagerFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(TimeManagerFrameCloseButton) TimeManagerFrameInset:Die() - STYLE:ApplyDropdownStyle(TimeManagerAlarmHourDropDown, 80) - STYLE:ApplyDropdownStyle(TimeManagerAlarmMinuteDropDown, 80) - STYLE:ApplyDropdownStyle(TimeManagerAlarmAMPMDropDown, 80) + PLUGIN:ApplyDropdownStyle(TimeManagerAlarmHourDropDown, 80) + PLUGIN:ApplyDropdownStyle(TimeManagerAlarmMinuteDropDown, 80) + PLUGIN:ApplyDropdownStyle(TimeManagerAlarmAMPMDropDown, 80) TimeManagerAlarmMessageEditBox:SetEditboxTemplate() TimeManagerAlarmEnabledButton:SetCheckboxTemplate(true) TimeManagerMilitaryTimeCheck:SetCheckboxTemplate(true) @@ -60,15 +60,15 @@ local function TimeManagerStyle() StopwatchTabFrame:RemoveTextures() - STYLE:ApplyCloseButtonStyle(StopwatchCloseButton) - STYLE:ApplyPaginationStyle(StopwatchPlayPauseButton) - STYLE:ApplyPaginationStyle(StopwatchResetButton) + PLUGIN:ApplyCloseButtonStyle(StopwatchCloseButton) + PLUGIN:ApplyPaginationStyle(StopwatchPlayPauseButton) + PLUGIN:ApplyPaginationStyle(StopwatchResetButton) StopwatchPlayPauseButton:Point("RIGHT", StopwatchResetButton, "LEFT", -4, 0) StopwatchResetButton:Point("BOTTOMRIGHT", StopwatchFrame, "BOTTOMRIGHT", -4, 6) end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle("Blizzard_TimeManager",TimeManagerStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_TimeManager",TimeManagerStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/trade.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/trade.lua index c2254f3..ce09649 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/trade.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/trade.lua @@ -23,24 +23,24 @@ local type = _G.type; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## -TRADEFRAME STYLER +TRADEFRAME PLUGINR ########################################################## ]]-- local function TradeFrameStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.trade ~= true then + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.trade ~= true then return end - STYLE:ApplyWindowStyle(TradeFrame, true) + PLUGIN:ApplyWindowStyle(TradeFrame, true) TradeFrameInset:Die() TradeFrameTradeButton:SetButtonTemplate() TradeFrameCancelButton:SetButtonTemplate() - STYLE:ApplyCloseButtonStyle(TradeFrameCloseButton, TradeFrame.Panel) + PLUGIN:ApplyCloseButtonStyle(TradeFrameCloseButton, TradeFrame.Panel) TradePlayerInputMoneyFrameGold:SetEditboxTemplate() TradePlayerInputMoneyFrameSilver:SetEditboxTemplate() TradePlayerInputMoneyFrameCopper:SetEditboxTemplate() @@ -114,7 +114,7 @@ local function TradeFrameStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(TradeFrameStyle) \ No newline at end of file +PLUGIN:SaveCustomStyle(TradeFrameStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/tradeskill.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/tradeskill.lua index bd6dbb2..ed9f8eb 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/tradeskill.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/tradeskill.lua @@ -20,15 +20,15 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## -TRADESKILL STYLER +TRADESKILL PLUGINR ########################################################## ]]-- local function TradeSkillStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.tradeskill ~= true then + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.tradeskill ~= true then return end @@ -44,13 +44,13 @@ local function TradeSkillStyle() TradeSkillCreateAllButton:RemoveTextures(true) TradeSkillViewGuildCraftersButton:RemoveTextures(true) - STYLE:ApplyWindowStyle(TradeSkillFrame, true, true) - STYLE:ApplyWindowStyle(TradeSkillGuildFrame) + PLUGIN:ApplyWindowStyle(TradeSkillFrame, true, true) + PLUGIN:ApplyWindowStyle(TradeSkillGuildFrame) TradeSkillGuildFrame:Point("BOTTOMLEFT", TradeSkillFrame, "BOTTOMRIGHT", 3, 19) TradeSkillGuildFrameContainer:RemoveTextures() TradeSkillGuildFrameContainer:SetPanelTemplate("Inset") - STYLE:ApplyCloseButtonStyle(TradeSkillGuildFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(TradeSkillGuildFrameCloseButton) TradeSkillRankFrame:SetPanelTemplate("Bar", true) TradeSkillRankFrame:SetStatusBarTexture([[Interface\AddOns\SVUI\assets\artwork\Bars\DEFAULT]]) @@ -63,8 +63,8 @@ local function TradeSkillStyle() TradeSkillCreateAllButton:SetButtonTemplate() TradeSkillViewGuildCraftersButton:SetButtonTemplate() - STYLE:ApplyScrollFrameStyle(TradeSkillListScrollFrameScrollBar) - STYLE:ApplyScrollFrameStyle(TradeSkillDetailScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(TradeSkillListScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(TradeSkillDetailScrollFrameScrollBar) TradeSkillLinkButton:Size(17, 14) TradeSkillLinkButton:Point("LEFT", TradeSkillLinkFrame, "LEFT", 5, -1) @@ -74,11 +74,11 @@ local function TradeSkillStyle() TradeSkillFrameSearchBox:SetEditboxTemplate() TradeSkillInputBox:SetEditboxTemplate() - STYLE:ApplyPaginationStyle(TradeSkillDecrementButton) - STYLE:ApplyPaginationStyle(TradeSkillIncrementButton) + PLUGIN:ApplyPaginationStyle(TradeSkillDecrementButton) + PLUGIN:ApplyPaginationStyle(TradeSkillIncrementButton) TradeSkillIncrementButton:Point("RIGHT", TradeSkillCreateButton, "LEFT", -13, 0) - STYLE:ApplyCloseButtonStyle(TradeSkillFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(TradeSkillFrameCloseButton) TradeSkillSkillIcon:SetFixedPanelTemplate("Slot") @@ -121,7 +121,7 @@ local function TradeSkillStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle("Blizzard_TradeSkillUI",TradeSkillStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_TradeSkillUI",TradeSkillStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/trainer.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/trainer.lua index 7a8e06d..6d0cf9c 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/trainer.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/trainer.lua @@ -23,8 +23,8 @@ local type = _G.type; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -46,14 +46,14 @@ local ClassTrainerTextureList = { }; --[[ ########################################################## -TRAINER STYLER +TRAINER PLUGINR ########################################################## ]]-- local function TrainerStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.trainer ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.trainer ~= true then return end ClassTrainerFrame:SetHeight(ClassTrainerFrame:GetHeight() + 42) - STYLE:ApplyWindowStyle(ClassTrainerFrame) + PLUGIN:ApplyWindowStyle(ClassTrainerFrame) for i=1, 8 do _G["ClassTrainerScrollFrameButton"..i]:RemoveTextures() @@ -66,7 +66,7 @@ local function TrainerStyle() _G["ClassTrainerScrollFrameButton"..i].selectedTex:FillInner() end - STYLE:ApplyScrollFrameStyle(ClassTrainerScrollFrameScrollBar, 5) + PLUGIN:ApplyScrollFrameStyle(ClassTrainerScrollFrameScrollBar, 5) for _,frame in pairs(ClassTrainerFrameList)do _G[frame]:RemoveTextures() @@ -78,9 +78,9 @@ local function TrainerStyle() _G["ClassTrainerTrainButton"]:RemoveTextures() _G["ClassTrainerTrainButton"]:SetButtonTemplate() - STYLE:ApplyDropdownStyle(ClassTrainerFrameFilterDropDown, 155) + PLUGIN:ApplyDropdownStyle(ClassTrainerFrameFilterDropDown, 155) ClassTrainerScrollFrame:SetFixedPanelTemplate("Inset") - STYLE:ApplyCloseButtonStyle(ClassTrainerFrameCloseButton, ClassTrainerFrame) + PLUGIN:ApplyCloseButtonStyle(ClassTrainerFrameCloseButton, ClassTrainerFrame) ClassTrainerFrameSkillStepButton.icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) ClassTrainerFrameSkillStepButton:SetFixedPanelTemplate("Button", true) --ClassTrainerFrameSkillStepButton.Panel:WrapOuter(ClassTrainerFrameSkillStepButton.icon) @@ -95,7 +95,7 @@ local function TrainerStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle("Blizzard_TrainerUI",TrainerStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_TrainerUI",TrainerStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/transmog.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/transmog.lua index 45762a2..033c5b2 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/transmog.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/transmog.lua @@ -23,8 +23,8 @@ local type = _G.type; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -54,13 +54,13 @@ local TransmogSlotList = { }; --[[ ########################################################## -TRANSMOG STYLER +TRANSMOG PLUGINR ########################################################## ]]-- local function TransmogStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.transmogrify ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.transmogrify ~= true then return end - STYLE:ApplyWindowStyle(TransmogrifyFrame, true) + PLUGIN:ApplyWindowStyle(TransmogrifyFrame, true) for p, texture in pairs(TransmogFrameList)do _G[texture]:Die() @@ -73,7 +73,7 @@ local function TransmogStyle() TransmogrifyApplyButton:RemoveTextures() TransmogrifyApplyButton:SetButtonTemplate() TransmogrifyApplyButton:Point("BOTTOMRIGHT", TransmogrifyFrame, "BOTTOMRIGHT", -4, 4) - STYLE:ApplyCloseButtonStyle(TransmogrifyArtFrameCloseButton) + PLUGIN:ApplyCloseButtonStyle(TransmogrifyArtFrameCloseButton) TransmogrifyArtFrame:RemoveTextures() for p, a9 in pairs(TransmogSlotList)do @@ -96,12 +96,12 @@ local function TransmogStyle() TransmogrifyConfirmationPopup:SetPanelTemplate("Pattern") TransmogrifyConfirmationPopup.Button1:SetButtonTemplate() TransmogrifyConfirmationPopup.Button2:SetButtonTemplate() - STYLE:ApplyItemButtonStyle(TransmogrifyConfirmationPopupItemFrame1, true) - STYLE:ApplyItemButtonStyle(TransmogrifyConfirmationPopupItemFrame2, true) + PLUGIN:ApplyItemButtonStyle(TransmogrifyConfirmationPopupItemFrame1, true) + PLUGIN:ApplyItemButtonStyle(TransmogrifyConfirmationPopupItemFrame2, true) end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle("Blizzard_ItemAlterationUI", TransmogStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_ItemAlterationUI", TransmogStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/voidstorage.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/voidstorage.lua index 56a8d13..dc407bc 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/voidstorage.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/voidstorage.lua @@ -23,8 +23,8 @@ local type = _G.type; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -87,16 +87,16 @@ local function ChangeTabHelper(this) end --[[ ########################################################## -VOIDSTORAGE STYLER +VOIDSTORAGE PLUGINR ########################################################## ]]-- local function VoidStorageStyle() - STYLE.Debugging = true - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.voidstorage ~= true then + PLUGIN.Debugging = true + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.voidstorage ~= true then return end - STYLE:ApplyWindowStyle(VoidStorageFrame, true) + PLUGIN:ApplyWindowStyle(VoidStorageFrame, true) for _,frame in pairs(VoidStorageList)do _G[frame]:RemoveTextures() @@ -112,7 +112,7 @@ local function VoidStorageStyle() VoidStoragePurchaseButton:SetButtonTemplate() VoidStorageHelpBoxButton:SetButtonTemplate() VoidStorageTransferButton:SetButtonTemplate() - STYLE:ApplyCloseButtonStyle(VoidStorageBorderFrame.CloseButton) + PLUGIN:ApplyCloseButtonStyle(VoidStorageBorderFrame.CloseButton) VoidItemSearchBox:SetPanelTemplate("Inset") VoidItemSearchBox.Panel:Point("TOPLEFT", 10, -1) VoidItemSearchBox.Panel:Point("BOTTOMRIGHT", 4, 1) @@ -146,7 +146,7 @@ local function VoidStorageStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveBlizzardStyle("Blizzard_VoidStorageUI", VoidStorageStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_VoidStorageUI", VoidStorageStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/worldmap.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/worldmap.lua index a49d8ef..4843d45 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/worldmap.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/worldmap.lua @@ -20,8 +20,8 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## HELPERS @@ -143,19 +143,19 @@ local function WorldMap_OnShow() end --[[ ########################################################## -WORLDMAP STYLER +WORLDMAP PLUGINR ########################################################## ]]-- local function WorldMapStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.worldmap ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.worldmap ~= true then return end WorldMapFrame:SetFrameLevel(4) - STYLE:ApplyWindowStyle(WorldMapFrame, true, true) + PLUGIN:ApplyWindowStyle(WorldMapFrame, true, true) WorldMapFrame.Panel:SetPanelTemplate("Blackout") - STYLE:ApplyScrollFrameStyle(WorldMapQuestScrollFrameScrollBar) - STYLE:ApplyScrollFrameStyle(WorldMapQuestDetailScrollFrameScrollBar, 4) - STYLE:ApplyScrollFrameStyle(WorldMapQuestRewardScrollFrameScrollBar, 4) + PLUGIN:ApplyScrollFrameStyle(WorldMapQuestScrollFrameScrollBar) + PLUGIN:ApplyScrollFrameStyle(WorldMapQuestDetailScrollFrameScrollBar, 4) + PLUGIN:ApplyScrollFrameStyle(WorldMapQuestRewardScrollFrameScrollBar, 4) WorldMapDetailFrame:SetFrameLevel(6) WorldMapDetailFrame:SetPanelTemplate("Blackout") @@ -166,15 +166,15 @@ local function WorldMapStyle() WorldMapFrameSizeUpButton:SetFrameLevel(999) WorldMapFrameCloseButton:SetFrameLevel(999) - STYLE:ApplyCloseButtonStyle(WorldMapFrameCloseButton) - STYLE:ApplyArrowButtonStyle(WorldMapFrameSizeDownButton, "down") - STYLE:ApplyArrowButtonStyle(WorldMapFrameSizeUpButton, "up") + PLUGIN:ApplyCloseButtonStyle(WorldMapFrameCloseButton) + PLUGIN:ApplyArrowButtonStyle(WorldMapFrameSizeDownButton, "down") + PLUGIN:ApplyArrowButtonStyle(WorldMapFrameSizeUpButton, "up") - STYLE:ApplyDropdownStyle(WorldMapLevelDropDown) - STYLE:ApplyDropdownStyle(WorldMapZoneMinimapDropDown) - STYLE:ApplyDropdownStyle(WorldMapContinentDropDown) - STYLE:ApplyDropdownStyle(WorldMapZoneDropDown) - STYLE:ApplyDropdownStyle(WorldMapShowDropDown) + PLUGIN:ApplyDropdownStyle(WorldMapLevelDropDown) + PLUGIN:ApplyDropdownStyle(WorldMapZoneMinimapDropDown) + PLUGIN:ApplyDropdownStyle(WorldMapContinentDropDown) + PLUGIN:ApplyDropdownStyle(WorldMapZoneDropDown) + PLUGIN:ApplyDropdownStyle(WorldMapShowDropDown) StripQuestMapFrame() @@ -190,10 +190,10 @@ local function WorldMapStyle() end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(WorldMapStyle) +PLUGIN:SaveCustomStyle(WorldMapStyle) --[[ function ArchaeologyDigSiteFrame_OnUpdate() diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/worldstate.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/worldstate.lua index 6a89c98..03a72c5 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/worldstate.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/worldstate.lua @@ -20,29 +20,29 @@ local select = _G.select; --[[ ADDON ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; --[[ ########################################################## -WORLDSTATE STYLER +WORLDSTATE PLUGINR ########################################################## ]]-- local function WorldStateStyle() - if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.bgscore ~= true then return end + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.bgscore ~= true then return end WorldStateScoreScrollFrame:RemoveTextures() WorldStateScoreFrame:RemoveTextures() WorldStateScoreFrame:SetPanelTemplate("Halftone") - STYLE:ApplyCloseButtonStyle(WorldStateScoreFrameCloseButton) - STYLE:ApplyScrollFrameStyle(WorldStateScoreScrollFrameScrollBar) + PLUGIN:ApplyCloseButtonStyle(WorldStateScoreFrameCloseButton) + PLUGIN:ApplyScrollFrameStyle(WorldStateScoreScrollFrameScrollBar) WorldStateScoreFrameInset:SetAlpha(0) WorldStateScoreFrameLeaveButton:SetButtonTemplate() for b = 1, 3 do - STYLE:ApplyTabStyle(_G["WorldStateScoreFrameTab"..b]) + PLUGIN:ApplyTabStyle(_G["WorldStateScoreFrameTab"..b]) end end --[[ ########################################################## -STYLE LOADING +PLUGIN LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(WorldStateStyle) \ No newline at end of file +PLUGIN:SaveCustomStyle(WorldStateStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/style_methods.lua b/Interface/AddOns/SVUI_StyleOMatic/components/style_methods.lua index 63657d1..8051212 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/style_methods.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/style_methods.lua @@ -37,8 +37,8 @@ GET ADDON DATA ]]-- local SV = _G.SVUI; local L = SV.L; -local STYLE = select(2, ...); -local Schema = STYLE.Schema; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; local LSM = LibStub("LibSharedMedia-3.0") local NewHook = hooksecurefunc; @@ -63,21 +63,21 @@ local _hook_WindowLevel = function(self, level) self.Panel:SetFrameLevel(adjustment) end -function STYLE:ApplyFrameStyle(this, template, noStripping, fullStripping) +function PLUGIN:ApplyFrameStyle(this, template, noStripping, fullStripping) if(not this or (this and this.Panel)) then return end if not noStripping then this:RemoveTextures(fullStripping) end template = template or "Transparent" this:SetPanelTemplate(template) end -function STYLE:ApplyUnderlayStyle(this, template, noStripping, fullStripping) +function PLUGIN:ApplyUnderlayStyle(this, template, noStripping, fullStripping) if(not this or (this and this.Panel)) then return end if not noStripping then this:RemoveTextures(fullStripping) end template = template or "Transparent" this:SetFixedPanelTemplate(template) end -function STYLE:ApplyWindowStyle(this, action, fullStrip) +function PLUGIN:ApplyWindowStyle(this, action, fullStrip) if(not this or (this and this.Panel)) then return end local template = action and "Action" or "Halftone" local baselevel = this:GetFrameLevel() @@ -89,7 +89,7 @@ function STYLE:ApplyWindowStyle(this, action, fullStrip) this:SetPanelTemplate(template) end -function STYLE:ApplyWindowHolder(this, fullStrip) +function PLUGIN:ApplyWindowHolder(this, fullStrip) if(not this or (this and this.Panel)) then return end local baselevel = this:GetFrameLevel() if(baselevel < 1) then @@ -119,7 +119,7 @@ local Button_OnLeave = function(self) self:SetBackdropColor(unpack(SV.Media.color.default)) end -function STYLE:ApplyButtonStyle(this) +function PLUGIN:ApplyButtonStyle(this) if not this then return end this:SetButtonTemplate() end @@ -132,7 +132,7 @@ local ArrowButton_OnLeave = function(self) self:SetBackdropBorderColor(0,0,0,1) end -function STYLE:ApplyArrowButtonStyle(this, direction, anchor) +function PLUGIN:ApplyArrowButtonStyle(this, direction, anchor) if not this then return end this:RemoveTextures() this:SetButtonTemplate(nil, 1, -7, -7, nil, "green") @@ -157,7 +157,7 @@ local CloseButton_OnLeave = function(self) self:SetBackdropBorderColor(0,0,0,1) end -function STYLE:ApplyCloseButtonStyle(this, anchor) +function PLUGIN:ApplyCloseButtonStyle(this, anchor) if not this then return end this:RemoveTextures() this:SetButtonTemplate(nil, 1, -7, -7, nil, "red") @@ -175,7 +175,7 @@ end --[[ ITEM BUTTON ]]-- -function STYLE:ApplyItemButtonStyle(frame, adjust, shrink, noScript) +function PLUGIN:ApplyItemButtonStyle(frame, adjust, shrink, noScript) if(not frame or (frame and frame.StyleHooked)) then return end local link = frame:GetName() @@ -257,7 +257,7 @@ end \______/ \______/ |__/ |__/ \______/ |________/|________/ ########################################################## --]] -function STYLE:ApplyScrollFrameStyle(this, scale, yOffset) +function PLUGIN:ApplyScrollFrameStyle(this, scale, yOffset) if(not this or (this and this.StyleHooked)) then return end scale = scale or 5 @@ -287,7 +287,7 @@ function STYLE:ApplyScrollFrameStyle(this, scale, yOffset) upButton:RemoveTextures() if(not upButton.icon) then local upW, upH = upButton:GetSize() - STYLE:ApplyPaginationStyle(upButton) + PLUGIN:ApplyPaginationStyle(upButton) SquareButton_SetIcon(upButton, "UP") upButton:Size(upW + scale, upH + scale) if(yOffset) then @@ -301,7 +301,7 @@ function STYLE:ApplyScrollFrameStyle(this, scale, yOffset) downButton:RemoveTextures() if(not downButton.icon) then local dnW, dnH = downButton:GetSize() - STYLE:ApplyPaginationStyle(downButton) + PLUGIN:ApplyPaginationStyle(downButton) SquareButton_SetIcon(downButton, "DOWN") downButton:Size(dnW + scale, dnH + scale) if(yOffset) then @@ -327,7 +327,7 @@ function STYLE:ApplyScrollFrameStyle(this, scale, yOffset) this.StyleHooked = true end -function STYLE:ApplyScrollBarStyle(this) +function PLUGIN:ApplyScrollBarStyle(this) if(not this or (this and not this.GetOrientation)) then return end if(this:GetOrientation() == "VERTICAL") then @@ -375,7 +375,7 @@ local Tab_OnLeave = function(self) self.backdrop:SetBackdropBorderColor(0,0,0,1) end -function STYLE:ApplyTabStyle(this, addBackground) +function PLUGIN:ApplyTabStyle(this, addBackground) if(not this or (this and this.StyleHooked)) then return end local tab = this:GetName(); @@ -451,7 +451,7 @@ end |__/ |__/ |__/ \______/ |________/ ########################################################## --]] -function STYLE:ApplyPaginationStyle(button, isVertical) +function PLUGIN:ApplyPaginationStyle(button, isVertical) if(not button or (button and not button:GetName()) or (button and button.StyleHooked)) then return end local bName = button:GetName() @@ -533,7 +533,7 @@ local _hook_DropDownButton_SetPoint = function(self, _, _, _, _, _, breaker) end end -function STYLE:ApplyDropdownStyle(this, width) +function PLUGIN:ApplyDropdownStyle(this, width) if(not this or (this and this.StyleHooked)) then return end local ddName = this:GetName(); @@ -556,7 +556,7 @@ function STYLE:ApplyDropdownStyle(this, width) NewHook(ddButton, "SetPoint", _hook_DropDownButton_SetPoint) - STYLE:ApplyPaginationStyle(ddButton, true) + PLUGIN:ApplyPaginationStyle(ddButton, true) local currentLevel = this:GetFrameLevel() if(currentLevel == 0) then @@ -596,7 +596,7 @@ local Tooltip_OnShow = function(self) self:SetBackdropBorderColor(0,0,0) end -function STYLE:ApplyTooltipStyle(frame) +function PLUGIN:ApplyTooltipStyle(frame) if(not frame or (frame and frame.StyleHooked)) then return end frame:HookScript('OnShow', Tooltip_OnShow) frame.StyleHooked = true @@ -613,7 +613,7 @@ end |__/ |__/|________/|________/|__/ |__/ |__/ ########################################################## --]] -function STYLE:ApplyAlertStyle(frame) +function PLUGIN:ApplyAlertStyle(frame) if(not frame or (frame and frame.StyleHooked)) then return end local alertpanel = CreateFrame("Frame", nil, frame) @@ -667,7 +667,7 @@ end |__/ |__/|______/ \______/ \______/ ########################################################## --]] -function STYLE:ApplyEditBoxStyle(this, width, height) +function PLUGIN:ApplyEditBoxStyle(this, width, height) if not this then return end this:RemoveTextures(true) this:SetEditboxTemplate() @@ -675,7 +675,7 @@ function STYLE:ApplyEditBoxStyle(this, width, height) if height then this:Height(height) end end -function STYLE:ApplyTextureStyle(this) +function PLUGIN:ApplyTextureStyle(this) if not this then return end this:SetTexCoord(0.1, 0.9, 0.1, 0.9) local parent = this:GetParent() @@ -684,6 +684,6 @@ function STYLE:ApplyTextureStyle(this) end end -function STYLE:ApplyRotateStyle(this) +function PLUGIN:ApplyRotateStyle(this) -- Do stuff end \ No newline at end of file diff --git a/Interface/AddOns/SVUI_TrackOMatic/Loader.lua b/Interface/AddOns/SVUI_TrackOMatic/Loader.lua index 3494f8f..dd85d68 100644 --- a/Interface/AddOns/SVUI_TrackOMatic/Loader.lua +++ b/Interface/AddOns/SVUI_TrackOMatic/Loader.lua @@ -27,7 +27,7 @@ local AddonName, AddonObject = ... assert(_G.LibSuperVillain, AddonName .. " requires LibSuperVillain") -local PLUGIN = _G.LibSuperVillain:NewPlugin(AddonName, AddonObject) +local PLUGIN = _G.LibSuperVillain:NewPlugin(AddonName, AddonObject, "TrackOMatic_Profile", "TrackOMatic_Global") local Schema = PLUGIN.Schema; local SV = _G["SVUI"]; @@ -37,13 +37,14 @@ local L = SV.L CONFIG DATA ########################################################## ]]-- -SV.configs[Schema] = { - ["enable"] = true, +PLUGIN.configs = { ["size"] = 75, ["fontSize"] = 12, ["groups"] = true, ["proximity"] = false, } + +PLUGIN.db = table.copy(PLUGIN.configs); --[[ ########################################################## CONFIG OPTIONS @@ -54,7 +55,7 @@ SV.Options.args.plugins.args.pluginOptions.args[Schema].args["groups"] = { name = L["GPS"], desc = L["Use group frame GPS elements"], type = "toggle", - get = function(key) return SV.db[Schema][key[#key]] end, + get = function(key) return PLUGIN.db[key[#key]] end, set = function(key,value) PLUGIN:ChangeDBVar(value, key[#key]); PLUGIN:UpdateLogWindow() end } @@ -63,7 +64,7 @@ SV.Options.args.plugins.args.pluginOptions.args[Schema].args["proximity"] = { name = L["GPS Proximity"], desc = L["Only point to closest low health unit"], type = "toggle", - get = function(key) return SV.db[Schema][key[#key]] end, + get = function(key) return PLUGIN.db[key[#key]] end, set = function(key,value) PLUGIN:ChangeDBVar(value, key[#key]); PLUGIN:UpdateLogWindow() end } @@ -75,6 +76,6 @@ SV.Options.args.plugins.args.pluginOptions.args[Schema].args["fontSize"] = { min = 6, max = 22, step = 1, - get = function(key) return SV.db[Schema][key[#key]] end, + get = function(key) return PLUGIN.db[key[#key]] end, set = function(key,value) PLUGIN:ChangeDBVar(value, key[#key]); PLUGIN:UpdateLogWindow() end } \ No newline at end of file diff --git a/Interface/AddOns/SVUI_TrackOMatic/SVUI_TrackOMatic.lua b/Interface/AddOns/SVUI_TrackOMatic/SVUI_TrackOMatic.lua index 7223fc5..78b92c5 100644 --- a/Interface/AddOns/SVUI_TrackOMatic/SVUI_TrackOMatic.lua +++ b/Interface/AddOns/SVUI_TrackOMatic/SVUI_TrackOMatic.lua @@ -96,6 +96,7 @@ function PLUGIN:PLAYER_TARGET_CHANGED() SVUI_TrackingDoodad:Show() else SVUI_TrackingDoodad.Trackable = false + SVUI_TrackingDoodad:Hide() end end @@ -122,16 +123,6 @@ local Rotate_Arrow = function(self, angle) self.Arrow:SetTexCoord(ULx, ULy, LLx, LLy, URx, URy, LRx, LRy); end -local TargetFrame_OnChange = function() - if not SVUI_TrackingDoodad then return end - if((UnitInParty("target") or UnitInRaid("target")) and not UnitIsUnit("target", "player")) then - SVUI_TrackingDoodad.Trackable = true - SVUI_TrackingDoodad:Show() - else - SVUI_TrackingDoodad.Trackable = false - end -end - local Tracker_OnUpdate = function(self, elapsed) if self.elapsed and self.elapsed > (self.throttle or 0.02) then if(self.Trackable) then @@ -153,10 +144,14 @@ local Tracker_OnUpdate = function(self, elapsed) self.Arrow:SetVertexColor(1,0.8,0.1,0.6) self.Radar:SetVertexColor(0.8,0.8,0.1,0.5) self.BG:SetVertexColor(0.4,0.8,0.1,0.5) - elseif(range > 5) then + elseif(range > 0) then self.Arrow:SetVertexColor(0.1,1,0.8,0.9) self.Radar:SetVertexColor(0.1,0.8,0.8,0.75) self.BG:SetVertexColor(0.1,0.8,0.1,0.75) + else + self.Arrow:SetVertexColor(0.1,0.1,0.1,0.1) + self.Radar:SetVertexColor(0.1,0.1,0.1,0.1) + self.BG:SetVertexColor(0.1,0.1,0.1,0.1) end self.Arrow:SetAlpha(1) self.Range:SetText(range) @@ -175,11 +170,9 @@ CORE ########################################################## ]]-- function PLUGIN:ReLoad() - if(not SV.db[Schema].enable) then return end - - local frameSize = SV.db[Schema].size or 70 + local frameSize = self.db.size or 70 local arrowSize = frameSize * 0.5 - local fontSize = SV.db[Schema].fontSize or 14 + local fontSize = self.db.fontSize or 14 local frame = _G["SVUI_TrackingDoodad"] frame:SetSize(frameSize, frameSize) @@ -188,13 +181,10 @@ function PLUGIN:ReLoad() end function PLUGIN:Load() - if(not SV.db[Schema].enable) then return end - local _TRACKER = SVUI_TrackingDoodad local _TARGET = SVUI_Target if(_TRACKER) then - _TRACKER.Border:SetGradient(unpack(SV.Media.gradient.special)) _TRACKER.Arrow:SetVertexColor(0.1, 0.8, 0.8) _TRACKER.Range:SetFont(SV.Media.font.roboto, 14, "OUTLINE") @@ -212,7 +202,6 @@ function PLUGIN:Load() if(_TARGET) then _TRACKER:SetParent(_TARGET) _TRACKER:SetPoint("LEFT", _TARGET, "RIGHT", 2, 0) - _TARGET:HookScript("OnShow", TargetFrame_OnChange) end self:RegisterEvent("PLAYER_TARGET_CHANGED") diff --git a/Interface/AddOns/SVUI_TrackOMatic/SVUI_TrackOMatic.toc b/Interface/AddOns/SVUI_TrackOMatic/SVUI_TrackOMatic.toc index c216e6d..1ab0ce8 100644 --- a/Interface/AddOns/SVUI_TrackOMatic/SVUI_TrackOMatic.toc +++ b/Interface/AddOns/SVUI_TrackOMatic/SVUI_TrackOMatic.toc @@ -3,6 +3,8 @@ ## Version: 5.0 ## Title: |cffFF9900SVUI |r|cffFFEF00Track-O-Matic|r ## Notes: Supervillain UI [|cff9911FFRaid & Party Member Tracking|r]. +## SavedVariables: TrackOMatic_Global +## SavedVariablesPerCharacter: TrackOMatic_Profile ## RequiredDeps: SVUI ## LoadOnDemand: 1 ## X-Email: munglunch@gmail.com diff --git a/Interface/AddOns/SVUI_TrackOMatic/components/unitframe_gps.lua b/Interface/AddOns/SVUI_TrackOMatic/components/unitframe_gps.lua index 0e68778..87bc9bb 100644 --- a/Interface/AddOns/SVUI_TrackOMatic/components/unitframe_gps.lua +++ b/Interface/AddOns/SVUI_TrackOMatic/components/unitframe_gps.lua @@ -181,7 +181,7 @@ end local RefreshGPS = function(self, frame, template) if(frame.GPS) then - local config = SV.db[Schema] + local config = PLUGIN.db if(config.groups) then frame.GPS.OnlyProximity = config.proximity local actualSz = min(frame.GPS.DefaultSize, (frame:GetHeight() - 2)) diff --git a/Interface/BUTTONS/Thumbs.db b/Interface/BUTTONS/Thumbs.db new file mode 100644 index 0000000..9a524d6 Binary files /dev/null and b/Interface/BUTTONS/Thumbs.db differ