# HG changeset patch # User Flick # Date 1207256932 0 # Node ID 00f08528faafc2a4d1116a625535c9c65ce901dd # Parent 413f61e038b1d4d0f7075a7fbc3f5a0801d5e15f HideBlizzard now reroutes InterfaceOptions->ActionBars to InterfaceOptions->AddOns->ReAction if hide-blizzard-bars is checked diff -r 413f61e038b1 -r 00f08528faaf ReAction.lua --- a/ReAction.lua Thu Apr 03 21:07:05 2008 +0000 +++ b/ReAction.lua Thu Apr 03 21:08:52 2008 +0000 @@ -113,26 +113,9 @@ end end - local function CallOptsModule(method,...) - local m = ReAction:GetModule("ConfigUI",true) - if not m then - LoadAddOn("ReAction_ConfigUI") - m = ReAction:GetModule("ConfigUI") - end - if m then - if type(m) == "table" and type(m[method]) == "function" then - m[method](m,...) - else - dbprint(("Bad call '%s' to options module"):format(tostring(method))); - end - else - ReAction:Print("Options module not found") - end - end - SlashHandler = function(option) if option == "config" then - CallOptsModule("OpenConfig",true) + ReAction:ShowConfig() elseif option == "unlock" then ReAction:SetConfigMode(true) elseif option == "lock" then @@ -228,6 +211,24 @@ end end +function ReAction:CallModuleMethod(modulename, method, ...) + local m = self:GetModule(modulename,true) + if not m then + LoadAddOn(("ReAction_%s"):format(modulename)) + m = self:GetModule(modulename,true) + end + if m then + if type(m) == "table" and type(m[method]) == "function" then + m[method](m,...) + else + dbprint(("Bad call '%s' to %s module"):format(tostring(method),modulename)); + end + else + self:Print(("Module '%s' not found"):format(tostring(modulename))) + end +end + + function ReAction:CreateBar(name, defaultConfig, prefix) local profile = self.db.profile defaultConfig = defaultConfig or profile.defaultBar @@ -320,3 +321,8 @@ self:CallMethodOnAllModules("ApplyConfigMode",mode,self.bars) self.configMode = mode end + +function ReAction:ShowConfig() + self:CallModuleMethod("ConfigUI","OpenConfig") +end + diff -r 413f61e038b1 -r 00f08528faaf bindings.lua --- a/bindings.lua Thu Apr 03 21:07:05 2008 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -local L = LibStub("AceLocale-3.0"):GetLocale("ReAction") -local _G = _G - -_G["BINDING_HEADER_REACTION"] = L["ReAction"] - -_G["BINDING_NAME_REACTION_TOGGLELOCK"] = L["Toggle ReAction Bar Lock"] -_G["BINDING_NAME_REACTION_TOGGLEKEYBIND"] = L["ReAction Keybinding Mode"] diff -r 413f61e038b1 -r 00f08528faaf modules/ReAction_HideBlizzard/ReAction_HideBlizzard.lua --- a/modules/ReAction_HideBlizzard/ReAction_HideBlizzard.lua Thu Apr 03 21:07:05 2008 +0000 +++ b/modules/ReAction_HideBlizzard/ReAction_HideBlizzard.lua Thu Apr 03 21:08:52 2008 +0000 @@ -45,6 +45,14 @@ disabled = InCombatLockdown } }) + + -- reroute blizzard action bar config to ReAction config window + InterfaceOptionsActionBarsPanel:HookScript("OnShow", + function() + if module:IsHidden() then + ReAction:ShowConfig() + end + end ) end function module:OnDisable()