From 7e8548e5ead73ab70887736a57124a8aa0885992 Mon Sep 17 00:00:00 2001 From: Steven Jackson Date: Sat, 23 Aug 2014 17:46:35 -0500 Subject: [PATCH] changes --- Interface/AddOns/SVUI/packages/bag/SVBag.lua | 7 +- Interface/AddOns/SVUI/packages/map/SVMap.lua | 1 - .../SVUI_StyleOMatic/addons/thirdparty/AdiBags.lua | 72 ++++++++++++++++++++ .../SVUI_StyleOMatic/addons/thirdparty/Bugsack.lua | 56 +++++++++++++++ .../SVUI_StyleOMatic/addons/thirdparty/_load.xml | 2 + 5 files changed, 136 insertions(+), 2 deletions(-) create mode 100644 Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AdiBags.lua create mode 100644 Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Bugsack.lua diff --git a/Interface/AddOns/SVUI/packages/bag/SVBag.lua b/Interface/AddOns/SVUI/packages/bag/SVBag.lua index b6a8833..1625731 100644 --- a/Interface/AddOns/SVUI/packages/bag/SVBag.lua +++ b/Interface/AddOns/SVUI/packages/bag/SVBag.lua @@ -1307,6 +1307,7 @@ BUILD FUNCTION / UPDATE ########################################################## ]]-- function MOD:ReLoad() + if not SuperVillain.db.SVBag.enable then return end self:Layout(); self:Layout(true); self:ModifyBags(); @@ -1314,7 +1315,11 @@ function MOD:ReLoad() end function MOD:Load() - if not SuperVillain.db.SVBag.enable then return end + if IsAddOnLoaded("AdiBags") then + SuperVillain.db.SVBag.enable = false + return + end + if not SuperVillain.db.SVBag.enable then return end self:ModifyBagBar() SuperVillain.bags = self; self.BagFrames = {} diff --git a/Interface/AddOns/SVUI/packages/map/SVMap.lua b/Interface/AddOns/SVUI/packages/map/SVMap.lua index 96852a0..c1823b5 100644 --- a/Interface/AddOns/SVUI/packages/map/SVMap.lua +++ b/Interface/AddOns/SVUI/packages/map/SVMap.lua @@ -808,7 +808,6 @@ function MOD:ADDON_LOADED(event, addon) FeedbackUIButton:MUNG() end self:UpdateMinimapButtonSettings() - print(SuperVillain.db.SVMap.enable) end function MOD:PLAYER_REGEN_ENABLED() diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AdiBags.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AdiBags.lua new file mode 100644 index 0000000..f80cf18 --- /dev/null +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AdiBags.lua @@ -0,0 +1,72 @@ +--[[ +############################################################################## +_____/\\\\\\\\\\\____/\\\________/\\\__/\\\________/\\\__/\\\\\\\\\\\_ # + ___/\\\/////////\\\_\/\\\_______\/\\\_\/\\\_______\/\\\_\/////\\\///__ # + __\//\\\______\///__\//\\\______/\\\__\/\\\_______\/\\\_____\/\\\_____ # + ___\////\\\__________\//\\\____/\\\___\/\\\_______\/\\\_____\/\\\_____ # + ______\////\\\________\//\\\__/\\\____\/\\\_______\/\\\_____\/\\\_____ # + _________\////\\\______\//\\\/\\\_____\/\\\_______\/\\\_____\/\\\_____ # + __/\\\______\//\\\______\//\\\\\______\//\\\______/\\\______\/\\\_____ # + _\///\\\\\\\\\\\/________\//\\\________\///\\\\\\\\\/____/\\\\\\\\\\\_# + ___\///////////___________\///___________\/////////_____\///////////_# +############################################################################## +S U P E R - V I L L A I N - U I By: Munglunch # +############################################################################## +########################################################## +LOCALIZED LUA FUNCTIONS +########################################################## +]]-- +--[[ GLOBALS ]]-- +local _G = _G; +local unpack = _G.unpack; +local select = _G.select; +local pairs = _G.pairs; +local string = _G.string; +--[[ STRING METHODS ]]-- +local format = string.format; +--[[ +########################################################## +GET ADDON DATA +########################################################## +]]-- +local SuperVillain, L = unpack(SVUI); +local STYLE = _G.StyleVillain; +--[[ +########################################################## +ADIBAGS +########################################################## +]]-- +local function StyleAdiBags(event) + local AdiBags = LibStub('AceAddon-3.0'):GetAddon('AdiBags') + assert(AdiBags, "AddOn Not Loaded") + --hooksecurefunc(AdiBags, 'HookBagFrameCreation', function(self) print(self) end) + + local function SkinFrame(frame) + local region = frame.HeaderRightRegion + frame:SetPanelTemplate("Transparent") + _G[frame:GetName()..'Bags']:SetPanelTemplate("Default") + for i = 1, 3 do + region.widgets[i].widget:SetButtonTemplate() + end + end + + if event == 'PLAYER_ENTERING_WORLD' then + SuperVillain:ExecuteTimer(function() + if not AdiBagsContainer1 then ToggleBackpack() ToggleBackpack() end + if AdiBagsContainer1 then + SkinFrame(AdiBagsContainer1) + AdiBagsContainer1SearchBox:SetEditboxTemplate() + AdiBagsContainer1SearchBox:Point('TOPRIGHT', AdiBagsSimpleLayeredRegion2, 'TOPRIGHT', -75, -1) + end + end, 1) + elseif event == 'BANKFRAME_OPENED' then + SuperVillain:ExecuteTimer(function() + if AdiBagsContainer2 then + SkinFrame(AdiBagsContainer2) + STYLE:SafeEventRemoval("AdiBags", event) + end + end, 1) + end +end + +STYLE:SaveAddonStyle("AdiBags", StyleAdiBags, nil, nil, 'PLAYER_ENTERING_WORLD', 'BANKFRAME_OPENED') \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Bugsack.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Bugsack.lua new file mode 100644 index 0000000..f957bc3 --- /dev/null +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Bugsack.lua @@ -0,0 +1,56 @@ +--[[ +############################################################################## +_____/\\\\\\\\\\\____/\\\________/\\\__/\\\________/\\\__/\\\\\\\\\\\_ # + ___/\\\/////////\\\_\/\\\_______\/\\\_\/\\\_______\/\\\_\/////\\\///__ # + __\//\\\______\///__\//\\\______/\\\__\/\\\_______\/\\\_____\/\\\_____ # + ___\////\\\__________\//\\\____/\\\___\/\\\_______\/\\\_____\/\\\_____ # + ______\////\\\________\//\\\__/\\\____\/\\\_______\/\\\_____\/\\\_____ # + _________\////\\\______\//\\\/\\\_____\/\\\_______\/\\\_____\/\\\_____ # + __/\\\______\//\\\______\//\\\\\______\//\\\______/\\\______\/\\\_____ # + _\///\\\\\\\\\\\/________\//\\\________\///\\\\\\\\\/____/\\\\\\\\\\\_# + ___\///////////___________\///___________\/////////_____\///////////_# +############################################################################## +S U P E R - V I L L A I N - U I By: Munglunch # +############################################################################## +########################################################## +LOCALIZED LUA FUNCTIONS +########################################################## +]]-- +--[[ GLOBALS ]]-- +local _G = _G; +local unpack = _G.unpack; +local select = _G.select; +local pairs = _G.pairs; +local string = _G.string; +--[[ STRING METHODS ]]-- +local format = string.format; +--[[ +########################################################## +GET ADDON DATA +########################################################## +]]-- +local SuperVillain, L = unpack(SVUI); +local STYLE = _G.StyleVillain; +--[[ +########################################################## +BUGSACK +########################################################## +]]-- +local function StyleBugSack(event, addon) + assert(BugSack, "AddOn Not Loaded") + hooksecurefunc(BugSack, "OpenSack", function() + if BugSackFrame.Panel then return end + BugSackFrame:Formula409() + BugSackFrame:SetPanelTemplate("Transparent") + STYLE:ApplyTabStyle(BugSackTabAll) + BugSackTabAll:SetPoint("TOPLEFT", BugSackFrame, "BOTTOMLEFT", 0, 1) + STYLE:ApplyTabStyle(BugSackTabSession) + STYLE:ApplyTabStyle(BugSackTabLast) + BugSackNextButton:SetButtonTemplate() + BugSackSendButton:SetButtonTemplate() + BugSackPrevButton:SetButtonTemplate() + STYLE:ApplyScrollbarStyle(BugSackScrollScrollBar) + end) +end + +STYLE:SaveAddonStyle("Bugsack", StyleBugSack) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/_load.xml b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/_load.xml index aff4b42..b32653f 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/_load.xml +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/_load.xml @@ -1,9 +1,11 @@