diff --git a/TomTom.lua b/TomTom.lua index ed6dcc1..1aa8f52 100755 --- a/TomTom.lua +++ b/TomTom.lua @@ -7,7 +7,7 @@ -- Simple localization table for messages local L = TomTomLocals local ldb = LibStub("LibDataBroker-1.1") -local astrolabe = DongleStub("TTAstrolabe-1.0") +local astrolabe = DongleStub("Astrolabe-1.0") local lmd = LibStub("LibMapData-1.0") local addonName, addon = ... diff --git a/TomTom_Config.lua b/TomTom_Config.lua old mode 100644 new mode 100755 diff --git a/TomTom_Corpse.lua b/TomTom_Corpse.lua old mode 100644 new mode 100755 index 9a30acb..a5e84ca --- a/TomTom_Corpse.lua +++ b/TomTom_Corpse.lua @@ -12,7 +12,7 @@ eventFrame:RegisterEvent("PLAYER_DEAD") eventFrame:RegisterEvent("PLAYER_UNGHOST") eventFrame:Hide() -local astrolabe = DongleStub("TTAstrolabe-1.0") +local astrolabe = DongleStub("Astrolabe-1.0") -- Local variables to store map, floor, x, y and uid or corpse waypoint local m,f,x,y,uid diff --git a/TomTom_CrazyArrow.lua b/TomTom_CrazyArrow.lua old mode 100644 new mode 100755 diff --git a/TomTom_POIIntegration.lua b/TomTom_POIIntegration.lua old mode 100644 new mode 100755 index c991a26..0453fe0 --- a/TomTom_POIIntegration.lua +++ b/TomTom_POIIntegration.lua @@ -9,7 +9,7 @@ local modTbl = { } local L = TomTomLocals -local astrolabe = DongleStub("TTAstrolabe-1.0") +local astrolabe = DongleStub("Astrolabe-1.0") -- This function and the related events/hooks are used to automatically -- update the crazy arrow to the closest quest waypoint. diff --git a/TomTom_Waypoints.lua b/TomTom_Waypoints.lua old mode 100644 new mode 100755 index 27b5755..f8a72d4 --- a/TomTom_Waypoints.lua +++ b/TomTom_Waypoints.lua @@ -8,7 +8,7 @@ -- TomTom:AddZWaypoint() and TomTom:RemoveWaypoint() instead. ----------------------------------------------------------------------------]] -local astrolabe = DongleStub("TTAstrolabe-1.0") +local astrolabe = DongleStub("Astrolabe-1.0") -- Create a tooltip to be used when mousing over waypoints local tooltip = CreateFrame("GameTooltip", "TomTomTooltip", UIParent, "GameTooltipTemplate") diff --git a/libs/AceConfig-3.0/AceConfig-3.0.lua b/libs/AceConfig-3.0/AceConfig-3.0.lua old mode 100644 new mode 100755 index f4a17cb..3bedf8c --- a/libs/AceConfig-3.0/AceConfig-3.0.lua +++ b/libs/AceConfig-3.0/AceConfig-3.0.lua @@ -1,57 +1,57 @@ ---- AceConfig-3.0 wrapper library. --- Provides an API to register an options table with the config registry, --- as well as associate it with a slash command. --- @class file --- @name AceConfig-3.0 --- @release $Id: AceConfig-3.0.lua 969 2010-10-07 02:11:48Z shefki $ - ---[[ -AceConfig-3.0 - -Very light wrapper library that combines all the AceConfig subcomponents into one more easily used whole. - -]] - -local MAJOR, MINOR = "AceConfig-3.0", 2 -local AceConfig = LibStub:NewLibrary(MAJOR, MINOR) - -if not AceConfig then return end - -local cfgreg = LibStub("AceConfigRegistry-3.0") -local cfgcmd = LibStub("AceConfigCmd-3.0") ---TODO: local cfgdlg = LibStub("AceConfigDialog-3.0", true) ---TODO: local cfgdrp = LibStub("AceConfigDropdown-3.0", true) - --- Lua APIs -local pcall, error, type, pairs = pcall, error, type, pairs - --- ------------------------------------------------------------------- --- :RegisterOptionsTable(appName, options, slashcmd, persist) --- --- - appName - (string) application name --- - options - table or function ref, see AceConfigRegistry --- - slashcmd - slash command (string) or table with commands, or nil to NOT create a slash command - ---- Register a option table with the AceConfig registry. --- You can supply a slash command (or a table of slash commands) to register with AceConfigCmd directly. --- @paramsig appName, options [, slashcmd] --- @param appName The application name for the config table. --- @param options The option table (or a function to generate one on demand). http://www.wowace.com/addons/ace3/pages/ace-config-3-0-options-tables/ --- @param slashcmd A slash command to register for the option table, or a table of slash commands. --- @usage --- local AceConfig = LibStub("AceConfig-3.0") --- AceConfig:RegisterOptionsTable("MyAddon", myOptions, {"/myslash", "/my"}) -function AceConfig:RegisterOptionsTable(appName, options, slashcmd) - local ok,msg = pcall(cfgreg.RegisterOptionsTable, self, appName, options) - if not ok then error(msg, 2) end - - if slashcmd then - if type(slashcmd) == "table" then - for _,cmd in pairs(slashcmd) do - cfgcmd:CreateChatCommand(cmd, appName) - end - else - cfgcmd:CreateChatCommand(slashcmd, appName) - end - end -end +--- AceConfig-3.0 wrapper library. +-- Provides an API to register an options table with the config registry, +-- as well as associate it with a slash command. +-- @class file +-- @name AceConfig-3.0 +-- @release $Id: AceConfig-3.0.lua 969 2010-10-07 02:11:48Z shefki $ + +--[[ +AceConfig-3.0 + +Very light wrapper library that combines all the AceConfig subcomponents into one more easily used whole. + +]] + +local MAJOR, MINOR = "AceConfig-3.0", 2 +local AceConfig = LibStub:NewLibrary(MAJOR, MINOR) + +if not AceConfig then return end + +local cfgreg = LibStub("AceConfigRegistry-3.0") +local cfgcmd = LibStub("AceConfigCmd-3.0") +--TODO: local cfgdlg = LibStub("AceConfigDialog-3.0", true) +--TODO: local cfgdrp = LibStub("AceConfigDropdown-3.0", true) + +-- Lua APIs +local pcall, error, type, pairs = pcall, error, type, pairs + +-- ------------------------------------------------------------------- +-- :RegisterOptionsTable(appName, options, slashcmd, persist) +-- +-- - appName - (string) application name +-- - options - table or function ref, see AceConfigRegistry +-- - slashcmd - slash command (string) or table with commands, or nil to NOT create a slash command + +--- Register a option table with the AceConfig registry. +-- You can supply a slash command (or a table of slash commands) to register with AceConfigCmd directly. +-- @paramsig appName, options [, slashcmd] +-- @param appName The application name for the config table. +-- @param options The option table (or a function to generate one on demand). http://www.wowace.com/addons/ace3/pages/ace-config-3-0-options-tables/ +-- @param slashcmd A slash command to register for the option table, or a table of slash commands. +-- @usage +-- local AceConfig = LibStub("AceConfig-3.0") +-- AceConfig:RegisterOptionsTable("MyAddon", myOptions, {"/myslash", "/my"}) +function AceConfig:RegisterOptionsTable(appName, options, slashcmd) + local ok,msg = pcall(cfgreg.RegisterOptionsTable, self, appName, options) + if not ok then error(msg, 2) end + + if slashcmd then + if type(slashcmd) == "table" then + for _,cmd in pairs(slashcmd) do + cfgcmd:CreateChatCommand(cmd, appName) + end + else + cfgcmd:CreateChatCommand(slashcmd, appName) + end + end +end diff --git a/libs/AceConfig-3.0/AceConfig-3.0.xml b/libs/AceConfig-3.0/AceConfig-3.0.xml old mode 100644 new mode 100755 index d9eb96a..87972ad --- a/libs/AceConfig-3.0/AceConfig-3.0.xml +++ b/libs/AceConfig-3.0/AceConfig-3.0.xml @@ -1,8 +1,8 @@ -<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ -..\FrameXML\UI.xsd"> - <Include file="AceConfigRegistry-3.0\AceConfigRegistry-3.0.xml"/> - <Include file="AceConfigCmd-3.0\AceConfigCmd-3.0.xml"/> - <Include file="AceConfigDialog-3.0\AceConfigDialog-3.0.xml"/> - <!--<Include file="AceConfigDropdown-3.0\AceConfigDropdown-3.0.xml"/>--> - <Script file="AceConfig-3.0.lua"/> +<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ +..\FrameXML\UI.xsd"> + <Include file="AceConfigRegistry-3.0\AceConfigRegistry-3.0.xml"/> + <Include file="AceConfigCmd-3.0\AceConfigCmd-3.0.xml"/> + <Include file="AceConfigDialog-3.0\AceConfigDialog-3.0.xml"/> + <!--<Include file="AceConfigDropdown-3.0\AceConfigDropdown-3.0.xml"/>--> + <Script file="AceConfig-3.0.lua"/> </Ui> \ No newline at end of file diff --git a/libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua b/libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua old mode 100644 new mode 100755 index 3936031..2023981 --- a/libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua +++ b/libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua @@ -1,787 +1,794 @@ ---- AceConfigCmd-3.0 handles access to an options table through the "command line" interface via the ChatFrames. --- @class file --- @name AceConfigCmd-3.0 --- @release $Id: AceConfigCmd-3.0.lua 904 2009-12-13 11:56:37Z nevcairiel $ - ---[[ -AceConfigCmd-3.0 - -Handles commandline optionstable access - -REQUIRES: AceConsole-3.0 for command registration (loaded on demand) - -]] - --- TODO: plugin args - - -local MAJOR, MINOR = "AceConfigCmd-3.0", 12 -local AceConfigCmd = LibStub:NewLibrary(MAJOR, MINOR) - -if not AceConfigCmd then return end - -AceConfigCmd.commands = AceConfigCmd.commands or {} -local commands = AceConfigCmd.commands - -local cfgreg = LibStub("AceConfigRegistry-3.0") -local AceConsole -- LoD -local AceConsoleName = "AceConsole-3.0" - --- Lua APIs -local strsub, strsplit, strlower, strmatch, strtrim = string.sub, string.split, string.lower, string.match, string.trim -local format, tonumber, tostring = string.format, tonumber, tostring -local tsort, tinsert = table.sort, table.insert -local select, pairs, next, type = select, pairs, next, type -local error, assert = error, assert - --- WoW APIs -local _G = _G - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: LibStub, SELECTED_CHAT_FRAME, DEFAULT_CHAT_FRAME - - -local L = setmetatable({}, { -- TODO: replace with proper locale - __index = function(self,k) return k end -}) - - - -local function print(msg) - (SELECTED_CHAT_FRAME or DEFAULT_CHAT_FRAME):AddMessage(msg) -end - --- constants used by getparam() calls below - -local handlertypes = {["table"]=true} -local handlermsg = "expected a table" - -local functypes = {["function"]=true, ["string"]=true} -local funcmsg = "expected function or member name" - - --- pickfirstset() - picks the first non-nil value and returns it - -local function pickfirstset(...) - for i=1,select("#",...) do - if select(i,...)~=nil then - return select(i,...) - end - end -end - - --- err() - produce real error() regarding malformed options tables etc - -local function err(info,inputpos,msg ) - local cmdstr=" "..strsub(info.input, 1, inputpos-1) - error(MAJOR..": /" ..info[0] ..cmdstr ..": "..(msg or "malformed options table"), 2) -end - - --- usererr() - produce chatframe message regarding bad slash syntax etc - -local function usererr(info,inputpos,msg ) - local cmdstr=strsub(info.input, 1, inputpos-1); - print("/" ..info[0] .. " "..cmdstr ..": "..(msg or "malformed options table")) -end - - --- callmethod() - call a given named method (e.g. "get", "set") with given arguments - -local function callmethod(info, inputpos, tab, methodtype, ...) - local method = info[methodtype] - if not method then - err(info, inputpos, "'"..methodtype.."': not set") - end - - info.arg = tab.arg - info.option = tab - info.type = tab.type - - if type(method)=="function" then - return method(info, ...) - elseif type(method)=="string" then - if type(info.handler[method])~="function" then - err(info, inputpos, "'"..methodtype.."': '"..method.."' is not a member function of "..tostring(info.handler)) - end - return info.handler[method](info.handler, info, ...) - else - assert(false) -- type should have already been checked on read - end -end - --- callfunction() - call a given named function (e.g. "name", "desc") with given arguments - -local function callfunction(info, tab, methodtype, ...) - local method = tab[methodtype] - - info.arg = tab.arg - info.option = tab - info.type = tab.type - - if type(method)=="function" then - return method(info, ...) - else - assert(false) -- type should have already been checked on read - end -end - --- do_final() - do the final step (set/execute) along with validation and confirmation - -local function do_final(info, inputpos, tab, methodtype, ...) - if info.validate then - local res = callmethod(info,inputpos,tab,"validate",...) - if type(res)=="string" then - usererr(info, inputpos, "'"..strsub(info.input, inputpos).."' - "..res) - return - end - end - -- console ignores .confirm - - callmethod(info,inputpos,tab,methodtype, ...) -end - - --- getparam() - used by handle() to retreive and store "handler", "get", "set", etc - -local function getparam(info, inputpos, tab, depth, paramname, types, errormsg) - local old,oldat = info[paramname], info[paramname.."_at"] - local val=tab[paramname] - if val~=nil then - if val==false then - val=nil - elseif not types[type(val)] then - err(info, inputpos, "'" .. paramname.. "' - "..errormsg) - end - info[paramname] = val - info[paramname.."_at"] = depth - end - return old,oldat -end - - --- iterateargs(tab) - custom iterator that iterates both t.args and t.plugins.* -local dummytable={} - -local function iterateargs(tab) - if not tab.plugins then - return pairs(tab.args) - end - - local argtabkey,argtab=next(tab.plugins) - local v - - return function(_, k) - while argtab do - k,v = next(argtab, k) - if k then return k,v end - if argtab==tab.args then - argtab=nil - else - argtabkey,argtab = next(tab.plugins, argtabkey) - if not argtabkey then - argtab=tab.args - end - end - end - end -end - -local function checkhidden(info, inputpos, tab) - if tab.cmdHidden~=nil then - return tab.cmdHidden - end - local hidden = tab.hidden - if type(hidden) == "function" or type(hidden) == "string" then - info.hidden = hidden - hidden = callmethod(info, inputpos, tab, 'hidden') - info.hidden = nil - end - return hidden -end - -local function showhelp(info, inputpos, tab, depth, noHead) - if not noHead then - print("|cff33ff99"..info.appName.."|r: Arguments to |cffffff78/"..info[0].."|r "..strsub(info.input,1,inputpos-1)..":") - end - - local sortTbl = {} -- [1..n]=name - local refTbl = {} -- [name]=tableref - - for k,v in iterateargs(tab) do - if not refTbl[k] then -- a plugin overriding something in .args - tinsert(sortTbl, k) - refTbl[k] = v - end - end - - tsort(sortTbl, function(one, two) - local o1 = refTbl[one].order or 100 - local o2 = refTbl[two].order or 100 - if type(o1) == "function" or type(o1) == "string" then - info.order = o1 - info[#info+1] = one - o1 = callmethod(info, inputpos, refTbl[one], "order") - info[#info] = nil - info.order = nil - end - if type(o2) == "function" or type(o1) == "string" then - info.order = o2 - info[#info+1] = two - o2 = callmethod(info, inputpos, refTbl[two], "order") - info[#info] = nil - info.order = nil - end - if o1<0 and o2<0 then return o1<o2 end - if o2<0 then return true end - if o1<0 then return false end - if o1==o2 then return tostring(one)<tostring(two) end -- compare names - return o1<o2 - end) - - for i = 1, #sortTbl do - local k = sortTbl[i] - local v = refTbl[k] - if not checkhidden(info, inputpos, v) then - if v.type ~= "description" and v.type ~= "header" then - -- recursively show all inline groups - local name, desc = v.name, v.desc - if type(name) == "function" then - name = callfunction(info, v, 'name') - end - if type(desc) == "function" then - desc = callfunction(info, v, 'desc') - end - if v.type == "group" and pickfirstset(v.cmdInline, v.inline, false) then - print(" "..(desc or name)..":") - local oldhandler,oldhandler_at = getparam(info, inputpos, v, depth, "handler", handlertypes, handlermsg) - showhelp(info, inputpos, v, depth, true) - info.handler,info.handler_at = oldhandler,oldhandler_at - else - local key = k:gsub(" ", "_") - print(" |cffffff78"..key.."|r - "..(desc or name or "")) - end - end - end - end -end - - -local function keybindingValidateFunc(text) - if text == nil or text == "NONE" then - return nil - end - text = text:upper() - local shift, ctrl, alt - local modifier - while true do - if text == "-" then - break - end - modifier, text = strsplit('-', text, 2) - if text then - if modifier ~= "SHIFT" and modifier ~= "CTRL" and modifier ~= "ALT" then - return false - end - if modifier == "SHIFT" then - if shift then - return false - end - shift = true - end - if modifier == "CTRL" then - if ctrl then - return false - end - ctrl = true - end - if modifier == "ALT" then - if alt then - return false - end - alt = true - end - else - text = modifier - break - end - end - if text == "" then - return false - end - if not text:find("^F%d+$") and text ~= "CAPSLOCK" and text:len() ~= 1 and (text:byte() < 128 or text:len() > 4) and not _G["KEY_" .. text] then - return false - end - local s = text - if shift then - s = "SHIFT-" .. s - end - if ctrl then - s = "CTRL-" .. s - end - if alt then - s = "ALT-" .. s - end - return s -end - --- handle() - selfrecursing function that processes input->optiontable --- - depth - starts at 0 --- - retfalse - return false rather than produce error if a match is not found (used by inlined groups) - -local function handle(info, inputpos, tab, depth, retfalse) - - if not(type(tab)=="table" and type(tab.type)=="string") then err(info,inputpos) end - - ------------------------------------------------------------------- - -- Grab hold of handler,set,get,func,etc if set (and remember old ones) - -- Note that we do NOT validate if method names are correct at this stage, - -- the handler may change before they're actually used! - - local oldhandler,oldhandler_at = getparam(info,inputpos,tab,depth,"handler",handlertypes,handlermsg) - local oldset,oldset_at = getparam(info,inputpos,tab,depth,"set",functypes,funcmsg) - local oldget,oldget_at = getparam(info,inputpos,tab,depth,"get",functypes,funcmsg) - local oldfunc,oldfunc_at = getparam(info,inputpos,tab,depth,"func",functypes,funcmsg) - local oldvalidate,oldvalidate_at = getparam(info,inputpos,tab,depth,"validate",functypes,funcmsg) - --local oldconfirm,oldconfirm_at = getparam(info,inputpos,tab,depth,"confirm",functypes,funcmsg) - - ------------------------------------------------------------------- - -- Act according to .type of this table - - if tab.type=="group" then - ------------ group -------------------------------------------- - - if type(tab.args)~="table" then err(info, inputpos) end - if tab.plugins and type(tab.plugins)~="table" then err(info,inputpos) end - - -- grab next arg from input - local _,nextpos,arg = (info.input):find(" *([^ ]+) *", inputpos) - if not arg then - showhelp(info, inputpos, tab, depth) - return - end - nextpos=nextpos+1 - - -- loop .args and try to find a key with a matching name - for k,v in iterateargs(tab) do - if not(type(k)=="string" and type(v)=="table" and type(v.type)=="string") then err(info,inputpos, "options table child '"..tostring(k).."' is malformed") end - - -- is this child an inline group? if so, traverse into it - if v.type=="group" and pickfirstset(v.cmdInline, v.inline, false) then - info[depth+1] = k - if handle(info, inputpos, v, depth+1, true)==false then - info[depth+1] = nil - -- wasn't found in there, but that's ok, we just keep looking down here - else - return -- done, name was found in inline group - end - -- matching name and not a inline group - elseif strlower(arg)==strlower(k:gsub(" ", "_")) then - info[depth+1] = k - return handle(info,nextpos,v,depth+1) - end - end - - -- no match - if retfalse then - -- restore old infotable members and return false to indicate failure - info.handler,info.handler_at = oldhandler,oldhandler_at - info.set,info.set_at = oldset,oldset_at - info.get,info.get_at = oldget,oldget_at - info.func,info.func_at = oldfunc,oldfunc_at - info.validate,info.validate_at = oldvalidate,oldvalidate_at - --info.confirm,info.confirm_at = oldconfirm,oldconfirm_at - return false - end - - -- couldn't find the command, display error - usererr(info, inputpos, "'"..arg.."' - " .. L["unknown argument"]) - return - end - - local str = strsub(info.input,inputpos); - - if tab.type=="execute" then - ------------ execute -------------------------------------------- - do_final(info, inputpos, tab, "func") - - - - elseif tab.type=="input" then - ------------ input -------------------------------------------- - - local res = true - if tab.pattern then - if not(type(tab.pattern)=="string") then err(info, inputpos, "'pattern' - expected a string") end - if not strmatch(str, tab.pattern) then - usererr(info, inputpos, "'"..str.."' - " .. L["invalid input"]) - return - end - end - - do_final(info, inputpos, tab, "set", str) - - - - elseif tab.type=="toggle" then - ------------ toggle -------------------------------------------- - local b - local str = strtrim(strlower(str)) - if str=="" then - b = callmethod(info, inputpos, tab, "get") - - if tab.tristate then - --cycle in true, nil, false order - if b then - b = nil - elseif b == nil then - b = false - else - b = true - end - else - b = not b - end - - elseif str==L["on"] then - b = true - elseif str==L["off"] then - b = false - elseif tab.tristate and str==L["default"] then - b = nil - else - if tab.tristate then - usererr(info, inputpos, format(L["'%s' - expected 'on', 'off' or 'default', or no argument to toggle."], str)) - else - usererr(info, inputpos, format(L["'%s' - expected 'on' or 'off', or no argument to toggle."], str)) - end - return - end - - do_final(info, inputpos, tab, "set", b) - - - elseif tab.type=="range" then - ------------ range -------------------------------------------- - local val = tonumber(str) - if not val then - usererr(info, inputpos, "'"..str.."' - "..L["expected number"]) - return - end - if type(info.step)=="number" then - val = val- (val % info.step) - end - if type(info.min)=="number" and val<info.min then - usererr(info, inputpos, val.." - "..format(L["must be equal to or higher than %s"], tostring(info.min)) ) - return - end - if type(info.max)=="number" and val>info.max then - usererr(info, inputpos, val.." - "..format(L["must be equal to or lower than %s"], tostring(info.max)) ) - return - end - - do_final(info, inputpos, tab, "set", val) - - - elseif tab.type=="select" then - ------------ select ------------------------------------ - local str = strtrim(strlower(str)) - - local values = tab.values - if type(values) == "function" or type(values) == "string" then - info.values = values - values = callmethod(info, inputpos, tab, "values") - info.values = nil - end - - if str == "" then - local b = callmethod(info, inputpos, tab, "get") - local fmt = "|cffffff78- [%s]|r %s" - local fmt_sel = "|cffffff78- [%s]|r %s |cffff0000*|r" - print(L["Options for |cffffff78"..info[#info].."|r:"]) - for k, v in pairs(values) do - if b == k then - print(fmt_sel:format(k, v)) - else - print(fmt:format(k, v)) - end - end - return - end - - local ok - for k,v in pairs(values) do - if strlower(k)==str then - str = k -- overwrite with key (in case of case mismatches) - ok = true - break - end - end - if not ok then - usererr(info, inputpos, "'"..str.."' - "..L["unknown selection"]) - return - end - - do_final(info, inputpos, tab, "set", str) - - elseif tab.type=="multiselect" then - ------------ multiselect ------------------------------------------- - local str = strtrim(strlower(str)) - - local values = tab.values - if type(values) == "function" or type(values) == "string" then - info.values = values - values = callmethod(info, inputpos, tab, "values") - info.values = nil - end - - if str == "" then - local fmt = "|cffffff78- [%s]|r %s" - local fmt_sel = "|cffffff78- [%s]|r %s |cffff0000*|r" - print(L["Options for |cffffff78"..info[#info].."|r (multiple possible):"]) - for k, v in pairs(values) do - if callmethod(info, inputpos, tab, "get", k) then - print(fmt_sel:format(k, v)) - else - print(fmt:format(k, v)) - end - end - return - end - - --build a table of the selections, checking that they exist - --parse for =on =off =default in the process - --table will be key = true for options that should toggle, key = [on|off|default] for options to be set - local sels = {} - for v in str:gmatch("[^ ]+") do - --parse option=on etc - local opt, val = v:match('(.+)=(.+)') - --get option if toggling - if not opt then - opt = v - end - - --check that the opt is valid - local ok - for k,v in pairs(values) do - if strlower(k)==opt then - opt = k -- overwrite with key (in case of case mismatches) - ok = true - break - end - end - - if not ok then - usererr(info, inputpos, "'"..opt.."' - "..L["unknown selection"]) - return - end - - --check that if val was supplied it is valid - if val then - if val == L["on"] or val == L["off"] or (tab.tristate and val == L["default"]) then - --val is valid insert it - sels[opt] = val - else - if tab.tristate then - usererr(info, inputpos, format(L["'%s' '%s' - expected 'on', 'off' or 'default', or no argument to toggle."], v, val)) - else - usererr(info, inputpos, format(L["'%s' '%s' - expected 'on' or 'off', or no argument to toggle."], v, val)) - end - return - end - else - -- no val supplied, toggle - sels[opt] = true - end - end - - for opt, val in pairs(sels) do - local newval - - if (val == true) then - --toggle the option - local b = callmethod(info, inputpos, tab, "get", opt) - - if tab.tristate then - --cycle in true, nil, false order - if b then - b = nil - elseif b == nil then - b = false - else - b = true - end - else - b = not b - end - newval = b - else - --set the option as specified - if val==L["on"] then - newval = true - elseif val==L["off"] then - newval = false - elseif val==L["default"] then - newval = nil - end - end - - do_final(info, inputpos, tab, "set", opt, newval) - end - - - elseif tab.type=="color" then - ------------ color -------------------------------------------- - local str = strtrim(strlower(str)) - if str == "" then - --TODO: Show current value - return - end - - local r, g, b, a - - if tab.hasAlpha then - if str:len() == 8 and str:find("^%x*$") then - --parse a hex string - r,g,b,a = tonumber(str:sub(1, 2), 16) / 255, tonumber(str:sub(3, 4), 16) / 255, tonumber(str:sub(5, 6), 16) / 255, tonumber(str:sub(7, 8), 16) / 255 - else - --parse seperate values - r,g,b,a = str:match("^([%d%.]+) ([%d%.]+) ([%d%.]+) ([%d%.]+)$") - r,g,b,a = tonumber(r), tonumber(g), tonumber(b), tonumber(a) - end - if not (r and g and b and a) then - usererr(info, inputpos, format(L["'%s' - expected 'RRGGBBAA' or 'r g b a'."], str)) - return - end - - if r >= 0.0 and r <= 1.0 and g >= 0.0 and g <= 1.0 and b >= 0.0 and b <= 1.0 and a >= 0.0 and a <= 1.0 then - --values are valid - elseif r >= 0 and r <= 255 and g >= 0 and g <= 255 and b >= 0 and b <= 255 and a >= 0 and a <= 255 then - --values are valid 0..255, convert to 0..1 - r = r / 255 - g = g / 255 - b = b / 255 - a = a / 255 - else - --values are invalid - usererr(info, inputpos, format(L["'%s' - values must all be either in the range 0..1 or 0..255."], str)) - end - else - a = 1.0 - if str:len() == 6 and str:find("^%x*$") then - --parse a hex string - r,g,b = tonumber(str:sub(1, 2), 16) / 255, tonumber(str:sub(3, 4), 16) / 255, tonumber(str:sub(5, 6), 16) / 255 - else - --parse seperate values - r,g,b = str:match("^([%d%.]+) ([%d%.]+) ([%d%.]+)$") - r,g,b = tonumber(r), tonumber(g), tonumber(b) - end - if not (r and g and b) then - usererr(info, inputpos, format(L["'%s' - expected 'RRGGBB' or 'r g b'."], str)) - return - end - if r >= 0.0 and r <= 1.0 and g >= 0.0 and g <= 1.0 and b >= 0.0 and b <= 1.0 then - --values are valid - elseif r >= 0 and r <= 255 and g >= 0 and g <= 255 and b >= 0 and b <= 255 then - --values are valid 0..255, convert to 0..1 - r = r / 255 - g = g / 255 - b = b / 255 - else - --values are invalid - usererr(info, inputpos, format(L["'%s' - values must all be either in the range 0-1 or 0-255."], str)) - end - end - - do_final(info, inputpos, tab, "set", r,g,b,a) - - elseif tab.type=="keybinding" then - ------------ keybinding -------------------------------------------- - local str = strtrim(strlower(str)) - if str == "" then - --TODO: Show current value - return - end - local value = keybindingValidateFunc(str:upper()) - if value == false then - usererr(info, inputpos, format(L["'%s' - Invalid Keybinding."], str)) - return - end - - do_final(info, inputpos, tab, "set", value) - - elseif tab.type=="description" then - ------------ description -------------------- - -- ignore description, GUI config only - else - err(info, inputpos, "unknown options table item type '"..tostring(tab.type).."'") - end -end - ---- Handle the chat command. --- This is usually called from a chat command handler to parse the command input as operations on an aceoptions table.\\ --- AceConfigCmd uses this function internally when a slash command is registered with `:CreateChatCommand` --- @param slashcmd The slash command WITHOUT leading slash (only used for error output) --- @param appName The application name as given to `:RegisterOptionsTable()` --- @param input The commandline input (as given by the WoW handler, i.e. without the command itself) --- @usage --- MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon", "AceConsole-3.0") --- -- Use AceConsole-3.0 to register a Chat Command --- MyAddon:RegisterChatCommand("mychat", "ChatCommand") --- --- -- Show the GUI if no input is supplied, otherwise handle the chat input. --- function MyAddon:ChatCommand(input) --- -- Assuming "MyOptions" is the appName of a valid options table --- if not input or input:trim() == "" then --- LibStub("AceConfigDialog-3.0"):Open("MyOptions") --- else --- LibStub("AceConfigCmd-3.0").HandleCommand(MyAddon, "mychat", "MyOptions", input) --- end --- end -function AceConfigCmd:HandleCommand(slashcmd, appName, input) - - local optgetter = cfgreg:GetOptionsTable(appName) - if not optgetter then - error([[Usage: HandleCommand("slashcmd", "appName", "input"): 'appName' - no options table "]]..tostring(appName)..[[" has been registered]], 2) - end - local options = assert( optgetter("cmd", MAJOR) ) - - local info = { -- Don't try to recycle this, it gets handed off to callbacks and whatnot - [0] = slashcmd, - appName = appName, - options = options, - input = input, - self = self, - handler = self, - uiType = "cmd", - uiName = MAJOR, - } - - handle(info, 1, options, 0) -- (info, inputpos, table, depth) -end - ---- Utility function to create a slash command handler. --- Also registers tab completion with AceTab --- @param slashcmd The slash command WITHOUT leading slash (only used for error output) --- @param appName The application name as given to `:RegisterOptionsTable()` -function AceConfigCmd:CreateChatCommand(slashcmd, appName) - if not AceConsole then - AceConsole = LibStub(AceConsoleName) - end - if AceConsole.RegisterChatCommand(self, slashcmd, function(input) - AceConfigCmd.HandleCommand(self, slashcmd, appName, input) -- upgradable - end, - true) then -- succesfully registered so lets get the command -> app table in - commands[slashcmd] = appName - end -end - ---- Utility function that returns the options table that belongs to a slashcommand. --- Designed to be used for the AceTab interface. --- @param slashcmd The slash command WITHOUT leading slash (only used for error output) --- @return The options table associated with the slash command (or nil if the slash command was not registered) -function AceConfigCmd:GetChatCommandOptions(slashcmd) - return commands[slashcmd] -end +--- AceConfigCmd-3.0 handles access to an options table through the "command line" interface via the ChatFrames. +-- @class file +-- @name AceConfigCmd-3.0 +-- @release $Id: AceConfigCmd-3.0.lua 1045 2011-12-09 17:58:40Z nevcairiel $ + +--[[ +AceConfigCmd-3.0 + +Handles commandline optionstable access + +REQUIRES: AceConsole-3.0 for command registration (loaded on demand) + +]] + +-- TODO: plugin args + + +local MAJOR, MINOR = "AceConfigCmd-3.0", 13 +local AceConfigCmd = LibStub:NewLibrary(MAJOR, MINOR) + +if not AceConfigCmd then return end + +AceConfigCmd.commands = AceConfigCmd.commands or {} +local commands = AceConfigCmd.commands + +local cfgreg = LibStub("AceConfigRegistry-3.0") +local AceConsole -- LoD +local AceConsoleName = "AceConsole-3.0" + +-- Lua APIs +local strsub, strsplit, strlower, strmatch, strtrim = string.sub, string.split, string.lower, string.match, string.trim +local format, tonumber, tostring = string.format, tonumber, tostring +local tsort, tinsert = table.sort, table.insert +local select, pairs, next, type = select, pairs, next, type +local error, assert = error, assert + +-- WoW APIs +local _G = _G + +-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded +-- List them here for Mikk's FindGlobals script +-- GLOBALS: LibStub, SELECTED_CHAT_FRAME, DEFAULT_CHAT_FRAME + + +local L = setmetatable({}, { -- TODO: replace with proper locale + __index = function(self,k) return k end +}) + + + +local function print(msg) + (SELECTED_CHAT_FRAME or DEFAULT_CHAT_FRAME):AddMessage(msg) +end + +-- constants used by getparam() calls below + +local handlertypes = {["table"]=true} +local handlermsg = "expected a table" + +local functypes = {["function"]=true, ["string"]=true} +local funcmsg = "expected function or member name" + + +-- pickfirstset() - picks the first non-nil value and returns it + +local function pickfirstset(...) + for i=1,select("#",...) do + if select(i,...)~=nil then + return select(i,...) + end + end +end + + +-- err() - produce real error() regarding malformed options tables etc + +local function err(info,inputpos,msg ) + local cmdstr=" "..strsub(info.input, 1, inputpos-1) + error(MAJOR..": /" ..info[0] ..cmdstr ..": "..(msg or "malformed options table"), 2) +end + + +-- usererr() - produce chatframe message regarding bad slash syntax etc + +local function usererr(info,inputpos,msg ) + local cmdstr=strsub(info.input, 1, inputpos-1); + print("/" ..info[0] .. " "..cmdstr ..": "..(msg or "malformed options table")) +end + + +-- callmethod() - call a given named method (e.g. "get", "set") with given arguments + +local function callmethod(info, inputpos, tab, methodtype, ...) + local method = info[methodtype] + if not method then + err(info, inputpos, "'"..methodtype.."': not set") + end + + info.arg = tab.arg + info.option = tab + info.type = tab.type + + if type(method)=="function" then + return method(info, ...) + elseif type(method)=="string" then + if type(info.handler[method])~="function" then + err(info, inputpos, "'"..methodtype.."': '"..method.."' is not a member function of "..tostring(info.handler)) + end + return info.handler[method](info.handler, info, ...) + else + assert(false) -- type should have already been checked on read + end +end + +-- callfunction() - call a given named function (e.g. "name", "desc") with given arguments + +local function callfunction(info, tab, methodtype, ...) + local method = tab[methodtype] + + info.arg = tab.arg + info.option = tab + info.type = tab.type + + if type(method)=="function" then + return method(info, ...) + else + assert(false) -- type should have already been checked on read + end +end + +-- do_final() - do the final step (set/execute) along with validation and confirmation + +local function do_final(info, inputpos, tab, methodtype, ...) + if info.validate then + local res = callmethod(info,inputpos,tab,"validate",...) + if type(res)=="string" then + usererr(info, inputpos, "'"..strsub(info.input, inputpos).."' - "..res) + return + end + end + -- console ignores .confirm + + callmethod(info,inputpos,tab,methodtype, ...) +end + + +-- getparam() - used by handle() to retreive and store "handler", "get", "set", etc + +local function getparam(info, inputpos, tab, depth, paramname, types, errormsg) + local old,oldat = info[paramname], info[paramname.."_at"] + local val=tab[paramname] + if val~=nil then + if val==false then + val=nil + elseif not types[type(val)] then + err(info, inputpos, "'" .. paramname.. "' - "..errormsg) + end + info[paramname] = val + info[paramname.."_at"] = depth + end + return old,oldat +end + + +-- iterateargs(tab) - custom iterator that iterates both t.args and t.plugins.* +local dummytable={} + +local function iterateargs(tab) + if not tab.plugins then + return pairs(tab.args) + end + + local argtabkey,argtab=next(tab.plugins) + local v + + return function(_, k) + while argtab do + k,v = next(argtab, k) + if k then return k,v end + if argtab==tab.args then + argtab=nil + else + argtabkey,argtab = next(tab.plugins, argtabkey) + if not argtabkey then + argtab=tab.args + end + end + end + end +end + +local function checkhidden(info, inputpos, tab) + if tab.cmdHidden~=nil then + return tab.cmdHidden + end + local hidden = tab.hidden + if type(hidden) == "function" or type(hidden) == "string" then + info.hidden = hidden + hidden = callmethod(info, inputpos, tab, 'hidden') + info.hidden = nil + end + return hidden +end + +local function showhelp(info, inputpos, tab, depth, noHead) + if not noHead then + print("|cff33ff99"..info.appName.."|r: Arguments to |cffffff78/"..info[0].."|r "..strsub(info.input,1,inputpos-1)..":") + end + + local sortTbl = {} -- [1..n]=name + local refTbl = {} -- [name]=tableref + + for k,v in iterateargs(tab) do + if not refTbl[k] then -- a plugin overriding something in .args + tinsert(sortTbl, k) + refTbl[k] = v + end + end + + tsort(sortTbl, function(one, two) + local o1 = refTbl[one].order or 100 + local o2 = refTbl[two].order or 100 + if type(o1) == "function" or type(o1) == "string" then + info.order = o1 + info[#info+1] = one + o1 = callmethod(info, inputpos, refTbl[one], "order") + info[#info] = nil + info.order = nil + end + if type(o2) == "function" or type(o1) == "string" then + info.order = o2 + info[#info+1] = two + o2 = callmethod(info, inputpos, refTbl[two], "order") + info[#info] = nil + info.order = nil + end + if o1<0 and o2<0 then return o1<o2 end + if o2<0 then return true end + if o1<0 then return false end + if o1==o2 then return tostring(one)<tostring(two) end -- compare names + return o1<o2 + end) + + for i = 1, #sortTbl do + local k = sortTbl[i] + local v = refTbl[k] + if not checkhidden(info, inputpos, v) then + if v.type ~= "description" and v.type ~= "header" then + -- recursively show all inline groups + local name, desc = v.name, v.desc + if type(name) == "function" then + name = callfunction(info, v, 'name') + end + if type(desc) == "function" then + desc = callfunction(info, v, 'desc') + end + if v.type == "group" and pickfirstset(v.cmdInline, v.inline, false) then + print(" "..(desc or name)..":") + local oldhandler,oldhandler_at = getparam(info, inputpos, v, depth, "handler", handlertypes, handlermsg) + showhelp(info, inputpos, v, depth, true) + info.handler,info.handler_at = oldhandler,oldhandler_at + else + local key = k:gsub(" ", "_") + print(" |cffffff78"..key.."|r - "..(desc or name or "")) + end + end + end + end +end + + +local function keybindingValidateFunc(text) + if text == nil or text == "NONE" then + return nil + end + text = text:upper() + local shift, ctrl, alt + local modifier + while true do + if text == "-" then + break + end + modifier, text = strsplit('-', text, 2) + if text then + if modifier ~= "SHIFT" and modifier ~= "CTRL" and modifier ~= "ALT" then + return false + end + if modifier == "SHIFT" then + if shift then + return false + end + shift = true + end + if modifier == "CTRL" then + if ctrl then + return false + end + ctrl = true + end + if modifier == "ALT" then + if alt then + return false + end + alt = true + end + else + text = modifier + break + end + end + if text == "" then + return false + end + if not text:find("^F%d+$") and text ~= "CAPSLOCK" and text:len() ~= 1 and (text:byte() < 128 or text:len() > 4) and not _G["KEY_" .. text] then + return false + end + local s = text + if shift then + s = "SHIFT-" .. s + end + if ctrl then + s = "CTRL-" .. s + end + if alt then + s = "ALT-" .. s + end + return s +end + +-- handle() - selfrecursing function that processes input->optiontable +-- - depth - starts at 0 +-- - retfalse - return false rather than produce error if a match is not found (used by inlined groups) + +local function handle(info, inputpos, tab, depth, retfalse) + + if not(type(tab)=="table" and type(tab.type)=="string") then err(info,inputpos) end + + ------------------------------------------------------------------- + -- Grab hold of handler,set,get,func,etc if set (and remember old ones) + -- Note that we do NOT validate if method names are correct at this stage, + -- the handler may change before they're actually used! + + local oldhandler,oldhandler_at = getparam(info,inputpos,tab,depth,"handler",handlertypes,handlermsg) + local oldset,oldset_at = getparam(info,inputpos,tab,depth,"set",functypes,funcmsg) + local oldget,oldget_at = getparam(info,inputpos,tab,depth,"get",functypes,funcmsg) + local oldfunc,oldfunc_at = getparam(info,inputpos,tab,depth,"func",functypes,funcmsg) + local oldvalidate,oldvalidate_at = getparam(info,inputpos,tab,depth,"validate",functypes,funcmsg) + --local oldconfirm,oldconfirm_at = getparam(info,inputpos,tab,depth,"confirm",functypes,funcmsg) + + ------------------------------------------------------------------- + -- Act according to .type of this table + + if tab.type=="group" then + ------------ group -------------------------------------------- + + if type(tab.args)~="table" then err(info, inputpos) end + if tab.plugins and type(tab.plugins)~="table" then err(info,inputpos) end + + -- grab next arg from input + local _,nextpos,arg = (info.input):find(" *([^ ]+) *", inputpos) + if not arg then + showhelp(info, inputpos, tab, depth) + return + end + nextpos=nextpos+1 + + -- loop .args and try to find a key with a matching name + for k,v in iterateargs(tab) do + if not(type(k)=="string" and type(v)=="table" and type(v.type)=="string") then err(info,inputpos, "options table child '"..tostring(k).."' is malformed") end + + -- is this child an inline group? if so, traverse into it + if v.type=="group" and pickfirstset(v.cmdInline, v.inline, false) then + info[depth+1] = k + if handle(info, inputpos, v, depth+1, true)==false then + info[depth+1] = nil + -- wasn't found in there, but that's ok, we just keep looking down here + else + return -- done, name was found in inline group + end + -- matching name and not a inline group + elseif strlower(arg)==strlower(k:gsub(" ", "_")) then + info[depth+1] = k + return handle(info,nextpos,v,depth+1) + end + end + + -- no match + if retfalse then + -- restore old infotable members and return false to indicate failure + info.handler,info.handler_at = oldhandler,oldhandler_at + info.set,info.set_at = oldset,oldset_at + info.get,info.get_at = oldget,oldget_at + info.func,info.func_at = oldfunc,oldfunc_at + info.validate,info.validate_at = oldvalidate,oldvalidate_at + --info.confirm,info.confirm_at = oldconfirm,oldconfirm_at + return false + end + + -- couldn't find the command, display error + usererr(info, inputpos, "'"..arg.."' - " .. L["unknown argument"]) + return + end + + local str = strsub(info.input,inputpos); + + if tab.type=="execute" then + ------------ execute -------------------------------------------- + do_final(info, inputpos, tab, "func") + + + + elseif tab.type=="input" then + ------------ input -------------------------------------------- + + local res = true + if tab.pattern then + if not(type(tab.pattern)=="string") then err(info, inputpos, "'pattern' - expected a string") end + if not strmatch(str, tab.pattern) then + usererr(info, inputpos, "'"..str.."' - " .. L["invalid input"]) + return + end + end + + do_final(info, inputpos, tab, "set", str) + + + + elseif tab.type=="toggle" then + ------------ toggle -------------------------------------------- + local b + local str = strtrim(strlower(str)) + if str=="" then + b = callmethod(info, inputpos, tab, "get") + + if tab.tristate then + --cycle in true, nil, false order + if b then + b = nil + elseif b == nil then + b = false + else + b = true + end + else + b = not b + end + + elseif str==L["on"] then + b = true + elseif str==L["off"] then + b = false + elseif tab.tristate and str==L["default"] then + b = nil + else + if tab.tristate then + usererr(info, inputpos, format(L["'%s' - expected 'on', 'off' or 'default', or no argument to toggle."], str)) + else + usererr(info, inputpos, format(L["'%s' - expected 'on' or 'off', or no argument to toggle."], str)) + end + return + end + + do_final(info, inputpos, tab, "set", b) + + + elseif tab.type=="range" then + ------------ range -------------------------------------------- + local val = tonumber(str) + if not val then + usererr(info, inputpos, "'"..str.."' - "..L["expected number"]) + return + end + if type(info.step)=="number" then + val = val- (val % info.step) + end + if type(info.min)=="number" and val<info.min then + usererr(info, inputpos, val.." - "..format(L["must be equal to or higher than %s"], tostring(info.min)) ) + return + end + if type(info.max)=="number" and val>info.max then + usererr(info, inputpos, val.." - "..format(L["must be equal to or lower than %s"], tostring(info.max)) ) + return + end + + do_final(info, inputpos, tab, "set", val) + + + elseif tab.type=="select" then + ------------ select ------------------------------------ + local str = strtrim(strlower(str)) + + local values = tab.values + if type(values) == "function" or type(values) == "string" then + info.values = values + values = callmethod(info, inputpos, tab, "values") + info.values = nil + end + + if str == "" then + local b = callmethod(info, inputpos, tab, "get") + local fmt = "|cffffff78- [%s]|r %s" + local fmt_sel = "|cffffff78- [%s]|r %s |cffff0000*|r" + print(L["Options for |cffffff78"..info[#info].."|r:"]) + for k, v in pairs(values) do + if b == k then + print(fmt_sel:format(k, v)) + else + print(fmt:format(k, v)) + end + end + return + end + + local ok + for k,v in pairs(values) do + if strlower(k)==str then + str = k -- overwrite with key (in case of case mismatches) + ok = true + break + end + end + if not ok then + usererr(info, inputpos, "'"..str.."' - "..L["unknown selection"]) + return + end + + do_final(info, inputpos, tab, "set", str) + + elseif tab.type=="multiselect" then + ------------ multiselect ------------------------------------------- + local str = strtrim(strlower(str)) + + local values = tab.values + if type(values) == "function" or type(values) == "string" then + info.values = values + values = callmethod(info, inputpos, tab, "values") + info.values = nil + end + + if str == "" then + local fmt = "|cffffff78- [%s]|r %s" + local fmt_sel = "|cffffff78- [%s]|r %s |cffff0000*|r" + print(L["Options for |cffffff78"..info[#info].."|r (multiple possible):"]) + for k, v in pairs(values) do + if callmethod(info, inputpos, tab, "get", k) then + print(fmt_sel:format(k, v)) + else + print(fmt:format(k, v)) + end + end + return + end + + --build a table of the selections, checking that they exist + --parse for =on =off =default in the process + --table will be key = true for options that should toggle, key = [on|off|default] for options to be set + local sels = {} + for v in str:gmatch("[^ ]+") do + --parse option=on etc + local opt, val = v:match('(.+)=(.+)') + --get option if toggling + if not opt then + opt = v + end + + --check that the opt is valid + local ok + for k,v in pairs(values) do + if strlower(k)==opt then + opt = k -- overwrite with key (in case of case mismatches) + ok = true + break + end + end + + if not ok then + usererr(info, inputpos, "'"..opt.."' - "..L["unknown selection"]) + return + end + + --check that if val was supplied it is valid + if val then + if val == L["on"] or val == L["off"] or (tab.tristate and val == L["default"]) then + --val is valid insert it + sels[opt] = val + else + if tab.tristate then + usererr(info, inputpos, format(L["'%s' '%s' - expected 'on', 'off' or 'default', or no argument to toggle."], v, val)) + else + usererr(info, inputpos, format(L["'%s' '%s' - expected 'on' or 'off', or no argument to toggle."], v, val)) + end + return + end + else + -- no val supplied, toggle + sels[opt] = true + end + end + + for opt, val in pairs(sels) do + local newval + + if (val == true) then + --toggle the option + local b = callmethod(info, inputpos, tab, "get", opt) + + if tab.tristate then + --cycle in true, nil, false order + if b then + b = nil + elseif b == nil then + b = false + else + b = true + end + else + b = not b + end + newval = b + else + --set the option as specified + if val==L["on"] then + newval = true + elseif val==L["off"] then + newval = false + elseif val==L["default"] then + newval = nil + end + end + + do_final(info, inputpos, tab, "set", opt, newval) + end + + + elseif tab.type=="color" then + ------------ color -------------------------------------------- + local str = strtrim(strlower(str)) + if str == "" then + --TODO: Show current value + return + end + + local r, g, b, a + + local hasAlpha = tab.hasAlpha + if type(hasAlpha) == "function" or type(hasAlpha) == "string" then + info.hasAlpha = hasAlpha + hasAlpha = callmethod(info, inputpos, tab, 'hasAlpha') + info.hasAlpha = nil + end + + if hasAlpha then + if str:len() == 8 and str:find("^%x*$") then + --parse a hex string + r,g,b,a = tonumber(str:sub(1, 2), 16) / 255, tonumber(str:sub(3, 4), 16) / 255, tonumber(str:sub(5, 6), 16) / 255, tonumber(str:sub(7, 8), 16) / 255 + else + --parse seperate values + r,g,b,a = str:match("^([%d%.]+) ([%d%.]+) ([%d%.]+) ([%d%.]+)$") + r,g,b,a = tonumber(r), tonumber(g), tonumber(b), tonumber(a) + end + if not (r and g and b and a) then + usererr(info, inputpos, format(L["'%s' - expected 'RRGGBBAA' or 'r g b a'."], str)) + return + end + + if r >= 0.0 and r <= 1.0 and g >= 0.0 and g <= 1.0 and b >= 0.0 and b <= 1.0 and a >= 0.0 and a <= 1.0 then + --values are valid + elseif r >= 0 and r <= 255 and g >= 0 and g <= 255 and b >= 0 and b <= 255 and a >= 0 and a <= 255 then + --values are valid 0..255, convert to 0..1 + r = r / 255 + g = g / 255 + b = b / 255 + a = a / 255 + else + --values are invalid + usererr(info, inputpos, format(L["'%s' - values must all be either in the range 0..1 or 0..255."], str)) + end + else + a = 1.0 + if str:len() == 6 and str:find("^%x*$") then + --parse a hex string + r,g,b = tonumber(str:sub(1, 2), 16) / 255, tonumber(str:sub(3, 4), 16) / 255, tonumber(str:sub(5, 6), 16) / 255 + else + --parse seperate values + r,g,b = str:match("^([%d%.]+) ([%d%.]+) ([%d%.]+)$") + r,g,b = tonumber(r), tonumber(g), tonumber(b) + end + if not (r and g and b) then + usererr(info, inputpos, format(L["'%s' - expected 'RRGGBB' or 'r g b'."], str)) + return + end + if r >= 0.0 and r <= 1.0 and g >= 0.0 and g <= 1.0 and b >= 0.0 and b <= 1.0 then + --values are valid + elseif r >= 0 and r <= 255 and g >= 0 and g <= 255 and b >= 0 and b <= 255 then + --values are valid 0..255, convert to 0..1 + r = r / 255 + g = g / 255 + b = b / 255 + else + --values are invalid + usererr(info, inputpos, format(L["'%s' - values must all be either in the range 0-1 or 0-255."], str)) + end + end + + do_final(info, inputpos, tab, "set", r,g,b,a) + + elseif tab.type=="keybinding" then + ------------ keybinding -------------------------------------------- + local str = strtrim(strlower(str)) + if str == "" then + --TODO: Show current value + return + end + local value = keybindingValidateFunc(str:upper()) + if value == false then + usererr(info, inputpos, format(L["'%s' - Invalid Keybinding."], str)) + return + end + + do_final(info, inputpos, tab, "set", value) + + elseif tab.type=="description" then + ------------ description -------------------- + -- ignore description, GUI config only + else + err(info, inputpos, "unknown options table item type '"..tostring(tab.type).."'") + end +end + +--- Handle the chat command. +-- This is usually called from a chat command handler to parse the command input as operations on an aceoptions table.\\ +-- AceConfigCmd uses this function internally when a slash command is registered with `:CreateChatCommand` +-- @param slashcmd The slash command WITHOUT leading slash (only used for error output) +-- @param appName The application name as given to `:RegisterOptionsTable()` +-- @param input The commandline input (as given by the WoW handler, i.e. without the command itself) +-- @usage +-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon", "AceConsole-3.0") +-- -- Use AceConsole-3.0 to register a Chat Command +-- MyAddon:RegisterChatCommand("mychat", "ChatCommand") +-- +-- -- Show the GUI if no input is supplied, otherwise handle the chat input. +-- function MyAddon:ChatCommand(input) +-- -- Assuming "MyOptions" is the appName of a valid options table +-- if not input or input:trim() == "" then +-- LibStub("AceConfigDialog-3.0"):Open("MyOptions") +-- else +-- LibStub("AceConfigCmd-3.0").HandleCommand(MyAddon, "mychat", "MyOptions", input) +-- end +-- end +function AceConfigCmd:HandleCommand(slashcmd, appName, input) + + local optgetter = cfgreg:GetOptionsTable(appName) + if not optgetter then + error([[Usage: HandleCommand("slashcmd", "appName", "input"): 'appName' - no options table "]]..tostring(appName)..[[" has been registered]], 2) + end + local options = assert( optgetter("cmd", MAJOR) ) + + local info = { -- Don't try to recycle this, it gets handed off to callbacks and whatnot + [0] = slashcmd, + appName = appName, + options = options, + input = input, + self = self, + handler = self, + uiType = "cmd", + uiName = MAJOR, + } + + handle(info, 1, options, 0) -- (info, inputpos, table, depth) +end + +--- Utility function to create a slash command handler. +-- Also registers tab completion with AceTab +-- @param slashcmd The slash command WITHOUT leading slash (only used for error output) +-- @param appName The application name as given to `:RegisterOptionsTable()` +function AceConfigCmd:CreateChatCommand(slashcmd, appName) + if not AceConsole then + AceConsole = LibStub(AceConsoleName) + end + if AceConsole.RegisterChatCommand(self, slashcmd, function(input) + AceConfigCmd.HandleCommand(self, slashcmd, appName, input) -- upgradable + end, + true) then -- succesfully registered so lets get the command -> app table in + commands[slashcmd] = appName + end +end + +--- Utility function that returns the options table that belongs to a slashcommand. +-- Designed to be used for the AceTab interface. +-- @param slashcmd The slash command WITHOUT leading slash (only used for error output) +-- @return The options table associated with the slash command (or nil if the slash command was not registered) +function AceConfigCmd:GetChatCommandOptions(slashcmd) + return commands[slashcmd] +end diff --git a/libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml b/libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml old mode 100644 new mode 100755 index b2f2c20..188d354 --- a/libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml +++ b/libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml @@ -1,4 +1,4 @@ -<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ -..\FrameXML\UI.xsd"> - <Script file="AceConfigCmd-3.0.lua"/> +<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ +..\FrameXML\UI.xsd"> + <Script file="AceConfigCmd-3.0.lua"/> </Ui> \ No newline at end of file diff --git a/libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua b/libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua old mode 100644 new mode 100755 index 45f0117..0411978 --- a/libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua +++ b/libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua @@ -1,1940 +1,1947 @@ ---- AceConfigDialog-3.0 generates AceGUI-3.0 based windows based on option tables. --- @class file --- @name AceConfigDialog-3.0 --- @release $Id: AceConfigDialog-3.0.lua 998 2010-12-01 18:39:53Z nevcairiel $ - -local LibStub = LibStub -local MAJOR, MINOR = "AceConfigDialog-3.0", 54 -local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR) - -if not AceConfigDialog then return end - -AceConfigDialog.OpenFrames = AceConfigDialog.OpenFrames or {} -AceConfigDialog.Status = AceConfigDialog.Status or {} -AceConfigDialog.frame = AceConfigDialog.frame or CreateFrame("Frame") - -AceConfigDialog.frame.apps = AceConfigDialog.frame.apps or {} -AceConfigDialog.frame.closing = AceConfigDialog.frame.closing or {} -AceConfigDialog.frame.closeAllOverride = AceConfigDialog.frame.closeAllOverride or {} - -local gui = LibStub("AceGUI-3.0") -local reg = LibStub("AceConfigRegistry-3.0") - --- Lua APIs -local tconcat, tinsert, tsort, tremove = table.concat, table.insert, table.sort, table.remove -local strmatch, format = string.match, string.format -local assert, loadstring, error = assert, loadstring, error -local pairs, next, select, type, unpack, wipe = pairs, next, select, type, unpack, wipe -local rawset, tostring, tonumber = rawset, tostring, tonumber -local math_min, math_max, math_floor = math.min, math.max, math.floor - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: NORMAL_FONT_COLOR, GameTooltip, StaticPopupDialogs, ACCEPT, CANCEL, StaticPopup_Show --- GLOBALS: PlaySound, GameFontHighlight, GameFontHighlightSmall, GameFontHighlightLarge --- GLOBALS: CloseSpecialWindows, InterfaceOptions_AddCategory, geterrorhandler - -local emptyTbl = {} - ---[[ - xpcall safecall implementation -]] -local xpcall = xpcall - -local function errorhandler(err) - return geterrorhandler()(err) -end - -local function CreateDispatcher(argCount) - local code = [[ - local xpcall, eh = ... - local method, ARGS - local function call() return method(ARGS) end - - local function dispatch(func, ...) - method = func - if not method then return end - ARGS = ... - return xpcall(call, eh) - end - - return dispatch - ]] - - local ARGS = {} - for i = 1, argCount do ARGS[i] = "arg"..i end - code = code:gsub("ARGS", tconcat(ARGS, ", ")) - return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(xpcall, errorhandler) -end - -local Dispatchers = setmetatable({}, {__index=function(self, argCount) - local dispatcher = CreateDispatcher(argCount) - rawset(self, argCount, dispatcher) - return dispatcher -end}) -Dispatchers[0] = function(func) - return xpcall(func, errorhandler) -end - -local function safecall(func, ...) - return Dispatchers[select("#", ...)](func, ...) -end - -local width_multiplier = 170 - ---[[ -Group Types - Tree - All Descendant Groups will all become nodes on the tree, direct child options will appear above the tree - - Descendant Groups with inline=true and thier children will not become nodes - - Tab - Direct Child Groups will become tabs, direct child options will appear above the tab control - - Grandchild groups will default to inline unless specified otherwise - - Select- Same as Tab but with entries in a dropdown rather than tabs - - - Inline Groups - - Will not become nodes of a select group, they will be effectivly part of thier parent group seperated by a border - - If declared on a direct child of a root node of a select group, they will appear above the group container control - - When a group is displayed inline, all descendants will also be inline members of the group - -]] - --- Recycling functions -local new, del, copy ---newcount, delcount,createdcount,cached = 0,0,0 -do - local pool = setmetatable({},{__mode="k"}) - function new() - --newcount = newcount + 1 - local t = next(pool) - if t then - pool[t] = nil - return t - else - --createdcount = createdcount + 1 - return {} - end - end - function copy(t) - local c = new() - for k, v in pairs(t) do - c[k] = v - end - return c - end - function del(t) - --delcount = delcount + 1 - wipe(t) - pool[t] = true - end --- function cached() --- local n = 0 --- for k in pairs(pool) do --- n = n + 1 --- end --- return n --- end -end - --- picks the first non-nil value and returns it -local function pickfirstset(...) - for i=1,select("#",...) do - if select(i,...)~=nil then - return select(i,...) - end - end -end - ---gets an option from a given group, checking plugins -local function GetSubOption(group, key) - if group.plugins then - for plugin, t in pairs(group.plugins) do - if t[key] then - return t[key] - end - end - end - - return group.args[key] -end - ---Option member type definitions, used to decide how to access it - ---Is the member Inherited from parent options -local isInherited = { - set = true, - get = true, - func = true, - confirm = true, - validate = true, - disabled = true, - hidden = true -} - ---Does a string type mean a literal value, instead of the default of a method of the handler -local stringIsLiteral = { - name = true, - desc = true, - icon = true, - usage = true, - width = true, - image = true, - fontSize = true, -} - ---Is Never a function or method -local allIsLiteral = { - type = true, - descStyle = true, - imageWidth = true, - imageHeight = true, -} - ---gets the value for a member that could be a function ---function refs are called with an info arg ---every other type is returned -local function GetOptionsMemberValue(membername, option, options, path, appName, ...) - --get definition for the member - local inherits = isInherited[membername] - - - --get the member of the option, traversing the tree if it can be inherited - local member - - if inherits then - local group = options - if group[membername] ~= nil then - member = group[membername] - end - for i = 1, #path do - group = GetSubOption(group, path[i]) - if group[membername] ~= nil then - member = group[membername] - end - end - else - member = option[membername] - end - - --check if we need to call a functon, or if we have a literal value - if ( not allIsLiteral[membername] ) and ( type(member) == "function" or ((not stringIsLiteral[membername]) and type(member) == "string") ) then - --We have a function to call - local info = new() - --traverse the options table, picking up the handler and filling the info with the path - local handler - local group = options - handler = group.handler or handler - - for i = 1, #path do - group = GetSubOption(group, path[i]) - info[i] = path[i] - handler = group.handler or handler - end - - info.options = options - info.appName = appName - info[0] = appName - info.arg = option.arg - info.handler = handler - info.option = option - info.type = option.type - info.uiType = "dialog" - info.uiName = MAJOR - - local a, b, c ,d - --using 4 returns for the get of a color type, increase if a type needs more - if type(member) == "function" then - --Call the function - a,b,c,d = member(info, ...) - else - --Call the method - if handler and handler[member] then - a,b,c,d = handler[member](handler, info, ...) - else - error(format("Method %s doesn't exist in handler for type %s", member, membername)) - end - end - del(info) - return a,b,c,d - else - --The value isnt a function to call, return it - return member - end -end - ---[[calls an options function that could be inherited, method name or function ref -local function CallOptionsFunction(funcname ,option, options, path, appName, ...) - local info = new() - - local func - local group = options - local handler - - --build the info table containing the path - -- pick up functions while traversing the tree - if group[funcname] ~= nil then - func = group[funcname] - end - handler = group.handler or handler - - for i, v in ipairs(path) do - group = GetSubOption(group, v) - info[i] = v - if group[funcname] ~= nil then - func = group[funcname] - end - handler = group.handler or handler - end - - info.options = options - info[0] = appName - info.arg = option.arg - - local a, b, c ,d - if type(func) == "string" then - if handler and handler[func] then - a,b,c,d = handler[func](handler, info, ...) - else - error(string.format("Method %s doesn't exist in handler for type func", func)) - end - elseif type(func) == "function" then - a,b,c,d = func(info, ...) - end - del(info) - return a,b,c,d -end ---]] - ---tables to hold orders and names for options being sorted, will be created with new() ---prevents needing to call functions repeatedly while sorting -local tempOrders -local tempNames - -local function compareOptions(a,b) - if not a then - return true - end - if not b then - return false - end - local OrderA, OrderB = tempOrders[a] or 100, tempOrders[b] or 100 - if OrderA == OrderB then - local NameA = (type(tempNames[a]) == "string") and tempNames[a] or "" - local NameB = (type(tempNames[b]) == "string") and tempNames[b] or "" - return NameA:upper() < NameB:upper() - end - if OrderA < 0 then - if OrderB > 0 then - return false - end - else - if OrderB < 0 then - return true - end - end - return OrderA < OrderB -end - - - ---builds 2 tables out of an options group --- keySort, sorted keys --- opts, combined options from .plugins and args -local function BuildSortedOptionsTable(group, keySort, opts, options, path, appName) - tempOrders = new() - tempNames = new() - - if group.plugins then - for plugin, t in pairs(group.plugins) do - for k, v in pairs(t) do - if not opts[k] then - tinsert(keySort, k) - opts[k] = v - - path[#path+1] = k - tempOrders[k] = GetOptionsMemberValue("order", v, options, path, appName) - tempNames[k] = GetOptionsMemberValue("name", v, options, path, appName) - path[#path] = nil - end - end - end - end - - for k, v in pairs(group.args) do - if not opts[k] then - tinsert(keySort, k) - opts[k] = v - - path[#path+1] = k - tempOrders[k] = GetOptionsMemberValue("order", v, options, path, appName) - tempNames[k] = GetOptionsMemberValue("name", v, options, path, appName) - path[#path] = nil - end - end - - tsort(keySort, compareOptions) - - del(tempOrders) - del(tempNames) -end - -local function DelTree(tree) - if tree.children then - local childs = tree.children - for i = 1, #childs do - DelTree(childs[i]) - del(childs[i]) - end - del(childs) - end -end - -local function CleanUserData(widget, event) - - local user = widget:GetUserDataTable() - - if user.path then - del(user.path) - end - - if widget.type == "TreeGroup" then - local tree = user.tree - widget:SetTree(nil) - if tree then - for i = 1, #tree do - DelTree(tree[i]) - del(tree[i]) - end - del(tree) - end - end - - if widget.type == "TabGroup" then - widget:SetTabs(nil) - if user.tablist then - del(user.tablist) - end - end - - if widget.type == "DropdownGroup" then - widget:SetGroupList(nil) - if user.grouplist then - del(user.grouplist) - end - if user.orderlist then - del(user.orderlist) - end - end -end - --- - Gets a status table for the given appname and options path. --- @param appName The application name as given to `:RegisterOptionsTable()` --- @param path The path to the options (a table with all group keys) --- @return -function AceConfigDialog:GetStatusTable(appName, path) - local status = self.Status - - if not status[appName] then - status[appName] = {} - status[appName].status = {} - status[appName].children = {} - end - - status = status[appName] - - if path then - for i = 1, #path do - local v = path[i] - if not status.children[v] then - status.children[v] = {} - status.children[v].status = {} - status.children[v].children = {} - end - status = status.children[v] - end - end - - return status.status -end - ---- Selects the specified path in the options window. --- The path specified has to match the keys of the groups in the table. --- @param appName The application name as given to `:RegisterOptionsTable()` --- @param ... The path to the key that should be selected -function AceConfigDialog:SelectGroup(appName, ...) - local path = new() - - - local app = reg:GetOptionsTable(appName) - if not app then - error(("%s isn't registed with AceConfigRegistry, unable to open config"):format(appName), 2) - end - local options = app("dialog", MAJOR) - local group = options - local status = self:GetStatusTable(appName, path) - if not status.groups then - status.groups = {} - end - status = status.groups - local treevalue - local treestatus - - for n = 1, select("#",...) do - local key = select(n, ...) - - if group.childGroups == "tab" or group.childGroups == "select" then - --if this is a tab or select group, select the group - status.selected = key - --children of this group are no longer extra levels of a tree - treevalue = nil - else - --tree group by default - if treevalue then - --this is an extra level of a tree group, build a uniquevalue for it - treevalue = treevalue.."\001"..key - else - --this is the top level of a tree group, the uniquevalue is the same as the key - treevalue = key - if not status.groups then - status.groups = {} - end - --save this trees status table for any extra levels or groups - treestatus = status - end - --make sure that the tree entry is open, and select it. - --the selected group will be overwritten if a child is the final target but still needs to be open - treestatus.selected = treevalue - treestatus.groups[treevalue] = true - - end - - --move to the next group in the path - group = GetSubOption(group, key) - if not group then - break - end - tinsert(path, key) - status = self:GetStatusTable(appName, path) - if not status.groups then - status.groups = {} - end - status = status.groups - end - - del(path) - reg:NotifyChange(appName) -end - -local function OptionOnMouseOver(widget, event) - --show a tooltip/set the status bar to the desc text - local user = widget:GetUserDataTable() - local opt = user.option - local options = user.options - local path = user.path - local appName = user.appName - - GameTooltip:SetOwner(widget.frame, "ANCHOR_TOPRIGHT") - local name = GetOptionsMemberValue("name", opt, options, path, appName) - local desc = GetOptionsMemberValue("desc", opt, options, path, appName) - local usage = GetOptionsMemberValue("usage", opt, options, path, appName) - local descStyle = opt.descStyle - - if descStyle and descStyle ~= "tooltip" then return end - - GameTooltip:SetText(name, 1, .82, 0, 1) - - if opt.type == "multiselect" then - GameTooltip:AddLine(user.text,0.5, 0.5, 0.8, 1) - end - if type(desc) == "string" then - GameTooltip:AddLine(desc, 1, 1, 1, 1) - end - if type(usage) == "string" then - GameTooltip:AddLine("Usage: "..usage, NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b, 1) - end - - GameTooltip:Show() -end - -local function OptionOnMouseLeave(widget, event) - GameTooltip:Hide() -end - -local function GetFuncName(option) - local type = option.type - if type == "execute" then - return "func" - else - return "set" - end -end -local function confirmPopup(appName, rootframe, basepath, info, message, func, ...) - if not StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"] then - StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"] = {} - end - local t = StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"] - for k in pairs(t) do - t[k] = nil - end - t.text = message - t.button1 = ACCEPT - t.button2 = CANCEL - local dialog, oldstrata - t.OnAccept = function() - safecall(func, unpack(t)) - if dialog and oldstrata then - dialog:SetFrameStrata(oldstrata) - end - AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl)) - del(info) - end - t.OnCancel = function() - if dialog and oldstrata then - dialog:SetFrameStrata(oldstrata) - end - AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl)) - del(info) - end - for i = 1, select("#", ...) do - t[i] = select(i, ...) or false - end - t.timeout = 0 - t.whileDead = 1 - t.hideOnEscape = 1 - - dialog = StaticPopup_Show("ACECONFIGDIALOG30_CONFIRM_DIALOG") - if dialog then - oldstrata = dialog:GetFrameStrata() - dialog:SetFrameStrata("TOOLTIP") - end -end - -local function ActivateControl(widget, event, ...) - --This function will call the set / execute handler for the widget - --widget:GetUserDataTable() contains the needed info - local user = widget:GetUserDataTable() - local option = user.option - local options = user.options - local path = user.path - local info = new() - - local func - local group = options - local funcname = GetFuncName(option) - local handler - local confirm - local validate - --build the info table containing the path - -- pick up functions while traversing the tree - if group[funcname] ~= nil then - func = group[funcname] - end - handler = group.handler or handler - confirm = group.confirm - validate = group.validate - for i = 1, #path do - local v = path[i] - group = GetSubOption(group, v) - info[i] = v - if group[funcname] ~= nil then - func = group[funcname] - end - handler = group.handler or handler - if group.confirm ~= nil then - confirm = group.confirm - end - if group.validate ~= nil then - validate = group.validate - end - end - - info.options = options - info.appName = user.appName - info.arg = option.arg - info.handler = handler - info.option = option - info.type = option.type - info.uiType = "dialog" - info.uiName = MAJOR - - local name - if type(option.name) == "function" then - name = option.name(info) - elseif type(option.name) == "string" then - name = option.name - else - name = "" - end - local usage = option.usage - local pattern = option.pattern - - local validated = true - - if option.type == "input" then - if type(pattern)=="string" then - if not strmatch(..., pattern) then - validated = false - end - end - end - - local success - if validated and option.type ~= "execute" then - if type(validate) == "string" then - if handler and handler[validate] then - success, validated = safecall(handler[validate], handler, info, ...) - if not success then validated = false end - else - error(format("Method %s doesn't exist in handler for type execute", validate)) - end - elseif type(validate) == "function" then - success, validated = safecall(validate, info, ...) - if not success then validated = false end - end - end - - local rootframe = user.rootframe - if type(validated) == "string" then - --validate function returned a message to display - if rootframe.SetStatusText then - rootframe:SetStatusText(validated) - else - -- TODO: do something else. - end - PlaySound("igPlayerInviteDecline") - del(info) - return true - elseif not validated then - --validate returned false - if rootframe.SetStatusText then - if usage then - rootframe:SetStatusText(name..": "..usage) - else - if pattern then - rootframe:SetStatusText(name..": Expected "..pattern) - else - rootframe:SetStatusText(name..": Invalid Value") - end - end - else - -- TODO: do something else - end - PlaySound("igPlayerInviteDecline") - del(info) - return true - else - - local confirmText = option.confirmText - --call confirm func/method - if type(confirm) == "string" then - if handler and handler[confirm] then - success, confirm = safecall(handler[confirm], handler, info, ...) - if success and type(confirm) == "string" then - confirmText = confirm - confirm = true - elseif not success then - confirm = false - end - else - error(format("Method %s doesn't exist in handler for type confirm", confirm)) - end - elseif type(confirm) == "function" then - success, confirm = safecall(confirm, info, ...) - if success and type(confirm) == "string" then - confirmText = confirm - confirm = true - elseif not success then - confirm = false - end - end - - --confirm if needed - if type(confirm) == "boolean" then - if confirm then - if not confirmText then - local name, desc = option.name, option.desc - if type(name) == "function" then - name = name(info) - end - if type(desc) == "function" then - desc = desc(info) - end - confirmText = name - if desc then - confirmText = confirmText.." - "..desc - end - end - - local iscustom = user.rootframe:GetUserData("iscustom") - local rootframe - - if iscustom then - rootframe = user.rootframe - end - local basepath = user.rootframe:GetUserData("basepath") - if type(func) == "string" then - if handler and handler[func] then - confirmPopup(user.appName, rootframe, basepath, info, confirmText, handler[func], handler, info, ...) - else - error(format("Method %s doesn't exist in handler for type func", func)) - end - elseif type(func) == "function" then - confirmPopup(user.appName, rootframe, basepath, info, confirmText, func, info, ...) - end - --func will be called and info deleted when the confirm dialog is responded to - return - end - end - - --call the function - if type(func) == "string" then - if handler and handler[func] then - safecall(handler[func],handler, info, ...) - else - error(format("Method %s doesn't exist in handler for type func", func)) - end - elseif type(func) == "function" then - safecall(func,info, ...) - end - - - - local iscustom = user.rootframe:GetUserData("iscustom") - local basepath = user.rootframe:GetUserData("basepath") or emptyTbl - --full refresh of the frame, some controls dont cause this on all events - if option.type == "color" then - if event == "OnValueConfirmed" then - - if iscustom then - AceConfigDialog:Open(user.appName, user.rootframe, unpack(basepath)) - else - AceConfigDialog:Open(user.appName, unpack(basepath)) - end - end - elseif option.type == "range" then - if event == "OnMouseUp" then - if iscustom then - AceConfigDialog:Open(user.appName, user.rootframe, unpack(basepath)) - else - AceConfigDialog:Open(user.appName, unpack(basepath)) - end - end - --multiselects don't cause a refresh on 'OnValueChanged' only 'OnClosed' - elseif option.type == "multiselect" then - user.valuechanged = true - else - if iscustom then - AceConfigDialog:Open(user.appName, user.rootframe, unpack(basepath)) - else - AceConfigDialog:Open(user.appName, unpack(basepath)) - end - end - - end - del(info) -end - -local function ActivateSlider(widget, event, value) - local option = widget:GetUserData("option") - local min, max, step = option.min or (not option.softMin and 0 or nil), option.max or (not option.softMax and 100 or nil), option.step - if min then - if step then - value = math_floor((value - min) / step + 0.5) * step + min - end - value = math_max(value, min) - end - if max then - value = math_min(value, max) - end - ActivateControl(widget,event,value) -end - ---called from a checkbox that is part of an internally created multiselect group ---this type is safe to refresh on activation of one control -local function ActivateMultiControl(widget, event, ...) - ActivateControl(widget, event, widget:GetUserData("value"), ...) - local user = widget:GetUserDataTable() - local iscustom = user.rootframe:GetUserData("iscustom") - local basepath = user.rootframe:GetUserData("basepath") or emptyTbl - if iscustom then - AceConfigDialog:Open(user.appName, user.rootframe, unpack(basepath)) - else - AceConfigDialog:Open(user.appName, unpack(basepath)) - end -end - -local function MultiControlOnClosed(widget, event, ...) - local user = widget:GetUserDataTable() - if user.valuechanged then - local iscustom = user.rootframe:GetUserData("iscustom") - local basepath = user.rootframe:GetUserData("basepath") or emptyTbl - if iscustom then - AceConfigDialog:Open(user.appName, user.rootframe, unpack(basepath)) - else - AceConfigDialog:Open(user.appName, unpack(basepath)) - end - end -end - -local function FrameOnClose(widget, event) - local appName = widget:GetUserData("appName") - AceConfigDialog.OpenFrames[appName] = nil - gui:Release(widget) -end - -local function CheckOptionHidden(option, options, path, appName) - --check for a specific boolean option - local hidden = pickfirstset(option.dialogHidden,option.guiHidden) - if hidden ~= nil then - return hidden - end - - return GetOptionsMemberValue("hidden", option, options, path, appName) -end - -local function CheckOptionDisabled(option, options, path, appName) - --check for a specific boolean option - local disabled = pickfirstset(option.dialogDisabled,option.guiDisabled) - if disabled ~= nil then - return disabled - end - - return GetOptionsMemberValue("disabled", option, options, path, appName) -end ---[[ -local function BuildTabs(group, options, path, appName) - local tabs = new() - local text = new() - local keySort = new() - local opts = new() - - BuildSortedOptionsTable(group, keySort, opts, options, path, appName) - - for i = 1, #keySort do - local k = keySort[i] - local v = opts[k] - if v.type == "group" then - path[#path+1] = k - local inline = pickfirstset(v.dialogInline,v.guiInline,v.inline, false) - local hidden = CheckOptionHidden(v, options, path, appName) - if not inline and not hidden then - tinsert(tabs, k) - text[k] = GetOptionsMemberValue("name", v, options, path, appName) - end - path[#path] = nil - end - end - - del(keySort) - del(opts) - - return tabs, text -end -]] -local function BuildSelect(group, options, path, appName) - local groups = new() - local order = new() - local keySort = new() - local opts = new() - - BuildSortedOptionsTable(group, keySort, opts, options, path, appName) - - for i = 1, #keySort do - local k = keySort[i] - local v = opts[k] - if v.type == "group" then - path[#path+1] = k - local inline = pickfirstset(v.dialogInline,v.guiInline,v.inline, false) - local hidden = CheckOptionHidden(v, options, path, appName) - if not inline and not hidden then - groups[k] = GetOptionsMemberValue("name", v, options, path, appName) - tinsert(order, k) - end - path[#path] = nil - end - end - - del(opts) - del(keySort) - - return groups, order -end - -local function BuildSubGroups(group, tree, options, path, appName) - local keySort = new() - local opts = new() - - BuildSortedOptionsTable(group, keySort, opts, options, path, appName) - - for i = 1, #keySort do - local k = keySort[i] - local v = opts[k] - if v.type == "group" then - path[#path+1] = k - local inline = pickfirstset(v.dialogInline,v.guiInline,v.inline, false) - local hidden = CheckOptionHidden(v, options, path, appName) - if not inline and not hidden then - local entry = new() - entry.value = k - entry.text = GetOptionsMemberValue("name", v, options, path, appName) - entry.icon = GetOptionsMemberValue("icon", v, options, path, appName) - entry.iconCoords = GetOptionsMemberValue("iconCoords", v, options, path, appName) - entry.disabled = CheckOptionDisabled(v, options, path, appName) - if not tree.children then tree.children = new() end - tinsert(tree.children,entry) - if (v.childGroups or "tree") == "tree" then - BuildSubGroups(v,entry, options, path, appName) - end - end - path[#path] = nil - end - end - - del(keySort) - del(opts) -end - -local function BuildGroups(group, options, path, appName, recurse) - local tree = new() - local keySort = new() - local opts = new() - - BuildSortedOptionsTable(group, keySort, opts, options, path, appName) - - for i = 1, #keySort do - local k = keySort[i] - local v = opts[k] - if v.type == "group" then - path[#path+1] = k - local inline = pickfirstset(v.dialogInline,v.guiInline,v.inline, false) - local hidden = CheckOptionHidden(v, options, path, appName) - if not inline and not hidden then - local entry = new() - entry.value = k - entry.text = GetOptionsMemberValue("name", v, options, path, appName) - entry.icon = GetOptionsMemberValue("icon", v, options, path, appName) - entry.disabled = CheckOptionDisabled(v, options, path, appName) - tinsert(tree,entry) - if recurse and (v.childGroups or "tree") == "tree" then - BuildSubGroups(v,entry, options, path, appName) - end - end - path[#path] = nil - end - end - del(keySort) - del(opts) - return tree -end - -local function InjectInfo(control, options, option, path, rootframe, appName) - local user = control:GetUserDataTable() - for i = 1, #path do - user[i] = path[i] - end - user.rootframe = rootframe - user.option = option - user.options = options - user.path = copy(path) - user.appName = appName - control:SetCallback("OnRelease", CleanUserData) - control:SetCallback("OnLeave", OptionOnMouseLeave) - control:SetCallback("OnEnter", OptionOnMouseOver) -end - - ---[[ - options - root of the options table being fed - container - widget that controls will be placed in - rootframe - Frame object the options are in - path - table with the keys to get to the group being fed ---]] - -local function FeedOptions(appName, options,container,rootframe,path,group,inline) - local keySort = new() - local opts = new() - - BuildSortedOptionsTable(group, keySort, opts, options, path, appName) - - for i = 1, #keySort do - local k = keySort[i] - local v = opts[k] - tinsert(path, k) - local hidden = CheckOptionHidden(v, options, path, appName) - local name = GetOptionsMemberValue("name", v, options, path, appName) - if not hidden then - if v.type == "group" then - if inline or pickfirstset(v.dialogInline,v.guiInline,v.inline, false) then - --Inline group - local GroupContainer - if name and name ~= "" then - GroupContainer = gui:Create("InlineGroup") - GroupContainer:SetTitle(name or "") - else - GroupContainer = gui:Create("SimpleGroup") - end - - GroupContainer.width = "fill" - GroupContainer:SetLayout("flow") - container:AddChild(GroupContainer) - FeedOptions(appName,options,GroupContainer,rootframe,path,v,true) - end - else - --Control to feed - local control - - local name = GetOptionsMemberValue("name", v, options, path, appName) - - if v.type == "execute" then - - local imageCoords = GetOptionsMemberValue("imageCoords",v, options, path, appName) - local image, width, height = GetOptionsMemberValue("image",v, options, path, appName) - - if type(image) == "string" then - control = gui:Create("Icon") - if not width then - width = GetOptionsMemberValue("imageWidth",v, options, path, appName) - end - if not height then - height = GetOptionsMemberValue("imageHeight",v, options, path, appName) - end - if type(imageCoords) == "table" then - control:SetImage(image, unpack(imageCoords)) - else - control:SetImage(image) - end - if type(width) ~= "number" then - width = 32 - end - if type(height) ~= "number" then - height = 32 - end - control:SetImageSize(width, height) - control:SetLabel(name) - else - control = gui:Create("Button") - control:SetText(name) - end - control:SetCallback("OnClick",ActivateControl) - - elseif v.type == "input" then - local controlType = v.dialogControl or v.control or (v.multiline and "MultiLineEditBox") or "EditBox" - control = gui:Create(controlType) - if not control then - geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(controlType))) - control = gui:Create(v.multiline and "MultiLineEditBox" or "EditBox") - end - - if v.multiline and control.SetNumLines then - control:SetNumLines(tonumber(v.multiline) or 4) - end - control:SetLabel(name) - control:SetCallback("OnEnterPressed",ActivateControl) - local text = GetOptionsMemberValue("get",v, options, path, appName) - if type(text) ~= "string" then - text = "" - end - control:SetText(text) - - elseif v.type == "toggle" then - control = gui:Create("CheckBox") - control:SetLabel(name) - control:SetTriState(v.tristate) - local value = GetOptionsMemberValue("get",v, options, path, appName) - control:SetValue(value) - control:SetCallback("OnValueChanged",ActivateControl) - - if v.descStyle == "inline" then - local desc = GetOptionsMemberValue("desc", v, options, path, appName) - control:SetDescription(desc) - end - - local image = GetOptionsMemberValue("image", v, options, path, appName) - local imageCoords = GetOptionsMemberValue("imageCoords", v, options, path, appName) - - if type(image) == "string" then - if type(imageCoords) == "table" then - control:SetImage(image, unpack(imageCoords)) - else - control:SetImage(image) - end - end - elseif v.type == "range" then - control = gui:Create("Slider") - control:SetLabel(name) - control:SetSliderValues(v.softMin or v.min or 0, v.softMax or v.max or 100, v.bigStep or v.step or 0) - control:SetIsPercent(v.isPercent) - local value = GetOptionsMemberValue("get",v, options, path, appName) - if type(value) ~= "number" then - value = 0 - end - control:SetValue(value) - control:SetCallback("OnValueChanged",ActivateSlider) - control:SetCallback("OnMouseUp",ActivateSlider) - - elseif v.type == "select" then - local values = GetOptionsMemberValue("values", v, options, path, appName) - if v.style == "radio" then - local disabled = CheckOptionDisabled(v, options, path, appName) - local width = GetOptionsMemberValue("width",v,options,path,appName) - control = gui:Create("InlineGroup") - control:SetLayout("Flow") - control:SetTitle(name) - control.width = "fill" - - control:PauseLayout() - local optionValue = GetOptionsMemberValue("get",v, options, path, appName, value) - for value, text in pairs(values) do - local radio = gui:Create("CheckBox") - radio:SetLabel(text) - radio:SetUserData("value", value) - radio:SetUserData("text", text) - radio:SetDisabled(disabled) - radio:SetType("radio") - radio:SetValue(optionValue == value) - radio:SetCallback("OnValueChanged", ActivateMultiControl) - InjectInfo(radio, options, v, path, rootframe, appName) - control:AddChild(radio) - if width == "double" then - radio:SetWidth(width_multiplier * 2) - elseif width == "half" then - radio:SetWidth(width_multiplier / 2) - elseif width == "full" then - radio.width = "fill" - else - radio:SetWidth(width_multiplier) - end - end - control:ResumeLayout() - control:DoLayout() - else - local controlType = v.dialogControl or v.control or "Dropdown" - control = gui:Create(controlType) - if not control then - geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(controlType))) - control = gui:Create("Dropdown") - end - local itemType = v.itemControl - if itemType and not gui:GetWidgetVersion(itemType) then - geterrorhandler()(("Invalid Custom Item Type - %s"):format(tostring(itemType))) - itemType = nil - end - control:SetLabel(name) - control:SetList(values, nil, itemType) - local value = GetOptionsMemberValue("get",v, options, path, appName) - if not values[value] then - value = nil - end - control:SetValue(value) - control:SetCallback("OnValueChanged", ActivateControl) - end - - elseif v.type == "multiselect" then - local values = GetOptionsMemberValue("values", v, options, path, appName) - local disabled = CheckOptionDisabled(v, options, path, appName) - - local controlType = v.dialogControl or v.control - - local valuesort = new() - if values then - for value, text in pairs(values) do - tinsert(valuesort, value) - end - end - tsort(valuesort) - - if controlType then - control = gui:Create(controlType) - if not control then - geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(controlType))) - end - end - if control then - control:SetMultiselect(true) - control:SetLabel(name) - control:SetList(values) - control:SetDisabled(disabled) - control:SetCallback("OnValueChanged",ActivateControl) - control:SetCallback("OnClosed", MultiControlOnClosed) - local width = GetOptionsMemberValue("width",v,options,path,appName) - if width == "double" then - control:SetWidth(width_multiplier * 2) - elseif width == "half" then - control:SetWidth(width_multiplier / 2) - elseif width == "full" then - control.width = "fill" - else - control:SetWidth(width_multiplier) - end - --check:SetTriState(v.tristate) - for i = 1, #valuesort do - local key = valuesort[i] - local value = GetOptionsMemberValue("get",v, options, path, appName, key) - control:SetItemValue(key,value) - end - else - control = gui:Create("InlineGroup") - control:SetLayout("Flow") - control:SetTitle(name) - control.width = "fill" - - control:PauseLayout() - local width = GetOptionsMemberValue("width",v,options,path,appName) - for i = 1, #valuesort do - local value = valuesort[i] - local text = values[value] - local check = gui:Create("CheckBox") - check:SetLabel(text) - check:SetUserData("value", value) - check:SetUserData("text", text) - check:SetDisabled(disabled) - check:SetTriState(v.tristate) - check:SetValue(GetOptionsMemberValue("get",v, options, path, appName, value)) - check:SetCallback("OnValueChanged",ActivateMultiControl) - InjectInfo(check, options, v, path, rootframe, appName) - control:AddChild(check) - if width == "double" then - check:SetWidth(width_multiplier * 2) - elseif width == "half" then - check:SetWidth(width_multiplier / 2) - elseif width == "full" then - check.width = "fill" - else - check:SetWidth(width_multiplier) - end - end - control:ResumeLayout() - control:DoLayout() - - - end - - del(valuesort) - - elseif v.type == "color" then - control = gui:Create("ColorPicker") - control:SetLabel(name) - control:SetHasAlpha(v.hasAlpha) - control:SetColor(GetOptionsMemberValue("get",v, options, path, appName)) - control:SetCallback("OnValueChanged",ActivateControl) - control:SetCallback("OnValueConfirmed",ActivateControl) - - elseif v.type == "keybinding" then - control = gui:Create("Keybinding") - control:SetLabel(name) - control:SetKey(GetOptionsMemberValue("get",v, options, path, appName)) - control:SetCallback("OnKeyChanged",ActivateControl) - - elseif v.type == "header" then - control = gui:Create("Heading") - control:SetText(name) - control.width = "fill" - - elseif v.type == "description" then - control = gui:Create("Label") - control:SetText(name) - - local fontSize = GetOptionsMemberValue("fontSize",v, options, path, appName) - if fontSize == "medium" then - control:SetFontObject(GameFontHighlight) - elseif fontSize == "large" then - control:SetFontObject(GameFontHighlightLarge) - else -- small or invalid - control:SetFontObject(GameFontHighlightSmall) - end - - local imageCoords = GetOptionsMemberValue("imageCoords",v, options, path, appName) - local image, width, height = GetOptionsMemberValue("image",v, options, path, appName) - - if type(image) == "string" then - if not width then - width = GetOptionsMemberValue("imageWidth",v, options, path, appName) - end - if not height then - height = GetOptionsMemberValue("imageHeight",v, options, path, appName) - end - if type(imageCoords) == "table" then - control:SetImage(image, unpack(imageCoords)) - else - control:SetImage(image) - end - if type(width) ~= "number" then - width = 32 - end - if type(height) ~= "number" then - height = 32 - end - control:SetImageSize(width, height) - end - local width = GetOptionsMemberValue("width",v,options,path,appName) - control.width = not width and "fill" - end - - --Common Init - if control then - if control.width ~= "fill" then - local width = GetOptionsMemberValue("width",v,options,path,appName) - if width == "double" then - control:SetWidth(width_multiplier * 2) - elseif width == "half" then - control:SetWidth(width_multiplier / 2) - elseif width == "full" then - control.width = "fill" - else - control:SetWidth(width_multiplier) - end - end - if control.SetDisabled then - local disabled = CheckOptionDisabled(v, options, path, appName) - control:SetDisabled(disabled) - end - - InjectInfo(control, options, v, path, rootframe, appName) - container:AddChild(control) - end - - end - end - tremove(path) - end - container:ResumeLayout() - container:DoLayout() - del(keySort) - del(opts) -end - -local function BuildPath(path, ...) - for i = 1, select("#",...) do - tinsert(path, (select(i,...))) - end -end - - -local function TreeOnButtonEnter(widget, event, uniquevalue, button) - local user = widget:GetUserDataTable() - if not user then return end - local options = user.options - local option = user.option - local path = user.path - local appName = user.appName - - local feedpath = new() - for i = 1, #path do - feedpath[i] = path[i] - end - - BuildPath(feedpath, ("\001"):split(uniquevalue)) - local group = options - for i = 1, #feedpath do - if not group then return end - group = GetSubOption(group, feedpath[i]) - end - - local name = GetOptionsMemberValue("name", group, options, feedpath, appName) - local desc = GetOptionsMemberValue("desc", group, options, feedpath, appName) - - GameTooltip:SetOwner(button, "ANCHOR_NONE") - if widget.type == "TabGroup" then - GameTooltip:SetPoint("BOTTOM",button,"TOP") - else - GameTooltip:SetPoint("LEFT",button,"RIGHT") - end - - GameTooltip:SetText(name, 1, .82, 0, 1) - - if type(desc) == "string" then - GameTooltip:AddLine(desc, 1, 1, 1, 1) - end - - GameTooltip:Show() -end - -local function TreeOnButtonLeave(widget, event, value, button) - GameTooltip:Hide() -end - - -local function GroupExists(appName, options, path, uniquevalue) - if not uniquevalue then return false end - - local feedpath = new() - local temppath = new() - for i = 1, #path do - feedpath[i] = path[i] - end - - BuildPath(feedpath, ("\001"):split(uniquevalue)) - - local group = options - for i = 1, #feedpath do - local v = feedpath[i] - temppath[i] = v - group = GetSubOption(group, v) - - if not group or group.type ~= "group" or CheckOptionHidden(group, options, temppath, appName) then - del(feedpath) - del(temppath) - return false - end - end - del(feedpath) - del(temppath) - return true -end - -local function GroupSelected(widget, event, uniquevalue) - - local user = widget:GetUserDataTable() - - local options = user.options - local option = user.option - local path = user.path - local rootframe = user.rootframe - - local feedpath = new() - for i = 1, #path do - feedpath[i] = path[i] - end - - BuildPath(feedpath, ("\001"):split(uniquevalue)) - local group = options - for i = 1, #feedpath do - group = GetSubOption(group, feedpath[i]) - end - widget:ReleaseChildren() - AceConfigDialog:FeedGroup(user.appName,options,widget,rootframe,feedpath) - - del(feedpath) -end - - - ---[[ --- INTERNAL -- -This function will feed one group, and any inline child groups into the given container -Select Groups will only have the selection control (tree, tabs, dropdown) fed in -and have a group selected, this event will trigger the feeding of child groups - -Rules: - If the group is Inline, FeedOptions - If the group has no child groups, FeedOptions - - If the group is a tab or select group, FeedOptions then add the Group Control - If the group is a tree group FeedOptions then - its parent isnt a tree group: then add the tree control containing this and all child tree groups - if its parent is a tree group, its already a node on a tree ---]] - -function AceConfigDialog:FeedGroup(appName,options,container,rootframe,path, isRoot) - local group = options - --follow the path to get to the curent group - local inline - local grouptype, parenttype = options.childGroups, "none" - - - for i = 1, #path do - local v = path[i] - group = GetSubOption(group, v) - inline = inline or pickfirstset(v.dialogInline,v.guiInline,v.inline, false) - parenttype = grouptype - grouptype = group.childGroups - end - - if not parenttype then - parenttype = "tree" - end - - --check if the group has child groups - local hasChildGroups - for k, v in pairs(group.args) do - if v.type == "group" and not pickfirstset(v.dialogInline,v.guiInline,v.inline, false) and not CheckOptionHidden(v, options, path, appName) then - hasChildGroups = true - end - end - if group.plugins then - for plugin, t in pairs(group.plugins) do - for k, v in pairs(t) do - if v.type == "group" and not pickfirstset(v.dialogInline,v.guiInline,v.inline, false) and not CheckOptionHidden(v, options, path, appName) then - hasChildGroups = true - end - end - end - end - - container:SetLayout("flow") - local scroll - - --Add a scrollframe if we are not going to add a group control, this is the inverse of the conditions for that later on - if (not (hasChildGroups and not inline)) or (grouptype ~= "tab" and grouptype ~= "select" and (parenttype == "tree" and not isRoot)) then - if container.type ~= "InlineGroup" and container.type ~= "SimpleGroup" then - scroll = gui:Create("ScrollFrame") - scroll:SetLayout("flow") - scroll.width = "fill" - scroll.height = "fill" - container:SetLayout("fill") - container:AddChild(scroll) - container = scroll - end - end - - FeedOptions(appName,options,container,rootframe,path,group,nil) - - if scroll then - container:PerformLayout() - local status = self:GetStatusTable(appName, path) - if not status.scroll then - status.scroll = {} - end - scroll:SetStatusTable(status.scroll) - end - - if hasChildGroups and not inline then - local name = GetOptionsMemberValue("name", group, options, path, appName) - if grouptype == "tab" then - - local tab = gui:Create("TabGroup") - InjectInfo(tab, options, group, path, rootframe, appName) - tab:SetCallback("OnGroupSelected", GroupSelected) - tab:SetCallback("OnTabEnter", TreeOnButtonEnter) - tab:SetCallback("OnTabLeave", TreeOnButtonLeave) - - local status = AceConfigDialog:GetStatusTable(appName, path) - if not status.groups then - status.groups = {} - end - tab:SetStatusTable(status.groups) - tab.width = "fill" - tab.height = "fill" - - local tabs = BuildGroups(group, options, path, appName) - tab:SetTabs(tabs) - tab:SetUserData("tablist", tabs) - - for i = 1, #tabs do - local entry = tabs[i] - if not entry.disabled then - tab:SelectTab((GroupExists(appName, options, path,status.groups.selected) and status.groups.selected) or entry.value) - break - end - end - - container:AddChild(tab) - - elseif grouptype == "select" then - - local select = gui:Create("DropdownGroup") - select:SetTitle(name) - InjectInfo(select, options, group, path, rootframe, appName) - select:SetCallback("OnGroupSelected", GroupSelected) - local status = AceConfigDialog:GetStatusTable(appName, path) - if not status.groups then - status.groups = {} - end - select:SetStatusTable(status.groups) - local grouplist, orderlist = BuildSelect(group, options, path, appName) - select:SetGroupList(grouplist, orderlist) - select:SetUserData("grouplist", grouplist) - select:SetUserData("orderlist", orderlist) - - local firstgroup = orderlist[1] - if firstgroup then - select:SetGroup((GroupExists(appName, options, path,status.groups.selected) and status.groups.selected) or firstgroup) - end - - select.width = "fill" - select.height = "fill" - - container:AddChild(select) - - --assume tree group by default - --if parenttype is tree then this group is already a node on that tree - elseif (parenttype ~= "tree") or isRoot then - local tree = gui:Create("TreeGroup") - InjectInfo(tree, options, group, path, rootframe, appName) - tree:EnableButtonTooltips(false) - - tree.width = "fill" - tree.height = "fill" - - tree:SetCallback("OnGroupSelected", GroupSelected) - tree:SetCallback("OnButtonEnter", TreeOnButtonEnter) - tree:SetCallback("OnButtonLeave", TreeOnButtonLeave) - - local status = AceConfigDialog:GetStatusTable(appName, path) - if not status.groups then - status.groups = {} - end - local treedefinition = BuildGroups(group, options, path, appName, true) - tree:SetStatusTable(status.groups) - - tree:SetTree(treedefinition) - tree:SetUserData("tree",treedefinition) - - for i = 1, #treedefinition do - local entry = treedefinition[i] - if not entry.disabled then - tree:SelectByValue((GroupExists(appName, options, path,status.groups.selected) and status.groups.selected) or entry.value) - break - end - end - - container:AddChild(tree) - end - end -end - -local old_CloseSpecialWindows - - -local function RefreshOnUpdate(this) - for appName in pairs(this.closing) do - if AceConfigDialog.OpenFrames[appName] then - AceConfigDialog.OpenFrames[appName]:Hide() - end - if AceConfigDialog.BlizOptions and AceConfigDialog.BlizOptions[appName] then - for key, widget in pairs(AceConfigDialog.BlizOptions[appName]) do - if not widget:IsVisible() then - widget:ReleaseChildren() - end - end - end - this.closing[appName] = nil - end - - if this.closeAll then - for k, v in pairs(AceConfigDialog.OpenFrames) do - if not this.closeAllOverride[k] then - v:Hide() - end - end - this.closeAll = nil - wipe(this.closeAllOverride) - end - - for appName in pairs(this.apps) do - if AceConfigDialog.OpenFrames[appName] then - local user = AceConfigDialog.OpenFrames[appName]:GetUserDataTable() - AceConfigDialog:Open(appName, unpack(user.basepath or emptyTbl)) - end - if AceConfigDialog.BlizOptions and AceConfigDialog.BlizOptions[appName] then - for key, widget in pairs(AceConfigDialog.BlizOptions[appName]) do - local user = widget:GetUserDataTable() - if widget:IsVisible() then - AceConfigDialog:Open(widget:GetUserData("appName"), widget, unpack(user.basepath or emptyTbl)) - end - end - end - this.apps[appName] = nil - end - this:SetScript("OnUpdate", nil) -end - --- Upgrade the OnUpdate script as well, if needed. -if AceConfigDialog.frame:GetScript("OnUpdate") then - AceConfigDialog.frame:SetScript("OnUpdate", RefreshOnUpdate) -end - ---- Close all open options windows -function AceConfigDialog:CloseAll() - AceConfigDialog.frame.closeAll = true - AceConfigDialog.frame:SetScript("OnUpdate", RefreshOnUpdate) - if next(self.OpenFrames) then - return true - end -end - ---- Close a specific options window. --- @param appName The application name as given to `:RegisterOptionsTable()` -function AceConfigDialog:Close(appName) - if self.OpenFrames[appName] then - AceConfigDialog.frame.closing[appName] = true - AceConfigDialog.frame:SetScript("OnUpdate", RefreshOnUpdate) - return true - end -end - --- Internal -- Called by AceConfigRegistry -function AceConfigDialog:ConfigTableChanged(event, appName) - AceConfigDialog.frame.apps[appName] = true - AceConfigDialog.frame:SetScript("OnUpdate", RefreshOnUpdate) -end - -reg.RegisterCallback(AceConfigDialog, "ConfigTableChange", "ConfigTableChanged") - ---- Sets the default size of the options window for a specific application. --- @param appName The application name as given to `:RegisterOptionsTable()` --- @param width The default width --- @param height The default height -function AceConfigDialog:SetDefaultSize(appName, width, height) - local status = AceConfigDialog:GetStatusTable(appName) - if type(width) == "number" and type(height) == "number" then - status.width = width - status.height = height - end -end - ---- Open an option window at the specified path (if any). --- This function can optionally feed the group into a pre-created container --- instead of creating a new container frame. --- @paramsig appName [, container][, ...] --- @param appName The application name as given to `:RegisterOptionsTable()` --- @param container An optional container frame to feed the options into --- @param ... The path to open after creating the options window (see `:SelectGroup` for details) -function AceConfigDialog:Open(appName, container, ...) - if not old_CloseSpecialWindows then - old_CloseSpecialWindows = CloseSpecialWindows - CloseSpecialWindows = function() - local found = old_CloseSpecialWindows() - return self:CloseAll() or found - end - end - local app = reg:GetOptionsTable(appName) - if not app then - error(("%s isn't registed with AceConfigRegistry, unable to open config"):format(appName), 2) - end - local options = app("dialog", MAJOR) - - local f - - local path = new() - local name = GetOptionsMemberValue("name", options, options, path, appName) - - --If an optional path is specified add it to the path table before feeding the options - --as container is optional as well it may contain the first element of the path - if type(container) == "string" then - tinsert(path, container) - container = nil - end - for n = 1, select("#",...) do - tinsert(path, (select(n, ...))) - end - - --if a container is given feed into that - if container then - f = container - f:ReleaseChildren() - f:SetUserData("appName", appName) - f:SetUserData("iscustom", true) - if #path > 0 then - f:SetUserData("basepath", copy(path)) - end - local status = AceConfigDialog:GetStatusTable(appName) - if not status.width then - status.width = 700 - end - if not status.height then - status.height = 500 - end - if f.SetStatusTable then - f:SetStatusTable(status) - end - if f.SetTitle then - f:SetTitle(name or "") - end - else - if not self.OpenFrames[appName] then - f = gui:Create("Frame") - self.OpenFrames[appName] = f - else - f = self.OpenFrames[appName] - end - f:ReleaseChildren() - f:SetCallback("OnClose", FrameOnClose) - f:SetUserData("appName", appName) - if #path > 0 then - f:SetUserData("basepath", copy(path)) - end - f:SetTitle(name or "") - local status = AceConfigDialog:GetStatusTable(appName) - f:SetStatusTable(status) - end - - self:FeedGroup(appName,options,f,f,path,true) - if f.Show then - f:Show() - end - del(path) - - if AceConfigDialog.frame.closeAll then - -- close all is set, but thats not good, since we're just opening here, so force it - AceConfigDialog.frame.closeAllOverride[appName] = true - end -end - --- convert pre-39 BlizOptions structure to the new format -if oldminor and oldminor < 39 and AceConfigDialog.BlizOptions then - local old = AceConfigDialog.BlizOptions - local new = {} - for key, widget in pairs(old) do - local appName = widget:GetUserData("appName") - if not new[appName] then new[appName] = {} end - new[appName][key] = widget - end - AceConfigDialog.BlizOptions = new -else - AceConfigDialog.BlizOptions = AceConfigDialog.BlizOptions or {} -end - -local function FeedToBlizPanel(widget, event) - local path = widget:GetUserData("path") - AceConfigDialog:Open(widget:GetUserData("appName"), widget, unpack(path or emptyTbl)) -end - -local function ClearBlizPanel(widget, event) - local appName = widget:GetUserData("appName") - AceConfigDialog.frame.closing[appName] = true - AceConfigDialog.frame:SetScript("OnUpdate", RefreshOnUpdate) -end - ---- Add an option table into the Blizzard Interface Options panel. --- You can optionally supply a descriptive name to use and a parent frame to use, --- as well as a path in the options table.\\ --- If no name is specified, the appName will be used instead. --- --- If you specify a proper `parent` (by name), the interface options will generate a --- tree layout. Note that only one level of children is supported, so the parent always --- has to be a head-level note. --- --- This function returns a reference to the container frame registered with the Interface --- Options. You can use this reference to open the options with the API function --- `InterfaceOptionsFrame_OpenToCategory`. --- @param appName The application name as given to `:RegisterOptionsTable()` --- @param name A descriptive name to display in the options tree (defaults to appName) --- @param parent The parent to use in the interface options tree. --- @param ... The path in the options table to feed into the interface options panel. --- @return The reference to the frame registered into the Interface Options. -function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...) - local BlizOptions = AceConfigDialog.BlizOptions - - local key = appName - for n = 1, select("#", ...) do - key = key.."\001"..select(n, ...) - end - - if not BlizOptions[appName] then - BlizOptions[appName] = {} - end - - if not BlizOptions[appName][key] then - local group = gui:Create("BlizOptionsGroup") - BlizOptions[appName][key] = group - group:SetName(name or appName, parent) - - group:SetTitle(name or appName) - group:SetUserData("appName", appName) - if select("#", ...) > 0 then - local path = {} - for n = 1, select("#",...) do - tinsert(path, (select(n, ...))) - end - group:SetUserData("path", path) - end - group:SetCallback("OnShow", FeedToBlizPanel) - group:SetCallback("OnHide", ClearBlizPanel) - InterfaceOptions_AddCategory(group.frame) - return group.frame - else - error(("%s has already been added to the Blizzard Options Window with the given path"):format(appName), 2) - end -end +--- AceConfigDialog-3.0 generates AceGUI-3.0 based windows based on option tables. +-- @class file +-- @name AceConfigDialog-3.0 +-- @release $Id: AceConfigDialog-3.0.lua 1049 2012-04-02 13:22:10Z mikk $ + +local LibStub = LibStub +local MAJOR, MINOR = "AceConfigDialog-3.0", 57 +local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR) + +if not AceConfigDialog then return end + +AceConfigDialog.OpenFrames = AceConfigDialog.OpenFrames or {} +AceConfigDialog.Status = AceConfigDialog.Status or {} +AceConfigDialog.frame = AceConfigDialog.frame or CreateFrame("Frame") + +AceConfigDialog.frame.apps = AceConfigDialog.frame.apps or {} +AceConfigDialog.frame.closing = AceConfigDialog.frame.closing or {} +AceConfigDialog.frame.closeAllOverride = AceConfigDialog.frame.closeAllOverride or {} + +local gui = LibStub("AceGUI-3.0") +local reg = LibStub("AceConfigRegistry-3.0") + +-- Lua APIs +local tconcat, tinsert, tsort, tremove, tsort = table.concat, table.insert, table.sort, table.remove, table.sort +local strmatch, format = string.match, string.format +local assert, loadstring, error = assert, loadstring, error +local pairs, next, select, type, unpack, wipe, ipairs = pairs, next, select, type, unpack, wipe, ipairs +local rawset, tostring, tonumber = rawset, tostring, tonumber +local math_min, math_max, math_floor = math.min, math.max, math.floor + +-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded +-- List them here for Mikk's FindGlobals script +-- GLOBALS: NORMAL_FONT_COLOR, GameTooltip, StaticPopupDialogs, ACCEPT, CANCEL, StaticPopup_Show +-- GLOBALS: PlaySound, GameFontHighlight, GameFontHighlightSmall, GameFontHighlightLarge +-- GLOBALS: CloseSpecialWindows, InterfaceOptions_AddCategory, geterrorhandler + +local emptyTbl = {} + +--[[ + xpcall safecall implementation +]] +local xpcall = xpcall + +local function errorhandler(err) + return geterrorhandler()(err) +end + +local function CreateDispatcher(argCount) + local code = [[ + local xpcall, eh = ... + local method, ARGS + local function call() return method(ARGS) end + + local function dispatch(func, ...) + method = func + if not method then return end + ARGS = ... + return xpcall(call, eh) + end + + return dispatch + ]] + + local ARGS = {} + for i = 1, argCount do ARGS[i] = "arg"..i end + code = code:gsub("ARGS", tconcat(ARGS, ", ")) + return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(xpcall, errorhandler) +end + +local Dispatchers = setmetatable({}, {__index=function(self, argCount) + local dispatcher = CreateDispatcher(argCount) + rawset(self, argCount, dispatcher) + return dispatcher +end}) +Dispatchers[0] = function(func) + return xpcall(func, errorhandler) +end + +local function safecall(func, ...) + return Dispatchers[select("#", ...)](func, ...) +end + +local width_multiplier = 170 + +--[[ +Group Types + Tree - All Descendant Groups will all become nodes on the tree, direct child options will appear above the tree + - Descendant Groups with inline=true and thier children will not become nodes + + Tab - Direct Child Groups will become tabs, direct child options will appear above the tab control + - Grandchild groups will default to inline unless specified otherwise + + Select- Same as Tab but with entries in a dropdown rather than tabs + + + Inline Groups + - Will not become nodes of a select group, they will be effectivly part of thier parent group seperated by a border + - If declared on a direct child of a root node of a select group, they will appear above the group container control + - When a group is displayed inline, all descendants will also be inline members of the group + +]] + +-- Recycling functions +local new, del, copy +--newcount, delcount,createdcount,cached = 0,0,0 +do + local pool = setmetatable({},{__mode="k"}) + function new() + --newcount = newcount + 1 + local t = next(pool) + if t then + pool[t] = nil + return t + else + --createdcount = createdcount + 1 + return {} + end + end + function copy(t) + local c = new() + for k, v in pairs(t) do + c[k] = v + end + return c + end + function del(t) + --delcount = delcount + 1 + wipe(t) + pool[t] = true + end +-- function cached() +-- local n = 0 +-- for k in pairs(pool) do +-- n = n + 1 +-- end +-- return n +-- end +end + +-- picks the first non-nil value and returns it +local function pickfirstset(...) + for i=1,select("#",...) do + if select(i,...)~=nil then + return select(i,...) + end + end +end + +--gets an option from a given group, checking plugins +local function GetSubOption(group, key) + if group.plugins then + for plugin, t in pairs(group.plugins) do + if t[key] then + return t[key] + end + end + end + + return group.args[key] +end + +--Option member type definitions, used to decide how to access it + +--Is the member Inherited from parent options +local isInherited = { + set = true, + get = true, + func = true, + confirm = true, + validate = true, + disabled = true, + hidden = true +} + +--Does a string type mean a literal value, instead of the default of a method of the handler +local stringIsLiteral = { + name = true, + desc = true, + icon = true, + usage = true, + width = true, + image = true, + fontSize = true, +} + +--Is Never a function or method +local allIsLiteral = { + type = true, + descStyle = true, + imageWidth = true, + imageHeight = true, +} + +--gets the value for a member that could be a function +--function refs are called with an info arg +--every other type is returned +local function GetOptionsMemberValue(membername, option, options, path, appName, ...) + --get definition for the member + local inherits = isInherited[membername] + + + --get the member of the option, traversing the tree if it can be inherited + local member + + if inherits then + local group = options + if group[membername] ~= nil then + member = group[membername] + end + for i = 1, #path do + group = GetSubOption(group, path[i]) + if group[membername] ~= nil then + member = group[membername] + end + end + else + member = option[membername] + end + + --check if we need to call a functon, or if we have a literal value + if ( not allIsLiteral[membername] ) and ( type(member) == "function" or ((not stringIsLiteral[membername]) and type(member) == "string") ) then + --We have a function to call + local info = new() + --traverse the options table, picking up the handler and filling the info with the path + local handler + local group = options + handler = group.handler or handler + + for i = 1, #path do + group = GetSubOption(group, path[i]) + info[i] = path[i] + handler = group.handler or handler + end + + info.options = options + info.appName = appName + info[0] = appName + info.arg = option.arg + info.handler = handler + info.option = option + info.type = option.type + info.uiType = "dialog" + info.uiName = MAJOR + + local a, b, c ,d + --using 4 returns for the get of a color type, increase if a type needs more + if type(member) == "function" then + --Call the function + a,b,c,d = member(info, ...) + else + --Call the method + if handler and handler[member] then + a,b,c,d = handler[member](handler, info, ...) + else + error(format("Method %s doesn't exist in handler for type %s", member, membername)) + end + end + del(info) + return a,b,c,d + else + --The value isnt a function to call, return it + return member + end +end + +--[[calls an options function that could be inherited, method name or function ref +local function CallOptionsFunction(funcname ,option, options, path, appName, ...) + local info = new() + + local func + local group = options + local handler + + --build the info table containing the path + -- pick up functions while traversing the tree + if group[funcname] ~= nil then + func = group[funcname] + end + handler = group.handler or handler + + for i, v in ipairs(path) do + group = GetSubOption(group, v) + info[i] = v + if group[funcname] ~= nil then + func = group[funcname] + end + handler = group.handler or handler + end + + info.options = options + info[0] = appName + info.arg = option.arg + + local a, b, c ,d + if type(func) == "string" then + if handler and handler[func] then + a,b,c,d = handler[func](handler, info, ...) + else + error(string.format("Method %s doesn't exist in handler for type func", func)) + end + elseif type(func) == "function" then + a,b,c,d = func(info, ...) + end + del(info) + return a,b,c,d +end +--]] + +--tables to hold orders and names for options being sorted, will be created with new() +--prevents needing to call functions repeatedly while sorting +local tempOrders +local tempNames + +local function compareOptions(a,b) + if not a then + return true + end + if not b then + return false + end + local OrderA, OrderB = tempOrders[a] or 100, tempOrders[b] or 100 + if OrderA == OrderB then + local NameA = (type(tempNames[a]) == "string") and tempNames[a] or "" + local NameB = (type(tempNames[b]) == "string") and tempNames[b] or "" + return NameA:upper() < NameB:upper() + end + if OrderA < 0 then + if OrderB > 0 then + return false + end + else + if OrderB < 0 then + return true + end + end + return OrderA < OrderB +end + + + +--builds 2 tables out of an options group +-- keySort, sorted keys +-- opts, combined options from .plugins and args +local function BuildSortedOptionsTable(group, keySort, opts, options, path, appName) + tempOrders = new() + tempNames = new() + + if group.plugins then + for plugin, t in pairs(group.plugins) do + for k, v in pairs(t) do + if not opts[k] then + tinsert(keySort, k) + opts[k] = v + + path[#path+1] = k + tempOrders[k] = GetOptionsMemberValue("order", v, options, path, appName) + tempNames[k] = GetOptionsMemberValue("name", v, options, path, appName) + path[#path] = nil + end + end + end + end + + for k, v in pairs(group.args) do + if not opts[k] then + tinsert(keySort, k) + opts[k] = v + + path[#path+1] = k + tempOrders[k] = GetOptionsMemberValue("order", v, options, path, appName) + tempNames[k] = GetOptionsMemberValue("name", v, options, path, appName) + path[#path] = nil + end + end + + tsort(keySort, compareOptions) + + del(tempOrders) + del(tempNames) +end + +local function DelTree(tree) + if tree.children then + local childs = tree.children + for i = 1, #childs do + DelTree(childs[i]) + del(childs[i]) + end + del(childs) + end +end + +local function CleanUserData(widget, event) + + local user = widget:GetUserDataTable() + + if user.path then + del(user.path) + end + + if widget.type == "TreeGroup" then + local tree = user.tree + widget:SetTree(nil) + if tree then + for i = 1, #tree do + DelTree(tree[i]) + del(tree[i]) + end + del(tree) + end + end + + if widget.type == "TabGroup" then + widget:SetTabs(nil) + if user.tablist then + del(user.tablist) + end + end + + if widget.type == "DropdownGroup" then + widget:SetGroupList(nil) + if user.grouplist then + del(user.grouplist) + end + if user.orderlist then + del(user.orderlist) + end + end +end + +-- - Gets a status table for the given appname and options path. +-- @param appName The application name as given to `:RegisterOptionsTable()` +-- @param path The path to the options (a table with all group keys) +-- @return +function AceConfigDialog:GetStatusTable(appName, path) + local status = self.Status + + if not status[appName] then + status[appName] = {} + status[appName].status = {} + status[appName].children = {} + end + + status = status[appName] + + if path then + for i = 1, #path do + local v = path[i] + if not status.children[v] then + status.children[v] = {} + status.children[v].status = {} + status.children[v].children = {} + end + status = status.children[v] + end + end + + return status.status +end + +--- Selects the specified path in the options window. +-- The path specified has to match the keys of the groups in the table. +-- @param appName The application name as given to `:RegisterOptionsTable()` +-- @param ... The path to the key that should be selected +function AceConfigDialog:SelectGroup(appName, ...) + local path = new() + + + local app = reg:GetOptionsTable(appName) + if not app then + error(("%s isn't registed with AceConfigRegistry, unable to open config"):format(appName), 2) + end + local options = app("dialog", MAJOR) + local group = options + local status = self:GetStatusTable(appName, path) + if not status.groups then + status.groups = {} + end + status = status.groups + local treevalue + local treestatus + + for n = 1, select("#",...) do + local key = select(n, ...) + + if group.childGroups == "tab" or group.childGroups == "select" then + --if this is a tab or select group, select the group + status.selected = key + --children of this group are no longer extra levels of a tree + treevalue = nil + else + --tree group by default + if treevalue then + --this is an extra level of a tree group, build a uniquevalue for it + treevalue = treevalue.."\001"..key + else + --this is the top level of a tree group, the uniquevalue is the same as the key + treevalue = key + if not status.groups then + status.groups = {} + end + --save this trees status table for any extra levels or groups + treestatus = status + end + --make sure that the tree entry is open, and select it. + --the selected group will be overwritten if a child is the final target but still needs to be open + treestatus.selected = treevalue + treestatus.groups[treevalue] = true + + end + + --move to the next group in the path + group = GetSubOption(group, key) + if not group then + break + end + tinsert(path, key) + status = self:GetStatusTable(appName, path) + if not status.groups then + status.groups = {} + end + status = status.groups + end + + del(path) + reg:NotifyChange(appName) +end + +local function OptionOnMouseOver(widget, event) + --show a tooltip/set the status bar to the desc text + local user = widget:GetUserDataTable() + local opt = user.option + local options = user.options + local path = user.path + local appName = user.appName + + GameTooltip:SetOwner(widget.frame, "ANCHOR_TOPRIGHT") + local name = GetOptionsMemberValue("name", opt, options, path, appName) + local desc = GetOptionsMemberValue("desc", opt, options, path, appName) + local usage = GetOptionsMemberValue("usage", opt, options, path, appName) + local descStyle = opt.descStyle + + if descStyle and descStyle ~= "tooltip" then return end + + GameTooltip:SetText(name, 1, .82, 0, 1) + + if opt.type == "multiselect" then + GameTooltip:AddLine(user.text,0.5, 0.5, 0.8, 1) + end + if type(desc) == "string" then + GameTooltip:AddLine(desc, 1, 1, 1, 1) + end + if type(usage) == "string" then + GameTooltip:AddLine("Usage: "..usage, NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b, 1) + end + + GameTooltip:Show() +end + +local function OptionOnMouseLeave(widget, event) + GameTooltip:Hide() +end + +local function GetFuncName(option) + local type = option.type + if type == "execute" then + return "func" + else + return "set" + end +end +local function confirmPopup(appName, rootframe, basepath, info, message, func, ...) + if not StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"] then + StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"] = {} + end + local t = StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"] + for k in pairs(t) do + t[k] = nil + end + t.text = message + t.button1 = ACCEPT + t.button2 = CANCEL + t.preferredIndex = 3 + local dialog, oldstrata + t.OnAccept = function() + safecall(func, unpack(t)) + if dialog and oldstrata then + dialog:SetFrameStrata(oldstrata) + end + AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl)) + del(info) + end + t.OnCancel = function() + if dialog and oldstrata then + dialog:SetFrameStrata(oldstrata) + end + AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl)) + del(info) + end + for i = 1, select("#", ...) do + t[i] = select(i, ...) or false + end + t.timeout = 0 + t.whileDead = 1 + t.hideOnEscape = 1 + + dialog = StaticPopup_Show("ACECONFIGDIALOG30_CONFIRM_DIALOG") + if dialog then + oldstrata = dialog:GetFrameStrata() + dialog:SetFrameStrata("TOOLTIP") + end +end + +local function ActivateControl(widget, event, ...) + --This function will call the set / execute handler for the widget + --widget:GetUserDataTable() contains the needed info + local user = widget:GetUserDataTable() + local option = user.option + local options = user.options + local path = user.path + local info = new() + + local func + local group = options + local funcname = GetFuncName(option) + local handler + local confirm + local validate + --build the info table containing the path + -- pick up functions while traversing the tree + if group[funcname] ~= nil then + func = group[funcname] + end + handler = group.handler or handler + confirm = group.confirm + validate = group.validate + for i = 1, #path do + local v = path[i] + group = GetSubOption(group, v) + info[i] = v + if group[funcname] ~= nil then + func = group[funcname] + end + handler = group.handler or handler + if group.confirm ~= nil then + confirm = group.confirm + end + if group.validate ~= nil then + validate = group.validate + end + end + + info.options = options + info.appName = user.appName + info.arg = option.arg + info.handler = handler + info.option = option + info.type = option.type + info.uiType = "dialog" + info.uiName = MAJOR + + local name + if type(option.name) == "function" then + name = option.name(info) + elseif type(option.name) == "string" then + name = option.name + else + name = "" + end + local usage = option.usage + local pattern = option.pattern + + local validated = true + + if option.type == "input" then + if type(pattern)=="string" then + if not strmatch(..., pattern) then + validated = false + end + end + end + + local success + if validated and option.type ~= "execute" then + if type(validate) == "string" then + if handler and handler[validate] then + success, validated = safecall(handler[validate], handler, info, ...) + if not success then validated = false end + else + error(format("Method %s doesn't exist in handler for type execute", validate)) + end + elseif type(validate) == "function" then + success, validated = safecall(validate, info, ...) + if not success then validated = false end + end + end + + local rootframe = user.rootframe + if type(validated) == "string" then + --validate function returned a message to display + if rootframe.SetStatusText then + rootframe:SetStatusText(validated) + else + -- TODO: do something else. + end + PlaySound("igPlayerInviteDecline") + del(info) + return true + elseif not validated then + --validate returned false + if rootframe.SetStatusText then + if usage then + rootframe:SetStatusText(name..": "..usage) + else + if pattern then + rootframe:SetStatusText(name..": Expected "..pattern) + else + rootframe:SetStatusText(name..": Invalid Value") + end + end + else + -- TODO: do something else + end + PlaySound("igPlayerInviteDecline") + del(info) + return true + else + + local confirmText = option.confirmText + --call confirm func/method + if type(confirm) == "string" then + if handler and handler[confirm] then + success, confirm = safecall(handler[confirm], handler, info, ...) + if success and type(confirm) == "string" then + confirmText = confirm + confirm = true + elseif not success then + confirm = false + end + else + error(format("Method %s doesn't exist in handler for type confirm", confirm)) + end + elseif type(confirm) == "function" then + success, confirm = safecall(confirm, info, ...) + if success and type(confirm) == "string" then + confirmText = confirm + confirm = true + elseif not success then + confirm = false + end + end + + --confirm if needed + if type(confirm) == "boolean" then + if confirm then + if not confirmText then + local name, desc = option.name, option.desc + if type(name) == "function" then + name = name(info) + end + if type(desc) == "function" then + desc = desc(info) + end + confirmText = name + if desc then + confirmText = confirmText.." - "..desc + end + end + + local iscustom = user.rootframe:GetUserData("iscustom") + local rootframe + + if iscustom then + rootframe = user.rootframe + end + local basepath = user.rootframe:GetUserData("basepath") + if type(func) == "string" then + if handler and handler[func] then + confirmPopup(user.appName, rootframe, basepath, info, confirmText, handler[func], handler, info, ...) + else + error(format("Method %s doesn't exist in handler for type func", func)) + end + elseif type(func) == "function" then + confirmPopup(user.appName, rootframe, basepath, info, confirmText, func, info, ...) + end + --func will be called and info deleted when the confirm dialog is responded to + return + end + end + + --call the function + if type(func) == "string" then + if handler and handler[func] then + safecall(handler[func],handler, info, ...) + else + error(format("Method %s doesn't exist in handler for type func", func)) + end + elseif type(func) == "function" then + safecall(func,info, ...) + end + + + + local iscustom = user.rootframe:GetUserData("iscustom") + local basepath = user.rootframe:GetUserData("basepath") or emptyTbl + --full refresh of the frame, some controls dont cause this on all events + if option.type == "color" then + if event == "OnValueConfirmed" then + + if iscustom then + AceConfigDialog:Open(user.appName, user.rootframe, unpack(basepath)) + else + AceConfigDialog:Open(user.appName, unpack(basepath)) + end + end + elseif option.type == "range" then + if event == "OnMouseUp" then + if iscustom then + AceConfigDialog:Open(user.appName, user.rootframe, unpack(basepath)) + else + AceConfigDialog:Open(user.appName, unpack(basepath)) + end + end + --multiselects don't cause a refresh on 'OnValueChanged' only 'OnClosed' + elseif option.type == "multiselect" then + user.valuechanged = true + else + if iscustom then + AceConfigDialog:Open(user.appName, user.rootframe, unpack(basepath)) + else + AceConfigDialog:Open(user.appName, unpack(basepath)) + end + end + + end + del(info) +end + +local function ActivateSlider(widget, event, value) + local option = widget:GetUserData("option") + local min, max, step = option.min or (not option.softMin and 0 or nil), option.max or (not option.softMax and 100 or nil), option.step + if min then + if step then + value = math_floor((value - min) / step + 0.5) * step + min + end + value = math_max(value, min) + end + if max then + value = math_min(value, max) + end + ActivateControl(widget,event,value) +end + +--called from a checkbox that is part of an internally created multiselect group +--this type is safe to refresh on activation of one control +local function ActivateMultiControl(widget, event, ...) + ActivateControl(widget, event, widget:GetUserData("value"), ...) + local user = widget:GetUserDataTable() + local iscustom = user.rootframe:GetUserData("iscustom") + local basepath = user.rootframe:GetUserData("basepath") or emptyTbl + if iscustom then + AceConfigDialog:Open(user.appName, user.rootframe, unpack(basepath)) + else + AceConfigDialog:Open(user.appName, unpack(basepath)) + end +end + +local function MultiControlOnClosed(widget, event, ...) + local user = widget:GetUserDataTable() + if user.valuechanged then + local iscustom = user.rootframe:GetUserData("iscustom") + local basepath = user.rootframe:GetUserData("basepath") or emptyTbl + if iscustom then + AceConfigDialog:Open(user.appName, user.rootframe, unpack(basepath)) + else + AceConfigDialog:Open(user.appName, unpack(basepath)) + end + end +end + +local function FrameOnClose(widget, event) + local appName = widget:GetUserData("appName") + AceConfigDialog.OpenFrames[appName] = nil + gui:Release(widget) +end + +local function CheckOptionHidden(option, options, path, appName) + --check for a specific boolean option + local hidden = pickfirstset(option.dialogHidden,option.guiHidden) + if hidden ~= nil then + return hidden + end + + return GetOptionsMemberValue("hidden", option, options, path, appName) +end + +local function CheckOptionDisabled(option, options, path, appName) + --check for a specific boolean option + local disabled = pickfirstset(option.dialogDisabled,option.guiDisabled) + if disabled ~= nil then + return disabled + end + + return GetOptionsMemberValue("disabled", option, options, path, appName) +end +--[[ +local function BuildTabs(group, options, path, appName) + local tabs = new() + local text = new() + local keySort = new() + local opts = new() + + BuildSortedOptionsTable(group, keySort, opts, options, path, appName) + + for i = 1, #keySort do + local k = keySort[i] + local v = opts[k] + if v.type == "group" then + path[#path+1] = k + local inline = pickfirstset(v.dialogInline,v.guiInline,v.inline, false) + local hidden = CheckOptionHidden(v, options, path, appName) + if not inline and not hidden then + tinsert(tabs, k) + text[k] = GetOptionsMemberValue("name", v, options, path, appName) + end + path[#path] = nil + end + end + + del(keySort) + del(opts) + + return tabs, text +end +]] +local function BuildSelect(group, options, path, appName) + local groups = new() + local order = new() + local keySort = new() + local opts = new() + + BuildSortedOptionsTable(group, keySort, opts, options, path, appName) + + for i = 1, #keySort do + local k = keySort[i] + local v = opts[k] + if v.type == "group" then + path[#path+1] = k + local inline = pickfirstset(v.dialogInline,v.guiInline,v.inline, false) + local hidden = CheckOptionHidden(v, options, path, appName) + if not inline and not hidden then + groups[k] = GetOptionsMemberValue("name", v, options, path, appName) + tinsert(order, k) + end + path[#path] = nil + end + end + + del(opts) + del(keySort) + + return groups, order +end + +local function BuildSubGroups(group, tree, options, path, appName) + local keySort = new() + local opts = new() + + BuildSortedOptionsTable(group, keySort, opts, options, path, appName) + + for i = 1, #keySort do + local k = keySort[i] + local v = opts[k] + if v.type == "group" then + path[#path+1] = k + local inline = pickfirstset(v.dialogInline,v.guiInline,v.inline, false) + local hidden = CheckOptionHidden(v, options, path, appName) + if not inline and not hidden then + local entry = new() + entry.value = k + entry.text = GetOptionsMemberValue("name", v, options, path, appName) + entry.icon = GetOptionsMemberValue("icon", v, options, path, appName) + entry.iconCoords = GetOptionsMemberValue("iconCoords", v, options, path, appName) + entry.disabled = CheckOptionDisabled(v, options, path, appName) + if not tree.children then tree.children = new() end + tinsert(tree.children,entry) + if (v.childGroups or "tree") == "tree" then + BuildSubGroups(v,entry, options, path, appName) + end + end + path[#path] = nil + end + end + + del(keySort) + del(opts) +end + +local function BuildGroups(group, options, path, appName, recurse) + local tree = new() + local keySort = new() + local opts = new() + + BuildSortedOptionsTable(group, keySort, opts, options, path, appName) + + for i = 1, #keySort do + local k = keySort[i] + local v = opts[k] + if v.type == "group" then + path[#path+1] = k + local inline = pickfirstset(v.dialogInline,v.guiInline,v.inline, false) + local hidden = CheckOptionHidden(v, options, path, appName) + if not inline and not hidden then + local entry = new() + entry.value = k + entry.text = GetOptionsMemberValue("name", v, options, path, appName) + entry.icon = GetOptionsMemberValue("icon", v, options, path, appName) + entry.disabled = CheckOptionDisabled(v, options, path, appName) + tinsert(tree,entry) + if recurse and (v.childGroups or "tree") == "tree" then + BuildSubGroups(v,entry, options, path, appName) + end + end + path[#path] = nil + end + end + del(keySort) + del(opts) + return tree +end + +local function InjectInfo(control, options, option, path, rootframe, appName) + local user = control:GetUserDataTable() + for i = 1, #path do + user[i] = path[i] + end + user.rootframe = rootframe + user.option = option + user.options = options + user.path = copy(path) + user.appName = appName + control:SetCallback("OnRelease", CleanUserData) + control:SetCallback("OnLeave", OptionOnMouseLeave) + control:SetCallback("OnEnter", OptionOnMouseOver) +end + + +--[[ + options - root of the options table being fed + container - widget that controls will be placed in + rootframe - Frame object the options are in + path - table with the keys to get to the group being fed +--]] + +local function FeedOptions(appName, options,container,rootframe,path,group,inline) + local keySort = new() + local opts = new() + + BuildSortedOptionsTable(group, keySort, opts, options, path, appName) + + for i = 1, #keySort do + local k = keySort[i] + local v = opts[k] + tinsert(path, k) + local hidden = CheckOptionHidden(v, options, path, appName) + local name = GetOptionsMemberValue("name", v, options, path, appName) + if not hidden then + if v.type == "group" then + if inline or pickfirstset(v.dialogInline,v.guiInline,v.inline, false) then + --Inline group + local GroupContainer + if name and name ~= "" then + GroupContainer = gui:Create("InlineGroup") + GroupContainer:SetTitle(name or "") + else + GroupContainer = gui:Create("SimpleGroup") + end + + GroupContainer.width = "fill" + GroupContainer:SetLayout("flow") + container:AddChild(GroupContainer) + FeedOptions(appName,options,GroupContainer,rootframe,path,v,true) + end + else + --Control to feed + local control + + local name = GetOptionsMemberValue("name", v, options, path, appName) + + if v.type == "execute" then + + local imageCoords = GetOptionsMemberValue("imageCoords",v, options, path, appName) + local image, width, height = GetOptionsMemberValue("image",v, options, path, appName) + + if type(image) == "string" then + control = gui:Create("Icon") + if not width then + width = GetOptionsMemberValue("imageWidth",v, options, path, appName) + end + if not height then + height = GetOptionsMemberValue("imageHeight",v, options, path, appName) + end + if type(imageCoords) == "table" then + control:SetImage(image, unpack(imageCoords)) + else + control:SetImage(image) + end + if type(width) ~= "number" then + width = 32 + end + if type(height) ~= "number" then + height = 32 + end + control:SetImageSize(width, height) + control:SetLabel(name) + else + control = gui:Create("Button") + control:SetText(name) + end + control:SetCallback("OnClick",ActivateControl) + + elseif v.type == "input" then + local controlType = v.dialogControl or v.control or (v.multiline and "MultiLineEditBox") or "EditBox" + control = gui:Create(controlType) + if not control then + geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(controlType))) + control = gui:Create(v.multiline and "MultiLineEditBox" or "EditBox") + end + + if v.multiline and control.SetNumLines then + control:SetNumLines(tonumber(v.multiline) or 4) + end + control:SetLabel(name) + control:SetCallback("OnEnterPressed",ActivateControl) + local text = GetOptionsMemberValue("get",v, options, path, appName) + if type(text) ~= "string" then + text = "" + end + control:SetText(text) + + elseif v.type == "toggle" then + control = gui:Create("CheckBox") + control:SetLabel(name) + control:SetTriState(v.tristate) + local value = GetOptionsMemberValue("get",v, options, path, appName) + control:SetValue(value) + control:SetCallback("OnValueChanged",ActivateControl) + + if v.descStyle == "inline" then + local desc = GetOptionsMemberValue("desc", v, options, path, appName) + control:SetDescription(desc) + end + + local image = GetOptionsMemberValue("image", v, options, path, appName) + local imageCoords = GetOptionsMemberValue("imageCoords", v, options, path, appName) + + if type(image) == "string" then + if type(imageCoords) == "table" then + control:SetImage(image, unpack(imageCoords)) + else + control:SetImage(image) + end + end + elseif v.type == "range" then + control = gui:Create("Slider") + control:SetLabel(name) + control:SetSliderValues(v.softMin or v.min or 0, v.softMax or v.max or 100, v.bigStep or v.step or 0) + control:SetIsPercent(v.isPercent) + local value = GetOptionsMemberValue("get",v, options, path, appName) + if type(value) ~= "number" then + value = 0 + end + control:SetValue(value) + control:SetCallback("OnValueChanged",ActivateSlider) + control:SetCallback("OnMouseUp",ActivateSlider) + + elseif v.type == "select" then + local values = GetOptionsMemberValue("values", v, options, path, appName) + if v.style == "radio" then + local disabled = CheckOptionDisabled(v, options, path, appName) + local width = GetOptionsMemberValue("width",v,options,path,appName) + control = gui:Create("InlineGroup") + control:SetLayout("Flow") + control:SetTitle(name) + control.width = "fill" + + control:PauseLayout() + local optionValue = GetOptionsMemberValue("get",v, options, path, appName) + local t = {} + for value, text in pairs(values) do + t[#t+1]=value + end + tsort(t) + for k, value in ipairs(t) do + local text = values[value] + local radio = gui:Create("CheckBox") + radio:SetLabel(text) + radio:SetUserData("value", value) + radio:SetUserData("text", text) + radio:SetDisabled(disabled) + radio:SetType("radio") + radio:SetValue(optionValue == value) + radio:SetCallback("OnValueChanged", ActivateMultiControl) + InjectInfo(radio, options, v, path, rootframe, appName) + control:AddChild(radio) + if width == "double" then + radio:SetWidth(width_multiplier * 2) + elseif width == "half" then + radio:SetWidth(width_multiplier / 2) + elseif width == "full" then + radio.width = "fill" + else + radio:SetWidth(width_multiplier) + end + end + control:ResumeLayout() + control:DoLayout() + else + local controlType = v.dialogControl or v.control or "Dropdown" + control = gui:Create(controlType) + if not control then + geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(controlType))) + control = gui:Create("Dropdown") + end + local itemType = v.itemControl + if itemType and not gui:GetWidgetVersion(itemType) then + geterrorhandler()(("Invalid Custom Item Type - %s"):format(tostring(itemType))) + itemType = nil + end + control:SetLabel(name) + control:SetList(values, nil, itemType) + local value = GetOptionsMemberValue("get",v, options, path, appName) + if not values[value] then + value = nil + end + control:SetValue(value) + control:SetCallback("OnValueChanged", ActivateControl) + end + + elseif v.type == "multiselect" then + local values = GetOptionsMemberValue("values", v, options, path, appName) + local disabled = CheckOptionDisabled(v, options, path, appName) + + local controlType = v.dialogControl or v.control + + local valuesort = new() + if values then + for value, text in pairs(values) do + tinsert(valuesort, value) + end + end + tsort(valuesort) + + if controlType then + control = gui:Create(controlType) + if not control then + geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(controlType))) + end + end + if control then + control:SetMultiselect(true) + control:SetLabel(name) + control:SetList(values) + control:SetDisabled(disabled) + control:SetCallback("OnValueChanged",ActivateControl) + control:SetCallback("OnClosed", MultiControlOnClosed) + local width = GetOptionsMemberValue("width",v,options,path,appName) + if width == "double" then + control:SetWidth(width_multiplier * 2) + elseif width == "half" then + control:SetWidth(width_multiplier / 2) + elseif width == "full" then + control.width = "fill" + else + control:SetWidth(width_multiplier) + end + --check:SetTriState(v.tristate) + for i = 1, #valuesort do + local key = valuesort[i] + local value = GetOptionsMemberValue("get",v, options, path, appName, key) + control:SetItemValue(key,value) + end + else + control = gui:Create("InlineGroup") + control:SetLayout("Flow") + control:SetTitle(name) + control.width = "fill" + + control:PauseLayout() + local width = GetOptionsMemberValue("width",v,options,path,appName) + for i = 1, #valuesort do + local value = valuesort[i] + local text = values[value] + local check = gui:Create("CheckBox") + check:SetLabel(text) + check:SetUserData("value", value) + check:SetUserData("text", text) + check:SetDisabled(disabled) + check:SetTriState(v.tristate) + check:SetValue(GetOptionsMemberValue("get",v, options, path, appName, value)) + check:SetCallback("OnValueChanged",ActivateMultiControl) + InjectInfo(check, options, v, path, rootframe, appName) + control:AddChild(check) + if width == "double" then + check:SetWidth(width_multiplier * 2) + elseif width == "half" then + check:SetWidth(width_multiplier / 2) + elseif width == "full" then + check.width = "fill" + else + check:SetWidth(width_multiplier) + end + end + control:ResumeLayout() + control:DoLayout() + + + end + + del(valuesort) + + elseif v.type == "color" then + control = gui:Create("ColorPicker") + control:SetLabel(name) + control:SetHasAlpha(GetOptionsMemberValue("hasAlpha",v, options, path, appName)) + control:SetColor(GetOptionsMemberValue("get",v, options, path, appName)) + control:SetCallback("OnValueChanged",ActivateControl) + control:SetCallback("OnValueConfirmed",ActivateControl) + + elseif v.type == "keybinding" then + control = gui:Create("Keybinding") + control:SetLabel(name) + control:SetKey(GetOptionsMemberValue("get",v, options, path, appName)) + control:SetCallback("OnKeyChanged",ActivateControl) + + elseif v.type == "header" then + control = gui:Create("Heading") + control:SetText(name) + control.width = "fill" + + elseif v.type == "description" then + control = gui:Create("Label") + control:SetText(name) + + local fontSize = GetOptionsMemberValue("fontSize",v, options, path, appName) + if fontSize == "medium" then + control:SetFontObject(GameFontHighlight) + elseif fontSize == "large" then + control:SetFontObject(GameFontHighlightLarge) + else -- small or invalid + control:SetFontObject(GameFontHighlightSmall) + end + + local imageCoords = GetOptionsMemberValue("imageCoords",v, options, path, appName) + local image, width, height = GetOptionsMemberValue("image",v, options, path, appName) + + if type(image) == "string" then + if not width then + width = GetOptionsMemberValue("imageWidth",v, options, path, appName) + end + if not height then + height = GetOptionsMemberValue("imageHeight",v, options, path, appName) + end + if type(imageCoords) == "table" then + control:SetImage(image, unpack(imageCoords)) + else + control:SetImage(image) + end + if type(width) ~= "number" then + width = 32 + end + if type(height) ~= "number" then + height = 32 + end + control:SetImageSize(width, height) + end + local width = GetOptionsMemberValue("width",v,options,path,appName) + control.width = not width and "fill" + end + + --Common Init + if control then + if control.width ~= "fill" then + local width = GetOptionsMemberValue("width",v,options,path,appName) + if width == "double" then + control:SetWidth(width_multiplier * 2) + elseif width == "half" then + control:SetWidth(width_multiplier / 2) + elseif width == "full" then + control.width = "fill" + else + control:SetWidth(width_multiplier) + end + end + if control.SetDisabled then + local disabled = CheckOptionDisabled(v, options, path, appName) + control:SetDisabled(disabled) + end + + InjectInfo(control, options, v, path, rootframe, appName) + container:AddChild(control) + end + + end + end + tremove(path) + end + container:ResumeLayout() + container:DoLayout() + del(keySort) + del(opts) +end + +local function BuildPath(path, ...) + for i = 1, select("#",...) do + tinsert(path, (select(i,...))) + end +end + + +local function TreeOnButtonEnter(widget, event, uniquevalue, button) + local user = widget:GetUserDataTable() + if not user then return end + local options = user.options + local option = user.option + local path = user.path + local appName = user.appName + + local feedpath = new() + for i = 1, #path do + feedpath[i] = path[i] + end + + BuildPath(feedpath, ("\001"):split(uniquevalue)) + local group = options + for i = 1, #feedpath do + if not group then return end + group = GetSubOption(group, feedpath[i]) + end + + local name = GetOptionsMemberValue("name", group, options, feedpath, appName) + local desc = GetOptionsMemberValue("desc", group, options, feedpath, appName) + + GameTooltip:SetOwner(button, "ANCHOR_NONE") + if widget.type == "TabGroup" then + GameTooltip:SetPoint("BOTTOM",button,"TOP") + else + GameTooltip:SetPoint("LEFT",button,"RIGHT") + end + + GameTooltip:SetText(name, 1, .82, 0, 1) + + if type(desc) == "string" then + GameTooltip:AddLine(desc, 1, 1, 1, 1) + end + + GameTooltip:Show() +end + +local function TreeOnButtonLeave(widget, event, value, button) + GameTooltip:Hide() +end + + +local function GroupExists(appName, options, path, uniquevalue) + if not uniquevalue then return false end + + local feedpath = new() + local temppath = new() + for i = 1, #path do + feedpath[i] = path[i] + end + + BuildPath(feedpath, ("\001"):split(uniquevalue)) + + local group = options + for i = 1, #feedpath do + local v = feedpath[i] + temppath[i] = v + group = GetSubOption(group, v) + + if not group or group.type ~= "group" or CheckOptionHidden(group, options, temppath, appName) then + del(feedpath) + del(temppath) + return false + end + end + del(feedpath) + del(temppath) + return true +end + +local function GroupSelected(widget, event, uniquevalue) + + local user = widget:GetUserDataTable() + + local options = user.options + local option = user.option + local path = user.path + local rootframe = user.rootframe + + local feedpath = new() + for i = 1, #path do + feedpath[i] = path[i] + end + + BuildPath(feedpath, ("\001"):split(uniquevalue)) + local group = options + for i = 1, #feedpath do + group = GetSubOption(group, feedpath[i]) + end + widget:ReleaseChildren() + AceConfigDialog:FeedGroup(user.appName,options,widget,rootframe,feedpath) + + del(feedpath) +end + + + +--[[ +-- INTERNAL -- +This function will feed one group, and any inline child groups into the given container +Select Groups will only have the selection control (tree, tabs, dropdown) fed in +and have a group selected, this event will trigger the feeding of child groups + +Rules: + If the group is Inline, FeedOptions + If the group has no child groups, FeedOptions + + If the group is a tab or select group, FeedOptions then add the Group Control + If the group is a tree group FeedOptions then + its parent isnt a tree group: then add the tree control containing this and all child tree groups + if its parent is a tree group, its already a node on a tree +--]] + +function AceConfigDialog:FeedGroup(appName,options,container,rootframe,path, isRoot) + local group = options + --follow the path to get to the curent group + local inline + local grouptype, parenttype = options.childGroups, "none" + + + for i = 1, #path do + local v = path[i] + group = GetSubOption(group, v) + inline = inline or pickfirstset(v.dialogInline,v.guiInline,v.inline, false) + parenttype = grouptype + grouptype = group.childGroups + end + + if not parenttype then + parenttype = "tree" + end + + --check if the group has child groups + local hasChildGroups + for k, v in pairs(group.args) do + if v.type == "group" and not pickfirstset(v.dialogInline,v.guiInline,v.inline, false) and not CheckOptionHidden(v, options, path, appName) then + hasChildGroups = true + end + end + if group.plugins then + for plugin, t in pairs(group.plugins) do + for k, v in pairs(t) do + if v.type == "group" and not pickfirstset(v.dialogInline,v.guiInline,v.inline, false) and not CheckOptionHidden(v, options, path, appName) then + hasChildGroups = true + end + end + end + end + + container:SetLayout("flow") + local scroll + + --Add a scrollframe if we are not going to add a group control, this is the inverse of the conditions for that later on + if (not (hasChildGroups and not inline)) or (grouptype ~= "tab" and grouptype ~= "select" and (parenttype == "tree" and not isRoot)) then + if container.type ~= "InlineGroup" and container.type ~= "SimpleGroup" then + scroll = gui:Create("ScrollFrame") + scroll:SetLayout("flow") + scroll.width = "fill" + scroll.height = "fill" + container:SetLayout("fill") + container:AddChild(scroll) + container = scroll + end + end + + FeedOptions(appName,options,container,rootframe,path,group,nil) + + if scroll then + container:PerformLayout() + local status = self:GetStatusTable(appName, path) + if not status.scroll then + status.scroll = {} + end + scroll:SetStatusTable(status.scroll) + end + + if hasChildGroups and not inline then + local name = GetOptionsMemberValue("name", group, options, path, appName) + if grouptype == "tab" then + + local tab = gui:Create("TabGroup") + InjectInfo(tab, options, group, path, rootframe, appName) + tab:SetCallback("OnGroupSelected", GroupSelected) + tab:SetCallback("OnTabEnter", TreeOnButtonEnter) + tab:SetCallback("OnTabLeave", TreeOnButtonLeave) + + local status = AceConfigDialog:GetStatusTable(appName, path) + if not status.groups then + status.groups = {} + end + tab:SetStatusTable(status.groups) + tab.width = "fill" + tab.height = "fill" + + local tabs = BuildGroups(group, options, path, appName) + tab:SetTabs(tabs) + tab:SetUserData("tablist", tabs) + + for i = 1, #tabs do + local entry = tabs[i] + if not entry.disabled then + tab:SelectTab((GroupExists(appName, options, path,status.groups.selected) and status.groups.selected) or entry.value) + break + end + end + + container:AddChild(tab) + + elseif grouptype == "select" then + + local select = gui:Create("DropdownGroup") + select:SetTitle(name) + InjectInfo(select, options, group, path, rootframe, appName) + select:SetCallback("OnGroupSelected", GroupSelected) + local status = AceConfigDialog:GetStatusTable(appName, path) + if not status.groups then + status.groups = {} + end + select:SetStatusTable(status.groups) + local grouplist, orderlist = BuildSelect(group, options, path, appName) + select:SetGroupList(grouplist, orderlist) + select:SetUserData("grouplist", grouplist) + select:SetUserData("orderlist", orderlist) + + local firstgroup = orderlist[1] + if firstgroup then + select:SetGroup((GroupExists(appName, options, path,status.groups.selected) and status.groups.selected) or firstgroup) + end + + select.width = "fill" + select.height = "fill" + + container:AddChild(select) + + --assume tree group by default + --if parenttype is tree then this group is already a node on that tree + elseif (parenttype ~= "tree") or isRoot then + local tree = gui:Create("TreeGroup") + InjectInfo(tree, options, group, path, rootframe, appName) + tree:EnableButtonTooltips(false) + + tree.width = "fill" + tree.height = "fill" + + tree:SetCallback("OnGroupSelected", GroupSelected) + tree:SetCallback("OnButtonEnter", TreeOnButtonEnter) + tree:SetCallback("OnButtonLeave", TreeOnButtonLeave) + + local status = AceConfigDialog:GetStatusTable(appName, path) + if not status.groups then + status.groups = {} + end + local treedefinition = BuildGroups(group, options, path, appName, true) + tree:SetStatusTable(status.groups) + + tree:SetTree(treedefinition) + tree:SetUserData("tree",treedefinition) + + for i = 1, #treedefinition do + local entry = treedefinition[i] + if not entry.disabled then + tree:SelectByValue((GroupExists(appName, options, path,status.groups.selected) and status.groups.selected) or entry.value) + break + end + end + + container:AddChild(tree) + end + end +end + +local old_CloseSpecialWindows + + +local function RefreshOnUpdate(this) + for appName in pairs(this.closing) do + if AceConfigDialog.OpenFrames[appName] then + AceConfigDialog.OpenFrames[appName]:Hide() + end + if AceConfigDialog.BlizOptions and AceConfigDialog.BlizOptions[appName] then + for key, widget in pairs(AceConfigDialog.BlizOptions[appName]) do + if not widget:IsVisible() then + widget:ReleaseChildren() + end + end + end + this.closing[appName] = nil + end + + if this.closeAll then + for k, v in pairs(AceConfigDialog.OpenFrames) do + if not this.closeAllOverride[k] then + v:Hide() + end + end + this.closeAll = nil + wipe(this.closeAllOverride) + end + + for appName in pairs(this.apps) do + if AceConfigDialog.OpenFrames[appName] then + local user = AceConfigDialog.OpenFrames[appName]:GetUserDataTable() + AceConfigDialog:Open(appName, unpack(user.basepath or emptyTbl)) + end + if AceConfigDialog.BlizOptions and AceConfigDialog.BlizOptions[appName] then + for key, widget in pairs(AceConfigDialog.BlizOptions[appName]) do + local user = widget:GetUserDataTable() + if widget:IsVisible() then + AceConfigDialog:Open(widget:GetUserData("appName"), widget, unpack(user.basepath or emptyTbl)) + end + end + end + this.apps[appName] = nil + end + this:SetScript("OnUpdate", nil) +end + +-- Upgrade the OnUpdate script as well, if needed. +if AceConfigDialog.frame:GetScript("OnUpdate") then + AceConfigDialog.frame:SetScript("OnUpdate", RefreshOnUpdate) +end + +--- Close all open options windows +function AceConfigDialog:CloseAll() + AceConfigDialog.frame.closeAll = true + AceConfigDialog.frame:SetScript("OnUpdate", RefreshOnUpdate) + if next(self.OpenFrames) then + return true + end +end + +--- Close a specific options window. +-- @param appName The application name as given to `:RegisterOptionsTable()` +function AceConfigDialog:Close(appName) + if self.OpenFrames[appName] then + AceConfigDialog.frame.closing[appName] = true + AceConfigDialog.frame:SetScript("OnUpdate", RefreshOnUpdate) + return true + end +end + +-- Internal -- Called by AceConfigRegistry +function AceConfigDialog:ConfigTableChanged(event, appName) + AceConfigDialog.frame.apps[appName] = true + AceConfigDialog.frame:SetScript("OnUpdate", RefreshOnUpdate) +end + +reg.RegisterCallback(AceConfigDialog, "ConfigTableChange", "ConfigTableChanged") + +--- Sets the default size of the options window for a specific application. +-- @param appName The application name as given to `:RegisterOptionsTable()` +-- @param width The default width +-- @param height The default height +function AceConfigDialog:SetDefaultSize(appName, width, height) + local status = AceConfigDialog:GetStatusTable(appName) + if type(width) == "number" and type(height) == "number" then + status.width = width + status.height = height + end +end + +--- Open an option window at the specified path (if any). +-- This function can optionally feed the group into a pre-created container +-- instead of creating a new container frame. +-- @paramsig appName [, container][, ...] +-- @param appName The application name as given to `:RegisterOptionsTable()` +-- @param container An optional container frame to feed the options into +-- @param ... The path to open after creating the options window (see `:SelectGroup` for details) +function AceConfigDialog:Open(appName, container, ...) + if not old_CloseSpecialWindows then + old_CloseSpecialWindows = CloseSpecialWindows + CloseSpecialWindows = function() + local found = old_CloseSpecialWindows() + return self:CloseAll() or found + end + end + local app = reg:GetOptionsTable(appName) + if not app then + error(("%s isn't registed with AceConfigRegistry, unable to open config"):format(appName), 2) + end + local options = app("dialog", MAJOR) + + local f + + local path = new() + local name = GetOptionsMemberValue("name", options, options, path, appName) + + --If an optional path is specified add it to the path table before feeding the options + --as container is optional as well it may contain the first element of the path + if type(container) == "string" then + tinsert(path, container) + container = nil + end + for n = 1, select("#",...) do + tinsert(path, (select(n, ...))) + end + + --if a container is given feed into that + if container then + f = container + f:ReleaseChildren() + f:SetUserData("appName", appName) + f:SetUserData("iscustom", true) + if #path > 0 then + f:SetUserData("basepath", copy(path)) + end + local status = AceConfigDialog:GetStatusTable(appName) + if not status.width then + status.width = 700 + end + if not status.height then + status.height = 500 + end + if f.SetStatusTable then + f:SetStatusTable(status) + end + if f.SetTitle then + f:SetTitle(name or "") + end + else + if not self.OpenFrames[appName] then + f = gui:Create("Frame") + self.OpenFrames[appName] = f + else + f = self.OpenFrames[appName] + end + f:ReleaseChildren() + f:SetCallback("OnClose", FrameOnClose) + f:SetUserData("appName", appName) + if #path > 0 then + f:SetUserData("basepath", copy(path)) + end + f:SetTitle(name or "") + local status = AceConfigDialog:GetStatusTable(appName) + f:SetStatusTable(status) + end + + self:FeedGroup(appName,options,f,f,path,true) + if f.Show then + f:Show() + end + del(path) + + if AceConfigDialog.frame.closeAll then + -- close all is set, but thats not good, since we're just opening here, so force it + AceConfigDialog.frame.closeAllOverride[appName] = true + end +end + +-- convert pre-39 BlizOptions structure to the new format +if oldminor and oldminor < 39 and AceConfigDialog.BlizOptions then + local old = AceConfigDialog.BlizOptions + local new = {} + for key, widget in pairs(old) do + local appName = widget:GetUserData("appName") + if not new[appName] then new[appName] = {} end + new[appName][key] = widget + end + AceConfigDialog.BlizOptions = new +else + AceConfigDialog.BlizOptions = AceConfigDialog.BlizOptions or {} +end + +local function FeedToBlizPanel(widget, event) + local path = widget:GetUserData("path") + AceConfigDialog:Open(widget:GetUserData("appName"), widget, unpack(path or emptyTbl)) +end + +local function ClearBlizPanel(widget, event) + local appName = widget:GetUserData("appName") + AceConfigDialog.frame.closing[appName] = true + AceConfigDialog.frame:SetScript("OnUpdate", RefreshOnUpdate) +end + +--- Add an option table into the Blizzard Interface Options panel. +-- You can optionally supply a descriptive name to use and a parent frame to use, +-- as well as a path in the options table.\\ +-- If no name is specified, the appName will be used instead. +-- +-- If you specify a proper `parent` (by name), the interface options will generate a +-- tree layout. Note that only one level of children is supported, so the parent always +-- has to be a head-level note. +-- +-- This function returns a reference to the container frame registered with the Interface +-- Options. You can use this reference to open the options with the API function +-- `InterfaceOptionsFrame_OpenToCategory`. +-- @param appName The application name as given to `:RegisterOptionsTable()` +-- @param name A descriptive name to display in the options tree (defaults to appName) +-- @param parent The parent to use in the interface options tree. +-- @param ... The path in the options table to feed into the interface options panel. +-- @return The reference to the frame registered into the Interface Options. +function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...) + local BlizOptions = AceConfigDialog.BlizOptions + + local key = appName + for n = 1, select("#", ...) do + key = key.."\001"..select(n, ...) + end + + if not BlizOptions[appName] then + BlizOptions[appName] = {} + end + + if not BlizOptions[appName][key] then + local group = gui:Create("BlizOptionsGroup") + BlizOptions[appName][key] = group + group:SetName(name or appName, parent) + + group:SetTitle(name or appName) + group:SetUserData("appName", appName) + if select("#", ...) > 0 then + local path = {} + for n = 1, select("#",...) do + tinsert(path, (select(n, ...))) + end + group:SetUserData("path", path) + end + group:SetCallback("OnShow", FeedToBlizPanel) + group:SetCallback("OnHide", ClearBlizPanel) + InterfaceOptions_AddCategory(group.frame) + return group.frame + else + error(("%s has already been added to the Blizzard Options Window with the given path"):format(appName), 2) + end +end diff --git a/libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml b/libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml old mode 100644 new mode 100755 index 69597e9..86ce057 --- a/libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml +++ b/libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml @@ -1,4 +1,4 @@ -<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ -..\FrameXML\UI.xsd"> - <Script file="AceConfigDialog-3.0.lua"/> +<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ +..\FrameXML\UI.xsd"> + <Script file="AceConfigDialog-3.0.lua"/> </Ui> \ No newline at end of file diff --git a/libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua b/libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua old mode 100644 new mode 100755 index 1805b2a..74f4880 --- a/libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua +++ b/libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua @@ -1,347 +1,347 @@ ---- AceConfigRegistry-3.0 handles central registration of options tables in use by addons and modules.\\ --- Options tables can be registered as raw tables, OR as function refs that return a table.\\ --- Such functions receive three arguments: "uiType", "uiName", "appName". \\ --- * Valid **uiTypes**: "cmd", "dropdown", "dialog". This is verified by the library at call time. \\ --- * The **uiName** field is expected to contain the full name of the calling addon, including version, e.g. "FooBar-1.0". This is verified by the library at call time.\\ --- * The **appName** field is the options table name as given at registration time \\ --- --- :IterateOptionsTables() (and :GetOptionsTable() if only given one argument) return a function reference that the requesting config handling addon must call with valid "uiType", "uiName". --- @class file --- @name AceConfigRegistry-3.0 --- @release $Id: AceConfigRegistry-3.0.lua 998 2010-12-01 18:39:53Z nevcairiel $ -local MAJOR, MINOR = "AceConfigRegistry-3.0", 13 -local AceConfigRegistry = LibStub:NewLibrary(MAJOR, MINOR) - -if not AceConfigRegistry then return end - -AceConfigRegistry.tables = AceConfigRegistry.tables or {} - -local CallbackHandler = LibStub:GetLibrary("CallbackHandler-1.0") - -if not AceConfigRegistry.callbacks then - AceConfigRegistry.callbacks = CallbackHandler:New(AceConfigRegistry) -end - --- Lua APIs -local tinsert, tconcat = table.insert, table.concat -local strfind, strmatch = string.find, string.match -local type, tostring, select, pairs = type, tostring, select, pairs -local error, assert = error, assert - ------------------------------------------------------------------------ --- Validating options table consistency: - - -AceConfigRegistry.validated = { - -- list of options table names ran through :ValidateOptionsTable automatically. - -- CLEARED ON PURPOSE, since newer versions may have newer validators - cmd = {}, - dropdown = {}, - dialog = {}, -} - - - -local function err(msg, errlvl, ...) - local t = {} - for i=select("#",...),1,-1 do - tinsert(t, (select(i, ...))) - end - error(MAJOR..":ValidateOptionsTable(): "..tconcat(t,".")..msg, errlvl+2) -end - - -local isstring={["string"]=true, _="string"} -local isstringfunc={["string"]=true,["function"]=true, _="string or funcref"} -local istable={["table"]=true, _="table"} -local ismethodtable={["table"]=true,["string"]=true,["function"]=true, _="methodname, funcref or table"} -local optstring={["nil"]=true,["string"]=true, _="string"} -local optstringfunc={["nil"]=true,["string"]=true,["function"]=true, _="string or funcref"} -local optnumber={["nil"]=true,["number"]=true, _="number"} -local optmethod={["nil"]=true,["string"]=true,["function"]=true, _="methodname or funcref"} -local optmethodfalse={["nil"]=true,["string"]=true,["function"]=true,["boolean"]={[false]=true}, _="methodname, funcref or false"} -local optmethodnumber={["nil"]=true,["string"]=true,["function"]=true,["number"]=true, _="methodname, funcref or number"} -local optmethodtable={["nil"]=true,["string"]=true,["function"]=true,["table"]=true, _="methodname, funcref or table"} -local optmethodbool={["nil"]=true,["string"]=true,["function"]=true,["boolean"]=true, _="methodname, funcref or boolean"} -local opttable={["nil"]=true,["table"]=true, _="table"} -local optbool={["nil"]=true,["boolean"]=true, _="boolean"} -local optboolnumber={["nil"]=true,["boolean"]=true,["number"]=true, _="boolean or number"} - -local basekeys={ - type=isstring, - name=isstringfunc, - desc=optstringfunc, - descStyle=optstring, - order=optmethodnumber, - validate=optmethodfalse, - confirm=optmethodbool, - confirmText=optstring, - disabled=optmethodbool, - hidden=optmethodbool, - guiHidden=optmethodbool, - dialogHidden=optmethodbool, - dropdownHidden=optmethodbool, - cmdHidden=optmethodbool, - icon=optstringfunc, - iconCoords=optmethodtable, - handler=opttable, - get=optmethodfalse, - set=optmethodfalse, - func=optmethodfalse, - arg={["*"]=true}, - width=optstring, -} - -local typedkeys={ - header={}, - description={ - image=optstringfunc, - imageCoords=optmethodtable, - imageHeight=optnumber, - imageWidth=optnumber, - fontSize=optstringfunc, - }, - group={ - args=istable, - plugins=opttable, - inline=optbool, - cmdInline=optbool, - guiInline=optbool, - dropdownInline=optbool, - dialogInline=optbool, - childGroups=optstring, - }, - execute={ - image=optstringfunc, - imageCoords=optmethodtable, - imageHeight=optnumber, - imageWidth=optnumber, - }, - input={ - pattern=optstring, - usage=optstring, - control=optstring, - dialogControl=optstring, - dropdownControl=optstring, - multiline=optboolnumber, - }, - toggle={ - tristate=optbool, - image=optstringfunc, - imageCoords=optmethodtable, - }, - tristate={ - }, - range={ - min=optnumber, - softMin=optnumber, - max=optnumber, - softMax=optnumber, - step=optnumber, - bigStep=optnumber, - isPercent=optbool, - }, - select={ - values=ismethodtable, - style={ - ["nil"]=true, - ["string"]={dropdown=true,radio=true}, - _="string: 'dropdown' or 'radio'" - }, - control=optstring, - dialogControl=optstring, - dropdownControl=optstring, - itemControl=optstring, - }, - multiselect={ - values=ismethodtable, - style=optstring, - tristate=optbool, - control=optstring, - dialogControl=optstring, - dropdownControl=optstring, - }, - color={ - hasAlpha=optbool, - }, - keybinding={ - -- TODO - }, -} - -local function validateKey(k,errlvl,...) - errlvl=(errlvl or 0)+1 - if type(k)~="string" then - err("["..tostring(k).."] - key is not a string", errlvl,...) - end - if strfind(k, "[%c\127]") then - err("["..tostring(k).."] - key name contained control characters", errlvl,...) - end -end - -local function validateVal(v, oktypes, errlvl,...) - errlvl=(errlvl or 0)+1 - local isok=oktypes[type(v)] or oktypes["*"] - - if not isok then - err(": expected a "..oktypes._..", got '"..tostring(v).."'", errlvl,...) - end - if type(isok)=="table" then -- isok was a table containing specific values to be tested for! - if not isok[v] then - err(": did not expect "..type(v).." value '"..tostring(v).."'", errlvl,...) - end - end -end - -local function validate(options,errlvl,...) - errlvl=(errlvl or 0)+1 - -- basic consistency - if type(options)~="table" then - err(": expected a table, got a "..type(options), errlvl,...) - end - if type(options.type)~="string" then - err(".type: expected a string, got a "..type(options.type), errlvl,...) - end - - -- get type and 'typedkeys' member - local tk = typedkeys[options.type] - if not tk then - err(".type: unknown type '"..options.type.."'", errlvl,...) - end - - -- make sure that all options[] are known parameters - for k,v in pairs(options) do - if not (tk[k] or basekeys[k]) then - err(": unknown parameter", errlvl,tostring(k),...) - end - end - - -- verify that required params are there, and that everything is the right type - for k,oktypes in pairs(basekeys) do - validateVal(options[k], oktypes, errlvl,k,...) - end - for k,oktypes in pairs(tk) do - validateVal(options[k], oktypes, errlvl,k,...) - end - - -- extra logic for groups - if options.type=="group" then - for k,v in pairs(options.args) do - validateKey(k,errlvl,"args",...) - validate(v, errlvl,k,"args",...) - end - if options.plugins then - for plugname,plugin in pairs(options.plugins) do - if type(plugin)~="table" then - err(": expected a table, got '"..tostring(plugin).."'", errlvl,tostring(plugname),"plugins",...) - end - for k,v in pairs(plugin) do - validateKey(k,errlvl,tostring(plugname),"plugins",...) - validate(v, errlvl,k,tostring(plugname),"plugins",...) - end - end - end - end -end - - ---- Validates basic structure and integrity of an options table \\ --- Does NOT verify that get/set etc actually exist, since they can be defined at any depth --- @param options The table to be validated --- @param name The name of the table to be validated (shown in any error message) --- @param errlvl (optional number) error level offset, default 0 (=errors point to the function calling :ValidateOptionsTable) -function AceConfigRegistry:ValidateOptionsTable(options,name,errlvl) - errlvl=(errlvl or 0)+1 - name = name or "Optionstable" - if not options.name then - options.name=name -- bit of a hack, the root level doesn't really need a .name :-/ - end - validate(options,errlvl,name) -end - ---- Fires a "ConfigTableChange" callback for those listening in on it, allowing config GUIs to refresh. --- You should call this function if your options table changed from any outside event, like a game event --- or a timer. --- @param appName The application name as given to `:RegisterOptionsTable()` -function AceConfigRegistry:NotifyChange(appName) - if not AceConfigRegistry.tables[appName] then return end - AceConfigRegistry.callbacks:Fire("ConfigTableChange", appName) -end - --- ------------------------------------------------------------------- --- Registering and retreiving options tables: - - --- validateGetterArgs: helper function for :GetOptionsTable (or, rather, the getter functions returned by it) - -local function validateGetterArgs(uiType, uiName, errlvl) - errlvl=(errlvl or 0)+2 - if uiType~="cmd" and uiType~="dropdown" and uiType~="dialog" then - error(MAJOR..": Requesting options table: 'uiType' - invalid configuration UI type, expected 'cmd', 'dropdown' or 'dialog'", errlvl) - end - if not strmatch(uiName, "[A-Za-z]%-[0-9]") then -- Expecting e.g. "MyLib-1.2" - error(MAJOR..": Requesting options table: 'uiName' - badly formatted or missing version number. Expected e.g. 'MyLib-1.2'", errlvl) - end -end - ---- Register an options table with the config registry. --- @param appName The application name as given to `:RegisterOptionsTable()` --- @param options The options table, OR a function reference that generates it on demand. \\ --- See the top of the page for info on arguments passed to such functions. -function AceConfigRegistry:RegisterOptionsTable(appName, options) - if type(options)=="table" then - if options.type~="group" then -- quick sanity checker - error(MAJOR..": RegisterOptionsTable(appName, options): 'options' - missing type='group' member in root group", 2) - end - AceConfigRegistry.tables[appName] = function(uiType, uiName, errlvl) - errlvl=(errlvl or 0)+1 - validateGetterArgs(uiType, uiName, errlvl) - if not AceConfigRegistry.validated[uiType][appName] then - AceConfigRegistry:ValidateOptionsTable(options, appName, errlvl) -- upgradable - AceConfigRegistry.validated[uiType][appName] = true - end - return options - end - elseif type(options)=="function" then - AceConfigRegistry.tables[appName] = function(uiType, uiName, errlvl) - errlvl=(errlvl or 0)+1 - validateGetterArgs(uiType, uiName, errlvl) - local tab = assert(options(uiType, uiName, appName)) - if not AceConfigRegistry.validated[uiType][appName] then - AceConfigRegistry:ValidateOptionsTable(tab, appName, errlvl) -- upgradable - AceConfigRegistry.validated[uiType][appName] = true - end - return tab - end - else - error(MAJOR..": RegisterOptionsTable(appName, options): 'options' - expected table or function reference", 2) - end -end - ---- Returns an iterator of ["appName"]=funcref pairs -function AceConfigRegistry:IterateOptionsTables() - return pairs(AceConfigRegistry.tables) -end - - - - ---- Query the registry for a specific options table. --- If only appName is given, a function is returned which you --- can call with (uiType,uiName) to get the table.\\ --- If uiType&uiName are given, the table is returned. --- @param appName The application name as given to `:RegisterOptionsTable()` --- @param uiType The type of UI to get the table for, one of "cmd", "dropdown", "dialog" --- @param uiName The name of the library/addon querying for the table, e.g. "MyLib-1.0" -function AceConfigRegistry:GetOptionsTable(appName, uiType, uiName) - local f = AceConfigRegistry.tables[appName] - if not f then - return nil - end - - if uiType then - return f(uiType,uiName,1) -- get the table for us - else - return f -- return the function - end -end +--- AceConfigRegistry-3.0 handles central registration of options tables in use by addons and modules.\\ +-- Options tables can be registered as raw tables, OR as function refs that return a table.\\ +-- Such functions receive three arguments: "uiType", "uiName", "appName". \\ +-- * Valid **uiTypes**: "cmd", "dropdown", "dialog". This is verified by the library at call time. \\ +-- * The **uiName** field is expected to contain the full name of the calling addon, including version, e.g. "FooBar-1.0". This is verified by the library at call time.\\ +-- * The **appName** field is the options table name as given at registration time \\ +-- +-- :IterateOptionsTables() (and :GetOptionsTable() if only given one argument) return a function reference that the requesting config handling addon must call with valid "uiType", "uiName". +-- @class file +-- @name AceConfigRegistry-3.0 +-- @release $Id: AceConfigRegistry-3.0.lua 1045 2011-12-09 17:58:40Z nevcairiel $ +local MAJOR, MINOR = "AceConfigRegistry-3.0", 14 +local AceConfigRegistry = LibStub:NewLibrary(MAJOR, MINOR) + +if not AceConfigRegistry then return end + +AceConfigRegistry.tables = AceConfigRegistry.tables or {} + +local CallbackHandler = LibStub:GetLibrary("CallbackHandler-1.0") + +if not AceConfigRegistry.callbacks then + AceConfigRegistry.callbacks = CallbackHandler:New(AceConfigRegistry) +end + +-- Lua APIs +local tinsert, tconcat = table.insert, table.concat +local strfind, strmatch = string.find, string.match +local type, tostring, select, pairs = type, tostring, select, pairs +local error, assert = error, assert + +----------------------------------------------------------------------- +-- Validating options table consistency: + + +AceConfigRegistry.validated = { + -- list of options table names ran through :ValidateOptionsTable automatically. + -- CLEARED ON PURPOSE, since newer versions may have newer validators + cmd = {}, + dropdown = {}, + dialog = {}, +} + + + +local function err(msg, errlvl, ...) + local t = {} + for i=select("#",...),1,-1 do + tinsert(t, (select(i, ...))) + end + error(MAJOR..":ValidateOptionsTable(): "..tconcat(t,".")..msg, errlvl+2) +end + + +local isstring={["string"]=true, _="string"} +local isstringfunc={["string"]=true,["function"]=true, _="string or funcref"} +local istable={["table"]=true, _="table"} +local ismethodtable={["table"]=true,["string"]=true,["function"]=true, _="methodname, funcref or table"} +local optstring={["nil"]=true,["string"]=true, _="string"} +local optstringfunc={["nil"]=true,["string"]=true,["function"]=true, _="string or funcref"} +local optnumber={["nil"]=true,["number"]=true, _="number"} +local optmethod={["nil"]=true,["string"]=true,["function"]=true, _="methodname or funcref"} +local optmethodfalse={["nil"]=true,["string"]=true,["function"]=true,["boolean"]={[false]=true}, _="methodname, funcref or false"} +local optmethodnumber={["nil"]=true,["string"]=true,["function"]=true,["number"]=true, _="methodname, funcref or number"} +local optmethodtable={["nil"]=true,["string"]=true,["function"]=true,["table"]=true, _="methodname, funcref or table"} +local optmethodbool={["nil"]=true,["string"]=true,["function"]=true,["boolean"]=true, _="methodname, funcref or boolean"} +local opttable={["nil"]=true,["table"]=true, _="table"} +local optbool={["nil"]=true,["boolean"]=true, _="boolean"} +local optboolnumber={["nil"]=true,["boolean"]=true,["number"]=true, _="boolean or number"} + +local basekeys={ + type=isstring, + name=isstringfunc, + desc=optstringfunc, + descStyle=optstring, + order=optmethodnumber, + validate=optmethodfalse, + confirm=optmethodbool, + confirmText=optstring, + disabled=optmethodbool, + hidden=optmethodbool, + guiHidden=optmethodbool, + dialogHidden=optmethodbool, + dropdownHidden=optmethodbool, + cmdHidden=optmethodbool, + icon=optstringfunc, + iconCoords=optmethodtable, + handler=opttable, + get=optmethodfalse, + set=optmethodfalse, + func=optmethodfalse, + arg={["*"]=true}, + width=optstring, +} + +local typedkeys={ + header={}, + description={ + image=optstringfunc, + imageCoords=optmethodtable, + imageHeight=optnumber, + imageWidth=optnumber, + fontSize=optstringfunc, + }, + group={ + args=istable, + plugins=opttable, + inline=optbool, + cmdInline=optbool, + guiInline=optbool, + dropdownInline=optbool, + dialogInline=optbool, + childGroups=optstring, + }, + execute={ + image=optstringfunc, + imageCoords=optmethodtable, + imageHeight=optnumber, + imageWidth=optnumber, + }, + input={ + pattern=optstring, + usage=optstring, + control=optstring, + dialogControl=optstring, + dropdownControl=optstring, + multiline=optboolnumber, + }, + toggle={ + tristate=optbool, + image=optstringfunc, + imageCoords=optmethodtable, + }, + tristate={ + }, + range={ + min=optnumber, + softMin=optnumber, + max=optnumber, + softMax=optnumber, + step=optnumber, + bigStep=optnumber, + isPercent=optbool, + }, + select={ + values=ismethodtable, + style={ + ["nil"]=true, + ["string"]={dropdown=true,radio=true}, + _="string: 'dropdown' or 'radio'" + }, + control=optstring, + dialogControl=optstring, + dropdownControl=optstring, + itemControl=optstring, + }, + multiselect={ + values=ismethodtable, + style=optstring, + tristate=optbool, + control=optstring, + dialogControl=optstring, + dropdownControl=optstring, + }, + color={ + hasAlpha=optmethodbool, + }, + keybinding={ + -- TODO + }, +} + +local function validateKey(k,errlvl,...) + errlvl=(errlvl or 0)+1 + if type(k)~="string" then + err("["..tostring(k).."] - key is not a string", errlvl,...) + end + if strfind(k, "[%c\127]") then + err("["..tostring(k).."] - key name contained control characters", errlvl,...) + end +end + +local function validateVal(v, oktypes, errlvl,...) + errlvl=(errlvl or 0)+1 + local isok=oktypes[type(v)] or oktypes["*"] + + if not isok then + err(": expected a "..oktypes._..", got '"..tostring(v).."'", errlvl,...) + end + if type(isok)=="table" then -- isok was a table containing specific values to be tested for! + if not isok[v] then + err(": did not expect "..type(v).." value '"..tostring(v).."'", errlvl,...) + end + end +end + +local function validate(options,errlvl,...) + errlvl=(errlvl or 0)+1 + -- basic consistency + if type(options)~="table" then + err(": expected a table, got a "..type(options), errlvl,...) + end + if type(options.type)~="string" then + err(".type: expected a string, got a "..type(options.type), errlvl,...) + end + + -- get type and 'typedkeys' member + local tk = typedkeys[options.type] + if not tk then + err(".type: unknown type '"..options.type.."'", errlvl,...) + end + + -- make sure that all options[] are known parameters + for k,v in pairs(options) do + if not (tk[k] or basekeys[k]) then + err(": unknown parameter", errlvl,tostring(k),...) + end + end + + -- verify that required params are there, and that everything is the right type + for k,oktypes in pairs(basekeys) do + validateVal(options[k], oktypes, errlvl,k,...) + end + for k,oktypes in pairs(tk) do + validateVal(options[k], oktypes, errlvl,k,...) + end + + -- extra logic for groups + if options.type=="group" then + for k,v in pairs(options.args) do + validateKey(k,errlvl,"args",...) + validate(v, errlvl,k,"args",...) + end + if options.plugins then + for plugname,plugin in pairs(options.plugins) do + if type(plugin)~="table" then + err(": expected a table, got '"..tostring(plugin).."'", errlvl,tostring(plugname),"plugins",...) + end + for k,v in pairs(plugin) do + validateKey(k,errlvl,tostring(plugname),"plugins",...) + validate(v, errlvl,k,tostring(plugname),"plugins",...) + end + end + end + end +end + + +--- Validates basic structure and integrity of an options table \\ +-- Does NOT verify that get/set etc actually exist, since they can be defined at any depth +-- @param options The table to be validated +-- @param name The name of the table to be validated (shown in any error message) +-- @param errlvl (optional number) error level offset, default 0 (=errors point to the function calling :ValidateOptionsTable) +function AceConfigRegistry:ValidateOptionsTable(options,name,errlvl) + errlvl=(errlvl or 0)+1 + name = name or "Optionstable" + if not options.name then + options.name=name -- bit of a hack, the root level doesn't really need a .name :-/ + end + validate(options,errlvl,name) +end + +--- Fires a "ConfigTableChange" callback for those listening in on it, allowing config GUIs to refresh. +-- You should call this function if your options table changed from any outside event, like a game event +-- or a timer. +-- @param appName The application name as given to `:RegisterOptionsTable()` +function AceConfigRegistry:NotifyChange(appName) + if not AceConfigRegistry.tables[appName] then return end + AceConfigRegistry.callbacks:Fire("ConfigTableChange", appName) +end + +-- ------------------------------------------------------------------- +-- Registering and retreiving options tables: + + +-- validateGetterArgs: helper function for :GetOptionsTable (or, rather, the getter functions returned by it) + +local function validateGetterArgs(uiType, uiName, errlvl) + errlvl=(errlvl or 0)+2 + if uiType~="cmd" and uiType~="dropdown" and uiType~="dialog" then + error(MAJOR..": Requesting options table: 'uiType' - invalid configuration UI type, expected 'cmd', 'dropdown' or 'dialog'", errlvl) + end + if not strmatch(uiName, "[A-Za-z]%-[0-9]") then -- Expecting e.g. "MyLib-1.2" + error(MAJOR..": Requesting options table: 'uiName' - badly formatted or missing version number. Expected e.g. 'MyLib-1.2'", errlvl) + end +end + +--- Register an options table with the config registry. +-- @param appName The application name as given to `:RegisterOptionsTable()` +-- @param options The options table, OR a function reference that generates it on demand. \\ +-- See the top of the page for info on arguments passed to such functions. +function AceConfigRegistry:RegisterOptionsTable(appName, options) + if type(options)=="table" then + if options.type~="group" then -- quick sanity checker + error(MAJOR..": RegisterOptionsTable(appName, options): 'options' - missing type='group' member in root group", 2) + end + AceConfigRegistry.tables[appName] = function(uiType, uiName, errlvl) + errlvl=(errlvl or 0)+1 + validateGetterArgs(uiType, uiName, errlvl) + if not AceConfigRegistry.validated[uiType][appName] then + AceConfigRegistry:ValidateOptionsTable(options, appName, errlvl) -- upgradable + AceConfigRegistry.validated[uiType][appName] = true + end + return options + end + elseif type(options)=="function" then + AceConfigRegistry.tables[appName] = function(uiType, uiName, errlvl) + errlvl=(errlvl or 0)+1 + validateGetterArgs(uiType, uiName, errlvl) + local tab = assert(options(uiType, uiName, appName)) + if not AceConfigRegistry.validated[uiType][appName] then + AceConfigRegistry:ValidateOptionsTable(tab, appName, errlvl) -- upgradable + AceConfigRegistry.validated[uiType][appName] = true + end + return tab + end + else + error(MAJOR..": RegisterOptionsTable(appName, options): 'options' - expected table or function reference", 2) + end +end + +--- Returns an iterator of ["appName"]=funcref pairs +function AceConfigRegistry:IterateOptionsTables() + return pairs(AceConfigRegistry.tables) +end + + + + +--- Query the registry for a specific options table. +-- If only appName is given, a function is returned which you +-- can call with (uiType,uiName) to get the table.\\ +-- If uiType&uiName are given, the table is returned. +-- @param appName The application name as given to `:RegisterOptionsTable()` +-- @param uiType The type of UI to get the table for, one of "cmd", "dropdown", "dialog" +-- @param uiName The name of the library/addon querying for the table, e.g. "MyLib-1.0" +function AceConfigRegistry:GetOptionsTable(appName, uiType, uiName) + local f = AceConfigRegistry.tables[appName] + if not f then + return nil + end + + if uiType then + return f(uiType,uiName,1) -- get the table for us + else + return f -- return the function + end +end diff --git a/libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml b/libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml old mode 100644 new mode 100755 index f65f5dd..101bfda --- a/libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml +++ b/libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml @@ -1,4 +1,4 @@ -<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ -..\FrameXML\UI.xsd"> - <Script file="AceConfigRegistry-3.0.lua"/> +<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ +..\FrameXML\UI.xsd"> + <Script file="AceConfigRegistry-3.0.lua"/> </Ui> \ No newline at end of file diff --git a/libs/AceDB-3.0/AceDB-3.0.lua b/libs/AceDB-3.0/AceDB-3.0.lua old mode 100644 new mode 100755 index 7125643..c2bb775 --- a/libs/AceDB-3.0/AceDB-3.0.lua +++ b/libs/AceDB-3.0/AceDB-3.0.lua @@ -1,728 +1,733 @@ ---- **AceDB-3.0** manages the SavedVariables of your addon. --- It offers profile management, smart defaults and namespaces for modules.\\ --- Data can be saved in different data-types, depending on its intended usage. --- The most common data-type is the `profile` type, which allows the user to choose --- the active profile, and manage the profiles of all of his characters.\\ --- The following data types are available: --- * **char** Character-specific data. Every character has its own database. --- * **realm** Realm-specific data. All of the players characters on the same realm share this database. --- * **class** Class-specific data. All of the players characters of the same class share this database. --- * **race** Race-specific data. All of the players characters of the same race share this database. --- * **faction** Faction-specific data. All of the players characters of the same faction share this database. --- * **factionrealm** Faction and realm specific data. All of the players characters on the same realm and of the same faction share this database. --- * **global** Global Data. All characters on the same account share this database. --- * **profile** Profile-specific data. All characters using the same profile share this database. The user can control which profile should be used. --- --- Creating a new Database using the `:New` function will return a new DBObject. A database will inherit all functions --- of the DBObjectLib listed here. \\ --- If you create a new namespaced child-database (`:RegisterNamespace`), you'll get a DBObject as well, but note --- that the child-databases cannot individually change their profile, and are linked to their parents profile - and because of that, --- the profile related APIs are not available. Only `:RegisterDefaults` and `:ResetProfile` are available on child-databases. --- --- For more details on how to use AceDB-3.0, see the [[AceDB-3.0 Tutorial]]. --- --- You may also be interested in [[libdualspec-1-0|LibDualSpec-1.0]] to do profile switching automatically when switching specs. --- --- @usage --- MyAddon = LibStub("AceAddon-3.0"):NewAddon("DBExample") --- --- -- declare defaults to be used in the DB --- local defaults = { --- profile = { --- setting = true, --- } --- } --- --- function MyAddon:OnInitialize() --- -- Assuming the .toc says ## SavedVariables: MyAddonDB --- self.db = LibStub("AceDB-3.0"):New("MyAddonDB", defaults, true) --- end --- @class file --- @name AceDB-3.0.lua --- @release $Id: AceDB-3.0.lua 940 2010-06-19 08:01:47Z nevcairiel $ -local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 21 -local AceDB, oldminor = LibStub:NewLibrary(ACEDB_MAJOR, ACEDB_MINOR) - -if not AceDB then return end -- No upgrade needed - --- Lua APIs -local type, pairs, next, error = type, pairs, next, error -local setmetatable, getmetatable, rawset, rawget = setmetatable, getmetatable, rawset, rawget - --- WoW APIs -local _G = _G - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: LibStub - -AceDB.db_registry = AceDB.db_registry or {} -AceDB.frame = AceDB.frame or CreateFrame("Frame") - -local CallbackHandler -local CallbackDummy = { Fire = function() end } - -local DBObjectLib = {} - ---[[------------------------------------------------------------------------- - AceDB Utility Functions ----------------------------------------------------------------------------]] - --- Simple shallow copy for copying defaults -local function copyTable(src, dest) - if type(dest) ~= "table" then dest = {} end - if type(src) == "table" then - for k,v in pairs(src) do - if type(v) == "table" then - -- try to index the key first so that the metatable creates the defaults, if set, and use that table - v = copyTable(v, dest[k]) - end - dest[k] = v - end - end - return dest -end - --- Called to add defaults to a section of the database --- --- When a ["*"] default section is indexed with a new key, a table is returned --- and set in the host table. These tables must be cleaned up by removeDefaults --- in order to ensure we don't write empty default tables. -local function copyDefaults(dest, src) - -- this happens if some value in the SV overwrites our default value with a non-table - --if type(dest) ~= "table" then return end - for k, v in pairs(src) do - if k == "*" or k == "**" then - if type(v) == "table" then - -- This is a metatable used for table defaults - local mt = { - -- This handles the lookup and creation of new subtables - __index = function(t,k) - if k == nil then return nil end - local tbl = {} - copyDefaults(tbl, v) - rawset(t, k, tbl) - return tbl - end, - } - setmetatable(dest, mt) - -- handle already existing tables in the SV - for dk, dv in pairs(dest) do - if not rawget(src, dk) and type(dv) == "table" then - copyDefaults(dv, v) - end - end - else - -- Values are not tables, so this is just a simple return - local mt = {__index = function(t,k) return k~=nil and v or nil end} - setmetatable(dest, mt) - end - elseif type(v) == "table" then - if not rawget(dest, k) then rawset(dest, k, {}) end - if type(dest[k]) == "table" then - copyDefaults(dest[k], v) - if src['**'] then - copyDefaults(dest[k], src['**']) - end - end - else - if rawget(dest, k) == nil then - rawset(dest, k, v) - end - end - end -end - --- Called to remove all defaults in the default table from the database -local function removeDefaults(db, defaults, blocker) - -- remove all metatables from the db, so we don't accidentally create new sub-tables through them - setmetatable(db, nil) - -- loop through the defaults and remove their content - for k,v in pairs(defaults) do - if k == "*" or k == "**" then - if type(v) == "table" then - -- Loop through all the actual k,v pairs and remove - for key, value in pairs(db) do - if type(value) == "table" then - -- if the key was not explicitly specified in the defaults table, just strip everything from * and ** tables - if defaults[key] == nil and (not blocker or blocker[key] == nil) then - removeDefaults(value, v) - -- if the table is empty afterwards, remove it - if next(value) == nil then - db[key] = nil - end - -- if it was specified, only strip ** content, but block values which were set in the key table - elseif k == "**" then - removeDefaults(value, v, defaults[key]) - end - end - end - elseif k == "*" then - -- check for non-table default - for key, value in pairs(db) do - if defaults[key] == nil and v == value then - db[key] = nil - end - end - end - elseif type(v) == "table" and type(db[k]) == "table" then - -- if a blocker was set, dive into it, to allow multi-level defaults - removeDefaults(db[k], v, blocker and blocker[k]) - if next(db[k]) == nil then - db[k] = nil - end - else - -- check if the current value matches the default, and that its not blocked by another defaults table - if db[k] == defaults[k] and (not blocker or blocker[k] == nil) then - db[k] = nil - end - end - end -end - --- This is called when a table section is first accessed, to set up the defaults -local function initSection(db, section, svstore, key, defaults) - local sv = rawget(db, "sv") - - local tableCreated - if not sv[svstore] then sv[svstore] = {} end - if not sv[svstore][key] then - sv[svstore][key] = {} - tableCreated = true - end - - local tbl = sv[svstore][key] - - if defaults then - copyDefaults(tbl, defaults) - end - rawset(db, section, tbl) - - return tableCreated, tbl -end - --- Metatable to handle the dynamic creation of sections and copying of sections. -local dbmt = { - __index = function(t, section) - local keys = rawget(t, "keys") - local key = keys[section] - if key then - local defaultTbl = rawget(t, "defaults") - local defaults = defaultTbl and defaultTbl[section] - - if section == "profile" then - local new = initSection(t, section, "profiles", key, defaults) - if new then - -- Callback: OnNewProfile, database, newProfileKey - t.callbacks:Fire("OnNewProfile", t, key) - end - elseif section == "profiles" then - local sv = rawget(t, "sv") - if not sv.profiles then sv.profiles = {} end - rawset(t, "profiles", sv.profiles) - elseif section == "global" then - local sv = rawget(t, "sv") - if not sv.global then sv.global = {} end - if defaults then - copyDefaults(sv.global, defaults) - end - rawset(t, section, sv.global) - else - initSection(t, section, section, key, defaults) - end - end - - return rawget(t, section) - end -} - -local function validateDefaults(defaults, keyTbl, offset) - if not defaults then return end - offset = offset or 0 - for k in pairs(defaults) do - if not keyTbl[k] or k == "profiles" then - error(("Usage: AceDBObject:RegisterDefaults(defaults): '%s' is not a valid datatype."):format(k), 3 + offset) - end - end -end - -local preserve_keys = { - ["callbacks"] = true, - ["RegisterCallback"] = true, - ["UnregisterCallback"] = true, - ["UnregisterAllCallbacks"] = true, - ["children"] = true, -} - -local realmKey = GetRealmName() -local charKey = UnitName("player") .. " - " .. realmKey -local _, classKey = UnitClass("player") -local _, raceKey = UnitRace("player") -local factionKey = UnitFactionGroup("player") -local factionrealmKey = factionKey .. " - " .. realmKey --- Actual database initialization function -local function initdb(sv, defaults, defaultProfile, olddb, parent) - -- Generate the database keys for each section - - -- map "true" to our "Default" profile - if defaultProfile == true then defaultProfile = "Default" end - - local profileKey - if not parent then - -- Make a container for profile keys - if not sv.profileKeys then sv.profileKeys = {} end - - -- Try to get the profile selected from the char db - profileKey = sv.profileKeys[charKey] or defaultProfile or charKey - - -- save the selected profile for later - sv.profileKeys[charKey] = profileKey - else - -- Use the profile of the parents DB - profileKey = parent.keys.profile or defaultProfile or charKey - - -- clear the profileKeys in the DB, namespaces don't need to store them - sv.profileKeys = nil - end - - -- This table contains keys that enable the dynamic creation - -- of each section of the table. The 'global' and 'profiles' - -- have a key of true, since they are handled in a special case - local keyTbl= { - ["char"] = charKey, - ["realm"] = realmKey, - ["class"] = classKey, - ["race"] = raceKey, - ["faction"] = factionKey, - ["factionrealm"] = factionrealmKey, - ["profile"] = profileKey, - ["global"] = true, - ["profiles"] = true, - } - - validateDefaults(defaults, keyTbl, 1) - - -- This allows us to use this function to reset an entire database - -- Clear out the old database - if olddb then - for k,v in pairs(olddb) do if not preserve_keys[k] then olddb[k] = nil end end - end - - -- Give this database the metatable so it initializes dynamically - local db = setmetatable(olddb or {}, dbmt) - - if not rawget(db, "callbacks") then - -- try to load CallbackHandler-1.0 if it loaded after our library - if not CallbackHandler then CallbackHandler = LibStub:GetLibrary("CallbackHandler-1.0", true) end - db.callbacks = CallbackHandler and CallbackHandler:New(db) or CallbackDummy - end - - -- Copy methods locally into the database object, to avoid hitting - -- the metatable when calling methods - - if not parent then - for name, func in pairs(DBObjectLib) do - db[name] = func - end - else - -- hack this one in - db.RegisterDefaults = DBObjectLib.RegisterDefaults - db.ResetProfile = DBObjectLib.ResetProfile - end - - -- Set some properties in the database object - db.profiles = sv.profiles - db.keys = keyTbl - db.sv = sv - --db.sv_name = name - db.defaults = defaults - db.parent = parent - - -- store the DB in the registry - AceDB.db_registry[db] = true - - return db -end - --- handle PLAYER_LOGOUT --- strip all defaults from all databases --- and cleans up empty sections -local function logoutHandler(frame, event) - if event == "PLAYER_LOGOUT" then - for db in pairs(AceDB.db_registry) do - db.callbacks:Fire("OnDatabaseShutdown", db) - db:RegisterDefaults(nil) - - -- cleanup sections that are empty without defaults - local sv = rawget(db, "sv") - for section in pairs(db.keys) do - if rawget(sv, section) then - -- global is special, all other sections have sub-entrys - -- also don't delete empty profiles on main dbs, only on namespaces - if section ~= "global" and (section ~= "profiles" or rawget(db, "parent")) then - for key in pairs(sv[section]) do - if not next(sv[section][key]) then - sv[section][key] = nil - end - end - end - if not next(sv[section]) then - sv[section] = nil - end - end - end - end - end -end - -AceDB.frame:RegisterEvent("PLAYER_LOGOUT") -AceDB.frame:SetScript("OnEvent", logoutHandler) - - ---[[------------------------------------------------------------------------- - AceDB Object Method Definitions ----------------------------------------------------------------------------]] - ---- Sets the defaults table for the given database object by clearing any --- that are currently set, and then setting the new defaults. --- @param defaults A table of defaults for this database -function DBObjectLib:RegisterDefaults(defaults) - if defaults and type(defaults) ~= "table" then - error("Usage: AceDBObject:RegisterDefaults(defaults): 'defaults' - table or nil expected.", 2) - end - - validateDefaults(defaults, self.keys) - - -- Remove any currently set defaults - if self.defaults then - for section,key in pairs(self.keys) do - if self.defaults[section] and rawget(self, section) then - removeDefaults(self[section], self.defaults[section]) - end - end - end - - -- Set the DBObject.defaults table - self.defaults = defaults - - -- Copy in any defaults, only touching those sections already created - if defaults then - for section,key in pairs(self.keys) do - if defaults[section] and rawget(self, section) then - copyDefaults(self[section], defaults[section]) - end - end - end -end - ---- Changes the profile of the database and all of it's namespaces to the --- supplied named profile --- @param name The name of the profile to set as the current profile -function DBObjectLib:SetProfile(name) - if type(name) ~= "string" then - error("Usage: AceDBObject:SetProfile(name): 'name' - string expected.", 2) - end - - -- changing to the same profile, dont do anything - if name == self.keys.profile then return end - - local oldProfile = self.profile - local defaults = self.defaults and self.defaults.profile - - -- Callback: OnProfileShutdown, database - self.callbacks:Fire("OnProfileShutdown", self) - - if oldProfile and defaults then - -- Remove the defaults from the old profile - removeDefaults(oldProfile, defaults) - end - - self.profile = nil - self.keys["profile"] = name - - -- if the storage exists, save the new profile - -- this won't exist on namespaces. - if self.sv.profileKeys then - self.sv.profileKeys[charKey] = name - end - - -- populate to child namespaces - if self.children then - for _, db in pairs(self.children) do - DBObjectLib.SetProfile(db, name) - end - end - - -- Callback: OnProfileChanged, database, newProfileKey - self.callbacks:Fire("OnProfileChanged", self, name) -end - ---- Returns a table with the names of the existing profiles in the database. --- You can optionally supply a table to re-use for this purpose. --- @param tbl A table to store the profile names in (optional) -function DBObjectLib:GetProfiles(tbl) - if tbl and type(tbl) ~= "table" then - error("Usage: AceDBObject:GetProfiles(tbl): 'tbl' - table or nil expected.", 2) - end - - -- Clear the container table - if tbl then - for k,v in pairs(tbl) do tbl[k] = nil end - else - tbl = {} - end - - local curProfile = self.keys.profile - - local i = 0 - for profileKey in pairs(self.profiles) do - i = i + 1 - tbl[i] = profileKey - if curProfile and profileKey == curProfile then curProfile = nil end - end - - -- Add the current profile, if it hasn't been created yet - if curProfile then - i = i + 1 - tbl[i] = curProfile - end - - return tbl, i -end - ---- Returns the current profile name used by the database -function DBObjectLib:GetCurrentProfile() - return self.keys.profile -end - ---- Deletes a named profile. This profile must not be the active profile. --- @param name The name of the profile to be deleted --- @param silent If true, do not raise an error when the profile does not exist -function DBObjectLib:DeleteProfile(name, silent) - if type(name) ~= "string" then - error("Usage: AceDBObject:DeleteProfile(name): 'name' - string expected.", 2) - end - - if self.keys.profile == name then - error("Cannot delete the active profile in an AceDBObject.", 2) - end - - if not rawget(self.profiles, name) and not silent then - error("Cannot delete profile '" .. name .. "'. It does not exist.", 2) - end - - self.profiles[name] = nil - - -- populate to child namespaces - if self.children then - for _, db in pairs(self.children) do - DBObjectLib.DeleteProfile(db, name, true) - end - end - - -- Callback: OnProfileDeleted, database, profileKey - self.callbacks:Fire("OnProfileDeleted", self, name) -end - ---- Copies a named profile into the current profile, overwriting any conflicting --- settings. --- @param name The name of the profile to be copied into the current profile --- @param silent If true, do not raise an error when the profile does not exist -function DBObjectLib:CopyProfile(name, silent) - if type(name) ~= "string" then - error("Usage: AceDBObject:CopyProfile(name): 'name' - string expected.", 2) - end - - if name == self.keys.profile then - error("Cannot have the same source and destination profiles.", 2) - end - - if not rawget(self.profiles, name) and not silent then - error("Cannot copy profile '" .. name .. "'. It does not exist.", 2) - end - - -- Reset the profile before copying - DBObjectLib.ResetProfile(self, nil, true) - - local profile = self.profile - local source = self.profiles[name] - - copyTable(source, profile) - - -- populate to child namespaces - if self.children then - for _, db in pairs(self.children) do - DBObjectLib.CopyProfile(db, name, true) - end - end - - -- Callback: OnProfileCopied, database, sourceProfileKey - self.callbacks:Fire("OnProfileCopied", self, name) -end - ---- Resets the current profile to the default values (if specified). --- @param noChildren if set to true, the reset will not be populated to the child namespaces of this DB object --- @param noCallbacks if set to true, won't fire the OnProfileReset callback -function DBObjectLib:ResetProfile(noChildren, noCallbacks) - local profile = self.profile - - for k,v in pairs(profile) do - profile[k] = nil - end - - local defaults = self.defaults and self.defaults.profile - if defaults then - copyDefaults(profile, defaults) - end - - -- populate to child namespaces - if self.children and not noChildren then - for _, db in pairs(self.children) do - DBObjectLib.ResetProfile(db, nil, noCallbacks) - end - end - - -- Callback: OnProfileReset, database - if not noCallbacks then - self.callbacks:Fire("OnProfileReset", self) - end -end - ---- Resets the entire database, using the string defaultProfile as the new default --- profile. --- @param defaultProfile The profile name to use as the default -function DBObjectLib:ResetDB(defaultProfile) - if defaultProfile and type(defaultProfile) ~= "string" then - error("Usage: AceDBObject:ResetDB(defaultProfile): 'defaultProfile' - string or nil expected.", 2) - end - - local sv = self.sv - for k,v in pairs(sv) do - sv[k] = nil - end - - local parent = self.parent - - initdb(sv, self.defaults, defaultProfile, self) - - -- fix the child namespaces - if self.children then - if not sv.namespaces then sv.namespaces = {} end - for name, db in pairs(self.children) do - if not sv.namespaces[name] then sv.namespaces[name] = {} end - initdb(sv.namespaces[name], db.defaults, self.keys.profile, db, self) - end - end - - -- Callback: OnDatabaseReset, database - self.callbacks:Fire("OnDatabaseReset", self) - -- Callback: OnProfileChanged, database, profileKey - self.callbacks:Fire("OnProfileChanged", self, self.keys["profile"]) - - return self -end - ---- Creates a new database namespace, directly tied to the database. This --- is a full scale database in it's own rights other than the fact that --- it cannot control its profile individually --- @param name The name of the new namespace --- @param defaults A table of values to use as defaults -function DBObjectLib:RegisterNamespace(name, defaults) - if type(name) ~= "string" then - error("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - string expected.", 2) - end - if defaults and type(defaults) ~= "table" then - error("Usage: AceDBObject:RegisterNamespace(name, defaults): 'defaults' - table or nil expected.", 2) - end - if self.children and self.children[name] then - error ("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - a namespace with that name already exists.", 2) - end - - local sv = self.sv - if not sv.namespaces then sv.namespaces = {} end - if not sv.namespaces[name] then - sv.namespaces[name] = {} - end - - local newDB = initdb(sv.namespaces[name], defaults, self.keys.profile, nil, self) - - if not self.children then self.children = {} end - self.children[name] = newDB - return newDB -end - ---- Returns an already existing namespace from the database object. --- @param name The name of the new namespace --- @param silent if true, the addon is optional, silently return nil if its not found --- @usage --- local namespace = self.db:GetNamespace('namespace') --- @return the namespace object if found -function DBObjectLib:GetNamespace(name, silent) - if type(name) ~= "string" then - error("Usage: AceDBObject:GetNamespace(name): 'name' - string expected.", 2) - end - if not silent and not (self.children and self.children[name]) then - error ("Usage: AceDBObject:GetNamespace(name): 'name' - namespace does not exist.", 2) - end - if not self.children then self.children = {} end - return self.children[name] -end - ---[[------------------------------------------------------------------------- - AceDB Exposed Methods ----------------------------------------------------------------------------]] - ---- Creates a new database object that can be used to handle database settings and profiles. --- By default, an empty DB is created, using a character specific profile. --- --- You can override the default profile used by passing any profile name as the third argument, --- or by passing //true// as the third argument to use a globally shared profile called "Default". --- --- Note that there is no token replacement in the default profile name, passing a defaultProfile as "char" --- will use a profile named "char", and not a character-specific profile. --- @param tbl The name of variable, or table to use for the database --- @param defaults A table of database defaults --- @param defaultProfile The name of the default profile. If not set, a character specific profile will be used as the default. --- You can also pass //true// to use a shared global profile called "Default". --- @usage --- -- Create an empty DB using a character-specific default profile. --- self.db = LibStub("AceDB-3.0"):New("MyAddonDB") --- @usage --- -- Create a DB using defaults and using a shared default profile --- self.db = LibStub("AceDB-3.0"):New("MyAddonDB", defaults, true) -function AceDB:New(tbl, defaults, defaultProfile) - if type(tbl) == "string" then - local name = tbl - tbl = _G[name] - if not tbl then - tbl = {} - _G[name] = tbl - end - end - - if type(tbl) ~= "table" then - error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'tbl' - table expected.", 2) - end - - if defaults and type(defaults) ~= "table" then - error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaults' - table expected.", 2) - end - - if defaultProfile and type(defaultProfile) ~= "string" and defaultProfile ~= true then - error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaultProfile' - string or true expected.", 2) - end - - return initdb(tbl, defaults, defaultProfile) -end - --- upgrade existing databases -for db in pairs(AceDB.db_registry) do - if not db.parent then - for name,func in pairs(DBObjectLib) do - db[name] = func - end - else - db.RegisterDefaults = DBObjectLib.RegisterDefaults - db.ResetProfile = DBObjectLib.ResetProfile - end -end +--- **AceDB-3.0** manages the SavedVariables of your addon. +-- It offers profile management, smart defaults and namespaces for modules.\\ +-- Data can be saved in different data-types, depending on its intended usage. +-- The most common data-type is the `profile` type, which allows the user to choose +-- the active profile, and manage the profiles of all of his characters.\\ +-- The following data types are available: +-- * **char** Character-specific data. Every character has its own database. +-- * **realm** Realm-specific data. All of the players characters on the same realm share this database. +-- * **class** Class-specific data. All of the players characters of the same class share this database. +-- * **race** Race-specific data. All of the players characters of the same race share this database. +-- * **faction** Faction-specific data. All of the players characters of the same faction share this database. +-- * **factionrealm** Faction and realm specific data. All of the players characters on the same realm and of the same faction share this database. +-- * **global** Global Data. All characters on the same account share this database. +-- * **profile** Profile-specific data. All characters using the same profile share this database. The user can control which profile should be used. +-- +-- Creating a new Database using the `:New` function will return a new DBObject. A database will inherit all functions +-- of the DBObjectLib listed here. \\ +-- If you create a new namespaced child-database (`:RegisterNamespace`), you'll get a DBObject as well, but note +-- that the child-databases cannot individually change their profile, and are linked to their parents profile - and because of that, +-- the profile related APIs are not available. Only `:RegisterDefaults` and `:ResetProfile` are available on child-databases. +-- +-- For more details on how to use AceDB-3.0, see the [[AceDB-3.0 Tutorial]]. +-- +-- You may also be interested in [[libdualspec-1-0|LibDualSpec-1.0]] to do profile switching automatically when switching specs. +-- +-- @usage +-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("DBExample") +-- +-- -- declare defaults to be used in the DB +-- local defaults = { +-- profile = { +-- setting = true, +-- } +-- } +-- +-- function MyAddon:OnInitialize() +-- -- Assuming the .toc says ## SavedVariables: MyAddonDB +-- self.db = LibStub("AceDB-3.0"):New("MyAddonDB", defaults, true) +-- end +-- @class file +-- @name AceDB-3.0.lua +-- @release $Id: AceDB-3.0.lua 1035 2011-07-09 03:20:13Z kaelten $ +local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 22 +local AceDB, oldminor = LibStub:NewLibrary(ACEDB_MAJOR, ACEDB_MINOR) + +if not AceDB then return end -- No upgrade needed + +-- Lua APIs +local type, pairs, next, error = type, pairs, next, error +local setmetatable, getmetatable, rawset, rawget = setmetatable, getmetatable, rawset, rawget + +-- WoW APIs +local _G = _G + +-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded +-- List them here for Mikk's FindGlobals script +-- GLOBALS: LibStub + +AceDB.db_registry = AceDB.db_registry or {} +AceDB.frame = AceDB.frame or CreateFrame("Frame") + +local CallbackHandler +local CallbackDummy = { Fire = function() end } + +local DBObjectLib = {} + +--[[------------------------------------------------------------------------- + AceDB Utility Functions +---------------------------------------------------------------------------]] + +-- Simple shallow copy for copying defaults +local function copyTable(src, dest) + if type(dest) ~= "table" then dest = {} end + if type(src) == "table" then + for k,v in pairs(src) do + if type(v) == "table" then + -- try to index the key first so that the metatable creates the defaults, if set, and use that table + v = copyTable(v, dest[k]) + end + dest[k] = v + end + end + return dest +end + +-- Called to add defaults to a section of the database +-- +-- When a ["*"] default section is indexed with a new key, a table is returned +-- and set in the host table. These tables must be cleaned up by removeDefaults +-- in order to ensure we don't write empty default tables. +local function copyDefaults(dest, src) + -- this happens if some value in the SV overwrites our default value with a non-table + --if type(dest) ~= "table" then return end + for k, v in pairs(src) do + if k == "*" or k == "**" then + if type(v) == "table" then + -- This is a metatable used for table defaults + local mt = { + -- This handles the lookup and creation of new subtables + __index = function(t,k) + if k == nil then return nil end + local tbl = {} + copyDefaults(tbl, v) + rawset(t, k, tbl) + return tbl + end, + } + setmetatable(dest, mt) + -- handle already existing tables in the SV + for dk, dv in pairs(dest) do + if not rawget(src, dk) and type(dv) == "table" then + copyDefaults(dv, v) + end + end + else + -- Values are not tables, so this is just a simple return + local mt = {__index = function(t,k) return k~=nil and v or nil end} + setmetatable(dest, mt) + end + elseif type(v) == "table" then + if not rawget(dest, k) then rawset(dest, k, {}) end + if type(dest[k]) == "table" then + copyDefaults(dest[k], v) + if src['**'] then + copyDefaults(dest[k], src['**']) + end + end + else + if rawget(dest, k) == nil then + rawset(dest, k, v) + end + end + end +end + +-- Called to remove all defaults in the default table from the database +local function removeDefaults(db, defaults, blocker) + -- remove all metatables from the db, so we don't accidentally create new sub-tables through them + setmetatable(db, nil) + -- loop through the defaults and remove their content + for k,v in pairs(defaults) do + if k == "*" or k == "**" then + if type(v) == "table" then + -- Loop through all the actual k,v pairs and remove + for key, value in pairs(db) do + if type(value) == "table" then + -- if the key was not explicitly specified in the defaults table, just strip everything from * and ** tables + if defaults[key] == nil and (not blocker or blocker[key] == nil) then + removeDefaults(value, v) + -- if the table is empty afterwards, remove it + if next(value) == nil then + db[key] = nil + end + -- if it was specified, only strip ** content, but block values which were set in the key table + elseif k == "**" then + removeDefaults(value, v, defaults[key]) + end + end + end + elseif k == "*" then + -- check for non-table default + for key, value in pairs(db) do + if defaults[key] == nil and v == value then + db[key] = nil + end + end + end + elseif type(v) == "table" and type(db[k]) == "table" then + -- if a blocker was set, dive into it, to allow multi-level defaults + removeDefaults(db[k], v, blocker and blocker[k]) + if next(db[k]) == nil then + db[k] = nil + end + else + -- check if the current value matches the default, and that its not blocked by another defaults table + if db[k] == defaults[k] and (not blocker or blocker[k] == nil) then + db[k] = nil + end + end + end +end + +-- This is called when a table section is first accessed, to set up the defaults +local function initSection(db, section, svstore, key, defaults) + local sv = rawget(db, "sv") + + local tableCreated + if not sv[svstore] then sv[svstore] = {} end + if not sv[svstore][key] then + sv[svstore][key] = {} + tableCreated = true + end + + local tbl = sv[svstore][key] + + if defaults then + copyDefaults(tbl, defaults) + end + rawset(db, section, tbl) + + return tableCreated, tbl +end + +-- Metatable to handle the dynamic creation of sections and copying of sections. +local dbmt = { + __index = function(t, section) + local keys = rawget(t, "keys") + local key = keys[section] + if key then + local defaultTbl = rawget(t, "defaults") + local defaults = defaultTbl and defaultTbl[section] + + if section == "profile" then + local new = initSection(t, section, "profiles", key, defaults) + if new then + -- Callback: OnNewProfile, database, newProfileKey + t.callbacks:Fire("OnNewProfile", t, key) + end + elseif section == "profiles" then + local sv = rawget(t, "sv") + if not sv.profiles then sv.profiles = {} end + rawset(t, "profiles", sv.profiles) + elseif section == "global" then + local sv = rawget(t, "sv") + if not sv.global then sv.global = {} end + if defaults then + copyDefaults(sv.global, defaults) + end + rawset(t, section, sv.global) + else + initSection(t, section, section, key, defaults) + end + end + + return rawget(t, section) + end +} + +local function validateDefaults(defaults, keyTbl, offset) + if not defaults then return end + offset = offset or 0 + for k in pairs(defaults) do + if not keyTbl[k] or k == "profiles" then + error(("Usage: AceDBObject:RegisterDefaults(defaults): '%s' is not a valid datatype."):format(k), 3 + offset) + end + end +end + +local preserve_keys = { + ["callbacks"] = true, + ["RegisterCallback"] = true, + ["UnregisterCallback"] = true, + ["UnregisterAllCallbacks"] = true, + ["children"] = true, +} + +local realmKey = GetRealmName() +local charKey = UnitName("player") .. " - " .. realmKey +local _, classKey = UnitClass("player") +local _, raceKey = UnitRace("player") +local factionKey = UnitFactionGroup("player") +local factionrealmKey = factionKey .. " - " .. realmKey +local factionrealmregionKey = factionrealmKey .. " - " .. string.sub(GetCVar("realmList"), 1, 2):upper() +local localeKey = GetLocale():lower() + +-- Actual database initialization function +local function initdb(sv, defaults, defaultProfile, olddb, parent) + -- Generate the database keys for each section + + -- map "true" to our "Default" profile + if defaultProfile == true then defaultProfile = "Default" end + + local profileKey + if not parent then + -- Make a container for profile keys + if not sv.profileKeys then sv.profileKeys = {} end + + -- Try to get the profile selected from the char db + profileKey = sv.profileKeys[charKey] or defaultProfile or charKey + + -- save the selected profile for later + sv.profileKeys[charKey] = profileKey + else + -- Use the profile of the parents DB + profileKey = parent.keys.profile or defaultProfile or charKey + + -- clear the profileKeys in the DB, namespaces don't need to store them + sv.profileKeys = nil + end + + -- This table contains keys that enable the dynamic creation + -- of each section of the table. The 'global' and 'profiles' + -- have a key of true, since they are handled in a special case + local keyTbl= { + ["char"] = charKey, + ["realm"] = realmKey, + ["class"] = classKey, + ["race"] = raceKey, + ["faction"] = factionKey, + ["factionrealm"] = factionrealmKey, + ["factionrealmregion"] = factionrealmregionKey, + ["profile"] = profileKey, + ["locale"] = localeKey, + ["global"] = true, + ["profiles"] = true, + } + + validateDefaults(defaults, keyTbl, 1) + + -- This allows us to use this function to reset an entire database + -- Clear out the old database + if olddb then + for k,v in pairs(olddb) do if not preserve_keys[k] then olddb[k] = nil end end + end + + -- Give this database the metatable so it initializes dynamically + local db = setmetatable(olddb or {}, dbmt) + + if not rawget(db, "callbacks") then + -- try to load CallbackHandler-1.0 if it loaded after our library + if not CallbackHandler then CallbackHandler = LibStub:GetLibrary("CallbackHandler-1.0", true) end + db.callbacks = CallbackHandler and CallbackHandler:New(db) or CallbackDummy + end + + -- Copy methods locally into the database object, to avoid hitting + -- the metatable when calling methods + + if not parent then + for name, func in pairs(DBObjectLib) do + db[name] = func + end + else + -- hack this one in + db.RegisterDefaults = DBObjectLib.RegisterDefaults + db.ResetProfile = DBObjectLib.ResetProfile + end + + -- Set some properties in the database object + db.profiles = sv.profiles + db.keys = keyTbl + db.sv = sv + --db.sv_name = name + db.defaults = defaults + db.parent = parent + + -- store the DB in the registry + AceDB.db_registry[db] = true + + return db +end + +-- handle PLAYER_LOGOUT +-- strip all defaults from all databases +-- and cleans up empty sections +local function logoutHandler(frame, event) + if event == "PLAYER_LOGOUT" then + for db in pairs(AceDB.db_registry) do + db.callbacks:Fire("OnDatabaseShutdown", db) + db:RegisterDefaults(nil) + + -- cleanup sections that are empty without defaults + local sv = rawget(db, "sv") + for section in pairs(db.keys) do + if rawget(sv, section) then + -- global is special, all other sections have sub-entrys + -- also don't delete empty profiles on main dbs, only on namespaces + if section ~= "global" and (section ~= "profiles" or rawget(db, "parent")) then + for key in pairs(sv[section]) do + if not next(sv[section][key]) then + sv[section][key] = nil + end + end + end + if not next(sv[section]) then + sv[section] = nil + end + end + end + end + end +end + +AceDB.frame:RegisterEvent("PLAYER_LOGOUT") +AceDB.frame:SetScript("OnEvent", logoutHandler) + + +--[[------------------------------------------------------------------------- + AceDB Object Method Definitions +---------------------------------------------------------------------------]] + +--- Sets the defaults table for the given database object by clearing any +-- that are currently set, and then setting the new defaults. +-- @param defaults A table of defaults for this database +function DBObjectLib:RegisterDefaults(defaults) + if defaults and type(defaults) ~= "table" then + error("Usage: AceDBObject:RegisterDefaults(defaults): 'defaults' - table or nil expected.", 2) + end + + validateDefaults(defaults, self.keys) + + -- Remove any currently set defaults + if self.defaults then + for section,key in pairs(self.keys) do + if self.defaults[section] and rawget(self, section) then + removeDefaults(self[section], self.defaults[section]) + end + end + end + + -- Set the DBObject.defaults table + self.defaults = defaults + + -- Copy in any defaults, only touching those sections already created + if defaults then + for section,key in pairs(self.keys) do + if defaults[section] and rawget(self, section) then + copyDefaults(self[section], defaults[section]) + end + end + end +end + +--- Changes the profile of the database and all of it's namespaces to the +-- supplied named profile +-- @param name The name of the profile to set as the current profile +function DBObjectLib:SetProfile(name) + if type(name) ~= "string" then + error("Usage: AceDBObject:SetProfile(name): 'name' - string expected.", 2) + end + + -- changing to the same profile, dont do anything + if name == self.keys.profile then return end + + local oldProfile = self.profile + local defaults = self.defaults and self.defaults.profile + + -- Callback: OnProfileShutdown, database + self.callbacks:Fire("OnProfileShutdown", self) + + if oldProfile and defaults then + -- Remove the defaults from the old profile + removeDefaults(oldProfile, defaults) + end + + self.profile = nil + self.keys["profile"] = name + + -- if the storage exists, save the new profile + -- this won't exist on namespaces. + if self.sv.profileKeys then + self.sv.profileKeys[charKey] = name + end + + -- populate to child namespaces + if self.children then + for _, db in pairs(self.children) do + DBObjectLib.SetProfile(db, name) + end + end + + -- Callback: OnProfileChanged, database, newProfileKey + self.callbacks:Fire("OnProfileChanged", self, name) +end + +--- Returns a table with the names of the existing profiles in the database. +-- You can optionally supply a table to re-use for this purpose. +-- @param tbl A table to store the profile names in (optional) +function DBObjectLib:GetProfiles(tbl) + if tbl and type(tbl) ~= "table" then + error("Usage: AceDBObject:GetProfiles(tbl): 'tbl' - table or nil expected.", 2) + end + + -- Clear the container table + if tbl then + for k,v in pairs(tbl) do tbl[k] = nil end + else + tbl = {} + end + + local curProfile = self.keys.profile + + local i = 0 + for profileKey in pairs(self.profiles) do + i = i + 1 + tbl[i] = profileKey + if curProfile and profileKey == curProfile then curProfile = nil end + end + + -- Add the current profile, if it hasn't been created yet + if curProfile then + i = i + 1 + tbl[i] = curProfile + end + + return tbl, i +end + +--- Returns the current profile name used by the database +function DBObjectLib:GetCurrentProfile() + return self.keys.profile +end + +--- Deletes a named profile. This profile must not be the active profile. +-- @param name The name of the profile to be deleted +-- @param silent If true, do not raise an error when the profile does not exist +function DBObjectLib:DeleteProfile(name, silent) + if type(name) ~= "string" then + error("Usage: AceDBObject:DeleteProfile(name): 'name' - string expected.", 2) + end + + if self.keys.profile == name then + error("Cannot delete the active profile in an AceDBObject.", 2) + end + + if not rawget(self.profiles, name) and not silent then + error("Cannot delete profile '" .. name .. "'. It does not exist.", 2) + end + + self.profiles[name] = nil + + -- populate to child namespaces + if self.children then + for _, db in pairs(self.children) do + DBObjectLib.DeleteProfile(db, name, true) + end + end + + -- Callback: OnProfileDeleted, database, profileKey + self.callbacks:Fire("OnProfileDeleted", self, name) +end + +--- Copies a named profile into the current profile, overwriting any conflicting +-- settings. +-- @param name The name of the profile to be copied into the current profile +-- @param silent If true, do not raise an error when the profile does not exist +function DBObjectLib:CopyProfile(name, silent) + if type(name) ~= "string" then + error("Usage: AceDBObject:CopyProfile(name): 'name' - string expected.", 2) + end + + if name == self.keys.profile then + error("Cannot have the same source and destination profiles.", 2) + end + + if not rawget(self.profiles, name) and not silent then + error("Cannot copy profile '" .. name .. "'. It does not exist.", 2) + end + + -- Reset the profile before copying + DBObjectLib.ResetProfile(self, nil, true) + + local profile = self.profile + local source = self.profiles[name] + + copyTable(source, profile) + + -- populate to child namespaces + if self.children then + for _, db in pairs(self.children) do + DBObjectLib.CopyProfile(db, name, true) + end + end + + -- Callback: OnProfileCopied, database, sourceProfileKey + self.callbacks:Fire("OnProfileCopied", self, name) +end + +--- Resets the current profile to the default values (if specified). +-- @param noChildren if set to true, the reset will not be populated to the child namespaces of this DB object +-- @param noCallbacks if set to true, won't fire the OnProfileReset callback +function DBObjectLib:ResetProfile(noChildren, noCallbacks) + local profile = self.profile + + for k,v in pairs(profile) do + profile[k] = nil + end + + local defaults = self.defaults and self.defaults.profile + if defaults then + copyDefaults(profile, defaults) + end + + -- populate to child namespaces + if self.children and not noChildren then + for _, db in pairs(self.children) do + DBObjectLib.ResetProfile(db, nil, noCallbacks) + end + end + + -- Callback: OnProfileReset, database + if not noCallbacks then + self.callbacks:Fire("OnProfileReset", self) + end +end + +--- Resets the entire database, using the string defaultProfile as the new default +-- profile. +-- @param defaultProfile The profile name to use as the default +function DBObjectLib:ResetDB(defaultProfile) + if defaultProfile and type(defaultProfile) ~= "string" then + error("Usage: AceDBObject:ResetDB(defaultProfile): 'defaultProfile' - string or nil expected.", 2) + end + + local sv = self.sv + for k,v in pairs(sv) do + sv[k] = nil + end + + local parent = self.parent + + initdb(sv, self.defaults, defaultProfile, self) + + -- fix the child namespaces + if self.children then + if not sv.namespaces then sv.namespaces = {} end + for name, db in pairs(self.children) do + if not sv.namespaces[name] then sv.namespaces[name] = {} end + initdb(sv.namespaces[name], db.defaults, self.keys.profile, db, self) + end + end + + -- Callback: OnDatabaseReset, database + self.callbacks:Fire("OnDatabaseReset", self) + -- Callback: OnProfileChanged, database, profileKey + self.callbacks:Fire("OnProfileChanged", self, self.keys["profile"]) + + return self +end + +--- Creates a new database namespace, directly tied to the database. This +-- is a full scale database in it's own rights other than the fact that +-- it cannot control its profile individually +-- @param name The name of the new namespace +-- @param defaults A table of values to use as defaults +function DBObjectLib:RegisterNamespace(name, defaults) + if type(name) ~= "string" then + error("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - string expected.", 2) + end + if defaults and type(defaults) ~= "table" then + error("Usage: AceDBObject:RegisterNamespace(name, defaults): 'defaults' - table or nil expected.", 2) + end + if self.children and self.children[name] then + error ("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - a namespace with that name already exists.", 2) + end + + local sv = self.sv + if not sv.namespaces then sv.namespaces = {} end + if not sv.namespaces[name] then + sv.namespaces[name] = {} + end + + local newDB = initdb(sv.namespaces[name], defaults, self.keys.profile, nil, self) + + if not self.children then self.children = {} end + self.children[name] = newDB + return newDB +end + +--- Returns an already existing namespace from the database object. +-- @param name The name of the new namespace +-- @param silent if true, the addon is optional, silently return nil if its not found +-- @usage +-- local namespace = self.db:GetNamespace('namespace') +-- @return the namespace object if found +function DBObjectLib:GetNamespace(name, silent) + if type(name) ~= "string" then + error("Usage: AceDBObject:GetNamespace(name): 'name' - string expected.", 2) + end + if not silent and not (self.children and self.children[name]) then + error ("Usage: AceDBObject:GetNamespace(name): 'name' - namespace does not exist.", 2) + end + if not self.children then self.children = {} end + return self.children[name] +end + +--[[------------------------------------------------------------------------- + AceDB Exposed Methods +---------------------------------------------------------------------------]] + +--- Creates a new database object that can be used to handle database settings and profiles. +-- By default, an empty DB is created, using a character specific profile. +-- +-- You can override the default profile used by passing any profile name as the third argument, +-- or by passing //true// as the third argument to use a globally shared profile called "Default". +-- +-- Note that there is no token replacement in the default profile name, passing a defaultProfile as "char" +-- will use a profile named "char", and not a character-specific profile. +-- @param tbl The name of variable, or table to use for the database +-- @param defaults A table of database defaults +-- @param defaultProfile The name of the default profile. If not set, a character specific profile will be used as the default. +-- You can also pass //true// to use a shared global profile called "Default". +-- @usage +-- -- Create an empty DB using a character-specific default profile. +-- self.db = LibStub("AceDB-3.0"):New("MyAddonDB") +-- @usage +-- -- Create a DB using defaults and using a shared default profile +-- self.db = LibStub("AceDB-3.0"):New("MyAddonDB", defaults, true) +function AceDB:New(tbl, defaults, defaultProfile) + if type(tbl) == "string" then + local name = tbl + tbl = _G[name] + if not tbl then + tbl = {} + _G[name] = tbl + end + end + + if type(tbl) ~= "table" then + error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'tbl' - table expected.", 2) + end + + if defaults and type(defaults) ~= "table" then + error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaults' - table expected.", 2) + end + + if defaultProfile and type(defaultProfile) ~= "string" and defaultProfile ~= true then + error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaultProfile' - string or true expected.", 2) + end + + return initdb(tbl, defaults, defaultProfile) +end + +-- upgrade existing databases +for db in pairs(AceDB.db_registry) do + if not db.parent then + for name,func in pairs(DBObjectLib) do + db[name] = func + end + else + db.RegisterDefaults = DBObjectLib.RegisterDefaults + db.ResetProfile = DBObjectLib.ResetProfile + end +end diff --git a/libs/AceDB-3.0/AceDB-3.0.xml b/libs/AceDB-3.0/AceDB-3.0.xml old mode 100644 new mode 100755 index e825f7b..46b20ba --- a/libs/AceDB-3.0/AceDB-3.0.xml +++ b/libs/AceDB-3.0/AceDB-3.0.xml @@ -1,4 +1,4 @@ -<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ -..\FrameXML\UI.xsd"> - <Script file="AceDB-3.0.lua"/> +<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ +..\FrameXML\UI.xsd"> + <Script file="AceDB-3.0.lua"/> </Ui> \ No newline at end of file diff --git a/libs/AceDBOptions-3.0/AceDBOptions-3.0.lua b/libs/AceDBOptions-3.0/AceDBOptions-3.0.lua old mode 100644 new mode 100755 index caae321..bc56106 --- a/libs/AceDBOptions-3.0/AceDBOptions-3.0.lua +++ b/libs/AceDBOptions-3.0/AceDBOptions-3.0.lua @@ -1,420 +1,420 @@ ---- AceDBOptions-3.0 provides a universal AceConfig options screen for managing AceDB-3.0 profiles. --- @class file --- @name AceDBOptions-3.0 --- @release $Id: AceDBOptions-3.0.lua 938 2010-06-13 07:21:38Z nevcairiel $ -local ACEDBO_MAJOR, ACEDBO_MINOR = "AceDBOptions-3.0", 12 -local AceDBOptions, oldminor = LibStub:NewLibrary(ACEDBO_MAJOR, ACEDBO_MINOR) - -if not AceDBOptions then return end -- No upgrade needed - --- Lua APIs -local pairs, next = pairs, next - --- WoW APIs -local UnitClass = UnitClass - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: NORMAL_FONT_COLOR_CODE, FONT_COLOR_CODE_CLOSE - -AceDBOptions.optionTables = AceDBOptions.optionTables or {} -AceDBOptions.handlers = AceDBOptions.handlers or {} - ---[[ - Localization of AceDBOptions-3.0 -]] - -local L = { - default = "Default", - intro = "You can change the active database profile, so you can have different settings for every character.", - reset_desc = "Reset the current profile back to its default values, in case your configuration is broken, or you simply want to start over.", - reset = "Reset Profile", - reset_sub = "Reset the current profile to the default", - choose_desc = "You can either create a new profile by entering a name in the editbox, or choose one of the already existing profiles.", - new = "New", - new_sub = "Create a new empty profile.", - choose = "Existing Profiles", - choose_sub = "Select one of your currently available profiles.", - copy_desc = "Copy the settings from one existing profile into the currently active profile.", - copy = "Copy From", - delete_desc = "Delete existing and unused profiles from the database to save space, and cleanup the SavedVariables file.", - delete = "Delete a Profile", - delete_sub = "Deletes a profile from the database.", - delete_confirm = "Are you sure you want to delete the selected profile?", - profiles = "Profiles", - profiles_sub = "Manage Profiles", - current = "Current Profile:", -} - -local LOCALE = GetLocale() -if LOCALE == "deDE" then - L["default"] = "Standard" - L["intro"] = "Hier kannst du das aktive Datenbankprofile \195\164ndern, damit du verschiedene Einstellungen f\195\188r jeden Charakter erstellen kannst, wodurch eine sehr flexible Konfiguration m\195\182glich wird." - L["reset_desc"] = "Setzt das momentane Profil auf Standardwerte zur\195\188ck, f\195\188r den Fall das mit der Konfiguration etwas schief lief oder weil du einfach neu starten willst." - L["reset"] = "Profil zur\195\188cksetzen" - L["reset_sub"] = "Das aktuelle Profil auf Standard zur\195\188cksetzen." - L["choose_desc"] = "Du kannst ein neues Profil erstellen, indem du einen neuen Namen in der Eingabebox 'Neu' eingibst, oder w\195\164hle eines der vorhandenen Profile aus." - L["new"] = "Neu" - L["new_sub"] = "Ein neues Profil erstellen." - L["choose"] = "Vorhandene Profile" - L["choose_sub"] = "W\195\164hlt ein bereits vorhandenes Profil aus." - L["copy_desc"] = "Kopiere die Einstellungen von einem vorhandenen Profil in das aktive Profil." - L["copy"] = "Kopieren von..." - L["delete_desc"] = "L\195\182sche vorhandene oder unbenutzte Profile aus der Datenbank um Platz zu sparen und um die SavedVariables Datei 'sauber' zu halten." - L["delete"] = "Profil l\195\182schen" - L["delete_sub"] = "L\195\182scht ein Profil aus der Datenbank." - L["delete_confirm"] = "Willst du das ausgew\195\164hlte Profil wirklich l\195\182schen?" - L["profiles"] = "Profile" - L["profiles_sub"] = "Profile verwalten" - --L["current"] = "Current Profile:" -elseif LOCALE == "frFR" then - L["default"] = "D\195\169faut" - L["intro"] = "Vous pouvez changer le profil actuel afin d'avoir des param\195\168tres diff\195\169rents pour chaque personnage, permettant ainsi d'avoir une configuration tr\195\168s flexible." - L["reset_desc"] = "R\195\169initialise le profil actuel au cas o\195\185 votre configuration est corrompue ou si vous voulez tout simplement faire table rase." - L["reset"] = "R\195\169initialiser le profil" - L["reset_sub"] = "R\195\169initialise le profil actuel avec les param\195\168tres par d\195\169faut." - L["choose_desc"] = "Vous pouvez cr\195\169er un nouveau profil en entrant un nouveau nom dans la bo\195\174te de saisie, ou en choississant un des profils d\195\169j\195\160 existants." - L["new"] = "Nouveau" - L["new_sub"] = "Cr\195\169\195\169e un nouveau profil vierge." - L["choose"] = "Profils existants" - L["choose_sub"] = "Permet de choisir un des profils d\195\169j\195\160 disponibles." - L["copy_desc"] = "Copie les param\195\168tres d'un profil d\195\169j\195\160 existant dans le profil actuellement actif." - L["copy"] = "Copier \195\160 partir de" - L["delete_desc"] = "Supprime les profils existants inutilis\195\169s de la base de donn\195\169es afin de gagner de la place et de nettoyer le fichier SavedVariables." - L["delete"] = "Supprimer un profil" - L["delete_sub"] = "Supprime un profil de la base de donn\195\169es." - L["delete_confirm"] = "Etes-vous s\195\187r de vouloir supprimer le profil s\195\169lectionn\195\169 ?" - L["profiles"] = "Profils" - L["profiles_sub"] = "Gestion des profils" - --L["current"] = "Current Profile:" -elseif LOCALE == "koKR" then - L["default"] = "기본값" - L["intro"] = "모든 캐릭터의 다양한 설정과 사용중인 데이터베이스 프로필, 어느것이던지 매우 다루기 쉽게 바꿀수 있습니다." - L["reset_desc"] = "단순히 다시 새롭게 구성을 원하는 경우, 현재 프로필을 기본값으로 초기화 합니다." - L["reset"] = "프로필 초기화" - L["reset_sub"] = "현재의 프로필을 기본값으로 초기화 합니다" - L["choose_desc"] = "새로운 이름을 입력하거나, 이미 있는 프로필중 하나를 선택하여 새로운 프로필을 만들 수 있습니다." - L["new"] = "새로운 프로필" - L["new_sub"] = "새로운 프로필을 만듭니다." - L["choose"] = "프로필 선택" - L["choose_sub"] = "당신이 현재 이용할수 있는 프로필을 선택합니다." - L["copy_desc"] = "현재 사용중인 프로필에, 선택한 프로필의 설정을 복사합니다." - L["copy"] = "복사" - L["delete_desc"] = "데이터베이스에 사용중이거나 저장된 프로파일 삭제로 SavedVariables 파일의 정리와 공간 절약이 됩니다." - L["delete"] = "프로필 삭제" - L["delete_sub"] = "데이터베이스의 프로필을 삭제합니다." - L["delete_confirm"] = "정말로 선택한 프로필의 삭제를 원하십니까?" - L["profiles"] = "프로필" - L["profiles_sub"] = "프로필 설정" - --L["current"] = "Current Profile:" -elseif LOCALE == "esES" or LOCALE == "esMX" then - L["default"] = "Por defecto" - L["intro"] = "Puedes cambiar el perfil activo de tal manera que cada personaje tenga diferentes configuraciones." - L["reset_desc"] = "Reinicia el perfil actual a los valores por defectos, en caso de que se haya estropeado la configuración o quieras volver a empezar de nuevo." - L["reset"] = "Reiniciar Perfil" - L["reset_sub"] = "Reinicar el perfil actual al de por defecto" - L["choose_desc"] = "Puedes crear un nuevo perfil introduciendo un nombre en el recuadro o puedes seleccionar un perfil de los ya existentes." - L["new"] = "Nuevo" - L["new_sub"] = "Crear un nuevo perfil vacio." - L["choose"] = "Perfiles existentes" - L["choose_sub"] = "Selecciona uno de los perfiles disponibles." - L["copy_desc"] = "Copia los ajustes de un perfil existente al perfil actual." - L["copy"] = "Copiar de" - L["delete_desc"] = "Borra los perfiles existentes y sin uso de la base de datos para ganar espacio y limpiar el archivo SavedVariables." - L["delete"] = "Borrar un Perfil" - L["delete_sub"] = "Borra un perfil de la base de datos." - L["delete_confirm"] = "¿Estas seguro que quieres borrar el perfil seleccionado?" - L["profiles"] = "Perfiles" - L["profiles_sub"] = "Manejar Perfiles" - --L["current"] = "Current Profile:" -elseif LOCALE == "zhTW" then - L["default"] = "預設" - L["intro"] = "你可以選擇一個活動的資料設定檔，這樣你的每個角色就可以擁有不同的設定值，可以給你的插件設定帶來極大的靈活性。" - L["reset_desc"] = "將當前的設定檔恢復到它的預設值，用於你的設定檔損壞，或者你只是想重來的情況。" - L["reset"] = "重置設定檔" - L["reset_sub"] = "將當前的設定檔恢復為預設值" - L["choose_desc"] = "你可以通過在文本框內輸入一個名字創立一個新的設定檔，也可以選擇一個已經存在的設定檔。" - L["new"] = "新建" - L["new_sub"] = "新建一個空的設定檔。" - L["choose"] = "現有的設定檔" - L["choose_sub"] = "從當前可用的設定檔裏面選擇一個。" - L["copy_desc"] = "從當前某個已保存的設定檔複製到當前正使用的設定檔。" - L["copy"] = "複製自" - L["delete_desc"] = "從資料庫裏刪除不再使用的設定檔，以節省空間，並且清理SavedVariables檔。" - L["delete"] = "刪除一個設定檔" - L["delete_sub"] = "從資料庫裏刪除一個設定檔。" - L["delete_confirm"] = "你確定要刪除所選擇的設定檔嗎？" - L["profiles"] = "設定檔" - L["profiles_sub"] = "管理設定檔" - --L["current"] = "Current Profile:" -elseif LOCALE == "zhCN" then - L["default"] = "默认" - L["intro"] = "你可以选择一个活动的数据配置文件，这样你的每个角色就可以拥有不同的设置值，可以给你的插件配置带来极大的灵活性。" - L["reset_desc"] = "将当前的配置文件恢复到它的默认值，用于你的配置文件损坏，或者你只是想重来的情况。" - L["reset"] = "重置配置文件" - L["reset_sub"] = "将当前的配置文件恢复为默认值" - L["choose_desc"] = "你可以通过在文本框内输入一个名字创立一个新的配置文件，也可以选择一个已经存在的配置文件。" - L["new"] = "新建" - L["new_sub"] = "新建一个空的配置文件。" - L["choose"] = "现有的配置文件" - L["choose_sub"] = "从当前可用的配置文件里面选择一个。" - L["copy_desc"] = "从当前某个已保存的配置文件复制到当前正使用的配置文件。" - L["copy"] = "复制自" - L["delete_desc"] = "从数据库里删除不再使用的配置文件，以节省空间，并且清理SavedVariables文件。" - L["delete"] = "删除一个配置文件" - L["delete_sub"] = "从数据库里删除一个配置文件。" - L["delete_confirm"] = "你确定要删除所选择的配置文件么？" - L["profiles"] = "配置文件" - L["profiles_sub"] = "管理配置文件" - --L["current"] = "Current Profile:" -elseif LOCALE == "ruRU" then - L["default"] = "По умолчанию" - L["intro"] = "Изменяя активный профиль, вы можете задать различные настройки модификаций для каждого персонажа." - L["reset_desc"] = "Если ваша конфигурации испорчена или если вы хотите настроить всё заново - сбросьте текущий профиль на стандартные значения." - L["reset"] = "Сброс профиля" - L["reset_sub"] = "Сброс текущего профиля на стандартный" - L["choose_desc"] = "Вы можете создать новый профиль, введя название в поле ввода, или выбрать один из уже существующих профилей." - L["new"] = "Новый" - L["new_sub"] = "Создать новый чистый профиль" - L["choose"] = "Существующие профили" - L["choose_sub"] = "Выбор одиного из уже доступных профилей" - L["copy_desc"] = "Скопировать настройки из выбранного профиля в активный." - L["copy"] = "Скопировать из" - L["delete_desc"] = "Удалить существующий и неиспользуемый профиль из БД для сохранения места, и очистить SavedVariables файл." - L["delete"] = "Удалить профиль" - L["delete_sub"] = "Удаление профиля из БД" - L["delete_confirm"] = "Вы уверены, что вы хотите удалить выбранный профиль?" - L["profiles"] = "Профили" - L["profiles_sub"] = "Управление профилями" - --L["current"] = "Current Profile:" -end - -local defaultProfiles -local tmpprofiles = {} - --- Get a list of available profiles for the specified database. --- You can specify which profiles to include/exclude in the list using the two boolean parameters listed below. --- @param db The db object to retrieve the profiles from --- @param common If true, getProfileList will add the default profiles to the return list, even if they have not been created yet --- @param nocurrent If true, then getProfileList will not display the current profile in the list --- @return Hashtable of all profiles with the internal name as keys and the display name as value. -local function getProfileList(db, common, nocurrent) - local profiles = {} - - -- copy existing profiles into the table - local currentProfile = db:GetCurrentProfile() - for i,v in pairs(db:GetProfiles(tmpprofiles)) do - if not (nocurrent and v == currentProfile) then - profiles[v] = v - end - end - - -- add our default profiles to choose from ( or rename existing profiles) - for k,v in pairs(defaultProfiles) do - if (common or profiles[k]) and not (nocurrent and k == currentProfile) then - profiles[k] = v - end - end - - return profiles -end - ---[[ - OptionsHandlerPrototype - prototype class for handling the options in a sane way -]] -local OptionsHandlerPrototype = {} - ---[[ Reset the profile ]] -function OptionsHandlerPrototype:Reset() - self.db:ResetProfile() -end - ---[[ Set the profile to value ]] -function OptionsHandlerPrototype:SetProfile(info, value) - self.db:SetProfile(value) -end - ---[[ returns the currently active profile ]] -function OptionsHandlerPrototype:GetCurrentProfile() - return self.db:GetCurrentProfile() -end - ---[[ - List all active profiles - you can control the output with the .arg variable - currently four modes are supported - - (empty) - return all available profiles - "nocurrent" - returns all available profiles except the currently active profile - "common" - returns all avaialble profiles + some commonly used profiles ("char - realm", "realm", "class", "Default") - "both" - common except the active profile -]] -function OptionsHandlerPrototype:ListProfiles(info) - local arg = info.arg - local profiles - if arg == "common" and not self.noDefaultProfiles then - profiles = getProfileList(self.db, true, nil) - elseif arg == "nocurrent" then - profiles = getProfileList(self.db, nil, true) - elseif arg == "both" then -- currently not used - profiles = getProfileList(self.db, (not self.noDefaultProfiles) and true, true) - else - profiles = getProfileList(self.db) - end - - return profiles -end - -function OptionsHandlerPrototype:HasNoProfiles(info) - local profiles = self:ListProfiles(info) - return ((not next(profiles)) and true or false) -end - ---[[ Copy a profile ]] -function OptionsHandlerPrototype:CopyProfile(info, value) - self.db:CopyProfile(value) -end - ---[[ Delete a profile from the db ]] -function OptionsHandlerPrototype:DeleteProfile(info, value) - self.db:DeleteProfile(value) -end - ---[[ fill defaultProfiles with some generic values ]] -local function generateDefaultProfiles(db) - defaultProfiles = { - ["Default"] = L["default"], - [db.keys.char] = db.keys.char, - [db.keys.realm] = db.keys.realm, - [db.keys.class] = UnitClass("player") - } -end - ---[[ create and return a handler object for the db, or upgrade it if it already existed ]] -local function getOptionsHandler(db, noDefaultProfiles) - if not defaultProfiles then - generateDefaultProfiles(db) - end - - local handler = AceDBOptions.handlers[db] or { db = db, noDefaultProfiles = noDefaultProfiles } - - for k,v in pairs(OptionsHandlerPrototype) do - handler[k] = v - end - - AceDBOptions.handlers[db] = handler - return handler -end - ---[[ - the real options table -]] -local optionsTable = { - desc = { - order = 1, - type = "description", - name = L["intro"] .. "\n", - }, - descreset = { - order = 9, - type = "description", - name = L["reset_desc"], - }, - reset = { - order = 10, - type = "execute", - name = L["reset"], - desc = L["reset_sub"], - func = "Reset", - }, - current = { - order = 11, - type = "description", - name = function(info) return L["current"] .. " " .. NORMAL_FONT_COLOR_CODE .. info.handler:GetCurrentProfile() .. FONT_COLOR_CODE_CLOSE end, - width = "default", - }, - choosedesc = { - order = 20, - type = "description", - name = "\n" .. L["choose_desc"], - }, - new = { - name = L["new"], - desc = L["new_sub"], - type = "input", - order = 30, - get = false, - set = "SetProfile", - }, - choose = { - name = L["choose"], - desc = L["choose_sub"], - type = "select", - order = 40, - get = "GetCurrentProfile", - set = "SetProfile", - values = "ListProfiles", - arg = "common", - }, - copydesc = { - order = 50, - type = "description", - name = "\n" .. L["copy_desc"], - }, - copyfrom = { - order = 60, - type = "select", - name = L["copy"], - desc = L["copy_desc"], - get = false, - set = "CopyProfile", - values = "ListProfiles", - disabled = "HasNoProfiles", - arg = "nocurrent", - }, - deldesc = { - order = 70, - type = "description", - name = "\n" .. L["delete_desc"], - }, - delete = { - order = 80, - type = "select", - name = L["delete"], - desc = L["delete_sub"], - get = false, - set = "DeleteProfile", - values = "ListProfiles", - disabled = "HasNoProfiles", - arg = "nocurrent", - confirm = true, - confirmText = L["delete_confirm"], - }, -} - ---- Get/Create a option table that you can use in your addon to control the profiles of AceDB-3.0. --- @param db The database object to create the options table for. --- @return The options table to be used in AceConfig-3.0 --- @usage --- -- Assuming `options` is your top-level options table and `self.db` is your database: --- options.args.profiles = LibStub("AceDBOptions-3.0"):GetOptionsTable(self.db) -function AceDBOptions:GetOptionsTable(db, noDefaultProfiles) - local tbl = AceDBOptions.optionTables[db] or { - type = "group", - name = L["profiles"], - desc = L["profiles_sub"], - } - - tbl.handler = getOptionsHandler(db, noDefaultProfiles) - tbl.args = optionsTable - - AceDBOptions.optionTables[db] = tbl - return tbl -end - --- upgrade existing tables -for db,tbl in pairs(AceDBOptions.optionTables) do - tbl.handler = getOptionsHandler(db) - tbl.args = optionsTable -end +--- AceDBOptions-3.0 provides a universal AceConfig options screen for managing AceDB-3.0 profiles. +-- @class file +-- @name AceDBOptions-3.0 +-- @release $Id: AceDBOptions-3.0.lua 938 2010-06-13 07:21:38Z nevcairiel $ +local ACEDBO_MAJOR, ACEDBO_MINOR = "AceDBOptions-3.0", 12 +local AceDBOptions, oldminor = LibStub:NewLibrary(ACEDBO_MAJOR, ACEDBO_MINOR) + +if not AceDBOptions then return end -- No upgrade needed + +-- Lua APIs +local pairs, next = pairs, next + +-- WoW APIs +local UnitClass = UnitClass + +-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded +-- List them here for Mikk's FindGlobals script +-- GLOBALS: NORMAL_FONT_COLOR_CODE, FONT_COLOR_CODE_CLOSE + +AceDBOptions.optionTables = AceDBOptions.optionTables or {} +AceDBOptions.handlers = AceDBOptions.handlers or {} + +--[[ + Localization of AceDBOptions-3.0 +]] + +local L = { + default = "Default", + intro = "You can change the active database profile, so you can have different settings for every character.", + reset_desc = "Reset the current profile back to its default values, in case your configuration is broken, or you simply want to start over.", + reset = "Reset Profile", + reset_sub = "Reset the current profile to the default", + choose_desc = "You can either create a new profile by entering a name in the editbox, or choose one of the already existing profiles.", + new = "New", + new_sub = "Create a new empty profile.", + choose = "Existing Profiles", + choose_sub = "Select one of your currently available profiles.", + copy_desc = "Copy the settings from one existing profile into the currently active profile.", + copy = "Copy From", + delete_desc = "Delete existing and unused profiles from the database to save space, and cleanup the SavedVariables file.", + delete = "Delete a Profile", + delete_sub = "Deletes a profile from the database.", + delete_confirm = "Are you sure you want to delete the selected profile?", + profiles = "Profiles", + profiles_sub = "Manage Profiles", + current = "Current Profile:", +} + +local LOCALE = GetLocale() +if LOCALE == "deDE" then + L["default"] = "Standard" + L["intro"] = "Hier kannst du das aktive Datenbankprofile \195\164ndern, damit du verschiedene Einstellungen f\195\188r jeden Charakter erstellen kannst, wodurch eine sehr flexible Konfiguration m\195\182glich wird." + L["reset_desc"] = "Setzt das momentane Profil auf Standardwerte zur\195\188ck, f\195\188r den Fall das mit der Konfiguration etwas schief lief oder weil du einfach neu starten willst." + L["reset"] = "Profil zur\195\188cksetzen" + L["reset_sub"] = "Das aktuelle Profil auf Standard zur\195\188cksetzen." + L["choose_desc"] = "Du kannst ein neues Profil erstellen, indem du einen neuen Namen in der Eingabebox 'Neu' eingibst, oder w\195\164hle eines der vorhandenen Profile aus." + L["new"] = "Neu" + L["new_sub"] = "Ein neues Profil erstellen." + L["choose"] = "Vorhandene Profile" + L["choose_sub"] = "W\195\164hlt ein bereits vorhandenes Profil aus." + L["copy_desc"] = "Kopiere die Einstellungen von einem vorhandenen Profil in das aktive Profil." + L["copy"] = "Kopieren von..." + L["delete_desc"] = "L\195\182sche vorhandene oder unbenutzte Profile aus der Datenbank um Platz zu sparen und um die SavedVariables Datei 'sauber' zu halten." + L["delete"] = "Profil l\195\182schen" + L["delete_sub"] = "L\195\182scht ein Profil aus der Datenbank." + L["delete_confirm"] = "Willst du das ausgew\195\164hlte Profil wirklich l\195\182schen?" + L["profiles"] = "Profile" + L["profiles_sub"] = "Profile verwalten" + --L["current"] = "Current Profile:" +elseif LOCALE == "frFR" then + L["default"] = "D\195\169faut" + L["intro"] = "Vous pouvez changer le profil actuel afin d'avoir des param\195\168tres diff\195\169rents pour chaque personnage, permettant ainsi d'avoir une configuration tr\195\168s flexible." + L["reset_desc"] = "R\195\169initialise le profil actuel au cas o\195\185 votre configuration est corrompue ou si vous voulez tout simplement faire table rase." + L["reset"] = "R\195\169initialiser le profil" + L["reset_sub"] = "R\195\169initialise le profil actuel avec les param\195\168tres par d\195\169faut." + L["choose_desc"] = "Vous pouvez cr\195\169er un nouveau profil en entrant un nouveau nom dans la bo\195\174te de saisie, ou en choississant un des profils d\195\169j\195\160 existants." + L["new"] = "Nouveau" + L["new_sub"] = "Cr\195\169\195\169e un nouveau profil vierge." + L["choose"] = "Profils existants" + L["choose_sub"] = "Permet de choisir un des profils d\195\169j\195\160 disponibles." + L["copy_desc"] = "Copie les param\195\168tres d'un profil d\195\169j\195\160 existant dans le profil actuellement actif." + L["copy"] = "Copier \195\160 partir de" + L["delete_desc"] = "Supprime les profils existants inutilis\195\169s de la base de donn\195\169es afin de gagner de la place et de nettoyer le fichier SavedVariables." + L["delete"] = "Supprimer un profil" + L["delete_sub"] = "Supprime un profil de la base de donn\195\169es." + L["delete_confirm"] = "Etes-vous s\195\187r de vouloir supprimer le profil s\195\169lectionn\195\169 ?" + L["profiles"] = "Profils" + L["profiles_sub"] = "Gestion des profils" + --L["current"] = "Current Profile:" +elseif LOCALE == "koKR" then + L["default"] = "기본값" + L["intro"] = "모든 캐릭터의 다양한 설정과 사용중인 데이터베이스 프로필, 어느것이던지 매우 다루기 쉽게 바꿀수 있습니다." + L["reset_desc"] = "단순히 다시 새롭게 구성을 원하는 경우, 현재 프로필을 기본값으로 초기화 합니다." + L["reset"] = "프로필 초기화" + L["reset_sub"] = "현재의 프로필을 기본값으로 초기화 합니다" + L["choose_desc"] = "새로운 이름을 입력하거나, 이미 있는 프로필중 하나를 선택하여 새로운 프로필을 만들 수 있습니다." + L["new"] = "새로운 프로필" + L["new_sub"] = "새로운 프로필을 만듭니다." + L["choose"] = "프로필 선택" + L["choose_sub"] = "당신이 현재 이용할수 있는 프로필을 선택합니다." + L["copy_desc"] = "현재 사용중인 프로필에, 선택한 프로필의 설정을 복사합니다." + L["copy"] = "복사" + L["delete_desc"] = "데이터베이스에 사용중이거나 저장된 프로파일 삭제로 SavedVariables 파일의 정리와 공간 절약이 됩니다." + L["delete"] = "프로필 삭제" + L["delete_sub"] = "데이터베이스의 프로필을 삭제합니다." + L["delete_confirm"] = "정말로 선택한 프로필의 삭제를 원하십니까?" + L["profiles"] = "프로필" + L["profiles_sub"] = "프로필 설정" + --L["current"] = "Current Profile:" +elseif LOCALE == "esES" or LOCALE == "esMX" then + L["default"] = "Por defecto" + L["intro"] = "Puedes cambiar el perfil activo de tal manera que cada personaje tenga diferentes configuraciones." + L["reset_desc"] = "Reinicia el perfil actual a los valores por defectos, en caso de que se haya estropeado la configuración o quieras volver a empezar de nuevo." + L["reset"] = "Reiniciar Perfil" + L["reset_sub"] = "Reinicar el perfil actual al de por defecto" + L["choose_desc"] = "Puedes crear un nuevo perfil introduciendo un nombre en el recuadro o puedes seleccionar un perfil de los ya existentes." + L["new"] = "Nuevo" + L["new_sub"] = "Crear un nuevo perfil vacio." + L["choose"] = "Perfiles existentes" + L["choose_sub"] = "Selecciona uno de los perfiles disponibles." + L["copy_desc"] = "Copia los ajustes de un perfil existente al perfil actual." + L["copy"] = "Copiar de" + L["delete_desc"] = "Borra los perfiles existentes y sin uso de la base de datos para ganar espacio y limpiar el archivo SavedVariables." + L["delete"] = "Borrar un Perfil" + L["delete_sub"] = "Borra un perfil de la base de datos." + L["delete_confirm"] = "¿Estas seguro que quieres borrar el perfil seleccionado?" + L["profiles"] = "Perfiles" + L["profiles_sub"] = "Manejar Perfiles" + --L["current"] = "Current Profile:" +elseif LOCALE == "zhTW" then + L["default"] = "預設" + L["intro"] = "你可以選擇一個活動的資料設定檔，這樣你的每個角色就可以擁有不同的設定值，可以給你的插件設定帶來極大的靈活性。" + L["reset_desc"] = "將當前的設定檔恢復到它的預設值，用於你的設定檔損壞，或者你只是想重來的情況。" + L["reset"] = "重置設定檔" + L["reset_sub"] = "將當前的設定檔恢復為預設值" + L["choose_desc"] = "你可以通過在文本框內輸入一個名字創立一個新的設定檔，也可以選擇一個已經存在的設定檔。" + L["new"] = "新建" + L["new_sub"] = "新建一個空的設定檔。" + L["choose"] = "現有的設定檔" + L["choose_sub"] = "從當前可用的設定檔裏面選擇一個。" + L["copy_desc"] = "從當前某個已保存的設定檔複製到當前正使用的設定檔。" + L["copy"] = "複製自" + L["delete_desc"] = "從資料庫裏刪除不再使用的設定檔，以節省空間，並且清理SavedVariables檔。" + L["delete"] = "刪除一個設定檔" + L["delete_sub"] = "從資料庫裏刪除一個設定檔。" + L["delete_confirm"] = "你確定要刪除所選擇的設定檔嗎？" + L["profiles"] = "設定檔" + L["profiles_sub"] = "管理設定檔" + --L["current"] = "Current Profile:" +elseif LOCALE == "zhCN" then + L["default"] = "默认" + L["intro"] = "你可以选择一个活动的数据配置文件，这样你的每个角色就可以拥有不同的设置值，可以给你的插件配置带来极大的灵活性。" + L["reset_desc"] = "将当前的配置文件恢复到它的默认值，用于你的配置文件损坏，或者你只是想重来的情况。" + L["reset"] = "重置配置文件" + L["reset_sub"] = "将当前的配置文件恢复为默认值" + L["choose_desc"] = "你可以通过在文本框内输入一个名字创立一个新的配置文件，也可以选择一个已经存在的配置文件。" + L["new"] = "新建" + L["new_sub"] = "新建一个空的配置文件。" + L["choose"] = "现有的配置文件" + L["choose_sub"] = "从当前可用的配置文件里面选择一个。" + L["copy_desc"] = "从当前某个已保存的配置文件复制到当前正使用的配置文件。" + L["copy"] = "复制自" + L["delete_desc"] = "从数据库里删除不再使用的配置文件，以节省空间，并且清理SavedVariables文件。" + L["delete"] = "删除一个配置文件" + L["delete_sub"] = "从数据库里删除一个配置文件。" + L["delete_confirm"] = "你确定要删除所选择的配置文件么？" + L["profiles"] = "配置文件" + L["profiles_sub"] = "管理配置文件" + --L["current"] = "Current Profile:" +elseif LOCALE == "ruRU" then + L["default"] = "По умолчанию" + L["intro"] = "Изменяя активный профиль, вы можете задать различные настройки модификаций для каждого персонажа." + L["reset_desc"] = "Если ваша конфигурации испорчена или если вы хотите настроить всё заново - сбросьте текущий профиль на стандартные значения." + L["reset"] = "Сброс профиля" + L["reset_sub"] = "Сброс текущего профиля на стандартный" + L["choose_desc"] = "Вы можете создать новый профиль, введя название в поле ввода, или выбрать один из уже существующих профилей." + L["new"] = "Новый" + L["new_sub"] = "Создать новый чистый профиль" + L["choose"] = "Существующие профили" + L["choose_sub"] = "Выбор одиного из уже доступных профилей" + L["copy_desc"] = "Скопировать настройки из выбранного профиля в активный." + L["copy"] = "Скопировать из" + L["delete_desc"] = "Удалить существующий и неиспользуемый профиль из БД для сохранения места, и очистить SavedVariables файл." + L["delete"] = "Удалить профиль" + L["delete_sub"] = "Удаление профиля из БД" + L["delete_confirm"] = "Вы уверены, что вы хотите удалить выбранный профиль?" + L["profiles"] = "Профили" + L["profiles_sub"] = "Управление профилями" + --L["current"] = "Current Profile:" +end + +local defaultProfiles +local tmpprofiles = {} + +-- Get a list of available profiles for the specified database. +-- You can specify which profiles to include/exclude in the list using the two boolean parameters listed below. +-- @param db The db object to retrieve the profiles from +-- @param common If true, getProfileList will add the default profiles to the return list, even if they have not been created yet +-- @param nocurrent If true, then getProfileList will not display the current profile in the list +-- @return Hashtable of all profiles with the internal name as keys and the display name as value. +local function getProfileList(db, common, nocurrent) + local profiles = {} + + -- copy existing profiles into the table + local currentProfile = db:GetCurrentProfile() + for i,v in pairs(db:GetProfiles(tmpprofiles)) do + if not (nocurrent and v == currentProfile) then + profiles[v] = v + end + end + + -- add our default profiles to choose from ( or rename existing profiles) + for k,v in pairs(defaultProfiles) do + if (common or profiles[k]) and not (nocurrent and k == currentProfile) then + profiles[k] = v + end + end + + return profiles +end + +--[[ + OptionsHandlerPrototype + prototype class for handling the options in a sane way +]] +local OptionsHandlerPrototype = {} + +--[[ Reset the profile ]] +function OptionsHandlerPrototype:Reset() + self.db:ResetProfile() +end + +--[[ Set the profile to value ]] +function OptionsHandlerPrototype:SetProfile(info, value) + self.db:SetProfile(value) +end + +--[[ returns the currently active profile ]] +function OptionsHandlerPrototype:GetCurrentProfile() + return self.db:GetCurrentProfile() +end + +--[[ + List all active profiles + you can control the output with the .arg variable + currently four modes are supported + + (empty) - return all available profiles + "nocurrent" - returns all available profiles except the currently active profile + "common" - returns all avaialble profiles + some commonly used profiles ("char - realm", "realm", "class", "Default") + "both" - common except the active profile +]] +function OptionsHandlerPrototype:ListProfiles(info) + local arg = info.arg + local profiles + if arg == "common" and not self.noDefaultProfiles then + profiles = getProfileList(self.db, true, nil) + elseif arg == "nocurrent" then + profiles = getProfileList(self.db, nil, true) + elseif arg == "both" then -- currently not used + profiles = getProfileList(self.db, (not self.noDefaultProfiles) and true, true) + else + profiles = getProfileList(self.db) + end + + return profiles +end + +function OptionsHandlerPrototype:HasNoProfiles(info) + local profiles = self:ListProfiles(info) + return ((not next(profiles)) and true or false) +end + +--[[ Copy a profile ]] +function OptionsHandlerPrototype:CopyProfile(info, value) + self.db:CopyProfile(value) +end + +--[[ Delete a profile from the db ]] +function OptionsHandlerPrototype:DeleteProfile(info, value) + self.db:DeleteProfile(value) +end + +--[[ fill defaultProfiles with some generic values ]] +local function generateDefaultProfiles(db) + defaultProfiles = { + ["Default"] = L["default"], + [db.keys.char] = db.keys.char, + [db.keys.realm] = db.keys.realm, + [db.keys.class] = UnitClass("player") + } +end + +--[[ create and return a handler object for the db, or upgrade it if it already existed ]] +local function getOptionsHandler(db, noDefaultProfiles) + if not defaultProfiles then + generateDefaultProfiles(db) + end + + local handler = AceDBOptions.handlers[db] or { db = db, noDefaultProfiles = noDefaultProfiles } + + for k,v in pairs(OptionsHandlerPrototype) do + handler[k] = v + end + + AceDBOptions.handlers[db] = handler + return handler +end + +--[[ + the real options table +]] +local optionsTable = { + desc = { + order = 1, + type = "description", + name = L["intro"] .. "\n", + }, + descreset = { + order = 9, + type = "description", + name = L["reset_desc"], + }, + reset = { + order = 10, + type = "execute", + name = L["reset"], + desc = L["reset_sub"], + func = "Reset", + }, + current = { + order = 11, + type = "description", + name = function(info) return L["current"] .. " " .. NORMAL_FONT_COLOR_CODE .. info.handler:GetCurrentProfile() .. FONT_COLOR_CODE_CLOSE end, + width = "default", + }, + choosedesc = { + order = 20, + type = "description", + name = "\n" .. L["choose_desc"], + }, + new = { + name = L["new"], + desc = L["new_sub"], + type = "input", + order = 30, + get = false, + set = "SetProfile", + }, + choose = { + name = L["choose"], + desc = L["choose_sub"], + type = "select", + order = 40, + get = "GetCurrentProfile", + set = "SetProfile", + values = "ListProfiles", + arg = "common", + }, + copydesc = { + order = 50, + type = "description", + name = "\n" .. L["copy_desc"], + }, + copyfrom = { + order = 60, + type = "select", + name = L["copy"], + desc = L["copy_desc"], + get = false, + set = "CopyProfile", + values = "ListProfiles", + disabled = "HasNoProfiles", + arg = "nocurrent", + }, + deldesc = { + order = 70, + type = "description", + name = "\n" .. L["delete_desc"], + }, + delete = { + order = 80, + type = "select", + name = L["delete"], + desc = L["delete_sub"], + get = false, + set = "DeleteProfile", + values = "ListProfiles", + disabled = "HasNoProfiles", + arg = "nocurrent", + confirm = true, + confirmText = L["delete_confirm"], + }, +} + +--- Get/Create a option table that you can use in your addon to control the profiles of AceDB-3.0. +-- @param db The database object to create the options table for. +-- @return The options table to be used in AceConfig-3.0 +-- @usage +-- -- Assuming `options` is your top-level options table and `self.db` is your database: +-- options.args.profiles = LibStub("AceDBOptions-3.0"):GetOptionsTable(self.db) +function AceDBOptions:GetOptionsTable(db, noDefaultProfiles) + local tbl = AceDBOptions.optionTables[db] or { + type = "group", + name = L["profiles"], + desc = L["profiles_sub"], + } + + tbl.handler = getOptionsHandler(db, noDefaultProfiles) + tbl.args = optionsTable + + AceDBOptions.optionTables[db] = tbl + return tbl +end + +-- upgrade existing tables +for db,tbl in pairs(AceDBOptions.optionTables) do + tbl.handler = getOptionsHandler(db) + tbl.args = optionsTable +end diff --git a/libs/AceDBOptions-3.0/AceDBOptions-3.0.xml b/libs/AceDBOptions-3.0/AceDBOptions-3.0.xml old mode 100644 new mode 100755 index a34c086..2668fb0 --- a/libs/AceDBOptions-3.0/AceDBOptions-3.0.xml +++ b/libs/AceDBOptions-3.0/AceDBOptions-3.0.xml @@ -1,4 +1,4 @@ -<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ -..\FrameXML\UI.xsd"> - <Script file="AceDBOptions-3.0.lua"/> +<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ +..\FrameXML\UI.xsd"> + <Script file="AceDBOptions-3.0.lua"/> </Ui> \ No newline at end of file diff --git a/libs/AceEvent-3.0/AceEvent-3.0.lua b/libs/AceEvent-3.0/AceEvent-3.0.lua old mode 100644 new mode 100755 index 0fe1533..578ae25 --- a/libs/AceEvent-3.0/AceEvent-3.0.lua +++ b/libs/AceEvent-3.0/AceEvent-3.0.lua @@ -1,126 +1,126 @@ ---- AceEvent-3.0 provides event registration and secure dispatching. --- All dispatching is done using **CallbackHandler-1.0**. AceEvent is a simple wrapper around --- CallbackHandler, and dispatches all game events or addon message to the registrees. --- --- **AceEvent-3.0** can be embeded into your addon, either explicitly by calling AceEvent:Embed(MyAddon) or by --- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object --- and can be accessed directly, without having to explicitly call AceEvent itself.\\ --- It is recommended to embed AceEvent, otherwise you'll have to specify a custom `self` on all calls you --- make into AceEvent. --- @class file --- @name AceEvent-3.0 --- @release $Id: AceEvent-3.0.lua 975 2010-10-23 11:26:18Z nevcairiel $ -local MAJOR, MINOR = "AceEvent-3.0", 3 -local AceEvent = LibStub:NewLibrary(MAJOR, MINOR) - -if not AceEvent then return end - --- Lua APIs -local pairs = pairs - -local CallbackHandler = LibStub:GetLibrary("CallbackHandler-1.0") - -AceEvent.frame = AceEvent.frame or CreateFrame("Frame", "AceEvent30Frame") -- our event frame -AceEvent.embeds = AceEvent.embeds or {} -- what objects embed this lib - --- APIs and registry for blizzard events, using CallbackHandler lib -if not AceEvent.events then - AceEvent.events = CallbackHandler:New(AceEvent, - "RegisterEvent", "UnregisterEvent", "UnregisterAllEvents") -end - -function AceEvent.events:OnUsed(target, eventname) - AceEvent.frame:RegisterEvent(eventname) -end - -function AceEvent.events:OnUnused(target, eventname) - AceEvent.frame:UnregisterEvent(eventname) -end - - --- APIs and registry for IPC messages, using CallbackHandler lib -if not AceEvent.messages then - AceEvent.messages = CallbackHandler:New(AceEvent, - "RegisterMessage", "UnregisterMessage", "UnregisterAllMessages" - ) - AceEvent.SendMessage = AceEvent.messages.Fire -end - ---- embedding and embed handling -local mixins = { - "RegisterEvent", "UnregisterEvent", - "RegisterMessage", "UnregisterMessage", - "SendMessage", - "UnregisterAllEvents", "UnregisterAllMessages", -} - ---- Register for a Blizzard Event. --- The callback will be called with the optional `arg` as the first argument (if supplied), and the event name as the second (or first, if no arg was supplied) --- Any arguments to the event will be passed on after that. --- @name AceEvent:RegisterEvent --- @class function --- @paramsig event[, callback [, arg]] --- @param event The event to register for --- @param callback The callback function to call when the event is triggered (funcref or method, defaults to a method with the event name) --- @param arg An optional argument to pass to the callback function - ---- Unregister an event. --- @name AceEvent:UnregisterEvent --- @class function --- @paramsig event --- @param event The event to unregister - ---- Register for a custom AceEvent-internal message. --- The callback will be called with the optional `arg` as the first argument (if supplied), and the event name as the second (or first, if no arg was supplied) --- Any arguments to the event will be passed on after that. --- @name AceEvent:RegisterMessage --- @class function --- @paramsig message[, callback [, arg]] --- @param message The message to register for --- @param callback The callback function to call when the message is triggered (funcref or method, defaults to a method with the event name) --- @param arg An optional argument to pass to the callback function - ---- Unregister a message --- @name AceEvent:UnregisterMessage --- @class function --- @paramsig message --- @param message The message to unregister - ---- Send a message over the AceEvent-3.0 internal message system to other addons registered for this message. --- @name AceEvent:SendMessage --- @class function --- @paramsig message, ... --- @param message The message to send --- @param ... Any arguments to the message - - --- Embeds AceEvent into the target object making the functions from the mixins list available on target:.. --- @param target target object to embed AceEvent in -function AceEvent:Embed(target) - for k, v in pairs(mixins) do - target[v] = self[v] - end - self.embeds[target] = true - return target -end - --- AceEvent:OnEmbedDisable( target ) --- target (object) - target object that is being disabled --- --- Unregister all events messages etc when the target disables. --- this method should be called by the target manually or by an addon framework -function AceEvent:OnEmbedDisable(target) - target:UnregisterAllEvents() - target:UnregisterAllMessages() -end - --- Script to fire blizzard events into the event listeners -local events = AceEvent.events -AceEvent.frame:SetScript("OnEvent", function(this, event, ...) - events:Fire(event, ...) -end) - ---- Finally: upgrade our old embeds -for target, v in pairs(AceEvent.embeds) do - AceEvent:Embed(target) -end +--- AceEvent-3.0 provides event registration and secure dispatching. +-- All dispatching is done using **CallbackHandler-1.0**. AceEvent is a simple wrapper around +-- CallbackHandler, and dispatches all game events or addon message to the registrees. +-- +-- **AceEvent-3.0** can be embeded into your addon, either explicitly by calling AceEvent:Embed(MyAddon) or by +-- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object +-- and can be accessed directly, without having to explicitly call AceEvent itself.\\ +-- It is recommended to embed AceEvent, otherwise you'll have to specify a custom `self` on all calls you +-- make into AceEvent. +-- @class file +-- @name AceEvent-3.0 +-- @release $Id: AceEvent-3.0.lua 975 2010-10-23 11:26:18Z nevcairiel $ +local MAJOR, MINOR = "AceEvent-3.0", 3 +local AceEvent = LibStub:NewLibrary(MAJOR, MINOR) + +if not AceEvent then return end + +-- Lua APIs +local pairs = pairs + +local CallbackHandler = LibStub:GetLibrary("CallbackHandler-1.0") + +AceEvent.frame = AceEvent.frame or CreateFrame("Frame", "AceEvent30Frame") -- our event frame +AceEvent.embeds = AceEvent.embeds or {} -- what objects embed this lib + +-- APIs and registry for blizzard events, using CallbackHandler lib +if not AceEvent.events then + AceEvent.events = CallbackHandler:New(AceEvent, + "RegisterEvent", "UnregisterEvent", "UnregisterAllEvents") +end + +function AceEvent.events:OnUsed(target, eventname) + AceEvent.frame:RegisterEvent(eventname) +end + +function AceEvent.events:OnUnused(target, eventname) + AceEvent.frame:UnregisterEvent(eventname) +end + + +-- APIs and registry for IPC messages, using CallbackHandler lib +if not AceEvent.messages then + AceEvent.messages = CallbackHandler:New(AceEvent, + "RegisterMessage", "UnregisterMessage", "UnregisterAllMessages" + ) + AceEvent.SendMessage = AceEvent.messages.Fire +end + +--- embedding and embed handling +local mixins = { + "RegisterEvent", "UnregisterEvent", + "RegisterMessage", "UnregisterMessage", + "SendMessage", + "UnregisterAllEvents", "UnregisterAllMessages", +} + +--- Register for a Blizzard Event. +-- The callback will be called with the optional `arg` as the first argument (if supplied), and the event name as the second (or first, if no arg was supplied) +-- Any arguments to the event will be passed on after that. +-- @name AceEvent:RegisterEvent +-- @class function +-- @paramsig event[, callback [, arg]] +-- @param event The event to register for +-- @param callback The callback function to call when the event is triggered (funcref or method, defaults to a method with the event name) +-- @param arg An optional argument to pass to the callback function + +--- Unregister an event. +-- @name AceEvent:UnregisterEvent +-- @class function +-- @paramsig event +-- @param event The event to unregister + +--- Register for a custom AceEvent-internal message. +-- The callback will be called with the optional `arg` as the first argument (if supplied), and the event name as the second (or first, if no arg was supplied) +-- Any arguments to the event will be passed on after that. +-- @name AceEvent:RegisterMessage +-- @class function +-- @paramsig message[, callback [, arg]] +-- @param message The message to register for +-- @param callback The callback function to call when the message is triggered (funcref or method, defaults to a method with the event name) +-- @param arg An optional argument to pass to the callback function + +--- Unregister a message +-- @name AceEvent:UnregisterMessage +-- @class function +-- @paramsig message +-- @param message The message to unregister + +--- Send a message over the AceEvent-3.0 internal message system to other addons registered for this message. +-- @name AceEvent:SendMessage +-- @class function +-- @paramsig message, ... +-- @param message The message to send +-- @param ... Any arguments to the message + + +-- Embeds AceEvent into the target object making the functions from the mixins list available on target:.. +-- @param target target object to embed AceEvent in +function AceEvent:Embed(target) + for k, v in pairs(mixins) do + target[v] = self[v] + end + self.embeds[target] = true + return target +end + +-- AceEvent:OnEmbedDisable( target ) +-- target (object) - target object that is being disabled +-- +-- Unregister all events messages etc when the target disables. +-- this method should be called by the target manually or by an addon framework +function AceEvent:OnEmbedDisable(target) + target:UnregisterAllEvents() + target:UnregisterAllMessages() +end + +-- Script to fire blizzard events into the event listeners +local events = AceEvent.events +AceEvent.frame:SetScript("OnEvent", function(this, event, ...) + events:Fire(event, ...) +end) + +--- Finally: upgrade our old embeds +for target, v in pairs(AceEvent.embeds) do + AceEvent:Embed(target) +end diff --git a/libs/AceEvent-3.0/AceEvent-3.0.xml b/libs/AceEvent-3.0/AceEvent-3.0.xml old mode 100644 new mode 100755 index 9d02169..313ef4d --- a/libs/AceEvent-3.0/AceEvent-3.0.xml +++ b/libs/AceEvent-3.0/AceEvent-3.0.xml @@ -1,4 +1,4 @@ -<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ -..\FrameXML\UI.xsd"> - <Script file="AceEvent-3.0.lua"/> +<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ +..\FrameXML\UI.xsd"> + <Script file="AceEvent-3.0.lua"/> </Ui> \ No newline at end of file diff --git a/libs/AceGUI-3.0/AceGUI-3.0.lua b/libs/AceGUI-3.0/AceGUI-3.0.lua old mode 100644 new mode 100755 index 1278fca..53295bb --- a/libs/AceGUI-3.0/AceGUI-3.0.lua +++ b/libs/AceGUI-3.0/AceGUI-3.0.lua @@ -1,805 +1,805 @@ ---- **AceGUI-3.0** provides access to numerous widgets which can be used to create GUIs. --- AceGUI is used by AceConfigDialog to create the option GUIs, but you can use it by itself --- to create any custom GUI. There are more extensive examples in the test suite in the Ace3 --- stand-alone distribution. --- --- **Note**: When using AceGUI-3.0 directly, please do not modify the frames of the widgets directly, --- as any "unknown" change to the widgets will cause addons that get your widget out of the widget pool --- to misbehave. If you think some part of a widget should be modifiable, please open a ticket, and we"ll --- implement a proper API to modify it. --- @usage --- local AceGUI = LibStub("AceGUI-3.0") --- -- Create a container frame --- local f = AceGUI:Create("Frame") --- f:SetCallback("OnClose",function(widget) AceGUI:Release(widget) end) --- f:SetTitle("AceGUI-3.0 Example") --- f:SetStatusText("Status Bar") --- f:SetLayout("Flow") --- -- Create a button --- local btn = AceGUI:Create("Button") --- btn:SetWidth(170) --- btn:SetText("Button !") --- btn:SetCallback("OnClick", function() print("Click!") end) --- -- Add the button to the container --- f:AddChild(btn) --- @class file --- @name AceGUI-3.0 --- @release $Id: AceGUI-3.0.lua 924 2010-05-13 15:12:20Z nevcairiel $ -local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 33 -local AceGUI, oldminor = LibStub:NewLibrary(ACEGUI_MAJOR, ACEGUI_MINOR) - -if not AceGUI then return end -- No upgrade needed - --- Lua APIs -local tconcat, tremove, tinsert = table.concat, table.remove, table.insert -local select, pairs, next, type = select, pairs, next, type -local error, assert, loadstring = error, assert, loadstring -local setmetatable, rawget, rawset = setmetatable, rawget, rawset -local math_max = math.max - --- WoW APIs -local UIParent = UIParent - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: geterrorhandler, LibStub - ---local con = LibStub("AceConsole-3.0",true) - -AceGUI.WidgetRegistry = AceGUI.WidgetRegistry or {} -AceGUI.LayoutRegistry = AceGUI.LayoutRegistry or {} -AceGUI.WidgetBase = AceGUI.WidgetBase or {} -AceGUI.WidgetContainerBase = AceGUI.WidgetContainerBase or {} -AceGUI.WidgetVersions = AceGUI.WidgetVersions or {} - --- local upvalues -local WidgetRegistry = AceGUI.WidgetRegistry -local LayoutRegistry = AceGUI.LayoutRegistry -local WidgetVersions = AceGUI.WidgetVersions - ---[[ - xpcall safecall implementation -]] -local xpcall = xpcall - -local function errorhandler(err) - return geterrorhandler()(err) -end - -local function CreateDispatcher(argCount) - local code = [[ - local xpcall, eh = ... - local method, ARGS - local function call() return method(ARGS) end - - local function dispatch(func, ...) - method = func - if not method then return end - ARGS = ... - return xpcall(call, eh) - end - - return dispatch - ]] - - local ARGS = {} - for i = 1, argCount do ARGS[i] = "arg"..i end - code = code:gsub("ARGS", tconcat(ARGS, ", ")) - return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(xpcall, errorhandler) -end - -local Dispatchers = setmetatable({}, {__index=function(self, argCount) - local dispatcher = CreateDispatcher(argCount) - rawset(self, argCount, dispatcher) - return dispatcher -end}) -Dispatchers[0] = function(func) - return xpcall(func, errorhandler) -end - -local function safecall(func, ...) - return Dispatchers[select("#", ...)](func, ...) -end - --- Recycling functions -local newWidget, delWidget -do - -- Version Upgrade in Minor 29 - -- Internal Storage of the objects changed, from an array table - -- to a hash table, and additionally we introduced versioning on - -- the widgets which would discard all widgets from a pre-29 version - -- anyway, so we just clear the storage now, and don't try to - -- convert the storage tables to the new format. - -- This should generally not cause *many* widgets to end up in trash, - -- since once dialogs are opened, all addons should be loaded already - -- and AceGUI should be on the latest version available on the users - -- setup. - -- -- nevcairiel - Nov 2nd, 2009 - if oldminor and oldminor < 29 and AceGUI.objPools then - AceGUI.objPools = nil - end - - AceGUI.objPools = AceGUI.objPools or {} - local objPools = AceGUI.objPools - --Returns a new instance, if none are available either returns a new table or calls the given contructor - function newWidget(type) - if not WidgetRegistry[type] then - error("Attempt to instantiate unknown widget type", 2) - end - - if not objPools[type] then - objPools[type] = {} - end - - local newObj = next(objPools[type]) - if not newObj then - newObj = WidgetRegistry[type]() - newObj.AceGUIWidgetVersion = WidgetVersions[type] - else - objPools[type][newObj] = nil - -- if the widget is older then the latest, don't even try to reuse it - -- just forget about it, and grab a new one. - if not newObj.AceGUIWidgetVersion or newObj.AceGUIWidgetVersion < WidgetVersions[type] then - return newWidget(type) - end - end - return newObj - end - -- Releases an instance to the Pool - function delWidget(obj,type) - if not objPools[type] then - objPools[type] = {} - end - if objPools[type][obj] then - error("Attempt to Release Widget that is already released", 2) - end - objPools[type][obj] = true - end -end - - -------------------- --- API Functions -- -------------------- - --- Gets a widget Object - ---- Create a new Widget of the given type. --- This function will instantiate a new widget (or use one from the widget pool), and call the --- OnAcquire function on it, before returning. --- @param type The type of the widget. --- @return The newly created widget. -function AceGUI:Create(type) - if WidgetRegistry[type] then - local widget = newWidget(type) - - if rawget(widget, "Acquire") then - widget.OnAcquire = widget.Acquire - widget.Acquire = nil - elseif rawget(widget, "Aquire") then - widget.OnAcquire = widget.Aquire - widget.Aquire = nil - end - - if rawget(widget, "Release") then - widget.OnRelease = rawget(widget, "Release") - widget.Release = nil - end - - if widget.OnAcquire then - widget:OnAcquire() - else - error(("Widget type %s doesn't supply an OnAcquire Function"):format(type)) - end - -- Set the default Layout ("List") - safecall(widget.SetLayout, widget, "List") - safecall(widget.ResumeLayout, widget) - return widget - end -end - ---- Releases a widget Object. --- This function calls OnRelease on the widget and places it back in the widget pool. --- Any data on the widget is being erased, and the widget will be hidden.\\ --- If this widget is a Container-Widget, all of its Child-Widgets will be releases as well. --- @param widget The widget to release -function AceGUI:Release(widget) - safecall(widget.PauseLayout, widget) - widget:Fire("OnRelease") - safecall(widget.ReleaseChildren, widget) - - if widget.OnRelease then - widget:OnRelease() --- else --- error(("Widget type %s doesn't supply an OnRelease Function"):format(widget.type)) - end - for k in pairs(widget.userdata) do - widget.userdata[k] = nil - end - for k in pairs(widget.events) do - widget.events[k] = nil - end - widget.width = nil - widget.relWidth = nil - widget.height = nil - widget.relHeight = nil - widget.noAutoHeight = nil - widget.frame:ClearAllPoints() - widget.frame:Hide() - widget.frame:SetParent(UIParent) - widget.frame.width = nil - widget.frame.height = nil - if widget.content then - widget.content.width = nil - widget.content.height = nil - end - delWidget(widget, widget.type) -end - ------------ --- Focus -- ------------ - - ---- Called when a widget has taken focus. --- e.g. Dropdowns opening, Editboxes gaining kb focus --- @param widget The widget that should be focused -function AceGUI:SetFocus(widget) - if self.FocusedWidget and self.FocusedWidget ~= widget then - safecall(self.FocusedWidget.ClearFocus, self.FocusedWidget) - end - self.FocusedWidget = widget -end - - ---- Called when something has happened that could cause widgets with focus to drop it --- e.g. titlebar of a frame being clicked -function AceGUI:ClearFocus() - if self.FocusedWidget then - safecall(self.FocusedWidget.ClearFocus, self.FocusedWidget) - self.FocusedWidget = nil - end -end - -------------- --- Widgets -- -------------- ---[[ - Widgets must provide the following functions - OnAcquire() - Called when the object is acquired, should set everything to a default hidden state - - And the following members - frame - the frame or derivitive object that will be treated as the widget for size and anchoring purposes - type - the type of the object, same as the name given to :RegisterWidget() - - Widgets contain a table called userdata, this is a safe place to store data associated with the wigdet - It will be cleared automatically when a widget is released - Placing values directly into a widget object should be avoided - - If the Widget can act as a container for other Widgets the following - content - frame or derivitive that children will be anchored to - - The Widget can supply the following Optional Members - :OnRelease() - Called when the object is Released, should remove any additional anchors and clear any data - :OnWidthSet(width) - Called when the width of the widget is changed - :OnHeightSet(height) - Called when the height of the widget is changed - Widgets should not use the OnSizeChanged events of thier frame or content members, use these methods instead - AceGUI already sets a handler to the event - :LayoutFinished(width, height) - called after a layout has finished, the width and height will be the width and height of the - area used for controls. These can be nil if the layout used the existing size to layout the controls. - -]] - --------------------------- --- Widget Base Template -- --------------------------- -do - local WidgetBase = AceGUI.WidgetBase - - WidgetBase.SetParent = function(self, parent) - local frame = self.frame - frame:SetParent(nil) - frame:SetParent(parent.content) - self.parent = parent - end - - WidgetBase.SetCallback = function(self, name, func) - if type(func) == "function" then - self.events[name] = func - end - end - - WidgetBase.Fire = function(self, name, ...) - if self.events[name] then - local success, ret = safecall(self.events[name], self, name, ...) - if success then - return ret - end - end - end - - WidgetBase.SetWidth = function(self, width) - self.frame:SetWidth(width) - self.frame.width = width - if self.OnWidthSet then - self:OnWidthSet(width) - end - end - - WidgetBase.SetRelativeWidth = function(self, width) - if width <= 0 or width > 1 then - error(":SetRelativeWidth(width): Invalid relative width.", 2) - end - self.relWidth = width - self.width = "relative" - end - - WidgetBase.SetHeight = function(self, height) - self.frame:SetHeight(height) - self.frame.height = height - if self.OnHeightSet then - self:OnHeightSet(height) - end - end - - --[[ WidgetBase.SetRelativeHeight = function(self, height) - if height <= 0 or height > 1 then - error(":SetRelativeHeight(height): Invalid relative height.", 2) - end - self.relHeight = height - self.height = "relative" - end ]] - - WidgetBase.IsVisible = function(self) - return self.frame:IsVisible() - end - - WidgetBase.IsShown= function(self) - return self.frame:IsShown() - end - - WidgetBase.Release = function(self) - AceGUI:Release(self) - end - - WidgetBase.SetPoint = function(self, ...) - return self.frame:SetPoint(...) - end - - WidgetBase.ClearAllPoints = function(self) - return self.frame:ClearAllPoints() - end - - WidgetBase.GetNumPoints = function(self) - return self.frame:GetNumPoints() - end - - WidgetBase.GetPoint = function(self, ...) - return self.frame:GetPoint(...) - end - - WidgetBase.GetUserDataTable = function(self) - return self.userdata - end - - WidgetBase.SetUserData = function(self, key, value) - self.userdata[key] = value - end - - WidgetBase.GetUserData = function(self, key) - return self.userdata[key] - end - - WidgetBase.IsFullHeight = function(self) - return self.height == "fill" - end - - WidgetBase.SetFullHeight = function(self, isFull) - if isFull then - self.height = "fill" - else - self.height = nil - end - end - - WidgetBase.IsFullWidth = function(self) - return self.width == "fill" - end - - WidgetBase.SetFullWidth = function(self, isFull) - if isFull then - self.width = "fill" - else - self.width = nil - end - end - --- local function LayoutOnUpdate(this) --- this:SetScript("OnUpdate",nil) --- this.obj:PerformLayout() --- end - - local WidgetContainerBase = AceGUI.WidgetContainerBase - - WidgetContainerBase.PauseLayout = function(self) - self.LayoutPaused = true - end - - WidgetContainerBase.ResumeLayout = function(self) - self.LayoutPaused = nil - end - - WidgetContainerBase.PerformLayout = function(self) - if self.LayoutPaused then - return - end - safecall(self.LayoutFunc, self.content, self.children) - end - - --call this function to layout, makes sure layed out objects get a frame to get sizes etc - WidgetContainerBase.DoLayout = function(self) - self:PerformLayout() --- if not self.parent then --- self.frame:SetScript("OnUpdate", LayoutOnUpdate) --- end - end - - WidgetContainerBase.AddChild = function(self, child, beforeWidget) - if beforeWidget then - local siblingIndex = 1 - for _, widget in pairs(self.children) do - if widget == beforeWidget then - break - end - siblingIndex = siblingIndex + 1 - end - tinsert(self.children, siblingIndex, child) - else - tinsert(self.children, child) - end - child:SetParent(self) - child.frame:Show() - self:DoLayout() - end - - WidgetContainerBase.AddChildren = function(self, ...) - for i = 1, select("#", ...) do - local child = select(i, ...) - tinsert(self.children, child) - child:SetParent(self) - child.frame:Show() - end - self:DoLayout() - end - - WidgetContainerBase.ReleaseChildren = function(self) - local children = self.children - for i = 1,#children do - AceGUI:Release(children[i]) - children[i] = nil - end - end - - WidgetContainerBase.SetLayout = function(self, Layout) - self.LayoutFunc = AceGUI:GetLayout(Layout) - end - - WidgetContainerBase.SetAutoAdjustHeight = function(self, adjust) - if adjust then - self.noAutoHeight = nil - else - self.noAutoHeight = true - end - end - - local function FrameResize(this) - local self = this.obj - if this:GetWidth() and this:GetHeight() then - if self.OnWidthSet then - self:OnWidthSet(this:GetWidth()) - end - if self.OnHeightSet then - self:OnHeightSet(this:GetHeight()) - end - end - end - - local function ContentResize(this) - if this:GetWidth() and this:GetHeight() then - this.width = this:GetWidth() - this.height = this:GetHeight() - this.obj:DoLayout() - end - end - - setmetatable(WidgetContainerBase, {__index=WidgetBase}) - - --One of these function should be called on each Widget Instance as part of its creation process - - --- Register a widget-class as a container for newly created widgets. - -- @param widget The widget class - function AceGUI:RegisterAsContainer(widget) - widget.children = {} - widget.userdata = {} - widget.events = {} - widget.base = WidgetContainerBase - widget.content.obj = widget - widget.frame.obj = widget - widget.content:SetScript("OnSizeChanged", ContentResize) - widget.frame:SetScript("OnSizeChanged", FrameResize) - setmetatable(widget, {__index = WidgetContainerBase}) - widget:SetLayout("List") - return widget - end - - --- Register a widget-class as a widget. - -- @param widget The widget class - function AceGUI:RegisterAsWidget(widget) - widget.userdata = {} - widget.events = {} - widget.base = WidgetBase - widget.frame.obj = widget - widget.frame:SetScript("OnSizeChanged", FrameResize) - setmetatable(widget, {__index = WidgetBase}) - return widget - end -end - - - - ------------------- --- Widget API -- ------------------- - ---- Registers a widget Constructor, this function returns a new instance of the Widget --- @param Name The name of the widget --- @param Constructor The widget constructor function --- @param Version The version of the widget -function AceGUI:RegisterWidgetType(Name, Constructor, Version) - assert(type(Constructor) == "function") - assert(type(Version) == "number") - - local oldVersion = WidgetVersions[Name] - if oldVersion and oldVersion >= Version then return end - - WidgetVersions[Name] = Version - WidgetRegistry[Name] = Constructor -end - ---- Registers a Layout Function --- @param Name The name of the layout --- @param LayoutFunc Reference to the layout function -function AceGUI:RegisterLayout(Name, LayoutFunc) - assert(type(LayoutFunc) == "function") - if type(Name) == "string" then - Name = Name:upper() - end - LayoutRegistry[Name] = LayoutFunc -end - ---- Get a Layout Function from the registry --- @param Name The name of the layout -function AceGUI:GetLayout(Name) - if type(Name) == "string" then - Name = Name:upper() - end - return LayoutRegistry[Name] -end - -AceGUI.counts = AceGUI.counts or {} - ---- A type-based counter to count the number of widgets created. --- This is used by widgets that require a named frame, e.g. when a Blizzard --- Template requires it. --- @param type The widget type -function AceGUI:GetNextWidgetNum(type) - if not self.counts[type] then - self.counts[type] = 0 - end - self.counts[type] = self.counts[type] + 1 - return self.counts[type] -end - ---- Return the number of created widgets for this type. --- In contrast to GetNextWidgetNum, the number is not incremented. --- @param type The widget type -function AceGUI:GetWidgetCount(type) - return self.counts[type] or 0 -end - ---- Return the version of the currently registered widget type. --- @param type The widget type -function AceGUI:GetWidgetVersion(type) - return WidgetVersions[type] -end - -------------- --- Layouts -- -------------- - ---[[ - A Layout is a func that takes 2 parameters - content - the frame that widgets will be placed inside - children - a table containing the widgets to layout -]] - --- Very simple Layout, Children are stacked on top of each other down the left side -AceGUI:RegisterLayout("List", - function(content, children) - local height = 0 - local width = content.width or content:GetWidth() or 0 - for i = 1, #children do - local child = children[i] - - local frame = child.frame - frame:ClearAllPoints() - frame:Show() - if i == 1 then - frame:SetPoint("TOPLEFT", content) - else - frame:SetPoint("TOPLEFT", children[i-1].frame, "BOTTOMLEFT") - end - - if child.width == "fill" then - child:SetWidth(width) - frame:SetPoint("RIGHT", content) - - if child.DoLayout then - child:DoLayout() - end - elseif child.width == "relative" then - child:SetWidth(width * child.relWidth) - - if child.DoLayout then - child:DoLayout() - end - end - - height = height + (frame.height or frame:GetHeight() or 0) - end - safecall(content.obj.LayoutFinished, content.obj, nil, height) - end) - --- A single control fills the whole content area -AceGUI:RegisterLayout("Fill", - function(content, children) - if children[1] then - children[1]:SetWidth(content:GetWidth() or 0) - children[1]:SetHeight(content:GetHeight() or 0) - children[1].frame:SetAllPoints(content) - children[1].frame:Show() - safecall(content.obj.LayoutFinished, content.obj, nil, children[1].frame:GetHeight()) - end - end) - -AceGUI:RegisterLayout("Flow", - function(content, children) - --used height so far - local height = 0 - --width used in the current row - local usedwidth = 0 - --height of the current row - local rowheight = 0 - local rowoffset = 0 - local lastrowoffset - - local width = content.width or content:GetWidth() or 0 - - --control at the start of the row - local rowstart - local rowstartoffset - local lastrowstart - local isfullheight - - local frameoffset - local lastframeoffset - local oversize - for i = 1, #children do - local child = children[i] - oversize = nil - local frame = child.frame - local frameheight = frame.height or frame:GetHeight() or 0 - local framewidth = frame.width or frame:GetWidth() or 0 - lastframeoffset = frameoffset - -- HACK: Why did we set a frameoffset of (frameheight / 2) ? - -- That was moving all widgets half the widgets size down, is that intended? - -- Actually, it seems to be neccessary for many cases, we'll leave it in for now. - -- If widgets seem to anchor weirdly with this, provide a valid alignoffset for them. - -- TODO: Investigate moar! - frameoffset = child.alignoffset or (frameheight / 2) - - if child.width == "relative" then - framewidth = width * child.relWidth - end - - frame:Show() - frame:ClearAllPoints() - if i == 1 then - -- anchor the first control to the top left - frame:SetPoint("TOPLEFT", content) - rowheight = frameheight - rowoffset = frameoffset - rowstart = frame - rowstartoffset = frameoffset - usedwidth = framewidth - if usedwidth > width then - oversize = true - end - else - -- if there isn't available width for the control start a new row - -- if a control is "fill" it will be on a row of its own full width - if usedwidth == 0 or ((framewidth) + usedwidth > width) or child.width == "fill" then - if isfullheight then - -- a previous row has already filled the entire height, there's nothing we can usefully do anymore - -- (maybe error/warn about this?) - break - end - --anchor the previous row, we will now know its height and offset - rowstart:SetPoint("TOPLEFT", content, "TOPLEFT", 0, -(height + (rowoffset - rowstartoffset) + 3)) - height = height + rowheight + 3 - --save this as the rowstart so we can anchor it after the row is complete and we have the max height and offset of controls in it - rowstart = frame - rowstartoffset = frameoffset - rowheight = frameheight - rowoffset = frameoffset - usedwidth = framewidth - if usedwidth > width then - oversize = true - end - -- put the control on the current row, adding it to the width and checking if the height needs to be increased - else - --handles cases where the new height is higher than either control because of the offsets - --math.max(rowheight-rowoffset+frameoffset, frameheight-frameoffset+rowoffset) - - --offset is always the larger of the two offsets - rowoffset = math_max(rowoffset, frameoffset) - rowheight = math_max(rowheight, rowoffset + (frameheight / 2)) - - frame:SetPoint("TOPLEFT", children[i-1].frame, "TOPRIGHT", 0, frameoffset - lastframeoffset) - usedwidth = framewidth + usedwidth - end - end - - if child.width == "fill" then - child:SetWidth(width) - frame:SetPoint("RIGHT", content) - - usedwidth = 0 - rowstart = frame - rowstartoffset = frameoffset - - if child.DoLayout then - child:DoLayout() - end - rowheight = frame.height or frame:GetHeight() or 0 - rowoffset = child.alignoffset or (rowheight / 2) - rowstartoffset = rowoffset - elseif child.width == "relative" then - child:SetWidth(width * child.relWidth) - - if child.DoLayout then - child:DoLayout() - end - elseif oversize then - if width > 1 then - frame:SetPoint("RIGHT", content) - end - end - - if child.height == "fill" then - frame:SetPoint("BOTTOM", content) - isfullheight = true - end - end - - --anchor the last row, if its full height needs a special case since its height has just been changed by the anchor - if isfullheight then - rowstart:SetPoint("TOPLEFT", content, "TOPLEFT", 0, -height) - elseif rowstart then - rowstart:SetPoint("TOPLEFT", content, "TOPLEFT", 0, -(height + (rowoffset - rowstartoffset) + 3)) - end - - height = height + rowheight + 3 - safecall(content.obj.LayoutFinished, content.obj, nil, height) - end) +--- **AceGUI-3.0** provides access to numerous widgets which can be used to create GUIs. +-- AceGUI is used by AceConfigDialog to create the option GUIs, but you can use it by itself +-- to create any custom GUI. There are more extensive examples in the test suite in the Ace3 +-- stand-alone distribution. +-- +-- **Note**: When using AceGUI-3.0 directly, please do not modify the frames of the widgets directly, +-- as any "unknown" change to the widgets will cause addons that get your widget out of the widget pool +-- to misbehave. If you think some part of a widget should be modifiable, please open a ticket, and we"ll +-- implement a proper API to modify it. +-- @usage +-- local AceGUI = LibStub("AceGUI-3.0") +-- -- Create a container frame +-- local f = AceGUI:Create("Frame") +-- f:SetCallback("OnClose",function(widget) AceGUI:Release(widget) end) +-- f:SetTitle("AceGUI-3.0 Example") +-- f:SetStatusText("Status Bar") +-- f:SetLayout("Flow") +-- -- Create a button +-- local btn = AceGUI:Create("Button") +-- btn:SetWidth(170) +-- btn:SetText("Button !") +-- btn:SetCallback("OnClick", function() print("Click!") end) +-- -- Add the button to the container +-- f:AddChild(btn) +-- @class file +-- @name AceGUI-3.0 +-- @release $Id: AceGUI-3.0.lua 924 2010-05-13 15:12:20Z nevcairiel $ +local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 33 +local AceGUI, oldminor = LibStub:NewLibrary(ACEGUI_MAJOR, ACEGUI_MINOR) + +if not AceGUI then return end -- No upgrade needed + +-- Lua APIs +local tconcat, tremove, tinsert = table.concat, table.remove, table.insert +local select, pairs, next, type = select, pairs, next, type +local error, assert, loadstring = error, assert, loadstring +local setmetatable, rawget, rawset = setmetatable, rawget, rawset +local math_max = math.max + +-- WoW APIs +local UIParent = UIParent + +-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded +-- List them here for Mikk's FindGlobals script +-- GLOBALS: geterrorhandler, LibStub + +--local con = LibStub("AceConsole-3.0",true) + +AceGUI.WidgetRegistry = AceGUI.WidgetRegistry or {} +AceGUI.LayoutRegistry = AceGUI.LayoutRegistry or {} +AceGUI.WidgetBase = AceGUI.WidgetBase or {} +AceGUI.WidgetContainerBase = AceGUI.WidgetContainerBase or {} +AceGUI.WidgetVersions = AceGUI.WidgetVersions or {} + +-- local upvalues +local WidgetRegistry = AceGUI.WidgetRegistry +local LayoutRegistry = AceGUI.LayoutRegistry +local WidgetVersions = AceGUI.WidgetVersions + +--[[ + xpcall safecall implementation +]] +local xpcall = xpcall + +local function errorhandler(err) + return geterrorhandler()(err) +end + +local function CreateDispatcher(argCount) + local code = [[ + local xpcall, eh = ... + local method, ARGS + local function call() return method(ARGS) end + + local function dispatch(func, ...) + method = func + if not method then return end + ARGS = ... + return xpcall(call, eh) + end + + return dispatch + ]] + + local ARGS = {} + for i = 1, argCount do ARGS[i] = "arg"..i end + code = code:gsub("ARGS", tconcat(ARGS, ", ")) + return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(xpcall, errorhandler) +end + +local Dispatchers = setmetatable({}, {__index=function(self, argCount) + local dispatcher = CreateDispatcher(argCount) + rawset(self, argCount, dispatcher) + return dispatcher +end}) +Dispatchers[0] = function(func) + return xpcall(func, errorhandler) +end + +local function safecall(func, ...) + return Dispatchers[select("#", ...)](func, ...) +end + +-- Recycling functions +local newWidget, delWidget +do + -- Version Upgrade in Minor 29 + -- Internal Storage of the objects changed, from an array table + -- to a hash table, and additionally we introduced versioning on + -- the widgets which would discard all widgets from a pre-29 version + -- anyway, so we just clear the storage now, and don't try to + -- convert the storage tables to the new format. + -- This should generally not cause *many* widgets to end up in trash, + -- since once dialogs are opened, all addons should be loaded already + -- and AceGUI should be on the latest version available on the users + -- setup. + -- -- nevcairiel - Nov 2nd, 2009 + if oldminor and oldminor < 29 and AceGUI.objPools then + AceGUI.objPools = nil + end + + AceGUI.objPools = AceGUI.objPools or {} + local objPools = AceGUI.objPools + --Returns a new instance, if none are available either returns a new table or calls the given contructor + function newWidget(type) + if not WidgetRegistry[type] then + error("Attempt to instantiate unknown widget type", 2) + end + + if not objPools[type] then + objPools[type] = {} + end + + local newObj = next(objPools[type]) + if not newObj then + newObj = WidgetRegistry[type]() + newObj.AceGUIWidgetVersion = WidgetVersions[type] + else + objPools[type][newObj] = nil + -- if the widget is older then the latest, don't even try to reuse it + -- just forget about it, and grab a new one. + if not newObj.AceGUIWidgetVersion or newObj.AceGUIWidgetVersion < WidgetVersions[type] then + return newWidget(type) + end + end + return newObj + end + -- Releases an instance to the Pool + function delWidget(obj,type) + if not objPools[type] then + objPools[type] = {} + end + if objPools[type][obj] then + error("Attempt to Release Widget that is already released", 2) + end + objPools[type][obj] = true + end +end + + +------------------- +-- API Functions -- +------------------- + +-- Gets a widget Object + +--- Create a new Widget of the given type. +-- This function will instantiate a new widget (or use one from the widget pool), and call the +-- OnAcquire function on it, before returning. +-- @param type The type of the widget. +-- @return The newly created widget. +function AceGUI:Create(type) + if WidgetRegistry[type] then + local widget = newWidget(type) + + if rawget(widget, "Acquire") then + widget.OnAcquire = widget.Acquire + widget.Acquire = nil + elseif rawget(widget, "Aquire") then + widget.OnAcquire = widget.Aquire + widget.Aquire = nil + end + + if rawget(widget, "Release") then + widget.OnRelease = rawget(widget, "Release") + widget.Release = nil + end + + if widget.OnAcquire then + widget:OnAcquire() + else + error(("Widget type %s doesn't supply an OnAcquire Function"):format(type)) + end + -- Set the default Layout ("List") + safecall(widget.SetLayout, widget, "List") + safecall(widget.ResumeLayout, widget) + return widget + end +end + +--- Releases a widget Object. +-- This function calls OnRelease on the widget and places it back in the widget pool. +-- Any data on the widget is being erased, and the widget will be hidden.\\ +-- If this widget is a Container-Widget, all of its Child-Widgets will be releases as well. +-- @param widget The widget to release +function AceGUI:Release(widget) + safecall(widget.PauseLayout, widget) + widget:Fire("OnRelease") + safecall(widget.ReleaseChildren, widget) + + if widget.OnRelease then + widget:OnRelease() +-- else +-- error(("Widget type %s doesn't supply an OnRelease Function"):format(widget.type)) + end + for k in pairs(widget.userdata) do + widget.userdata[k] = nil + end + for k in pairs(widget.events) do + widget.events[k] = nil + end + widget.width = nil + widget.relWidth = nil + widget.height = nil + widget.relHeight = nil + widget.noAutoHeight = nil + widget.frame:ClearAllPoints() + widget.frame:Hide() + widget.frame:SetParent(UIParent) + widget.frame.width = nil + widget.frame.height = nil + if widget.content then + widget.content.width = nil + widget.content.height = nil + end + delWidget(widget, widget.type) +end + +----------- +-- Focus -- +----------- + + +--- Called when a widget has taken focus. +-- e.g. Dropdowns opening, Editboxes gaining kb focus +-- @param widget The widget that should be focused +function AceGUI:SetFocus(widget) + if self.FocusedWidget and self.FocusedWidget ~= widget then + safecall(self.FocusedWidget.ClearFocus, self.FocusedWidget) + end + self.FocusedWidget = widget +end + + +--- Called when something has happened that could cause widgets with focus to drop it +-- e.g. titlebar of a frame being clicked +function AceGUI:ClearFocus() + if self.FocusedWidget then + safecall(self.FocusedWidget.ClearFocus, self.FocusedWidget) + self.FocusedWidget = nil + end +end + +------------- +-- Widgets -- +------------- +--[[ + Widgets must provide the following functions + OnAcquire() - Called when the object is acquired, should set everything to a default hidden state + + And the following members + frame - the frame or derivitive object that will be treated as the widget for size and anchoring purposes + type - the type of the object, same as the name given to :RegisterWidget() + + Widgets contain a table called userdata, this is a safe place to store data associated with the wigdet + It will be cleared automatically when a widget is released + Placing values directly into a widget object should be avoided + + If the Widget can act as a container for other Widgets the following + content - frame or derivitive that children will be anchored to + + The Widget can supply the following Optional Members + :OnRelease() - Called when the object is Released, should remove any additional anchors and clear any data + :OnWidthSet(width) - Called when the width of the widget is changed + :OnHeightSet(height) - Called when the height of the widget is changed + Widgets should not use the OnSizeChanged events of thier frame or content members, use these methods instead + AceGUI already sets a handler to the event + :LayoutFinished(width, height) - called after a layout has finished, the width and height will be the width and height of the + area used for controls. These can be nil if the layout used the existing size to layout the controls. + +]] + +-------------------------- +-- Widget Base Template -- +-------------------------- +do + local WidgetBase = AceGUI.WidgetBase + + WidgetBase.SetParent = function(self, parent) + local frame = self.frame + frame:SetParent(nil) + frame:SetParent(parent.content) + self.parent = parent + end + + WidgetBase.SetCallback = function(self, name, func) + if type(func) == "function" then + self.events[name] = func + end + end + + WidgetBase.Fire = function(self, name, ...) + if self.events[name] then + local success, ret = safecall(self.events[name], self, name, ...) + if success then + return ret + end + end + end + + WidgetBase.SetWidth = function(self, width) + self.frame:SetWidth(width) + self.frame.width = width + if self.OnWidthSet then + self:OnWidthSet(width) + end + end + + WidgetBase.SetRelativeWidth = function(self, width) + if width <= 0 or width > 1 then + error(":SetRelativeWidth(width): Invalid relative width.", 2) + end + self.relWidth = width + self.width = "relative" + end + + WidgetBase.SetHeight = function(self, height) + self.frame:SetHeight(height) + self.frame.height = height + if self.OnHeightSet then + self:OnHeightSet(height) + end + end + + --[[ WidgetBase.SetRelativeHeight = function(self, height) + if height <= 0 or height > 1 then + error(":SetRelativeHeight(height): Invalid relative height.", 2) + end + self.relHeight = height + self.height = "relative" + end ]] + + WidgetBase.IsVisible = function(self) + return self.frame:IsVisible() + end + + WidgetBase.IsShown= function(self) + return self.frame:IsShown() + end + + WidgetBase.Release = function(self) + AceGUI:Release(self) + end + + WidgetBase.SetPoint = function(self, ...) + return self.frame:SetPoint(...) + end + + WidgetBase.ClearAllPoints = function(self) + return self.frame:ClearAllPoints() + end + + WidgetBase.GetNumPoints = function(self) + return self.frame:GetNumPoints() + end + + WidgetBase.GetPoint = function(self, ...) + return self.frame:GetPoint(...) + end + + WidgetBase.GetUserDataTable = function(self) + return self.userdata + end + + WidgetBase.SetUserData = function(self, key, value) + self.userdata[key] = value + end + + WidgetBase.GetUserData = function(self, key) + return self.userdata[key] + end + + WidgetBase.IsFullHeight = function(self) + return self.height == "fill" + end + + WidgetBase.SetFullHeight = function(self, isFull) + if isFull then + self.height = "fill" + else + self.height = nil + end + end + + WidgetBase.IsFullWidth = function(self) + return self.width == "fill" + end + + WidgetBase.SetFullWidth = function(self, isFull) + if isFull then + self.width = "fill" + else + self.width = nil + end + end + +-- local function LayoutOnUpdate(this) +-- this:SetScript("OnUpdate",nil) +-- this.obj:PerformLayout() +-- end + + local WidgetContainerBase = AceGUI.WidgetContainerBase + + WidgetContainerBase.PauseLayout = function(self) + self.LayoutPaused = true + end + + WidgetContainerBase.ResumeLayout = function(self) + self.LayoutPaused = nil + end + + WidgetContainerBase.PerformLayout = function(self) + if self.LayoutPaused then + return + end + safecall(self.LayoutFunc, self.content, self.children) + end + + --call this function to layout, makes sure layed out objects get a frame to get sizes etc + WidgetContainerBase.DoLayout = function(self) + self:PerformLayout() +-- if not self.parent then +-- self.frame:SetScript("OnUpdate", LayoutOnUpdate) +-- end + end + + WidgetContainerBase.AddChild = function(self, child, beforeWidget) + if beforeWidget then + local siblingIndex = 1 + for _, widget in pairs(self.children) do + if widget == beforeWidget then + break + end + siblingIndex = siblingIndex + 1 + end + tinsert(self.children, siblingIndex, child) + else + tinsert(self.children, child) + end + child:SetParent(self) + child.frame:Show() + self:DoLayout() + end + + WidgetContainerBase.AddChildren = function(self, ...) + for i = 1, select("#", ...) do + local child = select(i, ...) + tinsert(self.children, child) + child:SetParent(self) + child.frame:Show() + end + self:DoLayout() + end + + WidgetContainerBase.ReleaseChildren = function(self) + local children = self.children + for i = 1,#children do + AceGUI:Release(children[i]) + children[i] = nil + end + end + + WidgetContainerBase.SetLayout = function(self, Layout) + self.LayoutFunc = AceGUI:GetLayout(Layout) + end + + WidgetContainerBase.SetAutoAdjustHeight = function(self, adjust) + if adjust then + self.noAutoHeight = nil + else + self.noAutoHeight = true + end + end + + local function FrameResize(this) + local self = this.obj + if this:GetWidth() and this:GetHeight() then + if self.OnWidthSet then + self:OnWidthSet(this:GetWidth()) + end + if self.OnHeightSet then + self:OnHeightSet(this:GetHeight()) + end + end + end + + local function ContentResize(this) + if this:GetWidth() and this:GetHeight() then + this.width = this:GetWidth() + this.height = this:GetHeight() + this.obj:DoLayout() + end + end + + setmetatable(WidgetContainerBase, {__index=WidgetBase}) + + --One of these function should be called on each Widget Instance as part of its creation process + + --- Register a widget-class as a container for newly created widgets. + -- @param widget The widget class + function AceGUI:RegisterAsContainer(widget) + widget.children = {} + widget.userdata = {} + widget.events = {} + widget.base = WidgetContainerBase + widget.content.obj = widget + widget.frame.obj = widget + widget.content:SetScript("OnSizeChanged", ContentResize) + widget.frame:SetScript("OnSizeChanged", FrameResize) + setmetatable(widget, {__index = WidgetContainerBase}) + widget:SetLayout("List") + return widget + end + + --- Register a widget-class as a widget. + -- @param widget The widget class + function AceGUI:RegisterAsWidget(widget) + widget.userdata = {} + widget.events = {} + widget.base = WidgetBase + widget.frame.obj = widget + widget.frame:SetScript("OnSizeChanged", FrameResize) + setmetatable(widget, {__index = WidgetBase}) + return widget + end +end + + + + +------------------ +-- Widget API -- +------------------ + +--- Registers a widget Constructor, this function returns a new instance of the Widget +-- @param Name The name of the widget +-- @param Constructor The widget constructor function +-- @param Version The version of the widget +function AceGUI:RegisterWidgetType(Name, Constructor, Version) + assert(type(Constructor) == "function") + assert(type(Version) == "number") + + local oldVersion = WidgetVersions[Name] + if oldVersion and oldVersion >= Version then return end + + WidgetVersions[Name] = Version + WidgetRegistry[Name] = Constructor +end + +--- Registers a Layout Function +-- @param Name The name of the layout +-- @param LayoutFunc Reference to the layout function +function AceGUI:RegisterLayout(Name, LayoutFunc) + assert(type(LayoutFunc) == "function") + if type(Name) == "string" then + Name = Name:upper() + end + LayoutRegistry[Name] = LayoutFunc +end + +--- Get a Layout Function from the registry +-- @param Name The name of the layout +function AceGUI:GetLayout(Name) + if type(Name) == "string" then + Name = Name:upper() + end + return LayoutRegistry[Name] +end + +AceGUI.counts = AceGUI.counts or {} + +--- A type-based counter to count the number of widgets created. +-- This is used by widgets that require a named frame, e.g. when a Blizzard +-- Template requires it. +-- @param type The widget type +function AceGUI:GetNextWidgetNum(type) + if not self.counts[type] then + self.counts[type] = 0 + end + self.counts[type] = self.counts[type] + 1 + return self.counts[type] +end + +--- Return the number of created widgets for this type. +-- In contrast to GetNextWidgetNum, the number is not incremented. +-- @param type The widget type +function AceGUI:GetWidgetCount(type) + return self.counts[type] or 0 +end + +--- Return the version of the currently registered widget type. +-- @param type The widget type +function AceGUI:GetWidgetVersion(type) + return WidgetVersions[type] +end + +------------- +-- Layouts -- +------------- + +--[[ + A Layout is a func that takes 2 parameters + content - the frame that widgets will be placed inside + children - a table containing the widgets to layout +]] + +-- Very simple Layout, Children are stacked on top of each other down the left side +AceGUI:RegisterLayout("List", + function(content, children) + local height = 0 + local width = content.width or content:GetWidth() or 0 + for i = 1, #children do + local child = children[i] + + local frame = child.frame + frame:ClearAllPoints() + frame:Show() + if i == 1 then + frame:SetPoint("TOPLEFT", content) + else + frame:SetPoint("TOPLEFT", children[i-1].frame, "BOTTOMLEFT") + end + + if child.width == "fill" then + child:SetWidth(width) + frame:SetPoint("RIGHT", content) + + if child.DoLayout then + child:DoLayout() + end + elseif child.width == "relative" then + child:SetWidth(width * child.relWidth) + + if child.DoLayout then + child:DoLayout() + end + end + + height = height + (frame.height or frame:GetHeight() or 0) + end + safecall(content.obj.LayoutFinished, content.obj, nil, height) + end) + +-- A single control fills the whole content area +AceGUI:RegisterLayout("Fill", + function(content, children) + if children[1] then + children[1]:SetWidth(content:GetWidth() or 0) + children[1]:SetHeight(content:GetHeight() or 0) + children[1].frame:SetAllPoints(content) + children[1].frame:Show() + safecall(content.obj.LayoutFinished, content.obj, nil, children[1].frame:GetHeight()) + end + end) + +AceGUI:RegisterLayout("Flow", + function(content, children) + --used height so far + local height = 0 + --width used in the current row + local usedwidth = 0 + --height of the current row + local rowheight = 0 + local rowoffset = 0 + local lastrowoffset + + local width = content.width or content:GetWidth() or 0 + + --control at the start of the row + local rowstart + local rowstartoffset + local lastrowstart + local isfullheight + + local frameoffset + local lastframeoffset + local oversize + for i = 1, #children do + local child = children[i] + oversize = nil + local frame = child.frame + local frameheight = frame.height or frame:GetHeight() or 0 + local framewidth = frame.width or frame:GetWidth() or 0 + lastframeoffset = frameoffset + -- HACK: Why did we set a frameoffset of (frameheight / 2) ? + -- That was moving all widgets half the widgets size down, is that intended? + -- Actually, it seems to be neccessary for many cases, we'll leave it in for now. + -- If widgets seem to anchor weirdly with this, provide a valid alignoffset for them. + -- TODO: Investigate moar! + frameoffset = child.alignoffset or (frameheight / 2) + + if child.width == "relative" then + framewidth = width * child.relWidth + end + + frame:Show() + frame:ClearAllPoints() + if i == 1 then + -- anchor the first control to the top left + frame:SetPoint("TOPLEFT", content) + rowheight = frameheight + rowoffset = frameoffset + rowstart = frame + rowstartoffset = frameoffset + usedwidth = framewidth + if usedwidth > width then + oversize = true + end + else + -- if there isn't available width for the control start a new row + -- if a control is "fill" it will be on a row of its own full width + if usedwidth == 0 or ((framewidth) + usedwidth > width) or child.width == "fill" then + if isfullheight then + -- a previous row has already filled the entire height, there's nothing we can usefully do anymore + -- (maybe error/warn about this?) + break + end + --anchor the previous row, we will now know its height and offset + rowstart:SetPoint("TOPLEFT", content, "TOPLEFT", 0, -(height + (rowoffset - rowstartoffset) + 3)) + height = height + rowheight + 3 + --save this as the rowstart so we can anchor it after the row is complete and we have the max height and offset of controls in it + rowstart = frame + rowstartoffset = frameoffset + rowheight = frameheight + rowoffset = frameoffset + usedwidth = framewidth + if usedwidth > width then + oversize = true + end + -- put the control on the current row, adding it to the width and checking if the height needs to be increased + else + --handles cases where the new height is higher than either control because of the offsets + --math.max(rowheight-rowoffset+frameoffset, frameheight-frameoffset+rowoffset) + + --offset is always the larger of the two offsets + rowoffset = math_max(rowoffset, frameoffset) + rowheight = math_max(rowheight, rowoffset + (frameheight / 2)) + + frame:SetPoint("TOPLEFT", children[i-1].frame, "TOPRIGHT", 0, frameoffset - lastframeoffset) + usedwidth = framewidth + usedwidth + end + end + + if child.width == "fill" then + child:SetWidth(width) + frame:SetPoint("RIGHT", content) + + usedwidth = 0 + rowstart = frame + rowstartoffset = frameoffset + + if child.DoLayout then + child:DoLayout() + end + rowheight = frame.height or frame:GetHeight() or 0 + rowoffset = child.alignoffset or (rowheight / 2) + rowstartoffset = rowoffset + elseif child.width == "relative" then + child:SetWidth(width * child.relWidth) + + if child.DoLayout then + child:DoLayout() + end + elseif oversize then + if width > 1 then + frame:SetPoint("RIGHT", content) + end + end + + if child.height == "fill" then + frame:SetPoint("BOTTOM", content) + isfullheight = true + end + end + + --anchor the last row, if its full height needs a special case since its height has just been changed by the anchor + if isfullheight then + rowstart:SetPoint("TOPLEFT", content, "TOPLEFT", 0, -height) + elseif rowstart then + rowstart:SetPoint("TOPLEFT", content, "TOPLEFT", 0, -(height + (rowoffset - rowstartoffset) + 3)) + end + + height = height + rowheight + 3 + safecall(content.obj.LayoutFinished, content.obj, nil, height) + end) diff --git a/libs/AceGUI-3.0/AceGUI-3.0.xml b/libs/AceGUI-3.0/AceGUI-3.0.xml old mode 100644 new mode 100755 index ae22c90..b515077 --- a/libs/AceGUI-3.0/AceGUI-3.0.xml +++ b/libs/AceGUI-3.0/AceGUI-3.0.xml @@ -1,28 +1,28 @@ -<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ -..\FrameXML\UI.xsd"> - <Script file="AceGUI-3.0.lua"/> - <!-- Container --> - <Script file="widgets\AceGUIContainer-BlizOptionsGroup.lua"/> - <Script file="widgets\AceGUIContainer-DropDownGroup.lua"/> - <Script file="widgets\AceGUIContainer-Frame.lua"/> - <Script file="widgets\AceGUIContainer-InlineGroup.lua"/> - <Script file="widgets\AceGUIContainer-ScrollFrame.lua"/> - <Script file="widgets\AceGUIContainer-SimpleGroup.lua"/> - <Script file="widgets\AceGUIContainer-TabGroup.lua"/> - <Script file="widgets\AceGUIContainer-TreeGroup.lua"/> - <Script file="widgets\AceGUIContainer-Window.lua"/> - <!-- Widgets --> - <Script file="widgets\AceGUIWidget-Button.lua"/> - <Script file="widgets\AceGUIWidget-CheckBox.lua"/> - <Script file="widgets\AceGUIWidget-ColorPicker.lua"/> - <Script file="widgets\AceGUIWidget-DropDown.lua"/> - <Script file="widgets\AceGUIWidget-DropDown-Items.lua"/> - <Script file="widgets\AceGUIWidget-EditBox.lua"/> - <Script file="widgets\AceGUIWidget-Heading.lua"/> - <Script file="widgets\AceGUIWidget-Icon.lua"/> - <Script file="widgets\AceGUIWidget-InteractiveLabel.lua"/> - <Script file="widgets\AceGUIWidget-Keybinding.lua"/> - <Script file="widgets\AceGUIWidget-Label.lua"/> - <Script file="widgets\AceGUIWidget-MultiLineEditBox.lua"/> - <Script file="widgets\AceGUIWidget-Slider.lua"/> -</Ui> +<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ +..\FrameXML\UI.xsd"> + <Script file="AceGUI-3.0.lua"/> + <!-- Container --> + <Script file="widgets\AceGUIContainer-BlizOptionsGroup.lua"/> + <Script file="widgets\AceGUIContainer-DropDownGroup.lua"/> + <Script file="widgets\AceGUIContainer-Frame.lua"/> + <Script file="widgets\AceGUIContainer-InlineGroup.lua"/> + <Script file="widgets\AceGUIContainer-ScrollFrame.lua"/> + <Script file="widgets\AceGUIContainer-SimpleGroup.lua"/> + <Script file="widgets\AceGUIContainer-TabGroup.lua"/> + <Script file="widgets\AceGUIContainer-TreeGroup.lua"/> + <Script file="widgets\AceGUIContainer-Window.lua"/> + <!-- Widgets --> + <Script file="widgets\AceGUIWidget-Button.lua"/> + <Script file="widgets\AceGUIWidget-CheckBox.lua"/> + <Script file="widgets\AceGUIWidget-ColorPicker.lua"/> + <Script file="widgets\AceGUIWidget-DropDown.lua"/> + <Script file="widgets\AceGUIWidget-DropDown-Items.lua"/> + <Script file="widgets\AceGUIWidget-EditBox.lua"/> + <Script file="widgets\AceGUIWidget-Heading.lua"/> + <Script file="widgets\AceGUIWidget-Icon.lua"/> + <Script file="widgets\AceGUIWidget-InteractiveLabel.lua"/> + <Script file="widgets\AceGUIWidget-Keybinding.lua"/> + <Script file="widgets\AceGUIWidget-Label.lua"/> + <Script file="widgets\AceGUIWidget-MultiLineEditBox.lua"/> + <Script file="widgets\AceGUIWidget-Slider.lua"/> +</Ui> diff --git a/libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua b/libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua old mode 100644 new mode 100755 index eba9cb0..7f92d82 --- a/libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua @@ -1,133 +1,133 @@ ---[[----------------------------------------------------------------------------- -BlizOptionsGroup Container -Simple container widget for the integration of AceGUI into the Blizzard Interface Options --------------------------------------------------------------------------------]] -local Type, Version = "BlizOptionsGroup", 20 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local pairs = pairs - --- WoW APIs -local CreateFrame = CreateFrame - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] - -local function OnShow(frame) - frame.obj:Fire("OnShow") -end - -local function OnHide(frame) - frame.obj:Fire("OnHide") -end - ---[[----------------------------------------------------------------------------- -Support functions --------------------------------------------------------------------------------]] - -local function okay(frame) - frame.obj:Fire("okay") -end - -local function cancel(frame) - frame.obj:Fire("cancel") -end - -local function defaults(frame) - frame.obj:Fire("defaults") -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] - -local methods = { - ["OnAcquire"] = function(self) - self:SetName() - self:SetTitle() - end, - - -- ["OnRelease"] = nil, - - ["OnWidthSet"] = function(self, width) - local content = self.content - local contentwidth = width - 63 - if contentwidth < 0 then - contentwidth = 0 - end - content:SetWidth(contentwidth) - content.width = contentwidth - end, - - ["OnHeightSet"] = function(self, height) - local content = self.content - local contentheight = height - 26 - if contentheight < 0 then - contentheight = 0 - end - content:SetHeight(contentheight) - content.height = contentheight - end, - - ["SetName"] = function(self, name, parent) - self.frame.name = name - self.frame.parent = parent - end, - - ["SetTitle"] = function(self, title) - local content = self.content - content:ClearAllPoints() - if not title or title == "" then - content:SetPoint("TOPLEFT", 10, -10) - self.label:SetText("") - else - content:SetPoint("TOPLEFT", 10, -40) - self.label:SetText(title) - end - content:SetPoint("BOTTOMRIGHT", -10, 10) - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local function Constructor() - local frame = CreateFrame("Frame") - frame:Hide() - - -- support functions for the Blizzard Interface Options - frame.okay = okay - frame.cancel = cancel - frame.defaults = defaults - - frame:SetScript("OnHide", OnHide) - frame:SetScript("OnShow", OnShow) - - local label = frame:CreateFontString(nil, "OVERLAY", "GameFontNormalLarge") - label:SetPoint("TOPLEFT", 10, -15) - label:SetPoint("BOTTOMRIGHT", frame, "TOPRIGHT", 10, -45) - label:SetJustifyH("LEFT") - label:SetJustifyV("TOP") - - --Container Support - local content = CreateFrame("Frame", nil, frame) - content:SetPoint("TOPLEFT", 10, -10) - content:SetPoint("BOTTOMRIGHT", -10, 10) - - local widget = { - label = label, - frame = frame, - content = content, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - - return AceGUI:RegisterAsContainer(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) +--[[----------------------------------------------------------------------------- +BlizOptionsGroup Container +Simple container widget for the integration of AceGUI into the Blizzard Interface Options +-------------------------------------------------------------------------------]] +local Type, Version = "BlizOptionsGroup", 20 +local AceGUI = LibStub and LibStub("AceGUI-3.0", true) +if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end + +-- Lua APIs +local pairs = pairs + +-- WoW APIs +local CreateFrame = CreateFrame + +--[[----------------------------------------------------------------------------- +Scripts +-------------------------------------------------------------------------------]] + +local function OnShow(frame) + frame.obj:Fire("OnShow") +end + +local function OnHide(frame) + frame.obj:Fire("OnHide") +end + +--[[----------------------------------------------------------------------------- +Support functions +-------------------------------------------------------------------------------]] + +local function okay(frame) + frame.obj:Fire("okay") +end + +local function cancel(frame) + frame.obj:Fire("cancel") +end + +local function defaults(frame) + frame.obj:Fire("defaults") +end + +--[[----------------------------------------------------------------------------- +Methods +-------------------------------------------------------------------------------]] + +local methods = { + ["OnAcquire"] = function(self) + self:SetName() + self:SetTitle() + end, + + -- ["OnRelease"] = nil, + + ["OnWidthSet"] = function(self, width) + local content = self.content + local contentwidth = width - 63 + if contentwidth < 0 then + contentwidth = 0 + end + content:SetWidth(contentwidth) + content.width = contentwidth + end, + + ["OnHeightSet"] = function(self, height) + local content = self.content + local contentheight = height - 26 + if contentheight < 0 then + contentheight = 0 + end + content:SetHeight(contentheight) + content.height = contentheight + end, + + ["SetName"] = function(self, name, parent) + self.frame.name = name + self.frame.parent = parent + end, + + ["SetTitle"] = function(self, title) + local content = self.content + content:ClearAllPoints() + if not title or title == "" then + content:SetPoint("TOPLEFT", 10, -10) + self.label:SetText("") + else + content:SetPoint("TOPLEFT", 10, -40) + self.label:SetText(title) + end + content:SetPoint("BOTTOMRIGHT", -10, 10) + end +} + +--[[----------------------------------------------------------------------------- +Constructor +-------------------------------------------------------------------------------]] +local function Constructor() + local frame = CreateFrame("Frame") + frame:Hide() + + -- support functions for the Blizzard Interface Options + frame.okay = okay + frame.cancel = cancel + frame.defaults = defaults + + frame:SetScript("OnHide", OnHide) + frame:SetScript("OnShow", OnShow) + + local label = frame:CreateFontString(nil, "OVERLAY", "GameFontNormalLarge") + label:SetPoint("TOPLEFT", 10, -15) + label:SetPoint("BOTTOMRIGHT", frame, "TOPRIGHT", 10, -45) + label:SetJustifyH("LEFT") + label:SetJustifyV("TOP") + + --Container Support + local content = CreateFrame("Frame", nil, frame) + content:SetPoint("TOPLEFT", 10, -10) + content:SetPoint("BOTTOMRIGHT", -10, 10) + + local widget = { + label = label, + frame = frame, + content = content, + type = Type + } + for method, func in pairs(methods) do + widget[method] = func + end + + return AceGUI:RegisterAsContainer(widget) +end + +AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua b/libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua old mode 100644 new mode 100755 index 18e49cb..b0f81b7 --- a/libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua @@ -1,157 +1,157 @@ ---[[----------------------------------------------------------------------------- -DropdownGroup Container -Container controlled by a dropdown on the top. --------------------------------------------------------------------------------]] -local Type, Version = "DropdownGroup", 21 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local assert, pairs, type = assert, pairs, type - --- WoW APIs -local CreateFrame = CreateFrame - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function SelectedGroup(self, event, value) - local group = self.parentgroup - local status = group.status or group.localstatus - status.selected = value - self.parentgroup:Fire("OnGroupSelected", value) -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self.dropdown:SetText("") - self:SetDropdownWidth(200) - self:SetTitle("") - end, - - ["OnRelease"] = function(self) - self.dropdown.list = nil - self.status = nil - for k in pairs(self.localstatus) do - self.localstatus[k] = nil - end - end, - - ["SetTitle"] = function(self, title) - self.titletext:SetText(title) - self.dropdown.frame:ClearAllPoints() - if title and title ~= "" then - self.dropdown.frame:SetPoint("TOPRIGHT", -2, 0) - else - self.dropdown.frame:SetPoint("TOPLEFT", -1, 0) - end - end, - - ["SetGroupList"] = function(self,list,order) - self.dropdown:SetList(list,order) - end, - - ["SetStatusTable"] = function(self, status) - assert(type(status) == "table") - self.status = status - end, - - ["SetGroup"] = function(self,group) - self.dropdown:SetValue(group) - local status = self.status or self.localstatus - status.selected = group - self:Fire("OnGroupSelected", group) - end, - - ["OnWidthSet"] = function(self, width) - local content = self.content - local contentwidth = width - 26 - if contentwidth < 0 then - contentwidth = 0 - end - content:SetWidth(contentwidth) - content.width = contentwidth - end, - - ["OnHeightSet"] = function(self, height) - local content = self.content - local contentheight = height - 63 - if contentheight < 0 then - contentheight = 0 - end - content:SetHeight(contentheight) - content.height = contentheight - end, - - ["LayoutFinished"] = function(self, width, height) - self:SetHeight((height or 0) + 63) - end, - - ["SetDropdownWidth"] = function(self, width) - self.dropdown:SetWidth(width) - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local PaneBackdrop = { - bgFile = "Interface\\ChatFrame\\ChatFrameBackground", - edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border", - tile = true, tileSize = 16, edgeSize = 16, - insets = { left = 3, right = 3, top = 5, bottom = 3 } -} - -local function Constructor() - local frame = CreateFrame("Frame") - frame:SetHeight(100) - frame:SetWidth(100) - frame:SetFrameStrata("FULLSCREEN_DIALOG") - - local titletext = frame:CreateFontString(nil, "OVERLAY", "GameFontNormal") - titletext:SetPoint("TOPLEFT", 4, -5) - titletext:SetPoint("TOPRIGHT", -4, -5) - titletext:SetJustifyH("LEFT") - titletext:SetHeight(18) - - local dropdown = AceGUI:Create("Dropdown") - dropdown.frame:SetParent(frame) - dropdown.frame:SetFrameLevel(dropdown.frame:GetFrameLevel() + 2) - dropdown:SetCallback("OnValueChanged", SelectedGroup) - dropdown.frame:SetPoint("TOPLEFT", -1, 0) - dropdown.frame:Show() - dropdown:SetLabel("") - - local border = CreateFrame("Frame", nil, frame) - border:SetPoint("TOPLEFT", 0, -26) - border:SetPoint("BOTTOMRIGHT", 0, 3) - border:SetBackdrop(PaneBackdrop) - border:SetBackdropColor(0.1,0.1,0.1,0.5) - border:SetBackdropBorderColor(0.4,0.4,0.4) - - --Container Support - local content = CreateFrame("Frame", nil, border) - content:SetPoint("TOPLEFT", 10, -10) - content:SetPoint("BOTTOMRIGHT", -10, 10) - - local widget = { - frame = frame, - localstatus = {}, - titletext = titletext, - dropdown = dropdown, - border = border, - content = content, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - dropdown.parentgroup = widget - - return AceGUI:RegisterAsContainer(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) +--[[----------------------------------------------------------------------------- +DropdownGroup Container +Container controlled by a dropdown on the top. +-------------------------------------------------------------------------------]] +local Type, Version = "DropdownGroup", 21 +local AceGUI = LibStub and LibStub("AceGUI-3.0", true) +if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end + +-- Lua APIs +local assert, pairs, type = assert, pairs, type + +-- WoW APIs +local CreateFrame = CreateFrame + +--[[----------------------------------------------------------------------------- +Scripts +-------------------------------------------------------------------------------]] +local function SelectedGroup(self, event, value) + local group = self.parentgroup + local status = group.status or group.localstatus + status.selected = value + self.parentgroup:Fire("OnGroupSelected", value) +end + +--[[----------------------------------------------------------------------------- +Methods +-------------------------------------------------------------------------------]] +local methods = { + ["OnAcquire"] = function(self) + self.dropdown:SetText("") + self:SetDropdownWidth(200) + self:SetTitle("") + end, + + ["OnRelease"] = function(self) + self.dropdown.list = nil + self.status = nil + for k in pairs(self.localstatus) do + self.localstatus[k] = nil + end + end, + + ["SetTitle"] = function(self, title) + self.titletext:SetText(title) + self.dropdown.frame:ClearAllPoints() + if title and title ~= "" then + self.dropdown.frame:SetPoint("TOPRIGHT", -2, 0) + else + self.dropdown.frame:SetPoint("TOPLEFT", -1, 0) + end + end, + + ["SetGroupList"] = function(self,list,order) + self.dropdown:SetList(list,order) + end, + + ["SetStatusTable"] = function(self, status) + assert(type(status) == "table") + self.status = status + end, + + ["SetGroup"] = function(self,group) + self.dropdown:SetValue(group) + local status = self.status or self.localstatus + status.selected = group + self:Fire("OnGroupSelected", group) + end, + + ["OnWidthSet"] = function(self, width) + local content = self.content + local contentwidth = width - 26 + if contentwidth < 0 then + contentwidth = 0 + end + content:SetWidth(contentwidth) + content.width = contentwidth + end, + + ["OnHeightSet"] = function(self, height) + local content = self.content + local contentheight = height - 63 + if contentheight < 0 then + contentheight = 0 + end + content:SetHeight(contentheight) + content.height = contentheight + end, + + ["LayoutFinished"] = function(self, width, height) + self:SetHeight((height or 0) + 63) + end, + + ["SetDropdownWidth"] = function(self, width) + self.dropdown:SetWidth(width) + end +} + +--[[----------------------------------------------------------------------------- +Constructor +-------------------------------------------------------------------------------]] +local PaneBackdrop = { + bgFile = "Interface\\ChatFrame\\ChatFrameBackground", + edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border", + tile = true, tileSize = 16, edgeSize = 16, + insets = { left = 3, right = 3, top = 5, bottom = 3 } +} + +local function Constructor() + local frame = CreateFrame("Frame") + frame:SetHeight(100) + frame:SetWidth(100) + frame:SetFrameStrata("FULLSCREEN_DIALOG") + + local titletext = frame:CreateFontString(nil, "OVERLAY", "GameFontNormal") + titletext:SetPoint("TOPLEFT", 4, -5) + titletext:SetPoint("TOPRIGHT", -4, -5) + titletext:SetJustifyH("LEFT") + titletext:SetHeight(18) + + local dropdown = AceGUI:Create("Dropdown") + dropdown.frame:SetParent(frame) + dropdown.frame:SetFrameLevel(dropdown.frame:GetFrameLevel() + 2) + dropdown:SetCallback("OnValueChanged", SelectedGroup) + dropdown.frame:SetPoint("TOPLEFT", -1, 0) + dropdown.frame:Show() + dropdown:SetLabel("") + + local border = CreateFrame("Frame", nil, frame) + border:SetPoint("TOPLEFT", 0, -26) + border:SetPoint("BOTTOMRIGHT", 0, 3) + border:SetBackdrop(PaneBackdrop) + border:SetBackdropColor(0.1,0.1,0.1,0.5) + border:SetBackdropBorderColor(0.4,0.4,0.4) + + --Container Support + local content = CreateFrame("Frame", nil, border) + content:SetPoint("TOPLEFT", 10, -10) + content:SetPoint("BOTTOMRIGHT", -10, 10) + + local widget = { + frame = frame, + localstatus = {}, + titletext = titletext, + dropdown = dropdown, + border = border, + content = content, + type = Type + } + for method, func in pairs(methods) do + widget[method] = func + end + dropdown.parentgroup = widget + + return AceGUI:RegisterAsContainer(widget) +end + +AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua b/libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua old mode 100644 new mode 100755 index a656f3c..0dae68c --- a/libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua @@ -1,300 +1,311 @@ ---[[----------------------------------------------------------------------------- -Frame Container --------------------------------------------------------------------------------]] -local Type, Version = "Frame", 22 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local pairs, assert, type = pairs, assert, type -local wipe = table.wipe - --- WoW APIs -local PlaySound = PlaySound -local CreateFrame, UIParent = CreateFrame, UIParent - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: CLOSE - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function Button_OnClick(frame) - PlaySound("gsTitleOptionExit") - frame.obj:Hide() -end - -local function Frame_OnClose(frame) - frame.obj:Fire("OnClose") -end - -local function Frame_OnMouseDown(frame) - AceGUI:ClearFocus() -end - -local function Title_OnMouseDown(frame) - frame:GetParent():StartMoving() - AceGUI:ClearFocus() -end - -local function MoverSizer_OnMouseUp(mover) - local frame = mover:GetParent() - frame:StopMovingOrSizing() - local self = frame.obj - local status = self.status or self.localstatus - status.width = frame:GetWidth() - status.height = frame:GetHeight() - status.top = frame:GetTop() - status.left = frame:GetLeft() -end - -local function SizerSE_OnMouseDown(frame) - frame:GetParent():StartSizing("BOTTOMRIGHT") - AceGUI:ClearFocus() -end - -local function SizerS_OnMouseDown(frame) - frame:GetParent():StartSizing("BOTTOM") - AceGUI:ClearFocus() -end - -local function SizerE_OnMouseDown(frame) - frame:GetParent():StartSizing("RIGHT") - AceGUI:ClearFocus() -end - -local function StatusBar_OnEnter(frame) - frame.obj:Fire("OnEnterStatusBar") -end - -local function StatusBar_OnLeave(frame) - frame.obj:Fire("OnLeaveStatusBar") -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self.frame:SetParent(UIParent) - self.frame:SetFrameStrata("FULLSCREEN_DIALOG") - self:SetTitle() - self:SetStatusText() - self:ApplyStatus() - self:Show() - end, - - ["OnRelease"] = function(self) - self.status = nil - wipe(self.localstatus) - end, - - ["OnWidthSet"] = function(self, width) - local content = self.content - local contentwidth = width - 34 - if contentwidth < 0 then - contentwidth = 0 - end - content:SetWidth(contentwidth) - content.width = contentwidth - end, - - ["OnHeightSet"] = function(self, height) - local content = self.content - local contentheight = height - 57 - if contentheight < 0 then - contentheight = 0 - end - content:SetHeight(contentheight) - content.height = contentheight - end, - - ["SetTitle"] = function(self, title) - self.titletext:SetText(title) - self.titlebg:SetWidth((self.titletext:GetWidth() or 0) + 10) - end, - - ["SetStatusText"] = function(self, text) - self.statustext:SetText(text) - end, - - ["Hide"] = function(self) - self.frame:Hide() - end, - - ["Show"] = function(self) - self.frame:Show() - end, - - -- called to set an external table to store status in - ["SetStatusTable"] = function(self, status) - assert(type(status) == "table") - self.status = status - self:ApplyStatus() - end, - - ["ApplyStatus"] = function(self) - local status = self.status or self.localstatus - local frame = self.frame - self:SetWidth(status.width or 700) - self:SetHeight(status.height or 500) - frame:ClearAllPoints() - if status.top and status.left then - frame:SetPoint("TOP", UIParent, "BOTTOM", 0, status.top) - frame:SetPoint("LEFT", UIParent, "LEFT", status.left, 0) - else - frame:SetPoint("CENTER") - end - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local FrameBackdrop = { - bgFile = "Interface\\DialogFrame\\UI-DialogBox-Background", - edgeFile = "Interface\\DialogFrame\\UI-DialogBox-Border", - tile = true, tileSize = 32, edgeSize = 32, - insets = { left = 8, right = 8, top = 8, bottom = 8 } -} - -local PaneBackdrop = { - bgFile = "Interface\\ChatFrame\\ChatFrameBackground", - edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border", - tile = true, tileSize = 16, edgeSize = 16, - insets = { left = 3, right = 3, top = 5, bottom = 3 } -} - -local function Constructor() - local frame = CreateFrame("Frame", nil, UIParent) - frame:Hide() - - frame:EnableMouse(true) - frame:SetMovable(true) - frame:SetResizable(true) - frame:SetFrameStrata("FULLSCREEN_DIALOG") - frame:SetBackdrop(FrameBackdrop) - frame:SetBackdropColor(0, 0, 0, 1) - frame:SetMinResize(400, 200) - frame:SetToplevel(true) - frame:SetScript("OnHide", Frame_OnClose) - frame:SetScript("OnMouseDown", Frame_OnMouseDown) - - local closebutton = CreateFrame("Button", nil, frame, "UIPanelButtonTemplate") - closebutton:SetScript("OnClick", Button_OnClick) - closebutton:SetPoint("BOTTOMRIGHT", -27, 17) - closebutton:SetHeight(20) - closebutton:SetWidth(100) - closebutton:SetText(CLOSE) - - local statusbg = CreateFrame("Button", nil, frame) - statusbg:SetPoint("BOTTOMLEFT", 15, 15) - statusbg:SetPoint("BOTTOMRIGHT", -132, 15) - statusbg:SetHeight(24) - statusbg:SetBackdrop(PaneBackdrop) - statusbg:SetBackdropColor(0.1,0.1,0.1) - statusbg:SetBackdropBorderColor(0.4,0.4,0.4) - statusbg:SetScript("OnEnter", StatusBar_OnEnter) - statusbg:SetScript("OnLeave", StatusBar_OnLeave) - - local statustext = statusbg:CreateFontString(nil, "OVERLAY", "GameFontNormal") - statustext:SetPoint("TOPLEFT", 7, -2) - statustext:SetPoint("BOTTOMRIGHT", -7, 2) - statustext:SetHeight(20) - statustext:SetJustifyH("LEFT") - statustext:SetText("") - - local titlebg = frame:CreateTexture(nil, "OVERLAY") - titlebg:SetTexture("Interface\\DialogFrame\\UI-DialogBox-Header") - titlebg:SetTexCoord(0.31, 0.67, 0, 0.63) - titlebg:SetPoint("TOP", 0, 12) - titlebg:SetWidth(100) - titlebg:SetHeight(40) - - local title = CreateFrame("Frame", nil, frame) - title:EnableMouse(true) - title:SetScript("OnMouseDown", Title_OnMouseDown) - title:SetScript("OnMouseUp", MoverSizer_OnMouseUp) - title:SetAllPoints(titlebg) - - local titletext = title:CreateFontString(nil, "OVERLAY", "GameFontNormal") - titletext:SetPoint("TOP", titlebg, "TOP", 0, -14) - - local titlebg_l = frame:CreateTexture(nil, "OVERLAY") - titlebg_l:SetTexture("Interface\\DialogFrame\\UI-DialogBox-Header") - titlebg_l:SetTexCoord(0.21, 0.31, 0, 0.63) - titlebg_l:SetPoint("RIGHT", titlebg, "LEFT") - titlebg_l:SetWidth(30) - titlebg_l:SetHeight(40) - - local titlebg_r = frame:CreateTexture(nil, "OVERLAY") - titlebg_r:SetTexture("Interface\\DialogFrame\\UI-DialogBox-Header") - titlebg_r:SetTexCoord(0.67, 0.77, 0, 0.63) - titlebg_r:SetPoint("LEFT", titlebg, "RIGHT") - titlebg_r:SetWidth(30) - titlebg_r:SetHeight(40) - - local sizer_se = CreateFrame("Frame", nil, frame) - sizer_se:SetPoint("BOTTOMRIGHT") - sizer_se:SetWidth(25) - sizer_se:SetHeight(25) - sizer_se:EnableMouse() - sizer_se:SetScript("OnMouseDown",SizerSE_OnMouseDown) - sizer_se:SetScript("OnMouseUp", MoverSizer_OnMouseUp) - - local line1 = sizer_se:CreateTexture(nil, "BACKGROUND") - line1:SetWidth(14) - line1:SetHeight(14) - line1:SetPoint("BOTTOMRIGHT", -8, 8) - line1:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border") - local x = 0.1 * 14/17 - line1:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5) - - local line2 = sizer_se:CreateTexture(nil, "BACKGROUND") - line2:SetWidth(8) - line2:SetHeight(8) - line2:SetPoint("BOTTOMRIGHT", -8, 8) - line2:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border") - local x = 0.1 * 8/17 - line2:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5) - - local sizer_s = CreateFrame("Frame", nil, frame) - sizer_s:SetPoint("BOTTOMRIGHT", -25, 0) - sizer_s:SetPoint("BOTTOMLEFT") - sizer_s:SetHeight(25) - sizer_s:EnableMouse(true) - sizer_s:SetScript("OnMouseDown", SizerS_OnMouseDown) - sizer_s:SetScript("OnMouseUp", MoverSizer_OnMouseUp) - - local sizer_e = CreateFrame("Frame", nil, frame) - sizer_e:SetPoint("BOTTOMRIGHT", 0, 25) - sizer_e:SetPoint("TOPRIGHT") - sizer_e:SetWidth(25) - sizer_e:EnableMouse(true) - sizer_e:SetScript("OnMouseDown", SizerE_OnMouseDown) - sizer_e:SetScript("OnMouseUp", MoverSizer_OnMouseUp) - - --Container Support - local content = CreateFrame("Frame", nil, frame) - content:SetPoint("TOPLEFT", 17, -27) - content:SetPoint("BOTTOMRIGHT", -17, 40) - - local widget = { - localstatus = {}, - titletext = titletext, - statustext = statustext, - titlebg = titlebg, - content = content, - frame = frame, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - closebutton.obj, statusbg.obj = widget, widget - - return AceGUI:RegisterAsContainer(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) +--[[----------------------------------------------------------------------------- +Frame Container +-------------------------------------------------------------------------------]] +local Type, Version = "Frame", 24 +local AceGUI = LibStub and LibStub("AceGUI-3.0", true) +if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end + +-- Lua APIs +local pairs, assert, type = pairs, assert, type +local wipe = table.wipe + +-- WoW APIs +local PlaySound = PlaySound +local CreateFrame, UIParent = CreateFrame, UIParent + +-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded +-- List them here for Mikk's FindGlobals script +-- GLOBALS: CLOSE + +--[[----------------------------------------------------------------------------- +Scripts +-------------------------------------------------------------------------------]] +local function Button_OnClick(frame) + PlaySound("gsTitleOptionExit") + frame.obj:Hide() +end + +local function Frame_OnClose(frame) + frame.obj:Fire("OnClose") +end + +local function Frame_OnMouseDown(frame) + AceGUI:ClearFocus() +end + +local function Title_OnMouseDown(frame) + frame:GetParent():StartMoving() + AceGUI:ClearFocus() +end + +local function MoverSizer_OnMouseUp(mover) + local frame = mover:GetParent() + frame:StopMovingOrSizing() + local self = frame.obj + local status = self.status or self.localstatus + status.width = frame:GetWidth() + status.height = frame:GetHeight() + status.top = frame:GetTop() + status.left = frame:GetLeft() +end + +local function SizerSE_OnMouseDown(frame) + frame:GetParent():StartSizing("BOTTOMRIGHT") + AceGUI:ClearFocus() +end + +local function SizerS_OnMouseDown(frame) + frame:GetParent():StartSizing("BOTTOM") + AceGUI:ClearFocus() +end + +local function SizerE_OnMouseDown(frame) + frame:GetParent():StartSizing("RIGHT") + AceGUI:ClearFocus() +end + +local function StatusBar_OnEnter(frame) + frame.obj:Fire("OnEnterStatusBar") +end + +local function StatusBar_OnLeave(frame) + frame.obj:Fire("OnLeaveStatusBar") +end + +--[[----------------------------------------------------------------------------- +Methods +-------------------------------------------------------------------------------]] +local methods = { + ["OnAcquire"] = function(self) + self.frame:SetParent(UIParent) + self.frame:SetFrameStrata("FULLSCREEN_DIALOG") + self:SetTitle() + self:SetStatusText() + self:ApplyStatus() + self:Show() + self:EnableResize(true) + end, + + ["OnRelease"] = function(self) + self.status = nil + wipe(self.localstatus) + end, + + ["OnWidthSet"] = function(self, width) + local content = self.content + local contentwidth = width - 34 + if contentwidth < 0 then + contentwidth = 0 + end + content:SetWidth(contentwidth) + content.width = contentwidth + end, + + ["OnHeightSet"] = function(self, height) + local content = self.content + local contentheight = height - 57 + if contentheight < 0 then + contentheight = 0 + end + content:SetHeight(contentheight) + content.height = contentheight + end, + + ["SetTitle"] = function(self, title) + self.titletext:SetText(title) + self.titlebg:SetWidth((self.titletext:GetWidth() or 0) + 10) + end, + + ["SetStatusText"] = function(self, text) + self.statustext:SetText(text) + end, + + ["Hide"] = function(self) + self.frame:Hide() + end, + + ["Show"] = function(self) + self.frame:Show() + end, + + ["EnableResize"] = function(self, state) + local func = state and "Show" or "Hide" + self.sizer_se[func](self.sizer_se) + self.sizer_s[func](self.sizer_s) + self.sizer_e[func](self.sizer_e) + end, + + -- called to set an external table to store status in + ["SetStatusTable"] = function(self, status) + assert(type(status) == "table") + self.status = status + self:ApplyStatus() + end, + + ["ApplyStatus"] = function(self) + local status = self.status or self.localstatus + local frame = self.frame + self:SetWidth(status.width or 700) + self:SetHeight(status.height or 500) + frame:ClearAllPoints() + if status.top and status.left then + frame:SetPoint("TOP", UIParent, "BOTTOM", 0, status.top) + frame:SetPoint("LEFT", UIParent, "LEFT", status.left, 0) + else + frame:SetPoint("CENTER") + end + end +} + +--[[----------------------------------------------------------------------------- +Constructor +-------------------------------------------------------------------------------]] +local FrameBackdrop = { + bgFile = "Interface\\DialogFrame\\UI-DialogBox-Background", + edgeFile = "Interface\\DialogFrame\\UI-DialogBox-Border", + tile = true, tileSize = 32, edgeSize = 32, + insets = { left = 8, right = 8, top = 8, bottom = 8 } +} + +local PaneBackdrop = { + bgFile = "Interface\\ChatFrame\\ChatFrameBackground", + edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border", + tile = true, tileSize = 16, edgeSize = 16, + insets = { left = 3, right = 3, top = 5, bottom = 3 } +} + +local function Constructor() + local frame = CreateFrame("Frame", nil, UIParent) + frame:Hide() + + frame:EnableMouse(true) + frame:SetMovable(true) + frame:SetResizable(true) + frame:SetFrameStrata("FULLSCREEN_DIALOG") + frame:SetBackdrop(FrameBackdrop) + frame:SetBackdropColor(0, 0, 0, 1) + frame:SetMinResize(400, 200) + frame:SetToplevel(true) + frame:SetScript("OnHide", Frame_OnClose) + frame:SetScript("OnMouseDown", Frame_OnMouseDown) + + local closebutton = CreateFrame("Button", nil, frame, "UIPanelButtonTemplate") + closebutton:SetScript("OnClick", Button_OnClick) + closebutton:SetPoint("BOTTOMRIGHT", -27, 17) + closebutton:SetHeight(20) + closebutton:SetWidth(100) + closebutton:SetText(CLOSE) + + local statusbg = CreateFrame("Button", nil, frame) + statusbg:SetPoint("BOTTOMLEFT", 15, 15) + statusbg:SetPoint("BOTTOMRIGHT", -132, 15) + statusbg:SetHeight(24) + statusbg:SetBackdrop(PaneBackdrop) + statusbg:SetBackdropColor(0.1,0.1,0.1) + statusbg:SetBackdropBorderColor(0.4,0.4,0.4) + statusbg:SetScript("OnEnter", StatusBar_OnEnter) + statusbg:SetScript("OnLeave", StatusBar_OnLeave) + + local statustext = statusbg:CreateFontString(nil, "OVERLAY", "GameFontNormal") + statustext:SetPoint("TOPLEFT", 7, -2) + statustext:SetPoint("BOTTOMRIGHT", -7, 2) + statustext:SetHeight(20) + statustext:SetJustifyH("LEFT") + statustext:SetText("") + + local titlebg = frame:CreateTexture(nil, "OVERLAY") + titlebg:SetTexture("Interface\\DialogFrame\\UI-DialogBox-Header") + titlebg:SetTexCoord(0.31, 0.67, 0, 0.63) + titlebg:SetPoint("TOP", 0, 12) + titlebg:SetWidth(100) + titlebg:SetHeight(40) + + local title = CreateFrame("Frame", nil, frame) + title:EnableMouse(true) + title:SetScript("OnMouseDown", Title_OnMouseDown) + title:SetScript("OnMouseUp", MoverSizer_OnMouseUp) + title:SetAllPoints(titlebg) + + local titletext = title:CreateFontString(nil, "OVERLAY", "GameFontNormal") + titletext:SetPoint("TOP", titlebg, "TOP", 0, -14) + + local titlebg_l = frame:CreateTexture(nil, "OVERLAY") + titlebg_l:SetTexture("Interface\\DialogFrame\\UI-DialogBox-Header") + titlebg_l:SetTexCoord(0.21, 0.31, 0, 0.63) + titlebg_l:SetPoint("RIGHT", titlebg, "LEFT") + titlebg_l:SetWidth(30) + titlebg_l:SetHeight(40) + + local titlebg_r = frame:CreateTexture(nil, "OVERLAY") + titlebg_r:SetTexture("Interface\\DialogFrame\\UI-DialogBox-Header") + titlebg_r:SetTexCoord(0.67, 0.77, 0, 0.63) + titlebg_r:SetPoint("LEFT", titlebg, "RIGHT") + titlebg_r:SetWidth(30) + titlebg_r:SetHeight(40) + + local sizer_se = CreateFrame("Frame", nil, frame) + sizer_se:SetPoint("BOTTOMRIGHT") + sizer_se:SetWidth(25) + sizer_se:SetHeight(25) + sizer_se:EnableMouse() + sizer_se:SetScript("OnMouseDown",SizerSE_OnMouseDown) + sizer_se:SetScript("OnMouseUp", MoverSizer_OnMouseUp) + + local line1 = sizer_se:CreateTexture(nil, "BACKGROUND") + line1:SetWidth(14) + line1:SetHeight(14) + line1:SetPoint("BOTTOMRIGHT", -8, 8) + line1:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border") + local x = 0.1 * 14/17 + line1:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5) + + local line2 = sizer_se:CreateTexture(nil, "BACKGROUND") + line2:SetWidth(8) + line2:SetHeight(8) + line2:SetPoint("BOTTOMRIGHT", -8, 8) + line2:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border") + local x = 0.1 * 8/17 + line2:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5) + + local sizer_s = CreateFrame("Frame", nil, frame) + sizer_s:SetPoint("BOTTOMRIGHT", -25, 0) + sizer_s:SetPoint("BOTTOMLEFT") + sizer_s:SetHeight(25) + sizer_s:EnableMouse(true) + sizer_s:SetScript("OnMouseDown", SizerS_OnMouseDown) + sizer_s:SetScript("OnMouseUp", MoverSizer_OnMouseUp) + + local sizer_e = CreateFrame("Frame", nil, frame) + sizer_e:SetPoint("BOTTOMRIGHT", 0, 25) + sizer_e:SetPoint("TOPRIGHT") + sizer_e:SetWidth(25) + sizer_e:EnableMouse(true) + sizer_e:SetScript("OnMouseDown", SizerE_OnMouseDown) + sizer_e:SetScript("OnMouseUp", MoverSizer_OnMouseUp) + + --Container Support + local content = CreateFrame("Frame", nil, frame) + content:SetPoint("TOPLEFT", 17, -27) + content:SetPoint("BOTTOMRIGHT", -17, 40) + + local widget = { + localstatus = {}, + titletext = titletext, + statustext = statustext, + titlebg = titlebg, + sizer_se = sizer_se, + sizer_s = sizer_s, + sizer_e = sizer_e, + content = content, + frame = frame, + type = Type + } + for method, func in pairs(methods) do + widget[method] = func + end + closebutton.obj, statusbg.obj = widget, widget + + return AceGUI:RegisterAsContainer(widget) +end + +AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua b/libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua old mode 100644 new mode 100755 index bb87885..9413611 --- a/libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua @@ -1,102 +1,102 @@ ---[[----------------------------------------------------------------------------- -InlineGroup Container -Simple container widget that creates a visible "box" with an optional title. --------------------------------------------------------------------------------]] -local Type, Version = "InlineGroup", 20 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local pairs = pairs - --- WoW APIs -local CreateFrame, UIParent = CreateFrame, UIParent - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:SetWidth(300) - self:SetHeight(100) - end, - - -- ["OnRelease"] = nil, - - ["SetTitle"] = function(self,title) - self.titletext:SetText(title) - end, - - - ["LayoutFinished"] = function(self, width, height) - if self.noAutoHeight then return end - self:SetHeight((height or 0) + 40) - end, - - ["OnWidthSet"] = function(self, width) - local content = self.content - local contentwidth = width - 20 - if contentwidth < 0 then - contentwidth = 0 - end - content:SetWidth(contentwidth) - content.width = contentwidth - end, - - ["OnHeightSet"] = function(self, height) - local content = self.content - local contentheight = height - 20 - if contentheight < 0 then - contentheight = 0 - end - content:SetHeight(contentheight) - content.height = contentheight - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local PaneBackdrop = { - bgFile = "Interface\\ChatFrame\\ChatFrameBackground", - edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border", - tile = true, tileSize = 16, edgeSize = 16, - insets = { left = 3, right = 3, top = 5, bottom = 3 } -} - -local function Constructor() - local frame = CreateFrame("Frame", nil, UIParent) - frame:SetFrameStrata("FULLSCREEN_DIALOG") - - local titletext = frame:CreateFontString(nil, "OVERLAY", "GameFontNormal") - titletext:SetPoint("TOPLEFT", 14, 0) - titletext:SetPoint("TOPRIGHT", -14, 0) - titletext:SetJustifyH("LEFT") - titletext:SetHeight(18) - - local border = CreateFrame("Frame", nil, frame) - border:SetPoint("TOPLEFT", 0, -17) - border:SetPoint("BOTTOMRIGHT", -1, 3) - border:SetBackdrop(PaneBackdrop) - border:SetBackdropColor(0.1, 0.1, 0.1, 0.5) - border:SetBackdropBorderColor(0.4, 0.4, 0.4) - - --Container Support - local content = CreateFrame("Frame", nil, border) - content:SetPoint("TOPLEFT", 10, -10) - content:SetPoint("BOTTOMRIGHT", -10, 10) - - local widget = { - frame = frame, - content = content, - titletext = titletext, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - - return AceGUI:RegisterAsContainer(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) +--[[----------------------------------------------------------------------------- +InlineGroup Container +Simple container widget that creates a visible "box" with an optional title. +-------------------------------------------------------------------------------]] +local Type, Version = "InlineGroup", 20 +local AceGUI = LibStub and LibStub("AceGUI-3.0", true) +if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end + +-- Lua APIs +local pairs = pairs + +-- WoW APIs +local CreateFrame, UIParent = CreateFrame, UIParent + +--[[----------------------------------------------------------------------------- +Methods +-------------------------------------------------------------------------------]] +local methods = { + ["OnAcquire"] = function(self) + self:SetWidth(300) + self:SetHeight(100) + end, + + -- ["OnRelease"] = nil, + + ["SetTitle"] = function(self,title) + self.titletext:SetText(title) + end, + + + ["LayoutFinished"] = function(self, width, height) + if self.noAutoHeight then return end + self:SetHeight((height or 0) + 40) + end, + + ["OnWidthSet"] = function(self, width) + local content = self.content + local contentwidth = width - 20 + if contentwidth < 0 then + contentwidth = 0 + end + content:SetWidth(contentwidth) + content.width = contentwidth + end, + + ["OnHeightSet"] = function(self, height) + local content = self.content + local contentheight = height - 20 + if contentheight < 0 then + contentheight = 0 + end + content:SetHeight(contentheight) + content.height = contentheight + end +} + +--[[----------------------------------------------------------------------------- +Constructor +-------------------------------------------------------------------------------]] +local PaneBackdrop = { + bgFile = "Interface\\ChatFrame\\ChatFrameBackground", + edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border", + tile = true, tileSize = 16, edgeSize = 16, + insets = { left = 3, right = 3, top = 5, bottom = 3 } +} + +local function Constructor() + local frame = CreateFrame("Frame", nil, UIParent) + frame:SetFrameStrata("FULLSCREEN_DIALOG") + + local titletext = frame:CreateFontString(nil, "OVERLAY", "GameFontNormal") + titletext:SetPoint("TOPLEFT", 14, 0) + titletext:SetPoint("TOPRIGHT", -14, 0) + titletext:SetJustifyH("LEFT") + titletext:SetHeight(18) + + local border = CreateFrame("Frame", nil, frame) + border:SetPoint("TOPLEFT", 0, -17) + border:SetPoint("BOTTOMRIGHT", -1, 3) + border:SetBackdrop(PaneBackdrop) + border:SetBackdropColor(0.1, 0.1, 0.1, 0.5) + border:SetBackdropBorderColor(0.4, 0.4, 0.4) + + --Container Support + local content = CreateFrame("Frame", nil, border) + content:SetPoint("TOPLEFT", 10, -10) + content:SetPoint("BOTTOMRIGHT", -10, 10) + + local widget = { + frame = frame, + content = content, + titletext = titletext, + type = Type + } + for method, func in pairs(methods) do + widget[method] = func + end + + return AceGUI:RegisterAsContainer(widget) +end + +AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua b/libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua old mode 100644 new mode 100755 index 30dead2..a56e7cd --- a/libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua @@ -1,203 +1,204 @@ ---[[----------------------------------------------------------------------------- -ScrollFrame Container -Plain container that scrolls its content and doesn't grow in height. --------------------------------------------------------------------------------]] -local Type, Version = "ScrollFrame", 21 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local pairs, assert, type = pairs, assert, type -local min, max, floor, abs = math.min, math.max, math.floor, math.abs - --- WoW APIs -local CreateFrame, UIParent = CreateFrame, UIParent - ---[[----------------------------------------------------------------------------- -Support functions --------------------------------------------------------------------------------]] -local function FixScrollOnUpdate(frame) - frame:SetScript("OnUpdate", nil) - frame.obj:FixScroll() -end - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function ScrollFrame_OnMouseWheel(frame, value) - frame.obj:MoveScroll(value) -end - -local function ScrollFrame_OnSizeChanged(frame) - frame:SetScript("OnUpdate", FixScrollOnUpdate) -end - -local function ScrollBar_OnScrollValueChanged(frame, value) - frame.obj:SetScroll(value) -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:SetScroll(0) - end, - - ["OnRelease"] = function(self) - self.status = nil - for k in pairs(self.localstatus) do - self.localstatus[k] = nil - end - self.scrollframe:SetPoint("BOTTOMRIGHT") - self.scrollbar:Hide() - self.scrollBarShown = nil - self.content.height, self.content.width = nil, nil - end, - - ["SetScroll"] = function(self, value) - local status = self.status or self.localstatus - local viewheight = self.scrollframe:GetHeight() - local height = self.content:GetHeight() - local offset - - if viewheight > height then - offset = 0 - else - offset = floor((height - viewheight) / 1000.0 * value) - end - self.content:ClearAllPoints() - self.content:SetPoint("TOPLEFT", 0, offset) - self.content:SetPoint("TOPRIGHT", 0, offset) - status.offset = offset - status.scrollvalue = value - end, - - ["MoveScroll"] = function(self, value) - local status = self.status or self.localstatus - local height, viewheight = self.scrollframe:GetHeight(), self.content:GetHeight() - - if self.scrollBarShown then - local diff = height - viewheight - local delta = 1 - if value < 0 then - delta = -1 - end - self.scrollbar:SetValue(min(max(status.scrollvalue + delta*(1000/(diff/45)),0), 1000)) - end - end, - - ["FixScroll"] = function(self) - if self.updateLock then return end - self.updateLock = true - local status = self.status or self.localstatus - local height, viewheight = self.scrollframe:GetHeight(), self.content:GetHeight() - local offset = status.offset or 0 - local curvalue = self.scrollbar:GetValue() - -- Give us a margin of error of 2 pixels to stop some conditions that i would blame on floating point inaccuracys - -- No-one is going to miss 2 pixels at the bottom of the frame, anyhow! - if viewheight < height + 2 then - if self.scrollBarShown then - self.scrollBarShown = nil - self.scrollbar:Hide() - self.scrollbar:SetValue(0) - self.scrollframe:SetPoint("BOTTOMRIGHT") - self:DoLayout() - end - else - if not self.scrollBarShown then - self.scrollBarShown = true - self.scrollbar:Show() - self.scrollframe:SetPoint("BOTTOMRIGHT", -20, 0) - self:DoLayout() - end - local value = (offset / (viewheight - height) * 1000) - if value > 1000 then value = 1000 end - self.scrollbar:SetValue(value) - self:SetScroll(value) - if value < 1000 then - self.content:ClearAllPoints() - self.content:SetPoint("TOPLEFT", 0, offset) - self.content:SetPoint("TOPRIGHT", 0, offset) - status.offset = offset - end - end - self.updateLock = nil - end, - - ["LayoutFinished"] = function(self, width, height) - self.content:SetHeight(height or 0 + 20) - self.scrollframe:SetScript("OnUpdate", FixScrollOnUpdate) - end, - - ["SetStatusTable"] = function(self, status) - assert(type(status) == "table") - self.status = status - if not status.scrollvalue then - status.scrollvalue = 0 - end - end, - - ["OnWidthSet"] = function(self, width) - local content = self.content - content.width = width - end, - - ["OnHeightSet"] = function(self, height) - local content = self.content - content.height = height - end -} ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local function Constructor() - local frame = CreateFrame("Frame", nil, UIParent) - local num = AceGUI:GetNextWidgetNum(Type) - - local scrollframe = CreateFrame("ScrollFrame", nil, frame) - scrollframe:SetPoint("TOPLEFT") - scrollframe:SetPoint("BOTTOMRIGHT") - scrollframe:EnableMouseWheel(true) - scrollframe:SetScript("OnMouseWheel", ScrollFrame_OnMouseWheel) - scrollframe:SetScript("OnSizeChanged", ScrollFrame_OnSizeChanged) - - local scrollbar = CreateFrame("Slider", ("AceConfigDialogScrollFrame%dScrollBar"):format(num), scrollframe, "UIPanelScrollBarTemplate") - scrollbar:SetPoint("TOPLEFT", scrollframe, "TOPRIGHT", 4, -16) - scrollbar:SetPoint("BOTTOMLEFT", scrollframe, "BOTTOMRIGHT", 4, 16) - scrollbar:SetMinMaxValues(0, 1000) - scrollbar:SetValueStep(1) - scrollbar:SetValue(0) - scrollbar:SetWidth(16) - scrollbar:Hide() - -- set the script as the last step, so it doesn't fire yet - scrollbar:SetScript("OnValueChanged", ScrollBar_OnScrollValueChanged) - - local scrollbg = scrollbar:CreateTexture(nil, "BACKGROUND") - scrollbg:SetAllPoints(scrollbar) - scrollbg:SetTexture(0, 0, 0, 0.4) - - --Container Support - local content = CreateFrame("Frame", nil, scrollframe) - content:SetPoint("TOPLEFT") - content:SetPoint("TOPRIGHT") - content:SetHeight(400) - scrollframe:SetScrollChild(content) - - local widget = { - localstatus = { scrollvalue = 0 }, - scrollframe = scrollframe, - scrollbar = scrollbar, - content = content, - frame = frame, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - scrollframe.obj, scrollbar.obj = widget, widget - - return AceGUI:RegisterAsContainer(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) +--[[----------------------------------------------------------------------------- +ScrollFrame Container +Plain container that scrolls its content and doesn't grow in height. +-------------------------------------------------------------------------------]] +local Type, Version = "ScrollFrame", 23 +local AceGUI = LibStub and LibStub("AceGUI-3.0", true) +if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end + +-- Lua APIs +local pairs, assert, type = pairs, assert, type +local min, max, floor, abs = math.min, math.max, math.floor, math.abs + +-- WoW APIs +local CreateFrame, UIParent = CreateFrame, UIParent + +--[[----------------------------------------------------------------------------- +Support functions +-------------------------------------------------------------------------------]] +local function FixScrollOnUpdate(frame) + frame:SetScript("OnUpdate", nil) + frame.obj:FixScroll() +end + +--[[----------------------------------------------------------------------------- +Scripts +-------------------------------------------------------------------------------]] +local function ScrollFrame_OnMouseWheel(frame, value) + frame.obj:MoveScroll(value) +end + +local function ScrollFrame_OnSizeChanged(frame) + frame:SetScript("OnUpdate", FixScrollOnUpdate) +end + +local function ScrollBar_OnScrollValueChanged(frame, value) + frame.obj:SetScroll(value) +end + +--[[----------------------------------------------------------------------------- +Methods +-------------------------------------------------------------------------------]] +local methods = { + ["OnAcquire"] = function(self) + self:SetScroll(0) + self.scrollframe:SetScript("OnUpdate", FixScrollOnUpdate) + end, + + ["OnRelease"] = function(self) + self.status = nil + for k in pairs(self.localstatus) do + self.localstatus[k] = nil + end + self.scrollframe:SetPoint("BOTTOMRIGHT") + self.scrollbar:Hide() + self.scrollBarShown = nil + self.content.height, self.content.width = nil, nil + end, + + ["SetScroll"] = function(self, value) + local status = self.status or self.localstatus + local viewheight = self.scrollframe:GetHeight() + local height = self.content:GetHeight() + local offset + + if viewheight > height then + offset = 0 + else + offset = floor((height - viewheight) / 1000.0 * value) + end + self.content:ClearAllPoints() + self.content:SetPoint("TOPLEFT", 0, offset) + self.content:SetPoint("TOPRIGHT", 0, offset) + status.offset = offset + status.scrollvalue = value + end, + + ["MoveScroll"] = function(self, value) + local status = self.status or self.localstatus + local height, viewheight = self.scrollframe:GetHeight(), self.content:GetHeight() + + if self.scrollBarShown then + local diff = height - viewheight + local delta = 1 + if value < 0 then + delta = -1 + end + self.scrollbar:SetValue(min(max(status.scrollvalue + delta*(1000/(diff/45)),0), 1000)) + end + end, + + ["FixScroll"] = function(self) + if self.updateLock then return end + self.updateLock = true + local status = self.status or self.localstatus + local height, viewheight = self.scrollframe:GetHeight(), self.content:GetHeight() + local offset = status.offset or 0 + local curvalue = self.scrollbar:GetValue() + -- Give us a margin of error of 2 pixels to stop some conditions that i would blame on floating point inaccuracys + -- No-one is going to miss 2 pixels at the bottom of the frame, anyhow! + if viewheight < height + 2 then + if self.scrollBarShown then + self.scrollBarShown = nil + self.scrollbar:Hide() + self.scrollbar:SetValue(0) + self.scrollframe:SetPoint("BOTTOMRIGHT") + self:DoLayout() + end + else + if not self.scrollBarShown then + self.scrollBarShown = true + self.scrollbar:Show() + self.scrollframe:SetPoint("BOTTOMRIGHT", -20, 0) + self:DoLayout() + end + local value = (offset / (viewheight - height) * 1000) + if value > 1000 then value = 1000 end + self.scrollbar:SetValue(value) + self:SetScroll(value) + if value < 1000 then + self.content:ClearAllPoints() + self.content:SetPoint("TOPLEFT", 0, offset) + self.content:SetPoint("TOPRIGHT", 0, offset) + status.offset = offset + end + end + self.updateLock = nil + end, + + ["LayoutFinished"] = function(self, width, height) + self.content:SetHeight(height or 0 + 20) + self.scrollframe:SetScript("OnUpdate", FixScrollOnUpdate) + end, + + ["SetStatusTable"] = function(self, status) + assert(type(status) == "table") + self.status = status + if not status.scrollvalue then + status.scrollvalue = 0 + end + end, + + ["OnWidthSet"] = function(self, width) + local content = self.content + content.width = width + end, + + ["OnHeightSet"] = function(self, height) + local content = self.content + content.height = height + end +} +--[[----------------------------------------------------------------------------- +Constructor +-------------------------------------------------------------------------------]] +local function Constructor() + local frame = CreateFrame("Frame", nil, UIParent) + local num = AceGUI:GetNextWidgetNum(Type) + + local scrollframe = CreateFrame("ScrollFrame", nil, frame) + scrollframe:SetPoint("TOPLEFT") + scrollframe:SetPoint("BOTTOMRIGHT") + scrollframe:EnableMouseWheel(true) + scrollframe:SetScript("OnMouseWheel", ScrollFrame_OnMouseWheel) + scrollframe:SetScript("OnSizeChanged", ScrollFrame_OnSizeChanged) + + local scrollbar = CreateFrame("Slider", ("AceConfigDialogScrollFrame%dScrollBar"):format(num), scrollframe, "UIPanelScrollBarTemplate") + scrollbar:SetPoint("TOPLEFT", scrollframe, "TOPRIGHT", 4, -16) + scrollbar:SetPoint("BOTTOMLEFT", scrollframe, "BOTTOMRIGHT", 4, 16) + scrollbar:SetMinMaxValues(0, 1000) + scrollbar:SetValueStep(1) + scrollbar:SetValue(0) + scrollbar:SetWidth(16) + scrollbar:Hide() + -- set the script as the last step, so it doesn't fire yet + scrollbar:SetScript("OnValueChanged", ScrollBar_OnScrollValueChanged) + + local scrollbg = scrollbar:CreateTexture(nil, "BACKGROUND") + scrollbg:SetAllPoints(scrollbar) + scrollbg:SetTexture(0, 0, 0, 0.4) + + --Container Support + local content = CreateFrame("Frame", nil, scrollframe) + content:SetPoint("TOPLEFT") + content:SetPoint("TOPRIGHT") + content:SetHeight(400) + scrollframe:SetScrollChild(content) + + local widget = { + localstatus = { scrollvalue = 0 }, + scrollframe = scrollframe, + scrollbar = scrollbar, + content = content, + frame = frame, + type = Type + } + for method, func in pairs(methods) do + widget[method] = func + end + scrollframe.obj, scrollbar.obj = widget, widget + + return AceGUI:RegisterAsContainer(widget) +end + +AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/libs/AceGUI-3.0/widgets/AceGUIContainer-SimpleGroup.lua b/libs/AceGUI-3.0/widgets/AceGUIContainer-SimpleGroup.lua old mode 100644 new mode 100755 index 6e23abc..57512c3 --- a/libs/AceGUI-3.0/widgets/AceGUIContainer-SimpleGroup.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIContainer-SimpleGroup.lua @@ -1,69 +1,69 @@ ---[[----------------------------------------------------------------------------- -SimpleGroup Container -Simple container widget that just groups widgets. --------------------------------------------------------------------------------]] -local Type, Version = "SimpleGroup", 20 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local pairs = pairs - --- WoW APIs -local CreateFrame, UIParent = CreateFrame, UIParent - - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:SetWidth(300) - self:SetHeight(100) - end, - - -- ["OnRelease"] = nil, - - ["LayoutFinished"] = function(self, width, height) - if self.noAutoHeight then return end - self:SetHeight(height or 0) - end, - - ["OnWidthSet"] = function(self, width) - local content = self.content - content:SetWidth(width) - content.width = width - end, - - ["OnHeightSet"] = function(self, height) - local content = self.content - content:SetHeight(height) - content.height = height - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local function Constructor() - local frame = CreateFrame("Frame", nil, UIParent) - frame:SetFrameStrata("FULLSCREEN_DIALOG") - - --Container Support - local content = CreateFrame("Frame", nil, frame) - content:SetPoint("TOPLEFT") - content:SetPoint("BOTTOMRIGHT") - - local widget = { - frame = frame, - content = content, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - - return AceGUI:RegisterAsContainer(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) +--[[----------------------------------------------------------------------------- +SimpleGroup Container +Simple container widget that just groups widgets. +-------------------------------------------------------------------------------]] +local Type, Version = "SimpleGroup", 20 +local AceGUI = LibStub and LibStub("AceGUI-3.0", true) +if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end + +-- Lua APIs +local pairs = pairs + +-- WoW APIs +local CreateFrame, UIParent = CreateFrame, UIParent + + +--[[----------------------------------------------------------------------------- +Methods +-------------------------------------------------------------------------------]] +local methods = { + ["OnAcquire"] = function(self) + self:SetWidth(300) + self:SetHeight(100) + end, + + -- ["OnRelease"] = nil, + + ["LayoutFinished"] = function(self, width, height) + if self.noAutoHeight then return end + self:SetHeight(height or 0) + end, + + ["OnWidthSet"] = function(self, width) + local content = self.content + content:SetWidth(width) + content.width = width + end, + + ["OnHeightSet"] = function(self, height) + local content = self.content + content:SetHeight(height) + content.height = height + end +} + +--[[----------------------------------------------------------------------------- +Constructor +-------------------------------------------------------------------------------]] +local function Constructor() + local frame = CreateFrame("Frame", nil, UIParent) + frame:SetFrameStrata("FULLSCREEN_DIALOG") + + --Container Support + local content = CreateFrame("Frame", nil, frame) + content:SetPoint("TOPLEFT") + content:SetPoint("BOTTOMRIGHT") + + local widget = { + frame = frame, + content = content, + type = Type + } + for method, func in pairs(methods) do + widget[method] = func + end + + return AceGUI:RegisterAsContainer(widget) +end + +AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua b/libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua old mode 100644 new mode 100755 index 6a88cbc..00be129 --- a/libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua @@ -1,365 +1,350 @@ ---[[----------------------------------------------------------------------------- -TabGroup Container -Container that uses tabs on top to switch between groups. --------------------------------------------------------------------------------]] -local Type, Version = "TabGroup", 34 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local pairs, ipairs, assert, type, wipe = pairs, ipairs, assert, type, wipe - --- WoW APIs -local PlaySound = PlaySound -local CreateFrame, UIParent = CreateFrame, UIParent -local _G = _G - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: PanelTemplates_TabResize, PanelTemplates_SetDisabledTabState, PanelTemplates_SelectTab, PanelTemplates_DeselectTab - --- local upvalue storage used by BuildTabs -local widths = {} -local rowwidths = {} -local rowends = {} - --- Determine if we're on WoW 4.0.6 or not. -local wow_406 -do - local _,wow_build = GetBuildInfo() - wow_406 = tonumber(wow_build) >= 13596 -end - ---[[----------------------------------------------------------------------------- -Support functions --------------------------------------------------------------------------------]] -local function UpdateTabLook(frame) - if frame.disabled then - PanelTemplates_SetDisabledTabState(frame) - elseif frame.selected then - PanelTemplates_SelectTab(frame) - else - PanelTemplates_DeselectTab(frame) - end -end - -local function Tab_SetText(frame, text) - frame:_SetText(text) - local width = frame.obj.frame.width or frame.obj.frame:GetWidth() or 0 - if wow_406 then - PanelTemplates_TabResize(frame, 0, nil, nil, width, frame:GetFontString():GetStringWidth()) - else - PanelTemplates_TabResize(frame, 0, nil, width) - end -end - -local function Tab_SetSelected(frame, selected) - frame.selected = selected - UpdateTabLook(frame) -end - -local function Tab_SetDisabled(frame, disabled) - frame.disabled = disabled - UpdateTabLook(frame) -end - -local function BuildTabsOnUpdate(frame) - local self = frame.obj - self:BuildTabs() - frame:SetScript("OnUpdate", nil) -end - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function Tab_OnClick(frame) - if not (frame.selected or frame.disabled) then - PlaySound("igCharacterInfoTab") - frame.obj:SelectTab(frame.value) - end -end - -local function Tab_OnEnter(frame) - local self = frame.obj - self:Fire("OnTabEnter", self.tabs[frame.id].value, frame) -end - -local function Tab_OnLeave(frame) - local self = frame.obj - self:Fire("OnTabLeave", self.tabs[frame.id].value, frame) -end - -local function Tab_OnShow(frame) - _G[frame:GetName().."HighlightTexture"]:SetWidth(frame:GetTextWidth() + 30) -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:SetTitle() - end, - - ["OnRelease"] = function(self) - self.status = nil - for k in pairs(self.localstatus) do - self.localstatus[k] = nil - end - self.tablist = nil - for _, tab in pairs(self.tabs) do - tab:Hide() - end - end, - - ["CreateTab"] = function(self, id) - local tabname = ("AceGUITabGroup%dTab%d"):format(self.num, id) - local tab = CreateFrame("Button", tabname, self.border, "OptionsFrameTabButtonTemplate") - tab.obj = self - tab.id = id - - tab.text = _G[tabname .. "Text"] - tab.text:ClearAllPoints() - tab.text:SetPoint("LEFT", 14, -3) - tab.text:SetPoint("RIGHT", -12, -3) - - tab:SetScript("OnClick", Tab_OnClick) - tab:SetScript("OnEnter", Tab_OnEnter) - tab:SetScript("OnLeave", Tab_OnLeave) - tab:SetScript("OnShow", Tab_OnShow) - - tab._SetText = tab.SetText - tab.SetText = Tab_SetText - tab.SetSelected = Tab_SetSelected - tab.SetDisabled = Tab_SetDisabled - - return tab - end, - - ["SetTitle"] = function(self, text) - self.titletext:SetText(text or "") - if text and text ~= "" then - self.alignoffset = 25 - else - self.alignoffset = 18 - end - self:BuildTabs() - end, - - ["SetStatusTable"] = function(self, status) - assert(type(status) == "table") - self.status = status - end, - - ["SelectTab"] = function(self, value) - local status = self.status or self.localstatus - local found - for i, v in ipairs(self.tabs) do - if v.value == value then - v:SetSelected(true) - found = true - else - v:SetSelected(false) - end - end - status.selected = value - if found then - self:Fire("OnGroupSelected",value) - end - end, - - ["SetTabs"] = function(self, tabs) - self.tablist = tabs - self:BuildTabs() - end, - - - ["BuildTabs"] = function(self) - local hastitle = (self.titletext:GetText() and self.titletext:GetText() ~= "") - local status = self.status or self.localstatus - local tablist = self.tablist - local tabs = self.tabs - - if not tablist then return end - - local width = self.frame.width or self.frame:GetWidth() or 0 - - wipe(widths) - wipe(rowwidths) - wipe(rowends) - - --Place Text into tabs and get thier initial width - for i, v in ipairs(tablist) do - local tab = tabs[i] - if not tab then - tab = self:CreateTab(i) - tabs[i] = tab - end - - tab:Show() - tab:SetText(v.text) - tab:SetDisabled(v.disabled) - tab.value = v.value - - widths[i] = tab:GetWidth() - 6 --tabs are anchored 10 pixels from the right side of the previous one to reduce spacing, but add a fixed 4px padding for the text - end - - for i = (#tablist)+1, #tabs, 1 do - tabs[i]:Hide() - end - - --First pass, find the minimum number of rows needed to hold all tabs and the initial tab layout - local numtabs = #tablist - local numrows = 1 - local usedwidth = 0 - - for i = 1, #tablist do - --If this is not the first tab of a row and there isn't room for it - if usedwidth ~= 0 and (width - usedwidth - widths[i]) < 0 then - rowwidths[numrows] = usedwidth + 10 --first tab in each row takes up an extra 10px - rowends[numrows] = i - 1 - numrows = numrows + 1 - usedwidth = 0 - end - usedwidth = usedwidth + widths[i] - end - rowwidths[numrows] = usedwidth + 10 --first tab in each row takes up an extra 10px - rowends[numrows] = #tablist - - --Fix for single tabs being left on the last row, move a tab from the row above if applicable - if numrows > 1 then - --if the last row has only one tab - if rowends[numrows-1] == numtabs-1 then - --if there are more than 2 tabs in the 2nd last row - if (numrows == 2 and rowends[numrows-1] > 2) or (rowends[numrows] - rowends[numrows-1] > 2) then - --move 1 tab from the second last row to the last, if there is enough space - if (rowwidths[numrows] + widths[numtabs-1]) <= width then - rowends[numrows-1] = rowends[numrows-1] - 1 - rowwidths[numrows] = rowwidths[numrows] + widths[numtabs-1] - rowwidths[numrows-1] = rowwidths[numrows-1] - widths[numtabs-1] - end - end - end - end - - --anchor the rows as defined and resize tabs to fill thier row - local starttab = 1 - for row, endtab in ipairs(rowends) do - local first = true - for tabno = starttab, endtab do - local tab = tabs[tabno] - tab:ClearAllPoints() - if first then - tab:SetPoint("TOPLEFT", self.frame, "TOPLEFT", 0, -(hastitle and 14 or 7)-(row-1)*20 ) - first = false - else - tab:SetPoint("LEFT", tabs[tabno-1], "RIGHT", -10, 0) - end - end - - -- equal padding for each tab to fill the available width, - -- if the used space is above 75% already - -- the 18 pixel is the typical width of a scrollbar, so we can have a tab group inside a scrolling frame, - -- and not have the tabs jump around funny when switching between tabs that need scrolling and those that don't - local padding = 0 - if not (numrows == 1 and rowwidths[1] < width*0.75 - 18) then - padding = (width - rowwidths[row]) / (endtab - starttab+1) - end - - for i = starttab, endtab do - if wow_406 then - PanelTemplates_TabResize(tabs[i], padding + 4, nil, nil, width, tabs[i]:GetFontString():GetStringWidth()) - else - PanelTemplates_TabResize(tabs[i], padding + 4, nil, width) - end - end - starttab = endtab + 1 - end - - self.borderoffset = (hastitle and 17 or 10)+((numrows)*20) - self.border:SetPoint("TOPLEFT", 1, -self.borderoffset) - end, - - ["OnWidthSet"] = function(self, width) - local content = self.content - local contentwidth = width - 60 - if contentwidth < 0 then - contentwidth = 0 - end - content:SetWidth(contentwidth) - content.width = contentwidth - self:BuildTabs(self) - self.frame:SetScript("OnUpdate", BuildTabsOnUpdate) - end, - - ["OnHeightSet"] = function(self, height) - local content = self.content - local contentheight = height - (self.borderoffset + 23) - if contentheight < 0 then - contentheight = 0 - end - content:SetHeight(contentheight) - content.height = contentheight - end, - - ["LayoutFinished"] = function(self, width, height) - if self.noAutoHeight then return end - self:SetHeight((height or 0) + (self.borderoffset + 23)) - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local PaneBackdrop = { - bgFile = "Interface\\ChatFrame\\ChatFrameBackground", - edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border", - tile = true, tileSize = 16, edgeSize = 16, - insets = { left = 3, right = 3, top = 5, bottom = 3 } -} - -local function Constructor() - local num = AceGUI:GetNextWidgetNum(Type) - local frame = CreateFrame("Frame",nil,UIParent) - frame:SetHeight(100) - frame:SetWidth(100) - frame:SetFrameStrata("FULLSCREEN_DIALOG") - - local titletext = frame:CreateFontString(nil,"OVERLAY","GameFontNormal") - titletext:SetPoint("TOPLEFT", 14, 0) - titletext:SetPoint("TOPRIGHT", -14, 0) - titletext:SetJustifyH("LEFT") - titletext:SetHeight(18) - titletext:SetText("") - - local border = CreateFrame("Frame", nil, frame) - border:SetPoint("TOPLEFT", 1, -27) - border:SetPoint("BOTTOMRIGHT", -1, 3) - border:SetBackdrop(PaneBackdrop) - border:SetBackdropColor(0.1, 0.1, 0.1, 0.5) - border:SetBackdropBorderColor(0.4, 0.4, 0.4) - - local content = CreateFrame("Frame", nil, border) - content:SetPoint("TOPLEFT", 10, -7) - content:SetPoint("BOTTOMRIGHT", -10, 7) - - local widget = { - num = num, - frame = frame, - localstatus = {}, - alignoffset = 18, - titletext = titletext, - border = border, - borderoffset = 27, - tabs = {}, - content = content, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - - return AceGUI:RegisterAsContainer(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) +--[[----------------------------------------------------------------------------- +TabGroup Container +Container that uses tabs on top to switch between groups. +-------------------------------------------------------------------------------]] +local Type, Version = "TabGroup", 35 +local AceGUI = LibStub and LibStub("AceGUI-3.0", true) +if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end + +-- Lua APIs +local pairs, ipairs, assert, type, wipe = pairs, ipairs, assert, type, wipe + +-- WoW APIs +local PlaySound = PlaySound +local CreateFrame, UIParent = CreateFrame, UIParent +local _G = _G + +-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded +-- List them here for Mikk's FindGlobals script +-- GLOBALS: PanelTemplates_TabResize, PanelTemplates_SetDisabledTabState, PanelTemplates_SelectTab, PanelTemplates_DeselectTab + +-- local upvalue storage used by BuildTabs +local widths = {} +local rowwidths = {} +local rowends = {} + +--[[----------------------------------------------------------------------------- +Support functions +-------------------------------------------------------------------------------]] +local function UpdateTabLook(frame) + if frame.disabled then + PanelTemplates_SetDisabledTabState(frame) + elseif frame.selected then + PanelTemplates_SelectTab(frame) + else + PanelTemplates_DeselectTab(frame) + end +end + +local function Tab_SetText(frame, text) + frame:_SetText(text) + local width = frame.obj.frame.width or frame.obj.frame:GetWidth() or 0 + PanelTemplates_TabResize(frame, 0, nil, nil, width, frame:GetFontString():GetStringWidth()) +end + +local function Tab_SetSelected(frame, selected) + frame.selected = selected + UpdateTabLook(frame) +end + +local function Tab_SetDisabled(frame, disabled) + frame.disabled = disabled + UpdateTabLook(frame) +end + +local function BuildTabsOnUpdate(frame) + local self = frame.obj + self:BuildTabs() + frame:SetScript("OnUpdate", nil) +end + +--[[----------------------------------------------------------------------------- +Scripts +-------------------------------------------------------------------------------]] +local function Tab_OnClick(frame) + if not (frame.selected or frame.disabled) then + PlaySound("igCharacterInfoTab") + frame.obj:SelectTab(frame.value) + end +end + +local function Tab_OnEnter(frame) + local self = frame.obj + self:Fire("OnTabEnter", self.tabs[frame.id].value, frame) +end + +local function Tab_OnLeave(frame) + local self = frame.obj + self:Fire("OnTabLeave", self.tabs[frame.id].value, frame) +end + +local function Tab_OnShow(frame) + _G[frame:GetName().."HighlightTexture"]:SetWidth(frame:GetTextWidth() + 30) +end + +--[[----------------------------------------------------------------------------- +Methods +-------------------------------------------------------------------------------]] +local methods = { + ["OnAcquire"] = function(self) + self:SetTitle() + end, + + ["OnRelease"] = function(self) + self.status = nil + for k in pairs(self.localstatus) do + self.localstatus[k] = nil + end + self.tablist = nil + for _, tab in pairs(self.tabs) do + tab:Hide() + end + end, + + ["CreateTab"] = function(self, id) + local tabname = ("AceGUITabGroup%dTab%d"):format(self.num, id) + local tab = CreateFrame("Button", tabname, self.border, "OptionsFrameTabButtonTemplate") + tab.obj = self + tab.id = id + + tab.text = _G[tabname .. "Text"] + tab.text:ClearAllPoints() + tab.text:SetPoint("LEFT", 14, -3) + tab.text:SetPoint("RIGHT", -12, -3) + + tab:SetScript("OnClick", Tab_OnClick) + tab:SetScript("OnEnter", Tab_OnEnter) + tab:SetScript("OnLeave", Tab_OnLeave) + tab:SetScript("OnShow", Tab_OnShow) + + tab._SetText = tab.SetText + tab.SetText = Tab_SetText + tab.SetSelected = Tab_SetSelected + tab.SetDisabled = Tab_SetDisabled + + return tab + end, + + ["SetTitle"] = function(self, text) + self.titletext:SetText(text or "") + if text and text ~= "" then + self.alignoffset = 25 + else + self.alignoffset = 18 + end + self:BuildTabs() + end, + + ["SetStatusTable"] = function(self, status) + assert(type(status) == "table") + self.status = status + end, + + ["SelectTab"] = function(self, value) + local status = self.status or self.localstatus + local found + for i, v in ipairs(self.tabs) do + if v.value == value then + v:SetSelected(true) + found = true + else + v:SetSelected(false) + end + end + status.selected = value + if found then + self:Fire("OnGroupSelected",value) + end + end, + + ["SetTabs"] = function(self, tabs) + self.tablist = tabs + self:BuildTabs() + end, + + + ["BuildTabs"] = function(self) + local hastitle = (self.titletext:GetText() and self.titletext:GetText() ~= "") + local status = self.status or self.localstatus + local tablist = self.tablist + local tabs = self.tabs + + if not tablist then return end + + local width = self.frame.width or self.frame:GetWidth() or 0 + + wipe(widths) + wipe(rowwidths) + wipe(rowends) + + --Place Text into tabs and get thier initial width + for i, v in ipairs(tablist) do + local tab = tabs[i] + if not tab then + tab = self:CreateTab(i) + tabs[i] = tab + end + + tab:Show() + tab:SetText(v.text) + tab:SetDisabled(v.disabled) + tab.value = v.value + + widths[i] = tab:GetWidth() - 6 --tabs are anchored 10 pixels from the right side of the previous one to reduce spacing, but add a fixed 4px padding for the text + end + + for i = (#tablist)+1, #tabs, 1 do + tabs[i]:Hide() + end + + --First pass, find the minimum number of rows needed to hold all tabs and the initial tab layout + local numtabs = #tablist + local numrows = 1 + local usedwidth = 0 + + for i = 1, #tablist do + --If this is not the first tab of a row and there isn't room for it + if usedwidth ~= 0 and (width - usedwidth - widths[i]) < 0 then + rowwidths[numrows] = usedwidth + 10 --first tab in each row takes up an extra 10px + rowends[numrows] = i - 1 + numrows = numrows + 1 + usedwidth = 0 + end + usedwidth = usedwidth + widths[i] + end + rowwidths[numrows] = usedwidth + 10 --first tab in each row takes up an extra 10px + rowends[numrows] = #tablist + + --Fix for single tabs being left on the last row, move a tab from the row above if applicable + if numrows > 1 then + --if the last row has only one tab + if rowends[numrows-1] == numtabs-1 then + --if there are more than 2 tabs in the 2nd last row + if (numrows == 2 and rowends[numrows-1] > 2) or (rowends[numrows] - rowends[numrows-1] > 2) then + --move 1 tab from the second last row to the last, if there is enough space + if (rowwidths[numrows] + widths[numtabs-1]) <= width then + rowends[numrows-1] = rowends[numrows-1] - 1 + rowwidths[numrows] = rowwidths[numrows] + widths[numtabs-1] + rowwidths[numrows-1] = rowwidths[numrows-1] - widths[numtabs-1] + end + end + end + end + + --anchor the rows as defined and resize tabs to fill thier row + local starttab = 1 + for row, endtab in ipairs(rowends) do + local first = true + for tabno = starttab, endtab do + local tab = tabs[tabno] + tab:ClearAllPoints() + if first then + tab:SetPoint("TOPLEFT", self.frame, "TOPLEFT", 0, -(hastitle and 14 or 7)-(row-1)*20 ) + first = false + else + tab:SetPoint("LEFT", tabs[tabno-1], "RIGHT", -10, 0) + end + end + + -- equal padding for each tab to fill the available width, + -- if the used space is above 75% already + -- the 18 pixel is the typical width of a scrollbar, so we can have a tab group inside a scrolling frame, + -- and not have the tabs jump around funny when switching between tabs that need scrolling and those that don't + local padding = 0 + if not (numrows == 1 and rowwidths[1] < width*0.75 - 18) then + padding = (width - rowwidths[row]) / (endtab - starttab+1) + end + + for i = starttab, endtab do + PanelTemplates_TabResize(tabs[i], padding + 4, nil, nil, width, tabs[i]:GetFontString():GetStringWidth()) + end + starttab = endtab + 1 + end + + self.borderoffset = (hastitle and 17 or 10)+((numrows)*20) + self.border:SetPoint("TOPLEFT", 1, -self.borderoffset) + end, + + ["OnWidthSet"] = function(self, width) + local content = self.content + local contentwidth = width - 60 + if contentwidth < 0 then + contentwidth = 0 + end + content:SetWidth(contentwidth) + content.width = contentwidth + self:BuildTabs(self) + self.frame:SetScript("OnUpdate", BuildTabsOnUpdate) + end, + + ["OnHeightSet"] = function(self, height) + local content = self.content + local contentheight = height - (self.borderoffset + 23) + if contentheight < 0 then + contentheight = 0 + end + content:SetHeight(contentheight) + content.height = contentheight + end, + + ["LayoutFinished"] = function(self, width, height) + if self.noAutoHeight then return end + self:SetHeight((height or 0) + (self.borderoffset + 23)) + end +} + +--[[----------------------------------------------------------------------------- +Constructor +-------------------------------------------------------------------------------]] +local PaneBackdrop = { + bgFile = "Interface\\ChatFrame\\ChatFrameBackground", + edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border", + tile = true, tileSize = 16, edgeSize = 16, + insets = { left = 3, right = 3, top = 5, bottom = 3 } +} + +local function Constructor() + local num = AceGUI:GetNextWidgetNum(Type) + local frame = CreateFrame("Frame",nil,UIParent) + frame:SetHeight(100) + frame:SetWidth(100) + frame:SetFrameStrata("FULLSCREEN_DIALOG") + + local titletext = frame:CreateFontString(nil,"OVERLAY","GameFontNormal") + titletext:SetPoint("TOPLEFT", 14, 0) + titletext:SetPoint("TOPRIGHT", -14, 0) + titletext:SetJustifyH("LEFT") + titletext:SetHeight(18) + titletext:SetText("") + + local border = CreateFrame("Frame", nil, frame) + border:SetPoint("TOPLEFT", 1, -27) + border:SetPoint("BOTTOMRIGHT", -1, 3) + border:SetBackdrop(PaneBackdrop) + border:SetBackdropColor(0.1, 0.1, 0.1, 0.5) + border:SetBackdropBorderColor(0.4, 0.4, 0.4) + + local content = CreateFrame("Frame", nil, border) + content:SetPoint("TOPLEFT", 10, -7) + content:SetPoint("BOTTOMRIGHT", -10, 7) + + local widget = { + num = num, + frame = frame, + localstatus = {}, + alignoffset = 18, + titletext = titletext, + border = border, + borderoffset = 27, + tabs = {}, + content = content, + type = Type + } + for method, func in pairs(methods) do + widget[method] = func + end + + return AceGUI:RegisterAsContainer(widget) +end + +AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua b/libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua old mode 100644 new mode 100755 index 603a055..b6b59f0 --- a/libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua @@ -1,707 +1,707 @@ ---[[----------------------------------------------------------------------------- -TreeGroup Container -Container that uses a tree control to switch between groups. --------------------------------------------------------------------------------]] -local Type, Version = "TreeGroup", 34 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local next, pairs, ipairs, assert, type = next, pairs, ipairs, assert, type -local math_min, math_max, floor = math.min, math.max, floor -local select, tremove, unpack, tconcat = select, table.remove, unpack, table.concat - --- WoW APIs -local CreateFrame, UIParent = CreateFrame, UIParent - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: GameTooltip, FONT_COLOR_CODE_CLOSE - --- Recycling functions -local new, del -do - local pool = setmetatable({},{__mode='k'}) - function new() - local t = next(pool) - if t then - pool[t] = nil - return t - else - return {} - end - end - function del(t) - for k in pairs(t) do - t[k] = nil - end - pool[t] = true - end -end - -local DEFAULT_TREE_WIDTH = 175 -local DEFAULT_TREE_SIZABLE = true - ---[[----------------------------------------------------------------------------- -Support functions --------------------------------------------------------------------------------]] -local function GetButtonUniqueValue(line) - local parent = line.parent - if parent and parent.value then - return GetButtonUniqueValue(parent).."\001"..line.value - else - return line.value - end -end - -local function UpdateButton(button, treeline, selected, canExpand, isExpanded) - local self = button.obj - local toggle = button.toggle - local frame = self.frame - local text = treeline.text or "" - local icon = treeline.icon - local iconCoords = treeline.iconCoords - local level = treeline.level - local value = treeline.value - local uniquevalue = treeline.uniquevalue - local disabled = treeline.disabled - - button.treeline = treeline - button.value = value - button.uniquevalue = uniquevalue - if selected then - button:LockHighlight() - button.selected = true - else - button:UnlockHighlight() - button.selected = false - end - local normalTexture = button:GetNormalTexture() - local line = button.line - button.level = level - if ( level == 1 ) then - button:SetNormalFontObject("GameFontNormal") - button:SetHighlightFontObject("GameFontHighlight") - button.text:SetPoint("LEFT", (icon and 16 or 0) + 8, 2) - else - button:SetNormalFontObject("GameFontHighlightSmall") - button:SetHighlightFontObject("GameFontHighlightSmall") - button.text:SetPoint("LEFT", (icon and 16 or 0) + 8 * level, 2) - end - - if disabled then - button:EnableMouse(false) - button.text:SetText("|cff808080"..text..FONT_COLOR_CODE_CLOSE) - else - button.text:SetText(text) - button:EnableMouse(true) - end - - if icon then - button.icon:SetTexture(icon) - button.icon:SetPoint("LEFT", 8 * level, (level == 1) and 0 or 1) - else - button.icon:SetTexture(nil) - end - - if iconCoords then - button.icon:SetTexCoord(unpack(iconCoords)) - else - button.icon:SetTexCoord(0, 1, 0, 1) - end - - if canExpand then - if not isExpanded then - toggle:SetNormalTexture("Interface\\Buttons\\UI-PlusButton-UP") - toggle:SetPushedTexture("Interface\\Buttons\\UI-PlusButton-DOWN") - else - toggle:SetNormalTexture("Interface\\Buttons\\UI-MinusButton-UP") - toggle:SetPushedTexture("Interface\\Buttons\\UI-MinusButton-DOWN") - end - toggle:Show() - else - toggle:Hide() - end -end - -local function ShouldDisplayLevel(tree) - local result = false - for k, v in ipairs(tree) do - if v.children == nil and v.visible ~= false then - result = true - elseif v.children then - result = result or ShouldDisplayLevel(v.children) - end - if result then return result end - end - return false -end - -local function addLine(self, v, tree, level, parent) - local line = new() - line.value = v.value - line.text = v.text - line.icon = v.icon - line.iconCoords = v.iconCoords - line.disabled = v.disabled - line.tree = tree - line.level = level - line.parent = parent - line.visible = v.visible - line.uniquevalue = GetButtonUniqueValue(line) - if v.children then - line.hasChildren = true - else - line.hasChildren = nil - end - self.lines[#self.lines+1] = line - return line -end - ---fire an update after one frame to catch the treeframes height -local function FirstFrameUpdate(frame) - local self = frame.obj - frame:SetScript("OnUpdate", nil) - self:RefreshTree() -end - -local function BuildUniqueValue(...) - local n = select('#', ...) - if n == 1 then - return ... - else - return (...).."\001"..BuildUniqueValue(select(2,...)) - end -end - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function Expand_OnClick(frame) - local button = frame.button - local self = button.obj - local status = (self.status or self.localstatus).groups - status[button.uniquevalue] = not status[button.uniquevalue] - self:RefreshTree() -end - -local function Button_OnClick(frame) - local self = frame.obj - self:Fire("OnClick", frame.uniquevalue, frame.selected) - if not frame.selected then - self:SetSelected(frame.uniquevalue) - frame.selected = true - frame:LockHighlight() - self:RefreshTree() - end - AceGUI:ClearFocus() -end - -local function Button_OnDoubleClick(button) - local self = button.obj - local status = self.status or self.localstatus - local status = (self.status or self.localstatus).groups - status[button.uniquevalue] = not status[button.uniquevalue] - self:RefreshTree() -end - -local function Button_OnEnter(frame) - local self = frame.obj - self:Fire("OnButtonEnter", frame.uniquevalue, frame) - - if self.enabletooltips then - GameTooltip:SetOwner(frame, "ANCHOR_NONE") - GameTooltip:SetPoint("LEFT",frame,"RIGHT") - GameTooltip:SetText(frame.text:GetText() or "", 1, .82, 0, 1) - - GameTooltip:Show() - end -end - -local function Button_OnLeave(frame) - local self = frame.obj - self:Fire("OnButtonLeave", frame.uniquevalue, frame) - - if self.enabletooltips then - GameTooltip:Hide() - end -end - -local function OnScrollValueChanged(frame, value) - if frame.obj.noupdate then return end - local self = frame.obj - local status = self.status or self.localstatus - status.scrollvalue = value - self:RefreshTree() - AceGUI:ClearFocus() -end - -local function Tree_OnSizeChanged(frame) - frame.obj:RefreshTree() -end - -local function Tree_OnMouseWheel(frame, delta) - local self = frame.obj - if self.showscroll then - local scrollbar = self.scrollbar - local min, max = scrollbar:GetMinMaxValues() - local value = scrollbar:GetValue() - local newvalue = math_min(max,math_max(min,value - delta)) - if value ~= newvalue then - scrollbar:SetValue(newvalue) - end - end -end - -local function Dragger_OnLeave(frame) - frame:SetBackdropColor(1, 1, 1, 0) -end - -local function Dragger_OnEnter(frame) - frame:SetBackdropColor(1, 1, 1, 0.8) -end - -local function Dragger_OnMouseDown(frame) - local treeframe = frame:GetParent() - treeframe:StartSizing("RIGHT") -end - -local function Dragger_OnMouseUp(frame) - local treeframe = frame:GetParent() - local self = treeframe.obj - local frame = treeframe:GetParent() - treeframe:StopMovingOrSizing() - --treeframe:SetScript("OnUpdate", nil) - treeframe:SetUserPlaced(false) - --Without this :GetHeight will get stuck on the current height, causing the tree contents to not resize - treeframe:SetHeight(0) - treeframe:SetPoint("TOPLEFT", frame, "TOPLEFT",0,0) - treeframe:SetPoint("BOTTOMLEFT", frame, "BOTTOMLEFT",0,0) - - local status = self.status or self.localstatus - status.treewidth = treeframe:GetWidth() - - treeframe.obj:Fire("OnTreeResize",treeframe:GetWidth()) - -- recalculate the content width - treeframe.obj:OnWidthSet(status.fullwidth) - -- update the layout of the content - treeframe.obj:DoLayout() -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:SetTreeWidth(DEFAULT_TREE_WIDTH, DEFAULT_TREE_SIZABLE) - self:EnableButtonTooltips(true) - end, - - ["OnRelease"] = function(self) - self.status = nil - for k, v in pairs(self.localstatus) do - if k == "groups" then - for k2 in pairs(v) do - v[k2] = nil - end - else - self.localstatus[k] = nil - end - end - self.localstatus.scrollvalue = 0 - self.localstatus.treewidth = DEFAULT_TREE_WIDTH - self.localstatus.treesizable = DEFAULT_TREE_SIZABLE - end, - - ["EnableButtonTooltips"] = function(self, enable) - self.enabletooltips = enable - end, - - ["CreateButton"] = function(self) - local num = AceGUI:GetNextWidgetNum("TreeGroupButton") - local button = CreateFrame("Button", ("AceGUI30TreeButton%d"):format(num), self.treeframe, "OptionsListButtonTemplate") - button.obj = self - - local icon = button:CreateTexture(nil, "OVERLAY") - icon:SetWidth(14) - icon:SetHeight(14) - button.icon = icon - - button:SetScript("OnClick",Button_OnClick) - button:SetScript("OnDoubleClick", Button_OnDoubleClick) - button:SetScript("OnEnter",Button_OnEnter) - button:SetScript("OnLeave",Button_OnLeave) - - button.toggle.button = button - button.toggle:SetScript("OnClick",Expand_OnClick) - - return button - end, - - ["SetStatusTable"] = function(self, status) - assert(type(status) == "table") - self.status = status - if not status.groups then - status.groups = {} - end - if not status.scrollvalue then - status.scrollvalue = 0 - end - if not status.treewidth then - status.treewidth = DEFAULT_TREE_WIDTH - end - if status.treesizable == nil then - status.treesizable = DEFAULT_TREE_SIZABLE - end - self:SetTreeWidth(status.treewidth,status.treesizable) - self:RefreshTree() - end, - - --sets the tree to be displayed - ["SetTree"] = function(self, tree, filter) - self.filter = filter - if tree then - assert(type(tree) == "table") - end - self.tree = tree - self:RefreshTree() - end, - - ["BuildLevel"] = function(self, tree, level, parent) - local groups = (self.status or self.localstatus).groups - local hasChildren = self.hasChildren - - for i, v in ipairs(tree) do - if v.children then - if not self.filter or ShouldDisplayLevel(v.children) then - local line = addLine(self, v, tree, level, parent) - if groups[line.uniquevalue] then - self:BuildLevel(v.children, level+1, line) - end - end - elseif v.visible ~= false or not self.filter then - addLine(self, v, tree, level, parent) - end - end - end, - - ["RefreshTree"] = function(self,scrollToSelection) - local buttons = self.buttons - local lines = self.lines - - for i, v in ipairs(buttons) do - v:Hide() - end - while lines[1] do - local t = tremove(lines) - for k in pairs(t) do - t[k] = nil - end - del(t) - end - - if not self.tree then return end - --Build the list of visible entries from the tree and status tables - local status = self.status or self.localstatus - local groupstatus = status.groups - local tree = self.tree - - local treeframe = self.treeframe - - status.scrollToSelection = status.scrollToSelection or scrollToSelection -- needs to be cached in case the control hasn't been drawn yet (code bails out below) - - self:BuildLevel(tree, 1) - - local numlines = #lines - - local maxlines = (floor(((self.treeframe:GetHeight()or 0) - 20 ) / 18)) - if maxlines <= 0 then return end - - local first, last - - scrollToSelection = status.scrollToSelection - status.scrollToSelection = nil - - if numlines <= maxlines then - --the whole tree fits in the frame - status.scrollvalue = 0 - self:ShowScroll(false) - first, last = 1, numlines - else - self:ShowScroll(true) - --scrolling will be needed - self.noupdate = true - self.scrollbar:SetMinMaxValues(0, numlines - maxlines) - --check if we are scrolled down too far - if numlines - status.scrollvalue < maxlines then - status.scrollvalue = numlines - maxlines - end - self.noupdate = nil - first, last = status.scrollvalue+1, status.scrollvalue + maxlines - --show selection? - if scrollToSelection and status.selected then - local show - for i,line in ipairs(lines) do -- find the line number - if line.uniquevalue==status.selected then - show=i - end - end - if not show then - -- selection was deleted or something? - elseif show>=first and show<=last then - -- all good - else - -- scrolling needed! - if show<first then - status.scrollvalue = show-1 - else - status.scrollvalue = show-maxlines - end - first, last = status.scrollvalue+1, status.scrollvalue + maxlines - end - end - if self.scrollbar:GetValue() ~= status.scrollvalue then - self.scrollbar:SetValue(status.scrollvalue) - end - end - - local buttonnum = 1 - for i = first, last do - local line = lines[i] - local button = buttons[buttonnum] - if not button then - button = self:CreateButton() - - buttons[buttonnum] = button - button:SetParent(treeframe) - button:SetFrameLevel(treeframe:GetFrameLevel()+1) - button:ClearAllPoints() - if buttonnum == 1 then - if self.showscroll then - button:SetPoint("TOPRIGHT", -22, -10) - button:SetPoint("TOPLEFT", 0, -10) - else - button:SetPoint("TOPRIGHT", 0, -10) - button:SetPoint("TOPLEFT", 0, -10) - end - else - button:SetPoint("TOPRIGHT", buttons[buttonnum-1], "BOTTOMRIGHT",0,0) - button:SetPoint("TOPLEFT", buttons[buttonnum-1], "BOTTOMLEFT",0,0) - end - end - - UpdateButton(button, line, status.selected == line.uniquevalue, line.hasChildren, groupstatus[line.uniquevalue] ) - button:Show() - buttonnum = buttonnum + 1 - end - - end, - - ["SetSelected"] = function(self, value) - local status = self.status or self.localstatus - if status.selected ~= value then - status.selected = value - self:Fire("OnGroupSelected", value) - end - end, - - ["Select"] = function(self, uniquevalue, ...) - self.filter = false - local status = self.status or self.localstatus - local groups = status.groups - local path = {...} - for i = 1, #path do - groups[tconcat(path, "\001", 1, i)] = true - end - status.selected = uniquevalue - self:RefreshTree(true) - self:Fire("OnGroupSelected", uniquevalue) - end, - - ["SelectByPath"] = function(self, ...) - self:Select(BuildUniqueValue(...), ...) - end, - - ["SelectByValue"] = function(self, uniquevalue) - self:Select(uniquevalue, ("\001"):split(uniquevalue)) - end, - - ["ShowScroll"] = function(self, show) - self.showscroll = show - if show then - self.scrollbar:Show() - if self.buttons[1] then - self.buttons[1]:SetPoint("TOPRIGHT", self.treeframe,"TOPRIGHT",-22,-10) - end - else - self.scrollbar:Hide() - if self.buttons[1] then - self.buttons[1]:SetPoint("TOPRIGHT", self.treeframe,"TOPRIGHT",0,-10) - end - end - end, - - ["OnWidthSet"] = function(self, width) - local content = self.content - local treeframe = self.treeframe - local status = self.status or self.localstatus - status.fullwidth = width - - local contentwidth = width - status.treewidth - 20 - if contentwidth < 0 then - contentwidth = 0 - end - content:SetWidth(contentwidth) - content.width = contentwidth - - local maxtreewidth = math_min(400, width - 50) - - if maxtreewidth > 100 and status.treewidth > maxtreewidth then - self:SetTreeWidth(maxtreewidth, status.treesizable) - end - treeframe:SetMaxResize(maxtreewidth, 1600) - end, - - ["OnHeightSet"] = function(self, height) - local content = self.content - local contentheight = height - 20 - if contentheight < 0 then - contentheight = 0 - end - content:SetHeight(contentheight) - content.height = contentheight - end, - - ["SetTreeWidth"] = function(self, treewidth, resizable) - if not resizable then - if type(treewidth) == 'number' then - resizable = false - elseif type(treewidth) == 'boolean' then - resizable = treewidth - treewidth = DEFAULT_TREE_WIDTH - else - resizable = false - treewidth = DEFAULT_TREE_WIDTH - end - end - self.treeframe:SetWidth(treewidth) - self.dragger:EnableMouse(resizable) - - local status = self.status or self.localstatus - status.treewidth = treewidth - status.treesizable = resizable - - -- recalculate the content width - if status.fullwidth then - self:OnWidthSet(status.fullwidth) - end - end, - - ["GetTreeWidth"] = function(self) - local status = self.status or self.localstatus - return status.treewidth or DEFAULT_TREE_WIDTH - end, - - ["LayoutFinished"] = function(self, width, height) - if self.noAutoHeight then return end - self:SetHeight((height or 0) + 20) - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local PaneBackdrop = { - bgFile = "Interface\\ChatFrame\\ChatFrameBackground", - edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border", - tile = true, tileSize = 16, edgeSize = 16, - insets = { left = 3, right = 3, top = 5, bottom = 3 } -} - -local DraggerBackdrop = { - bgFile = "Interface\\Tooltips\\UI-Tooltip-Background", - edgeFile = nil, - tile = true, tileSize = 16, edgeSize = 0, - insets = { left = 3, right = 3, top = 7, bottom = 7 } -} - -local function Constructor() - local num = AceGUI:GetNextWidgetNum(Type) - local frame = CreateFrame("Frame", nil, UIParent) - - local treeframe = CreateFrame("Frame", nil, frame) - treeframe:SetPoint("TOPLEFT") - treeframe:SetPoint("BOTTOMLEFT") - treeframe:SetWidth(DEFAULT_TREE_WIDTH) - treeframe:EnableMouseWheel(true) - treeframe:SetBackdrop(PaneBackdrop) - treeframe:SetBackdropColor(0.1, 0.1, 0.1, 0.5) - treeframe:SetBackdropBorderColor(0.4, 0.4, 0.4) - treeframe:SetResizable(true) - treeframe:SetMinResize(100, 1) - treeframe:SetMaxResize(400, 1600) - treeframe:SetScript("OnUpdate", FirstFrameUpdate) - treeframe:SetScript("OnSizeChanged", Tree_OnSizeChanged) - treeframe:SetScript("OnMouseWheel", Tree_OnMouseWheel) - - local dragger = CreateFrame("Frame", nil, treeframe) - dragger:SetWidth(8) - dragger:SetPoint("TOP", treeframe, "TOPRIGHT") - dragger:SetPoint("BOTTOM", treeframe, "BOTTOMRIGHT") - dragger:SetBackdrop(DraggerBackdrop) - dragger:SetBackdropColor(1, 1, 1, 0) - dragger:SetScript("OnEnter", Dragger_OnEnter) - dragger:SetScript("OnLeave", Dragger_OnLeave) - dragger:SetScript("OnMouseDown", Dragger_OnMouseDown) - dragger:SetScript("OnMouseUp", Dragger_OnMouseUp) - - local scrollbar = CreateFrame("Slider", ("AceConfigDialogTreeGroup%dScrollBar"):format(num), treeframe, "UIPanelScrollBarTemplate") - scrollbar:SetScript("OnValueChanged", nil) - scrollbar:SetPoint("TOPRIGHT", -10, -26) - scrollbar:SetPoint("BOTTOMRIGHT", -10, 26) - scrollbar:SetMinMaxValues(0,0) - scrollbar:SetValueStep(1) - scrollbar:SetValue(0) - scrollbar:SetWidth(16) - scrollbar:SetScript("OnValueChanged", OnScrollValueChanged) - - local scrollbg = scrollbar:CreateTexture(nil, "BACKGROUND") - scrollbg:SetAllPoints(scrollbar) - scrollbg:SetTexture(0,0,0,0.4) - - local border = CreateFrame("Frame",nil,frame) - border:SetPoint("TOPLEFT", treeframe, "TOPRIGHT") - border:SetPoint("BOTTOMRIGHT") - border:SetBackdrop(PaneBackdrop) - border:SetBackdropColor(0.1, 0.1, 0.1, 0.5) - border:SetBackdropBorderColor(0.4, 0.4, 0.4) - - --Container Support - local content = CreateFrame("Frame", nil, border) - content:SetPoint("TOPLEFT", 10, -10) - content:SetPoint("BOTTOMRIGHT", -10, 10) - - local widget = { - frame = frame, - lines = {}, - levels = {}, - buttons = {}, - hasChildren = {}, - localstatus = { groups = {}, scrollvalue = 0 }, - filter = false, - treeframe = treeframe, - dragger = dragger, - scrollbar = scrollbar, - border = border, - content = content, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - treeframe.obj, dragger.obj, scrollbar.obj = widget, widget, widget - - return AceGUI:RegisterAsContainer(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) +--[[----------------------------------------------------------------------------- +TreeGroup Container +Container that uses a tree control to switch between groups. +-------------------------------------------------------------------------------]] +local Type, Version = "TreeGroup", 34 +local AceGUI = LibStub and LibStub("AceGUI-3.0", true) +if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end + +-- Lua APIs +local next, pairs, ipairs, assert, type = next, pairs, ipairs, assert, type +local math_min, math_max, floor = math.min, math.max, floor +local select, tremove, unpack, tconcat = select, table.remove, unpack, table.concat + +-- WoW APIs +local CreateFrame, UIParent = CreateFrame, UIParent + +-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded +-- List them here for Mikk's FindGlobals script +-- GLOBALS: GameTooltip, FONT_COLOR_CODE_CLOSE + +-- Recycling functions +local new, del +do + local pool = setmetatable({},{__mode='k'}) + function new() + local t = next(pool) + if t then + pool[t] = nil + return t + else + return {} + end + end + function del(t) + for k in pairs(t) do + t[k] = nil + end + pool[t] = true + end +end + +local DEFAULT_TREE_WIDTH = 175 +local DEFAULT_TREE_SIZABLE = true + +--[[----------------------------------------------------------------------------- +Support functions +-------------------------------------------------------------------------------]] +local function GetButtonUniqueValue(line) + local parent = line.parent + if parent and parent.value then + return GetButtonUniqueValue(parent).."\001"..line.value + else + return line.value + end +end + +local function UpdateButton(button, treeline, selected, canExpand, isExpanded) + local self = button.obj + local toggle = button.toggle + local frame = self.frame + local text = treeline.text or "" + local icon = treeline.icon + local iconCoords = treeline.iconCoords + local level = treeline.level + local value = treeline.value + local uniquevalue = treeline.uniquevalue + local disabled = treeline.disabled + + button.treeline = treeline + button.value = value + button.uniquevalue = uniquevalue + if selected then + button:LockHighlight() + button.selected = true + else + button:UnlockHighlight() + button.selected = false + end + local normalTexture = button:GetNormalTexture() + local line = button.line + button.level = level + if ( level == 1 ) then + button:SetNormalFontObject("GameFontNormal") + button:SetHighlightFontObject("GameFontHighlight") + button.text:SetPoint("LEFT", (icon and 16 or 0) + 8, 2) + else + button:SetNormalFontObject("GameFontHighlightSmall") + button:SetHighlightFontObject("GameFontHighlightSmall") + button.text:SetPoint("LEFT", (icon and 16 or 0) + 8 * level, 2) + end + + if disabled then + button:EnableMouse(false) + button.text:SetText("|cff808080"..text..FONT_COLOR_CODE_CLOSE) + else + button.text:SetText(text) + button:EnableMouse(true) + end + + if icon then + button.icon:SetTexture(icon) + button.icon:SetPoint("LEFT", 8 * level, (level == 1) and 0 or 1) + else + button.icon:SetTexture(nil) + end + + if iconCoords then + button.icon:SetTexCoord(unpack(iconCoords)) + else + button.icon:SetTexCoord(0, 1, 0, 1) + end + + if canExpand then + if not isExpanded then + toggle:SetNormalTexture("Interface\\Buttons\\UI-PlusButton-UP") + toggle:SetPushedTexture("Interface\\Buttons\\UI-PlusButton-DOWN") + else + toggle:SetNormalTexture("Interface\\Buttons\\UI-MinusButton-UP") + toggle:SetPushedTexture("Interface\\Buttons\\UI-MinusButton-DOWN") + end + toggle:Show() + else + toggle:Hide() + end +end + +local function ShouldDisplayLevel(tree) + local result = false + for k, v in ipairs(tree) do + if v.children == nil and v.visible ~= false then + result = true + elseif v.children then + result = result or ShouldDisplayLevel(v.children) + end + if result then return result end + end + return false +end + +local function addLine(self, v, tree, level, parent) + local line = new() + line.value = v.value + line.text = v.text + line.icon = v.icon + line.iconCoords = v.iconCoords + line.disabled = v.disabled + line.tree = tree + line.level = level + line.parent = parent + line.visible = v.visible + line.uniquevalue = GetButtonUniqueValue(line) + if v.children then + line.hasChildren = true + else + line.hasChildren = nil + end + self.lines[#self.lines+1] = line + return line +end + +--fire an update after one frame to catch the treeframes height +local function FirstFrameUpdate(frame) + local self = frame.obj + frame:SetScript("OnUpdate", nil) + self:RefreshTree() +end + +local function BuildUniqueValue(...) + local n = select('#', ...) + if n == 1 then + return ... + else + return (...).."\001"..BuildUniqueValue(select(2,...)) + end +end + +--[[----------------------------------------------------------------------------- +Scripts +-------------------------------------------------------------------------------]] +local function Expand_OnClick(frame) + local button = frame.button + local self = button.obj + local status = (self.status or self.localstatus).groups + status[button.uniquevalue] = not status[button.uniquevalue] + self:RefreshTree() +end + +local function Button_OnClick(frame) + local self = frame.obj + self:Fire("OnClick", frame.uniquevalue, frame.selected) + if not frame.selected then + self:SetSelected(frame.uniquevalue) + frame.selected = true + frame:LockHighlight() + self:RefreshTree() + end + AceGUI:ClearFocus() +end + +local function Button_OnDoubleClick(button) + local self = button.obj + local status = self.status or self.localstatus + local status = (self.status or self.localstatus).groups + status[button.uniquevalue] = not status[button.uniquevalue] + self:RefreshTree() +end + +local function Button_OnEnter(frame) + local self = frame.obj + self:Fire("OnButtonEnter", frame.uniquevalue, frame) + + if self.enabletooltips then + GameTooltip:SetOwner(frame, "ANCHOR_NONE") + GameTooltip:SetPoint("LEFT",frame,"RIGHT") + GameTooltip:SetText(frame.text:GetText() or "", 1, .82, 0, 1) + + GameTooltip:Show() + end +end + +local function Button_OnLeave(frame) + local self = frame.obj + self:Fire("OnButtonLeave", frame.uniquevalue, frame) + + if self.enabletooltips then + GameTooltip:Hide() + end +end + +local function OnScrollValueChanged(frame, value) + if frame.obj.noupdate then return end + local self = frame.obj + local status = self.status or self.localstatus + status.scrollvalue = value + self:RefreshTree() + AceGUI:ClearFocus() +end + +local function Tree_OnSizeChanged(frame) + frame.obj:RefreshTree() +end + +local function Tree_OnMouseWheel(frame, delta) + local self = frame.obj + if self.showscroll then + local scrollbar = self.scrollbar + local min, max = scrollbar:GetMinMaxValues() + local value = scrollbar:GetValue() + local newvalue = math_min(max,math_max(min,value - delta)) + if value ~= newvalue then + scrollbar:SetValue(newvalue) + end + end +end + +local function Dragger_OnLeave(frame) + frame:SetBackdropColor(1, 1, 1, 0) +end + +local function Dragger_OnEnter(frame) + frame:SetBackdropColor(1, 1, 1, 0.8) +end + +local function Dragger_OnMouseDown(frame) + local treeframe = frame:GetParent() + treeframe:StartSizing("RIGHT") +end + +local function Dragger_OnMouseUp(frame) + local treeframe = frame:GetParent() + local self = treeframe.obj + local frame = treeframe:GetParent() + treeframe:StopMovingOrSizing() + --treeframe:SetScript("OnUpdate", nil) + treeframe:SetUserPlaced(false) + --Without this :GetHeight will get stuck on the current height, causing the tree contents to not resize + treeframe:SetHeight(0) + treeframe:SetPoint("TOPLEFT", frame, "TOPLEFT",0,0) + treeframe:SetPoint("BOTTOMLEFT", frame, "BOTTOMLEFT",0,0) + + local status = self.status or self.localstatus + status.treewidth = treeframe:GetWidth() + + treeframe.obj:Fire("OnTreeResize",treeframe:GetWidth()) + -- recalculate the content width + treeframe.obj:OnWidthSet(status.fullwidth) + -- update the layout of the content + treeframe.obj:DoLayout() +end + +--[[----------------------------------------------------------------------------- +Methods +-------------------------------------------------------------------------------]] +local methods = { + ["OnAcquire"] = function(self) + self:SetTreeWidth(DEFAULT_TREE_WIDTH, DEFAULT_TREE_SIZABLE) + self:EnableButtonTooltips(true) + end, + + ["OnRelease"] = function(self) + self.status = nil + for k, v in pairs(self.localstatus) do + if k == "groups" then + for k2 in pairs(v) do + v[k2] = nil + end + else + self.localstatus[k] = nil + end + end + self.localstatus.scrollvalue = 0 + self.localstatus.treewidth = DEFAULT_TREE_WIDTH + self.localstatus.treesizable = DEFAULT_TREE_SIZABLE + end, + + ["EnableButtonTooltips"] = function(self, enable) + self.enabletooltips = enable + end, + + ["CreateButton"] = function(self) + local num = AceGUI:GetNextWidgetNum("TreeGroupButton") + local button = CreateFrame("Button", ("AceGUI30TreeButton%d"):format(num), self.treeframe, "OptionsListButtonTemplate") + button.obj = self + + local icon = button:CreateTexture(nil, "OVERLAY") + icon:SetWidth(14) + icon:SetHeight(14) + button.icon = icon + + button:SetScript("OnClick",Button_OnClick) + button:SetScript("OnDoubleClick", Button_OnDoubleClick) + button:SetScript("OnEnter",Button_OnEnter) + button:SetScript("OnLeave",Button_OnLeave) + + button.toggle.button = button + button.toggle:SetScript("OnClick",Expand_OnClick) + + return button + end, + + ["SetStatusTable"] = function(self, status) + assert(type(status) == "table") + self.status = status + if not status.groups then + status.groups = {} + end + if not status.scrollvalue then + status.scrollvalue = 0 + end + if not status.treewidth then + status.treewidth = DEFAULT_TREE_WIDTH + end + if status.treesizable == nil then + status.treesizable = DEFAULT_TREE_SIZABLE + end + self:SetTreeWidth(status.treewidth,status.treesizable) + self:RefreshTree() + end, + + --sets the tree to be displayed + ["SetTree"] = function(self, tree, filter) + self.filter = filter + if tree then + assert(type(tree) == "table") + end + self.tree = tree + self:RefreshTree() + end, + + ["BuildLevel"] = function(self, tree, level, parent) + local groups = (self.status or self.localstatus).groups + local hasChildren = self.hasChildren + + for i, v in ipairs(tree) do + if v.children then + if not self.filter or ShouldDisplayLevel(v.children) then + local line = addLine(self, v, tree, level, parent) + if groups[line.uniquevalue] then + self:BuildLevel(v.children, level+1, line) + end + end + elseif v.visible ~= false or not self.filter then + addLine(self, v, tree, level, parent) + end + end + end, + + ["RefreshTree"] = function(self,scrollToSelection) + local buttons = self.buttons + local lines = self.lines + + for i, v in ipairs(buttons) do + v:Hide() + end + while lines[1] do + local t = tremove(lines) + for k in pairs(t) do + t[k] = nil + end + del(t) + end + + if not self.tree then return end + --Build the list of visible entries from the tree and status tables + local status = self.status or self.localstatus + local groupstatus = status.groups + local tree = self.tree + + local treeframe = self.treeframe + + status.scrollToSelection = status.scrollToSelection or scrollToSelection -- needs to be cached in case the control hasn't been drawn yet (code bails out below) + + self:BuildLevel(tree, 1) + + local numlines = #lines + + local maxlines = (floor(((self.treeframe:GetHeight()or 0) - 20 ) / 18)) + if maxlines <= 0 then return end + + local first, last + + scrollToSelection = status.scrollToSelection + status.scrollToSelection = nil + + if numlines <= maxlines then + --the whole tree fits in the frame + status.scrollvalue = 0 + self:ShowScroll(false) + first, last = 1, numlines + else + self:ShowScroll(true) + --scrolling will be needed + self.noupdate = true + self.scrollbar:SetMinMaxValues(0, numlines - maxlines) + --check if we are scrolled down too far + if numlines - status.scrollvalue < maxlines then + status.scrollvalue = numlines - maxlines + end + self.noupdate = nil + first, last = status.scrollvalue+1, status.scrollvalue + maxlines + --show selection? + if scrollToSelection and status.selected then + local show + for i,line in ipairs(lines) do -- find the line number + if line.uniquevalue==status.selected then + show=i + end + end + if not show then + -- selection was deleted or something? + elseif show>=first and show<=last then + -- all good + else + -- scrolling needed! + if show<first then + status.scrollvalue = show-1 + else + status.scrollvalue = show-maxlines + end + first, last = status.scrollvalue+1, status.scrollvalue + maxlines + end + end + if self.scrollbar:GetValue() ~= status.scrollvalue then + self.scrollbar:SetValue(status.scrollvalue) + end + end + + local buttonnum = 1 + for i = first, last do + local line = lines[i] + local button = buttons[buttonnum] + if not button then + button = self:CreateButton() + + buttons[buttonnum] = button + button:SetParent(treeframe) + button:SetFrameLevel(treeframe:GetFrameLevel()+1) + button:ClearAllPoints() + if buttonnum == 1 then + if self.showscroll then + button:SetPoint("TOPRIGHT", -22, -10) + button:SetPoint("TOPLEFT", 0, -10) + else + button:SetPoint("TOPRIGHT", 0, -10) + button:SetPoint("TOPLEFT", 0, -10) + end + else + button:SetPoint("TOPRIGHT", buttons[buttonnum-1], "BOTTOMRIGHT",0,0) + button:SetPoint("TOPLEFT", buttons[buttonnum-1], "BOTTOMLEFT",0,0) + end + end + + UpdateButton(button, line, status.selected == line.uniquevalue, line.hasChildren, groupstatus[line.uniquevalue] ) + button:Show() + buttonnum = buttonnum + 1 + end + + end, + + ["SetSelected"] = function(self, value) + local status = self.status or self.localstatus + if status.selected ~= value then + status.selected = value + self:Fire("OnGroupSelected", value) + end + end, + + ["Select"] = function(self, uniquevalue, ...) + self.filter = false + local status = self.status or self.localstatus + local groups = status.groups + local path = {...} + for i = 1, #path do + groups[tconcat(path, "\001", 1, i)] = true + end + status.selected = uniquevalue + self:RefreshTree(true) + self:Fire("OnGroupSelected", uniquevalue) + end, + + ["SelectByPath"] = function(self, ...) + self:Select(BuildUniqueValue(...), ...) + end, + + ["SelectByValue"] = function(self, uniquevalue) + self:Select(uniquevalue, ("\001"):split(uniquevalue)) + end, + + ["ShowScroll"] = function(self, show) + self.showscroll = show + if show then + self.scrollbar:Show() + if self.buttons[1] then + self.buttons[1]:SetPoint("TOPRIGHT", self.treeframe,"TOPRIGHT",-22,-10) + end + else + self.scrollbar:Hide() + if self.buttons[1] then + self.buttons[1]:SetPoint("TOPRIGHT", self.treeframe,"TOPRIGHT",0,-10) + end + end + end, + + ["OnWidthSet"] = function(self, width) + local content = self.content + local treeframe = self.treeframe + local status = self.status or self.localstatus + status.fullwidth = width + + local contentwidth = width - status.treewidth - 20 + if contentwidth < 0 then + contentwidth = 0 + end + content:SetWidth(contentwidth) + content.width = contentwidth + + local maxtreewidth = math_min(400, width - 50) + + if maxtreewidth > 100 and status.treewidth > maxtreewidth then + self:SetTreeWidth(maxtreewidth, status.treesizable) + end + treeframe:SetMaxResize(maxtreewidth, 1600) + end, + + ["OnHeightSet"] = function(self, height) + local content = self.content + local contentheight = height - 20 + if contentheight < 0 then + contentheight = 0 + end + content:SetHeight(contentheight) + content.height = contentheight + end, + + ["SetTreeWidth"] = function(self, treewidth, resizable) + if not resizable then + if type(treewidth) == 'number' then + resizable = false + elseif type(treewidth) == 'boolean' then + resizable = treewidth + treewidth = DEFAULT_TREE_WIDTH + else + resizable = false + treewidth = DEFAULT_TREE_WIDTH + end + end + self.treeframe:SetWidth(treewidth) + self.dragger:EnableMouse(resizable) + + local status = self.status or self.localstatus + status.treewidth = treewidth + status.treesizable = resizable + + -- recalculate the content width + if status.fullwidth then + self:OnWidthSet(status.fullwidth) + end + end, + + ["GetTreeWidth"] = function(self) + local status = self.status or self.localstatus + return status.treewidth or DEFAULT_TREE_WIDTH + end, + + ["LayoutFinished"] = function(self, width, height) + if self.noAutoHeight then return end + self:SetHeight((height or 0) + 20) + end +} + +--[[----------------------------------------------------------------------------- +Constructor +-------------------------------------------------------------------------------]] +local PaneBackdrop = { + bgFile = "Interface\\ChatFrame\\ChatFrameBackground", + edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border", + tile = true, tileSize = 16, edgeSize = 16, + insets = { left = 3, right = 3, top = 5, bottom = 3 } +} + +local DraggerBackdrop = { + bgFile = "Interface\\Tooltips\\UI-Tooltip-Background", + edgeFile = nil, + tile = true, tileSize = 16, edgeSize = 0, + insets = { left = 3, right = 3, top = 7, bottom = 7 } +} + +local function Constructor() + local num = AceGUI:GetNextWidgetNum(Type) + local frame = CreateFrame("Frame", nil, UIParent) + + local treeframe = CreateFrame("Frame", nil, frame) + treeframe:SetPoint("TOPLEFT") + treeframe:SetPoint("BOTTOMLEFT") + treeframe:SetWidth(DEFAULT_TREE_WIDTH) + treeframe:EnableMouseWheel(true) + treeframe:SetBackdrop(PaneBackdrop) + treeframe:SetBackdropColor(0.1, 0.1, 0.1, 0.5) + treeframe:SetBackdropBorderColor(0.4, 0.4, 0.4) + treeframe:SetResizable(true) + treeframe:SetMinResize(100, 1) + treeframe:SetMaxResize(400, 1600) + treeframe:SetScript("OnUpdate", FirstFrameUpdate) + treeframe:SetScript("OnSizeChanged", Tree_OnSizeChanged) + treeframe:SetScript("OnMouseWheel", Tree_OnMouseWheel) + + local dragger = CreateFrame("Frame", nil, treeframe) + dragger:SetWidth(8) + dragger:SetPoint("TOP", treeframe, "TOPRIGHT") + dragger:SetPoint("BOTTOM", treeframe, "BOTTOMRIGHT") + dragger:SetBackdrop(DraggerBackdrop) + dragger:SetBackdropColor(1, 1, 1, 0) + dragger:SetScript("OnEnter", Dragger_OnEnter) + dragger:SetScript("OnLeave", Dragger_OnLeave) + dragger:SetScript("OnMouseDown", Dragger_OnMouseDown) + dragger:SetScript("OnMouseUp", Dragger_OnMouseUp) + + local scrollbar = CreateFrame("Slider", ("AceConfigDialogTreeGroup%dScrollBar"):format(num), treeframe, "UIPanelScrollBarTemplate") + scrollbar:SetScript("OnValueChanged", nil) + scrollbar:SetPoint("TOPRIGHT", -10, -26) + scrollbar:SetPoint("BOTTOMRIGHT", -10, 26) + scrollbar:SetMinMaxValues(0,0) + scrollbar:SetValueStep(1) + scrollbar:SetValue(0) + scrollbar:SetWidth(16) + scrollbar:SetScript("OnValueChanged", OnScrollValueChanged) + + local scrollbg = scrollbar:CreateTexture(nil, "BACKGROUND") + scrollbg:SetAllPoints(scrollbar) + scrollbg:SetTexture(0,0,0,0.4) + + local border = CreateFrame("Frame",nil,frame) + border:SetPoint("TOPLEFT", treeframe, "TOPRIGHT") + border:SetPoint("BOTTOMRIGHT") + border:SetBackdrop(PaneBackdrop) + border:SetBackdropColor(0.1, 0.1, 0.1, 0.5) + border:SetBackdropBorderColor(0.4, 0.4, 0.4) + + --Container Support + local content = CreateFrame("Frame", nil, border) + content:SetPoint("TOPLEFT", 10, -10) + content:SetPoint("BOTTOMRIGHT", -10, 10) + + local widget = { + frame = frame, + lines = {}, + levels = {}, + buttons = {}, + hasChildren = {}, + localstatus = { groups = {}, scrollvalue = 0 }, + filter = false, + treeframe = treeframe, + dragger = dragger, + scrollbar = scrollbar, + border = border, + content = content, + type = Type + } + for method, func in pairs(methods) do + widget[method] = func + end + treeframe.obj, dragger.obj, scrollbar.obj = widget, widget, widget + + return AceGUI:RegisterAsContainer(widget) +end + +AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua b/libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua old mode 100644 new mode 100755 index 33ed7d8..bb0a2a2 --- a/libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua @@ -1,331 +1,331 @@ -local AceGUI = LibStub("AceGUI-3.0") - --- Lua APIs -local pairs, assert, type = pairs, assert, type - --- WoW APIs -local PlaySound = PlaySound -local CreateFrame, UIParent = CreateFrame, UIParent - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: GameFontNormal - ----------------- --- Main Frame -- ----------------- ---[[ - Events : - OnClose - -]] -do - local Type = "Window" - local Version = 4 - - local function frameOnClose(this) - this.obj:Fire("OnClose") - end - - local function closeOnClick(this) - PlaySound("gsTitleOptionExit") - this.obj:Hide() - end - - local function frameOnMouseDown(this) - AceGUI:ClearFocus() - end - - local function titleOnMouseDown(this) - this:GetParent():StartMoving() - AceGUI:ClearFocus() - end - - local function frameOnMouseUp(this) - local frame = this:GetParent() - frame:StopMovingOrSizing() - local self = frame.obj - local status = self.status or self.localstatus - status.width = frame:GetWidth() - status.height = frame:GetHeight() - status.top = frame:GetTop() - status.left = frame:GetLeft() - end - - local function sizerseOnMouseDown(this) - this:GetParent():StartSizing("BOTTOMRIGHT") - AceGUI:ClearFocus() - end - - local function sizersOnMouseDown(this) - this:GetParent():StartSizing("BOTTOM") - AceGUI:ClearFocus() - end - - local function sizereOnMouseDown(this) - this:GetParent():StartSizing("RIGHT") - AceGUI:ClearFocus() - end - - local function sizerOnMouseUp(this) - this:GetParent():StopMovingOrSizing() - end - - local function SetTitle(self,title) - self.titletext:SetText(title) - end - - local function SetStatusText(self,text) - -- self.statustext:SetText(text) - end - - local function Hide(self) - self.frame:Hide() - end - - local function Show(self) - self.frame:Show() - end - - local function OnAcquire(self) - self.frame:SetParent(UIParent) - self.frame:SetFrameStrata("FULLSCREEN_DIALOG") - self:ApplyStatus() - self:EnableResize(true) - self:Show() - end - - local function OnRelease(self) - self.status = nil - for k in pairs(self.localstatus) do - self.localstatus[k] = nil - end - end - - -- called to set an external table to store status in - local function SetStatusTable(self, status) - assert(type(status) == "table") - self.status = status - self:ApplyStatus() - end - - local function ApplyStatus(self) - local status = self.status or self.localstatus - local frame = self.frame - self:SetWidth(status.width or 700) - self:SetHeight(status.height or 500) - if status.top and status.left then - frame:SetPoint("TOP",UIParent,"BOTTOM",0,status.top) - frame:SetPoint("LEFT",UIParent,"LEFT",status.left,0) - else - frame:SetPoint("CENTER",UIParent,"CENTER") - end - end - - local function OnWidthSet(self, width) - local content = self.content - local contentwidth = width - 34 - if contentwidth < 0 then - contentwidth = 0 - end - content:SetWidth(contentwidth) - content.width = contentwidth - end - - - local function OnHeightSet(self, height) - local content = self.content - local contentheight = height - 57 - if contentheight < 0 then - contentheight = 0 - end - content:SetHeight(contentheight) - content.height = contentheight - end - - local function EnableResize(self, state) - local func = state and "Show" or "Hide" - self.sizer_se[func](self.sizer_se) - self.sizer_s[func](self.sizer_s) - self.sizer_e[func](self.sizer_e) - end - - local function Constructor() - local frame = CreateFrame("Frame",nil,UIParent) - local self = {} - self.type = "Window" - - self.Hide = Hide - self.Show = Show - self.SetTitle = SetTitle - self.OnRelease = OnRelease - self.OnAcquire = OnAcquire - self.SetStatusText = SetStatusText - self.SetStatusTable = SetStatusTable - self.ApplyStatus = ApplyStatus - self.OnWidthSet = OnWidthSet - self.OnHeightSet = OnHeightSet - self.EnableResize = EnableResize - - self.localstatus = {} - - self.frame = frame - frame.obj = self - frame:SetWidth(700) - frame:SetHeight(500) - frame:SetPoint("CENTER",UIParent,"CENTER",0,0) - frame:EnableMouse() - frame:SetMovable(true) - frame:SetResizable(true) - frame:SetFrameStrata("FULLSCREEN_DIALOG") - frame:SetScript("OnMouseDown", frameOnMouseDown) - - frame:SetScript("OnHide",frameOnClose) - frame:SetMinResize(240,240) - frame:SetToplevel(true) - - local titlebg = frame:CreateTexture(nil, "BACKGROUND") - titlebg:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Title-Background]]) - titlebg:SetPoint("TOPLEFT", 9, -6) - titlebg:SetPoint("BOTTOMRIGHT", frame, "TOPRIGHT", -28, -24) - - local dialogbg = frame:CreateTexture(nil, "BACKGROUND") - dialogbg:SetTexture([[Interface\Tooltips\UI-Tooltip-Background]]) - dialogbg:SetPoint("TOPLEFT", 8, -24) - dialogbg:SetPoint("BOTTOMRIGHT", -6, 8) - dialogbg:SetVertexColor(0, 0, 0, .75) - - local topleft = frame:CreateTexture(nil, "BORDER") - topleft:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]]) - topleft:SetWidth(64) - topleft:SetHeight(64) - topleft:SetPoint("TOPLEFT") - topleft:SetTexCoord(0.501953125, 0.625, 0, 1) - - local topright = frame:CreateTexture(nil, "BORDER") - topright:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]]) - topright:SetWidth(64) - topright:SetHeight(64) - topright:SetPoint("TOPRIGHT") - topright:SetTexCoord(0.625, 0.75, 0, 1) - - local top = frame:CreateTexture(nil, "BORDER") - top:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]]) - top:SetHeight(64) - top:SetPoint("TOPLEFT", topleft, "TOPRIGHT") - top:SetPoint("TOPRIGHT", topright, "TOPLEFT") - top:SetTexCoord(0.25, 0.369140625, 0, 1) - - local bottomleft = frame:CreateTexture(nil, "BORDER") - bottomleft:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]]) - bottomleft:SetWidth(64) - bottomleft:SetHeight(64) - bottomleft:SetPoint("BOTTOMLEFT") - bottomleft:SetTexCoord(0.751953125, 0.875, 0, 1) - - local bottomright = frame:CreateTexture(nil, "BORDER") - bottomright:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]]) - bottomright:SetWidth(64) - bottomright:SetHeight(64) - bottomright:SetPoint("BOTTOMRIGHT") - bottomright:SetTexCoord(0.875, 1, 0, 1) - - local bottom = frame:CreateTexture(nil, "BORDER") - bottom:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]]) - bottom:SetHeight(64) - bottom:SetPoint("BOTTOMLEFT", bottomleft, "BOTTOMRIGHT") - bottom:SetPoint("BOTTOMRIGHT", bottomright, "BOTTOMLEFT") - bottom:SetTexCoord(0.376953125, 0.498046875, 0, 1) - - local left = frame:CreateTexture(nil, "BORDER") - left:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]]) - left:SetWidth(64) - left:SetPoint("TOPLEFT", topleft, "BOTTOMLEFT") - left:SetPoint("BOTTOMLEFT", bottomleft, "TOPLEFT") - left:SetTexCoord(0.001953125, 0.125, 0, 1) - - local right = frame:CreateTexture(nil, "BORDER") - right:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]]) - right:SetWidth(64) - right:SetPoint("TOPRIGHT", topright, "BOTTOMRIGHT") - right:SetPoint("BOTTOMRIGHT", bottomright, "TOPRIGHT") - right:SetTexCoord(0.1171875, 0.2421875, 0, 1) - - local close = CreateFrame("Button", nil, frame, "UIPanelCloseButton") - close:SetPoint("TOPRIGHT", 2, 1) - close:SetScript("OnClick", closeOnClick) - self.closebutton = close - close.obj = self - - local titletext = frame:CreateFontString(nil, "ARTWORK") - titletext:SetFontObject(GameFontNormal) - titletext:SetPoint("TOPLEFT", 12, -8) - titletext:SetPoint("TOPRIGHT", -32, -8) - self.titletext = titletext - - local title = CreateFrame("Button", nil, frame) - title:SetPoint("TOPLEFT", titlebg) - title:SetPoint("BOTTOMRIGHT", titlebg) - title:EnableMouse() - title:SetScript("OnMouseDown",titleOnMouseDown) - title:SetScript("OnMouseUp", frameOnMouseUp) - self.title = title - - local sizer_se = CreateFrame("Frame",nil,frame) - sizer_se:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,0) - sizer_se:SetWidth(25) - sizer_se:SetHeight(25) - sizer_se:EnableMouse() - sizer_se:SetScript("OnMouseDown",sizerseOnMouseDown) - sizer_se:SetScript("OnMouseUp", sizerOnMouseUp) - self.sizer_se = sizer_se - - local line1 = sizer_se:CreateTexture(nil, "BACKGROUND") - self.line1 = line1 - line1:SetWidth(14) - line1:SetHeight(14) - line1:SetPoint("BOTTOMRIGHT", -8, 8) - line1:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border") - local x = 0.1 * 14/17 - line1:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5) - - local line2 = sizer_se:CreateTexture(nil, "BACKGROUND") - self.line2 = line2 - line2:SetWidth(8) - line2:SetHeight(8) - line2:SetPoint("BOTTOMRIGHT", -8, 8) - line2:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border") - local x = 0.1 * 8/17 - line2:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5) - - local sizer_s = CreateFrame("Frame",nil,frame) - sizer_s:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-25,0) - sizer_s:SetPoint("BOTTOMLEFT",frame,"BOTTOMLEFT",0,0) - sizer_s:SetHeight(25) - sizer_s:EnableMouse() - sizer_s:SetScript("OnMouseDown",sizersOnMouseDown) - sizer_s:SetScript("OnMouseUp", sizerOnMouseUp) - self.sizer_s = sizer_s - - local sizer_e = CreateFrame("Frame",nil,frame) - sizer_e:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,25) - sizer_e:SetPoint("TOPRIGHT",frame,"TOPRIGHT",0,0) - sizer_e:SetWidth(25) - sizer_e:EnableMouse() - sizer_e:SetScript("OnMouseDown",sizereOnMouseDown) - sizer_e:SetScript("OnMouseUp", sizerOnMouseUp) - self.sizer_e = sizer_e - - --Container Support - local content = CreateFrame("Frame",nil,frame) - self.content = content - content.obj = self - content:SetPoint("TOPLEFT",frame,"TOPLEFT",12,-32) - content:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-12,13) - - AceGUI:RegisterAsContainer(self) - return self - end - - AceGUI:RegisterWidgetType(Type,Constructor,Version) -end +local AceGUI = LibStub("AceGUI-3.0") + +-- Lua APIs +local pairs, assert, type = pairs, assert, type + +-- WoW APIs +local PlaySound = PlaySound +local CreateFrame, UIParent = CreateFrame, UIParent + +-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded +-- List them here for Mikk's FindGlobals script +-- GLOBALS: GameFontNormal + +---------------- +-- Main Frame -- +---------------- +--[[ + Events : + OnClose + +]] +do + local Type = "Window" + local Version = 4 + + local function frameOnClose(this) + this.obj:Fire("OnClose") + end + + local function closeOnClick(this) + PlaySound("gsTitleOptionExit") + this.obj:Hide() + end + + local function frameOnMouseDown(this) + AceGUI:ClearFocus() + end + + local function titleOnMouseDown(this) + this:GetParent():StartMoving() + AceGUI:ClearFocus() + end + + local function frameOnMouseUp(this) + local frame = this:GetParent() + frame:StopMovingOrSizing() + local self = frame.obj + local status = self.status or self.localstatus + status.width = frame:GetWidth() + status.height = frame:GetHeight() + status.top = frame:GetTop() + status.left = frame:GetLeft() + end + + local function sizerseOnMouseDown(this) + this:GetParent():StartSizing("BOTTOMRIGHT") + AceGUI:ClearFocus() + end + + local function sizersOnMouseDown(this) + this:GetParent():StartSizing("BOTTOM") + AceGUI:ClearFocus() + end + + local function sizereOnMouseDown(this) + this:GetParent():StartSizing("RIGHT") + AceGUI:ClearFocus() + end + + local function sizerOnMouseUp(this) + this:GetParent():StopMovingOrSizing() + end + + local function SetTitle(self,title) + self.titletext:SetText(title) + end + + local function SetStatusText(self,text) + -- self.statustext:SetText(text) + end + + local function Hide(self) + self.frame:Hide() + end + + local function Show(self) + self.frame:Show() + end + + local function OnAcquire(self) + self.frame:SetParent(UIParent) + self.frame:SetFrameStrata("FULLSCREEN_DIALOG") + self:ApplyStatus() + self:EnableResize(true) + self:Show() + end + + local function OnRelease(self) + self.status = nil + for k in pairs(self.localstatus) do + self.localstatus[k] = nil + end + end + + -- called to set an external table to store status in + local function SetStatusTable(self, status) + assert(type(status) == "table") + self.status = status + self:ApplyStatus() + end + + local function ApplyStatus(self) + local status = self.status or self.localstatus + local frame = self.frame + self:SetWidth(status.width or 700) + self:SetHeight(status.height or 500) + if status.top and status.left then + frame:SetPoint("TOP",UIParent,"BOTTOM",0,status.top) + frame:SetPoint("LEFT",UIParent,"LEFT",status.left,0) + else + frame:SetPoint("CENTER",UIParent,"CENTER") + end + end + + local function OnWidthSet(self, width) + local content = self.content + local contentwidth = width - 34 + if contentwidth < 0 then + contentwidth = 0 + end + content:SetWidth(contentwidth) + content.width = contentwidth + end + + + local function OnHeightSet(self, height) + local content = self.content + local contentheight = height - 57 + if contentheight < 0 then + contentheight = 0 + end + content:SetHeight(contentheight) + content.height = contentheight + end + + local function EnableResize(self, state) + local func = state and "Show" or "Hide" + self.sizer_se[func](self.sizer_se) + self.sizer_s[func](self.sizer_s) + self.sizer_e[func](self.sizer_e) + end + + local function Constructor() + local frame = CreateFrame("Frame",nil,UIParent) + local self = {} + self.type = "Window" + + self.Hide = Hide + self.Show = Show + self.SetTitle = SetTitle + self.OnRelease = OnRelease + self.OnAcquire = OnAcquire + self.SetStatusText = SetStatusText + self.SetStatusTable = SetStatusTable + self.ApplyStatus = ApplyStatus + self.OnWidthSet = OnWidthSet + self.OnHeightSet = OnHeightSet + self.EnableResize = EnableResize + + self.localstatus = {} + + self.frame = frame + frame.obj = self + frame:SetWidth(700) + frame:SetHeight(500) + frame:SetPoint("CENTER",UIParent,"CENTER",0,0) + frame:EnableMouse() + frame:SetMovable(true) + frame:SetResizable(true) + frame:SetFrameStrata("FULLSCREEN_DIALOG") + frame:SetScript("OnMouseDown", frameOnMouseDown) + + frame:SetScript("OnHide",frameOnClose) + frame:SetMinResize(240,240) + frame:SetToplevel(true) + + local titlebg = frame:CreateTexture(nil, "BACKGROUND") + titlebg:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Title-Background]]) + titlebg:SetPoint("TOPLEFT", 9, -6) + titlebg:SetPoint("BOTTOMRIGHT", frame, "TOPRIGHT", -28, -24) + + local dialogbg = frame:CreateTexture(nil, "BACKGROUND") + dialogbg:SetTexture([[Interface\Tooltips\UI-Tooltip-Background]]) + dialogbg:SetPoint("TOPLEFT", 8, -24) + dialogbg:SetPoint("BOTTOMRIGHT", -6, 8) + dialogbg:SetVertexColor(0, 0, 0, .75) + + local topleft = frame:CreateTexture(nil, "BORDER") + topleft:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]]) + topleft:SetWidth(64) + topleft:SetHeight(64) + topleft:SetPoint("TOPLEFT") + topleft:SetTexCoord(0.501953125, 0.625, 0, 1) + + local topright = frame:CreateTexture(nil, "BORDER") + topright:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]]) + topright:SetWidth(64) + topright:SetHeight(64) + topright:SetPoint("TOPRIGHT") + topright:SetTexCoord(0.625, 0.75, 0, 1) + + local top = frame:CreateTexture(nil, "BORDER") + top:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]]) + top:SetHeight(64) + top:SetPoint("TOPLEFT", topleft, "TOPRIGHT") + top:SetPoint("TOPRIGHT", topright, "TOPLEFT") + top:SetTexCoord(0.25, 0.369140625, 0, 1) + + local bottomleft = frame:CreateTexture(nil, "BORDER") + bottomleft:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]]) + bottomleft:SetWidth(64) + bottomleft:SetHeight(64) + bottomleft:SetPoint("BOTTOMLEFT") + bottomleft:SetTexCoord(0.751953125, 0.875, 0, 1) + + local bottomright = frame:CreateTexture(nil, "BORDER") + bottomright:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]]) + bottomright:SetWidth(64) + bottomright:SetHeight(64) + bottomright:SetPoint("BOTTOMRIGHT") + bottomright:SetTexCoord(0.875, 1, 0, 1) + + local bottom = frame:CreateTexture(nil, "BORDER") + bottom:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]]) + bottom:SetHeight(64) + bottom:SetPoint("BOTTOMLEFT", bottomleft, "BOTTOMRIGHT") + bottom:SetPoint("BOTTOMRIGHT", bottomright, "BOTTOMLEFT") + bottom:SetTexCoord(0.376953125, 0.498046875, 0, 1) + + local left = frame:CreateTexture(nil, "BORDER") + left:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]]) + left:SetWidth(64) + left:SetPoint("TOPLEFT", topleft, "BOTTOMLEFT") + left:SetPoint("BOTTOMLEFT", bottomleft, "TOPLEFT") + left:SetTexCoord(0.001953125, 0.125, 0, 1) + + local right = frame:CreateTexture(nil, "BORDER") + right:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]]) + right:SetWidth(64) + right:SetPoint("TOPRIGHT", topright, "BOTTOMRIGHT") + right:SetPoint("BOTTOMRIGHT", bottomright, "TOPRIGHT") + right:SetTexCoord(0.1171875, 0.2421875, 0, 1) + + local close = CreateFrame("Button", nil, frame, "UIPanelCloseButton") + close:SetPoint("TOPRIGHT", 2, 1) + close:SetScript("OnClick", closeOnClick) + self.closebutton = close + close.obj = self + + local titletext = frame:CreateFontString(nil, "ARTWORK") + titletext:SetFontObject(GameFontNormal) + titletext:SetPoint("TOPLEFT", 12, -8) + titletext:SetPoint("TOPRIGHT", -32, -8) + self.titletext = titletext + + local title = CreateFrame("Button", nil, frame) + title:SetPoint("TOPLEFT", titlebg) + title:SetPoint("BOTTOMRIGHT", titlebg) + title:EnableMouse() + title:SetScript("OnMouseDown",titleOnMouseDown) + title:SetScript("OnMouseUp", frameOnMouseUp) + self.title = title + + local sizer_se = CreateFrame("Frame",nil,frame) + sizer_se:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,0) + sizer_se:SetWidth(25) + sizer_se:SetHeight(25) + sizer_se:EnableMouse() + sizer_se:SetScript("OnMouseDown",sizerseOnMouseDown) + sizer_se:SetScript("OnMouseUp", sizerOnMouseUp) + self.sizer_se = sizer_se + + local line1 = sizer_se:CreateTexture(nil, "BACKGROUND") + self.line1 = line1 + line1:SetWidth(14) + line1:SetHeight(14) + line1:SetPoint("BOTTOMRIGHT", -8, 8) + line1:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border") + local x = 0.1 * 14/17 + line1:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5) + + local line2 = sizer_se:CreateTexture(nil, "BACKGROUND") + self.line2 = line2 + line2:SetWidth(8) + line2:SetHeight(8) + line2:SetPoint("BOTTOMRIGHT", -8, 8) + line2:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border") + local x = 0.1 * 8/17 + line2:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5) + + local sizer_s = CreateFrame("Frame",nil,frame) + sizer_s:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-25,0) + sizer_s:SetPoint("BOTTOMLEFT",frame,"BOTTOMLEFT",0,0) + sizer_s:SetHeight(25) + sizer_s:EnableMouse() + sizer_s:SetScript("OnMouseDown",sizersOnMouseDown) + sizer_s:SetScript("OnMouseUp", sizerOnMouseUp) + self.sizer_s = sizer_s + + local sizer_e = CreateFrame("Frame",nil,frame) + sizer_e:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,25) + sizer_e:SetPoint("TOPRIGHT",frame,"TOPRIGHT",0,0) + sizer_e:SetWidth(25) + sizer_e:EnableMouse() + sizer_e:SetScript("OnMouseDown",sizereOnMouseDown) + sizer_e:SetScript("OnMouseUp", sizerOnMouseUp) + self.sizer_e = sizer_e + + --Container Support + local content = CreateFrame("Frame",nil,frame) + self.content = content + content.obj = self + content:SetPoint("TOPLEFT",frame,"TOPLEFT",12,-32) + content:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-12,13) + + AceGUI:RegisterAsContainer(self) + return self + end + + AceGUI:RegisterWidgetType(Type,Constructor,Version) +end diff --git a/libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua b/libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua old mode 100644 new mode 100755 index 38d4c06..fd95cb7 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua @@ -1,92 +1,98 @@ ---[[----------------------------------------------------------------------------- -Button Widget -Graphical Button. --------------------------------------------------------------------------------]] -local Type, Version = "Button", 21 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local pairs = pairs - --- WoW APIs -local _G = _G -local PlaySound, CreateFrame, UIParent = PlaySound, CreateFrame, UIParent - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function Button_OnClick(frame, ...) - AceGUI:ClearFocus() - PlaySound("igMainMenuOption") - frame.obj:Fire("OnClick", ...) -end - -local function Control_OnEnter(frame) - frame.obj:Fire("OnEnter") -end - -local function Control_OnLeave(frame) - frame.obj:Fire("OnLeave") -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - -- restore default values - self:SetHeight(24) - self:SetWidth(200) - self:SetDisabled(false) - self:SetText() - end, - - -- ["OnRelease"] = nil, - - ["SetText"] = function(self, text) - self.text:SetText(text) - end, - - ["SetDisabled"] = function(self, disabled) - self.disabled = disabled - if disabled then - self.frame:Disable() - else - self.frame:Enable() - end - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local function Constructor() - local name = "AceGUI30Button" .. AceGUI:GetNextWidgetNum(Type) - local frame = CreateFrame("Button", name, UIParent, "UIPanelButtonTemplate2") - frame:Hide() - - frame:EnableMouse(true) - frame:SetScript("OnClick", Button_OnClick) - frame:SetScript("OnEnter", Control_OnEnter) - frame:SetScript("OnLeave", Control_OnLeave) - - local text = frame:GetFontString() - text:ClearAllPoints() - text:SetPoint("TOPLEFT", 15, -1) - text:SetPoint("BOTTOMRIGHT", -15, 1) - text:SetJustifyV("MIDDLE") - - local widget = { - text = text, - frame = frame, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - - return AceGUI:RegisterAsWidget(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) +--[[----------------------------------------------------------------------------- +Button Widget +Graphical Button. +-------------------------------------------------------------------------------]] +local Type, Version = "Button", 22 +local AceGUI = LibStub and LibStub("AceGUI-3.0", true) +if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end + +-- Lua APIs +local pairs = pairs + +-- WoW APIs +local _G = _G +local PlaySound, CreateFrame, UIParent = PlaySound, CreateFrame, UIParent + +local wowMoP +do + local _, _, _, interface = GetBuildInfo() + wowMoP = (interface >= 50000) +end + +--[[----------------------------------------------------------------------------- +Scripts +-------------------------------------------------------------------------------]] +local function Button_OnClick(frame, ...) + AceGUI:ClearFocus() + PlaySound("igMainMenuOption") + frame.obj:Fire("OnClick", ...) +end + +local function Control_OnEnter(frame) + frame.obj:Fire("OnEnter") +end + +local function Control_OnLeave(frame) + frame.obj:Fire("OnLeave") +end + +--[[----------------------------------------------------------------------------- +Methods +-------------------------------------------------------------------------------]] +local methods = { + ["OnAcquire"] = function(self) + -- restore default values + self:SetHeight(24) + self:SetWidth(200) + self:SetDisabled(false) + self:SetText() + end, + + -- ["OnRelease"] = nil, + + ["SetText"] = function(self, text) + self.text:SetText(text) + end, + + ["SetDisabled"] = function(self, disabled) + self.disabled = disabled + if disabled then + self.frame:Disable() + else + self.frame:Enable() + end + end +} + +--[[----------------------------------------------------------------------------- +Constructor +-------------------------------------------------------------------------------]] +local function Constructor() + local name = "AceGUI30Button" .. AceGUI:GetNextWidgetNum(Type) + local frame = CreateFrame("Button", name, UIParent, wowMoP and "UIPanelButtonTemplate" or "UIPanelButtonTemplate2") + frame:Hide() + + frame:EnableMouse(true) + frame:SetScript("OnClick", Button_OnClick) + frame:SetScript("OnEnter", Control_OnEnter) + frame:SetScript("OnLeave", Control_OnLeave) + + local text = frame:GetFontString() + text:ClearAllPoints() + text:SetPoint("TOPLEFT", 15, -1) + text:SetPoint("BOTTOMRIGHT", -15, 1) + text:SetJustifyV("MIDDLE") + + local widget = { + text = text, + frame = frame, + type = Type + } + for method, func in pairs(methods) do + widget[method] = func + end + + return AceGUI:RegisterAsWidget(widget) +end + +AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua b/libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua old mode 100644 new mode 100755 index 8341442..8847ebc --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua @@ -1,289 +1,295 @@ ---[[----------------------------------------------------------------------------- -Checkbox Widget --------------------------------------------------------------------------------]] -local Type, Version = "CheckBox", 21 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local select, pairs = select, pairs - --- WoW APIs -local PlaySound = PlaySound -local CreateFrame, UIParent = CreateFrame, UIParent - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: SetDesaturation, GameFontHighlight - ---[[----------------------------------------------------------------------------- -Support functions --------------------------------------------------------------------------------]] -local function AlignImage(self) - local img = self.image:GetTexture() - self.text:ClearAllPoints() - if not img then - self.text:SetPoint("LEFT", self.checkbg, "RIGHT") - self.text:SetPoint("RIGHT") - else - self.text:SetPoint("LEFT", self.image,"RIGHT", 1, 0) - self.text:SetPoint("RIGHT") - end -end - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function Control_OnEnter(frame) - frame.obj:Fire("OnEnter") -end - -local function Control_OnLeave(frame) - frame.obj:Fire("OnLeave") -end - -local function CheckBox_OnMouseDown(frame) - local self = frame.obj - if not self.disabled then - if self.image:GetTexture() then - self.text:SetPoint("LEFT", self.image,"RIGHT", 2, -1) - else - self.text:SetPoint("LEFT", self.checkbg, "RIGHT", 1, -1) - end - end - AceGUI:ClearFocus() -end - -local function CheckBox_OnMouseUp(frame) - local self = frame.obj - if not self.disabled then - self:ToggleChecked() - - if self.checked then - PlaySound("igMainMenuOptionCheckBoxOn") - else -- for both nil and false (tristate) - PlaySound("igMainMenuOptionCheckBoxOff") - end - - self:Fire("OnValueChanged", self.checked) - AlignImage(self) - end -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:SetType() - self:SetValue(false) - self:SetTriState(nil) - -- height is calculated from the width and required space for the description - self:SetWidth(200) - self:SetImage() - self:SetDisabled(nil) - self:SetDescription(nil) - end, - - -- ["OnRelease"] = nil, - - ["OnWidthSet"] = function(self, width) - if self.desc then - self.desc:SetWidth(width - 30) - if self.desc:GetText() and self.desc:GetText() ~= "" then - self:SetHeight(28 + self.desc:GetHeight()) - end - end - end, - - ["SetDisabled"] = function(self, disabled) - self.disabled = disabled - if disabled then - self.frame:Disable() - self.text:SetTextColor(0.5, 0.5, 0.5) - SetDesaturation(self.check, true) - else - self.frame:Enable() - self.text:SetTextColor(1, 1, 1) - if self.tristate and self.checked == nil then - SetDesaturation(self.check, true) - else - SetDesaturation(self.check, false) - end - end - end, - - ["SetValue"] = function(self,value) - local check = self.check - self.checked = value - if value then - SetDesaturation(self.check, false) - self.check:Show() - else - --Nil is the unknown tristate value - if self.tristate and value == nil then - SetDesaturation(self.check, true) - self.check:Show() - else - SetDesaturation(self.check, false) - self.check:Hide() - end - end - self:SetDisabled(self.disabled) - end, - - ["GetValue"] = function(self) - return self.checked - end, - - ["SetTriState"] = function(self, enabled) - self.tristate = enabled - self:SetValue(self:GetValue()) - end, - - ["SetType"] = function(self, type) - local checkbg = self.checkbg - local check = self.check - local highlight = self.highlight - - local size - if type == "radio" then - size = 16 - checkbg:SetTexture("Interface\\Buttons\\UI-RadioButton") - checkbg:SetTexCoord(0, 0.25, 0, 1) - check:SetTexture("Interface\\Buttons\\UI-RadioButton") - check:SetTexCoord(0.25, 0.5, 0, 1) - check:SetBlendMode("ADD") - highlight:SetTexture("Interface\\Buttons\\UI-RadioButton") - highlight:SetTexCoord(0.5, 0.75, 0, 1) - else - size = 24 - checkbg:SetTexture("Interface\\Buttons\\UI-CheckBox-Up") - checkbg:SetTexCoord(0, 1, 0, 1) - check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check") - check:SetTexCoord(0, 1, 0, 1) - check:SetBlendMode("BLEND") - highlight:SetTexture("Interface\\Buttons\\UI-CheckBox-Highlight") - highlight:SetTexCoord(0, 1, 0, 1) - end - checkbg:SetHeight(size) - checkbg:SetWidth(size) - end, - - ["ToggleChecked"] = function(self) - local value = self:GetValue() - if self.tristate then - --cycle in true, nil, false order - if value then - self:SetValue(nil) - elseif value == nil then - self:SetValue(false) - else - self:SetValue(true) - end - else - self:SetValue(not self:GetValue()) - end - end, - - ["SetLabel"] = function(self, label) - self.text:SetText(label) - end, - - ["SetDescription"] = function(self, desc) - if desc then - if not self.desc then - local desc = self.frame:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall") - desc:ClearAllPoints() - desc:SetPoint("TOPLEFT", self.checkbg, "TOPRIGHT", 5, -21) - desc:SetWidth(self.frame.width - 30) - desc:SetJustifyH("LEFT") - desc:SetJustifyV("TOP") - self.desc = desc - end - self.desc:Show() - --self.text:SetFontObject(GameFontNormal) - self.desc:SetText(desc) - self:SetHeight(28 + self.desc:GetHeight()) - else - if self.desc then - self.desc:SetText("") - self.desc:Hide() - end - --self.text:SetFontObject(GameFontHighlight) - self:SetHeight(24) - end - end, - - ["SetImage"] = function(self, path, ...) - local image = self.image - image:SetTexture(path) - - if image:GetTexture() then - local n = select("#", ...) - if n == 4 or n == 8 then - image:SetTexCoord(...) - else - image:SetTexCoord(0, 1, 0, 1) - end - end - AlignImage(self) - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local function Constructor() - local frame = CreateFrame("Button", nil, UIParent) - frame:Hide() - - frame:EnableMouse(true) - frame:SetScript("OnEnter", Control_OnEnter) - frame:SetScript("OnLeave", Control_OnLeave) - frame:SetScript("OnMouseDown", CheckBox_OnMouseDown) - frame:SetScript("OnMouseUp", CheckBox_OnMouseUp) - - local checkbg = frame:CreateTexture(nil, "ARTWORK") - checkbg:SetWidth(24) - checkbg:SetHeight(24) - checkbg:SetPoint("TOPLEFT") - checkbg:SetTexture("Interface\\Buttons\\UI-CheckBox-Up") - - local check = frame:CreateTexture(nil, "OVERLAY") - check:SetAllPoints(checkbg) - check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check") - - local text = frame:CreateFontString(nil, "OVERLAY", "GameFontHighlight") - text:SetJustifyH("LEFT") - text:SetHeight(18) - text:SetPoint("LEFT", checkbg, "RIGHT") - text:SetPoint("RIGHT") - - local highlight = frame:CreateTexture(nil, "HIGHLIGHT") - highlight:SetTexture("Interface\\Buttons\\UI-CheckBox-Highlight") - highlight:SetBlendMode("ADD") - highlight:SetAllPoints(checkbg) - - local image = frame:CreateTexture(nil, "OVERLAY") - image:SetHeight(16) - image:SetWidth(16) - image:SetPoint("LEFT", checkbg, "RIGHT", 1, 0) - - local widget = { - checkbg = checkbg, - check = check, - text = text, - highlight = highlight, - image = image, - frame = frame, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - - return AceGUI:RegisterAsWidget(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) +--[[----------------------------------------------------------------------------- +Checkbox Widget +-------------------------------------------------------------------------------]] +local Type, Version = "CheckBox", 22 +local AceGUI = LibStub and LibStub("AceGUI-3.0", true) +if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end + +-- Lua APIs +local select, pairs = select, pairs + +-- WoW APIs +local PlaySound = PlaySound +local CreateFrame, UIParent = CreateFrame, UIParent + +-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded +-- List them here for Mikk's FindGlobals script +-- GLOBALS: SetDesaturation, GameFontHighlight + +--[[----------------------------------------------------------------------------- +Support functions +-------------------------------------------------------------------------------]] +local function AlignImage(self) + local img = self.image:GetTexture() + self.text:ClearAllPoints() + if not img then + self.text:SetPoint("LEFT", self.checkbg, "RIGHT") + self.text:SetPoint("RIGHT") + else + self.text:SetPoint("LEFT", self.image,"RIGHT", 1, 0) + self.text:SetPoint("RIGHT") + end +end + +--[[----------------------------------------------------------------------------- +Scripts +-------------------------------------------------------------------------------]] +local function Control_OnEnter(frame) + frame.obj:Fire("OnEnter") +end + +local function Control_OnLeave(frame) + frame.obj:Fire("OnLeave") +end + +local function CheckBox_OnMouseDown(frame) + local self = frame.obj + if not self.disabled then + if self.image:GetTexture() then + self.text:SetPoint("LEFT", self.image,"RIGHT", 2, -1) + else + self.text:SetPoint("LEFT", self.checkbg, "RIGHT", 1, -1) + end + end + AceGUI:ClearFocus() +end + +local function CheckBox_OnMouseUp(frame) + local self = frame.obj + if not self.disabled then + self:ToggleChecked() + + if self.checked then + PlaySound("igMainMenuOptionCheckBoxOn") + else -- for both nil and false (tristate) + PlaySound("igMainMenuOptionCheckBoxOff") + end + + self:Fire("OnValueChanged", self.checked) + AlignImage(self) + end +end + +--[[----------------------------------------------------------------------------- +Methods +-------------------------------------------------------------------------------]] +local methods = { + ["OnAcquire"] = function(self) + self:SetType() + self:SetValue(false) + self:SetTriState(nil) + -- height is calculated from the width and required space for the description + self:SetWidth(200) + self:SetImage() + self:SetDisabled(nil) + self:SetDescription(nil) + end, + + -- ["OnRelease"] = nil, + + ["OnWidthSet"] = function(self, width) + if self.desc then + self.desc:SetWidth(width - 30) + if self.desc:GetText() and self.desc:GetText() ~= "" then + self:SetHeight(28 + self.desc:GetHeight()) + end + end + end, + + ["SetDisabled"] = function(self, disabled) + self.disabled = disabled + if disabled then + self.frame:Disable() + self.text:SetTextColor(0.5, 0.5, 0.5) + SetDesaturation(self.check, true) + if self.desc then + self.desc:SetTextColor(0.5, 0.5, 0.5) + end + else + self.frame:Enable() + self.text:SetTextColor(1, 1, 1) + if self.tristate and self.checked == nil then + SetDesaturation(self.check, true) + else + SetDesaturation(self.check, false) + end + if self.desc then + self.desc:SetTextColor(1, 1, 1) + end + end + end, + + ["SetValue"] = function(self,value) + local check = self.check + self.checked = value + if value then + SetDesaturation(self.check, false) + self.check:Show() + else + --Nil is the unknown tristate value + if self.tristate and value == nil then + SetDesaturation(self.check, true) + self.check:Show() + else + SetDesaturation(self.check, false) + self.check:Hide() + end + end + self:SetDisabled(self.disabled) + end, + + ["GetValue"] = function(self) + return self.checked + end, + + ["SetTriState"] = function(self, enabled) + self.tristate = enabled + self:SetValue(self:GetValue()) + end, + + ["SetType"] = function(self, type) + local checkbg = self.checkbg + local check = self.check + local highlight = self.highlight + + local size + if type == "radio" then + size = 16 + checkbg:SetTexture("Interface\\Buttons\\UI-RadioButton") + checkbg:SetTexCoord(0, 0.25, 0, 1) + check:SetTexture("Interface\\Buttons\\UI-RadioButton") + check:SetTexCoord(0.25, 0.5, 0, 1) + check:SetBlendMode("ADD") + highlight:SetTexture("Interface\\Buttons\\UI-RadioButton") + highlight:SetTexCoord(0.5, 0.75, 0, 1) + else + size = 24 + checkbg:SetTexture("Interface\\Buttons\\UI-CheckBox-Up") + checkbg:SetTexCoord(0, 1, 0, 1) + check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check") + check:SetTexCoord(0, 1, 0, 1) + check:SetBlendMode("BLEND") + highlight:SetTexture("Interface\\Buttons\\UI-CheckBox-Highlight") + highlight:SetTexCoord(0, 1, 0, 1) + end + checkbg:SetHeight(size) + checkbg:SetWidth(size) + end, + + ["ToggleChecked"] = function(self) + local value = self:GetValue() + if self.tristate then + --cycle in true, nil, false order + if value then + self:SetValue(nil) + elseif value == nil then + self:SetValue(false) + else + self:SetValue(true) + end + else + self:SetValue(not self:GetValue()) + end + end, + + ["SetLabel"] = function(self, label) + self.text:SetText(label) + end, + + ["SetDescription"] = function(self, desc) + if desc then + if not self.desc then + local desc = self.frame:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall") + desc:ClearAllPoints() + desc:SetPoint("TOPLEFT", self.checkbg, "TOPRIGHT", 5, -21) + desc:SetWidth(self.frame.width - 30) + desc:SetJustifyH("LEFT") + desc:SetJustifyV("TOP") + self.desc = desc + end + self.desc:Show() + --self.text:SetFontObject(GameFontNormal) + self.desc:SetText(desc) + self:SetHeight(28 + self.desc:GetHeight()) + else + if self.desc then + self.desc:SetText("") + self.desc:Hide() + end + --self.text:SetFontObject(GameFontHighlight) + self:SetHeight(24) + end + end, + + ["SetImage"] = function(self, path, ...) + local image = self.image + image:SetTexture(path) + + if image:GetTexture() then + local n = select("#", ...) + if n == 4 or n == 8 then + image:SetTexCoord(...) + else + image:SetTexCoord(0, 1, 0, 1) + end + end + AlignImage(self) + end +} + +--[[----------------------------------------------------------------------------- +Constructor +-------------------------------------------------------------------------------]] +local function Constructor() + local frame = CreateFrame("Button", nil, UIParent) + frame:Hide() + + frame:EnableMouse(true) + frame:SetScript("OnEnter", Control_OnEnter) + frame:SetScript("OnLeave", Control_OnLeave) + frame:SetScript("OnMouseDown", CheckBox_OnMouseDown) + frame:SetScript("OnMouseUp", CheckBox_OnMouseUp) + + local checkbg = frame:CreateTexture(nil, "ARTWORK") + checkbg:SetWidth(24) + checkbg:SetHeight(24) + checkbg:SetPoint("TOPLEFT") + checkbg:SetTexture("Interface\\Buttons\\UI-CheckBox-Up") + + local check = frame:CreateTexture(nil, "OVERLAY") + check:SetAllPoints(checkbg) + check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check") + + local text = frame:CreateFontString(nil, "OVERLAY", "GameFontHighlight") + text:SetJustifyH("LEFT") + text:SetHeight(18) + text:SetPoint("LEFT", checkbg, "RIGHT") + text:SetPoint("RIGHT") + + local highlight = frame:CreateTexture(nil, "HIGHLIGHT") + highlight:SetTexture("Interface\\Buttons\\UI-CheckBox-Highlight") + highlight:SetBlendMode("ADD") + highlight:SetAllPoints(checkbg) + + local image = frame:CreateTexture(nil, "OVERLAY") + image:SetHeight(16) + image:SetWidth(16) + image:SetPoint("LEFT", checkbg, "RIGHT", 1, 0) + + local widget = { + checkbg = checkbg, + check = check, + text = text, + highlight = highlight, + image = image, + frame = frame, + type = Type + } + for method, func in pairs(methods) do + widget[method] = func + end + + return AceGUI:RegisterAsWidget(widget) +end + +AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua b/libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua old mode 100644 new mode 100755 index 009fc3b..ba02615 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua @@ -1,186 +1,186 @@ ---[[----------------------------------------------------------------------------- -ColorPicker Widget --------------------------------------------------------------------------------]] -local Type, Version = "ColorPicker", 20 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local pairs = pairs - --- WoW APIs -local CreateFrame, UIParent = CreateFrame, UIParent - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: ShowUIPanel, HideUIPanel, ColorPickerFrame, OpacitySliderFrame - ---[[----------------------------------------------------------------------------- -Support functions --------------------------------------------------------------------------------]] -local function ColorCallback(self, r, g, b, a, isAlpha) - if not self.HasAlpha then - a = 1 - end - self:SetColor(r, g, b, a) - if ColorPickerFrame:IsVisible() then - --colorpicker is still open - self:Fire("OnValueChanged", r, g, b, a) - else - --colorpicker is closed, color callback is first, ignore it, - --alpha callback is the final call after it closes so confirm now - if isAlpha then - self:Fire("OnValueConfirmed", r, g, b, a) - end - end -end - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function Control_OnEnter(frame) - frame.obj:Fire("OnEnter") -end - -local function Control_OnLeave(frame) - frame.obj:Fire("OnLeave") -end - -local function ColorSwatch_OnClick(frame) - HideUIPanel(ColorPickerFrame) - local self = frame.obj - if not self.disabled then - ColorPickerFrame:SetFrameStrata("FULLSCREEN_DIALOG") - - ColorPickerFrame.func = function() - local r, g, b = ColorPickerFrame:GetColorRGB() - local a = 1 - OpacitySliderFrame:GetValue() - ColorCallback(self, r, g, b, a) - end - - ColorPickerFrame.hasOpacity = self.HasAlpha - ColorPickerFrame.opacityFunc = function() - local r, g, b = ColorPickerFrame:GetColorRGB() - local a = 1 - OpacitySliderFrame:GetValue() - ColorCallback(self, r, g, b, a, true) - end - - local r, g, b, a = self.r, self.g, self.b, self.a - if self.HasAlpha then - ColorPickerFrame.opacity = 1 - (a or 0) - end - ColorPickerFrame:SetColorRGB(r, g, b) - - ColorPickerFrame.cancelFunc = function() - ColorCallback(self, r, g, b, a, true) - end - - ShowUIPanel(ColorPickerFrame) - end - AceGUI:ClearFocus() -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:SetHeight(24) - self:SetWidth(200) - self:SetHasAlpha(false) - self:SetColor(0, 0, 0, 1) - self:SetDisabled(nil) - self:SetLabel(nil) - end, - - -- ["OnRelease"] = nil, - - ["SetLabel"] = function(self, text) - self.text:SetText(text) - end, - - ["SetColor"] = function(self, r, g, b, a) - self.r = r - self.g = g - self.b = b - self.a = a or 1 - self.colorSwatch:SetVertexColor(r, g, b, a) - end, - - ["SetHasAlpha"] = function(self, HasAlpha) - self.HasAlpha = HasAlpha - end, - - ["SetDisabled"] = function(self, disabled) - self.disabled = disabled - if self.disabled then - self.frame:Disable() - self.text:SetTextColor(0.5, 0.5, 0.5) - else - self.frame:Enable() - self.text:SetTextColor(1, 1, 1) - end - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local function Constructor() - local frame = CreateFrame("Button", nil, UIParent) - frame:Hide() - - frame:EnableMouse(true) - frame:SetScript("OnEnter", Control_OnEnter) - frame:SetScript("OnLeave", Control_OnLeave) - frame:SetScript("OnClick", ColorSwatch_OnClick) - - local colorSwatch = frame:CreateTexture(nil, "OVERLAY") - colorSwatch:SetWidth(19) - colorSwatch:SetHeight(19) - colorSwatch:SetTexture("Interface\\ChatFrame\\ChatFrameColorSwatch") - colorSwatch:SetPoint("LEFT") - - local texture = frame:CreateTexture(nil, "BACKGROUND") - texture:SetWidth(16) - texture:SetHeight(16) - texture:SetTexture(1, 1, 1) - texture:SetPoint("CENTER", colorSwatch) - texture:Show() - - local checkers = frame:CreateTexture(nil, "BACKGROUND") - checkers:SetWidth(14) - checkers:SetHeight(14) - checkers:SetTexture("Tileset\\Generic\\Checkers") - checkers:SetTexCoord(.25, 0, 0.5, .25) - checkers:SetDesaturated(true) - checkers:SetVertexColor(1, 1, 1, 0.75) - checkers:SetPoint("CENTER", colorSwatch) - checkers:Show() - - local text = frame:CreateFontString(nil,"OVERLAY","GameFontHighlight") - text:SetHeight(24) - text:SetJustifyH("LEFT") - text:SetTextColor(1, 1, 1) - text:SetPoint("LEFT", colorSwatch, "RIGHT", 2, 0) - text:SetPoint("RIGHT") - - --local highlight = frame:CreateTexture(nil, "HIGHLIGHT") - --highlight:SetTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight") - --highlight:SetBlendMode("ADD") - --highlight:SetAllPoints(frame) - - local widget = { - colorSwatch = colorSwatch, - text = text, - frame = frame, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - - return AceGUI:RegisterAsWidget(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) +--[[----------------------------------------------------------------------------- +ColorPicker Widget +-------------------------------------------------------------------------------]] +local Type, Version = "ColorPicker", 20 +local AceGUI = LibStub and LibStub("AceGUI-3.0", true) +if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end + +-- Lua APIs +local pairs = pairs + +-- WoW APIs +local CreateFrame, UIParent = CreateFrame, UIParent + +-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded +-- List them here for Mikk's FindGlobals script +-- GLOBALS: ShowUIPanel, HideUIPanel, ColorPickerFrame, OpacitySliderFrame + +--[[----------------------------------------------------------------------------- +Support functions +-------------------------------------------------------------------------------]] +local function ColorCallback(self, r, g, b, a, isAlpha) + if not self.HasAlpha then + a = 1 + end + self:SetColor(r, g, b, a) + if ColorPickerFrame:IsVisible() then + --colorpicker is still open + self:Fire("OnValueChanged", r, g, b, a) + else + --colorpicker is closed, color callback is first, ignore it, + --alpha callback is the final call after it closes so confirm now + if isAlpha then + self:Fire("OnValueConfirmed", r, g, b, a) + end + end +end + +--[[----------------------------------------------------------------------------- +Scripts +-------------------------------------------------------------------------------]] +local function Control_OnEnter(frame) + frame.obj:Fire("OnEnter") +end + +local function Control_OnLeave(frame) + frame.obj:Fire("OnLeave") +end + +local function ColorSwatch_OnClick(frame) + HideUIPanel(ColorPickerFrame) + local self = frame.obj + if not self.disabled then + ColorPickerFrame:SetFrameStrata("FULLSCREEN_DIALOG") + + ColorPickerFrame.func = function() + local r, g, b = ColorPickerFrame:GetColorRGB() + local a = 1 - OpacitySliderFrame:GetValue() + ColorCallback(self, r, g, b, a) + end + + ColorPickerFrame.hasOpacity = self.HasAlpha + ColorPickerFrame.opacityFunc = function() + local r, g, b = ColorPickerFrame:GetColorRGB() + local a = 1 - OpacitySliderFrame:GetValue() + ColorCallback(self, r, g, b, a, true) + end + + local r, g, b, a = self.r, self.g, self.b, self.a + if self.HasAlpha then + ColorPickerFrame.opacity = 1 - (a or 0) + end + ColorPickerFrame:SetColorRGB(r, g, b) + + ColorPickerFrame.cancelFunc = function() + ColorCallback(self, r, g, b, a, true) + end + + ShowUIPanel(ColorPickerFrame) + end + AceGUI:ClearFocus() +end + +--[[----------------------------------------------------------------------------- +Methods +-------------------------------------------------------------------------------]] +local methods = { + ["OnAcquire"] = function(self) + self:SetHeight(24) + self:SetWidth(200) + self:SetHasAlpha(false) + self:SetColor(0, 0, 0, 1) + self:SetDisabled(nil) + self:SetLabel(nil) + end, + + -- ["OnRelease"] = nil, + + ["SetLabel"] = function(self, text) + self.text:SetText(text) + end, + + ["SetColor"] = function(self, r, g, b, a) + self.r = r + self.g = g + self.b = b + self.a = a or 1 + self.colorSwatch:SetVertexColor(r, g, b, a) + end, + + ["SetHasAlpha"] = function(self, HasAlpha) + self.HasAlpha = HasAlpha + end, + + ["SetDisabled"] = function(self, disabled) + self.disabled = disabled + if self.disabled then + self.frame:Disable() + self.text:SetTextColor(0.5, 0.5, 0.5) + else + self.frame:Enable() + self.text:SetTextColor(1, 1, 1) + end + end +} + +--[[----------------------------------------------------------------------------- +Constructor +-------------------------------------------------------------------------------]] +local function Constructor() + local frame = CreateFrame("Button", nil, UIParent) + frame:Hide() + + frame:EnableMouse(true) + frame:SetScript("OnEnter", Control_OnEnter) + frame:SetScript("OnLeave", Control_OnLeave) + frame:SetScript("OnClick", ColorSwatch_OnClick) + + local colorSwatch = frame:CreateTexture(nil, "OVERLAY") + colorSwatch:SetWidth(19) + colorSwatch:SetHeight(19) + colorSwatch:SetTexture("Interface\\ChatFrame\\ChatFrameColorSwatch") + colorSwatch:SetPoint("LEFT") + + local texture = frame:CreateTexture(nil, "BACKGROUND") + texture:SetWidth(16) + texture:SetHeight(16) + texture:SetTexture(1, 1, 1) + texture:SetPoint("CENTER", colorSwatch) + texture:Show() + + local checkers = frame:CreateTexture(nil, "BACKGROUND") + checkers:SetWidth(14) + checkers:SetHeight(14) + checkers:SetTexture("Tileset\\Generic\\Checkers") + checkers:SetTexCoord(.25, 0, 0.5, .25) + checkers:SetDesaturated(true) + checkers:SetVertexColor(1, 1, 1, 0.75) + checkers:SetPoint("CENTER", colorSwatch) + checkers:Show() + + local text = frame:CreateFontString(nil,"OVERLAY","GameFontHighlight") + text:SetHeight(24) + text:SetJustifyH("LEFT") + text:SetTextColor(1, 1, 1) + text:SetPoint("LEFT", colorSwatch, "RIGHT", 2, 0) + text:SetPoint("RIGHT") + + --local highlight = frame:CreateTexture(nil, "HIGHLIGHT") + --highlight:SetTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight") + --highlight:SetBlendMode("ADD") + --highlight:SetAllPoints(frame) + + local widget = { + colorSwatch = colorSwatch, + text = text, + frame = frame, + type = Type + } + for method, func in pairs(methods) do + widget[method] = func + end + + return AceGUI:RegisterAsWidget(widget) +end + +AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua b/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua old mode 100644 new mode 100755 index 985f76c..1f28cb5 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua @@ -1,471 +1,471 @@ ---[[ $Id: AceGUIWidget-DropDown-Items.lua 996 2010-12-01 18:34:17Z nevcairiel $ ]]-- - -local AceGUI = LibStub("AceGUI-3.0") - --- Lua APIs -local select, assert = select, assert - --- WoW APIs -local PlaySound = PlaySound -local CreateFrame = CreateFrame - -local function fixlevels(parent,...) - local i = 1 - local child = select(i, ...) - while child do - child:SetFrameLevel(parent:GetFrameLevel()+1) - fixlevels(child, child:GetChildren()) - i = i + 1 - child = select(i, ...) - end -end - -local function fixstrata(strata, parent, ...) - local i = 1 - local child = select(i, ...) - parent:SetFrameStrata(strata) - while child do - fixstrata(strata, child, child:GetChildren()) - i = i + 1 - child = select(i, ...) - end -end - --- ItemBase is the base "class" for all dropdown items. --- Each item has to use ItemBase.Create(widgetType) to --- create an initial 'self' value. --- ItemBase will add common functions and ui event handlers. --- Be sure to keep basic usage when you override functions. - -local ItemBase = { - -- NOTE: The ItemBase version is added to each item's version number - -- to ensure proper updates on ItemBase changes. - -- Use at least 1000er steps. - version = 1000, - counter = 0, -} - -function ItemBase.Frame_OnEnter(this) - local self = this.obj - - if self.useHighlight then - self.highlight:Show() - end - self:Fire("OnEnter") - - if self.specialOnEnter then - self.specialOnEnter(self) - end -end - -function ItemBase.Frame_OnLeave(this) - local self = this.obj - - self.highlight:Hide() - self:Fire("OnLeave") - - if self.specialOnLeave then - self.specialOnLeave(self) - end -end - --- exported, AceGUI callback -function ItemBase.OnAcquire(self) - self.frame:SetToplevel(true) - self.frame:SetFrameStrata("FULLSCREEN_DIALOG") -end - --- exported, AceGUI callback -function ItemBase.OnRelease(self) - self:SetDisabled(false) - self.pullout = nil - self.frame:SetParent(nil) - self.frame:ClearAllPoints() - self.frame:Hide() -end - --- exported --- NOTE: this is called by a Dropdown-Pullout. --- Do not call this method directly -function ItemBase.SetPullout(self, pullout) - self.pullout = pullout - - self.frame:SetParent(nil) - self.frame:SetParent(pullout.itemFrame) - self.parent = pullout.itemFrame - fixlevels(pullout.itemFrame, pullout.itemFrame:GetChildren()) -end - --- exported -function ItemBase.SetText(self, text) - self.text:SetText(text or "") -end - --- exported -function ItemBase.GetText(self) - return self.text:GetText() -end - --- exported -function ItemBase.SetPoint(self, ...) - self.frame:SetPoint(...) -end - --- exported -function ItemBase.Show(self) - self.frame:Show() -end - --- exported -function ItemBase.Hide(self) - self.frame:Hide() -end - --- exported -function ItemBase.SetDisabled(self, disabled) - self.disabled = disabled - if disabled then - self.useHighlight = false - self.text:SetTextColor(.5, .5, .5) - else - self.useHighlight = true - self.text:SetTextColor(1, 1, 1) - end -end - --- exported --- NOTE: this is called by a Dropdown-Pullout. --- Do not call this method directly -function ItemBase.SetOnLeave(self, func) - self.specialOnLeave = func -end - --- exported --- NOTE: this is called by a Dropdown-Pullout. --- Do not call this method directly -function ItemBase.SetOnEnter(self, func) - self.specialOnEnter = func -end - -function ItemBase.Create(type) - -- NOTE: Most of the following code is copied from AceGUI-3.0/Dropdown widget - local count = AceGUI:GetNextWidgetNum(type) - local frame = CreateFrame("Button", "AceGUI30DropDownItem"..count) - local self = {} - self.frame = frame - frame.obj = self - self.type = type - - self.useHighlight = true - - frame:SetHeight(17) - frame:SetFrameStrata("FULLSCREEN_DIALOG") - - local text = frame:CreateFontString(nil,"OVERLAY","GameFontNormalSmall") - text:SetTextColor(1,1,1) - text:SetJustifyH("LEFT") - text:SetPoint("TOPLEFT",frame,"TOPLEFT",18,0) - text:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-8,0) - self.text = text - - local highlight = frame:CreateTexture(nil, "OVERLAY") - highlight:SetTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight") - highlight:SetBlendMode("ADD") - highlight:SetHeight(14) - highlight:ClearAllPoints() - highlight:SetPoint("RIGHT",frame,"RIGHT",-3,0) - highlight:SetPoint("LEFT",frame,"LEFT",5,0) - highlight:Hide() - self.highlight = highlight - - local check = frame:CreateTexture("OVERLAY") - check:SetWidth(16) - check:SetHeight(16) - check:SetPoint("LEFT",frame,"LEFT",3,-1) - check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check") - check:Hide() - self.check = check - - local sub = frame:CreateTexture("OVERLAY") - sub:SetWidth(16) - sub:SetHeight(16) - sub:SetPoint("RIGHT",frame,"RIGHT",-3,-1) - sub:SetTexture("Interface\\ChatFrame\\ChatFrameExpandArrow") - sub:Hide() - self.sub = sub - - frame:SetScript("OnEnter", ItemBase.Frame_OnEnter) - frame:SetScript("OnLeave", ItemBase.Frame_OnLeave) - - self.OnAcquire = ItemBase.OnAcquire - self.OnRelease = ItemBase.OnRelease - - self.SetPullout = ItemBase.SetPullout - self.GetText = ItemBase.GetText - self.SetText = ItemBase.SetText - self.SetDisabled = ItemBase.SetDisabled - - self.SetPoint = ItemBase.SetPoint - self.Show = ItemBase.Show - self.Hide = ItemBase.Hide - - self.SetOnLeave = ItemBase.SetOnLeave - self.SetOnEnter = ItemBase.SetOnEnter - - return self -end - --- Register a dummy LibStub library to retrieve the ItemBase, so other addons can use it. -local IBLib = LibStub:NewLibrary("AceGUI-3.0-DropDown-ItemBase", ItemBase.version) -if IBLib then - IBLib.GetItemBase = function() return ItemBase end -end - ---[[ - Template for items: - --- Item: --- -do - local widgetType = "Dropdown-Item-" - local widgetVersion = 1 - - local function Constructor() - local self = ItemBase.Create(widgetType) - - AceGUI:RegisterAsWidget(self) - return self - end - - AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version) -end ---]] - --- Item: Header --- A single text entry. --- Special: Different text color and no highlight -do - local widgetType = "Dropdown-Item-Header" - local widgetVersion = 1 - - local function OnEnter(this) - local self = this.obj - self:Fire("OnEnter") - - if self.specialOnEnter then - self.specialOnEnter(self) - end - end - - local function OnLeave(this) - local self = this.obj - self:Fire("OnLeave") - - if self.specialOnLeave then - self.specialOnLeave(self) - end - end - - -- exported, override - local function SetDisabled(self, disabled) - ItemBase.SetDisabled(self, disabled) - if not disabled then - self.text:SetTextColor(1, 1, 0) - end - end - - local function Constructor() - local self = ItemBase.Create(widgetType) - - self.SetDisabled = SetDisabled - - self.frame:SetScript("OnEnter", OnEnter) - self.frame:SetScript("OnLeave", OnLeave) - - self.text:SetTextColor(1, 1, 0) - - AceGUI:RegisterAsWidget(self) - return self - end - - AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version) -end - --- Item: Execute --- A simple button -do - local widgetType = "Dropdown-Item-Execute" - local widgetVersion = 1 - - local function Frame_OnClick(this, button) - local self = this.obj - if self.disabled then return end - self:Fire("OnClick") - if self.pullout then - self.pullout:Close() - end - end - - local function Constructor() - local self = ItemBase.Create(widgetType) - - self.frame:SetScript("OnClick", Frame_OnClick) - - AceGUI:RegisterAsWidget(self) - return self - end - - AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version) -end - --- Item: Toggle --- Some sort of checkbox for dropdown menus. --- Does not close the pullout on click. -do - local widgetType = "Dropdown-Item-Toggle" - local widgetVersion = 3 - - local function UpdateToggle(self) - if self.value then - self.check:Show() - else - self.check:Hide() - end - end - - local function OnRelease(self) - ItemBase.OnRelease(self) - self:SetValue(nil) - end - - local function Frame_OnClick(this, button) - local self = this.obj - if self.disabled then return end - self.value = not self.value - if self.value then - PlaySound("igMainMenuOptionCheckBoxOn") - else - PlaySound("igMainMenuOptionCheckBoxOff") - end - UpdateToggle(self) - self:Fire("OnValueChanged", self.value) - end - - -- exported - local function SetValue(self, value) - self.value = value - UpdateToggle(self) - end - - -- exported - local function GetValue(self) - return self.value - end - - local function Constructor() - local self = ItemBase.Create(widgetType) - - self.frame:SetScript("OnClick", Frame_OnClick) - - self.SetValue = SetValue - self.GetValue = GetValue - self.OnRelease = OnRelease - - AceGUI:RegisterAsWidget(self) - return self - end - - AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version) -end - --- Item: Menu --- Shows a submenu on mouse over --- Does not close the pullout on click -do - local widgetType = "Dropdown-Item-Menu" - local widgetVersion = 2 - - local function OnEnter(this) - local self = this.obj - self:Fire("OnEnter") - - if self.specialOnEnter then - self.specialOnEnter(self) - end - - self.highlight:Show() - - if not self.disabled and self.submenu then - self.submenu:Open("TOPLEFT", self.frame, "TOPRIGHT", self.pullout:GetRightBorderWidth(), 0, self.frame:GetFrameLevel() + 100) - end - end - - local function OnHide(this) - local self = this.obj - if self.submenu then - self.submenu:Close() - end - end - - -- exported - local function SetMenu(self, menu) - assert(menu.type == "Dropdown-Pullout") - self.submenu = menu - end - - -- exported - local function CloseMenu(self) - self.submenu:Close() - end - - local function Constructor() - local self = ItemBase.Create(widgetType) - - self.sub:Show() - - self.frame:SetScript("OnEnter", OnEnter) - self.frame:SetScript("OnHide", OnHide) - - self.SetMenu = SetMenu - self.CloseMenu = CloseMenu - - AceGUI:RegisterAsWidget(self) - return self - end - - AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version) -end - --- Item: Separator --- A single line to separate items -do - local widgetType = "Dropdown-Item-Separator" - local widgetVersion = 1 - - -- exported, override - local function SetDisabled(self, disabled) - ItemBase.SetDisabled(self, disabled) - self.useHighlight = false - end - - local function Constructor() - local self = ItemBase.Create(widgetType) - - self.SetDisabled = SetDisabled - - local line = self.frame:CreateTexture(nil, "OVERLAY") - line:SetHeight(1) - line:SetTexture(.5, .5, .5) - line:SetPoint("LEFT", self.frame, "LEFT", 10, 0) - line:SetPoint("RIGHT", self.frame, "RIGHT", -10, 0) - - self.text:Hide() - - self.useHighlight = false - - AceGUI:RegisterAsWidget(self) - return self - end - - AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version) -end +--[[ $Id: AceGUIWidget-DropDown-Items.lua 996 2010-12-01 18:34:17Z nevcairiel $ ]]-- + +local AceGUI = LibStub("AceGUI-3.0") + +-- Lua APIs +local select, assert = select, assert + +-- WoW APIs +local PlaySound = PlaySound +local CreateFrame = CreateFrame + +local function fixlevels(parent,...) + local i = 1 + local child = select(i, ...) + while child do + child:SetFrameLevel(parent:GetFrameLevel()+1) + fixlevels(child, child:GetChildren()) + i = i + 1 + child = select(i, ...) + end +end + +local function fixstrata(strata, parent, ...) + local i = 1 + local child = select(i, ...) + parent:SetFrameStrata(strata) + while child do + fixstrata(strata, child, child:GetChildren()) + i = i + 1 + child = select(i, ...) + end +end + +-- ItemBase is the base "class" for all dropdown items. +-- Each item has to use ItemBase.Create(widgetType) to +-- create an initial 'self' value. +-- ItemBase will add common functions and ui event handlers. +-- Be sure to keep basic usage when you override functions. + +local ItemBase = { + -- NOTE: The ItemBase version is added to each item's version number + -- to ensure proper updates on ItemBase changes. + -- Use at least 1000er steps. + version = 1000, + counter = 0, +} + +function ItemBase.Frame_OnEnter(this) + local self = this.obj + + if self.useHighlight then + self.highlight:Show() + end + self:Fire("OnEnter") + + if self.specialOnEnter then + self.specialOnEnter(self) + end +end + +function ItemBase.Frame_OnLeave(this) + local self = this.obj + + self.highlight:Hide() + self:Fire("OnLeave") + + if self.specialOnLeave then + self.specialOnLeave(self) + end +end + +-- exported, AceGUI callback +function ItemBase.OnAcquire(self) + self.frame:SetToplevel(true) + self.frame:SetFrameStrata("FULLSCREEN_DIALOG") +end + +-- exported, AceGUI callback +function ItemBase.OnRelease(self) + self:SetDisabled(false) + self.pullout = nil + self.frame:SetParent(nil) + self.frame:ClearAllPoints() + self.frame:Hide() +end + +-- exported +-- NOTE: this is called by a Dropdown-Pullout. +-- Do not call this method directly +function ItemBase.SetPullout(self, pullout) + self.pullout = pullout + + self.frame:SetParent(nil) + self.frame:SetParent(pullout.itemFrame) + self.parent = pullout.itemFrame + fixlevels(pullout.itemFrame, pullout.itemFrame:GetChildren()) +end + +-- exported +function ItemBase.SetText(self, text) + self.text:SetText(text or "") +end + +-- exported +function ItemBase.GetText(self) + return self.text:GetText() +end + +-- exported +function ItemBase.SetPoint(self, ...) + self.frame:SetPoint(...) +end + +-- exported +function ItemBase.Show(self) + self.frame:Show() +end + +-- exported +function ItemBase.Hide(self) + self.frame:Hide() +end + +-- exported +function ItemBase.SetDisabled(self, disabled) + self.disabled = disabled + if disabled then + self.useHighlight = false + self.text:SetTextColor(.5, .5, .5) + else + self.useHighlight = true + self.text:SetTextColor(1, 1, 1) + end +end + +-- exported +-- NOTE: this is called by a Dropdown-Pullout. +-- Do not call this method directly +function ItemBase.SetOnLeave(self, func) + self.specialOnLeave = func +end + +-- exported +-- NOTE: this is called by a Dropdown-Pullout. +-- Do not call this method directly +function ItemBase.SetOnEnter(self, func) + self.specialOnEnter = func +end + +function ItemBase.Create(type) + -- NOTE: Most of the following code is copied from AceGUI-3.0/Dropdown widget + local count = AceGUI:GetNextWidgetNum(type) + local frame = CreateFrame("Button", "AceGUI30DropDownItem"..count) + local self = {} + self.frame = frame + frame.obj = self + self.type = type + + self.useHighlight = true + + frame:SetHeight(17) + frame:SetFrameStrata("FULLSCREEN_DIALOG") + + local text = frame:CreateFontString(nil,"OVERLAY","GameFontNormalSmall") + text:SetTextColor(1,1,1) + text:SetJustifyH("LEFT") + text:SetPoint("TOPLEFT",frame,"TOPLEFT",18,0) + text:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-8,0) + self.text = text + + local highlight = frame:CreateTexture(nil, "OVERLAY") + highlight:SetTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight") + highlight:SetBlendMode("ADD") + highlight:SetHeight(14) + highlight:ClearAllPoints() + highlight:SetPoint("RIGHT",frame,"RIGHT",-3,0) + highlight:SetPoint("LEFT",frame,"LEFT",5,0) + highlight:Hide() + self.highlight = highlight + + local check = frame:CreateTexture("OVERLAY") + check:SetWidth(16) + check:SetHeight(16) + check:SetPoint("LEFT",frame,"LEFT",3,-1) + check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check") + check:Hide() + self.check = check + + local sub = frame:CreateTexture("OVERLAY") + sub:SetWidth(16) + sub:SetHeight(16) + sub:SetPoint("RIGHT",frame,"RIGHT",-3,-1) + sub:SetTexture("Interface\\ChatFrame\\ChatFrameExpandArrow") + sub:Hide() + self.sub = sub + + frame:SetScript("OnEnter", ItemBase.Frame_OnEnter) + frame:SetScript("OnLeave", ItemBase.Frame_OnLeave) + + self.OnAcquire = ItemBase.OnAcquire + self.OnRelease = ItemBase.OnRelease + + self.SetPullout = ItemBase.SetPullout + self.GetText = ItemBase.GetText + self.SetText = ItemBase.SetText + self.SetDisabled = ItemBase.SetDisabled + + self.SetPoint = ItemBase.SetPoint + self.Show = ItemBase.Show + self.Hide = ItemBase.Hide + + self.SetOnLeave = ItemBase.SetOnLeave + self.SetOnEnter = ItemBase.SetOnEnter + + return self +end + +-- Register a dummy LibStub library to retrieve the ItemBase, so other addons can use it. +local IBLib = LibStub:NewLibrary("AceGUI-3.0-DropDown-ItemBase", ItemBase.version) +if IBLib then + IBLib.GetItemBase = function() return ItemBase end +end + +--[[ + Template for items: + +-- Item: +-- +do + local widgetType = "Dropdown-Item-" + local widgetVersion = 1 + + local function Constructor() + local self = ItemBase.Create(widgetType) + + AceGUI:RegisterAsWidget(self) + return self + end + + AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version) +end +--]] + +-- Item: Header +-- A single text entry. +-- Special: Different text color and no highlight +do + local widgetType = "Dropdown-Item-Header" + local widgetVersion = 1 + + local function OnEnter(this) + local self = this.obj + self:Fire("OnEnter") + + if self.specialOnEnter then + self.specialOnEnter(self) + end + end + + local function OnLeave(this) + local self = this.obj + self:Fire("OnLeave") + + if self.specialOnLeave then + self.specialOnLeave(self) + end + end + + -- exported, override + local function SetDisabled(self, disabled) + ItemBase.SetDisabled(self, disabled) + if not disabled then + self.text:SetTextColor(1, 1, 0) + end + end + + local function Constructor() + local self = ItemBase.Create(widgetType) + + self.SetDisabled = SetDisabled + + self.frame:SetScript("OnEnter", OnEnter) + self.frame:SetScript("OnLeave", OnLeave) + + self.text:SetTextColor(1, 1, 0) + + AceGUI:RegisterAsWidget(self) + return self + end + + AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version) +end + +-- Item: Execute +-- A simple button +do + local widgetType = "Dropdown-Item-Execute" + local widgetVersion = 1 + + local function Frame_OnClick(this, button) + local self = this.obj + if self.disabled then return end + self:Fire("OnClick") + if self.pullout then + self.pullout:Close() + end + end + + local function Constructor() + local self = ItemBase.Create(widgetType) + + self.frame:SetScript("OnClick", Frame_OnClick) + + AceGUI:RegisterAsWidget(self) + return self + end + + AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version) +end + +-- Item: Toggle +-- Some sort of checkbox for dropdown menus. +-- Does not close the pullout on click. +do + local widgetType = "Dropdown-Item-Toggle" + local widgetVersion = 3 + + local function UpdateToggle(self) + if self.value then + self.check:Show() + else + self.check:Hide() + end + end + + local function OnRelease(self) + ItemBase.OnRelease(self) + self:SetValue(nil) + end + + local function Frame_OnClick(this, button) + local self = this.obj + if self.disabled then return end + self.value = not self.value + if self.value then + PlaySound("igMainMenuOptionCheckBoxOn") + else + PlaySound("igMainMenuOptionCheckBoxOff") + end + UpdateToggle(self) + self:Fire("OnValueChanged", self.value) + end + + -- exported + local function SetValue(self, value) + self.value = value + UpdateToggle(self) + end + + -- exported + local function GetValue(self) + return self.value + end + + local function Constructor() + local self = ItemBase.Create(widgetType) + + self.frame:SetScript("OnClick", Frame_OnClick) + + self.SetValue = SetValue + self.GetValue = GetValue + self.OnRelease = OnRelease + + AceGUI:RegisterAsWidget(self) + return self + end + + AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version) +end + +-- Item: Menu +-- Shows a submenu on mouse over +-- Does not close the pullout on click +do + local widgetType = "Dropdown-Item-Menu" + local widgetVersion = 2 + + local function OnEnter(this) + local self = this.obj + self:Fire("OnEnter") + + if self.specialOnEnter then + self.specialOnEnter(self) + end + + self.highlight:Show() + + if not self.disabled and self.submenu then + self.submenu:Open("TOPLEFT", self.frame, "TOPRIGHT", self.pullout:GetRightBorderWidth(), 0, self.frame:GetFrameLevel() + 100) + end + end + + local function OnHide(this) + local self = this.obj + if self.submenu then + self.submenu:Close() + end + end + + -- exported + local function SetMenu(self, menu) + assert(menu.type == "Dropdown-Pullout") + self.submenu = menu + end + + -- exported + local function CloseMenu(self) + self.submenu:Close() + end + + local function Constructor() + local self = ItemBase.Create(widgetType) + + self.sub:Show() + + self.frame:SetScript("OnEnter", OnEnter) + self.frame:SetScript("OnHide", OnHide) + + self.SetMenu = SetMenu + self.CloseMenu = CloseMenu + + AceGUI:RegisterAsWidget(self) + return self + end + + AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version) +end + +-- Item: Separator +-- A single line to separate items +do + local widgetType = "Dropdown-Item-Separator" + local widgetVersion = 1 + + -- exported, override + local function SetDisabled(self, disabled) + ItemBase.SetDisabled(self, disabled) + self.useHighlight = false + end + + local function Constructor() + local self = ItemBase.Create(widgetType) + + self.SetDisabled = SetDisabled + + local line = self.frame:CreateTexture(nil, "OVERLAY") + line:SetHeight(1) + line:SetTexture(.5, .5, .5) + line:SetPoint("LEFT", self.frame, "LEFT", 10, 0) + line:SetPoint("RIGHT", self.frame, "RIGHT", -10, 0) + + self.text:Hide() + + self.useHighlight = false + + AceGUI:RegisterAsWidget(self) + return self + end + + AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version) +end diff --git a/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua b/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua old mode 100644 new mode 100755 index 77864f5..f46f370 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua @@ -1,717 +1,717 @@ ---[[ $Id: AceGUIWidget-DropDown.lua 1029 2011-06-10 23:10:58Z nevcairiel $ ]]-- -local AceGUI = LibStub("AceGUI-3.0") - --- Lua APIs -local min, max, floor = math.min, math.max, math.floor -local select, pairs, ipairs, type = select, pairs, ipairs, type -local tsort = table.sort - --- WoW APIs -local PlaySound = PlaySound -local UIParent, CreateFrame = UIParent, CreateFrame -local _G = _G - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: CLOSE - -local function fixlevels(parent,...) - local i = 1 - local child = select(i, ...) - while child do - child:SetFrameLevel(parent:GetFrameLevel()+1) - fixlevels(child, child:GetChildren()) - i = i + 1 - child = select(i, ...) - end -end - -local function fixstrata(strata, parent, ...) - local i = 1 - local child = select(i, ...) - parent:SetFrameStrata(strata) - while child do - fixstrata(strata, child, child:GetChildren()) - i = i + 1 - child = select(i, ...) - end -end - -do - local widgetType = "Dropdown-Pullout" - local widgetVersion = 3 - - --[[ Static data ]]-- - - local backdrop = { - bgFile = "Interface\\ChatFrame\\ChatFrameBackground", - edgeFile = "Interface\\DialogFrame\\UI-DialogBox-Border", - edgeSize = 32, - tileSize = 32, - tile = true, - insets = { left = 11, right = 12, top = 12, bottom = 11 }, - } - local sliderBackdrop = { - bgFile = "Interface\\Buttons\\UI-SliderBar-Background", - edgeFile = "Interface\\Buttons\\UI-SliderBar-Border", - tile = true, tileSize = 8, edgeSize = 8, - insets = { left = 3, right = 3, top = 3, bottom = 3 } - } - - local defaultWidth = 200 - local defaultMaxHeight = 600 - - --[[ UI Event Handlers ]]-- - - -- HACK: This should be no part of the pullout, but there - -- is no other 'clean' way to response to any item-OnEnter - -- Used to close Submenus when an other item is entered - local function OnEnter(item) - local self = item.pullout - for k, v in ipairs(self.items) do - if v.CloseMenu and v ~= item then - v:CloseMenu() - end - end - end - - -- See the note in Constructor() for each scroll related function - local function OnMouseWheel(this, value) - this.obj:MoveScroll(value) - end - - local function OnScrollValueChanged(this, value) - this.obj:SetScroll(value) - end - - local function OnSizeChanged(this) - this.obj:FixScroll() - end - - --[[ Exported methods ]]-- - - -- exported - local function SetScroll(self, value) - local status = self.scrollStatus - local frame, child = self.scrollFrame, self.itemFrame - local height, viewheight = frame:GetHeight(), child:GetHeight() - - local offset - if height > viewheight then - offset = 0 - else - offset = floor((viewheight - height) / 1000 * value) - end - child:ClearAllPoints() - child:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, offset) - child:SetPoint("TOPRIGHT", frame, "TOPRIGHT", self.slider:IsShown() and -12 or 0, offset) - status.offset = offset - status.scrollvalue = value - end - - -- exported - local function MoveScroll(self, value) - local status = self.scrollStatus - local frame, child = self.scrollFrame, self.itemFrame - local height, viewheight = frame:GetHeight(), child:GetHeight() - - if height > viewheight then - self.slider:Hide() - else - self.slider:Show() - local diff = height - viewheight - local delta = 1 - if value < 0 then - delta = -1 - end - self.slider:SetValue(min(max(status.scrollvalue + delta*(1000/(diff/45)),0), 1000)) - end - end - - -- exported - local function FixScroll(self) - local status = self.scrollStatus - local frame, child = self.scrollFrame, self.itemFrame - local height, viewheight = frame:GetHeight(), child:GetHeight() - local offset = status.offset or 0 - - if viewheight < height then - self.slider:Hide() - child:SetPoint("TOPRIGHT", frame, "TOPRIGHT", 0, offset) - self.slider:SetValue(0) - else - self.slider:Show() - local value = (offset / (viewheight - height) * 1000) - if value > 1000 then value = 1000 end - self.slider:SetValue(value) - self:SetScroll(value) - if value < 1000 then - child:ClearAllPoints() - child:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, offset) - child:SetPoint("TOPRIGHT", frame, "TOPRIGHT", -12, offset) - status.offset = offset - end - end - end - - -- exported, AceGUI callback - local function OnAcquire(self) - self.frame:SetParent(UIParent) - --self.itemFrame:SetToplevel(true) - end - - -- exported, AceGUI callback - local function OnRelease(self) - self:Clear() - self.frame:ClearAllPoints() - self.frame:Hide() - end - - -- exported - local function AddItem(self, item) - self.items[#self.items + 1] = item - - local h = #self.items * 16 - self.itemFrame:SetHeight(h) - self.frame:SetHeight(min(h + 34, self.maxHeight)) -- +34: 20 for scrollFrame placement (10 offset) and +14 for item placement - - item.frame:SetPoint("LEFT", self.itemFrame, "LEFT") - item.frame:SetPoint("RIGHT", self.itemFrame, "RIGHT") - - item:SetPullout(self) - item:SetOnEnter(OnEnter) - end - - -- exported - local function Open(self, point, relFrame, relPoint, x, y) - local items = self.items - local frame = self.frame - local itemFrame = self.itemFrame - - frame:SetPoint(point, relFrame, relPoint, x, y) - - - local height = 8 - for i, item in pairs(items) do - if i == 1 then - item:SetPoint("TOP", itemFrame, "TOP", 0, -2) - else - item:SetPoint("TOP", items[i-1].frame, "BOTTOM", 0, 1) - end - - item:Show() - - height = height + 16 - end - itemFrame:SetHeight(height) - fixstrata("TOOLTIP", frame, frame:GetChildren()) - frame:Show() - self:Fire("OnOpen") - end - - -- exported - local function Close(self) - self.frame:Hide() - self:Fire("OnClose") - end - - -- exported - local function Clear(self) - local items = self.items - for i, item in pairs(items) do - AceGUI:Release(item) - items[i] = nil - end - end - - -- exported - local function IterateItems(self) - return ipairs(self.items) - end - - -- exported - local function SetHideOnLeave(self, val) - self.hideOnLeave = val - end - - -- exported - local function SetMaxHeight(self, height) - self.maxHeight = height or defaultMaxHeight - if self.frame:GetHeight() > height then - self.frame:SetHeight(height) - elseif (self.itemFrame:GetHeight() + 34) < height then - self.frame:SetHeight(self.itemFrame:GetHeight() + 34) -- see :AddItem - end - end - - -- exported - local function GetRightBorderWidth(self) - return 6 + (self.slider:IsShown() and 12 or 0) - end - - -- exported - local function GetLeftBorderWidth(self) - return 6 - end - - --[[ Constructor ]]-- - - local function Constructor() - local count = AceGUI:GetNextWidgetNum(widgetType) - local frame = CreateFrame("Frame", "AceGUI30Pullout"..count, UIParent) - local self = {} - self.count = count - self.type = widgetType - self.frame = frame - frame.obj = self - - self.OnAcquire = OnAcquire - self.OnRelease = OnRelease - - self.AddItem = AddItem - self.Open = Open - self.Close = Close - self.Clear = Clear - self.IterateItems = IterateItems - self.SetHideOnLeave = SetHideOnLeave - - self.SetScroll = SetScroll - self.MoveScroll = MoveScroll - self.FixScroll = FixScroll - - self.SetMaxHeight = SetMaxHeight - self.GetRightBorderWidth = GetRightBorderWidth - self.GetLeftBorderWidth = GetLeftBorderWidth - - self.items = {} - - self.scrollStatus = { - scrollvalue = 0, - } - - self.maxHeight = defaultMaxHeight - - frame:SetBackdrop(backdrop) - frame:SetBackdropColor(0, 0, 0) - frame:SetFrameStrata("FULLSCREEN_DIALOG") - frame:SetClampedToScreen(true) - frame:SetWidth(defaultWidth) - frame:SetHeight(self.maxHeight) - --frame:SetToplevel(true) - - -- NOTE: The whole scroll frame code is copied from the AceGUI-3.0 widget ScrollFrame - local scrollFrame = CreateFrame("ScrollFrame", nil, frame) - local itemFrame = CreateFrame("Frame", nil, scrollFrame) - - self.scrollFrame = scrollFrame - self.itemFrame = itemFrame - - scrollFrame.obj = self - itemFrame.obj = self - - local slider = CreateFrame("Slider", "AceGUI30PulloutScrollbar"..count, scrollFrame) - slider:SetOrientation("VERTICAL") - slider:SetHitRectInsets(0, 0, -10, 0) - slider:SetBackdrop(sliderBackdrop) - slider:SetWidth(8) - slider:SetThumbTexture("Interface\\Buttons\\UI-SliderBar-Button-Vertical") - slider:SetFrameStrata("FULLSCREEN_DIALOG") - self.slider = slider - slider.obj = self - - scrollFrame:SetScrollChild(itemFrame) - scrollFrame:SetPoint("TOPLEFT", frame, "TOPLEFT", 6, -12) - scrollFrame:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -6, 12) - scrollFrame:EnableMouseWheel(true) - scrollFrame:SetScript("OnMouseWheel", OnMouseWheel) - scrollFrame:SetScript("OnSizeChanged", OnSizeChanged) - scrollFrame:SetToplevel(true) - scrollFrame:SetFrameStrata("FULLSCREEN_DIALOG") - - itemFrame:SetPoint("TOPLEFT", scrollFrame, "TOPLEFT", 0, 0) - itemFrame:SetPoint("TOPRIGHT", scrollFrame, "TOPRIGHT", -12, 0) - itemFrame:SetHeight(400) - itemFrame:SetToplevel(true) - itemFrame:SetFrameStrata("FULLSCREEN_DIALOG") - - slider:SetPoint("TOPLEFT", scrollFrame, "TOPRIGHT", -16, 0) - slider:SetPoint("BOTTOMLEFT", scrollFrame, "BOTTOMRIGHT", -16, 0) - slider:SetScript("OnValueChanged", OnScrollValueChanged) - slider:SetMinMaxValues(0, 1000) - slider:SetValueStep(1) - slider:SetValue(0) - - scrollFrame:Show() - itemFrame:Show() - slider:Hide() - - self:FixScroll() - - AceGUI:RegisterAsWidget(self) - return self - end - - AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion) -end - -do - local widgetType = "Dropdown" - local widgetVersion = 25 - - --[[ Static data ]]-- - - --[[ UI event handler ]]-- - - local function Control_OnEnter(this) - this.obj:Fire("OnEnter") - end - - local function Control_OnLeave(this) - this.obj:Fire("OnLeave") - end - - local function Dropdown_OnHide(this) - local self = this.obj - if self.open then - self.pullout:Close() - end - end - - local function Dropdown_TogglePullout(this) - local self = this.obj - PlaySound("igMainMenuOptionCheckBoxOn") -- missleading name, but the Blizzard code uses this sound - if self.open then - self.open = nil - self.pullout:Close() - AceGUI:ClearFocus() - else - self.open = true - self.pullout:SetWidth(self.frame:GetWidth()) - self.pullout:Open("TOPLEFT", self.frame, "BOTTOMLEFT", 0, self.label:IsShown() and -2 or 0) - AceGUI:SetFocus(self) - end - end - - local function OnPulloutOpen(this) - local self = this.userdata.obj - local value = self.value - - if not self.multiselect then - for i, item in this:IterateItems() do - item:SetValue(item.userdata.value == value) - end - end - - self.open = true - end - - local function OnPulloutClose(this) - local self = this.userdata.obj - self.open = nil - self:Fire("OnClosed") - end - - local function ShowMultiText(self) - local text - for i, widget in self.pullout:IterateItems() do - if widget.type == "Dropdown-Item-Toggle" then - if widget:GetValue() then - if text then - text = text..", "..widget:GetText() - else - text = widget:GetText() - end - end - end - end - self:SetText(text) - end - - local function OnItemValueChanged(this, event, checked) - local self = this.userdata.obj - - if self.multiselect then - self:Fire("OnValueChanged", this.userdata.value, checked) - ShowMultiText(self) - else - if checked then - self:SetValue(this.userdata.value) - self:Fire("OnValueChanged", this.userdata.value) - else - this:SetValue(true) - end - if self.open then - self.pullout:Close() - end - end - end - - --[[ Exported methods ]]-- - - -- exported, AceGUI callback - local function OnAcquire(self) - local pullout = AceGUI:Create("Dropdown-Pullout") - self.pullout = pullout - pullout.userdata.obj = self - pullout:SetCallback("OnClose", OnPulloutClose) - pullout:SetCallback("OnOpen", OnPulloutOpen) - self.pullout.frame:SetFrameLevel(self.frame:GetFrameLevel() + 1) - fixlevels(self.pullout.frame, self.pullout.frame:GetChildren()) - - self:SetHeight(44) - self:SetWidth(200) - self:SetLabel() - end - - -- exported, AceGUI callback - local function OnRelease(self) - if self.open then - self.pullout:Close() - end - AceGUI:Release(self.pullout) - self.pullout = nil - - self:SetText("") - self:SetDisabled(false) - self:SetMultiselect(false) - - self.value = nil - self.list = nil - self.open = nil - self.hasClose = nil - - self.frame:ClearAllPoints() - self.frame:Hide() - end - - -- exported - local function SetDisabled(self, disabled) - self.disabled = disabled - if disabled then - self.text:SetTextColor(0.5,0.5,0.5) - self.button:Disable() - self.label:SetTextColor(0.5,0.5,0.5) - else - self.button:Enable() - self.label:SetTextColor(1,.82,0) - self.text:SetTextColor(1,1,1) - end - end - - -- exported - local function ClearFocus(self) - if self.open then - self.pullout:Close() - end - end - - -- exported - local function SetText(self, text) - self.text:SetText(text or "") - end - - -- exported - local function SetLabel(self, text) - if text and text ~= "" then - self.label:SetText(text) - self.label:Show() - self.dropdown:SetPoint("TOPLEFT",self.frame,"TOPLEFT",-15,-18) - self:SetHeight(44) - self.alignoffset = 30 - else - self.label:SetText("") - self.label:Hide() - self.dropdown:SetPoint("TOPLEFT",self.frame,"TOPLEFT",-15,0) - self:SetHeight(26) - self.alignoffset = 12 - end - end - - -- exported - local function SetValue(self, value) - if self.list then - self:SetText(self.list[value] or "") - end - self.value = value - end - - -- exported - local function GetValue(self) - return self.value - end - - -- exported - local function SetItemValue(self, item, value) - if not self.multiselect then return end - for i, widget in self.pullout:IterateItems() do - if widget.userdata.value == item then - if widget.SetValue then - widget:SetValue(value) - end - end - end - ShowMultiText(self) - end - - -- exported - local function SetItemDisabled(self, item, disabled) - for i, widget in self.pullout:IterateItems() do - if widget.userdata.value == item then - widget:SetDisabled(disabled) - end - end - end - - local function AddListItem(self, value, text, itemType) - if not itemType then itemType = "Dropdown-Item-Toggle" end - local exists = AceGUI:GetWidgetVersion(itemType) - if not exists then error(("The given item type, %q, does not exist within AceGUI-3.0"):format(tostring(itemType)), 2) end - - local item = AceGUI:Create(itemType) - item:SetText(text) - item.userdata.obj = self - item.userdata.value = value - item:SetCallback("OnValueChanged", OnItemValueChanged) - self.pullout:AddItem(item) - end - - local function AddCloseButton(self) - if not self.hasClose then - local close = AceGUI:Create("Dropdown-Item-Execute") - close:SetText(CLOSE) - self.pullout:AddItem(close) - self.hasClose = true - end - end - - -- exported - local sortlist = {} - local function SetList(self, list, order, itemType) - self.list = list - self.pullout:Clear() - self.hasClose = nil - if not list then return end - - if type(order) ~= "table" then - for v in pairs(list) do - sortlist[#sortlist + 1] = v - end - tsort(sortlist) - - for i, key in ipairs(sortlist) do - AddListItem(self, key, list[key], itemType) - sortlist[i] = nil - end - else - for i, key in ipairs(order) do - AddListItem(self, key, list[key], itemType) - end - end - if self.multiselect then - ShowMultiText(self) - AddCloseButton(self) - end - end - - -- exported - local function AddItem(self, value, text, itemType) - if self.list then - self.list[value] = text - AddListItem(self, value, text, itemType) - end - end - - -- exported - local function SetMultiselect(self, multi) - self.multiselect = multi - if multi then - ShowMultiText(self) - AddCloseButton(self) - end - end - - -- exported - local function GetMultiselect(self) - return self.multiselect - end - - --[[ Constructor ]]-- - - local function Constructor() - local count = AceGUI:GetNextWidgetNum(widgetType) - local frame = CreateFrame("Frame", nil, UIParent) - local dropdown = CreateFrame("Frame", "AceGUI30DropDown"..count, frame, "UIDropDownMenuTemplate") - - local self = {} - self.type = widgetType - self.frame = frame - self.dropdown = dropdown - self.count = count - frame.obj = self - dropdown.obj = self - - self.OnRelease = OnRelease - self.OnAcquire = OnAcquire - - self.ClearFocus = ClearFocus - - self.SetText = SetText - self.SetValue = SetValue - self.GetValue = GetValue - self.SetList = SetList - self.SetLabel = SetLabel - self.SetDisabled = SetDisabled - self.AddItem = AddItem - self.SetMultiselect = SetMultiselect - self.GetMultiselect = GetMultiselect - self.SetItemValue = SetItemValue - self.SetItemDisabled = SetItemDisabled - - self.alignoffset = 30 - - frame:SetScript("OnHide",Dropdown_OnHide) - - dropdown:ClearAllPoints() - dropdown:SetPoint("TOPLEFT",frame,"TOPLEFT",-15,0) - dropdown:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",17,0) - dropdown:SetScript("OnHide", nil) - - local left = _G[dropdown:GetName() .. "Left"] - local middle = _G[dropdown:GetName() .. "Middle"] - local right = _G[dropdown:GetName() .. "Right"] - - middle:ClearAllPoints() - right:ClearAllPoints() - - middle:SetPoint("LEFT", left, "RIGHT", 0, 0) - middle:SetPoint("RIGHT", right, "LEFT", 0, 0) - right:SetPoint("TOPRIGHT", dropdown, "TOPRIGHT", 0, 17) - - local button = _G[dropdown:GetName() .. "Button"] - self.button = button - button.obj = self - button:SetScript("OnEnter",Control_OnEnter) - button:SetScript("OnLeave",Control_OnLeave) - button:SetScript("OnClick",Dropdown_TogglePullout) - - local text = _G[dropdown:GetName() .. "Text"] - self.text = text - text.obj = self - text:ClearAllPoints() - text:SetPoint("RIGHT", right, "RIGHT" ,-43, 2) - text:SetPoint("LEFT", left, "LEFT", 25, 2) - - local label = frame:CreateFontString(nil,"OVERLAY","GameFontNormalSmall") - label:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0) - label:SetPoint("TOPRIGHT",frame,"TOPRIGHT",0,0) - label:SetJustifyH("LEFT") - label:SetHeight(18) - label:Hide() - self.label = label - - AceGUI:RegisterAsWidget(self) - return self - end - - AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion) -end +--[[ $Id: AceGUIWidget-DropDown.lua 1029 2011-06-10 23:10:58Z nevcairiel $ ]]-- +local AceGUI = LibStub("AceGUI-3.0") + +-- Lua APIs +local min, max, floor = math.min, math.max, math.floor +local select, pairs, ipairs, type = select, pairs, ipairs, type +local tsort = table.sort + +-- WoW APIs +local PlaySound = PlaySound +local UIParent, CreateFrame = UIParent, CreateFrame +local _G = _G + +-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded +-- List them here for Mikk's FindGlobals script +-- GLOBALS: CLOSE + +local function fixlevels(parent,...) + local i = 1 + local child = select(i, ...) + while child do + child:SetFrameLevel(parent:GetFrameLevel()+1) + fixlevels(child, child:GetChildren()) + i = i + 1 + child = select(i, ...) + end +end + +local function fixstrata(strata, parent, ...) + local i = 1 + local child = select(i, ...) + parent:SetFrameStrata(strata) + while child do + fixstrata(strata, child, child:GetChildren()) + i = i + 1 + child = select(i, ...) + end +end + +do + local widgetType = "Dropdown-Pullout" + local widgetVersion = 3 + + --[[ Static data ]]-- + + local backdrop = { + bgFile = "Interface\\ChatFrame\\ChatFrameBackground", + edgeFile = "Interface\\DialogFrame\\UI-DialogBox-Border", + edgeSize = 32, + tileSize = 32, + tile = true, + insets = { left = 11, right = 12, top = 12, bottom = 11 }, + } + local sliderBackdrop = { + bgFile = "Interface\\Buttons\\UI-SliderBar-Background", + edgeFile = "Interface\\Buttons\\UI-SliderBar-Border", + tile = true, tileSize = 8, edgeSize = 8, + insets = { left = 3, right = 3, top = 3, bottom = 3 } + } + + local defaultWidth = 200 + local defaultMaxHeight = 600 + + --[[ UI Event Handlers ]]-- + + -- HACK: This should be no part of the pullout, but there + -- is no other 'clean' way to response to any item-OnEnter + -- Used to close Submenus when an other item is entered + local function OnEnter(item) + local self = item.pullout + for k, v in ipairs(self.items) do + if v.CloseMenu and v ~= item then + v:CloseMenu() + end + end + end + + -- See the note in Constructor() for each scroll related function + local function OnMouseWheel(this, value) + this.obj:MoveScroll(value) + end + + local function OnScrollValueChanged(this, value) + this.obj:SetScroll(value) + end + + local function OnSizeChanged(this) + this.obj:FixScroll() + end + + --[[ Exported methods ]]-- + + -- exported + local function SetScroll(self, value) + local status = self.scrollStatus + local frame, child = self.scrollFrame, self.itemFrame + local height, viewheight = frame:GetHeight(), child:GetHeight() + + local offset + if height > viewheight then + offset = 0 + else + offset = floor((viewheight - height) / 1000 * value) + end + child:ClearAllPoints() + child:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, offset) + child:SetPoint("TOPRIGHT", frame, "TOPRIGHT", self.slider:IsShown() and -12 or 0, offset) + status.offset = offset + status.scrollvalue = value + end + + -- exported + local function MoveScroll(self, value) + local status = self.scrollStatus + local frame, child = self.scrollFrame, self.itemFrame + local height, viewheight = frame:GetHeight(), child:GetHeight() + + if height > viewheight then + self.slider:Hide() + else + self.slider:Show() + local diff = height - viewheight + local delta = 1 + if value < 0 then + delta = -1 + end + self.slider:SetValue(min(max(status.scrollvalue + delta*(1000/(diff/45)),0), 1000)) + end + end + + -- exported + local function FixScroll(self) + local status = self.scrollStatus + local frame, child = self.scrollFrame, self.itemFrame + local height, viewheight = frame:GetHeight(), child:GetHeight() + local offset = status.offset or 0 + + if viewheight < height then + self.slider:Hide() + child:SetPoint("TOPRIGHT", frame, "TOPRIGHT", 0, offset) + self.slider:SetValue(0) + else + self.slider:Show() + local value = (offset / (viewheight - height) * 1000) + if value > 1000 then value = 1000 end + self.slider:SetValue(value) + self:SetScroll(value) + if value < 1000 then + child:ClearAllPoints() + child:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, offset) + child:SetPoint("TOPRIGHT", frame, "TOPRIGHT", -12, offset) + status.offset = offset + end + end + end + + -- exported, AceGUI callback + local function OnAcquire(self) + self.frame:SetParent(UIParent) + --self.itemFrame:SetToplevel(true) + end + + -- exported, AceGUI callback + local function OnRelease(self) + self:Clear() + self.frame:ClearAllPoints() + self.frame:Hide() + end + + -- exported + local function AddItem(self, item) + self.items[#self.items + 1] = item + + local h = #self.items * 16 + self.itemFrame:SetHeight(h) + self.frame:SetHeight(min(h + 34, self.maxHeight)) -- +34: 20 for scrollFrame placement (10 offset) and +14 for item placement + + item.frame:SetPoint("LEFT", self.itemFrame, "LEFT") + item.frame:SetPoint("RIGHT", self.itemFrame, "RIGHT") + + item:SetPullout(self) + item:SetOnEnter(OnEnter) + end + + -- exported + local function Open(self, point, relFrame, relPoint, x, y) + local items = self.items + local frame = self.frame + local itemFrame = self.itemFrame + + frame:SetPoint(point, relFrame, relPoint, x, y) + + + local height = 8 + for i, item in pairs(items) do + if i == 1 then + item:SetPoint("TOP", itemFrame, "TOP", 0, -2) + else + item:SetPoint("TOP", items[i-1].frame, "BOTTOM", 0, 1) + end + + item:Show() + + height = height + 16 + end + itemFrame:SetHeight(height) + fixstrata("TOOLTIP", frame, frame:GetChildren()) + frame:Show() + self:Fire("OnOpen") + end + + -- exported + local function Close(self) + self.frame:Hide() + self:Fire("OnClose") + end + + -- exported + local function Clear(self) + local items = self.items + for i, item in pairs(items) do + AceGUI:Release(item) + items[i] = nil + end + end + + -- exported + local function IterateItems(self) + return ipairs(self.items) + end + + -- exported + local function SetHideOnLeave(self, val) + self.hideOnLeave = val + end + + -- exported + local function SetMaxHeight(self, height) + self.maxHeight = height or defaultMaxHeight + if self.frame:GetHeight() > height then + self.frame:SetHeight(height) + elseif (self.itemFrame:GetHeight() + 34) < height then + self.frame:SetHeight(self.itemFrame:GetHeight() + 34) -- see :AddItem + end + end + + -- exported + local function GetRightBorderWidth(self) + return 6 + (self.slider:IsShown() and 12 or 0) + end + + -- exported + local function GetLeftBorderWidth(self) + return 6 + end + + --[[ Constructor ]]-- + + local function Constructor() + local count = AceGUI:GetNextWidgetNum(widgetType) + local frame = CreateFrame("Frame", "AceGUI30Pullout"..count, UIParent) + local self = {} + self.count = count + self.type = widgetType + self.frame = frame + frame.obj = self + + self.OnAcquire = OnAcquire + self.OnRelease = OnRelease + + self.AddItem = AddItem + self.Open = Open + self.Close = Close + self.Clear = Clear + self.IterateItems = IterateItems + self.SetHideOnLeave = SetHideOnLeave + + self.SetScroll = SetScroll + self.MoveScroll = MoveScroll + self.FixScroll = FixScroll + + self.SetMaxHeight = SetMaxHeight + self.GetRightBorderWidth = GetRightBorderWidth + self.GetLeftBorderWidth = GetLeftBorderWidth + + self.items = {} + + self.scrollStatus = { + scrollvalue = 0, + } + + self.maxHeight = defaultMaxHeight + + frame:SetBackdrop(backdrop) + frame:SetBackdropColor(0, 0, 0) + frame:SetFrameStrata("FULLSCREEN_DIALOG") + frame:SetClampedToScreen(true) + frame:SetWidth(defaultWidth) + frame:SetHeight(self.maxHeight) + --frame:SetToplevel(true) + + -- NOTE: The whole scroll frame code is copied from the AceGUI-3.0 widget ScrollFrame + local scrollFrame = CreateFrame("ScrollFrame", nil, frame) + local itemFrame = CreateFrame("Frame", nil, scrollFrame) + + self.scrollFrame = scrollFrame + self.itemFrame = itemFrame + + scrollFrame.obj = self + itemFrame.obj = self + + local slider = CreateFrame("Slider", "AceGUI30PulloutScrollbar"..count, scrollFrame) + slider:SetOrientation("VERTICAL") + slider:SetHitRectInsets(0, 0, -10, 0) + slider:SetBackdrop(sliderBackdrop) + slider:SetWidth(8) + slider:SetThumbTexture("Interface\\Buttons\\UI-SliderBar-Button-Vertical") + slider:SetFrameStrata("FULLSCREEN_DIALOG") + self.slider = slider + slider.obj = self + + scrollFrame:SetScrollChild(itemFrame) + scrollFrame:SetPoint("TOPLEFT", frame, "TOPLEFT", 6, -12) + scrollFrame:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -6, 12) + scrollFrame:EnableMouseWheel(true) + scrollFrame:SetScript("OnMouseWheel", OnMouseWheel) + scrollFrame:SetScript("OnSizeChanged", OnSizeChanged) + scrollFrame:SetToplevel(true) + scrollFrame:SetFrameStrata("FULLSCREEN_DIALOG") + + itemFrame:SetPoint("TOPLEFT", scrollFrame, "TOPLEFT", 0, 0) + itemFrame:SetPoint("TOPRIGHT", scrollFrame, "TOPRIGHT", -12, 0) + itemFrame:SetHeight(400) + itemFrame:SetToplevel(true) + itemFrame:SetFrameStrata("FULLSCREEN_DIALOG") + + slider:SetPoint("TOPLEFT", scrollFrame, "TOPRIGHT", -16, 0) + slider:SetPoint("BOTTOMLEFT", scrollFrame, "BOTTOMRIGHT", -16, 0) + slider:SetScript("OnValueChanged", OnScrollValueChanged) + slider:SetMinMaxValues(0, 1000) + slider:SetValueStep(1) + slider:SetValue(0) + + scrollFrame:Show() + itemFrame:Show() + slider:Hide() + + self:FixScroll() + + AceGUI:RegisterAsWidget(self) + return self + end + + AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion) +end + +do + local widgetType = "Dropdown" + local widgetVersion = 25 + + --[[ Static data ]]-- + + --[[ UI event handler ]]-- + + local function Control_OnEnter(this) + this.obj:Fire("OnEnter") + end + + local function Control_OnLeave(this) + this.obj:Fire("OnLeave") + end + + local function Dropdown_OnHide(this) + local self = this.obj + if self.open then + self.pullout:Close() + end + end + + local function Dropdown_TogglePullout(this) + local self = this.obj + PlaySound("igMainMenuOptionCheckBoxOn") -- missleading name, but the Blizzard code uses this sound + if self.open then + self.open = nil + self.pullout:Close() + AceGUI:ClearFocus() + else + self.open = true + self.pullout:SetWidth(self.frame:GetWidth()) + self.pullout:Open("TOPLEFT", self.frame, "BOTTOMLEFT", 0, self.label:IsShown() and -2 or 0) + AceGUI:SetFocus(self) + end + end + + local function OnPulloutOpen(this) + local self = this.userdata.obj + local value = self.value + + if not self.multiselect then + for i, item in this:IterateItems() do + item:SetValue(item.userdata.value == value) + end + end + + self.open = true + end + + local function OnPulloutClose(this) + local self = this.userdata.obj + self.open = nil + self:Fire("OnClosed") + end + + local function ShowMultiText(self) + local text + for i, widget in self.pullout:IterateItems() do + if widget.type == "Dropdown-Item-Toggle" then + if widget:GetValue() then + if text then + text = text..", "..widget:GetText() + else + text = widget:GetText() + end + end + end + end + self:SetText(text) + end + + local function OnItemValueChanged(this, event, checked) + local self = this.userdata.obj + + if self.multiselect then + self:Fire("OnValueChanged", this.userdata.value, checked) + ShowMultiText(self) + else + if checked then + self:SetValue(this.userdata.value) + self:Fire("OnValueChanged", this.userdata.value) + else + this:SetValue(true) + end + if self.open then + self.pullout:Close() + end + end + end + + --[[ Exported methods ]]-- + + -- exported, AceGUI callback + local function OnAcquire(self) + local pullout = AceGUI:Create("Dropdown-Pullout") + self.pullout = pullout + pullout.userdata.obj = self + pullout:SetCallback("OnClose", OnPulloutClose) + pullout:SetCallback("OnOpen", OnPulloutOpen) + self.pullout.frame:SetFrameLevel(self.frame:GetFrameLevel() + 1) + fixlevels(self.pullout.frame, self.pullout.frame:GetChildren()) + + self:SetHeight(44) + self:SetWidth(200) + self:SetLabel() + end + + -- exported, AceGUI callback + local function OnRelease(self) + if self.open then + self.pullout:Close() + end + AceGUI:Release(self.pullout) + self.pullout = nil + + self:SetText("") + self:SetDisabled(false) + self:SetMultiselect(false) + + self.value = nil + self.list = nil + self.open = nil + self.hasClose = nil + + self.frame:ClearAllPoints() + self.frame:Hide() + end + + -- exported + local function SetDisabled(self, disabled) + self.disabled = disabled + if disabled then + self.text:SetTextColor(0.5,0.5,0.5) + self.button:Disable() + self.label:SetTextColor(0.5,0.5,0.5) + else + self.button:Enable() + self.label:SetTextColor(1,.82,0) + self.text:SetTextColor(1,1,1) + end + end + + -- exported + local function ClearFocus(self) + if self.open then + self.pullout:Close() + end + end + + -- exported + local function SetText(self, text) + self.text:SetText(text or "") + end + + -- exported + local function SetLabel(self, text) + if text and text ~= "" then + self.label:SetText(text) + self.label:Show() + self.dropdown:SetPoint("TOPLEFT",self.frame,"TOPLEFT",-15,-18) + self:SetHeight(44) + self.alignoffset = 30 + else + self.label:SetText("") + self.label:Hide() + self.dropdown:SetPoint("TOPLEFT",self.frame,"TOPLEFT",-15,0) + self:SetHeight(26) + self.alignoffset = 12 + end + end + + -- exported + local function SetValue(self, value) + if self.list then + self:SetText(self.list[value] or "") + end + self.value = value + end + + -- exported + local function GetValue(self) + return self.value + end + + -- exported + local function SetItemValue(self, item, value) + if not self.multiselect then return end + for i, widget in self.pullout:IterateItems() do + if widget.userdata.value == item then + if widget.SetValue then + widget:SetValue(value) + end + end + end + ShowMultiText(self) + end + + -- exported + local function SetItemDisabled(self, item, disabled) + for i, widget in self.pullout:IterateItems() do + if widget.userdata.value == item then + widget:SetDisabled(disabled) + end + end + end + + local function AddListItem(self, value, text, itemType) + if not itemType then itemType = "Dropdown-Item-Toggle" end + local exists = AceGUI:GetWidgetVersion(itemType) + if not exists then error(("The given item type, %q, does not exist within AceGUI-3.0"):format(tostring(itemType)), 2) end + + local item = AceGUI:Create(itemType) + item:SetText(text) + item.userdata.obj = self + item.userdata.value = value + item:SetCallback("OnValueChanged", OnItemValueChanged) + self.pullout:AddItem(item) + end + + local function AddCloseButton(self) + if not self.hasClose then + local close = AceGUI:Create("Dropdown-Item-Execute") + close:SetText(CLOSE) + self.pullout:AddItem(close) + self.hasClose = true + end + end + + -- exported + local sortlist = {} + local function SetList(self, list, order, itemType) + self.list = list + self.pullout:Clear() + self.hasClose = nil + if not list then return end + + if type(order) ~= "table" then + for v in pairs(list) do + sortlist[#sortlist + 1] = v + end + tsort(sortlist) + + for i, key in ipairs(sortlist) do + AddListItem(self, key, list[key], itemType) + sortlist[i] = nil + end + else + for i, key in ipairs(order) do + AddListItem(self, key, list[key], itemType) + end + end + if self.multiselect then + ShowMultiText(self) + AddCloseButton(self) + end + end + + -- exported + local function AddItem(self, value, text, itemType) + if self.list then + self.list[value] = text + AddListItem(self, value, text, itemType) + end + end + + -- exported + local function SetMultiselect(self, multi) + self.multiselect = multi + if multi then + ShowMultiText(self) + AddCloseButton(self) + end + end + + -- exported + local function GetMultiselect(self) + return self.multiselect + end + + --[[ Constructor ]]-- + + local function Constructor() + local count = AceGUI:GetNextWidgetNum(widgetType) + local frame = CreateFrame("Frame", nil, UIParent) + local dropdown = CreateFrame("Frame", "AceGUI30DropDown"..count, frame, "UIDropDownMenuTemplate") + + local self = {} + self.type = widgetType + self.frame = frame + self.dropdown = dropdown + self.count = count + frame.obj = self + dropdown.obj = self + + self.OnRelease = OnRelease + self.OnAcquire = OnAcquire + + self.ClearFocus = ClearFocus + + self.SetText = SetText + self.SetValue = SetValue + self.GetValue = GetValue + self.SetList = SetList + self.SetLabel = SetLabel + self.SetDisabled = SetDisabled + self.AddItem = AddItem + self.SetMultiselect = SetMultiselect + self.GetMultiselect = GetMultiselect + self.SetItemValue = SetItemValue + self.SetItemDisabled = SetItemDisabled + + self.alignoffset = 30 + + frame:SetScript("OnHide",Dropdown_OnHide) + + dropdown:ClearAllPoints() + dropdown:SetPoint("TOPLEFT",frame,"TOPLEFT",-15,0) + dropdown:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",17,0) + dropdown:SetScript("OnHide", nil) + + local left = _G[dropdown:GetName() .. "Left"] + local middle = _G[dropdown:GetName() .. "Middle"] + local right = _G[dropdown:GetName() .. "Right"] + + middle:ClearAllPoints() + right:ClearAllPoints() + + middle:SetPoint("LEFT", left, "RIGHT", 0, 0) + middle:SetPoint("RIGHT", right, "LEFT", 0, 0) + right:SetPoint("TOPRIGHT", dropdown, "TOPRIGHT", 0, 17) + + local button = _G[dropdown:GetName() .. "Button"] + self.button = button + button.obj = self + button:SetScript("OnEnter",Control_OnEnter) + button:SetScript("OnLeave",Control_OnLeave) + button:SetScript("OnClick",Dropdown_TogglePullout) + + local text = _G[dropdown:GetName() .. "Text"] + self.text = text + text.obj = self + text:ClearAllPoints() + text:SetPoint("RIGHT", right, "RIGHT" ,-43, 2) + text:SetPoint("LEFT", left, "LEFT", 25, 2) + + local label = frame:CreateFontString(nil,"OVERLAY","GameFontNormalSmall") + label:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0) + label:SetPoint("TOPRIGHT",frame,"TOPRIGHT",0,0) + label:SetJustifyH("LEFT") + label:SetHeight(18) + label:Hide() + self.label = label + + AceGUI:RegisterAsWidget(self) + return self + end + + AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion) +end diff --git a/libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua b/libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua old mode 100644 new mode 100755 index ec089f4..acd7131 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua @@ -1,256 +1,256 @@ ---[[----------------------------------------------------------------------------- -EditBox Widget --------------------------------------------------------------------------------]] -local Type, Version = "EditBox", 24 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local tostring, pairs = tostring, pairs - --- WoW APIs -local PlaySound = PlaySound -local GetCursorInfo, ClearCursor, GetSpellInfo = GetCursorInfo, ClearCursor, GetSpellInfo -local CreateFrame, UIParent = CreateFrame, UIParent -local _G = _G - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: AceGUIEditBoxInsertLink, ChatFontNormal, OKAY - ---[[----------------------------------------------------------------------------- -Support functions --------------------------------------------------------------------------------]] -if not AceGUIEditBoxInsertLink then - -- upgradeable hook - hooksecurefunc("ChatEdit_InsertLink", function(...) return _G.AceGUIEditBoxInsertLink(...) end) -end - -function _G.AceGUIEditBoxInsertLink(text) - for i = 1, AceGUI:GetWidgetCount(Type) do - local editbox = _G["AceGUI-3.0EditBox"..i] - if editbox and editbox:IsVisible() and editbox:HasFocus() then - editbox:Insert(text) - return true - end - end -end - -local function ShowButton(self) - if not self.disablebutton then - self.button:Show() - self.editbox:SetTextInsets(0, 20, 3, 3) - end -end - -local function HideButton(self) - self.button:Hide() - self.editbox:SetTextInsets(0, 0, 3, 3) -end - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function Control_OnEnter(frame) - frame.obj:Fire("OnEnter") -end - -local function Control_OnLeave(frame) - frame.obj:Fire("OnLeave") -end - -local function Frame_OnShowFocus(frame) - frame.obj.editbox:SetFocus() - frame:SetScript("OnShow", nil) -end - -local function EditBox_OnEscapePressed(frame) - AceGUI:ClearFocus() -end - -local function EditBox_OnEnterPressed(frame) - local self = frame.obj - local value = frame:GetText() - local cancel = self:Fire("OnEnterPressed", value) - if not cancel then - PlaySound("igMainMenuOptionCheckBoxOn") - HideButton(self) - end -end - -local function EditBox_OnReceiveDrag(frame) - local self = frame.obj - local type, id, info = GetCursorInfo() - if type == "item" then - self:SetText(info) - self:Fire("OnEnterPressed", info) - ClearCursor() - elseif type == "spell" then - local name = GetSpellInfo(id, info) - self:SetText(name) - self:Fire("OnEnterPressed", name) - ClearCursor() - end - HideButton(self) - AceGUI:ClearFocus() -end - -local function EditBox_OnTextChanged(frame) - local self = frame.obj - local value = frame:GetText() - if tostring(value) ~= tostring(self.lasttext) then - self:Fire("OnTextChanged", value) - self.lasttext = value - ShowButton(self) - end -end - -local function EditBox_OnFocusGained(frame) - AceGUI:SetFocus(frame.obj) -end - -local function Button_OnClick(frame) - local editbox = frame.obj.editbox - editbox:ClearFocus() - EditBox_OnEnterPressed(editbox) -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - -- height is controlled by SetLabel - self:SetWidth(200) - self:SetDisabled(false) - self:SetLabel() - self:SetText() - self:DisableButton(false) - self:SetMaxLetters(0) - end, - - ["OnRelease"] = function(self) - self:ClearFocus() - end, - - ["SetDisabled"] = function(self, disabled) - self.disabled = disabled - if disabled then - self.editbox:EnableMouse(false) - self.editbox:ClearFocus() - self.editbox:SetTextColor(0.5,0.5,0.5) - self.label:SetTextColor(0.5,0.5,0.5) - else - self.editbox:EnableMouse(true) - self.editbox:SetTextColor(1,1,1) - self.label:SetTextColor(1,.82,0) - end - end, - - ["SetText"] = function(self, text) - self.lasttext = text or "" - self.editbox:SetText(text or "") - self.editbox:SetCursorPosition(0) - HideButton(self) - end, - - ["GetText"] = function(self, text) - return self.editbox:GetText() - end, - - ["SetLabel"] = function(self, text) - if text and text ~= "" then - self.label:SetText(text) - self.label:Show() - self.editbox:SetPoint("TOPLEFT",self.frame,"TOPLEFT",7,-18) - self:SetHeight(44) - self.alignoffset = 30 - else - self.label:SetText("") - self.label:Hide() - self.editbox:SetPoint("TOPLEFT",self.frame,"TOPLEFT",7,0) - self:SetHeight(26) - self.alignoffset = 12 - end - end, - - ["DisableButton"] = function(self, disabled) - self.disablebutton = disabled - if disabled then - HideButton(self) - end - end, - - ["SetMaxLetters"] = function (self, num) - self.editbox:SetMaxLetters(num or 0) - end, - - ["ClearFocus"] = function(self) - self.editbox:ClearFocus() - self.frame:SetScript("OnShow", nil) - end, - - ["SetFocus"] = function(self) - self.editbox:SetFocus() - if not self.frame:IsShown() then - self.frame:SetScript("OnShow", Frame_OnShowFocus) - end - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local function Constructor() - local num = AceGUI:GetNextWidgetNum(Type) - local frame = CreateFrame("Frame", nil, UIParent) - frame:Hide() - - local editbox = CreateFrame("EditBox", "AceGUI-3.0EditBox"..num, frame, "InputBoxTemplate") - editbox:SetAutoFocus(false) - editbox:SetFontObject(ChatFontNormal) - editbox:SetScript("OnEnter", Control_OnEnter) - editbox:SetScript("OnLeave", Control_OnLeave) - editbox:SetScript("OnEscapePressed", EditBox_OnEscapePressed) - editbox:SetScript("OnEnterPressed", EditBox_OnEnterPressed) - editbox:SetScript("OnTextChanged", EditBox_OnTextChanged) - editbox:SetScript("OnReceiveDrag", EditBox_OnReceiveDrag) - editbox:SetScript("OnMouseDown", EditBox_OnReceiveDrag) - editbox:SetScript("OnEditFocusGained", EditBox_OnFocusGained) - editbox:SetTextInsets(0, 0, 3, 3) - editbox:SetMaxLetters(256) - editbox:SetPoint("BOTTOMLEFT", 6, 0) - editbox:SetPoint("BOTTOMRIGHT") - editbox:SetHeight(19) - - local label = frame:CreateFontString(nil, "OVERLAY", "GameFontNormalSmall") - label:SetPoint("TOPLEFT", 0, -2) - label:SetPoint("TOPRIGHT", 0, -2) - label:SetJustifyH("LEFT") - label:SetHeight(18) - - local button = CreateFrame("Button", nil, editbox, "UIPanelButtonTemplate") - button:SetWidth(40) - button:SetHeight(20) - button:SetPoint("RIGHT", -2, 0) - button:SetText(OKAY) - button:SetScript("OnClick", Button_OnClick) - button:Hide() - - local widget = { - alignoffset = 30, - editbox = editbox, - label = label, - button = button, - frame = frame, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - editbox.obj, button.obj = widget, widget - - return AceGUI:RegisterAsWidget(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) +--[[----------------------------------------------------------------------------- +EditBox Widget +-------------------------------------------------------------------------------]] +local Type, Version = "EditBox", 24 +local AceGUI = LibStub and LibStub("AceGUI-3.0", true) +if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end + +-- Lua APIs +local tostring, pairs = tostring, pairs + +-- WoW APIs +local PlaySound = PlaySound +local GetCursorInfo, ClearCursor, GetSpellInfo = GetCursorInfo, ClearCursor, GetSpellInfo +local CreateFrame, UIParent = CreateFrame, UIParent +local _G = _G + +-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded +-- List them here for Mikk's FindGlobals script +-- GLOBALS: AceGUIEditBoxInsertLink, ChatFontNormal, OKAY + +--[[----------------------------------------------------------------------------- +Support functions +-------------------------------------------------------------------------------]] +if not AceGUIEditBoxInsertLink then + -- upgradeable hook + hooksecurefunc("ChatEdit_InsertLink", function(...) return _G.AceGUIEditBoxInsertLink(...) end) +end + +function _G.AceGUIEditBoxInsertLink(text) + for i = 1, AceGUI:GetWidgetCount(Type) do + local editbox = _G["AceGUI-3.0EditBox"..i] + if editbox and editbox:IsVisible() and editbox:HasFocus() then + editbox:Insert(text) + return true + end + end +end + +local function ShowButton(self) + if not self.disablebutton then + self.button:Show() + self.editbox:SetTextInsets(0, 20, 3, 3) + end +end + +local function HideButton(self) + self.button:Hide() + self.editbox:SetTextInsets(0, 0, 3, 3) +end + +--[[----------------------------------------------------------------------------- +Scripts +-------------------------------------------------------------------------------]] +local function Control_OnEnter(frame) + frame.obj:Fire("OnEnter") +end + +local function Control_OnLeave(frame) + frame.obj:Fire("OnLeave") +end + +local function Frame_OnShowFocus(frame) + frame.obj.editbox:SetFocus() + frame:SetScript("OnShow", nil) +end + +local function EditBox_OnEscapePressed(frame) + AceGUI:ClearFocus() +end + +local function EditBox_OnEnterPressed(frame) + local self = frame.obj + local value = frame:GetText() + local cancel = self:Fire("OnEnterPressed", value) + if not cancel then + PlaySound("igMainMenuOptionCheckBoxOn") + HideButton(self) + end +end + +local function EditBox_OnReceiveDrag(frame) + local self = frame.obj + local type, id, info = GetCursorInfo() + if type == "item" then + self:SetText(info) + self:Fire("OnEnterPressed", info) + ClearCursor() + elseif type == "spell" then + local name = GetSpellInfo(id, info) + self:SetText(name) + self:Fire("OnEnterPressed", name) + ClearCursor() + end + HideButton(self) + AceGUI:ClearFocus() +end + +local function EditBox_OnTextChanged(frame) + local self = frame.obj + local value = frame:GetText() + if tostring(value) ~= tostring(self.lasttext) then + self:Fire("OnTextChanged", value) + self.lasttext = value + ShowButton(self) + end +end + +local function EditBox_OnFocusGained(frame) + AceGUI:SetFocus(frame.obj) +end + +local function Button_OnClick(frame) + local editbox = frame.obj.editbox + editbox:ClearFocus() + EditBox_OnEnterPressed(editbox) +end + +--[[----------------------------------------------------------------------------- +Methods +-------------------------------------------------------------------------------]] +local methods = { + ["OnAcquire"] = function(self) + -- height is controlled by SetLabel + self:SetWidth(200) + self:SetDisabled(false) + self:SetLabel() + self:SetText() + self:DisableButton(false) + self:SetMaxLetters(0) + end, + + ["OnRelease"] = function(self) + self:ClearFocus() + end, + + ["SetDisabled"] = function(self, disabled) + self.disabled = disabled + if disabled then + self.editbox:EnableMouse(false) + self.editbox:ClearFocus() + self.editbox:SetTextColor(0.5,0.5,0.5) + self.label:SetTextColor(0.5,0.5,0.5) + else + self.editbox:EnableMouse(true) + self.editbox:SetTextColor(1,1,1) + self.label:SetTextColor(1,.82,0) + end + end, + + ["SetText"] = function(self, text) + self.lasttext = text or "" + self.editbox:SetText(text or "") + self.editbox:SetCursorPosition(0) + HideButton(self) + end, + + ["GetText"] = function(self, text) + return self.editbox:GetText() + end, + + ["SetLabel"] = function(self, text) + if text and text ~= "" then + self.label:SetText(text) + self.label:Show() + self.editbox:SetPoint("TOPLEFT",self.frame,"TOPLEFT",7,-18) + self:SetHeight(44) + self.alignoffset = 30 + else + self.label:SetText("") + self.label:Hide() + self.editbox:SetPoint("TOPLEFT",self.frame,"TOPLEFT",7,0) + self:SetHeight(26) + self.alignoffset = 12 + end + end, + + ["DisableButton"] = function(self, disabled) + self.disablebutton = disabled + if disabled then + HideButton(self) + end + end, + + ["SetMaxLetters"] = function (self, num) + self.editbox:SetMaxLetters(num or 0) + end, + + ["ClearFocus"] = function(self) + self.editbox:ClearFocus() + self.frame:SetScript("OnShow", nil) + end, + + ["SetFocus"] = function(self) + self.editbox:SetFocus() + if not self.frame:IsShown() then + self.frame:SetScript("OnShow", Frame_OnShowFocus) + end + end +} + +--[[----------------------------------------------------------------------------- +Constructor +-------------------------------------------------------------------------------]] +local function Constructor() + local num = AceGUI:GetNextWidgetNum(Type) + local frame = CreateFrame("Frame", nil, UIParent) + frame:Hide() + + local editbox = CreateFrame("EditBox", "AceGUI-3.0EditBox"..num, frame, "InputBoxTemplate") + editbox:SetAutoFocus(false) + editbox:SetFontObject(ChatFontNormal) + editbox:SetScript("OnEnter", Control_OnEnter) + editbox:SetScript("OnLeave", Control_OnLeave) + editbox:SetScript("OnEscapePressed", EditBox_OnEscapePressed) + editbox:SetScript("OnEnterPressed", EditBox_OnEnterPressed) + editbox:SetScript("OnTextChanged", EditBox_OnTextChanged) + editbox:SetScript("OnReceiveDrag", EditBox_OnReceiveDrag) + editbox:SetScript("OnMouseDown", EditBox_OnReceiveDrag) + editbox:SetScript("OnEditFocusGained", EditBox_OnFocusGained) + editbox:SetTextInsets(0, 0, 3, 3) + editbox:SetMaxLetters(256) + editbox:SetPoint("BOTTOMLEFT", 6, 0) + editbox:SetPoint("BOTTOMRIGHT") + editbox:SetHeight(19) + + local label = frame:CreateFontString(nil, "OVERLAY", "GameFontNormalSmall") + label:SetPoint("TOPLEFT", 0, -2) + label:SetPoint("TOPRIGHT", 0, -2) + label:SetJustifyH("LEFT") + label:SetHeight(18) + + local button = CreateFrame("Button", nil, editbox, "UIPanelButtonTemplate") + button:SetWidth(40) + button:SetHeight(20) + button:SetPoint("RIGHT", -2, 0) + button:SetText(OKAY) + button:SetScript("OnClick", Button_OnClick) + button:Hide() + + local widget = { + alignoffset = 30, + editbox = editbox, + label = label, + button = button, + frame = frame, + type = Type + } + for method, func in pairs(methods) do + widget[method] = func + end + editbox.obj, button.obj = widget, widget + + return AceGUI:RegisterAsWidget(widget) +end + +AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/libs/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua b/libs/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua old mode 100644 new mode 100755 index bf8b2c0..1aaf3f5 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua @@ -1,78 +1,78 @@ ---[[----------------------------------------------------------------------------- -Heading Widget --------------------------------------------------------------------------------]] -local Type, Version = "Heading", 20 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local pairs = pairs - --- WoW APIs -local CreateFrame, UIParent = CreateFrame, UIParent - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:SetText() - self:SetFullWidth() - self:SetHeight(18) - end, - - -- ["OnRelease"] = nil, - - ["SetText"] = function(self, text) - self.label:SetText(text or "") - if text and text ~= "" then - self.left:SetPoint("RIGHT", self.label, "LEFT", -5, 0) - self.right:Show() - else - self.left:SetPoint("RIGHT", -3, 0) - self.right:Hide() - end - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local function Constructor() - local frame = CreateFrame("Frame", nil, UIParent) - frame:Hide() - - local label = frame:CreateFontString(nil, "BACKGROUND", "GameFontNormal") - label:SetPoint("TOP") - label:SetPoint("BOTTOM") - label:SetJustifyH("CENTER") - - local left = frame:CreateTexture(nil, "BACKGROUND") - left:SetHeight(8) - left:SetPoint("LEFT", 3, 0) - left:SetPoint("RIGHT", label, "LEFT", -5, 0) - left:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border") - left:SetTexCoord(0.81, 0.94, 0.5, 1) - - local right = frame:CreateTexture(nil, "BACKGROUND") - right:SetHeight(8) - right:SetPoint("RIGHT", -3, 0) - right:SetPoint("LEFT", label, "RIGHT", 5, 0) - right:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border") - right:SetTexCoord(0.81, 0.94, 0.5, 1) - - local widget = { - label = label, - left = left, - right = right, - frame = frame, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - - return AceGUI:RegisterAsWidget(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) +--[[----------------------------------------------------------------------------- +Heading Widget +-------------------------------------------------------------------------------]] +local Type, Version = "Heading", 20 +local AceGUI = LibStub and LibStub("AceGUI-3.0", true) +if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end + +-- Lua APIs +local pairs = pairs + +-- WoW APIs +local CreateFrame, UIParent = CreateFrame, UIParent + +--[[----------------------------------------------------------------------------- +Methods +-------------------------------------------------------------------------------]] +local methods = { + ["OnAcquire"] = function(self) + self:SetText() + self:SetFullWidth() + self:SetHeight(18) + end, + + -- ["OnRelease"] = nil, + + ["SetText"] = function(self, text) + self.label:SetText(text or "") + if text and text ~= "" then + self.left:SetPoint("RIGHT", self.label, "LEFT", -5, 0) + self.right:Show() + else + self.left:SetPoint("RIGHT", -3, 0) + self.right:Hide() + end + end +} + +--[[----------------------------------------------------------------------------- +Constructor +-------------------------------------------------------------------------------]] +local function Constructor() + local frame = CreateFrame("Frame", nil, UIParent) + frame:Hide() + + local label = frame:CreateFontString(nil, "BACKGROUND", "GameFontNormal") + label:SetPoint("TOP") + label:SetPoint("BOTTOM") + label:SetJustifyH("CENTER") + + local left = frame:CreateTexture(nil, "BACKGROUND") + left:SetHeight(8) + left:SetPoint("LEFT", 3, 0) + left:SetPoint("RIGHT", label, "LEFT", -5, 0) + left:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border") + left:SetTexCoord(0.81, 0.94, 0.5, 1) + + local right = frame:CreateTexture(nil, "BACKGROUND") + right:SetHeight(8) + right:SetPoint("RIGHT", -3, 0) + right:SetPoint("LEFT", label, "RIGHT", 5, 0) + right:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border") + right:SetTexCoord(0.81, 0.94, 0.5, 1) + + local widget = { + label = label, + left = left, + right = right, + frame = frame, + type = Type + } + for method, func in pairs(methods) do + widget[method] = func + end + + return AceGUI:RegisterAsWidget(widget) +end + +AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua b/libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua old mode 100644 new mode 100755 index ffb0d68..8d01b54 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua @@ -1,144 +1,144 @@ ---[[----------------------------------------------------------------------------- -Icon Widget --------------------------------------------------------------------------------]] -local Type, Version = "Icon", 21 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local select, pairs, print = select, pairs, print - --- WoW APIs -local CreateFrame, UIParent, GetBuildInfo = CreateFrame, UIParent, GetBuildInfo - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function Control_OnEnter(frame) - frame.obj:Fire("OnEnter") -end - -local function Control_OnLeave(frame) - frame.obj:Fire("OnLeave") -end - -local function Button_OnClick(frame, button) - frame.obj:Fire("OnClick", button) - AceGUI:ClearFocus() -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:SetHeight(110) - self:SetWidth(110) - self:SetLabel() - self:SetImage(nil) - self:SetImageSize(64, 64) - self:SetDisabled(false) - end, - - -- ["OnRelease"] = nil, - - ["SetLabel"] = function(self, text) - if text and text ~= "" then - self.label:Show() - self.label:SetText(text) - self:SetHeight(self.image:GetHeight() + 25) - else - self.label:Hide() - self:SetHeight(self.image:GetHeight() + 10) - end - end, - - ["SetImage"] = function(self, path, ...) - local image = self.image - image:SetTexture(path) - - if image:GetTexture() then - local n = select("#", ...) - if n == 4 or n == 8 then - image:SetTexCoord(...) - else - image:SetTexCoord(0, 1, 0, 1) - end - end - end, - - ["SetImageSize"] = function(self, width, height) - self.image:SetWidth(width) - self.image:SetHeight(height) - --self.frame:SetWidth(width + 30) - if self.label:IsShown() then - self:SetHeight(height + 25) - else - self:SetHeight(height + 10) - end - end, - - ["SetDisabled"] = function(self, disabled) - self.disabled = disabled - if disabled then - self.frame:Disable() - self.label:SetTextColor(0.5, 0.5, 0.5) - self.image:SetVertexColor(0.5, 0.5, 0.5, 0.5) - else - self.frame:Enable() - self.label:SetTextColor(1, 1, 1) - self.image:SetVertexColor(1, 1, 1, 1) - end - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local function Constructor() - local frame = CreateFrame("Button", nil, UIParent) - frame:Hide() - - frame:EnableMouse(true) - frame:SetScript("OnEnter", Control_OnEnter) - frame:SetScript("OnLeave", Control_OnLeave) - frame:SetScript("OnClick", Button_OnClick) - - local label = frame:CreateFontString(nil, "BACKGROUND", "GameFontHighlight") - label:SetPoint("BOTTOMLEFT") - label:SetPoint("BOTTOMRIGHT") - label:SetJustifyH("CENTER") - label:SetJustifyV("TOP") - label:SetHeight(18) - - local image = frame:CreateTexture(nil, "BACKGROUND") - image:SetWidth(64) - image:SetHeight(64) - image:SetPoint("TOP", 0, -5) - - local highlight = frame:CreateTexture(nil, "HIGHLIGHT") - highlight:SetAllPoints(image) - highlight:SetTexture("Interface\\PaperDollInfoFrame\\UI-Character-Tab-Highlight") - highlight:SetTexCoord(0, 1, 0.23, 0.77) - highlight:SetBlendMode("ADD") - - local widget = { - label = label, - image = image, - frame = frame, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - -- SetText is deprecated, but keep it around for a while. (say, to WoW 4.0) - if (select(4, GetBuildInfo()) < 40000) then - widget.SetText = widget.SetLabel - else - widget.SetText = function(self, ...) print("AceGUI-3.0-Icon: SetText is deprecated! Use SetLabel instead!"); self:SetLabel(...) end - end - - return AceGUI:RegisterAsWidget(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) +--[[----------------------------------------------------------------------------- +Icon Widget +-------------------------------------------------------------------------------]] +local Type, Version = "Icon", 21 +local AceGUI = LibStub and LibStub("AceGUI-3.0", true) +if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end + +-- Lua APIs +local select, pairs, print = select, pairs, print + +-- WoW APIs +local CreateFrame, UIParent, GetBuildInfo = CreateFrame, UIParent, GetBuildInfo + +--[[----------------------------------------------------------------------------- +Scripts +-------------------------------------------------------------------------------]] +local function Control_OnEnter(frame) + frame.obj:Fire("OnEnter") +end + +local function Control_OnLeave(frame) + frame.obj:Fire("OnLeave") +end + +local function Button_OnClick(frame, button) + frame.obj:Fire("OnClick", button) + AceGUI:ClearFocus() +end + +--[[----------------------------------------------------------------------------- +Methods +-------------------------------------------------------------------------------]] +local methods = { + ["OnAcquire"] = function(self) + self:SetHeight(110) + self:SetWidth(110) + self:SetLabel() + self:SetImage(nil) + self:SetImageSize(64, 64) + self:SetDisabled(false) + end, + + -- ["OnRelease"] = nil, + + ["SetLabel"] = function(self, text) + if text and text ~= "" then + self.label:Show() + self.label:SetText(text) + self:SetHeight(self.image:GetHeight() + 25) + else + self.label:Hide() + self:SetHeight(self.image:GetHeight() + 10) + end + end, + + ["SetImage"] = function(self, path, ...) + local image = self.image + image:SetTexture(path) + + if image:GetTexture() then + local n = select("#", ...) + if n == 4 or n == 8 then + image:SetTexCoord(...) + else + image:SetTexCoord(0, 1, 0, 1) + end + end + end, + + ["SetImageSize"] = function(self, width, height) + self.image:SetWidth(width) + self.image:SetHeight(height) + --self.frame:SetWidth(width + 30) + if self.label:IsShown() then + self:SetHeight(height + 25) + else + self:SetHeight(height + 10) + end + end, + + ["SetDisabled"] = function(self, disabled) + self.disabled = disabled + if disabled then + self.frame:Disable() + self.label:SetTextColor(0.5, 0.5, 0.5) + self.image:SetVertexColor(0.5, 0.5, 0.5, 0.5) + else + self.frame:Enable() + self.label:SetTextColor(1, 1, 1) + self.image:SetVertexColor(1, 1, 1, 1) + end + end +} + +--[[----------------------------------------------------------------------------- +Constructor +-------------------------------------------------------------------------------]] +local function Constructor() + local frame = CreateFrame("Button", nil, UIParent) + frame:Hide() + + frame:EnableMouse(true) + frame:SetScript("OnEnter", Control_OnEnter) + frame:SetScript("OnLeave", Control_OnLeave) + frame:SetScript("OnClick", Button_OnClick) + + local label = frame:CreateFontString(nil, "BACKGROUND", "GameFontHighlight") + label:SetPoint("BOTTOMLEFT") + label:SetPoint("BOTTOMRIGHT") + label:SetJustifyH("CENTER") + label:SetJustifyV("TOP") + label:SetHeight(18) + + local image = frame:CreateTexture(nil, "BACKGROUND") + image:SetWidth(64) + image:SetHeight(64) + image:SetPoint("TOP", 0, -5) + + local highlight = frame:CreateTexture(nil, "HIGHLIGHT") + highlight:SetAllPoints(image) + highlight:SetTexture("Interface\\PaperDollInfoFrame\\UI-Character-Tab-Highlight") + highlight:SetTexCoord(0, 1, 0.23, 0.77) + highlight:SetBlendMode("ADD") + + local widget = { + label = label, + image = image, + frame = frame, + type = Type + } + for method, func in pairs(methods) do + widget[method] = func + end + -- SetText is deprecated, but keep it around for a while. (say, to WoW 4.0) + if (select(4, GetBuildInfo()) < 40000) then + widget.SetText = widget.SetLabel + else + widget.SetText = function(self, ...) print("AceGUI-3.0-Icon: SetText is deprecated! Use SetLabel instead!"); self:SetLabel(...) end + end + + return AceGUI:RegisterAsWidget(widget) +end + +AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/libs/AceGUI-3.0/widgets/AceGUIWidget-InteractiveLabel.lua b/libs/AceGUI-3.0/widgets/AceGUIWidget-InteractiveLabel.lua old mode 100644 new mode 100755 index e1388a1..9e06049 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-InteractiveLabel.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-InteractiveLabel.lua @@ -1,101 +1,101 @@ ---[[----------------------------------------------------------------------------- -InteractiveLabel Widget --------------------------------------------------------------------------------]] -local Type, Version = "InteractiveLabel", 20 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local select, pairs = select, pairs - --- WoW APIs -local CreateFrame, UIParent = CreateFrame, UIParent - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: GameFontHighlightSmall - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function Control_OnEnter(frame) - frame.obj:Fire("OnEnter") -end - -local function Control_OnLeave(frame) - frame.obj:Fire("OnLeave") -end - -local function Label_OnClick(frame, button) - frame.obj:Fire("OnClick", button) - AceGUI:ClearFocus() -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:LabelOnAcquire() - self:SetHighlight() - self:SetHighlightTexCoord() - self:SetDisabled(false) - end, - - -- ["OnRelease"] = nil, - - ["SetHighlight"] = function(self, ...) - self.highlight:SetTexture(...) - end, - - ["SetHighlightTexCoord"] = function(self, ...) - local c = select("#", ...) - if c == 4 or c == 8 then - self.highlight:SetTexCoord(...) - else - self.highlight:SetTexCoord(0, 1, 0, 1) - end - end, - - ["SetDisabled"] = function(self,disabled) - self.disabled = disabled - if disabled then - self.frame:EnableMouse(false) - self.label:SetTextColor(0.5, 0.5, 0.5) - else - self.frame:EnableMouse(true) - self.label:SetTextColor(1, 1, 1) - end - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local function Constructor() - -- create a Label type that we will hijack - local label = AceGUI:Create("Label") - - local frame = label.frame - frame:EnableMouse(true) - frame:SetScript("OnEnter", Control_OnEnter) - frame:SetScript("OnLeave", Control_OnLeave) - frame:SetScript("OnMouseDown", Label_OnClick) - - local highlight = frame:CreateTexture(nil, "HIGHLIGHT") - highlight:SetTexture(nil) - highlight:SetAllPoints() - highlight:SetBlendMode("ADD") - - label.highlight = highlight - label.type = Type - label.LabelOnAcquire = label.OnAcquire - for method, func in pairs(methods) do - label[method] = func - end - - return label -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) - +--[[----------------------------------------------------------------------------- +InteractiveLabel Widget +-------------------------------------------------------------------------------]] +local Type, Version = "InteractiveLabel", 20 +local AceGUI = LibStub and LibStub("AceGUI-3.0", true) +if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end + +-- Lua APIs +local select, pairs = select, pairs + +-- WoW APIs +local CreateFrame, UIParent = CreateFrame, UIParent + +-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded +-- List them here for Mikk's FindGlobals script +-- GLOBALS: GameFontHighlightSmall + +--[[----------------------------------------------------------------------------- +Scripts +-------------------------------------------------------------------------------]] +local function Control_OnEnter(frame) + frame.obj:Fire("OnEnter") +end + +local function Control_OnLeave(frame) + frame.obj:Fire("OnLeave") +end + +local function Label_OnClick(frame, button) + frame.obj:Fire("OnClick", button) + AceGUI:ClearFocus() +end + +--[[----------------------------------------------------------------------------- +Methods +-------------------------------------------------------------------------------]] +local methods = { + ["OnAcquire"] = function(self) + self:LabelOnAcquire() + self:SetHighlight() + self:SetHighlightTexCoord() + self:SetDisabled(false) + end, + + -- ["OnRelease"] = nil, + + ["SetHighlight"] = function(self, ...) + self.highlight:SetTexture(...) + end, + + ["SetHighlightTexCoord"] = function(self, ...) + local c = select("#", ...) + if c == 4 or c == 8 then + self.highlight:SetTexCoord(...) + else + self.highlight:SetTexCoord(0, 1, 0, 1) + end + end, + + ["SetDisabled"] = function(self,disabled) + self.disabled = disabled + if disabled then + self.frame:EnableMouse(false) + self.label:SetTextColor(0.5, 0.5, 0.5) + else + self.frame:EnableMouse(true) + self.label:SetTextColor(1, 1, 1) + end + end +} + +--[[----------------------------------------------------------------------------- +Constructor +-------------------------------------------------------------------------------]] +local function Constructor() + -- create a Label type that we will hijack + local label = AceGUI:Create("Label") + + local frame = label.frame + frame:EnableMouse(true) + frame:SetScript("OnEnter", Control_OnEnter) + frame:SetScript("OnLeave", Control_OnLeave) + frame:SetScript("OnMouseDown", Label_OnClick) + + local highlight = frame:CreateTexture(nil, "HIGHLIGHT") + highlight:SetTexture(nil) + highlight:SetAllPoints() + highlight:SetBlendMode("ADD") + + label.highlight = highlight + label.type = Type + label.LabelOnAcquire = label.OnAcquire + for method, func in pairs(methods) do + label[method] = func + end + + return label +end + +AceGUI:RegisterWidgetType(Type, Constructor, Version) + diff --git a/libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua b/libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua old mode 100644 new mode 100755 index ebff255..7dccc64 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua @@ -1,232 +1,239 @@ ---[[----------------------------------------------------------------------------- -Keybinding Widget -Set Keybindings in the Config UI. --------------------------------------------------------------------------------]] -local Type, Version = "Keybinding", 22 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local pairs = pairs - --- WoW APIs -local IsShiftKeyDown, IsControlKeyDown, IsAltKeyDown = IsShiftKeyDown, IsControlKeyDown, IsAltKeyDown -local CreateFrame, UIParent = CreateFrame, UIParent - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: NOT_BOUND - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] - -local function Control_OnEnter(frame) - frame.obj:Fire("OnEnter") -end - -local function Control_OnLeave(frame) - frame.obj:Fire("OnLeave") -end - -local function Keybinding_OnClick(frame, button) - if button == "LeftButton" or button == "RightButton" then - local self = frame.obj - if self.waitingForKey then - frame:EnableKeyboard(false) - self.msgframe:Hide() - frame:UnlockHighlight() - self.waitingForKey = nil - else - frame:EnableKeyboard(true) - self.msgframe:Show() - frame:LockHighlight() - self.waitingForKey = true - end - end - AceGUI:ClearFocus() -end - -local ignoreKeys = { - ["BUTTON1"] = true, ["BUTTON2"] = true, - ["UNKNOWN"] = true, - ["LSHIFT"] = true, ["LCTRL"] = true, ["LALT"] = true, - ["RSHIFT"] = true, ["RCTRL"] = true, ["RALT"] = true, -} -local function Keybinding_OnKeyDown(frame, key) - local self = frame.obj - if self.waitingForKey then - local keyPressed = key - if keyPressed == "ESCAPE" then - keyPressed = "" - else - if ignoreKeys[keyPressed] then return end - if IsShiftKeyDown() then - keyPressed = "SHIFT-"..keyPressed - end - if IsControlKeyDown() then - keyPressed = "CTRL-"..keyPressed - end - if IsAltKeyDown() then - keyPressed = "ALT-"..keyPressed - end - end - - frame:EnableKeyboard(false) - self.msgframe:Hide() - frame:UnlockHighlight() - self.waitingForKey = nil - - if not self.disabled then - self:SetKey(keyPressed) - self:Fire("OnKeyChanged", keyPressed) - end - end -end - -local function Keybinding_OnMouseDown(frame, button) - if button == "LeftButton" or button == "RightButton" then - return - elseif button == "MiddleButton" then - button = "BUTTON3" - elseif button == "Button4" then - button = "BUTTON4" - elseif button == "Button5" then - button = "BUTTON5" - end - Keybinding_OnKeyDown(frame, button) -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:SetWidth(200) - self:SetLabel("") - self:SetKey("") - self.waitingForKey = nil - self.msgframe:Hide() - self:SetDisabled(false) - self.button:EnableKeyboard(false) - end, - - -- ["OnRelease"] = nil, - - ["SetDisabled"] = function(self, disabled) - self.disabled = disabled - if disabled then - self.button:Disable() - self.label:SetTextColor(0.5,0.5,0.5) - else - self.button:Enable() - self.label:SetTextColor(1,1,1) - end - end, - - ["SetKey"] = function(self, key) - if (key or "") == "" then - self.button:SetText(NOT_BOUND) - self.button:SetNormalFontObject("GameFontNormal") - else - self.button:SetText(key) - self.button:SetNormalFontObject("GameFontHighlight") - end - end, - - ["GetKey"] = function(self) - local key = self.button:GetText() - if key == NOT_BOUND then - key = nil - end - return key - end, - - ["SetLabel"] = function(self, label) - self.label:SetText(label or "") - if (label or "") == "" then - self.alignoffset = nil - self:SetHeight(24) - else - self.alignoffset = 30 - self:SetHeight(44) - end - end, -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] - -local ControlBackdrop = { - bgFile = "Interface\\Tooltips\\UI-Tooltip-Background", - edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border", - tile = true, tileSize = 16, edgeSize = 16, - insets = { left = 3, right = 3, top = 3, bottom = 3 } -} - -local function keybindingMsgFixWidth(frame) - frame:SetWidth(frame.msg:GetWidth() + 10) - frame:SetScript("OnUpdate", nil) -end - -local function Constructor() - local name = "AceGUI30KeybindingButton" .. AceGUI:GetNextWidgetNum(Type) - - local frame = CreateFrame("Frame", nil, UIParent) - local button = CreateFrame("Button", name, frame, "UIPanelButtonTemplate2") - - button:EnableMouse(true) - button:RegisterForClicks("AnyDown") - button:SetScript("OnEnter", Control_OnEnter) - button:SetScript("OnLeave", Control_OnLeave) - button:SetScript("OnClick", Keybinding_OnClick) - button:SetScript("OnKeyDown", Keybinding_OnKeyDown) - button:SetScript("OnMouseDown", Keybinding_OnMouseDown) - button:SetPoint("BOTTOMLEFT") - button:SetPoint("BOTTOMRIGHT") - button:SetHeight(24) - button:EnableKeyboard(false) - - local text = button:GetFontString() - text:SetPoint("LEFT", 7, 0) - text:SetPoint("RIGHT", -7, 0) - - local label = frame:CreateFontString(nil, "OVERLAY", "GameFontHighlight") - label:SetPoint("TOPLEFT") - label:SetPoint("TOPRIGHT") - label:SetJustifyH("CENTER") - label:SetHeight(18) - - local msgframe = CreateFrame("Frame", nil, UIParent) - msgframe:SetHeight(30) - msgframe:SetBackdrop(ControlBackdrop) - msgframe:SetBackdropColor(0,0,0) - msgframe:SetFrameStrata("FULLSCREEN_DIALOG") - msgframe:SetFrameLevel(1000) - - local msg = msgframe:CreateFontString(nil, "OVERLAY", "GameFontNormal") - msg:SetText("Press a key to bind, ESC to clear the binding or click the button again to cancel.") - msgframe.msg = msg - msg:SetPoint("TOPLEFT", 5, -5) - msgframe:SetScript("OnUpdate", keybindingMsgFixWidth) - msgframe:SetPoint("BOTTOM", button, "TOP") - msgframe:Hide() - - local widget = { - button = button, - label = label, - msgframe = msgframe, - frame = frame, - alignoffset = 30, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - button.obj = widget - - return AceGUI:RegisterAsWidget(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) +--[[----------------------------------------------------------------------------- +Keybinding Widget +Set Keybindings in the Config UI. +-------------------------------------------------------------------------------]] +local Type, Version = "Keybinding", 24 +local AceGUI = LibStub and LibStub("AceGUI-3.0", true) +if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end + +-- Lua APIs +local pairs = pairs + +-- WoW APIs +local IsShiftKeyDown, IsControlKeyDown, IsAltKeyDown = IsShiftKeyDown, IsControlKeyDown, IsAltKeyDown +local CreateFrame, UIParent = CreateFrame, UIParent + +-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded +-- List them here for Mikk's FindGlobals script +-- GLOBALS: NOT_BOUND + +local wowMoP +do + local _, _, _, interface = GetBuildInfo() + wowMoP = (interface >= 50000) +end + +--[[----------------------------------------------------------------------------- +Scripts +-------------------------------------------------------------------------------]] + +local function Control_OnEnter(frame) + frame.obj:Fire("OnEnter") +end + +local function Control_OnLeave(frame) + frame.obj:Fire("OnLeave") +end + +local function Keybinding_OnClick(frame, button) + if button == "LeftButton" or button == "RightButton" then + local self = frame.obj + if self.waitingForKey then + frame:EnableKeyboard(false) + self.msgframe:Hide() + frame:UnlockHighlight() + self.waitingForKey = nil + else + frame:EnableKeyboard(true) + self.msgframe:Show() + frame:LockHighlight() + self.waitingForKey = true + end + end + AceGUI:ClearFocus() +end + +local ignoreKeys = { + ["BUTTON1"] = true, ["BUTTON2"] = true, + ["UNKNOWN"] = true, + ["LSHIFT"] = true, ["LCTRL"] = true, ["LALT"] = true, + ["RSHIFT"] = true, ["RCTRL"] = true, ["RALT"] = true, +} +local function Keybinding_OnKeyDown(frame, key) + local self = frame.obj + if self.waitingForKey then + local keyPressed = key + if keyPressed == "ESCAPE" then + keyPressed = "" + else + if ignoreKeys[keyPressed] then return end + if IsShiftKeyDown() then + keyPressed = "SHIFT-"..keyPressed + end + if IsControlKeyDown() then + keyPressed = "CTRL-"..keyPressed + end + if IsAltKeyDown() then + keyPressed = "ALT-"..keyPressed + end + end + + frame:EnableKeyboard(false) + self.msgframe:Hide() + frame:UnlockHighlight() + self.waitingForKey = nil + + if not self.disabled then + self:SetKey(keyPressed) + self:Fire("OnKeyChanged", keyPressed) + end + end +end + +local function Keybinding_OnMouseDown(frame, button) + if button == "LeftButton" or button == "RightButton" then + return + elseif button == "MiddleButton" then + button = "BUTTON3" + elseif button == "Button4" then + button = "BUTTON4" + elseif button == "Button5" then + button = "BUTTON5" + end + Keybinding_OnKeyDown(frame, button) +end + +--[[----------------------------------------------------------------------------- +Methods +-------------------------------------------------------------------------------]] +local methods = { + ["OnAcquire"] = function(self) + self:SetWidth(200) + self:SetLabel("") + self:SetKey("") + self.waitingForKey = nil + self.msgframe:Hide() + self:SetDisabled(false) + self.button:EnableKeyboard(false) + end, + + -- ["OnRelease"] = nil, + + ["SetDisabled"] = function(self, disabled) + self.disabled = disabled + if disabled then + self.button:Disable() + self.label:SetTextColor(0.5,0.5,0.5) + else + self.button:Enable() + self.label:SetTextColor(1,1,1) + end + end, + + ["SetKey"] = function(self, key) + if (key or "") == "" then + self.button:SetText(NOT_BOUND) + self.button:SetNormalFontObject("GameFontNormal") + else + self.button:SetText(key) + self.button:SetNormalFontObject("GameFontHighlight") + end + end, + + ["GetKey"] = function(self) + local key = self.button:GetText() + if key == NOT_BOUND then + key = nil + end + return key + end, + + ["SetLabel"] = function(self, label) + self.label:SetText(label or "") + if (label or "") == "" then + self.alignoffset = nil + self:SetHeight(24) + else + self.alignoffset = 30 + self:SetHeight(44) + end + end, +} + +--[[----------------------------------------------------------------------------- +Constructor +-------------------------------------------------------------------------------]] + +local ControlBackdrop = { + bgFile = "Interface\\Tooltips\\UI-Tooltip-Background", + edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border", + tile = true, tileSize = 16, edgeSize = 16, + insets = { left = 3, right = 3, top = 3, bottom = 3 } +} + +local function keybindingMsgFixWidth(frame) + frame:SetWidth(frame.msg:GetWidth() + 10) + frame:SetScript("OnUpdate", nil) +end + +local function Constructor() + local name = "AceGUI30KeybindingButton" .. AceGUI:GetNextWidgetNum(Type) + + local frame = CreateFrame("Frame", nil, UIParent) + local button = CreateFrame("Button", name, frame, wowMoP and "UIPanelButtonTemplate" or "UIPanelButtonTemplate2") + + button:EnableMouse(true) + button:RegisterForClicks("AnyDown") + button:SetScript("OnEnter", Control_OnEnter) + button:SetScript("OnLeave", Control_OnLeave) + button:SetScript("OnClick", Keybinding_OnClick) + button:SetScript("OnKeyDown", Keybinding_OnKeyDown) + button:SetScript("OnMouseDown", Keybinding_OnMouseDown) + button:SetPoint("BOTTOMLEFT") + button:SetPoint("BOTTOMRIGHT") + button:SetHeight(24) + button:EnableKeyboard(false) + + local text = button:GetFontString() + text:SetPoint("LEFT", 7, 0) + text:SetPoint("RIGHT", -7, 0) + + local label = frame:CreateFontString(nil, "OVERLAY", "GameFontHighlight") + label:SetPoint("TOPLEFT") + label:SetPoint("TOPRIGHT") + label:SetJustifyH("CENTER") + label:SetHeight(18) + + local msgframe = CreateFrame("Frame", nil, UIParent) + msgframe:SetHeight(30) + msgframe:SetBackdrop(ControlBackdrop) + msgframe:SetBackdropColor(0,0,0) + msgframe:SetFrameStrata("FULLSCREEN_DIALOG") + msgframe:SetFrameLevel(1000) + msgframe:SetToplevel(true) + + local msg = msgframe:CreateFontString(nil, "OVERLAY", "GameFontNormal") + msg:SetText("Press a key to bind, ESC to clear the binding or click the button again to cancel.") + msgframe.msg = msg + msg:SetPoint("TOPLEFT", 5, -5) + msgframe:SetScript("OnUpdate", keybindingMsgFixWidth) + msgframe:SetPoint("BOTTOM", button, "TOP") + msgframe:Hide() + + local widget = { + button = button, + label = label, + msgframe = msgframe, + frame = frame, + alignoffset = 30, + type = Type + } + for method, func in pairs(methods) do + widget[method] = func + end + button.obj = widget + + return AceGUI:RegisterAsWidget(widget) +end + +AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua b/libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua old mode 100644 new mode 100755 index 18c86ee..23897d5 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua @@ -1,162 +1,166 @@ ---[[----------------------------------------------------------------------------- -Label Widget -Displays text and optionally an icon. --------------------------------------------------------------------------------]] -local Type, Version = "Label", 21 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local max, select, pairs = math.max, select, pairs - --- WoW APIs -local CreateFrame, UIParent = CreateFrame, UIParent - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: GameFontHighlightSmall - ---[[----------------------------------------------------------------------------- -Support functions --------------------------------------------------------------------------------]] - -local function UpdateImageAnchor(self) - if self.resizing then return end - local frame = self.frame - local width = frame.width or frame:GetWidth() or 0 - local image = self.image - local label = self.label - local height - - label:ClearAllPoints() - image:ClearAllPoints() - - if self.imageshown then - local imagewidth = image:GetWidth() - if (width - imagewidth) < 200 or (label:GetText() or "") == "" then - -- image goes on top centered when less than 200 width for the text, or if there is no text - image:SetPoint("TOP") - label:SetPoint("TOP", image, "BOTTOM") - label:SetPoint("LEFT") - label:SetWidth(width) - height = image:GetHeight() + label:GetHeight() - else - -- image on the left - image:SetPoint("TOPLEFT") - label:SetPoint("TOPLEFT", image, "TOPRIGHT", 4, 0) - label:SetWidth(width - imagewidth - 4) - height = max(image:GetHeight(), label:GetHeight()) - end - else - -- no image shown - label:SetPoint("TOPLEFT") - label:SetWidth(width) - height = label:GetHeight() - end - - self.resizing = true - frame:SetHeight(height) - frame.height = height - self.resizing = nil -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - -- set the flag to stop constant size updates - self.resizing = true - -- height is set dynamically by the text and image size - self:SetWidth(200) - self:SetText() - self:SetImage(nil) - self:SetImageSize(16, 16) - self:SetColor() - self:SetFontObject() - - -- reset the flag - self.resizing = nil - -- run the update explicitly - UpdateImageAnchor(self) - end, - - -- ["OnRelease"] = nil, - - ["OnWidthSet"] = function(self, width) - UpdateImageAnchor(self) - end, - - ["SetText"] = function(self, text) - self.label:SetText(text) - UpdateImageAnchor(self) - end, - - ["SetColor"] = function(self, r, g, b) - if not (r and g and b) then - r, g, b = 1, 1, 1 - end - self.label:SetVertexColor(r, g, b) - end, - - ["SetImage"] = function(self, path, ...) - local image = self.image - image:SetTexture(path) - - if image:GetTexture() then - self.imageshown = true - local n = select("#", ...) - if n == 4 or n == 8 then - image:SetTexCoord(...) - else - image:SetTexCoord(0, 1, 0, 1) - end - else - self.imageshown = nil - end - UpdateImageAnchor(self) - end, - - ["SetFont"] = function(self, font, height, flags) - self.label:SetFont(font, height, flags) - end, - - ["SetFontObject"] = function(self, font) - self:SetFont((font or GameFontHighlightSmall):GetFont()) - end, - - ["SetImageSize"] = function(self, width, height) - self.image:SetWidth(width) - self.image:SetHeight(height) - UpdateImageAnchor(self) - end, -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local function Constructor() - local frame = CreateFrame("Frame", nil, UIParent) - frame:Hide() - - local label = frame:CreateFontString(nil, "BACKGROUND", "GameFontHighlightSmall") - label:SetJustifyH("LEFT") - label:SetJustifyV("TOP") - - local image = frame:CreateTexture(nil, "BACKGROUND") - - -- create widget - local widget = { - label = label, - image = image, - frame = frame, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - - return AceGUI:RegisterAsWidget(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) +--[[----------------------------------------------------------------------------- +Label Widget +Displays text and optionally an icon. +-------------------------------------------------------------------------------]] +local Type, Version = "Label", 23 +local AceGUI = LibStub and LibStub("AceGUI-3.0", true) +if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end + +-- Lua APIs +local max, select, pairs = math.max, select, pairs + +-- WoW APIs +local CreateFrame, UIParent = CreateFrame, UIParent + +-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded +-- List them here for Mikk's FindGlobals script +-- GLOBALS: GameFontHighlightSmall + +--[[----------------------------------------------------------------------------- +Support functions +-------------------------------------------------------------------------------]] + +local function UpdateImageAnchor(self) + if self.resizing then return end + local frame = self.frame + local width = frame.width or frame:GetWidth() or 0 + local image = self.image + local label = self.label + local height + + label:ClearAllPoints() + image:ClearAllPoints() + + if self.imageshown then + local imagewidth = image:GetWidth() + if (width - imagewidth) < 200 or (label:GetText() or "") == "" then + -- image goes on top centered when less than 200 width for the text, or if there is no text + image:SetPoint("TOP") + label:SetPoint("TOP", image, "BOTTOM") + label:SetPoint("LEFT") + label:SetWidth(width) + height = image:GetHeight() + label:GetHeight() + else + -- image on the left + image:SetPoint("TOPLEFT") + if image:GetHeight() > label:GetHeight() then + label:SetPoint("LEFT", image, "RIGHT", 4, 0) + else + label:SetPoint("TOPLEFT", image, "TOPRIGHT", 4, 0) + end + label:SetWidth(width - imagewidth - 4) + height = max(image:GetHeight(), label:GetHeight()) + end + else + -- no image shown + label:SetPoint("TOPLEFT") + label:SetWidth(width) + height = label:GetHeight() + end + + self.resizing = true + frame:SetHeight(height) + frame.height = height + self.resizing = nil +end + +--[[----------------------------------------------------------------------------- +Methods +-------------------------------------------------------------------------------]] +local methods = { + ["OnAcquire"] = function(self) + -- set the flag to stop constant size updates + self.resizing = true + -- height is set dynamically by the text and image size + self:SetWidth(200) + self:SetText() + self:SetImage(nil) + self:SetImageSize(16, 16) + self:SetColor() + self:SetFontObject() + + -- reset the flag + self.resizing = nil + -- run the update explicitly + UpdateImageAnchor(self) + end, + + -- ["OnRelease"] = nil, + + ["OnWidthSet"] = function(self, width) + UpdateImageAnchor(self) + end, + + ["SetText"] = function(self, text) + self.label:SetText(text) + UpdateImageAnchor(self) + end, + + ["SetColor"] = function(self, r, g, b) + if not (r and g and b) then + r, g, b = 1, 1, 1 + end + self.label:SetVertexColor(r, g, b) + end, + + ["SetImage"] = function(self, path, ...) + local image = self.image + image:SetTexture(path) + + if image:GetTexture() then + self.imageshown = true + local n = select("#", ...) + if n == 4 or n == 8 then + image:SetTexCoord(...) + else + image:SetTexCoord(0, 1, 0, 1) + end + else + self.imageshown = nil + end + UpdateImageAnchor(self) + end, + + ["SetFont"] = function(self, font, height, flags) + self.label:SetFont(font, height, flags) + end, + + ["SetFontObject"] = function(self, font) + self:SetFont((font or GameFontHighlightSmall):GetFont()) + end, + + ["SetImageSize"] = function(self, width, height) + self.image:SetWidth(width) + self.image:SetHeight(height) + UpdateImageAnchor(self) + end, +} + +--[[----------------------------------------------------------------------------- +Constructor +-------------------------------------------------------------------------------]] +local function Constructor() + local frame = CreateFrame("Frame", nil, UIParent) + frame:Hide() + + local label = frame:CreateFontString(nil, "BACKGROUND", "GameFontHighlightSmall") + label:SetJustifyH("LEFT") + label:SetJustifyV("TOP") + + local image = frame:CreateTexture(nil, "BACKGROUND") + + -- create widget + local widget = { + label = label, + image = image, + frame = frame, + type = Type + } + for method, func in pairs(methods) do + widget[method] = func + end + + return AceGUI:RegisterAsWidget(widget) +end + +AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua b/libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua old mode 100644 new mode 100755 index 83b7e95..a27a2fc --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua @@ -1,345 +1,368 @@ -local Type, Version = "MultiLineEditBox", 25 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local pairs = pairs - --- WoW APIs -local GetCursorInfo, GetSpellInfo, ClearCursor = GetCursorInfo, GetSpellInfo, ClearCursor -local CreateFrame, UIParent = CreateFrame, UIParent -local _G = _G - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: ACCEPT, ChatFontNormal - ---[[----------------------------------------------------------------------------- -Support functions --------------------------------------------------------------------------------]] -local function Layout(self) - self:SetHeight(self.numlines * 14 + (self.disablebutton and 19 or 41) + self.labelHeight) - - if self.labelHeight == 0 then - self.scrollBar:SetPoint("TOP", self.frame, "TOP", 0, -23) - else - self.scrollBar:SetPoint("TOP", self.label, "BOTTOM", 0, -19) - end - - if self.disablebutton then - self.scrollBar:SetPoint("BOTTOM", self.frame, "BOTTOM", 0, 21) - self.scrollBG:SetPoint("BOTTOMLEFT", 0, 4) - else - self.scrollBar:SetPoint("BOTTOM", self.button, "TOP", 0, 18) - self.scrollBG:SetPoint("BOTTOMLEFT", self.button, "TOPLEFT") - end -end - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function OnClick(self) -- Button - self = self.obj - self.editBox:ClearFocus() - if not self:Fire("OnEnterPressed", self.editBox:GetText()) then - self.button:Disable() - end -end - -local function OnCursorChanged(self, _, y, _, cursorHeight) -- EditBox - self, y = self.obj.scrollFrame, -y - local offset = self:GetVerticalScroll() - if y < offset then - self:SetVerticalScroll(y) - else - y = y + cursorHeight - self:GetHeight() - if y > offset then - self:SetVerticalScroll(y) - end - end -end - -local function OnEditFocusLost(self) -- EditBox - self:HighlightText(0, 0) - self.obj:Fire("OnEditFocusLost") -end - -local function OnEnter(self) -- EditBox / ScrollFrame - self = self.obj - if not self.entered then - self.entered = true - self:Fire("OnEnter") - end -end - -local function OnLeave(self) -- EditBox / ScrollFrame - self = self.obj - if self.entered then - self.entered = nil - self:Fire("OnLeave") - end -end - -local function OnMouseUp(self) -- ScrollFrame - self = self.obj.editBox - self:SetFocus() - self:SetCursorPosition(self:GetNumLetters()) -end - -local function OnReceiveDrag(self) -- EditBox / ScrollFrame - local type, id, info = GetCursorInfo() - if type == "spell" then - info = GetSpellInfo(id, info) - elseif type ~= "item" then - return - end - ClearCursor() - self = self.obj - local editBox = self.editBox - if not editBox:HasFocus() then - editBox:SetFocus() - editBox:SetCursorPosition(editBox:GetNumLetters()) - end - editBox:Insert(info) - self.button:Enable() -end - -local function OnSizeChanged(self, width, height) -- ScrollFrame - self.obj.editBox:SetWidth(width) -end - -local function OnTextChanged(self, userInput) -- EditBox - if userInput then - self = self.obj - self:Fire("OnTextChanged", self.editBox:GetText()) - self.button:Enable() - end -end - -local function OnTextSet(self) -- EditBox - self:HighlightText(0, 0) - self:SetCursorPosition(self:GetNumLetters()) - self:SetCursorPosition(0) - self.obj.button:Disable() -end - -local function OnVerticalScroll(self, offset) -- ScrollFrame - local editBox = self.obj.editBox - editBox:SetHitRectInsets(0, 0, offset, editBox:GetHeight() - offset - self:GetHeight()) -end - -local function OnShowFocus(frame) - frame.obj.editBox:SetFocus() - frame:SetScript("OnShow", nil) -end - -local function OnEditFocusGained(frame) - AceGUI:SetFocus(frame.obj) - frame.obj:Fire("OnEditFocusGained") -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self.editBox:SetText("") - self:SetDisabled(false) - self:SetWidth(200) - self:DisableButton(false) - self:SetNumLines() - self.entered = nil - self:SetMaxLetters(0) - end, - - ["OnRelease"] = function(self) - self:ClearFocus() - end, - - ["SetDisabled"] = function(self, disabled) - local editBox = self.editBox - if disabled then - editBox:ClearFocus() - editBox:EnableMouse(false) - editBox:SetTextColor(0.5, 0.5, 0.5) - self.label:SetTextColor(0.5, 0.5, 0.5) - self.scrollFrame:EnableMouse(false) - self.button:Disable() - else - editBox:EnableMouse(true) - editBox:SetTextColor(1, 1, 1) - self.label:SetTextColor(1, 0.82, 0) - self.scrollFrame:EnableMouse(true) - end - end, - - ["SetLabel"] = function(self, text) - if text and text ~= "" then - self.label:SetText(text) - if self.labelHeight ~= 10 then - self.labelHeight = 10 - self.label:Show() - end - elseif self.labelHeight ~= 0 then - self.labelHeight = 0 - self.label:Hide() - end - Layout(self) - end, - - ["SetNumLines"] = function(self, value) - if not value or value < 4 then - value = 4 - end - self.numlines = value - Layout(self) - end, - - ["SetText"] = function(self, text) - self.editBox:SetText(text) - end, - - ["GetText"] = function(self) - return self.editBox:GetText() - end, - - ["SetMaxLetters"] = function (self, num) - self.editBox:SetMaxLetters(num or 0) - end, - - ["DisableButton"] = function(self, disabled) - self.disablebutton = disabled - if disabled then - self.button:Hide() - else - self.button:Show() - end - Layout(self) - end, - - ["ClearFocus"] = function(self) - self.editBox:ClearFocus() - self.frame:SetScript("OnShow", nil) - end, - - ["SetFocus"] = function(self) - self.editBox:SetFocus() - if not self.frame:IsShown() then - self.frame:SetScript("OnShow", OnShowFocus) - end - end, - - ["GetCursorPosition"] = function(self) - return self.editBox:GetCursorPosition() - end, - - ["SetCursorPosition"] = function(self, ...) - return self.editBox:SetCursorPosition(...) - end, - - -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local backdrop = { - bgFile = [[Interface\Tooltips\UI-Tooltip-Background]], - edgeFile = [[Interface\Tooltips\UI-Tooltip-Border]], edgeSize = 16, - insets = { left = 4, right = 3, top = 4, bottom = 3 } -} - -local function Constructor() - local frame = CreateFrame("Frame", nil, UIParent) - frame:Hide() - - local widgetNum = AceGUI:GetNextWidgetNum(Type) - - local label = frame:CreateFontString(nil, "OVERLAY", "GameFontNormalSmall") - label:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, -4) - label:SetPoint("TOPRIGHT", frame, "TOPRIGHT", 0, -4) - label:SetJustifyH("LEFT") - label:SetText(ACCEPT) - label:SetHeight(10) - - local button = CreateFrame("Button", ("%s%dButton"):format(Type, widgetNum), frame, "UIPanelButtonTemplate2") - button:SetPoint("BOTTOMLEFT", 0, 4) - button:SetHeight(22) - button:SetWidth(label:GetStringWidth() + 24) - button:SetText(ACCEPT) - button:SetScript("OnClick", OnClick) - button:Disable() - - local text = button:GetFontString() - text:ClearAllPoints() - text:SetPoint("TOPLEFT", button, "TOPLEFT", 5, -5) - text:SetPoint("BOTTOMRIGHT", button, "BOTTOMRIGHT", -5, 1) - text:SetJustifyV("MIDDLE") - - local scrollBG = CreateFrame("Frame", nil, frame) - scrollBG:SetBackdrop(backdrop) - scrollBG:SetBackdropColor(0, 0, 0) - scrollBG:SetBackdropBorderColor(0.4, 0.4, 0.4) - - local scrollFrame = CreateFrame("ScrollFrame", ("%s%dScrollFrame"):format(Type, widgetNum), frame, "UIPanelScrollFrameTemplate") - - local scrollBar = _G[scrollFrame:GetName() .. "ScrollBar"] - scrollBar:ClearAllPoints() - scrollBar:SetPoint("TOP", label, "BOTTOM", 0, -19) - scrollBar:SetPoint("BOTTOM", button, "TOP", 0, 18) - scrollBar:SetPoint("RIGHT", frame, "RIGHT") - - scrollBG:SetPoint("TOPRIGHT", scrollBar, "TOPLEFT", 0, 19) - scrollBG:SetPoint("BOTTOMLEFT", button, "TOPLEFT") - - scrollFrame:SetPoint("TOPLEFT", scrollBG, "TOPLEFT", 5, -6) - scrollFrame:SetPoint("BOTTOMRIGHT", scrollBG, "BOTTOMRIGHT", -4, 4) - scrollFrame:SetScript("OnEnter", OnEnter) - scrollFrame:SetScript("OnLeave", OnLeave) - scrollFrame:SetScript("OnMouseUp", OnMouseUp) - scrollFrame:SetScript("OnReceiveDrag", OnReceiveDrag) - scrollFrame:SetScript("OnSizeChanged", OnSizeChanged) - scrollFrame:HookScript("OnVerticalScroll", OnVerticalScroll) - - local editBox = CreateFrame("EditBox", nil, scrollFrame) - editBox:SetAllPoints() - editBox:SetFontObject(ChatFontNormal) - editBox:SetMultiLine(true) - editBox:EnableMouse(true) - editBox:SetAutoFocus(false) - editBox:SetCountInvisibleLetters(false) - editBox:SetScript("OnCursorChanged", OnCursorChanged) - editBox:SetScript("OnEditFocusLost", OnEditFocusLost) - editBox:SetScript("OnEnter", OnEnter) - editBox:SetScript("OnEscapePressed", editBox.ClearFocus) - editBox:SetScript("OnLeave", OnLeave) - editBox:SetScript("OnMouseDown", OnReceiveDrag) - editBox:SetScript("OnReceiveDrag", OnReceiveDrag) - editBox:SetScript("OnTextChanged", OnTextChanged) - editBox:SetScript("OnTextSet", OnTextSet) - editBox:SetScript("OnEditFocusGained", OnEditFocusGained) - - - scrollFrame:SetScrollChild(editBox) - - local widget = { - button = button, - editBox = editBox, - frame = frame, - label = label, - labelHeight = 10, - numlines = 4, - scrollBar = scrollBar, - scrollBG = scrollBG, - scrollFrame = scrollFrame, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - button.obj, editBox.obj, scrollFrame.obj = widget, widget, widget - - return AceGUI:RegisterAsWidget(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) +local Type, Version = "MultiLineEditBox", 27 +local AceGUI = LibStub and LibStub("AceGUI-3.0", true) +if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end + +-- Lua APIs +local pairs = pairs + +-- WoW APIs +local GetCursorInfo, GetSpellInfo, ClearCursor = GetCursorInfo, GetSpellInfo, ClearCursor +local CreateFrame, UIParent = CreateFrame, UIParent +local _G = _G + +-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded +-- List them here for Mikk's FindGlobals script +-- GLOBALS: ACCEPT, ChatFontNormal + +local wowMoP +do + local _, _, _, interface = GetBuildInfo() + wowMoP = (interface >= 50000) +end + +--[[----------------------------------------------------------------------------- +Support functions +-------------------------------------------------------------------------------]] + +if not AceGUIMultiLineEditBoxInsertLink then + -- upgradeable hook + hooksecurefunc("ChatEdit_InsertLink", function(...) return _G.AceGUIMultiLineEditBoxInsertLink(...) end) +end + +function _G.AceGUIMultiLineEditBoxInsertLink(text) + for i = 1, AceGUI:GetWidgetCount(Type) do + local editbox = _G[("MultiLineEditBox%uEdit"):format(i)] + if editbox and editbox:IsVisible() and editbox:HasFocus() then + editbox:Insert(text) + return true + end + end +end + + +local function Layout(self) + self:SetHeight(self.numlines * 14 + (self.disablebutton and 19 or 41) + self.labelHeight) + + if self.labelHeight == 0 then + self.scrollBar:SetPoint("TOP", self.frame, "TOP", 0, -23) + else + self.scrollBar:SetPoint("TOP", self.label, "BOTTOM", 0, -19) + end + + if self.disablebutton then + self.scrollBar:SetPoint("BOTTOM", self.frame, "BOTTOM", 0, 21) + self.scrollBG:SetPoint("BOTTOMLEFT", 0, 4) + else + self.scrollBar:SetPoint("BOTTOM", self.button, "TOP", 0, 18) + self.scrollBG:SetPoint("BOTTOMLEFT", self.button, "TOPLEFT") + end +end + +--[[----------------------------------------------------------------------------- +Scripts +-------------------------------------------------------------------------------]] +local function OnClick(self) -- Button + self = self.obj + self.editBox:ClearFocus() + if not self:Fire("OnEnterPressed", self.editBox:GetText()) then + self.button:Disable() + end +end + +local function OnCursorChanged(self, _, y, _, cursorHeight) -- EditBox + self, y = self.obj.scrollFrame, -y + local offset = self:GetVerticalScroll() + if y < offset then + self:SetVerticalScroll(y) + else + y = y + cursorHeight - self:GetHeight() + if y > offset then + self:SetVerticalScroll(y) + end + end +end + +local function OnEditFocusLost(self) -- EditBox + self:HighlightText(0, 0) + self.obj:Fire("OnEditFocusLost") +end + +local function OnEnter(self) -- EditBox / ScrollFrame + self = self.obj + if not self.entered then + self.entered = true + self:Fire("OnEnter") + end +end + +local function OnLeave(self) -- EditBox / ScrollFrame + self = self.obj + if self.entered then + self.entered = nil + self:Fire("OnLeave") + end +end + +local function OnMouseUp(self) -- ScrollFrame + self = self.obj.editBox + self:SetFocus() + self:SetCursorPosition(self:GetNumLetters()) +end + +local function OnReceiveDrag(self) -- EditBox / ScrollFrame + local type, id, info = GetCursorInfo() + if type == "spell" then + info = GetSpellInfo(id, info) + elseif type ~= "item" then + return + end + ClearCursor() + self = self.obj + local editBox = self.editBox + if not editBox:HasFocus() then + editBox:SetFocus() + editBox:SetCursorPosition(editBox:GetNumLetters()) + end + editBox:Insert(info) + self.button:Enable() +end + +local function OnSizeChanged(self, width, height) -- ScrollFrame + self.obj.editBox:SetWidth(width) +end + +local function OnTextChanged(self, userInput) -- EditBox + if userInput then + self = self.obj + self:Fire("OnTextChanged", self.editBox:GetText()) + self.button:Enable() + end +end + +local function OnTextSet(self) -- EditBox + self:HighlightText(0, 0) + self:SetCursorPosition(self:GetNumLetters()) + self:SetCursorPosition(0) + self.obj.button:Disable() +end + +local function OnVerticalScroll(self, offset) -- ScrollFrame + local editBox = self.obj.editBox + editBox:SetHitRectInsets(0, 0, offset, editBox:GetHeight() - offset - self:GetHeight()) +end + +local function OnShowFocus(frame) + frame.obj.editBox:SetFocus() + frame:SetScript("OnShow", nil) +end + +local function OnEditFocusGained(frame) + AceGUI:SetFocus(frame.obj) + frame.obj:Fire("OnEditFocusGained") +end + +--[[----------------------------------------------------------------------------- +Methods +-------------------------------------------------------------------------------]] +local methods = { + ["OnAcquire"] = function(self) + self.editBox:SetText("") + self:SetDisabled(false) + self:SetWidth(200) + self:DisableButton(false) + self:SetNumLines() + self.entered = nil + self:SetMaxLetters(0) + end, + + ["OnRelease"] = function(self) + self:ClearFocus() + end, + + ["SetDisabled"] = function(self, disabled) + local editBox = self.editBox + if disabled then + editBox:ClearFocus() + editBox:EnableMouse(false) + editBox:SetTextColor(0.5, 0.5, 0.5) + self.label:SetTextColor(0.5, 0.5, 0.5) + self.scrollFrame:EnableMouse(false) + self.button:Disable() + else + editBox:EnableMouse(true) + editBox:SetTextColor(1, 1, 1) + self.label:SetTextColor(1, 0.82, 0) + self.scrollFrame:EnableMouse(true) + end + end, + + ["SetLabel"] = function(self, text) + if text and text ~= "" then + self.label:SetText(text) + if self.labelHeight ~= 10 then + self.labelHeight = 10 + self.label:Show() + end + elseif self.labelHeight ~= 0 then + self.labelHeight = 0 + self.label:Hide() + end + Layout(self) + end, + + ["SetNumLines"] = function(self, value) + if not value or value < 4 then + value = 4 + end + self.numlines = value + Layout(self) + end, + + ["SetText"] = function(self, text) + self.editBox:SetText(text) + end, + + ["GetText"] = function(self) + return self.editBox:GetText() + end, + + ["SetMaxLetters"] = function (self, num) + self.editBox:SetMaxLetters(num or 0) + end, + + ["DisableButton"] = function(self, disabled) + self.disablebutton = disabled + if disabled then + self.button:Hide() + else + self.button:Show() + end + Layout(self) + end, + + ["ClearFocus"] = function(self) + self.editBox:ClearFocus() + self.frame:SetScript("OnShow", nil) + end, + + ["SetFocus"] = function(self) + self.editBox:SetFocus() + if not self.frame:IsShown() then + self.frame:SetScript("OnShow", OnShowFocus) + end + end, + + ["GetCursorPosition"] = function(self) + return self.editBox:GetCursorPosition() + end, + + ["SetCursorPosition"] = function(self, ...) + return self.editBox:SetCursorPosition(...) + end, + + +} + +--[[----------------------------------------------------------------------------- +Constructor +-------------------------------------------------------------------------------]] +local backdrop = { + bgFile = [[Interface\Tooltips\UI-Tooltip-Background]], + edgeFile = [[Interface\Tooltips\UI-Tooltip-Border]], edgeSize = 16, + insets = { left = 4, right = 3, top = 4, bottom = 3 } +} + +local function Constructor() + local frame = CreateFrame("Frame", nil, UIParent) + frame:Hide() + + local widgetNum = AceGUI:GetNextWidgetNum(Type) + + local label = frame:CreateFontString(nil, "OVERLAY", "GameFontNormalSmall") + label:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, -4) + label:SetPoint("TOPRIGHT", frame, "TOPRIGHT", 0, -4) + label:SetJustifyH("LEFT") + label:SetText(ACCEPT) + label:SetHeight(10) + + local button = CreateFrame("Button", ("%s%dButton"):format(Type, widgetNum), frame, wowMoP and "UIPanelButtonTemplate" or "UIPanelButtonTemplate2") + button:SetPoint("BOTTOMLEFT", 0, 4) + button:SetHeight(22) + button:SetWidth(label:GetStringWidth() + 24) + button:SetText(ACCEPT) + button:SetScript("OnClick", OnClick) + button:Disable() + + local text = button:GetFontString() + text:ClearAllPoints() + text:SetPoint("TOPLEFT", button, "TOPLEFT", 5, -5) + text:SetPoint("BOTTOMRIGHT", button, "BOTTOMRIGHT", -5, 1) + text:SetJustifyV("MIDDLE") + + local scrollBG = CreateFrame("Frame", nil, frame) + scrollBG:SetBackdrop(backdrop) + scrollBG:SetBackdropColor(0, 0, 0) + scrollBG:SetBackdropBorderColor(0.4, 0.4, 0.4) + + local scrollFrame = CreateFrame("ScrollFrame", ("%s%dScrollFrame"):format(Type, widgetNum), frame, "UIPanelScrollFrameTemplate") + + local scrollBar = _G[scrollFrame:GetName() .. "ScrollBar"] + scrollBar:ClearAllPoints() + scrollBar:SetPoint("TOP", label, "BOTTOM", 0, -19) + scrollBar:SetPoint("BOTTOM", button, "TOP", 0, 18) + scrollBar:SetPoint("RIGHT", frame, "RIGHT") + + scrollBG:SetPoint("TOPRIGHT", scrollBar, "TOPLEFT", 0, 19) + scrollBG:SetPoint("BOTTOMLEFT", button, "TOPLEFT") + + scrollFrame:SetPoint("TOPLEFT", scrollBG, "TOPLEFT", 5, -6) + scrollFrame:SetPoint("BOTTOMRIGHT", scrollBG, "BOTTOMRIGHT", -4, 4) + scrollFrame:SetScript("OnEnter", OnEnter) + scrollFrame:SetScript("OnLeave", OnLeave) + scrollFrame:SetScript("OnMouseUp", OnMouseUp) + scrollFrame:SetScript("OnReceiveDrag", OnReceiveDrag) + scrollFrame:SetScript("OnSizeChanged", OnSizeChanged) + scrollFrame:HookScript("OnVerticalScroll", OnVerticalScroll) + + local editBox = CreateFrame("EditBox", ("%s%dEdit"):format(Type, widgetNum), scrollFrame) + editBox:SetAllPoints() + editBox:SetFontObject(ChatFontNormal) + editBox:SetMultiLine(true) + editBox:EnableMouse(true) + editBox:SetAutoFocus(false) + editBox:SetCountInvisibleLetters(false) + editBox:SetScript("OnCursorChanged", OnCursorChanged) + editBox:SetScript("OnEditFocusLost", OnEditFocusLost) + editBox:SetScript("OnEnter", OnEnter) + editBox:SetScript("OnEscapePressed", editBox.ClearFocus) + editBox:SetScript("OnLeave", OnLeave) + editBox:SetScript("OnMouseDown", OnReceiveDrag) + editBox:SetScript("OnReceiveDrag", OnReceiveDrag) + editBox:SetScript("OnTextChanged", OnTextChanged) + editBox:SetScript("OnTextSet", OnTextSet) + editBox:SetScript("OnEditFocusGained", OnEditFocusGained) + + + scrollFrame:SetScrollChild(editBox) + + local widget = { + button = button, + editBox = editBox, + frame = frame, + label = label, + labelHeight = 10, + numlines = 4, + scrollBar = scrollBar, + scrollBG = scrollBG, + scrollFrame = scrollFrame, + type = Type + } + for method, func in pairs(methods) do + widget[method] = func + end + button.obj, editBox.obj, scrollFrame.obj = widget, widget, widget + + return AceGUI:RegisterAsWidget(widget) +end + +AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua b/libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua old mode 100644 new mode 100755 index 26c72a0..7f0bd5f --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua @@ -1,281 +1,281 @@ ---[[----------------------------------------------------------------------------- -Slider Widget -Graphical Slider, like, for Range values. --------------------------------------------------------------------------------]] -local Type, Version = "Slider", 20 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local min, max, floor = math.min, math.max, math.floor -local tonumber, pairs = tonumber, pairs - --- WoW APIs -local PlaySound = PlaySound -local CreateFrame, UIParent = CreateFrame, UIParent - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: GameFontHighlightSmall - ---[[----------------------------------------------------------------------------- -Support functions --------------------------------------------------------------------------------]] -local function UpdateText(self) - local value = self.value or 0 - if self.ispercent then - self.editbox:SetText(("%s%%"):format(floor(value * 1000 + 0.5) / 10)) - else - self.editbox:SetText(floor(value * 100 + 0.5) / 100) - end -end - -local function UpdateLabels(self) - local min, max = (self.min or 0), (self.max or 100) - if self.ispercent then - self.lowtext:SetFormattedText("%s%%", (min * 100)) - self.hightext:SetFormattedText("%s%%", (max * 100)) - else - self.lowtext:SetText(min) - self.hightext:SetText(max) - end -end - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function Control_OnEnter(frame) - frame.obj:Fire("OnEnter") -end - -local function Control_OnLeave(frame) - frame.obj:Fire("OnLeave") -end - -local function Frame_OnMouseDown(frame) - frame.obj.slider:EnableMouseWheel(true) - AceGUI:ClearFocus() -end - -local function Slider_OnValueChanged(frame) - local self = frame.obj - if not frame.setup then - local newvalue = frame:GetValue() - if newvalue ~= self.value and not self.disabled then - self.value = newvalue - self:Fire("OnValueChanged", newvalue) - end - if self.value then - UpdateText(self) - end - end -end - -local function Slider_OnMouseUp(frame) - local self = frame.obj - self:Fire("OnMouseUp", self.value) -end - -local function Slider_OnMouseWheel(frame, v) - local self = frame.obj - if not self.disabled then - local value = self.value - if v > 0 then - value = min(value + (self.step or 1), self.max) - else - value = max(value - (self.step or 1), self.min) - end - self.slider:SetValue(value) - end -end - -local function EditBox_OnEscapePressed(frame) - frame:ClearFocus() -end - -local function EditBox_OnEnterPressed(frame) - local self = frame.obj - local value = frame:GetText() - if self.ispercent then - value = value:gsub('%%', '') - value = tonumber(value) / 100 - else - value = tonumber(value) - end - - if value then - PlaySound("igMainMenuOptionCheckBoxOn") - self.slider:SetValue(value) - self:Fire("OnMouseUp", value) - end -end - -local function EditBox_OnEnter(frame) - frame:SetBackdropBorderColor(0.5, 0.5, 0.5, 1) -end - -local function EditBox_OnLeave(frame) - frame:SetBackdropBorderColor(0.3, 0.3, 0.3, 0.8) -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:SetWidth(200) - self:SetHeight(44) - self:SetDisabled(false) - self:SetIsPercent(nil) - self:SetSliderValues(0,100,1) - self:SetValue(0) - self.slider:EnableMouseWheel(false) - end, - - -- ["OnRelease"] = nil, - - ["SetDisabled"] = function(self, disabled) - self.disabled = disabled - if disabled then - self.slider:EnableMouse(false) - self.label:SetTextColor(.5, .5, .5) - self.hightext:SetTextColor(.5, .5, .5) - self.lowtext:SetTextColor(.5, .5, .5) - --self.valuetext:SetTextColor(.5, .5, .5) - self.editbox:SetTextColor(.5, .5, .5) - self.editbox:EnableMouse(false) - self.editbox:ClearFocus() - else - self.slider:EnableMouse(true) - self.label:SetTextColor(1, .82, 0) - self.hightext:SetTextColor(1, 1, 1) - self.lowtext:SetTextColor(1, 1, 1) - --self.valuetext:SetTextColor(1, 1, 1) - self.editbox:SetTextColor(1, 1, 1) - self.editbox:EnableMouse(true) - end - end, - - ["SetValue"] = function(self, value) - self.slider.setup = true - self.slider:SetValue(value) - self.value = value - UpdateText(self) - self.slider.setup = nil - end, - - ["GetValue"] = function(self) - return self.value - end, - - ["SetLabel"] = function(self, text) - self.label:SetText(text) - end, - - ["SetSliderValues"] = function(self, min, max, step) - local frame = self.slider - frame.setup = true - self.min = min - self.max = max - self.step = step - frame:SetMinMaxValues(min or 0,max or 100) - UpdateLabels(self) - frame:SetValueStep(step or 1) - if self.value then - frame:SetValue(self.value) - end - frame.setup = nil - end, - - ["SetIsPercent"] = function(self, value) - self.ispercent = value - UpdateLabels(self) - UpdateText(self) - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local SliderBackdrop = { - bgFile = "Interface\\Buttons\\UI-SliderBar-Background", - edgeFile = "Interface\\Buttons\\UI-SliderBar-Border", - tile = true, tileSize = 8, edgeSize = 8, - insets = { left = 3, right = 3, top = 6, bottom = 6 } -} - -local ManualBackdrop = { - bgFile = "Interface\\ChatFrame\\ChatFrameBackground", - edgeFile = "Interface\\ChatFrame\\ChatFrameBackground", - tile = true, edgeSize = 1, tileSize = 5, -} - -local function Constructor() - local frame = CreateFrame("Frame", nil, UIParent) - - frame:EnableMouse(true) - frame:SetScript("OnMouseDown", Frame_OnMouseDown) - - local label = frame:CreateFontString(nil, "OVERLAY", "GameFontNormal") - label:SetPoint("TOPLEFT") - label:SetPoint("TOPRIGHT") - label:SetJustifyH("CENTER") - label:SetHeight(15) - - local slider = CreateFrame("Slider", nil, frame) - slider:SetOrientation("HORIZONTAL") - slider:SetHeight(15) - slider:SetHitRectInsets(0, 0, -10, 0) - slider:SetBackdrop(SliderBackdrop) - slider:SetThumbTexture("Interface\\Buttons\\UI-SliderBar-Button-Horizontal") - slider:SetPoint("TOP", label, "BOTTOM") - slider:SetPoint("LEFT", 3, 0) - slider:SetPoint("RIGHT", -3, 0) - slider:SetValue(0) - slider:SetScript("OnValueChanged",Slider_OnValueChanged) - slider:SetScript("OnEnter", Control_OnEnter) - slider:SetScript("OnLeave", Control_OnLeave) - slider:SetScript("OnMouseUp", Slider_OnMouseUp) - slider:SetScript("OnMouseWheel", Slider_OnMouseWheel) - - local lowtext = slider:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall") - lowtext:SetPoint("TOPLEFT", slider, "BOTTOMLEFT", 2, 3) - - local hightext = slider:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall") - hightext:SetPoint("TOPRIGHT", slider, "BOTTOMRIGHT", -2, 3) - - local editbox = CreateFrame("EditBox", nil, frame) - editbox:SetAutoFocus(false) - editbox:SetFontObject(GameFontHighlightSmall) - editbox:SetPoint("TOP", slider, "BOTTOM") - editbox:SetHeight(14) - editbox:SetWidth(70) - editbox:SetJustifyH("CENTER") - editbox:EnableMouse(true) - editbox:SetBackdrop(ManualBackdrop) - editbox:SetBackdropColor(0, 0, 0, 0.5) - editbox:SetBackdropBorderColor(0.3, 0.3, 0.30, 0.80) - editbox:SetScript("OnEnter", EditBox_OnEnter) - editbox:SetScript("OnLeave", EditBox_OnLeave) - editbox:SetScript("OnEnterPressed", EditBox_OnEnterPressed) - editbox:SetScript("OnEscapePressed", EditBox_OnEscapePressed) - - local widget = { - label = label, - slider = slider, - lowtext = lowtext, - hightext = hightext, - editbox = editbox, - alignoffset = 25, - frame = frame, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - slider.obj, editbox.obj = widget, widget - - return AceGUI:RegisterAsWidget(widget) -end - -AceGUI:RegisterWidgetType(Type,Constructor,Version) +--[[----------------------------------------------------------------------------- +Slider Widget +Graphical Slider, like, for Range values. +-------------------------------------------------------------------------------]] +local Type, Version = "Slider", 20 +local AceGUI = LibStub and LibStub("AceGUI-3.0", true) +if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end + +-- Lua APIs +local min, max, floor = math.min, math.max, math.floor +local tonumber, pairs = tonumber, pairs + +-- WoW APIs +local PlaySound = PlaySound +local CreateFrame, UIParent = CreateFrame, UIParent + +-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded +-- List them here for Mikk's FindGlobals script +-- GLOBALS: GameFontHighlightSmall + +--[[----------------------------------------------------------------------------- +Support functions +-------------------------------------------------------------------------------]] +local function UpdateText(self) + local value = self.value or 0 + if self.ispercent then + self.editbox:SetText(("%s%%"):format(floor(value * 1000 + 0.5) / 10)) + else + self.editbox:SetText(floor(value * 100 + 0.5) / 100) + end +end + +local function UpdateLabels(self) + local min, max = (self.min or 0), (self.max or 100) + if self.ispercent then + self.lowtext:SetFormattedText("%s%%", (min * 100)) + self.hightext:SetFormattedText("%s%%", (max * 100)) + else + self.lowtext:SetText(min) + self.hightext:SetText(max) + end +end + +--[[----------------------------------------------------------------------------- +Scripts +-------------------------------------------------------------------------------]] +local function Control_OnEnter(frame) + frame.obj:Fire("OnEnter") +end + +local function Control_OnLeave(frame) + frame.obj:Fire("OnLeave") +end + +local function Frame_OnMouseDown(frame) + frame.obj.slider:EnableMouseWheel(true) + AceGUI:ClearFocus() +end + +local function Slider_OnValueChanged(frame) + local self = frame.obj + if not frame.setup then + local newvalue = frame:GetValue() + if newvalue ~= self.value and not self.disabled then + self.value = newvalue + self:Fire("OnValueChanged", newvalue) + end + if self.value then + UpdateText(self) + end + end +end + +local function Slider_OnMouseUp(frame) + local self = frame.obj + self:Fire("OnMouseUp", self.value) +end + +local function Slider_OnMouseWheel(frame, v) + local self = frame.obj + if not self.disabled then + local value = self.value + if v > 0 then + value = min(value + (self.step or 1), self.max) + else + value = max(value - (self.step or 1), self.min) + end + self.slider:SetValue(value) + end +end + +local function EditBox_OnEscapePressed(frame) + frame:ClearFocus() +end + +local function EditBox_OnEnterPressed(frame) + local self = frame.obj + local value = frame:GetText() + if self.ispercent then + value = value:gsub('%%', '') + value = tonumber(value) / 100 + else + value = tonumber(value) + end + + if value then + PlaySound("igMainMenuOptionCheckBoxOn") + self.slider:SetValue(value) + self:Fire("OnMouseUp", value) + end +end + +local function EditBox_OnEnter(frame) + frame:SetBackdropBorderColor(0.5, 0.5, 0.5, 1) +end + +local function EditBox_OnLeave(frame) + frame:SetBackdropBorderColor(0.3, 0.3, 0.3, 0.8) +end + +--[[----------------------------------------------------------------------------- +Methods +-------------------------------------------------------------------------------]] +local methods = { + ["OnAcquire"] = function(self) + self:SetWidth(200) + self:SetHeight(44) + self:SetDisabled(false) + self:SetIsPercent(nil) + self:SetSliderValues(0,100,1) + self:SetValue(0) + self.slider:EnableMouseWheel(false) + end, + + -- ["OnRelease"] = nil, + + ["SetDisabled"] = function(self, disabled) + self.disabled = disabled + if disabled then + self.slider:EnableMouse(false) + self.label:SetTextColor(.5, .5, .5) + self.hightext:SetTextColor(.5, .5, .5) + self.lowtext:SetTextColor(.5, .5, .5) + --self.valuetext:SetTextColor(.5, .5, .5) + self.editbox:SetTextColor(.5, .5, .5) + self.editbox:EnableMouse(false) + self.editbox:ClearFocus() + else + self.slider:EnableMouse(true) + self.label:SetTextColor(1, .82, 0) + self.hightext:SetTextColor(1, 1, 1) + self.lowtext:SetTextColor(1, 1, 1) + --self.valuetext:SetTextColor(1, 1, 1) + self.editbox:SetTextColor(1, 1, 1) + self.editbox:EnableMouse(true) + end + end, + + ["SetValue"] = function(self, value) + self.slider.setup = true + self.slider:SetValue(value) + self.value = value + UpdateText(self) + self.slider.setup = nil + end, + + ["GetValue"] = function(self) + return self.value + end, + + ["SetLabel"] = function(self, text) + self.label:SetText(text) + end, + + ["SetSliderValues"] = function(self, min, max, step) + local frame = self.slider + frame.setup = true + self.min = min + self.max = max + self.step = step + frame:SetMinMaxValues(min or 0,max or 100) + UpdateLabels(self) + frame:SetValueStep(step or 1) + if self.value then + frame:SetValue(self.value) + end + frame.setup = nil + end, + + ["SetIsPercent"] = function(self, value) + self.ispercent = value + UpdateLabels(self) + UpdateText(self) + end +} + +--[[----------------------------------------------------------------------------- +Constructor +-------------------------------------------------------------------------------]] +local SliderBackdrop = { + bgFile = "Interface\\Buttons\\UI-SliderBar-Background", + edgeFile = "Interface\\Buttons\\UI-SliderBar-Border", + tile = true, tileSize = 8, edgeSize = 8, + insets = { left = 3, right = 3, top = 6, bottom = 6 } +} + +local ManualBackdrop = { + bgFile = "Interface\\ChatFrame\\ChatFrameBackground", + edgeFile = "Interface\\ChatFrame\\ChatFrameBackground", + tile = true, edgeSize = 1, tileSize = 5, +} + +local function Constructor() + local frame = CreateFrame("Frame", nil, UIParent) + + frame:EnableMouse(true) + frame:SetScript("OnMouseDown", Frame_OnMouseDown) + + local label = frame:CreateFontString(nil, "OVERLAY", "GameFontNormal") + label:SetPoint("TOPLEFT") + label:SetPoint("TOPRIGHT") + label:SetJustifyH("CENTER") + label:SetHeight(15) + + local slider = CreateFrame("Slider", nil, frame) + slider:SetOrientation("HORIZONTAL") + slider:SetHeight(15) + slider:SetHitRectInsets(0, 0, -10, 0) + slider:SetBackdrop(SliderBackdrop) + slider:SetThumbTexture("Interface\\Buttons\\UI-SliderBar-Button-Horizontal") + slider:SetPoint("TOP", label, "BOTTOM") + slider:SetPoint("LEFT", 3, 0) + slider:SetPoint("RIGHT", -3, 0) + slider:SetValue(0) + slider:SetScript("OnValueChanged",Slider_OnValueChanged) + slider:SetScript("OnEnter", Control_OnEnter) + slider:SetScript("OnLeave", Control_OnLeave) + slider:SetScript("OnMouseUp", Slider_OnMouseUp) + slider:SetScript("OnMouseWheel", Slider_OnMouseWheel) + + local lowtext = slider:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall") + lowtext:SetPoint("TOPLEFT", slider, "BOTTOMLEFT", 2, 3) + + local hightext = slider:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall") + hightext:SetPoint("TOPRIGHT", slider, "BOTTOMRIGHT", -2, 3) + + local editbox = CreateFrame("EditBox", nil, frame) + editbox:SetAutoFocus(false) + editbox:SetFontObject(GameFontHighlightSmall) + editbox:SetPoint("TOP", slider, "BOTTOM") + editbox:SetHeight(14) + editbox:SetWidth(70) + editbox:SetJustifyH("CENTER") + editbox:EnableMouse(true) + editbox:SetBackdrop(ManualBackdrop) + editbox:SetBackdropColor(0, 0, 0, 0.5) + editbox:SetBackdropBorderColor(0.3, 0.3, 0.30, 0.80) + editbox:SetScript("OnEnter", EditBox_OnEnter) + editbox:SetScript("OnLeave", EditBox_OnLeave) + editbox:SetScript("OnEnterPressed", EditBox_OnEnterPressed) + editbox:SetScript("OnEscapePressed", EditBox_OnEscapePressed) + + local widget = { + label = label, + slider = slider, + lowtext = lowtext, + hightext = hightext, + editbox = editbox, + alignoffset = 25, + frame = frame, + type = Type + } + for method, func in pairs(methods) do + widget[method] = func + end + slider.obj, editbox.obj = widget, widget + + return AceGUI:RegisterAsWidget(widget) +end + +AceGUI:RegisterWidgetType(Type,Constructor,Version) diff --git a/libs/Astrolabe/Astrolabe.lua b/libs/Astrolabe/Astrolabe.lua old mode 100644 new mode 100755 index e84df83..dcb1967 --- a/libs/Astrolabe/Astrolabe.lua +++ b/libs/Astrolabe/Astrolabe.lua @@ -1,7 +1,7 @@ --[[ Name: Astrolabe -Revision: $Rev: 125 $ -$Date: 2010-12-12 05:17:15 +0000 (Sun, 12 Dec 2010) $ +Revision: $Rev: 147 $ +$Date: 2012-08-28 17:45:40 +0100 (Tue, 28 Aug 2012) $ Author(s): Esamynn (esamynn at wowinterface.com) Inspired By: Gatherer by Norganna MapLibrary by Kristofer Karlsson (krka at kth.se) @@ -13,7 +13,7 @@ Description: This library also manages and updates the position of Minimap icons automatically. -Copyright (C) 2006-2010 James Carrothers +Copyright (C) 2006-2012 James Carrothers License: This library is free software; you can redistribute it and/or @@ -41,8 +41,8 @@ Note: -- WARNING!!! -- DO NOT MAKE CHANGES TO THIS LIBRARY WITHOUT FIRST CHANGING THE LIBRARY_VERSION_MAJOR -- STRING (to something unique) OR ELSE YOU MAY BREAK OTHER ADDONS THAT USE THIS LIBRARY!!! -local LIBRARY_VERSION_MAJOR = "TTAstrolabe-1.0" -local LIBRARY_VERSION_MINOR = tonumber(string.match("$Revision: 125 $", "(%d+)") or 1) +local LIBRARY_VERSION_MAJOR = "Astrolabe-1.0" +local LIBRARY_VERSION_MINOR = tonumber(string.match("$Revision: 147 $", "(%d+)") or 1) if not DongleStub then error(LIBRARY_VERSION_MAJOR .. " requires DongleStub.") end if not DongleStub:IsNewerVersion(LIBRARY_VERSION_MAJOR, LIBRARY_VERSION_MINOR) then return end @@ -50,7 +50,7 @@ if not DongleStub:IsNewerVersion(LIBRARY_VERSION_MAJOR, LIBRARY_VERSION_MINOR) t local Astrolabe = {}; -- define local variables for Data Tables (defined at the end of this file) -local WorldMapSize, MinimapSize, ValidMinimapShapes, zeroData; +local WorldMapSize, MicroDungeonSize, MinimapSize, ValidMinimapShapes, zeroData; function Astrolabe:GetVersion() return LIBRARY_VERSION_MAJOR, LIBRARY_VERSION_MINOR; @@ -141,13 +141,19 @@ end local function getSystemPosition( mapData, f, x, y ) if ( f ~= 0 ) then - mapData = mapData[f]; + mapData = rawget(mapData, f) or MicroDungeonSize[mapData.system][f]; end x = x * mapData.width + mapData.xOffset; y = y * mapData.height + mapData.yOffset; return x, y; end +local function printError( ... ) + if ( ASTROLABE_VERBOSE) then + print(...) + end +end + -------------------------------------------------------------------------------------------------------------- -- General Utility Functions @@ -176,7 +182,7 @@ function Astrolabe:ComputeDistance( m1, f1, x1, y1, m2, f2, x2, y2 ) -- points in the same zone on the same floor local mapData = WorldMapSize[m1]; if ( f1 ~= 0 ) then - mapData = mapData[f1]; + mapData = rawget(mapData, f1) or MicroDungeonSize[mapData.system][f1]; end xDelta = (x2 - x1) * mapData.width; yDelta = (y2 - y1) * mapData.height; @@ -192,24 +198,22 @@ function Astrolabe:ComputeDistance( m1, f1, x1, y1, m2, f2, x2, y2 ) yDelta = (y2 - y1); else - local sp1 = map1.systemParent; - local sp2 = map2.systemParent; - if ( sp1 == sp2 ) then - --local worldID = sp1; - -- instead of a new local, reuse sp1 - local s1 = map1.system; - local s2 = map2.system; + local s1 = map1.system; + local s2 = map2.system; + if ( (m1==0 or WorldMapSize[0][s1]) and (m2==0 or WorldMapSize[0][s2]) ) then x1, y1 = getSystemPosition(map1, f1, x1, y1); x2, y2 = getSystemPosition(map2, f2, x2, y2); - if not ( s1 == map1.systemParent ) then - local cont1 = WorldMapSize[sp1][s1]; - x1 = x1 - cont1.xOffset; - y1 = y1 - cont1.yOffset; + if ( m1 ~= 0 ) then + -- translate up from system 1 + local cont1 = WorldMapSize[0][s1]; + x1 = (x1 - cont1.xOffset) * cont1.scale; + y1 = (y1 - cont1.yOffset) * cont1.scale; end - if not ( s2 == map2.systemParent ) then - local cont2 = WorldMapSize[sp1][s2]; - x2 = x2 - cont2.xOffset; - y2 = y2 - cont2.yOffset; + if ( m2 ~= 0 ) then + -- translate up from system 2 + local cont2 = WorldMapSize[0][s2]; + x2 = (x2 - cont2.xOffset) * cont2.scale; + y2 = (y2 - cont2.yOffset) * cont2.scale; end xDelta = x2 - x1; @@ -254,35 +258,31 @@ function Astrolabe:TranslateWorldMapPosition( M, F, xPos, yPos, nM, nF ) xPos, yPos = getSystemPosition(map, F, xPos, yPos); mapData = WorldMapSize[nM]; if ( nF ~= 0 ) then - mapData = mapData[nF]; + mapData = rawget(mapData, nF) or MicroDungeonSize[mapData.system][nF]; end else -- different continents, same world - local SP = map.systemParent; - local nSP = nMap.systemParent; - if ( SP == nSP ) then - --local worldID = SP; - -- instead of a new local, reuse SP - local S = map.system; - local nS = nMap.system; + local S = map.system; + local nS = nMap.system; + if ( (M==0 or WorldMapSize[0][S]) and (nM==0 or WorldMapSize[0][nS]) ) then mapData = WorldMapSize[M]; xPos, yPos = getSystemPosition(mapData, F, xPos, yPos); - if ( M ~= SP ) then + if ( M ~= 0 ) then -- translate up to world map if we aren't there already - local cont = WorldMapSize[SP][S]; - xPos = xPos - cont.xOffset; - yPos = yPos - cont.yOffset; - mapData = WorldMapSize[SP]; + local cont = WorldMapSize[0][S]; + xPos = (xPos - cont.xOffset) * cont.scale; + yPos = (yPos - cont.yOffset) * cont.scale; + mapData = WorldMapSize[0]; end - if ( nM ~= SP ) then + if ( nM ~= 0 ) then -- translate down to the new continent - local nCont = WorldMapSize[SP][nS]; - xPos = xPos + nCont.xOffset; - yPos = yPos + nCont.yOffset; + local nCont = WorldMapSize[0][nS]; + xPos = (xPos / nCont.scale) + nCont.xOffset; + yPos = (yPos / nCont.scale) + nCont.yOffset; mapData = WorldMapSize[nM]; if ( nF ~= 0 ) then - mapData = mapData[nF]; + mapData = rawget(mapData, nF) or MicroDungeonSize[mapData.system][nF]; end end @@ -321,18 +321,16 @@ function Astrolabe:GetUnitPosition( unit, noMapChange ) WorldMapZoomOutButton_OnClick(); x, y = GetPlayerMapPosition(unit); if ( x <= 0 and y <= 0 ) then - -- we are in an instance or otherwise off map + -- we are in an instance without a map or otherwise off map return; end end local M, F = GetCurrentMapAreaID(), GetCurrentMapDungeonLevel(); - -- This code has been commented out to give slightly better behaviour - -- when getting the players position (jnw) - -- if ( M ~= lastMapID or F ~= lastFloor ) then - -- -- set map zoom back to what it was before - -- SetMapByID(lastMapID); - -- SetDungeonMapLevel(lastFloor); - -- end + if ( M ~= lastMapID or F ~= lastFloor ) then + -- set map zoom back to what it was before + SetMapByID(lastMapID); + SetDungeonMapLevel(lastFloor); + end return M, F, x, y; end return GetCurrentMapAreaID(), GetCurrentMapDungeonLevel(), x, y; @@ -343,11 +341,29 @@ end -- for the specified unit, including changing the current map zoom (if needed). -- However, if a monitored WorldMapFrame (See AstrolabeMapMonitor.lua) is -- visible, then will simply return nil if the current zoom does not provide --- a valid position for the player unit. Map Zoom is returned to its previous --- setting before this function returns, if it was changed. +-- a valid position for the player unit. Map Zoom is NOT returned to its previous +-- setting before this function returns, in order to provide better performance. --***************************************************************************** function Astrolabe:GetCurrentPlayerPosition() - return self:GetUnitPosition("player", self.WorldMapVisible); + local x, y = GetPlayerMapPosition("player"); + if ( x <= 0 and y <= 0 ) then + if ( self.WorldMapVisible ) then + -- we know there is a visible world map, so don't cause + -- WORLD_MAP_UPDATE events by changing map zoom + return; + end + SetMapToCurrentZone(); + x, y = GetPlayerMapPosition("player"); + if ( x <= 0 and y <= 0 ) then + WorldMapZoomOutButton_OnClick(); + x, y = GetPlayerMapPosition("player"); + if ( x <= 0 and y <= 0 ) then + -- we are in an instance without a map or otherwise off map + return; + end + end + end + return GetCurrentMapAreaID(), GetCurrentMapDungeonLevel(), x, y; end function Astrolabe:GetMapID(continent, zone) @@ -375,9 +391,9 @@ function Astrolabe:GetMapInfo( mapID, mapFloor ) mapFloor = mapFloor or min(#WorldMapSize[mapID], 1); local mapData = WorldMapSize[mapID]; - local system, systemParent = mapData.system, mapData.systemParent + local system, systemParent = mapData.system, WorldMapSize[0][mapData.system] and true or false if ( mapFloor ~= 0 ) then - mapData = mapData[mapFloor]; + mapData = rawget(mapData, mapFloor) or MicroDungeonSize[mapData.system][mapFloor]; end if ( mapData ~= zeroData ) then return system, systemParent, mapData.width, mapData.height, mapData.xOffset, mapData.yOffset; @@ -1011,6 +1027,7 @@ end -- Library Registration -------------------------------------------------------------------------------------------------------------- +local HARVESTED_DATA_VERSION = 3; -- increment this when the format of the harvested data has to change local function harvestMapData( HarvestedMapData ) local mapData = {} local mapName = GetMapInfo(); @@ -1021,35 +1038,23 @@ local function harvestMapData( HarvestedMapData ) mapData.zone = (GetCurrentMapZone()) or -100; mapData.numFloors = numFloors; local _, TLx, TLy, BRx, BRy = GetCurrentMapZone(); - if ( TLx and TLy and BRx and BRy ) then + if ( TLx and TLy and BRx and BRy and (TLx~=0 or TLy~=0 or BRx~=0 or BRy~=0) ) then mapData[0] = {}; - if not ( TLx < BRx ) then - TLx = -TLx; - BRx = -BRx; - end - if not ( TLy < BRy) then - TLy = -TLy; - BRy = -BRy; - end mapData[0].TLx = TLx; mapData[0].TLy = TLy; mapData[0].BRx = BRx; mapData[0].BRy = BRy; end + if ( not mapData[0] and numFloors == 0 and (GetCurrentMapDungeonLevel()) == 1 ) then + numFloors = 1; + mapData.hiddenFloor = true; + end if ( numFloors > 0 ) then for f = 1, numFloors do SetDungeonMapLevel(f); local _, TLx, TLy, BRx, BRy = GetCurrentMapDungeonLevel(); if ( TLx and TLy and BRx and BRy ) then mapData[f] = {}; - if not ( TLx < BRx ) then - TLx = -TLx; - BRx = -BRx; - end - if not ( TLy < BRy) then - TLy = -TLy; - BRy = -BRy; - end mapData[f].TLx = TLx; mapData[f].TLy = TLy; mapData[f].BRx = BRx; @@ -1057,11 +1062,16 @@ local function harvestMapData( HarvestedMapData ) end end end + HarvestedMapData[mapID] = mapData; end local function activate( newInstance, oldInstance ) if ( oldInstance ) then -- this is an upgrade activate + -- print upgrade debug info + local _, oldVersion = oldInstance:GetVersion(); + printError("Upgrading "..LIBRARY_VERSION_MAJOR.." from version "..oldVersion.." to version "..LIBRARY_VERSION_MINOR); + if ( oldInstance.DumpNewIconsCache ) then oldInstance:DumpNewIconsCache() end @@ -1081,8 +1091,11 @@ local function activate( newInstance, oldInstance ) else local frame = CreateFrame("Frame"); newInstance.processingFrame = frame; - - newInstance.HarvestedMapData = {}; + end + configConstants = nil -- we don't need this anymore + + if not ( oldInstance and oldInstance.HarvestedMapData.VERSION == HARVESTED_DATA_VERSION ) then + newInstance.HarvestedMapData = { VERSION = HARVESTED_DATA_VERSION }; local HarvestedMapData = newInstance.HarvestedMapData; newInstance.ContinentList = { GetMapContinents() }; @@ -1099,7 +1112,7 @@ local function activate( newInstance, oldInstance ) end end - for id=1,10000 do + for _, id in ipairs(GetAreaMaps()) do if not ( HarvestedMapData[id] ) then if ( SetMapByID(id) ) then harvestMapData(HarvestedMapData); @@ -1107,7 +1120,6 @@ local function activate( newInstance, oldInstance ) end end end - configConstants = nil -- we don't need this anymore local frame = newInstance.processingFrame; frame:Hide(); @@ -1190,450 +1202,253 @@ ValidMinimapShapes = { -- in game yards WorldMapSize = { [0] = { - height = 31809.52239, - system = 0, - systemParent = 0, - width = 47714.28663, + height = 22266.74312, + system = -1, + width = 33400.121, xOffset = 0, yOffset = 0, - [13] = { - xOffset = -8476.18926, - yOffset = -18428.5703, + [1] = { + xOffset = -10311.71318, + yOffset = -19819.33898, + scale = 0.56089997291565, }, - [14] = { - xOffset = -36714.28738, - yOffset = -14761.90436, + [0] = { + xOffset = -48226.86993, + yOffset = -16433.90283, + scale = 0.56300002336502, }, - [485] = { - xOffset = -25238.09554, - yOffset = -11047.61835, + [571] = { + xOffset = -29750.89905, + yOffset = -11454.50802, + scale = 0.5949000120163, }, - }, - [13] = { - height = 24533.19945, - systemParent = 0, - width = 36799.81197, - xOffset = -17066.60126, - yOffset = -12799.89961, - }, - [14] = { - height = 27149.68748, - systemParent = 0, - width = 40741.17907, - xOffset = -18171.96844, - yOffset = -11176.34367, - }, - [321] = { - { -- [1] - height = 1159.5835, - width = 1739.375, - xOffset = 3506.354, - yOffset = -2486.66675, + [870] = { + xOffset = -27693.71178, + yOffset = -29720.0585, + scale = 0.65140002965927, }, - { -- [2] - height = 241.39025, - width = 362.08962, - xOffset = 4163.96713, - yOffset = -1932.27183, - }, - xOffset = 8690.02719, - yOffset = -3623.15183, - }, - [401] = { - height = 2825.00046, - width = 4237.49828, - xOffset = 0, - yOffset = 0, - }, - [443] = { - height = 764.58325, - width = 1145.83472, - xOffset = 0, - yOffset = 0, - }, - [461] = { - height = 1170.83309, - width = 1756.25023, - xOffset = 0, - yOffset = 0, - }, - [462] = { - height = 3283.33296, - width = 4924.99935, - xOffset = 2087.50023, - yOffset = -8641.66578, - }, - [463] = { - height = 2200.0001, - width = 3300.00085, - xOffset = 2883.33272, - yOffset = -5866.66614, - }, - [464] = { - height = 2714.58133, - width = 4070.83028, - xOffset = -7099.9985, - yOffset = -7339.58233, - }, - [466] = { - height = 11642.71843, - systemParent = 466, - width = 17464.0779, - xOffset = -12996.03902, - yOffset = -5821.35914, - }, - [471] = { - height = 704.68794, - width = 1056.7699, - xOffset = -6533.63241, - yOffset = -6523.64995, - }, - [476] = { - height = 2174.99908, - width = 3262.50031, - xOffset = -7525.00003, - yOffset = -9374.99943, - }, - [480] = { - height = 806.7719, - width = 1211.45871, - xOffset = 4000.74932, - yOffset = -7753.70939, - }, - [482] = { - height = 1514.58311, - width = 2270.83529, - xOffset = 0, - yOffset = 0, - }, - [485] = { - height = 11834.26515, - systemParent = 0, - width = 17751.39839, - xOffset = -9217.15231, - yOffset = -10593.37487, - }, - [499] = { - height = 2218.75027, - width = 3327.08362, - xOffset = 2902.08234, - yOffset = -11168.74965, - }, - [502] = { - height = 2108.33411, - width = 3162.49385, - xOffset = 0, - yOffset = 0, - }, - [504] = { - { -- [1] - height = 553.33995, - width = 830.01643, - xOffset = -1052.51109, - yOffset = -6066.67115, - }, - { -- [2] - height = 375.48927, - width = 563.22279, - xOffset = -915.86865, - yOffset = -5975.33259, - }, - xOffset = -1270.796, - yOffset = -11581.57677, - }, - [512] = { - height = 1162.50002, - width = 1743.74946, - xOffset = 0, - yOffset = 0, - }, - [521] = { - { -- [1] - height = 1216.66649, - width = 1824.99985, - xOffset = 435.33678, - yOffset = 2235.80349, - }, - }, - [529] = { - { -- [1] - height = 2191.66598, - width = 3287.50074, - xOffset = -1804.35279, - yOffset = 2062.9701, - }, - }, - [531] = { - height = 774.99991, - width = 1162.49961, - xOffset = 0, - yOffset = 0, - }, - [540] = { - height = 1766.66716, - width = 2650.00164, - xOffset = 0, - yOffset = 0, - }, - [544] = { - system = 544, - }, - [545] = { - height = 2097.91669, - width = 3145.83325, - xOffset = 0, - yOffset = 0, - }, - [602] = { - height = 1022.91668, - width = 1533.33347, - xOffset = 0, - yOffset = 0, - }, - [605] = { - system = 605, - }, - [609] = { - height = 502.08329, - width = 752.08331, - xOffset = 0, - yOffset = 0, - }, - [611] = { - height = 593.74988, - width = 889.58325, - xOffset = 0, - yOffset = 0, - }, - [626] = { - height = 810.41329, - width = 1214.58151, - xOffset = 0, - yOffset = 0, - }, - [640] = { - system = 640, - }, - [677] = { - height = 593.74988, - width = 889.58325, - xOffset = 0, - yOffset = 0, - }, - [678] = { - height = 2097.91669, - width = 3145.83325, - xOffset = 0, - yOffset = 0, - }, - [679] = { - height = 2097.91669, - width = 3145.83325, - xOffset = 0, - yOffset = 0, - }, - [681] = { - height = 3010.41666, - width = 4514.58301, - xOffset = 0, - yOffset = 0, - }, - [682] = { - height = 3010.41666, - width = 4514.58301, - xOffset = 0, - yOffset = 0, - }, - [686] = { - height = 922.9166, - width = 1383.33334, - xOffset = 0, - yOffset = 0, - }, - [708] = { - height = 1343.75002, - width = 2014.58153, - xOffset = -4810.41584, - yOffset = 2160.41647, - }, - [709] = { - height = 1224.99954, - width = 1837.49974, - xOffset = -5212.4997, - yOffset = 1222.91666, - }, - [717] = { - height = 1674.99988, - width = 2512.4912, - xOffset = 0, - yOffset = 0, - }, - [736] = { - height = 868.74697, - width = 1302.08448, - xOffset = 0, - yOffset = 0, - }, - [737] = { - system = 737, - }, - [747] = { - height = 647.91734, - width = 970.83627, - xOffset = 0, - yOffset = 0, }, } +MicroDungeonSize = {} + local function zeroDataFunc(tbl, key) if ( type(key) == "number" ) then return zeroData; else - return 0; + return rawget(zeroData, key); end end -zeroData = { xOffset = 0, height = 0, yOffset = 0, width = 0, __index = zeroDataFunc }; +zeroData = { xOffset = 0, height = 1, yOffset = 0, width = 1, __index = zeroDataFunc }; setmetatable(zeroData, zeroData); -local function printError( ... ) - if ( ASTROLABE_VERBOSE) then - print(...) +-- get data on useful transforms +local TRANSFORMS = {} +for _, ID in ipairs(GetWorldMapTransforms()) do + local terrainMapID, newTerrainMapID, _, _, transformMinY, transformMaxY, transformMinX, transformMaxX, offsetY, offsetX = GetWorldMapTransformInfo(ID) + if ( offsetX ~= 0 or offsetY ~= 0 ) then + TRANSFORMS[ID] = { + terrainMapID = terrainMapID, + newTerrainMapID = newTerrainMapID, + BRy = -transformMinY, + TLy = -transformMaxY, + BRx = -transformMinX, + TLx = -transformMaxX, + offsetY = offsetY, + offsetX = offsetX, + } end end +--remove this temporarily +local harvestedDataVersion = Astrolabe.HarvestedMapData.VERSION +Astrolabe.HarvestedMapData.VERSION = nil + for mapID, harvestedData in pairs(Astrolabe.HarvestedMapData) do + local terrainMapID = GetAreaMapInfo(mapID) local mapData = WorldMapSize[mapID]; - if ( mapData ) then - if ( harvestedData.numFloors > 0 ) then - for f, harvData in pairs(harvestedData) do - if ( type(f) == "number" and f > 0 ) then - if not ( mapData[f] ) then - mapData[f] = {}; + if not ( mapData ) then mapData = {}; end + if ( harvestedData.numFloors > 0 or harvestedData.hiddenFloor ) then + for f, harvData in pairs(harvestedData) do + if ( type(f) == "number" and f > 0 ) then + if not ( mapData[f] ) then + mapData[f] = {}; + end + local floorData = mapData[f] + local TLx, TLy, BRx, BRy = -harvData.BRx, -harvData.BRy, -harvData.TLx, -harvData.TLy + if not ( TLx < BRx ) then + printError("Bad x-axis Orientation (Floor): ", mapID, f, TLx, BRx); end - local floorData = mapData[f] - if not ( floorData.width ) then - floorData.width = harvData.BRx - harvData.TLx + if not ( TLy < BRy) then + printError("Bad y-axis Orientation (Floor): ", mapID, f, TLy, BRy); end - if not ( floorData.height ) then - floorData.height = harvData.BRy - harvData.TLy + if not ( floorData.width ) then + floorData.width = BRx - TLx + end + if not ( floorData.height ) then + floorData.height = BRy - TLy + end + if not ( floorData.xOffset ) then + floorData.xOffset = TLx + end + if not ( floorData.yOffset ) then + floorData.yOffset = TLy + end + end + end + for f = 1, harvestedData.numFloors do + if not ( mapData[f] ) then + if ( f == 1 and harvestedData[0] and harvestedData[0].TLx and harvestedData[0].TLy and harvestedData[0].BRx and harvestedData[0].BRy ) then + -- handle dungeon maps which use zone level data for the first floor + mapData[f] = {}; + local floorData = mapData[f] + local harvData = harvestedData[0] + local TLx, TLy, BRx, BRy = -harvData.TLx, -harvData.TLy, -harvData.BRx, -harvData.BRy + if not ( TLx < BRx ) then + printError("Bad x-axis Orientation (Floor from Zone): ", mapID, f, TLx, BRx); end - if not ( floorData.xOffset ) then - floorData.xOffset = harvData.TLx + if not ( TLy < BRy) then + printError("Bad y-axis Orientation (Floor from Zone): ", mapID, f, TLy, BRy); end - if not ( floorData.yOffset ) then - floorData.yOffset = harvData.TLy + floorData.width = BRx - TLx + floorData.height = BRy - TLy + floorData.xOffset = TLx + floorData.yOffset = TLy + else + printError(("Astrolabe is missing data for %s [%d], floor %d."):format(harvestedData.mapName, mapID, f)); + end + end + end + if ( harvestedData.hiddenFloor ) then + mapData.width = mapData[1].width + mapData.height = mapData[1].height + mapData.xOffset = mapData[1].xOffset + mapData.yOffset = mapData[1].yOffset + end + + else + local harvData = harvestedData[0] + if ( harvData ~= nil ) then + local TLx, TLy, BRx, BRy = -harvData.TLx, -harvData.TLy, -harvData.BRx, -harvData.BRy + -- apply any necessary transforms + for transformID, transformData in pairs(TRANSFORMS) do + if ( transformData.terrainMapID == terrainMapID ) then + if ( (transformData.TLx < TLx and BRx < transformData.BRx) and (transformData.TLy < TLy and BRy < transformData.BRy) ) then + TLx = TLx - transformData.offsetX; + BRx = BRx - transformData.offsetX; + BRy = BRy - transformData.offsetY; + TLy = TLy - transformData.offsetY; + terrainMapID = transformData.newTerrainMapID; + break; end end end - for f = 1, harvestedData.numFloors do - if not ( mapData[f] ) then - printError(("Astrolabe is missing data for %s [%d], floor %d."):format(harvestedData.mapName, mapID, f)); + if not ( TLx==0 and TLy==0 and BRx==0 and BRy==0 ) then + if not ( TLx < BRx ) then + printError("Bad x-axis Orientation (Zone): ", mapID, TLx, BRx); + end + if not ( TLy < BRy) then + printError("Bad y-axis Orientation (Zone): ", mapID, TLy, BRy); end end - -- TODO: handle floored world maps - - else - local harvData = harvestedData[0] if not ( mapData.width ) then - mapData.width = harvData.BRx - harvData.TLx + mapData.width = BRx - TLx end if not ( mapData.height ) then - mapData.height = harvData.BRy - harvData.TLy + mapData.height = BRy - TLy end if not ( mapData.xOffset ) then - mapData.xOffset = harvData.TLx + mapData.xOffset = TLx end if not ( mapData.yOffset ) then - mapData.yOffset = harvData.TLy + mapData.yOffset = TLy end - - end - - else - mapData = {}; - - if ( harvestedData.numFloors > 0 ) then - for f, harvData in pairs(harvestedData) do - if ( type(f) == "number" and f > 0 ) then - mapData[f] = {}; - local floorData = mapData[f] - floorData.width = harvData.BRx - harvData.TLx - floorData.height = harvData.BRy - harvData.TLy - floorData.xOffset = harvData.TLx - floorData.yOffset = harvData.TLy - end - end - for f = 1, harvestedData.numFloors do - if not ( mapData[f] ) then - printError(("Astrolabe is missing data for %s [%d], floor %d."):format(harvestedData.mapName, mapID, f)); - end - end - else - local harvData = harvestedData[0] - if ( harvData ) then - mapData.width = harvData.BRx - harvData.TLx - mapData.height = harvData.BRy - harvData.TLy - mapData.xOffset = harvData.TLx - mapData.yOffset = harvData.TLy - + if ( mapID == 751 ) then -- okay, this is Maelstrom continent else - printError(("Astrolabe is missing data for %s [%d]."):format(harvestedData.mapName, mapID)); - - end - - end - - -- if we don't have any data, we're gonna use zeroData, but we also need to - -- setup the system and systemParent IDs so things don't get confused - if not ( next(mapData, nil) ) then - mapData = { xOffset = 0, height = 0, yOffset = 0, width = 0 }; - -- if this is an outside continent level or world map then throw up an extra warning - if ( harvestedData.cont > 0 and harvestedData.zone == 0 ) then - printError(("Astrolabe is missing data for world map %s [%d] (%d, %d)."):format(harvestedData.mapName, mapID, harvestedData.cont, harvestedData.zone)); + printError("Astrolabe harvested a map with no data at all: ", mapID) end end - - -- store the data in the WorldMapSize DB - WorldMapSize[mapID] = mapData; end - -- setup system and systemParent IDs + -- if we don't have any data, we're gonna use zeroData, but we also need to + -- setup the system and systemParent IDs so things don't get confused + if not ( next(mapData, nil) ) then + mapData = { xOffset = 0, height = 1, yOffset = 0, width = 1 }; + -- if this is an outside continent level or world map then throw up an extra warning + if ( harvestedData.cont > 0 and harvestedData.zone == 0 ) then + printError(("Astrolabe is missing data for world map %s [%d] (%d, %d)."):format(harvestedData.mapName, mapID, harvestedData.cont, harvestedData.zone)); + end + end + + -- store the data in the WorldMapSize DB + WorldMapSize[mapID] = mapData; + + if ( mapData and mapData ~= zeroData ) then + -- setup system IDs if not ( mapData.system ) then - mapData.system = mapID; - - if ( harvestedData.cont > 0 and harvestedData.zone > 0 ) then - mapData.system = Astrolabe:GetMapID(harvestedData.cont, nil); - end - end - if not ( mapData.systemParent ) then - mapData.systemParent = mapID; - - local systemData = WorldMapSize[mapData.system]; - if ( systemData and systemData.systemParent ) then - mapData.systemParent = systemData.systemParent; - end + mapData.system = terrainMapID; end - -- systemParent sanity checks - if ( mapData.system ~= mapData.systemParent ) then - if not ( WorldMapSize[mapData.systemParent] and WorldMapSize[mapData.systemParent][mapData.system] ) then - printError("Astrolabe detected a child system that the parent doesn't know about. VERY BAD!!!"); - end + -- determine terrainMapID for micro-dungeons + if ( harvestedData.cont > 0 and harvestedData.zone > 0 ) then + MicroDungeonSize[terrainMapID] = {} end setmetatable(mapData, zeroData); end end -setmetatable(WorldMapSize[0], zeroData); -- special case for World Map +-- put the version back +Astrolabe.HarvestedMapData.VERSION = harvestedDataVersion + +-- micro dungeons +for _, ID in ipairs(GetDungeonMaps()) do + local floorIndex, minX, maxX, minY, maxY, terrainMapID, parentWorldMapID = GetDungeonMapInfo(ID); + local TLx, TLy, BRx, BRy = -maxX, -maxY, -minX, -minY + -- apply any necessary transforms + local transformApplied = false + for transformID, transformData in pairs(TRANSFORMS) do + if ( transformData.terrainMapID == terrainMapID ) then + if ( (transformData.TLx < TLx and BRx < transformData.BRx) and (transformData.TLy < TLy and BRy < transformData.BRy) ) then + TLx = TLx - transformData.offsetX; + BRx = BRx - transformData.offsetX; + BRy = BRy - transformData.offsetY; + TLy = TLy - transformData.offsetY; + terrainMapID = transformData.newTerrainMapID; + transformApplied = true; + break; + end + end + end + if ( MicroDungeonSize[terrainMapID] ) then + -- only consider systems that can have micro dungeons + if ( MicroDungeonSize[terrainMapID][floorIndex] and not transformApplied ) then + printError("Astrolabe detected a duplicate microdungeon floor!", terrainMapID, ID); + end + MicroDungeonSize[terrainMapID][floorIndex] = { + width = BRx - TLx, + height = BRy - TLy, + xOffset = TLx, + yOffset = TLy, + }; + end +end + +-- done with Transforms data +TRANSFORMS = nil + +for _, data in pairs(MicroDungeonSize) do + setmetatable(data, zeroData); +end +setmetatable(MicroDungeonSize, zeroData); -- make sure we don't have any EXTRA data hanging around for mapID, mapData in pairs(WorldMapSize) do - if ( getmetatable(mapData) ~= zeroData ) then + if ( mapID ~= 0 and getmetatable(mapData) ~= zeroData ) then printError("Astrolabe has hard coded data for an invalid map ID", mapID); end end @@ -1641,5 +1456,6 @@ end setmetatable(WorldMapSize, zeroData); -- setup the metatable so that invalid map IDs don't cause Lua errors -- register this library with AstrolabeMapMonitor, this will cause a full update if PLAYER_LOGIN has already fired -local AstrolabeMapMonitor = DongleStub("TTAstrolabeMapMonitor"); +local AstrolabeMapMonitor = DongleStub("AstrolabeMapMonitor"); AstrolabeMapMonitor:RegisterAstrolabeLibrary(Astrolabe, LIBRARY_VERSION_MAJOR); + diff --git a/libs/Astrolabe/AstrolabeMapMonitor.lua b/libs/Astrolabe/AstrolabeMapMonitor.lua old mode 100644 new mode 100755 index 02dea55..58b83cc --- a/libs/Astrolabe/AstrolabeMapMonitor.lua +++ b/libs/Astrolabe/AstrolabeMapMonitor.lua @@ -42,7 +42,7 @@ Note: -- WARNING!!! -- DO NOT MAKE CHANGES TO THIS LIBRARY WITHOUT FIRST CHANGING THE LIBRARY_VERSION_MAJOR -- STRING (to something unique) OR ELSE YOU MAY BREAK OTHER ADDONS THAT USE THIS LIBRARY!!! -local LIBRARY_VERSION_MAJOR = "TTAstrolabeMapMonitor" +local LIBRARY_VERSION_MAJOR = "AstrolabeMapMonitor" local LIBRARY_VERSION_MINOR = tonumber(string.match("$Revision: 44 $", "(%d+)") or 1) if not DongleStub then error(LIBRARY_VERSION_MAJOR .. " requires DongleStub.") end diff --git a/libs/Astrolabe/DongleStub.lua b/libs/Astrolabe/DongleStub.lua old mode 100644 new mode 100755 diff --git a/libs/Astrolabe/Load.xml b/libs/Astrolabe/Load.xml old mode 100644 new mode 100755 diff --git a/libs/Astrolabe/lgpl.txt b/libs/Astrolabe/lgpl.txt old mode 100644 new mode 100755 diff --git a/libs/CallbackHandler-1.0/CallbackHandler-1.0.lua b/libs/CallbackHandler-1.0/CallbackHandler-1.0.lua old mode 100644 new mode 100755 index bc311d9..a127301 --- a/libs/CallbackHandler-1.0/CallbackHandler-1.0.lua +++ b/libs/CallbackHandler-1.0/CallbackHandler-1.0.lua @@ -1,240 +1,240 @@ ---[[ $Id: CallbackHandler-1.0.lua 965 2010-08-09 00:47:52Z mikk $ ]] -local MAJOR, MINOR = "CallbackHandler-1.0", 6 -local CallbackHandler = LibStub:NewLibrary(MAJOR, MINOR) - -if not CallbackHandler then return end -- No upgrade needed - -local meta = {__index = function(tbl, key) tbl[key] = {} return tbl[key] end} - --- Lua APIs -local tconcat = table.concat -local assert, error, loadstring = assert, error, loadstring -local setmetatable, rawset, rawget = setmetatable, rawset, rawget -local next, select, pairs, type, tostring = next, select, pairs, type, tostring - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: geterrorhandler - -local xpcall = xpcall - -local function errorhandler(err) - return geterrorhandler()(err) -end - -local function CreateDispatcher(argCount) - local code = [[ - local next, xpcall, eh = ... - - local method, ARGS - local function call() method(ARGS) end - - local function dispatch(handlers, ...) - local index - index, method = next(handlers) - if not method then return end - local OLD_ARGS = ARGS - ARGS = ... - repeat - xpcall(call, eh) - index, method = next(handlers, index) - until not method - ARGS = OLD_ARGS - end - - return dispatch - ]] - - local ARGS, OLD_ARGS = {}, {} - for i = 1, argCount do ARGS[i], OLD_ARGS[i] = "arg"..i, "old_arg"..i end - code = code:gsub("OLD_ARGS", tconcat(OLD_ARGS, ", ")):gsub("ARGS", tconcat(ARGS, ", ")) - return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(next, xpcall, errorhandler) -end - -local Dispatchers = setmetatable({}, {__index=function(self, argCount) - local dispatcher = CreateDispatcher(argCount) - rawset(self, argCount, dispatcher) - return dispatcher -end}) - --------------------------------------------------------------------------- --- CallbackHandler:New --- --- target - target object to embed public APIs in --- RegisterName - name of the callback registration API, default "RegisterCallback" --- UnregisterName - name of the callback unregistration API, default "UnregisterCallback" --- UnregisterAllName - name of the API to unregister all callbacks, default "UnregisterAllCallbacks". false == don't publish this API. - -function CallbackHandler:New(target, RegisterName, UnregisterName, UnregisterAllName, OnUsed, OnUnused) - -- TODO: Remove this after beta has gone out - assert(not OnUsed and not OnUnused, "ACE-80: OnUsed/OnUnused are deprecated. Callbacks are now done to registry.OnUsed and registry.OnUnused") - - RegisterName = RegisterName or "RegisterCallback" - UnregisterName = UnregisterName or "UnregisterCallback" - if UnregisterAllName==nil then -- false is used to indicate "don't want this method" - UnregisterAllName = "UnregisterAllCallbacks" - end - - -- we declare all objects and exported APIs inside this closure to quickly gain access - -- to e.g. function names, the "target" parameter, etc - - - -- Create the registry object - local events = setmetatable({}, meta) - local registry = { recurse=0, events=events } - - -- registry:Fire() - fires the given event/message into the registry - function registry:Fire(eventname, ...) - if not rawget(events, eventname) or not next(events[eventname]) then return end - local oldrecurse = registry.recurse - registry.recurse = oldrecurse + 1 - - Dispatchers[select('#', ...) + 1](events[eventname], eventname, ...) - - registry.recurse = oldrecurse - - if registry.insertQueue and oldrecurse==0 then - -- Something in one of our callbacks wanted to register more callbacks; they got queued - for eventname,callbacks in pairs(registry.insertQueue) do - local first = not rawget(events, eventname) or not next(events[eventname]) -- test for empty before. not test for one member after. that one member may have been overwritten. - for self,func in pairs(callbacks) do - events[eventname][self] = func - -- fire OnUsed callback? - if first and registry.OnUsed then - registry.OnUsed(registry, target, eventname) - first = nil - end - end - end - registry.insertQueue = nil - end - end - - -- Registration of a callback, handles: - -- self["method"], leads to self["method"](self, ...) - -- self with function ref, leads to functionref(...) - -- "addonId" (instead of self) with function ref, leads to functionref(...) - -- all with an optional arg, which, if present, gets passed as first argument (after self if present) - target[RegisterName] = function(self, eventname, method, ... --[[actually just a single arg]]) - if type(eventname) ~= "string" then - error("Usage: "..RegisterName.."(eventname, method[, arg]): 'eventname' - string expected.", 2) - end - - method = method or eventname - - local first = not rawget(events, eventname) or not next(events[eventname]) -- test for empty before. not test for one member after. that one member may have been overwritten. - - if type(method) ~= "string" and type(method) ~= "function" then - error("Usage: "..RegisterName.."(\"eventname\", \"methodname\"): 'methodname' - string or function expected.", 2) - end - - local regfunc - - if type(method) == "string" then - -- self["method"] calling style - if type(self) ~= "table" then - error("Usage: "..RegisterName.."(\"eventname\", \"methodname\"): self was not a table?", 2) - elseif self==target then - error("Usage: "..RegisterName.."(\"eventname\", \"methodname\"): do not use Library:"..RegisterName.."(), use your own 'self'", 2) - elseif type(self[method]) ~= "function" then - error("Usage: "..RegisterName.."(\"eventname\", \"methodname\"): 'methodname' - method '"..tostring(method).."' not found on self.", 2) - end - - if select("#",...)>=1 then -- this is not the same as testing for arg==nil! - local arg=select(1,...) - regfunc = function(...) self[method](self,arg,...) end - else - regfunc = function(...) self[method](self,...) end - end - else - -- function ref with self=object or self="addonId" or self=thread - if type(self)~="table" and type(self)~="string" and type(self)~="thread" then - error("Usage: "..RegisterName.."(self or \"addonId\", eventname, method): 'self or addonId': table or string or thread expected.", 2) - end - - if select("#",...)>=1 then -- this is not the same as testing for arg==nil! - local arg=select(1,...) - regfunc = function(...) method(arg,...) end - else - regfunc = method - end - end - - - if events[eventname][self] or registry.recurse<1 then - -- if registry.recurse<1 then - -- we're overwriting an existing entry, or not currently recursing. just set it. - events[eventname][self] = regfunc - -- fire OnUsed callback? - if registry.OnUsed and first then - registry.OnUsed(registry, target, eventname) - end - else - -- we're currently processing a callback in this registry, so delay the registration of this new entry! - -- yes, we're a bit wasteful on garbage, but this is a fringe case, so we're picking low implementation overhead over garbage efficiency - registry.insertQueue = registry.insertQueue or setmetatable({},meta) - registry.insertQueue[eventname][self] = regfunc - end - end - - -- Unregister a callback - target[UnregisterName] = function(self, eventname) - if not self or self==target then - error("Usage: "..UnregisterName.."(eventname): bad 'self'", 2) - end - if type(eventname) ~= "string" then - error("Usage: "..UnregisterName.."(eventname): 'eventname' - string expected.", 2) - end - if rawget(events, eventname) and events[eventname][self] then - events[eventname][self] = nil - -- Fire OnUnused callback? - if registry.OnUnused and not next(events[eventname]) then - registry.OnUnused(registry, target, eventname) - end - end - if registry.insertQueue and rawget(registry.insertQueue, eventname) and registry.insertQueue[eventname][self] then - registry.insertQueue[eventname][self] = nil - end - end - - -- OPTIONAL: Unregister all callbacks for given selfs/addonIds - if UnregisterAllName then - target[UnregisterAllName] = function(...) - if select("#",...)<1 then - error("Usage: "..UnregisterAllName.."([whatFor]): missing 'self' or \"addonId\" to unregister events for.", 2) - end - if select("#",...)==1 and ...==target then - error("Usage: "..UnregisterAllName.."([whatFor]): supply a meaningful 'self' or \"addonId\"", 2) - end - - - for i=1,select("#",...) do - local self = select(i,...) - if registry.insertQueue then - for eventname, callbacks in pairs(registry.insertQueue) do - if callbacks[self] then - callbacks[self] = nil - end - end - end - for eventname, callbacks in pairs(events) do - if callbacks[self] then - callbacks[self] = nil - -- Fire OnUnused callback? - if registry.OnUnused and not next(callbacks) then - registry.OnUnused(registry, target, eventname) - end - end - end - end - end - end - - return registry -end - - --- CallbackHandler purposefully does NOT do explicit embedding. Nor does it --- try to upgrade old implicit embeds since the system is selfcontained and --- relies on closures to work. - +--[[ $Id: CallbackHandler-1.0.lua 965 2010-08-09 00:47:52Z mikk $ ]] +local MAJOR, MINOR = "CallbackHandler-1.0", 6 +local CallbackHandler = LibStub:NewLibrary(MAJOR, MINOR) + +if not CallbackHandler then return end -- No upgrade needed + +local meta = {__index = function(tbl, key) tbl[key] = {} return tbl[key] end} + +-- Lua APIs +local tconcat = table.concat +local assert, error, loadstring = assert, error, loadstring +local setmetatable, rawset, rawget = setmetatable, rawset, rawget +local next, select, pairs, type, tostring = next, select, pairs, type, tostring + +-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded +-- List them here for Mikk's FindGlobals script +-- GLOBALS: geterrorhandler + +local xpcall = xpcall + +local function errorhandler(err) + return geterrorhandler()(err) +end + +local function CreateDispatcher(argCount) + local code = [[ + local next, xpcall, eh = ... + + local method, ARGS + local function call() method(ARGS) end + + local function dispatch(handlers, ...) + local index + index, method = next(handlers) + if not method then return end + local OLD_ARGS = ARGS + ARGS = ... + repeat + xpcall(call, eh) + index, method = next(handlers, index) + until not method + ARGS = OLD_ARGS + end + + return dispatch + ]] + + local ARGS, OLD_ARGS = {}, {} + for i = 1, argCount do ARGS[i], OLD_ARGS[i] = "arg"..i, "old_arg"..i end + code = code:gsub("OLD_ARGS", tconcat(OLD_ARGS, ", ")):gsub("ARGS", tconcat(ARGS, ", ")) + return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(next, xpcall, errorhandler) +end + +local Dispatchers = setmetatable({}, {__index=function(self, argCount) + local dispatcher = CreateDispatcher(argCount) + rawset(self, argCount, dispatcher) + return dispatcher +end}) + +-------------------------------------------------------------------------- +-- CallbackHandler:New +-- +-- target - target object to embed public APIs in +-- RegisterName - name of the callback registration API, default "RegisterCallback" +-- UnregisterName - name of the callback unregistration API, default "UnregisterCallback" +-- UnregisterAllName - name of the API to unregister all callbacks, default "UnregisterAllCallbacks". false == don't publish this API. + +function CallbackHandler:New(target, RegisterName, UnregisterName, UnregisterAllName, OnUsed, OnUnused) + -- TODO: Remove this after beta has gone out + assert(not OnUsed and not OnUnused, "ACE-80: OnUsed/OnUnused are deprecated. Callbacks are now done to registry.OnUsed and registry.OnUnused") + + RegisterName = RegisterName or "RegisterCallback" + UnregisterName = UnregisterName or "UnregisterCallback" + if UnregisterAllName==nil then -- false is used to indicate "don't want this method" + UnregisterAllName = "UnregisterAllCallbacks" + end + + -- we declare all objects and exported APIs inside this closure to quickly gain access + -- to e.g. function names, the "target" parameter, etc + + + -- Create the registry object + local events = setmetatable({}, meta) + local registry = { recurse=0, events=events } + + -- registry:Fire() - fires the given event/message into the registry + function registry:Fire(eventname, ...) + if not rawget(events, eventname) or not next(events[eventname]) then return end + local oldrecurse = registry.recurse + registry.recurse = oldrecurse + 1 + + Dispatchers[select('#', ...) + 1](events[eventname], eventname, ...) + + registry.recurse = oldrecurse + + if registry.insertQueue and oldrecurse==0 then + -- Something in one of our callbacks wanted to register more callbacks; they got queued + for eventname,callbacks in pairs(registry.insertQueue) do + local first = not rawget(events, eventname) or not next(events[eventname]) -- test for empty before. not test for one member after. that one member may have been overwritten. + for self,func in pairs(callbacks) do + events[eventname][self] = func + -- fire OnUsed callback? + if first and registry.OnUsed then + registry.OnUsed(registry, target, eventname) + first = nil + end + end + end + registry.insertQueue = nil + end + end + + -- Registration of a callback, handles: + -- self["method"], leads to self["method"](self, ...) + -- self with function ref, leads to functionref(...) + -- "addonId" (instead of self) with function ref, leads to functionref(...) + -- all with an optional arg, which, if present, gets passed as first argument (after self if present) + target[RegisterName] = function(self, eventname, method, ... --[[actually just a single arg]]) + if type(eventname) ~= "string" then + error("Usage: "..RegisterName.."(eventname, method[, arg]): 'eventname' - string expected.", 2) + end + + method = method or eventname + + local first = not rawget(events, eventname) or not next(events[eventname]) -- test for empty before. not test for one member after. that one member may have been overwritten. + + if type(method) ~= "string" and type(method) ~= "function" then + error("Usage: "..RegisterName.."(\"eventname\", \"methodname\"): 'methodname' - string or function expected.", 2) + end + + local regfunc + + if type(method) == "string" then + -- self["method"] calling style + if type(self) ~= "table" then + error("Usage: "..RegisterName.."(\"eventname\", \"methodname\"): self was not a table?", 2) + elseif self==target then + error("Usage: "..RegisterName.."(\"eventname\", \"methodname\"): do not use Library:"..RegisterName.."(), use your own 'self'", 2) + elseif type(self[method]) ~= "function" then + error("Usage: "..RegisterName.."(\"eventname\", \"methodname\"): 'methodname' - method '"..tostring(method).."' not found on self.", 2) + end + + if select("#",...)>=1 then -- this is not the same as testing for arg==nil! + local arg=select(1,...) + regfunc = function(...) self[method](self,arg,...) end + else + regfunc = function(...) self[method](self,...) end + end + else + -- function ref with self=object or self="addonId" or self=thread + if type(self)~="table" and type(self)~="string" and type(self)~="thread" then + error("Usage: "..RegisterName.."(self or \"addonId\", eventname, method): 'self or addonId': table or string or thread expected.", 2) + end + + if select("#",...)>=1 then -- this is not the same as testing for arg==nil! + local arg=select(1,...) + regfunc = function(...) method(arg,...) end + else + regfunc = method + end + end + + + if events[eventname][self] or registry.recurse<1 then + -- if registry.recurse<1 then + -- we're overwriting an existing entry, or not currently recursing. just set it. + events[eventname][self] = regfunc + -- fire OnUsed callback? + if registry.OnUsed and first then + registry.OnUsed(registry, target, eventname) + end + else + -- we're currently processing a callback in this registry, so delay the registration of this new entry! + -- yes, we're a bit wasteful on garbage, but this is a fringe case, so we're picking low implementation overhead over garbage efficiency + registry.insertQueue = registry.insertQueue or setmetatable({},meta) + registry.insertQueue[eventname][self] = regfunc + end + end + + -- Unregister a callback + target[UnregisterName] = function(self, eventname) + if not self or self==target then + error("Usage: "..UnregisterName.."(eventname): bad 'self'", 2) + end + if type(eventname) ~= "string" then + error("Usage: "..UnregisterName.."(eventname): 'eventname' - string expected.", 2) + end + if rawget(events, eventname) and events[eventname][self] then + events[eventname][self] = nil + -- Fire OnUnused callback? + if registry.OnUnused and not next(events[eventname]) then + registry.OnUnused(registry, target, eventname) + end + end + if registry.insertQueue and rawget(registry.insertQueue, eventname) and registry.insertQueue[eventname][self] then + registry.insertQueue[eventname][self] = nil + end + end + + -- OPTIONAL: Unregister all callbacks for given selfs/addonIds + if UnregisterAllName then + target[UnregisterAllName] = function(...) + if select("#",...)<1 then + error("Usage: "..UnregisterAllName.."([whatFor]): missing 'self' or \"addonId\" to unregister events for.", 2) + end + if select("#",...)==1 and ...==target then + error("Usage: "..UnregisterAllName.."([whatFor]): supply a meaningful 'self' or \"addonId\"", 2) + end + + + for i=1,select("#",...) do + local self = select(i,...) + if registry.insertQueue then + for eventname, callbacks in pairs(registry.insertQueue) do + if callbacks[self] then + callbacks[self] = nil + end + end + end + for eventname, callbacks in pairs(events) do + if callbacks[self] then + callbacks[self] = nil + -- Fire OnUnused callback? + if registry.OnUnused and not next(callbacks) then + registry.OnUnused(registry, target, eventname) + end + end + end + end + end + end + + return registry +end + + +-- CallbackHandler purposefully does NOT do explicit embedding. Nor does it +-- try to upgrade old implicit embeds since the system is selfcontained and +-- relies on closures to work. + diff --git a/libs/CallbackHandler-1.0/CallbackHandler-1.0.xml b/libs/CallbackHandler-1.0/CallbackHandler-1.0.xml old mode 100644 new mode 100755 index 1aad3a2..876df83 --- a/libs/CallbackHandler-1.0/CallbackHandler-1.0.xml +++ b/libs/CallbackHandler-1.0/CallbackHandler-1.0.xml @@ -1,4 +1,4 @@ -<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ -..\FrameXML\UI.xsd"> - <Script file="CallbackHandler-1.0.lua"/> +<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ +..\FrameXML\UI.xsd"> + <Script file="CallbackHandler-1.0.lua"/> </Ui> \ No newline at end of file diff --git a/libs/LibDataBroker-1.1/LibDataBroker-1.1.lua b/libs/LibDataBroker-1.1/LibDataBroker-1.1.lua old mode 100644 new mode 100755 diff --git a/libs/LibMapData-1.0/library.lua b/libs/LibMapData-1.0/library.lua old mode 100644 new mode 100755 index be2c4fa..a3272bf --- a/libs/LibMapData-1.0/library.lua +++ b/libs/LibMapData-1.0/library.lua @@ -2,7 +2,7 @@ Library contains a dataset for Map file names and floors giving the raw map data it also has a few functions to help determine distance and directions. --]] -local MAJOR, MINOR = "LibMapData-1.0", tonumber("103") or 999 +local MAJOR, MINOR = "LibMapData-1.0", tonumber("108") or 999 assert(LibStub, MAJOR.." requires LibStub") local lib = LibStub:NewLibrary(MAJOR, MINOR) @@ -20,6 +20,12 @@ local atan2 = math.atan2 local PI2 = math.pi*2 local floor = math.floor local type,assert = type,assert +local wowMoP +do + local _, _, _, interface = GetBuildInfo() + wowMoP = (interface >= 50000) +end + --- Constants lib.MAP_NORMAL = 0 lib.MAP_INSTANCE = 1 @@ -235,7 +241,7 @@ do } mapData[141] = { ['floors'] = 0, ['name'] = "Dustwallow", ['rzti'] = 1, ['map_type'] = 0, ['continent'] = 2, ['transform'] = 0, - [1] = {5250.000061035156,3499.999755859375,974.9999389648438,-2033.333251953125,6225.0,-5533.3330078125}, + [1] = {5250.0,3500.0,975.0,-2033.333984375,6225.0,-5533.333984375}, } mapData[161] = { ['floors'] = 0, ['name'] = "Tanaris", ['rzti'] = 1, ['map_type'] = 0, ['continent'] = 2, ['transform'] = 0, @@ -1302,11 +1308,21 @@ do ['floors'] = 0, ['name'] = "DustwallowMarshScenarioAlliance", ['rzti'] = 1000, ['map_type'] = 5, ['continent'] = 0, ['transform'] = 0, [1] = {1058.333984375,706.25,3979.166015625,-3468.75,5037.5,-4175.0}, } + mapData[907] = { + ['floors'] = 0, ['name'] = "Dustwallow_terrain1", ['rzti'] = 1, ['map_type'] = 0, ['continent'] = 2, ['transform'] = 0, + [1] = {5250.0,3500.0,975.0,-2033.333984375,6225.0,-5533.333984375}, + } + -- Dustwallow Transition patch for client that havent been patched + SetMapByID(141) + local dwMap = GetMapInfo() + if dwMap == "DustwallowMarsh" then + mapData[141].name = "Dustwallow" + end -- Create Reverse map for k,v in pairs(mapData) do idToMap[v['name']] = k end - + -- Phasing Hacks for k,v in pairs(idToMap) do local m,e = string.find(k,"_terrain%d") @@ -1351,12 +1367,45 @@ do end SetMapByID(k) local _,l,t,r,b = GetCurrentMapZone() + local floors = GetNumDungeonMapLevels(); + local width, height = 0,0 + width = math.abs((-l) - (-r)) + height = math.abs(t - b) if l and l ~= 0 and t and t~= 0 and r and r ~= 0 and b and b ~= 0 and v.floors == 0 then + if v[1][1] ~= width then + v[1][1] = width + end + if v[1][2] ~= height then + v[1][2] = height + end v[1][3] = -l v[1][4] = t v[1][5] = -r v[1][6] = b end + -- update floor data if we can + if v.floors > 0 and floors > 0 then + for f = 1, floors do + SetDungeonMapLevel(f) + local _, l, t, r, b = GetCurrentMapDungeonLevel() + if l and l ~= 0 and t and t~= 0 and r and r ~= 0 and b and b ~= 0 then + if v[f] == nil then + v[f] = {} + end + local width, height = 0,0 + width = math.abs((-l) - (-r)) + height = math.abs(t - b) + if v[f][3] ~= -l and v[f][4] ~= t and v[f][5] ~= -r and v[f][6] ~= b then + v[f][1] = width + v[f][2] = height + v[f][3] = -l + v[f][4] = t + v[f][5] = -r + v[f][6] = b + end + end + end + end end end diff --git a/libs/LibStub/LibStub.lua b/libs/LibStub/LibStub.lua old mode 100644 new mode 100755