diff --git a/Interface/AddOns/SVUI/SVUI.toc b/Interface/AddOns/SVUI/SVUI.toc index 371f165..6956c4f 100644 --- a/Interface/AddOns/SVUI/SVUI.toc +++ b/Interface/AddOns/SVUI/SVUI.toc @@ -1,6 +1,6 @@ ## Interface: 50400 ## Author: Munglunch -## Version: 4.081 +## Version: 4.082 ## Title: |cffFF9900SVUI|r ## Notes: Supervillain UI [|cff9911FFCore Framework|r]. ## SavedVariables: SVUI_Global diff --git a/Interface/AddOns/SVUI/packages/bag/SVBag.lua b/Interface/AddOns/SVUI/packages/bag/SVBag.lua index 1625731..0a2e0cc 100644 --- a/Interface/AddOns/SVUI/packages/bag/SVBag.lua +++ b/Interface/AddOns/SVUI/packages/bag/SVBag.lua @@ -1316,7 +1316,6 @@ end function MOD:Load() if IsAddOnLoaded("AdiBags") then - SuperVillain.db.SVBag.enable = false return end if not SuperVillain.db.SVBag.enable then return end diff --git a/Interface/AddOns/SVUI/system/alerts.lua b/Interface/AddOns/SVUI/system/alerts.lua index a463291..9ef2faa 100644 --- a/Interface/AddOns/SVUI/system/alerts.lua +++ b/Interface/AddOns/SVUI/system/alerts.lua @@ -91,6 +91,15 @@ SuperVillain.SystemAlert["FAILED_UISCALE"] = { whileDead = 1, hideOnEscape = false, } +SuperVillain.SystemAlert["TAINT_RL"] = { + text = L["SVUI has lost it's damned mind! I need to reload your UI to fix it."], + button1 = ACCEPT, + button2 = CANCEL, + OnAccept = function()ReloadUI()end, + timeout = 0, + whileDead = 1, + hideOnEscape = true +}; SuperVillain.SystemAlert["RL_CLIENT"] = { text = L["A setting you have changed requires that you reload your User Interface."], button1 = ACCEPT, diff --git a/Interface/AddOns/SVUI/system/system.lua b/Interface/AddOns/SVUI/system/system.lua index b6179d4..f104ec9 100644 --- a/Interface/AddOns/SVUI/system/system.lua +++ b/Interface/AddOns/SVUI/system/system.lua @@ -241,9 +241,12 @@ function SuperVillain:ToggleConfig() GameTooltip:Hide() end +--/script SVUI[1]:TaintHandler("SVUI", "Script", "Function") function SuperVillain:TaintHandler(taint, sourceName, sourceFunc) - if GetCVarBool('scriptErrors') ~= 1 then return end - ScriptErrorsFrame_OnError(L["%s: %s has lost it's damn mind and is destroying '%s'."]:format(taint, sourceName or "elements", sourceFunc or "functions"),false) + if GetCVarBool('scriptErrors') ~= 1 then return end + local errorString = ("Error Captured: %s->%s->{%s}"):format(taint, sourceName or "Unknown", sourceFunc or "Unknown") + SuperVillain:AddonMessage(errorString) + SuperVillain:StaticPopup_Show("TAINT_RL") end --[[ ########################################################## diff --git a/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.toc b/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.toc index 5f6afa2..c09a1e2 100644 --- a/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.toc +++ b/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.toc @@ -1,6 +1,6 @@ ## Interface: 50400 ## Author: Munglunch, Elv -## Version: 4.081 +## Version: 4.082 ## Title: |cffFF9900SVUI |r|cffFFEF00Config O Matic|r ## Notes: Supervillain UI [|cff9911FFConfig Options|r] ## RequiredDeps: SVUI diff --git a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.toc b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.toc index 74bab39..5705bc8 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.toc +++ b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.toc @@ -1,6 +1,6 @@ ## Interface: 50400 ## Author: Munglunch, Azilroka, Sortokk -## Version: 4.081 +## Version: 4.082 ## Title: |cffFF9900SVUI |r|cffFFEF00Style O Matic|r ## Notes: Supervillain UI [|cff9911FFAddon Skins|r]. ## RequiredDeps: SVUI diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/supervillain.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/supervillain.lua index efe594f..55f3f2f 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/supervillain.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/supervillain.lua @@ -83,37 +83,26 @@ local function Widget_PaginationStyle(...) STYLE:ApplyPaginationStyle(...) end -local function SVUICoreStyle(postLoad) - if(not postLoad) then - for i = 1, 4 do - local alert = _G["SVUI_SystemAlert"..i]; - if(alert) then - for b = 1, 3 do - alert.buttons[b]:SetButtonTemplate() - end; - alert:Formula409() - STYLE:ApplyAlertStyle(alert) - alert.input:SetEditboxTemplate() - alert.input.Panel:Point("TOPLEFT", -2, -4) - alert.input.Panel:Point("BOTTOMRIGHT", 2, 4) - alert.gold:SetEditboxTemplate() - alert.silver:SetEditboxTemplate() - alert.copper:SetEditboxTemplate() - end - end - end - +local function StyleAceGUI() local AceGUI = LibStub("AceGUI-3.0", true) - if not AceGUI then - local h = CreateFrame("Frame") - h:RegisterEvent("ADDON_LOADED") - h:SetScript("OnEvent", function(b, M, N) - if LibStub("AceGUI-3.0", true) then - SVUICoreStyle(true) - b:UnregisterEvent("ADDON_LOADED") - end - end) - return + + assert(AceGUI, "Addon Not Loaded") + + for i = 1, 4 do + local alert = _G["SVUI_SystemAlert"..i]; + if(alert) then + for b = 1, 3 do + alert.buttons[b]:SetButtonTemplate() + end; + alert:Formula409() + STYLE:ApplyAlertStyle(alert) + alert.input:SetEditboxTemplate() + alert.input.Panel:Point("TOPLEFT", -2, -4) + alert.input.Panel:Point("BOTTOMRIGHT", 2, 4) + alert.gold:SetEditboxTemplate() + alert.silver:SetEditboxTemplate() + alert.copper:SetEditboxTemplate() + end end local regWidget = AceGUI.RegisterAsWidget; @@ -345,4 +334,4 @@ end STYLE LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(SVUICoreStyle) \ No newline at end of file +STYLE:SaveAddonStyle("ConfigOMatic", StyleAceGUI, nil, true) \ No newline at end of file