diff --git a/Kungaloosh.toc b/Kungaloosh.toc old mode 100644 new mode 100755 index 268f96f..f75ff4a --- a/Kungaloosh.toc +++ b/Kungaloosh.toc @@ -1,7 +1,7 @@ ## Interface: 40000 ## Title: Kungaloosh ## Notes: Automagic raid marking when tanking -## Version: 1.3 +## Version: 1.4 ## Author: Christopher Rosell ## X-Email: chrippa@gmail.com ## X-Category: Combat @@ -13,14 +13,16 @@ libs\LibStub-1.0\LibStub-1.0.xml libs\CallbackHandler-1.0\CallbackHandler-1.0.xml -libs\AceGUI-3.0\AceGUI-3.0.xml -libs\AceConfig-3.0\AceConfig-3.0.xml +libs\AceAddon-3.0\AceAddon-3.0.xml libs\AceEvent-3.0\AceEvent-3.0.xml +libs\AceConfig-3.0\AceConfig-3.0.xml libs\AceDB-3.0\AceDB-3.0.xml libs\AceDBOptions-3.0\AceDBOptions-3.0.xml +libs\AceGUI-3.0\AceGUI-3.0.xml +libs\AceTimer-3.0\AceTimer-3.0.xml libs\tekKonfigAboutPanel.lua locale\enGB.lua -config.lua kungaloosh.lua +config.lua diff --git a/config.lua b/config.lua old mode 100644 new mode 100755 index 4ce6c3b..ff39943 --- a/config.lua +++ b/config.lua @@ -1,5 +1,6 @@ -local addonname, addon = ... -local L = addon.L +local addonname, addontbl = ... +local addon = Kungaloosh +local L = addontbl.L local options = {} local UpdateIconLists @@ -13,13 +14,13 @@ local function setprofile(info, val) end options.general = { - type = 'group', + type = "group", name = addonname, args = { general = { - name = L['General'], - type = 'group', + name = L["General"], + type = "group", order = 1, inline = true, @@ -28,26 +29,26 @@ options.general = { name = function(info) for k,v in pairs(addon.db.profile.enabled_in) do if v == true then - return L['Kungaloosh will be automatically enabled when getting assigned as tank but can also be manually enabled with the slash command |cff00ff00/kl|r.'] + return L["Kungaloosh will be automatically enabled when getting assigned as tank but can also be manually enabled with the slash command |cff00ff00/kl|r."] end end - return L['Kungaloosh must be manually enabled with the slash command |cff00ff00/kl|r.'] + return L["Kungaloosh must be manually enabled with the slash command |cff00ff00/kl|r."] end, - type = 'description', + type = "description", order = 1 }, - sep = { order = 2, type = 'header', name = '' }, + sep = { order = 2, type = "header", name = "" }, enabled_in = { - name = L['Enable when assigned as tank in a ...'], - desc = L['Enables the addon automatically if you\'re assigned as tank in a dungeon or raid'], - type = 'multiselect', + name = L["Enable when assigned as tank in a ..."], + desc = L["Enables the addon automatically if you\"re assigned as tank in a dungeon or raid"], + type = "multiselect", order = 3, - width = 'half', + width = "half", - values = { dungeon = L['Dungeon'], raid = L['Raid'] }, + values = { dungeon = L["Dungeon"], raid = L["Raid"] }, get = function(info, key) return addon.db.profile.enabled_in[key] end, set = function(info, key, val) addon.db.profile.enabled_in[key] = val end }, @@ -55,76 +56,92 @@ options.general = { }, threat = { - name = L['Threat'], - type = 'group', + name = L["Threat"], + type = "group", order = 2, inline = true, args = { desc = { name = function(info) - return L['Kungaloosh will place a raid target icon on the target when you have done |cffff0000%d|r or more threat to it.']:format(addon:GetMinThreat()) + return L["Kungaloosh will place a raid target icon on the target when you have done |cffff0000%d|r or more threat to it."]:format(addon:GetMinThreat()) end, - type = 'description', + type = "description", order = 1 }, - sep = { order = 2, type = 'header', name = '' }, + sep = { order = 2, type = "header", name = "" }, dynamic_minthreat = { - name = L['Dynamic threat value'], - desc = L['Tries to guess a good threat value based on your level'], - type = 'toggle', + name = L["Dynamic threat value"], + desc = L["Tries to guess a good threat value based on your level"], + type = "toggle", order = 3, set = setprofile, get = getprofile }, minthreat = { - name = L['Manual threat value'], - desc = L['Threat value to have before placing a raid target icon'], - type = 'input', + name = L["Manual threat value"], + desc = L["Threat value to have before placing a raid target icon"], + type = "input", order = 4, set = function(info, val) setprofile(info, tonumber(val)) end, get = function(info) return tostring(getprofile(info)) end, disabled = function(info) return addon.db.profile.dynamic_minthreat end, - validate = function(info, value) if tonumber(value) then return true else return L['Invalid number'] end end + validate = function(info, value) if tonumber(value) then return true else return L["Invalid number"] end end } } }, icons = { - name = L['Icons'], - type = 'group', + name = L["Icons"], + type = "group", order = 3, inline = true, args = { desc = { - name = L['Here you can customize what icons to use and in what order they will be placed. Click on the icon to either add or remove it.'], - type = 'description', + name = L["Here you can customize what icons to use and in what order they will be placed. Click on the icon to either add or remove it."], + type = "description", order = 1 }, - sep = { order = 2, type = 'header', name = '' }, + sep = { order = 2, type = "header", name = "" }, enabled = { - name = L['Enabled'], - type = 'group', + name = L["Enabled"], + type = "group", order = 3, args = {} }, - disabled = { - name = L['Available'], - type = 'group', + disabled = { + name = L["Available"], + type = "group", order = 4, args = {} - } + }, + + icon_reuse_time = { + name = function(info) return L["Reuse icon from dead mob after %d seconds."]:format(getprofile(info)) end, + desc = L["When a mob dies the icon it had will not be reused for a certain amount of time."], + type = "range", + order = 5, + width = "double", + min = 1, + max = 1000, + softMin = 1, + softMax = 15, + step = 1, + + set = setprofile, + get = getprofile + }, }, }, } @@ -147,7 +164,7 @@ end function IconExecuteFunc(info) local state, icon = info[2], tonumber(info[3]) - if state == 'enabled' then + if state == "enabled" then for i,v in ipairs(addon.db.profile.raid_icons) do if v == icon then table.remove(addon.db.profile.raid_icons, i) @@ -162,13 +179,13 @@ end function CreateIconOptions(icon) return { - type = 'execute', - name = _G['RAID_TARGET_'..icon], + type = "execute", + name = _G["RAID_TARGET_"..icon], image = [[Interface\TargetingFrame\UI-RaidTargetingIcons]], imageCoords = { GetRaidTargetCoords(icon) }, imageWidth = 16, imageHeight = 16, - width = 'half', + width = "half", func = IconExecuteFunc } end @@ -201,30 +218,30 @@ function UpdateIconLists() end end - LibStub('AceConfigRegistry-3.0'):NotifyChange(addonname) + LibStub("AceConfigRegistry-3.0"):NotifyChange(addonname) end function addon:CreateConfig() - options.profiles = LibStub('AceDBOptions-3.0'):GetOptionsTable(self.db) + options.profiles = LibStub("AceDBOptions-3.0"):GetOptionsTable(self.db) - LibStub('AceConfig-3.0'):RegisterOptionsTable('Kungaloosh-General', options.general) - LibStub('AceConfig-3.0'):RegisterOptionsTable('Kungaloosh-Profiles', options.profiles) + LibStub("AceConfig-3.0"):RegisterOptionsTable("Kungaloosh-General", options.general) + LibStub("AceConfig-3.0"):RegisterOptionsTable("Kungaloosh-Profiles", options.profiles) - LibStub('AceConfigDialog-3.0'):AddToBlizOptions('Kungaloosh-General', addonname) - LibStub('AceConfigDialog-3.0'):AddToBlizOptions('Kungaloosh-Profiles', 'Profiles', addonname) + LibStub("AceConfigDialog-3.0"):AddToBlizOptions("Kungaloosh-General", addonname) + LibStub("AceConfigDialog-3.0"):AddToBlizOptions("Kungaloosh-Profiles", "Profiles", addonname) - LibStub('tekKonfig-AboutPanel').new(addonname, addonname) + LibStub("tekKonfig-AboutPanel").new(addonname, addonname) for i = 1,8 do iconopts[i] = CreateIconOptions(i) end - self.db.RegisterCallback(self, 'OnNewProfile', UpdateIconLists) - self.db.RegisterCallback(self, 'OnProfileChanged', UpdateIconLists) - self.db.RegisterCallback(self, 'OnProfileCopied', UpdateIconLists) - self.db.RegisterCallback(self, 'OnProfileDeleted', UpdateIconLists) - self.db.RegisterCallback(self, 'OnProfileReset', UpdateIconLists) + self.db.RegisterCallback(self, "OnNewProfile", UpdateIconLists) + self.db.RegisterCallback(self, "OnProfileChanged", UpdateIconLists) + self.db.RegisterCallback(self, "OnProfileCopied", UpdateIconLists) + self.db.RegisterCallback(self, "OnProfileDeleted", UpdateIconLists) + self.db.RegisterCallback(self, "OnProfileReset", UpdateIconLists) UpdateIconLists() end diff --git a/kungaloosh.lua b/kungaloosh.lua old mode 100644 new mode 100755 index 63abdeb..f4b69f5 --- a/kungaloosh.lua +++ b/kungaloosh.lua @@ -1,27 +1,11 @@ -local addonname, addon = ... -local L = addon.L +local addonname, addontbl = ... +local addon = LibStub("AceAddon-3.0"):NewAddon(addonname, "AceEvent-3.0", "AceTimer-3.0") +local L = addontbl.L -local IsCataclysmClient = select(4, GetBuildInfo()) >= 40000 - -function addon:Initialize() - local events = CreateFrame"Frame" - events:SetScript("OnEvent", function(frame, e, ...) - if type(self[e]) == "function" then - self[e](self, ...) - end - end) - - function self:RegisterEvent(...) events:RegisterEvent(...) end - function self:UnregisterEvent(...) events:UnregisterEvent(...) end - - self:RegisterEvent"ADDON_LOADED" - self:RegisterEvent"PLAYER_ROLES_ASSIGNED" - self:RegisterEvent"PLAYER_ENTERING_WORLD" +function addon:OnInitialize() end -function addon:ADDON_LOADED(name) - if addonname ~= name then return end - +function addon:OnEnable() -- DB local defaults = { profile = { @@ -29,6 +13,7 @@ function addon:ADDON_LOADED(name) dynamic_minthreat = true, enabled_in = { dungeon = true, raid = false }, raid_icons = { 8, 7, 1, 2 }, + icon_reuse_time = 10 } } self.db = LibStub("AceDB-3.0"):New("KungalooshDB", defaults, true) @@ -36,6 +21,8 @@ function addon:ADDON_LOADED(name) self:CreateConfig() self:UnregisterEvent"ADDON_LOADED" + self:RegisterEvent"PLAYER_ROLES_ASSIGNED" + self:RegisterEvent"PLAYER_ENTERING_WORLD" self:EnableIfTank() end @@ -56,7 +43,7 @@ function addon:PLAYER_REGEN_ENABLED() self:ResetState() end -function addon:UNIT_THREAT_LIST_UPDATE(unit) +function addon:UNIT_THREAT_LIST_UPDATE(event, unit) if not unit then return end local guid = UnitGUID(unit) @@ -71,11 +58,13 @@ function addon:UNIT_THREAT_LIST_UPDATE(unit) end end -function addon:COMBAT_LOG_EVENT(timestamp, event, sguid, sname, sflags, dguid, dname, dflags) - if event == "UNIT_DIED" then +function addon:COMBAT_LOG_EVENT_UNFILTERED(event, timestamp, cevent, hidecaster, + sguid, sname, sflags, sflags2, + dguid, dname, dflags, dflags2) + if cevent == "UNIT_DIED" then local icon = self:GetRaidIconByGUID(dguid) if icon then - self.iconguids[icon] = nil + self:ScheduleTimer("ResetIcon", self.db.profile.icon_reuse_time, icon) end end end @@ -108,7 +97,9 @@ end function addon:RAID_TARGET_UPDATE() CheckUnit"player" + CheckUnit"focus" CheckUnit"target" + CheckUnit"targettarget" CheckUnit"pet" CheckUnit"pettarget" @@ -124,10 +115,16 @@ function addon:RAID_TARGET_UPDATE() end function addon:ResetState() + self:CancelAllTimers() + self.iconguids = self.iconguids or {} table.wipe(self.iconguids) end +function addon:ResetIcon(icon) + self.iconguids[icon] = nil +end + function addon:GetRaidIconByGUID(guid) for icon, iguid in pairs(self.iconguids) do if guid == iguid then @@ -151,29 +148,29 @@ end function addon:GetMinThreat() if self.db.profile.dynamic_minthreat then local level = UnitLevel"player" + local multiplier = (level > 80 and 3.0) or 1.2 - return (level * level) * 1.2 + return (level * level) * multiplier else return self.db.profile.minthreat end end function addon:EnableIfTank() - if self.db.profile.enabled_in.dungeon then - local istank - if IsCataclysmClient then - istank = UnitGroupRolesAssigned"player" == "TANK" - else - istank, _, _ = UnitGroupRolesAssigned"player" + local istank = (UnitGroupRolesAssigned"player" == "TANK") or (GetPartyAssignment("MAINTANK", "player") == 1) + + if istank then + local enable = false + + if self.db.profile.enabled_in.dungeon and not UnitInRaid"player" then + enable = true end - if istank then - return self:Enable(L["is now enabled since you are assigned as a tank"]) + if self.db.profile.enabled_in.raid and UnitInRaid"player" then + enable = true end - end - if self.db.profile.enabled_in.raid then - if GetPartyAssignment("MAINTANK", "player") == 1 then + if enable then return self:Enable(L["is now enabled since you are assigned as a tank"]) end end @@ -187,7 +184,7 @@ function addon:Enable(msg) self:RegisterEvent"PLAYER_REGEN_ENABLED" self:RegisterEvent"UNIT_THREAT_LIST_UPDATE" self:RegisterEvent"RAID_TARGET_UPDATE" - self:RegisterEvent"COMBAT_LOG_EVENT" + self:RegisterEvent"COMBAT_LOG_EVENT_UNFILTERED" self.enabled = true self:ResetState() @@ -201,7 +198,7 @@ function addon:Disable(msg) self:UnregisterEvent"PLAYER_REGEN_ENABLED" self:UnregisterEvent"UNIT_THREAT_LIST_UPDATE" self:UnregisterEvent"RAID_TARGET_UPDATE" - self:UnregisterEvent"COMBAT_LOG_EVENT" + self:UnregisterEvent"COMBAT_LOG_EVENT_UNFILTERED" self.enabled = false if msg then self:Print(msg) end @@ -219,7 +216,6 @@ function SlashCmdList.KUNGALOOSH() addon:Toggle() end -addon:Initialize() - _G["SLASH_KUNGALOOSH1"] = "/kungaloosh" _G["SLASH_KUNGALOOSH2"] = "/kl" +_G["Kungaloosh"] = addon diff --git a/libs/AceAddon-3.0/AceAddon-3.0.lua b/libs/AceAddon-3.0/AceAddon-3.0.lua new file mode 100755 index 0000000..ceb49e0 --- /dev/null +++ b/libs/AceAddon-3.0/AceAddon-3.0.lua @@ -0,0 +1,658 @@ +--- **AceAddon-3.0** provides a template for creating addon objects. +-- It'll provide you with a set of callback functions that allow you to simplify the loading +-- process of your addon.\\ +-- Callbacks provided are:\\ +-- * **OnInitialize**, which is called directly after the addon is fully loaded. +-- * **OnEnable** which gets called during the PLAYER_LOGIN event, when most of the data provided by the game is already present. +-- * **OnDisable**, which is only called when your addon is manually being disabled. +-- @usage +-- -- A small (but complete) addon, that doesn't do anything, +-- -- but shows usage of the callbacks. +-- local MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon") +-- +-- function MyAddon:OnInitialize() +-- -- do init tasks here, like loading the Saved Variables, +-- -- or setting up slash commands. +-- end +-- +-- function MyAddon:OnEnable() +-- -- Do more initialization here, that really enables the use of your addon. +-- -- Register Events, Hook functions, Create Frames, Get information from +-- -- the game that wasn't available in OnInitialize +-- end +-- +-- function MyAddon:OnDisable() +-- -- Unhook, Unregister Events, Hide frames that you created. +-- -- You would probably only use an OnDisable if you want to +-- -- build a "standby" mode, or be able to toggle modules on/off. +-- end +-- @class file +-- @name AceAddon-3.0.lua +-- @release $Id: AceAddon-3.0.lua 980 2010-10-27 14:20:11Z nevcairiel $ + +local MAJOR, MINOR = "AceAddon-3.0", 10 +local AceAddon, oldminor = LibStub:NewLibrary(MAJOR, MINOR) + +if not AceAddon then return end -- No Upgrade needed. + +AceAddon.frame = AceAddon.frame or CreateFrame("Frame", "AceAddon30Frame") -- Our very own frame +AceAddon.addons = AceAddon.addons or {} -- addons in general +AceAddon.statuses = AceAddon.statuses or {} -- statuses of addon. +AceAddon.initializequeue = AceAddon.initializequeue or {} -- addons that are new and not initialized +AceAddon.enablequeue = AceAddon.enablequeue or {} -- addons that are initialized and waiting to be enabled +AceAddon.embeds = AceAddon.embeds or setmetatable({}, {__index = function(tbl, key) tbl[key] = {} return tbl[key] end }) -- contains a list of libraries embedded in an addon + +-- Lua APIs +local tinsert, tconcat, tremove = table.insert, table.concat, table.remove +local fmt, tostring = string.format, tostring +local select, pairs, next, type, unpack = select, pairs, next, type, unpack +local loadstring, assert, error = loadstring, assert, error +local setmetatable, getmetatable, rawset, rawget = setmetatable, getmetatable, rawset, rawget + +-- 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, IsLoggedIn, geterrorhandler + +--[[ + 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, ...) + -- we check to see if the func is passed is actually a function here and don't error when it isn't + -- this safecall is used for optional functions like OnInitialize OnEnable etc. When they are not + -- present execution should continue without hinderance + if type(func) == "function" then + return Dispatchers[select('#', ...)](func, ...) + end +end + +-- local functions that will be implemented further down +local Enable, Disable, EnableModule, DisableModule, Embed, NewModule, GetModule, GetName, SetDefaultModuleState, SetDefaultModuleLibraries, SetEnabledState, SetDefaultModulePrototype + +-- used in the addon metatable +local function addontostring( self ) return self.name end + +--- Create a new AceAddon-3.0 addon. +-- Any libraries you specified will be embeded, and the addon will be scheduled for +-- its OnInitialize and OnEnable callbacks. +-- The final addon object, with all libraries embeded, will be returned. +-- @paramsig [object ,]name[, lib, ...] +-- @param object Table to use as a base for the addon (optional) +-- @param name Name of the addon object to create +-- @param lib List of libraries to embed into the addon +-- @usage +-- -- Create a simple addon object +-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon", "AceEvent-3.0") +-- +-- -- Create a Addon object based on the table of a frame +-- local MyFrame = CreateFrame("Frame") +-- MyAddon = LibStub("AceAddon-3.0"):NewAddon(MyFrame, "MyAddon", "AceEvent-3.0") +function AceAddon:NewAddon(objectorname, ...) + local object,name + local i=1 + if type(objectorname)=="table" then + object=objectorname + name=... + i=2 + else + name=objectorname + end + if type(name)~="string" then + error(("Usage: NewAddon([object,] name, [lib, lib, lib, ...]): 'name' - string expected got '%s'."):format(type(name)), 2) + end + if self.addons[name] then + error(("Usage: NewAddon([object,] name, [lib, lib, lib, ...]): 'name' - Addon '%s' already exists."):format(name), 2) + end + + object = object or {} + object.name = name + + local addonmeta = {} + local oldmeta = getmetatable(object) + if oldmeta then + for k, v in pairs(oldmeta) do addonmeta[k] = v end + end + addonmeta.__tostring = addontostring + + setmetatable( object, addonmeta ) + self.addons[name] = object + object.modules = {} + object.orderedModules = {} + object.defaultModuleLibraries = {} + Embed( object ) -- embed NewModule, GetModule methods + self:EmbedLibraries(object, select(i,...)) + + -- add to queue of addons to be initialized upon ADDON_LOADED + tinsert(self.initializequeue, object) + return object +end + + +--- Get the addon object by its name from the internal AceAddon registry. +-- Throws an error if the addon object cannot be found (except if silent is set). +-- @param name unique name of the addon object +-- @param silent if true, the addon is optional, silently return nil if its not found +-- @usage +-- -- Get the Addon +-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon") +function AceAddon:GetAddon(name, silent) + if not silent and not self.addons[name] then + error(("Usage: GetAddon(name): 'name' - Cannot find an AceAddon '%s'."):format(tostring(name)), 2) + end + return self.addons[name] +end + +-- - Embed a list of libraries into the specified addon. +-- This function will try to embed all of the listed libraries into the addon +-- and error if a single one fails. +-- +-- **Note:** This function is for internal use by :NewAddon/:NewModule +-- @paramsig addon, [lib, ...] +-- @param addon addon object to embed the libs in +-- @param lib List of libraries to embed into the addon +function AceAddon:EmbedLibraries(addon, ...) + for i=1,select("#", ... ) do + local libname = select(i, ...) + self:EmbedLibrary(addon, libname, false, 4) + end +end + +-- - Embed a library into the addon object. +-- This function will check if the specified library is registered with LibStub +-- and if it has a :Embed function to call. It'll error if any of those conditions +-- fails. +-- +-- **Note:** This function is for internal use by :EmbedLibraries +-- @paramsig addon, libname[, silent[, offset]] +-- @param addon addon object to embed the library in +-- @param libname name of the library to embed +-- @param silent marks an embed to fail silently if the library doesn't exist (optional) +-- @param offset will push the error messages back to said offset, defaults to 2 (optional) +function AceAddon:EmbedLibrary(addon, libname, silent, offset) + local lib = LibStub:GetLibrary(libname, true) + if not lib and not silent then + error(("Usage: EmbedLibrary(addon, libname, silent, offset): 'libname' - Cannot find a library instance of %q."):format(tostring(libname)), offset or 2) + elseif lib and type(lib.Embed) == "function" then + lib:Embed(addon) + tinsert(self.embeds[addon], libname) + return true + elseif lib then + error(("Usage: EmbedLibrary(addon, libname, silent, offset): 'libname' - Library '%s' is not Embed capable"):format(libname), offset or 2) + end +end + +--- Return the specified module from an addon object. +-- Throws an error if the addon object cannot be found (except if silent is set) +-- @name //addon//:GetModule +-- @paramsig name[, silent] +-- @param name unique name of the module +-- @param silent if true, the module is optional, silently return nil if its not found (optional) +-- @usage +-- -- Get the Addon +-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon") +-- -- Get the Module +-- MyModule = MyAddon:GetModule("MyModule") +function GetModule(self, name, silent) + if not self.modules[name] and not silent then + error(("Usage: GetModule(name, silent): 'name' - Cannot find module '%s'."):format(tostring(name)), 2) + end + return self.modules[name] +end + +local function IsModuleTrue(self) return true end + +--- Create a new module for the addon. +-- The new module can have its own embeded libraries and/or use a module prototype to be mixed into the module.\\ +-- A module has the same functionality as a real addon, it can have modules of its own, and has the same API as +-- an addon object. +-- @name //addon//:NewModule +-- @paramsig name[, prototype|lib[, lib, ...]] +-- @param name unique name of the module +-- @param prototype object to derive this module from, methods and values from this table will be mixed into the module (optional) +-- @param lib List of libraries to embed into the addon +-- @usage +-- -- Create a module with some embeded libraries +-- MyModule = MyAddon:NewModule("MyModule", "AceEvent-3.0", "AceHook-3.0") +-- +-- -- Create a module with a prototype +-- local prototype = { OnEnable = function(self) print("OnEnable called!") end } +-- MyModule = MyAddon:NewModule("MyModule", prototype, "AceEvent-3.0", "AceHook-3.0") +function NewModule(self, name, prototype, ...) + if type(name) ~= "string" then error(("Usage: NewModule(name, [prototype, [lib, lib, lib, ...]): 'name' - string expected got '%s'."):format(type(name)), 2) end + if type(prototype) ~= "string" and type(prototype) ~= "table" and type(prototype) ~= "nil" then error(("Usage: NewModule(name, [prototype, [lib, lib, lib, ...]): 'prototype' - table (prototype), string (lib) or nil expected got '%s'."):format(type(prototype)), 2) end + + if self.modules[name] then error(("Usage: NewModule(name, [prototype, [lib, lib, lib, ...]): 'name' - Module '%s' already exists."):format(name), 2) end + + -- modules are basically addons. We treat them as such. They will be added to the initializequeue properly as well. + -- NewModule can only be called after the parent addon is present thus the modules will be initialized after their parent is. + local module = AceAddon:NewAddon(fmt("%s_%s", self.name or tostring(self), name)) + + module.IsModule = IsModuleTrue + module:SetEnabledState(self.defaultModuleState) + module.moduleName = name + + if type(prototype) == "string" then + AceAddon:EmbedLibraries(module, prototype, ...) + else + AceAddon:EmbedLibraries(module, ...) + end + AceAddon:EmbedLibraries(module, unpack(self.defaultModuleLibraries)) + + if not prototype or type(prototype) == "string" then + prototype = self.defaultModulePrototype or nil + end + + if type(prototype) == "table" then + local mt = getmetatable(module) + mt.__index = prototype + setmetatable(module, mt) -- More of a Base class type feel. + end + + safecall(self.OnModuleCreated, self, module) -- Was in Ace2 and I think it could be a cool thing to have handy. + self.modules[name] = module + tinsert(self.orderedModules, module) + + return module +end + +--- Returns the real name of the addon or module, without any prefix. +-- @name //addon//:GetName +-- @paramsig +-- @usage +-- print(MyAddon:GetName()) +-- -- prints "MyAddon" +function GetName(self) + return self.moduleName or self.name +end + +--- Enables the Addon, if possible, return true or false depending on success. +-- This internally calls AceAddon:EnableAddon(), thus dispatching a OnEnable callback +-- and enabling all modules of the addon (unless explicitly disabled).\\ +-- :Enable() also sets the internal `enableState` variable to true +-- @name //addon//:Enable +-- @paramsig +-- @usage +-- -- Enable MyModule +-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon") +-- MyModule = MyAddon:GetModule("MyModule") +-- MyModule:Enable() +function Enable(self) + self:SetEnabledState(true) + return AceAddon:EnableAddon(self) +end + +--- Disables the Addon, if possible, return true or false depending on success. +-- This internally calls AceAddon:DisableAddon(), thus dispatching a OnDisable callback +-- and disabling all modules of the addon.\\ +-- :Disable() also sets the internal `enableState` variable to false +-- @name //addon//:Disable +-- @paramsig +-- @usage +-- -- Disable MyAddon +-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon") +-- MyAddon:Disable() +function Disable(self) + self:SetEnabledState(false) + return AceAddon:DisableAddon(self) +end + +--- Enables the Module, if possible, return true or false depending on success. +-- Short-hand function that retrieves the module via `:GetModule` and calls `:Enable` on the module object. +-- @name //addon//:EnableModule +-- @paramsig name +-- @usage +-- -- Enable MyModule using :GetModule +-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon") +-- MyModule = MyAddon:GetModule("MyModule") +-- MyModule:Enable() +-- +-- -- Enable MyModule using the short-hand +-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon") +-- MyAddon:EnableModule("MyModule") +function EnableModule(self, name) + local module = self:GetModule( name ) + return module:Enable() +end + +--- Disables the Module, if possible, return true or false depending on success. +-- Short-hand function that retrieves the module via `:GetModule` and calls `:Disable` on the module object. +-- @name //addon//:DisableModule +-- @paramsig name +-- @usage +-- -- Disable MyModule using :GetModule +-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon") +-- MyModule = MyAddon:GetModule("MyModule") +-- MyModule:Disable() +-- +-- -- Disable MyModule using the short-hand +-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon") +-- MyAddon:DisableModule("MyModule") +function DisableModule(self, name) + local module = self:GetModule( name ) + return module:Disable() +end + +--- Set the default libraries to be mixed into all modules created by this object. +-- Note that you can only change the default module libraries before any module is created. +-- @name //addon//:SetDefaultModuleLibraries +-- @paramsig lib[, lib, ...] +-- @param lib List of libraries to embed into the addon +-- @usage +-- -- Create the addon object +-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon") +-- -- Configure default libraries for modules (all modules need AceEvent-3.0) +-- MyAddon:SetDefaultModuleLibraries("AceEvent-3.0") +-- -- Create a module +-- MyModule = MyAddon:NewModule("MyModule") +function SetDefaultModuleLibraries(self, ...) + if next(self.modules) then + error("Usage: SetDefaultModuleLibraries(...): cannot change the module defaults after a module has been registered.", 2) + end + self.defaultModuleLibraries = {...} +end + +--- Set the default state in which new modules are being created. +-- Note that you can only change the default state before any module is created. +-- @name //addon//:SetDefaultModuleState +-- @paramsig state +-- @param state Default state for new modules, true for enabled, false for disabled +-- @usage +-- -- Create the addon object +-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon") +-- -- Set the default state to "disabled" +-- MyAddon:SetDefaultModuleState(false) +-- -- Create a module and explicilty enable it +-- MyModule = MyAddon:NewModule("MyModule") +-- MyModule:Enable() +function SetDefaultModuleState(self, state) + if next(self.modules) then + error("Usage: SetDefaultModuleState(state): cannot change the module defaults after a module has been registered.", 2) + end + self.defaultModuleState = state +end + +--- Set the default prototype to use for new modules on creation. +-- Note that you can only change the default prototype before any module is created. +-- @name //addon//:SetDefaultModulePrototype +-- @paramsig prototype +-- @param prototype Default prototype for the new modules (table) +-- @usage +-- -- Define a prototype +-- local prototype = { OnEnable = function(self) print("OnEnable called!") end } +-- -- Set the default prototype +-- MyAddon:SetDefaultModulePrototype(prototype) +-- -- Create a module and explicitly Enable it +-- MyModule = MyAddon:NewModule("MyModule") +-- MyModule:Enable() +-- -- should print "OnEnable called!" now +-- @see NewModule +function SetDefaultModulePrototype(self, prototype) + if next(self.modules) then + error("Usage: SetDefaultModulePrototype(prototype): cannot change the module defaults after a module has been registered.", 2) + end + if type(prototype) ~= "table" then + error(("Usage: SetDefaultModulePrototype(prototype): 'prototype' - table expected got '%s'."):format(type(prototype)), 2) + end + self.defaultModulePrototype = prototype +end + +--- Set the state of an addon or module +-- This should only be called before any enabling actually happend, e.g. in/before OnInitialize. +-- @name //addon//:SetEnabledState +-- @paramsig state +-- @param state the state of an addon or module (enabled=true, disabled=false) +function SetEnabledState(self, state) + self.enabledState = state +end + + +--- Return an iterator of all modules associated to the addon. +-- @name //addon//:IterateModules +-- @paramsig +-- @usage +-- -- Enable all modules +-- for name, module in MyAddon:IterateModules() do +-- module:Enable() +-- end +local function IterateModules(self) return pairs(self.modules) end + +-- Returns an iterator of all embeds in the addon +-- @name //addon//:IterateEmbeds +-- @paramsig +local function IterateEmbeds(self) return pairs(AceAddon.embeds[self]) end + +--- Query the enabledState of an addon. +-- @name //addon//:IsEnabled +-- @paramsig +-- @usage +-- if MyAddon:IsEnabled() then +-- MyAddon:Disable() +-- end +local function IsEnabled(self) return self.enabledState end +local mixins = { + NewModule = NewModule, + GetModule = GetModule, + Enable = Enable, + Disable = Disable, + EnableModule = EnableModule, + DisableModule = DisableModule, + IsEnabled = IsEnabled, + SetDefaultModuleLibraries = SetDefaultModuleLibraries, + SetDefaultModuleState = SetDefaultModuleState, + SetDefaultModulePrototype = SetDefaultModulePrototype, + SetEnabledState = SetEnabledState, + IterateModules = IterateModules, + IterateEmbeds = IterateEmbeds, + GetName = GetName, +} +local function IsModule(self) return false end +local pmixins = { + defaultModuleState = true, + enabledState = true, + IsModule = IsModule, +} +-- Embed( target ) +-- target (object) - target object to embed aceaddon in +-- +-- this is a local function specifically since it's meant to be only called internally +function Embed(target, skipPMixins) + for k, v in pairs(mixins) do + target[k] = v + end + if not skipPMixins then + for k, v in pairs(pmixins) do + target[k] = target[k] or v + end + end +end + + +-- - Initialize the addon after creation. +-- This function is only used internally during the ADDON_LOADED event +-- It will call the **OnInitialize** function on the addon object (if present), +-- and the **OnEmbedInitialize** function on all embeded libraries. +-- +-- **Note:** Do not call this function manually, unless you're absolutely sure that you know what you are doing. +-- @param addon addon object to intialize +function AceAddon:InitializeAddon(addon) + safecall(addon.OnInitialize, addon) + + local embeds = self.embeds[addon] + for i = 1, #embeds do + local lib = LibStub:GetLibrary(embeds[i], true) + if lib then safecall(lib.OnEmbedInitialize, lib, addon) end + end + + -- we don't call InitializeAddon on modules specifically, this is handled + -- from the event handler and only done _once_ +end + +-- - Enable the addon after creation. +-- Note: This function is only used internally during the PLAYER_LOGIN event, or during ADDON_LOADED, +-- if IsLoggedIn() already returns true at that point, e.g. for LoD Addons. +-- It will call the **OnEnable** function on the addon object (if present), +-- and the **OnEmbedEnable** function on all embeded libraries.\\ +-- This function does not toggle the enable state of the addon itself, and will return early if the addon is disabled. +-- +-- **Note:** Do not call this function manually, unless you're absolutely sure that you know what you are doing. +-- Use :Enable on the addon itself instead. +-- @param addon addon object to enable +function AceAddon:EnableAddon(addon) + if type(addon) == "string" then addon = AceAddon:GetAddon(addon) end + if self.statuses[addon.name] or not addon.enabledState then return false end + + -- set the statuses first, before calling the OnEnable. this allows for Disabling of the addon in OnEnable. + self.statuses[addon.name] = true + + safecall(addon.OnEnable, addon) + + -- make sure we're still enabled before continueing + if self.statuses[addon.name] then + local embeds = self.embeds[addon] + for i = 1, #embeds do + local lib = LibStub:GetLibrary(embeds[i], true) + if lib then safecall(lib.OnEmbedEnable, lib, addon) end + end + + -- enable possible modules. + local modules = addon.orderedModules + for i = 1, #modules do + self:EnableAddon(modules[i]) + end + end + return self.statuses[addon.name] -- return true if we're disabled +end + +-- - Disable the addon +-- Note: This function is only used internally. +-- It will call the **OnDisable** function on the addon object (if present), +-- and the **OnEmbedDisable** function on all embeded libraries.\\ +-- This function does not toggle the enable state of the addon itself, and will return early if the addon is still enabled. +-- +-- **Note:** Do not call this function manually, unless you're absolutely sure that you know what you are doing. +-- Use :Disable on the addon itself instead. +-- @param addon addon object to enable +function AceAddon:DisableAddon(addon) + if type(addon) == "string" then addon = AceAddon:GetAddon(addon) end + if not self.statuses[addon.name] then return false end + + -- set statuses first before calling OnDisable, this allows for aborting the disable in OnDisable. + self.statuses[addon.name] = false + + safecall( addon.OnDisable, addon ) + + -- make sure we're still disabling... + if not self.statuses[addon.name] then + local embeds = self.embeds[addon] + for i = 1, #embeds do + local lib = LibStub:GetLibrary(embeds[i], true) + if lib then safecall(lib.OnEmbedDisable, lib, addon) end + end + -- disable possible modules. + local modules = addon.orderedModules + for i = 1, #modules do + self:DisableAddon(modules[i]) + end + end + + return not self.statuses[addon.name] -- return true if we're disabled +end + +--- Get an iterator over all registered addons. +-- @usage +-- -- Print a list of all installed AceAddon's +-- for name, addon in AceAddon:IterateAddons() do +-- print("Addon: " .. name) +-- end +function AceAddon:IterateAddons() return pairs(self.addons) end + +--- Get an iterator over the internal status registry. +-- @usage +-- -- Print a list of all enabled addons +-- for name, status in AceAddon:IterateAddonStatus() do +-- if status then +-- print("EnabledAddon: " .. name) +-- end +-- end +function AceAddon:IterateAddonStatus() return pairs(self.statuses) end + +-- Following Iterators are deprecated, and their addon specific versions should be used +-- e.g. addon:IterateEmbeds() instead of :IterateEmbedsOnAddon(addon) +function AceAddon:IterateEmbedsOnAddon(addon) return pairs(self.embeds[addon]) end +function AceAddon:IterateModulesOfAddon(addon) return pairs(addon.modules) end + +-- Event Handling +local function onEvent(this, event, arg1) + if event == "ADDON_LOADED" or event == "PLAYER_LOGIN" then + -- if a addon loads another addon, recursion could happen here, so we need to validate the table on every iteration + while(#AceAddon.initializequeue > 0) do + local addon = tremove(AceAddon.initializequeue, 1) + -- this might be an issue with recursion - TODO: validate + if event == "ADDON_LOADED" then addon.baseName = arg1 end + AceAddon:InitializeAddon(addon) + tinsert(AceAddon.enablequeue, addon) + end + + if IsLoggedIn() then + while(#AceAddon.enablequeue > 0) do + local addon = tremove(AceAddon.enablequeue, 1) + AceAddon:EnableAddon(addon) + end + end + end +end + +AceAddon.frame:RegisterEvent("ADDON_LOADED") +AceAddon.frame:RegisterEvent("PLAYER_LOGIN") +AceAddon.frame:SetScript("OnEvent", onEvent) + +-- upgrade embeded +for name, addon in pairs(AceAddon.addons) do + Embed(addon, true) +end + +-- 2010-10-27 nevcairiel - add new "orderedModules" table +if oldminor and oldminor < 10 then + for name, addon in pairs(AceAddon.addons) do + addon.orderedModules = {} + for module_name, module in pairs(addon.modules) do + tinsert(addon.orderedModules, module) + end + end +end diff --git a/libs/AceAddon-3.0/AceAddon-3.0.xml b/libs/AceAddon-3.0/AceAddon-3.0.xml new file mode 100755 index 0000000..17c568c --- /dev/null +++ b/libs/AceAddon-3.0/AceAddon-3.0.xml @@ -0,0 +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="AceAddon-3.0.lua"/> +</Ui> \ No newline at end of file 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 b66022d..f4a17cb --- a/libs/AceConfig-3.0/AceConfig-3.0.lua +++ b/libs/AceConfig-3.0/AceConfig-3.0.lua @@ -3,7 +3,7 @@ -- as well as associate it with a slash command. -- @class file -- @name AceConfig-3.0 --- @release $Id: AceConfig-3.0.lua 877 2009-11-02 15:56:50Z nevcairiel $ +-- @release $Id: AceConfig-3.0.lua 969 2010-10-07 02:11:48Z shefki $ --[[ AceConfig-3.0 @@ -19,8 +19,8 @@ if not AceConfig then return end local cfgreg = LibStub("AceConfigRegistry-3.0") local cfgcmd = LibStub("AceConfigCmd-3.0") -local cfgdlg = LibStub("AceConfigDialog-3.0") ---TODO: local cfgdrp = LibStub("AceConfigDropdown-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 @@ -36,7 +36,7 @@ local pcall, error, type, pairs = pcall, error, type, pairs -- 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) +-- @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") 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 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 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 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 acad844..45f0117 --- 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,10 +1,10 @@ --- 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 913 2010-02-13 12:16:13Z nevcairiel $ +-- @release $Id: AceConfigDialog-3.0.lua 998 2010-12-01 18:39:53Z nevcairiel $ local LibStub = LibStub -local MAJOR, MINOR = "AceConfigDialog-3.0", 45 +local MAJOR, MINOR = "AceConfigDialog-3.0", 54 local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR) if not AceConfigDialog then return end @@ -15,6 +15,7 @@ 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") @@ -23,8 +24,8 @@ local reg = LibStub("AceConfigRegistry-3.0") 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 = pairs, next, select, type, unpack -local rawset, tostring = rawset, tostring +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 @@ -76,7 +77,7 @@ Dispatchers[0] = function(func) end local function safecall(func, ...) - return Dispatchers[select('#', ...)](func, ...) + return Dispatchers[select("#", ...)](func, ...) end local width_multiplier = 170 @@ -103,7 +104,7 @@ Group Types local new, del, copy --newcount, delcount,createdcount,cached = 0,0,0 do - local pool = setmetatable({},{__mode='k'}) + local pool = setmetatable({},{__mode="k"}) function new() --newcount = newcount + 1 local t = next(pool) @@ -124,9 +125,7 @@ do end function del(t) --delcount = delcount + 1 - for k in pairs(t) do - t[k] = nil - end + wipe(t) pool[t] = true end -- function cached() @@ -240,7 +239,7 @@ local function GetOptionsMemberValue(membername, option, options, path, appName, info.handler = handler info.option = option info.type = option.type - info.uiType = 'dialog' + info.uiType = "dialog" info.uiName = MAJOR local a, b, c ,d @@ -321,8 +320,8 @@ local function compareOptions(a,b) 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 "" + 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 @@ -423,6 +422,9 @@ local function CleanUserData(widget, event) if user.grouplist then del(user.grouplist) end + if user.orderlist then + del(user.orderlist) + end end end @@ -478,7 +480,7 @@ function AceConfigDialog:SelectGroup(appName, ...) local treevalue local treestatus - for n = 1, select('#',...) do + for n = 1, select("#",...) do local key = select(n, ...) if group.childGroups == "tab" or group.childGroups == "select" then @@ -542,7 +544,7 @@ local function OptionOnMouseOver(widget, event) GameTooltip:SetText(name, 1, .82, 0, 1) - if opt.type == 'multiselect' then + if opt.type == "multiselect" then GameTooltip:AddLine(user.text,0.5, 0.5, 0.8, 1) end if type(desc) == "string" then @@ -561,10 +563,10 @@ end local function GetFuncName(option) local type = option.type - if type == 'execute' then - return 'func' + if type == "execute" then + return "func" else - return 'set' + return "set" end end local function confirmPopup(appName, rootframe, basepath, info, message, func, ...) @@ -594,7 +596,7 @@ local function confirmPopup(appName, rootframe, basepath, info, message, func, . AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl)) del(info) end - for i = 1, select('#', ...) do + for i = 1, select("#", ...) do t[i] = select(i, ...) or false end t.timeout = 0 @@ -653,7 +655,7 @@ local function ActivateControl(widget, event, ...) info.handler = handler info.option = option info.type = option.type - info.uiType = 'dialog' + info.uiType = "dialog" info.uiName = MAJOR local name @@ -764,13 +766,13 @@ local function ActivateControl(widget, event, ...) end end - local iscustom = user.rootframe:GetUserData('iscustom') + local iscustom = user.rootframe:GetUserData("iscustom") local rootframe if iscustom then rootframe = user.rootframe end - local basepath = user.rootframe:GetUserData('basepath') + 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, ...) @@ -798,8 +800,8 @@ local function ActivateControl(widget, event, ...) - local iscustom = user.rootframe:GetUserData('iscustom') - local basepath = user.rootframe:GetUserData('basepath') or emptyTbl + 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 @@ -834,22 +836,27 @@ local function ActivateControl(widget, event, ...) end local function ActivateSlider(widget, event, value) - local option = widget:GetUserData('option') - local min, max, step = option.min or 0, option.max or 100, option.step - if step then - value = math_floor((value - min) / step + 0.5) * step + min + 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 - value = math_max(math_min(value,max),min) 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'), ...) + ActivateControl(widget, event, widget:GetUserData("value"), ...) local user = widget:GetUserDataTable() - local iscustom = user.rootframe:GetUserData('iscustom') - local basepath = user.rootframe:GetUserData('basepath') or emptyTbl + 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 @@ -860,8 +867,8 @@ 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 + 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 @@ -871,7 +878,7 @@ local function MultiControlOnClosed(widget, event, ...) end local function FrameOnClose(widget, event) - local appName = widget:GetUserData('appName') + local appName = widget:GetUserData("appName") AceConfigDialog.OpenFrames[appName] = nil gui:Release(widget) end @@ -927,6 +934,7 @@ end ]] local function BuildSelect(group, options, path, appName) local groups = new() + local order = new() local keySort = new() local opts = new() @@ -941,15 +949,16 @@ local function BuildSelect(group, options, path, appName) 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(keySort) del(opts) + del(keySort) - return groups + return groups, order end local function BuildSubGroups(group, tree, options, path, appName) @@ -1082,7 +1091,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin local imageCoords = GetOptionsMemberValue("imageCoords",v, options, path, appName) local image, width, height = GetOptionsMemberValue("image",v, options, path, appName) - if type(image) == 'string' then + if type(image) == "string" then control = gui:Create("Icon") if not width then width = GetOptionsMemberValue("imageWidth",v, options, path, appName) @@ -1090,7 +1099,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin if not height then height = GetOptionsMemberValue("imageHeight",v, options, path, appName) end - if type(imageCoords) == 'table' then + if type(imageCoords) == "table" then control:SetImage(image, unpack(imageCoords)) else control:SetImage(image) @@ -1117,12 +1126,8 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin control = gui:Create(v.multiline and "MultiLineEditBox" or "EditBox") end - if v.multiline then - local lines = 4 - if type(v.multiline) == "number" then - lines = v.multiline - end - control:SetHeight(60 + (14*lines)) + if v.multiline and control.SetNumLines then + control:SetNumLines(tonumber(v.multiline) or 4) end control:SetLabel(name) control:SetCallback("OnEnterPressed",ActivateControl) @@ -1148,8 +1153,8 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin 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 + if type(image) == "string" then + if type(imageCoords) == "table" then control:SetImage(image, unpack(imageCoords)) else control:SetImage(image) @@ -1158,7 +1163,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin elseif v.type == "range" then control = gui:Create("Slider") control:SetLabel(name) - control:SetSliderValues(v.min or 0,v.max or 100, v.bigStep or v.step or 0) + 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 @@ -1170,20 +1175,60 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin elseif v.type == "select" then local values = GetOptionsMemberValue("values", v, options, path, appName) - 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 - control:SetLabel(name) - control:SetList(values) - local value = GetOptionsMemberValue("get",v, options, path, appName) - if not values[value] then - value = nil + 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 - control:SetValue(value) - control:SetCallback("OnValueChanged",ActivateControl) elseif v.type == "multiselect" then local values = GetOptionsMemberValue("values", v, options, path, appName) @@ -1241,8 +1286,8 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin local text = values[value] local check = gui:Create("CheckBox") check:SetLabel(text) - check:SetUserData('value', value) - check:SetUserData('text', 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)) @@ -1302,14 +1347,14 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin local imageCoords = GetOptionsMemberValue("imageCoords",v, options, path, appName) local image, width, height = GetOptionsMemberValue("image",v, options, path, appName) - if type(image) == 'string' then + 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 + if type(imageCoords) == "table" then control:SetImage(image, unpack(imageCoords)) else control:SetImage(image) @@ -1360,7 +1405,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin end local function BuildPath(path, ...) - for i = 1, select('#',...) do + for i = 1, select("#",...) do tinsert(path, (select(i,...))) end end @@ -1488,17 +1533,13 @@ function AceConfigDialog:FeedGroup(appName,options,container,rootframe,path, isR local grouptype, parenttype = options.childGroups, "none" - --temp path table to pass to callbacks as we traverse the tree - local temppath = new() for i = 1, #path do local v = path[i] - temppath[i] = v group = GetSubOption(group, v) inline = inline or pickfirstset(v.dialogInline,v.guiInline,v.inline, false) parenttype = grouptype grouptype = group.childGroups end - del(temppath) if not parenttype then parenttype = "tree" @@ -1591,16 +1632,12 @@ function AceConfigDialog:FeedGroup(appName,options,container,rootframe,path, isR status.groups = {} end select:SetStatusTable(status.groups) - local grouplist = BuildSelect(group, options, path, appName) - select:SetGroupList(grouplist) + local grouplist, orderlist = BuildSelect(group, options, path, appName) + select:SetGroupList(grouplist, orderlist) select:SetUserData("grouplist", grouplist) - local firstgroup - for k, v in pairs(grouplist) do - if not firstgroup or k < firstgroup then - firstgroup = k - end - end - + 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 @@ -1667,9 +1704,12 @@ local function RefreshOnUpdate(this) if this.closeAll then for k, v in pairs(AceConfigDialog.OpenFrames) do - v:Hide() + if not this.closeAllOverride[k] then + v:Hide() + end end this.closeAll = nil + wipe(this.closeAllOverride) end for appName in pairs(this.apps) do @@ -1681,7 +1721,7 @@ local function RefreshOnUpdate(this) 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)) + AceConfigDialog:Open(widget:GetUserData("appName"), widget, unpack(user.basepath or emptyTbl)) end end end @@ -1766,7 +1806,7 @@ function AceConfigDialog:Open(appName, container, ...) tinsert(path, container) container = nil end - for n = 1, select('#',...) do + for n = 1, select("#",...) do tinsert(path, (select(n, ...))) end @@ -1774,10 +1814,10 @@ function AceConfigDialog:Open(appName, container, ...) if container then f = container f:ReleaseChildren() - f:SetUserData('appName', appName) - f:SetUserData('iscustom', true) + f:SetUserData("appName", appName) + f:SetUserData("iscustom", true) if #path > 0 then - f:SetUserData('basepath', copy(path)) + f:SetUserData("basepath", copy(path)) end local status = AceConfigDialog:GetStatusTable(appName) if not status.width then @@ -1801,9 +1841,9 @@ function AceConfigDialog:Open(appName, container, ...) end f:ReleaseChildren() f:SetCallback("OnClose", FrameOnClose) - f:SetUserData('appName', appName) + f:SetUserData("appName", appName) if #path > 0 then - f:SetUserData('basepath', copy(path)) + f:SetUserData("basepath", copy(path)) end f:SetTitle(name or "") local status = AceConfigDialog:GetStatusTable(appName) @@ -1815,6 +1855,11 @@ function AceConfigDialog:Open(appName, container, ...) 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 @@ -1822,7 +1867,7 @@ 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') + local appName = widget:GetUserData("appName") if not new[appName] then new[appName] = {} end new[appName][key] = widget end @@ -1832,12 +1877,12 @@ else end local function FeedToBlizPanel(widget, event) - local path = widget:GetUserData('path') - AceConfigDialog:Open(widget:GetUserData('appName'), widget, unpack(path or emptyTbl)) + 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') + local appName = widget:GetUserData("appName") AceConfigDialog.frame.closing[appName] = true AceConfigDialog.frame:SetScript("OnUpdate", RefreshOnUpdate) end @@ -1863,8 +1908,8 @@ function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...) local BlizOptions = AceConfigDialog.BlizOptions local key = appName - for n = 1, select('#', ...) do - key = key..'\001'..select(n, ...) + for n = 1, select("#", ...) do + key = key.."\001"..select(n, ...) end if not BlizOptions[appName] then @@ -1877,13 +1922,13 @@ function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...) group:SetName(name or appName, parent) group:SetTitle(name or appName) - group:SetUserData('appName', appName) - if select('#', ...) > 0 then + group:SetUserData("appName", appName) + if select("#", ...) > 0 then local path = {} - for n = 1, select('#',...) do + for n = 1, select("#",...) do tinsert(path, (select(n, ...))) end - group:SetUserData('path', path) + group:SetUserData("path", path) end group:SetCallback("OnShow", FeedToBlizPanel) group:SetCallback("OnHide", ClearBlizPanel) 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 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 b6be483..1805b2a --- a/libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua +++ b/libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua @@ -8,8 +8,8 @@ -- :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 890 2009-12-06 12:50:05Z nevcairiel $ -local MAJOR, MINOR = "AceConfigRegistry-3.0", 11 +-- @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 @@ -134,7 +134,9 @@ local typedkeys={ }, range={ min=optnumber, + softMin=optnumber, max=optnumber, + softMax=optnumber, step=optnumber, bigStep=optnumber, isPercent=optbool, @@ -149,6 +151,7 @@ local typedkeys={ control=optstring, dialogControl=optstring, dropdownControl=optstring, + itemControl=optstring, }, multiselect={ values=ismethodtable, 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 diff --git a/libs/AceDB-3.0/AceDB-3.0.lua b/libs/AceDB-3.0/AceDB-3.0.lua deleted file mode 100644 index 6f51265..0000000 --- a/libs/AceDB-3.0/AceDB-3.0.lua +++ /dev/null @@ -1,712 +0,0 @@ ---- **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 877 2009-11-02 15:56:50Z nevcairiel $ -local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 19 -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 -local function logoutHandler(frame, event) - if event == "PLAYER_LOGOUT" then - for db in pairs(AceDB.db_registry) do - db.callbacks:Fire("OnDatabaseShutdown", db) - for section, key in pairs(db.keys) do - if db.defaults and db.defaults[section] and rawget(db, section) then - removeDefaults(db[section], db.defaults[section]) - 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.sv.profiles, name) and not silent then - error("Cannot delete profile '" .. name .. "'. It does not exist.", 2) - end - - self.sv.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.sv.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.sv.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 deleted file mode 100644 index e825f7b..0000000 --- a/libs/AceDB-3.0/AceDB-3.0.xml +++ /dev/null @@ -1,4 +0,0 @@ -<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 d40172d..caae321 --- a/libs/AceDBOptions-3.0/AceDBOptions-3.0.lua +++ b/libs/AceDBOptions-3.0/AceDBOptions-3.0.lua @@ -1,8 +1,8 @@ --- 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 895 2009-12-06 16:28:55Z nevcairiel $ -local ACEDBO_MAJOR, ACEDBO_MINOR = "AceDBOptions-3.0", 11 +-- @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 @@ -30,7 +30,7 @@ local L = { 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 exisiting profiles.", + 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", 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 diff --git a/libs/AceEvent-3.0/AceEvent-3.0.lua b/libs/AceEvent-3.0/AceEvent-3.0.lua new file mode 100755 index 0000000..0fe1533 --- /dev/null +++ b/libs/AceEvent-3.0/AceEvent-3.0.lua @@ -0,0 +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 diff --git a/libs/AceEvent-3.0/AceEvent-3.0.xml b/libs/AceEvent-3.0/AceEvent-3.0.xml new file mode 100755 index 0000000..9d02169 --- /dev/null +++ b/libs/AceEvent-3.0/AceEvent-3.0.xml @@ -0,0 +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> \ 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 f6c013c..1278fca --- a/libs/AceGUI-3.0/AceGUI-3.0.lua +++ b/libs/AceGUI-3.0/AceGUI-3.0.lua @@ -5,7 +5,7 @@ -- -- **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 +-- 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") @@ -24,8 +24,8 @@ -- f:AddChild(btn) -- @class file -- @name AceGUI-3.0 --- @release $Id: AceGUI-3.0.lua 896 2009-12-06 16:29:49Z nevcairiel $ -local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 30 +-- @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 @@ -98,7 +98,7 @@ Dispatchers[0] = function(func) end local function safecall(func, ...) - return Dispatchers[select('#', ...)](func, ...) + return Dispatchers[select("#", ...)](func, ...) end -- Recycling functions @@ -173,16 +173,16 @@ function AceGUI:Create(type) if WidgetRegistry[type] then local widget = newWidget(type) - if rawget(widget,'Acquire') then + if rawget(widget, "Acquire") then widget.OnAcquire = widget.Acquire widget.Acquire = nil - elseif rawget(widget,'Aquire') then + elseif rawget(widget, "Aquire") then widget.OnAcquire = widget.Aquire widget.Aquire = nil end - if rawget(widget,'Release') then - widget.OnRelease = rawget(widget,'Release') + if rawget(widget, "Release") then + widget.OnRelease = rawget(widget, "Release") widget.Release = nil end @@ -191,8 +191,8 @@ function AceGUI:Create(type) else error(("Widget type %s doesn't supply an OnAcquire Function"):format(type)) end - -- Set the default Layout ('List') - safecall(widget.SetLayout, widget, 'List') + -- Set the default Layout ("List") + safecall(widget.SetLayout, widget, "List") safecall(widget.ResumeLayout, widget) return widget end @@ -204,14 +204,14 @@ end -- 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 ) + safecall(widget.PauseLayout, widget) widget:Fire("OnRelease") - safecall( widget.ReleaseChildren, widget ) + safecall(widget.ReleaseChildren, widget) if widget.OnRelease then widget:OnRelease() - else - error(("Widget type %s doesn't supply an OnRelease Function"):format(type)) +-- 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 @@ -267,7 +267,6 @@ end --[[ Widgets must provide the following functions OnAcquire() - Called when the object is acquired, should set everything to a default hidden state - OnRelease() - Called when the object is Released, should remove any anchors and hide the Widget And the following members frame - the frame or derivitive object that will be treated as the widget for size and anchoring purposes @@ -281,6 +280,7 @@ end 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 @@ -294,17 +294,6 @@ end -- Widget Base Template -- -------------------------- do - 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 WidgetBase = AceGUI.WidgetBase WidgetBase.SetParent = function(self, parent) @@ -312,7 +301,6 @@ do frame:SetParent(nil) frame:SetParent(parent.content) self.parent = parent - --fixlevels(parent.frame,parent.frame:GetChildren()) end WidgetBase.SetCallback = function(self, name, func) @@ -445,7 +433,7 @@ do if self.LayoutPaused then return end - safecall(self.LayoutFunc,self.content, self.children) + 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 @@ -524,7 +512,7 @@ do end end - setmetatable(WidgetContainerBase,{__index=WidgetBase}) + setmetatable(WidgetContainerBase, {__index=WidgetBase}) --One of these function should be called on each Widget Instance as part of its creation process @@ -537,10 +525,11 @@ do 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.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. @@ -550,8 +539,9 @@ do widget.events = {} widget.base = WidgetBase widget.frame.obj = widget - widget.frame:SetScript("OnSizeChanged",FrameResize) - setmetatable(widget,{__index=WidgetBase}) + widget.frame:SetScript("OnSizeChanged", FrameResize) + setmetatable(widget, {__index = WidgetBase}) + return widget end end @@ -611,49 +601,18 @@ function AceGUI:GetNextWidgetNum(type) return self.counts[type] end ---[[ Widget Template - --------------------------- --- Widget Name -- --------------------------- -do - local Type = "Type" - - local function OnAcquire(self) - - end - - local function OnRelease(self) - self.frame:ClearAllPoints() - self.frame:Hide() - end - - - local function Constructor() - local frame = CreateFrame("Frame",nil,UIParent) - local self = {} - self.type = Type - - self.OnRelease = OnRelease - self.OnAcquire = OnAcquire - - self.frame = frame - frame.obj = self - - --Container Support - --local content = CreateFrame("Frame",nil,frame) - --self.content = content - - --AceGUI:RegisterAsContainer(self) - AceGUI:RegisterAsWidget(self) - return self - end - - AceGUI:RegisterWidgetType(Type,Constructor) +--- 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 -- @@ -663,15 +622,13 @@ end 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 + function(content, children) + local height = 0 + local width = content.width or content:GetWidth() or 0 for i = 1, #children do local child = children[i] @@ -679,25 +636,21 @@ AceGUI:RegisterLayout("List", frame:ClearAllPoints() frame:Show() if i == 1 then - frame:SetPoint("TOPLEFT",content,"TOPLEFT",0,0) + frame:SetPoint("TOPLEFT", content) else - frame:SetPoint("TOPLEFT",children[i-1].frame,"BOTTOMLEFT",0,0) + frame:SetPoint("TOPLEFT", children[i-1].frame, "BOTTOMLEFT") end if child.width == "fill" then child:SetWidth(width) - frame:SetPoint("RIGHT",content,"RIGHT") - if child.OnWidthSet then - child:OnWidthSet(content.width or content:GetWidth()) - end + frame:SetPoint("RIGHT", content) + if child.DoLayout then child:DoLayout() end elseif child.width == "relative" then child:SetWidth(width * child.relWidth) - if child.OnWidthSet then - child:OnWidthSet(content.width or content:GetWidth()) - end + if child.DoLayout then child:DoLayout() end @@ -705,45 +658,43 @@ AceGUI:RegisterLayout("List", height = height + (frame.height or frame:GetHeight() or 0) end - safecall( content.obj.LayoutFinished, content.obj, nil, height ) - end - ) - + safecall(content.obj.LayoutFinished, content.obj, nil, height) + end) + -- A single control fills the whole content area AceGUI:RegisterLayout("Fill", - function(content, children) + 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() ) + safecall(content.obj.LayoutFinished, content.obj, nil, children[1].frame:GetHeight()) end - 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 + 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 + local lastrowstart + local isfullheight + + local frameoffset + local lastframeoffset + local oversize for i = 1, #children do local child = children[i] oversize = nil @@ -766,7 +717,7 @@ AceGUI:RegisterLayout("Flow", frame:ClearAllPoints() if i == 1 then -- anchor the first control to the top left - frame:SetPoint("TOPLEFT",content,"TOPLEFT",0,0) + frame:SetPoint("TOPLEFT", content) rowheight = frameheight rowoffset = frameoffset rowstart = frame @@ -785,7 +736,7 @@ AceGUI:RegisterLayout("Flow", break end --anchor the previous row, we will now know its height and offset - rowstart:SetPoint("TOPLEFT",content,"TOPLEFT",0,-(height+(rowoffset-rowstartoffset)+3)) + 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 @@ -803,25 +754,21 @@ AceGUI:RegisterLayout("Flow", --offset is always the larger of the two offsets rowoffset = math_max(rowoffset, frameoffset) + rowheight = math_max(rowheight, rowoffset + (frameheight / 2)) - rowheight = math_max(rowheight,rowoffset+(frameheight/2)) - --print("type:", child.type, "offset:",frameoffset-lastframeoffset) - frame:SetPoint("TOPLEFT",children[i-1].frame,"TOPRIGHT",0,frameoffset-lastframeoffset) + 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,"RIGHT",0,0) + frame:SetPoint("RIGHT", content) usedwidth = 0 rowstart = frame rowstartoffset = frameoffset - if child.OnWidthSet then - child:OnWidthSet(width) - end if child.DoLayout then child:DoLayout() end @@ -831,33 +778,28 @@ AceGUI:RegisterLayout("Flow", elseif child.width == "relative" then child:SetWidth(width * child.relWidth) - if child.OnWidthSet then - child:OnWidthSet(width) - end - if child.DoLayout then child:DoLayout() end elseif oversize then if width > 1 then - frame:SetPoint("RIGHT",content,"RIGHT",0,0) + frame:SetPoint("RIGHT", content) end end if child.height == "fill" then - frame:SetPoint("BOTTOM",content,"BOTTOM") + 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) + rowstart:SetPoint("TOPLEFT", content, "TOPLEFT", 0, -height) elseif rowstart then - rowstart:SetPoint("TOPLEFT",content,"TOPLEFT",0,-(height+(rowoffset-rowstartoffset)+3)) + rowstart:SetPoint("TOPLEFT", content, "TOPLEFT", 0, -(height + (rowoffset - rowstartoffset) + 3)) end height = height + rowheight + 3 - safecall( content.obj.LayoutFinished, content.obj, nil, height ) - end - ) + 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 65b0000..ae22c90 --- a/libs/AceGUI-3.0/AceGUI-3.0.xml +++ b/libs/AceGUI-3.0/AceGUI-3.0.xml @@ -1,26 +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-DropDownGroup.lua"/> <Script file="widgets\AceGUIWidget-DropDown.lua"/> <Script file="widgets\AceGUIWidget-DropDown-Items.lua"/> <Script file="widgets\AceGUIWidget-EditBox.lua"/> - <Script file="widgets\AceGUIWidget-Frame.lua"/> - <Script file="widgets\AceGUIWidget-Window.lua"/> - <Script file="widgets\AceGUIWidget-Heading.lua"/> - <Script file="widgets\AceGUIWidget-InlineGroup.lua"/> - <Script file="widgets\AceGUIWidget-Keybinding.lua"/> - <Script file="widgets\AceGUIWidget-ScrollFrame.lua"/> - <Script file="widgets\AceGUIWidget-SimpleGroup.lua"/> - <Script file="widgets\AceGUIWidget-Slider.lua"/> - <Script file="widgets\AceGUIWidget-TabGroup.lua"/> - <Script file="widgets\AceGUIWidget-TreeGroup.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-BlizOptionsGroup.lua"/> - <Script file="widgets\AceGUIWidget-InteractiveLabel.lua"/> - <Script file="widgets\AceGUIWidget-Icon.lua"/> -</Ui> \ No newline at end of file + <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 new file mode 100755 index 0000000..eba9cb0 --- /dev/null +++ b/libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua @@ -0,0 +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) diff --git a/libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua b/libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua new file mode 100755 index 0000000..18e49cb --- /dev/null +++ b/libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua @@ -0,0 +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) diff --git a/libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua b/libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua new file mode 100755 index 0000000..a656f3c --- /dev/null +++ b/libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua @@ -0,0 +1,300 @@ +--[[----------------------------------------------------------------------------- +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) diff --git a/libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua b/libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua new file mode 100755 index 0000000..bb87885 --- /dev/null +++ b/libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua @@ -0,0 +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) diff --git a/libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua b/libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua new file mode 100755 index 0000000..30dead2 --- /dev/null +++ b/libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua @@ -0,0 +1,203 @@ +--[[----------------------------------------------------------------------------- +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) diff --git a/libs/AceGUI-3.0/widgets/AceGUIContainer-SimpleGroup.lua b/libs/AceGUI-3.0/widgets/AceGUIContainer-SimpleGroup.lua new file mode 100755 index 0000000..6e23abc --- /dev/null +++ b/libs/AceGUI-3.0/widgets/AceGUIContainer-SimpleGroup.lua @@ -0,0 +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) diff --git a/libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua b/libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua new file mode 100755 index 0000000..6a88cbc --- /dev/null +++ b/libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua @@ -0,0 +1,365 @@ +--[[----------------------------------------------------------------------------- +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) diff --git a/libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua b/libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua new file mode 100755 index 0000000..603a055 --- /dev/null +++ b/libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua @@ -0,0 +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) diff --git a/libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua b/libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua new file mode 100755 index 0000000..33ed7d8 --- /dev/null +++ b/libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua @@ -0,0 +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 diff --git a/libs/AceGUI-3.0/widgets/AceGUIWidget-BlizOptionsGroup.lua b/libs/AceGUI-3.0/widgets/AceGUIWidget-BlizOptionsGroup.lua deleted file mode 100644 index 1c16d4f..0000000 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-BlizOptionsGroup.lua +++ /dev/null @@ -1,153 +0,0 @@ -local AceGUI = LibStub("AceGUI-3.0") - - -------------- --- Widgets -- -------------- ---[[ - Widgets must provide the following functions - Acquire() - Called when the object is aquired, should set everything to a default hidden state - Release() - Called when the object is Released, should remove any anchors and hide the Widget - - 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 - - -]] - ----------------------------------- --- Blizzard Options Group -- ----------------------------------- ---[[ - Group Designed to be added to the bliz interface options panel -]] - --- WoW APIs -local CreateFrame = CreateFrame - -do - local Type = "BlizOptionsGroup" - local Version = 10 - - local function OnAcquire(self) - - end - - local function OnRelease(self) - self.frame:ClearAllPoints() - self.frame:Hide() - self:SetName() - end - - local function okay(this) - this.obj:Fire("okay") - end - - local function cancel(this) - this.obj:Fire("cancel") - end - - local function defaults(this) - this.obj:Fire("defaults") - end - - local function SetName(self, name, parent) - self.frame.name = name - self.frame.parent = parent - end - - local function OnShow(this) - this.obj:Fire("OnShow") - end - - local function OnHide(this) - this.obj:Fire("OnHide") - end - - local function OnWidthSet(self, width) - local content = self.content - local contentwidth = width - 63 - 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 - 26 - if contentheight < 0 then - contentheight = 0 - end - content:SetHeight(contentheight) - content.height = contentheight - end - - local function SetTitle(self, title) - local content = self.content - content:ClearAllPoints() - if not title or title == "" then - content:SetPoint("TOPLEFT",self.frame,"TOPLEFT",10,-10) - self.label:SetText("") - else - content:SetPoint("TOPLEFT",self.frame,"TOPLEFT",10,-40) - self.label:SetText(title) - end - content:SetPoint("BOTTOMRIGHT",self.frame,"BOTTOMRIGHT",-10,10) - end - - local function Constructor() - local frame = CreateFrame("Frame") - local self = {} - self.type = Type - - self.OnRelease = OnRelease - self.OnAcquire = OnAcquire - self.frame = frame - self.SetName = SetName - - self.OnWidthSet = OnWidthSet - self.OnHeightSet = OnHeightSet - self.SetTitle = SetTitle - - frame.obj = self - frame.okay = okay - frame.cancel = cancel - frame.defaults = defaults - - frame:Hide() - frame:SetScript("OnHide",OnHide) - frame:SetScript("OnShow",OnShow) - - local label = frame:CreateFontString(nil,"OVERLAY","GameFontNormalLarge") - self.label = label - label:SetPoint("TOPLEFT", frame, "TOPLEFT", 10, -15) - label:SetPoint("BOTTOMRIGHT", frame, "TOPRIGHT", 10, -45) - label:SetJustifyH("LEFT") - label:SetJustifyV("TOP") - - --Container Support - local content = CreateFrame("Frame",nil,frame) - self.content = content - content.obj = self - content:SetPoint("TOPLEFT",frame,"TOPLEFT",15,-10) - content:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-10,10) - - 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 f9cc382..38d4c06 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua @@ -1,46 +1,54 @@ -local AceGUI = LibStub("AceGUI-3.0") +--[[----------------------------------------------------------------------------- +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 CreateFrame, UIParent = CreateFrame, UIParent +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 --------------------------- --- Button -- --------------------------- -do - local Type = "Button" - local Version = 12 - - local function OnAcquire(self) +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) - end - - local function OnRelease(self) - self.frame:ClearAllPoints() - self.frame:Hide() self:SetDisabled(false) - end - - local function Button_OnClick(this, ...) - this.obj:Fire("OnClick", ...) - AceGUI:ClearFocus() - end - - local function Button_OnEnter(this) - this.obj:Fire("OnEnter") - end - - local function Button_OnLeave(this) - this.obj:Fire("OnLeave") - end - - local function SetText(self, text) - self.text:SetText(text or "") - end - - local function SetDisabled(self, disabled) + 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() @@ -48,57 +56,37 @@ do self.frame:Enable() end end - - local function Constructor() - local num = AceGUI:GetNextWidgetNum(Type) - local name = "AceGUI30Button"..num - local frame = CreateFrame("Button",name,UIParent,"UIPanelButtonTemplate2") - local self = {} - self.num = num - self.type = Type - self.frame = frame - - local left = _G[name .. "Left"] - local right = _G[name .. "Right"] - local middle = _G[name .. "Middle"] - - left:SetPoint("TOP", frame, "TOP", 0, 0) - left:SetPoint("BOTTOM", frame, "BOTTOM", 0, 0) - - right:SetPoint("TOP", frame, "TOP", 0, 0) - right:SetPoint("BOTTOM", frame, "BOTTOM", 0, 0) - - middle:SetPoint("TOP", frame, "TOP", 0, 0) - middle:SetPoint("BOTTOM", frame, "BOTTOM", 0, 0) - - local text = frame:GetFontString() - self.text = text - text:ClearAllPoints() - text:SetPoint("TOPLEFT",frame,"TOPLEFT", 15, -1) - text:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT", -15, 1) - text:SetJustifyV("MIDDLE") +} - frame:SetScript("OnClick",Button_OnClick) - frame:SetScript("OnEnter",Button_OnEnter) - frame:SetScript("OnLeave",Button_OnLeave) +--[[----------------------------------------------------------------------------- +Constructor +-------------------------------------------------------------------------------]] +local function Constructor() + local name = "AceGUI30Button" .. AceGUI:GetNextWidgetNum(Type) + local frame = CreateFrame("Button", name, UIParent, "UIPanelButtonTemplate2") + frame:Hide() - self.SetText = SetText - self.SetDisabled = SetDisabled - - frame:EnableMouse(true) + frame:EnableMouse(true) + frame:SetScript("OnClick", Button_OnClick) + frame:SetScript("OnEnter", Control_OnEnter) + frame:SetScript("OnLeave", Control_OnLeave) - frame:SetHeight(24) - frame:SetWidth(200) - - self.OnRelease = OnRelease - self.OnAcquire = OnAcquire - - self.frame = frame - frame.obj = self + local text = frame:GetFontString() + text:ClearAllPoints() + text:SetPoint("TOPLEFT", 15, -1) + text:SetPoint("BOTTOMRIGHT", -15, 1) + text:SetJustifyV("MIDDLE") - AceGUI:RegisterAsWidget(self) - return self + local widget = { + text = text, + frame = frame, + type = Type + } + for method, func in pairs(methods) do + widget[method] = func end - - AceGUI:RegisterWidgetType(Type,Constructor,Version) + + 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 98cb1d9..8341442 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua @@ -1,96 +1,119 @@ -local AceGUI = LibStub("AceGUI-3.0") +--[[----------------------------------------------------------------------------- +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 = select +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 --------------------------- --- Check Box -- --------------------------- ---[[ - Events : - OnValueChanged - -]] -do - local Type = "CheckBox" - local Version = 14 - - local function OnAcquire(self) - self:SetValue(false) - self.tristate = nil - self:SetHeight(24) - self:SetWidth(200) - self:SetImage() - end - - local function OnRelease(self) - self.frame:ClearAllPoints() - self.frame:Hide() - self.check:Hide() - self.highlight:Hide() - self.down = nil - self.checked = nil - self:SetType() - self:SetDisabled(false) - self:SetDescription(nil) - end - - local function CheckBox_OnEnter(this) - local self = this.obj - self.highlight:Show() - self:Fire("OnEnter") +--[[----------------------------------------------------------------------------- +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 - - local function CheckBox_OnLeave(this) - local self = this.obj - self.highlight:Hide() - self:Fire("OnLeave") - end - - local function CheckBox_OnMouseUp(this) - local self = this.obj - if not self.disabled then - self:ToggleChecked() - self:Fire("OnValueChanged",self.checked) - self.text:SetPoint("LEFT",self.check,"RIGHT",0,0) +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 - self.down = nil end - - local function CheckBox_OnMouseDown(this) - local self = this.obj - if not self.disabled then - self.text:SetPoint("LEFT",self.check,"RIGHT",1,-1) - self.down = true + 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 - AceGUI:ClearFocus() + + 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, - local function SetDisabled(self,disabled) + ["SetDisabled"] = function(self, disabled) self.disabled = disabled if disabled then self.frame:Disable() - self.text:SetTextColor(0.5,0.5,0.5) + self.text:SetTextColor(0.5, 0.5, 0.5) SetDesaturation(self.check, true) else self.frame:Enable() - self.text:SetTextColor(1,1,1) + 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 - - local function SetValue(self,value) + end, + + ["SetValue"] = function(self,value) local check = self.check self.checked = value if value then @@ -106,51 +129,48 @@ do self.check:Hide() end end - SetDisabled(self, self.disabled) - end - - local function SetTriState(self, enabled) + self:SetDisabled(self.disabled) + end, + + ["GetValue"] = function(self) + return self.checked + end, + + ["SetTriState"] = function(self, enabled) self.tristate = enabled self:SetValue(self:GetValue()) - end - - local function GetValue(self) - return self.checked - end - - local function SetType(self, type) + end, + + ["SetType"] = function(self, type) local checkbg = self.checkbg local check = self.check local highlight = self.highlight - + + local size if type == "radio" then - checkbg:SetHeight(16) - checkbg:SetWidth(16) + size = 16 checkbg:SetTexture("Interface\\Buttons\\UI-RadioButton") - checkbg:SetTexCoord(0,0.25,0,1) - check:SetHeight(16) - check:SetWidth(16) + checkbg:SetTexCoord(0, 0.25, 0, 1) check:SetTexture("Interface\\Buttons\\UI-RadioButton") - check:SetTexCoord(0.25,0.5,0,1) + 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) + highlight:SetTexCoord(0.5, 0.75, 0, 1) else - checkbg:SetHeight(24) - checkbg:SetWidth(24) + size = 24 checkbg:SetTexture("Interface\\Buttons\\UI-CheckBox-Up") - checkbg:SetTexCoord(0,1,0,1) - check:SetHeight(24) - check:SetWidth(24) + checkbg:SetTexCoord(0, 1, 0, 1) check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check") - check:SetTexCoord(0,1,0,1) + check:SetTexCoord(0, 1, 0, 1) check:SetBlendMode("BLEND") highlight:SetTexture("Interface\\Buttons\\UI-CheckBox-Highlight") - highlight:SetTexCoord(0,1,0,1) + highlight:SetTexCoord(0, 1, 0, 1) end - end - - local function ToggleChecked(self) + checkbg:SetHeight(size) + checkbg:SetWidth(size) + end, + + ["ToggleChecked"] = function(self) local value = self:GetValue() if self.tristate then --cycle in true, nil, false order @@ -164,18 +184,18 @@ do else self:SetValue(not self:GetValue()) end - end - - local function SetLabel(self, label) + end, + + ["SetLabel"] = function(self, label) self.text:SetText(label) - end - - local function SetDescription(self, desc) + 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.check, "TOPRIGHT", 5, -21) + desc:SetPoint("TOPLEFT", self.checkbg, "TOPRIGHT", 5, -21) desc:SetWidth(self.frame.width - 30) desc:SetJustifyH("LEFT") desc:SetJustifyV("TOP") @@ -190,112 +210,80 @@ do self.desc:SetText("") self.desc:Hide() end - self.text:SetFontObject(GameFontHighlight) + --self.text:SetFontObject(GameFontHighlight) self:SetHeight(24) end - end + end, - local function SetImage(self, path, ...) + ["SetImage"] = function(self, path, ...) local image = self.image image:SetTexture(path) if image:GetTexture() then - local n = select('#', ...) + local n = select("#", ...) if n == 4 or n == 8 then image:SetTexCoord(...) else image:SetTexCoord(0, 1, 0, 1) end end - self:AlignImage() + AlignImage(self) end - - local function AlignImage(self) - local img = self.image:GetTexture() - self.text:ClearAllPoints() - if not img then - self.text:SetPoint("LEFT", self.check, "RIGHT", 0, 0) - self.text:SetPoint("RIGHT", self.frame, "RIGHT", 0, 0) - else - self.text:SetPoint("LEFT", self.image,"RIGHT", 1, 0) - self.text:SetPoint("RIGHT", self.frame,"RIGHT", 0, 0) - end - end - - local function OnWidthSet(self, width) - if self.desc and self.desc:GetText() ~= "" then - self.desc:SetWidth(width - 30) - self:SetHeight(28 + self.desc:GetHeight()) - end - end - - local function Constructor() - local frame = CreateFrame("Button",nil,UIParent) - local self = {} - self.type = Type - - self.OnRelease = OnRelease - self.OnAcquire = OnAcquire - - self.SetValue = SetValue - self.GetValue = GetValue - self.SetDisabled = SetDisabled - self.SetType = SetType - self.ToggleChecked = ToggleChecked - self.SetLabel = SetLabel - self.SetTriState = SetTriState - self.SetDescription = SetDescription - self.OnWidthSet = OnWidthSet - self.SetImage = SetImage - self.AlignImage = AlignImage - - self.frame = frame - frame.obj = self - - local text = frame:CreateFontString(nil,"OVERLAY","GameFontHighlight") - self.text = text - - frame:SetScript("OnEnter",CheckBox_OnEnter) - frame:SetScript("OnLeave",CheckBox_OnLeave) - frame:SetScript("OnMouseUp",CheckBox_OnMouseUp) - frame:SetScript("OnMouseDown",CheckBox_OnMouseDown) - frame:EnableMouse() - local checkbg = frame:CreateTexture(nil,"ARTWORK") - self.checkbg = checkbg - checkbg:SetWidth(24) - checkbg:SetHeight(24) - checkbg:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0) - checkbg:SetTexture("Interface\\Buttons\\UI-CheckBox-Up") - local check = frame:CreateTexture(nil,"OVERLAY") - self.check = check - check:SetWidth(24) - check:SetHeight(24) - check:SetPoint("CENTER",checkbg,"CENTER",0,0) - check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check") - - local highlight = frame:CreateTexture(nil, "OVERLAY") - self.highlight = highlight - highlight:SetTexture("Interface\\Buttons\\UI-CheckBox-Highlight") - highlight:SetBlendMode("ADD") - highlight:SetAllPoints(checkbg) - highlight:Hide() - - local image = frame:CreateTexture(nil, "OVERLAY") - self.image = image - image:SetHeight(16) - image:SetWidth(16) - image:SetPoint("LEFT", check, "RIGHT", 1, 0) - - text:SetJustifyH("LEFT") - frame:SetHeight(24) - frame:SetWidth(200) - text:SetHeight(18) - text:SetPoint("LEFT",check,"RIGHT",0,0) - text:SetPoint("RIGHT",frame,"RIGHT",0,0) - - AceGUI:RegisterAsWidget(self) - return self +} + +--[[----------------------------------------------------------------------------- +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 - - AceGUI:RegisterWidgetType(Type,Constructor,Version) + + 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 c3e363d..009fc3b --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua @@ -1,4 +1,12 @@ -local AceGUI = LibStub("AceGUI-3.0") +--[[----------------------------------------------------------------------------- +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 @@ -7,175 +15,172 @@ local CreateFrame, UIParent = CreateFrame, UIParent -- List them here for Mikk's FindGlobals script -- GLOBALS: ShowUIPanel, HideUIPanel, ColorPickerFrame, OpacitySliderFrame --------------------------- --- ColorPicker -- --------------------------- -do - local Type = "ColorPicker" - local Version = 11 - - local function OnAcquire(self) - self.HasAlpha = false - self:SetColor(0,0,0,1) - self:SetHeight(24) - self:SetWidth(200) +--[[----------------------------------------------------------------------------- +Support functions +-------------------------------------------------------------------------------]] +local function ColorCallback(self, r, g, b, a, isAlpha) + if not self.HasAlpha then + a = 1 end - - local function SetLabel(self, text) - self.text:SetText(text) + 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 - local function SetColor(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 +--[[----------------------------------------------------------------------------- +Scripts +-------------------------------------------------------------------------------]] +local function Control_OnEnter(frame) + frame.obj:Fire("OnEnter") +end - local function Control_OnEnter(this) - this.obj:Fire("OnEnter") - end +local function Control_OnLeave(frame) + frame.obj:Fire("OnLeave") +end - local function Control_OnLeave(this) - this.obj:Fire("OnLeave") - end - - local function SetHasAlpha(self, HasAlpha) - self.HasAlpha = HasAlpha - end +local function ColorSwatch_OnClick(frame) + HideUIPanel(ColorPickerFrame) + local self = frame.obj + if not self.disabled then + ColorPickerFrame:SetFrameStrata("FULLSCREEN_DIALOG") - local function ColorCallback(self,r,g,b,a,isAlpha) - if not self.HasAlpha then - a = 1 + ColorPickerFrame.func = function() + local r, g, b = ColorPickerFrame:GetColorRGB() + local a = 1 - OpacitySliderFrame:GetValue() + ColorCallback(self, r, g, b, a) 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 + 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 - end - - local function ColorSwatch_OnClick(this) - HideUIPanel(ColorPickerFrame) - local self = this.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) + + 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 - AceGUI:ClearFocus() - end - local function OnRelease(self) - self.frame:ClearAllPoints() - self.frame:Hide() + 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, - local function SetDisabled(self, disabled) + ["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) + self.text:SetTextColor(0.5, 0.5, 0.5) else self.frame:Enable() - self.text:SetTextColor(1,1,1) + 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 function Constructor() - local frame = CreateFrame("Button",nil,UIParent) - local self = {} - self.type = Type - - self.OnRelease = OnRelease - self.OnAcquire = OnAcquire - - self.SetLabel = SetLabel - self.SetColor = SetColor - self.SetDisabled = SetDisabled - self.SetHasAlpha = SetHasAlpha - - self.frame = frame - frame.obj = self - - local text = frame:CreateFontString(nil,"OVERLAY","GameFontHighlight") - self.text = text - text:SetJustifyH("LEFT") - text:SetTextColor(1,1,1) - frame:SetHeight(24) - frame:SetWidth(200) - text:SetHeight(24) - frame:SetScript("OnClick", ColorSwatch_OnClick) - frame:SetScript("OnEnter",Control_OnEnter) - frame:SetScript("OnLeave",Control_OnLeave) - - local colorSwatch = frame:CreateTexture(nil, "OVERLAY") - self.colorSwatch = colorSwatch - colorSwatch:SetWidth(19) - colorSwatch:SetHeight(19) - colorSwatch:SetTexture("Interface\\ChatFrame\\ChatFrameColorSwatch") - local texture = frame:CreateTexture(nil, "BACKGROUND") - colorSwatch.texture = texture - texture:SetWidth(16) - texture:SetHeight(16) - texture:SetTexture(1,1,1) - texture:Show() - - local checkers = frame:CreateTexture(nil, "BACKGROUND") - colorSwatch.checkers = checkers - checkers:SetTexture("Tileset\\Generic\\Checkers") - checkers:SetDesaturated(true) - checkers:SetVertexColor(1,1,1,0.75) - checkers:SetTexCoord(.25,0,0.5,.25) - checkers:SetWidth(14) - checkers:SetHeight(14) - checkers:Show() - - local highlight = frame:CreateTexture(nil, "BACKGROUND") - self.highlight = highlight - highlight:SetTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight") - highlight:SetBlendMode("ADD") - highlight:SetAllPoints(frame) - highlight:Hide() - - texture:SetPoint("CENTER", colorSwatch, "CENTER") - checkers:SetPoint("CENTER", colorSwatch, "CENTER") - colorSwatch:SetPoint("LEFT", frame, "LEFT", 0, 0) - text:SetPoint("LEFT",colorSwatch,"RIGHT",2,0) - text:SetPoint("RIGHT",frame,"RIGHT") - - AceGUI:RegisterAsWidget(self) - return self + 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 - - AceGUI:RegisterWidgetType(Type,Constructor,Version) + + 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 16b0db7..985f76c --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua @@ -1,4 +1,4 @@ ---[[ $Id: AceGUIWidget-DropDown-Items.lua 877 2009-11-02 15:56:50Z nevcairiel $ ]]-- +--[[ $Id: AceGUIWidget-DropDown-Items.lua 996 2010-12-01 18:34:17Z nevcairiel $ ]]-- local AceGUI = LibStub("AceGUI-3.0") @@ -6,6 +6,7 @@ local AceGUI = LibStub("AceGUI-3.0") local select, assert = select, assert -- WoW APIs +local PlaySound = PlaySound local CreateFrame = CreateFrame local function fixlevels(parent,...) @@ -214,6 +215,12 @@ function ItemBase.Create(type) 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: @@ -316,7 +323,7 @@ end -- Does not close the pullout on click. do local widgetType = "Dropdown-Item-Toggle" - local widgetVersion = 2 + local widgetVersion = 3 local function UpdateToggle(self) if self.value then @@ -335,6 +342,11 @@ do 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 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 8713460..77864f5 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua @@ -1,12 +1,13 @@ ---[[ $Id: AceGUIWidget-DropDown.lua 877 2009-11-02 15:56:50Z nevcairiel $ ]]-- +--[[ $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 = select, pairs, ipairs +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 @@ -355,7 +356,7 @@ end do local widgetType = "Dropdown" - local widgetVersion = 21 + local widgetVersion = 25 --[[ Static data ]]-- @@ -378,6 +379,7 @@ do 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() @@ -458,6 +460,7 @@ do self:SetHeight(44) self:SetWidth(200) + self:SetLabel() end -- exported, AceGUI callback @@ -469,7 +472,6 @@ do self.pullout = nil self:SetText("") - self:SetLabel("") self:SetDisabled(false) self:SetMultiselect(false) @@ -514,12 +516,14 @@ do self.label:SetText(text) self.label:Show() self.dropdown:SetPoint("TOPLEFT",self.frame,"TOPLEFT",-15,-18) - self.frame:SetHeight(44) + self:SetHeight(44) + self.alignoffset = 30 else self.label:SetText("") self.label:Hide() self.dropdown:SetPoint("TOPLEFT",self.frame,"TOPLEFT",-15,0) - self.frame:SetHeight(26) + self:SetHeight(26) + self.alignoffset = 12 end end @@ -558,8 +562,12 @@ do end end - local function AddListItem(self, value, text) - local item = AceGUI:Create("Dropdown-Item-Toggle") + 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 @@ -578,20 +586,26 @@ do -- exported local sortlist = {} - local function SetList(self, list) + local function SetList(self, list, order, itemType) self.list = list self.pullout:Clear() self.hasClose = nil if not list then return end - for v in pairs(list) do - sortlist[#sortlist + 1] = v - end - tsort(sortlist) - - for i, value in pairs(sortlist) do - AddListItem(self, value, list[value]) - sortlist[i] = nil + 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) @@ -600,10 +614,10 @@ do end -- exported - local function AddItem(self, value, text) + local function AddItem(self, value, text, itemType) if self.list then self.list[value] = text - AddListItem(self, value, text) + AddListItem(self, value, text, itemType) end end @@ -653,10 +667,8 @@ do self.SetItemValue = SetItemValue self.SetItemDisabled = SetItemDisabled - self.alignoffset = 31 + self.alignoffset = 30 - frame:SetHeight(44) - frame:SetWidth(200) frame:SetScript("OnHide",Dropdown_OnHide) dropdown:ClearAllPoints() diff --git a/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDownGroup.lua b/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDownGroup.lua deleted file mode 100644 index cebfc7a..0000000 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDownGroup.lua +++ /dev/null @@ -1,178 +0,0 @@ -local AceGUI = LibStub("AceGUI-3.0") - --- Lua APIs -local assert, pairs, type = assert, pairs, type - --- WoW APIs -local CreateFrame = CreateFrame - ---[[ - Selection Group controls all have an interface to select a group for thier contents - None of them will auto size to thier contents, and should usually be used with a scrollframe - unless you know that the controls will fit inside -]] - --------------------------- --- Dropdown Group -- --------------------------- ---[[ - Events : - OnGroupSelected - -]] -do - local Type = "DropdownGroup" - local Version = 13 - - local function OnAcquire(self) - self.dropdown:SetText("") - self:SetDropdownWidth(200) - self:SetTitle("") - end - - local function OnRelease(self) - self.frame:ClearAllPoints() - self.frame:Hide() - self.dropdown.list = nil - self.status = nil - for k in pairs(self.localstatus) do - self.localstatus[k] = nil - end - end - - 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 SetTitle(self,title) - self.titletext:SetText(title) - self.dropdown.frame:ClearAllPoints() - if title and title ~= "" then - self.dropdown.frame:SetPoint("TOPRIGHT", self.frame, "TOPRIGHT", -2, 0) - else - self.dropdown.frame:SetPoint("TOPLEFT", self.frame, "TOPLEFT", -1, 0) - end - end - - - 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 - - local function SetGroupList(self,list) - self.dropdown:SetList(list) - end - - -- called to set an external table to store status in - local function SetStatusTable(self, status) - assert(type(status) == "table") - self.status = status - end - - local function SetGroup(self,group) - self.dropdown:SetValue(group) - local status = self.status or self.localstatus - status.selected = group - self:Fire("OnGroupSelected", group) - end - - local function OnWidthSet(self, width) - local content = self.content - local contentwidth = width - 26 - 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 - 63 - if contentheight < 0 then - contentheight = 0 - end - content:SetHeight(contentheight) - content.height = contentheight - end - - local function LayoutFinished(self, width, height) - self:SetHeight((height or 0) + 63) - end - - local function SetDropdownWidth(self, width) - self.dropdown:SetWidth(width) - end - - local function Constructor() - local frame = CreateFrame("Frame") - local self = {} - self.type = Type - - self.OnRelease = OnRelease - self.OnAcquire = OnAcquire - - self.SetTitle = SetTitle - self.SetGroupList = SetGroupList - self.SetGroup = SetGroup - self.SetStatusTable = SetStatusTable - self.SetDropdownWidth = SetDropdownWidth - self.OnWidthSet = OnWidthSet - self.OnHeightSet = OnHeightSet - self.LayoutFinished = LayoutFinished - - self.localstatus = {} - - self.frame = frame - frame.obj = self - - frame:SetHeight(100) - frame:SetWidth(100) - frame:SetFrameStrata("FULLSCREEN_DIALOG") - - local titletext = frame:CreateFontString(nil, "OVERLAY", "GameFontNormal") - titletext:SetPoint("TOPLEFT", frame, "TOPLEFT", 4, -5) - titletext:SetPoint("TOPRIGHT", frame, "TOPRIGHT", -4, -5) - titletext:SetJustifyH("LEFT") - titletext:SetHeight(18) - self.titletext = titletext - - local dropdown = AceGUI:Create("Dropdown") - self.dropdown = dropdown - dropdown.frame:SetParent(frame) - dropdown.frame:SetFrameLevel(dropdown.frame:GetFrameLevel() + 2) - dropdown.parentgroup = self - dropdown:SetCallback("OnValueChanged",SelectedGroup) - dropdown.frame:SetPoint("TOPLEFT",frame,"TOPLEFT", -1, 0) - dropdown.frame:Show() - dropdown:SetLabel("") - - local border = CreateFrame("Frame",nil,frame) - self.border = border - border:SetPoint("TOPLEFT",frame,"TOPLEFT",0,-26) - border:SetPoint("BOTTOMRIGHT",frame,"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) - self.content = content - content.obj = self - content:SetPoint("TOPLEFT",border,"TOPLEFT",10,-10) - content:SetPoint("BOTTOMRIGHT",border,"BOTTOMRIGHT",-10,10) - - AceGUI:RegisterAsContainer(self) - return self - end - - AceGUI:RegisterWidgetType(Type,Constructor,Version) -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 ab7578b..ec089f4 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua @@ -1,10 +1,16 @@ -local AceGUI = LibStub("AceGUI-3.0") +--[[----------------------------------------------------------------------------- +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 = tostring +local tostring, pairs = tostring, pairs -- WoW APIs -local GetCursorInfo, ClearCursor, GetSpellName = GetCursorInfo, ClearCursor, GetSpellName +local PlaySound = PlaySound +local GetCursorInfo, ClearCursor, GetSpellInfo = GetCursorInfo, ClearCursor, GetSpellInfo local CreateFrame, UIParent = CreateFrame, UIParent local _G = _G @@ -12,16 +18,16 @@ local _G = _G -- List them here for Mikk's FindGlobals script -- GLOBALS: AceGUIEditBoxInsertLink, ChatFontNormal, OKAY -local Type = "EditBox" -local Version = 13 - +--[[----------------------------------------------------------------------------- +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:GetNextWidgetNum(Type)-1 do + 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) @@ -30,102 +36,104 @@ function _G.AceGUIEditBoxInsertLink(text) end end +local function ShowButton(self) + if not self.disablebutton then + self.button:Show() + self.editbox:SetTextInsets(0, 20, 3, 3) + end +end --------------------------- --- Edit box -- --------------------------- ---[[ - Events : - OnTextChanged - OnEnterPressed +local function HideButton(self) + self.button:Hide() + self.editbox:SetTextInsets(0, 0, 3, 3) +end -]] -do - local function OnAcquire(self) - self:SetHeight(26) +--[[----------------------------------------------------------------------------- +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.showbutton = true - end - - local function OnRelease(self) - self.frame:ClearAllPoints() - self.frame:Hide() - self:SetDisabled(false) self:SetText() - end - - local function Control_OnEnter(this) - this.obj:Fire("OnEnter") - end - - local function Control_OnLeave(this) - this.obj:Fire("OnLeave") - end - - local function EditBox_OnEscapePressed(this) - this:ClearFocus() - end - - local function ShowButton(self) - if self.showbutton 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 - - local function EditBox_OnEnterPressed(this) - local self = this.obj - local value = this:GetText() - local cancel = self:Fire("OnEnterPressed",value) - if not cancel then - HideButton(self) - end - end - - local function Button_OnClick(this) - local editbox = this.obj.editbox - editbox:ClearFocus() - EditBox_OnEnterPressed(editbox) - end - - local function EditBox_OnReceiveDrag(this) - local self = this.obj - local type, id, info = GetCursorInfo() - if type == "item" then - self:SetText(info) - self:Fire("OnEnterPressed",info) - ClearCursor() - elseif type == "spell" then - local name, rank = GetSpellName(id, info) - if rank and rank:match("%d") then - name = name.."("..rank..")" - end - self:SetText(name) - self:Fire("OnEnterPressed",name) - ClearCursor() - end - HideButton(self) - AceGUI:ClearFocus() - end - - local function EditBox_OnTextChanged(this) - local self = this.obj - local value = this:GetText() - if tostring(value) ~= tostring(self.lasttext) then - self:Fire("OnTextChanged",value) - self.lasttext = value - ShowButton(self) - end - end - - local function SetDisabled(self, disabled) + 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) @@ -137,16 +145,20 @@ do self.editbox:SetTextColor(1,1,1) self.label:SetTextColor(1,.82,0) end - end - - local function SetText(self, text) + end, + + ["SetText"] = function(self, text) self.lasttext = text or "" self.editbox:SetText(text or "") self.editbox:SetCursorPosition(0) HideButton(self) - end - - local function SetLabel(self, text) + 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() @@ -160,74 +172,85 @@ do 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 - - - local function Constructor() - local num = AceGUI:GetNextWidgetNum(Type) - local frame = CreateFrame("Frame",nil,UIParent) - local editbox = CreateFrame("EditBox","AceGUI-3.0EditBox"..num,frame,"InputBoxTemplate") - - local self = {} - self.type = Type - self.num = num - - self.OnRelease = OnRelease - self.OnAcquire = OnAcquire - - self.SetDisabled = SetDisabled - self.SetText = SetText - self.SetLabel = SetLabel - - self.frame = frame - frame.obj = self - self.editbox = editbox - editbox.obj = self - - self.alignoffset = 30 - - frame:SetHeight(44) - frame:SetWidth(200) - - editbox:SetScript("OnEnter",Control_OnEnter) - editbox:SetScript("OnLeave",Control_OnLeave) - - editbox:SetAutoFocus(false) - editbox:SetFontObject(ChatFontNormal) - 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:SetTextInsets(0,0,3,3) - editbox:SetMaxLetters(256) - - editbox:SetPoint("BOTTOMLEFT",frame,"BOTTOMLEFT",6,0) - editbox:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,0) - editbox:SetHeight(19) - - local label = frame:CreateFontString(nil,"OVERLAY","GameFontNormalSmall") - label:SetPoint("TOPLEFT",frame,"TOPLEFT",0,-2) - label:SetPoint("TOPRIGHT",frame,"TOPRIGHT",0,-2) - label:SetJustifyH("LEFT") - label:SetHeight(18) - self.label = label - - local button = CreateFrame("Button",nil,editbox,"UIPanelButtonTemplate") - button:SetWidth(40) - button:SetHeight(20) - button:SetPoint("RIGHT",editbox,"RIGHT",-2,0) - button:SetText(OKAY) - button:SetScript("OnClick", Button_OnClick) - button:Hide() - - self.button = button - button.obj = self - - AceGUI:RegisterAsWidget(self) - return self +} + +--[[----------------------------------------------------------------------------- +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 - - AceGUI:RegisterWidgetType(Type,Constructor,Version) + 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-Frame.lua b/libs/AceGUI-3.0/widgets/AceGUIWidget-Frame.lua deleted file mode 100644 index 5a63034..0000000 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-Frame.lua +++ /dev/null @@ -1,305 +0,0 @@ -local AceGUI = LibStub("AceGUI-3.0") - --- Lua APIs -local pairs, assert, type = pairs, assert, type - --- 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: CLOSE - ----------------- --- Main Frame -- ----------------- ---[[ - Events : - OnClose - -]] -do - local Type = "Frame" - local Version = 9 - - 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 frameOnClose(this) - this.obj:Fire("OnClose") - end - - local function closeOnClick(this) - 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 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() - 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 Constructor() - local frame = CreateFrame("Frame",nil,UIParent) - local self = {} - self.type = "Frame" - - 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.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:SetBackdrop(FrameBackdrop) - frame:SetBackdropColor(0,0,0,1) - frame:SetScript("OnHide",frameOnClose) - frame:SetMinResize(400,200) - frame:SetToplevel(true) - - local closebutton = CreateFrame("Button",nil,frame,"UIPanelButtonTemplate") - closebutton:SetScript("OnClick", closeOnClick) - closebutton:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-27,17) - closebutton:SetHeight(20) - closebutton:SetWidth(100) - closebutton:SetText(CLOSE) - - self.closebutton = closebutton - closebutton.obj = self - - local statusbg = CreateFrame("Frame",nil,frame) - statusbg:SetPoint("BOTTOMLEFT",frame,"BOTTOMLEFT",15,15) - statusbg:SetPoint("BOTTOMRIGHT",frame,"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) - self.statusbg = statusbg - - local statustext = statusbg:CreateFontString(nil,"OVERLAY","GameFontNormal") - self.statustext = statustext - statustext:SetPoint("TOPLEFT",statusbg,"TOPLEFT",7,-2) - statustext:SetPoint("BOTTOMRIGHT",statusbg,"BOTTOMRIGHT",-7,2) - statustext:SetHeight(20) - statustext:SetJustifyH("LEFT") - statustext:SetText("") - - local title = CreateFrame("Frame",nil,frame) - self.title = title - title:EnableMouse() - title:SetScript("OnMouseDown",titleOnMouseDown) - title:SetScript("OnMouseUp", frameOnMouseUp) - - - 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",frame,"TOP",0,12) - titlebg:SetWidth(100) - titlebg:SetHeight(40) - - 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",0,0) - titlebg_l:SetWidth(30) - titlebg_l:SetHeight(40) - - local titlebg_right = frame:CreateTexture(nil,"OVERLAY") - titlebg_right:SetTexture("Interface\\DialogFrame\\UI-DialogBox-Header") - titlebg_right:SetTexCoord(0.67,0.77,0,0.63) - titlebg_right:SetPoint("LEFT",titlebg,"RIGHT",0,0) - titlebg_right:SetWidth(30) - titlebg_right:SetHeight(40) - - title:SetAllPoints(titlebg) - local titletext = title:CreateFontString(nil,"OVERLAY","GameFontNormal") - titletext:SetPoint("TOP",titlebg,"TOP",0,-14) - - self.titletext = titletext - - 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", frameOnMouseUp) - 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", frameOnMouseUp) - 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", frameOnMouseUp) - self.sizer_e = sizer_e - - --Container Support - local content = CreateFrame("Frame",nil,frame) - self.content = content - content.obj = self - content:SetPoint("TOPLEFT",frame,"TOPLEFT",17,-27) - content:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-17,40) - - AceGUI:RegisterAsContainer(self) - return self - end - - AceGUI:RegisterWidgetType(Type,Constructor,Version) -end 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 a39817e..bf8b2c0 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua @@ -1,76 +1,78 @@ -local AceGUI = LibStub("AceGUI-3.0") +--[[----------------------------------------------------------------------------- +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 --------------------------- --- Heading -- --------------------------- -do - local Type = "Heading" - local Version = 5 - - local function OnAcquire(self) - self:SetText("") +--[[----------------------------------------------------------------------------- +Methods +-------------------------------------------------------------------------------]] +local methods = { + ["OnAcquire"] = function(self) + self:SetText() self:SetFullWidth() self:SetHeight(18) - end - - local function OnRelease(self) - self.frame:ClearAllPoints() - self.frame:Hide() - end - - local function SetText(self, text) + end, + + -- ["OnRelease"] = nil, + + ["SetText"] = function(self, text) self.label:SetText(text or "") - if (text or "") == "" then - self.left:SetPoint("RIGHT",self.frame,"RIGHT",-3,0) - self.right:Hide() - else - self.left:SetPoint("RIGHT",self.label,"LEFT",-5,0) + 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 function Constructor() - local frame = CreateFrame("Frame",nil,UIParent) - local self = {} - self.type = Type - - self.OnRelease = OnRelease - self.OnAcquire = OnAcquire - self.SetText = SetText - self.frame = frame - frame.obj = self - - frame:SetHeight(18) - - local label = frame:CreateFontString(nil,"BACKGROUND","GameFontNormal") - label:SetPoint("TOP",frame,"TOP",0,0) - label:SetPoint("BOTTOM",frame,"BOTTOM",0,0) - label:SetJustifyH("CENTER") - label:SetHeight(18) - self.label = label - - local left = frame:CreateTexture(nil, "BACKGROUND") - self.left = left - left:SetHeight(8) - left:SetPoint("LEFT",frame,"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 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") - self.right = right - right:SetHeight(8) - right:SetPoint("RIGHT",frame,"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) - - AceGUI:RegisterAsWidget(self) - return self + 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 - - AceGUI:RegisterWidgetType(Type,Constructor,Version) + + 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 2b46b5e..ffb0d68 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua @@ -1,33 +1,48 @@ -local AceGUI = LibStub("AceGUI-3.0") +--[[----------------------------------------------------------------------------- +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 = select +local select, pairs, print = select, pairs, print -- WoW APIs -local CreateFrame, UIParent = CreateFrame, UIParent - --------------------------- --- Label -- --------------------------- -do - local Type = "Icon" - local Version = 12 - - local function OnAcquire(self) +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:SetLabel() self:SetImage(nil) self:SetImageSize(64, 64) - end - - local function OnRelease(self) - self.frame:ClearAllPoints() - self.frame:Hide() self:SetDisabled(false) - end - - local function SetLabel(self, text) + end, + + -- ["OnRelease"] = nil, + + ["SetLabel"] = function(self, text) if text and text ~= "" then self.label:Show() self.label:SetText(text) @@ -36,26 +51,23 @@ do self.label:Hide() self:SetHeight(self.image:GetHeight() + 10) end - end - - local function SetImage(self, path, ...) + end, + + ["SetImage"] = function(self, path, ...) local image = self.image image:SetTexture(path) if image:GetTexture() then - self.imageshown = true - local n = select('#', ...) + 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 - end - - local function SetImageSize(self, width, height) + end, + + ["SetImageSize"] = function(self, width, height) self.image:SetWidth(width) self.image:SetHeight(height) --self.frame:SetWidth(width + 30) @@ -64,86 +76,69 @@ do else self:SetHeight(height + 10) end - end - - local function SetDisabled(self, disabled) + end, + + ["SetDisabled"] = function(self, disabled) self.disabled = disabled if disabled then self.frame:Disable() - self.label:SetTextColor(0.5,0.5,0.5) + 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) + self.label:SetTextColor(1, 1, 1) + self.image:SetVertexColor(1, 1, 1, 1) end end - - local function OnClick(this, button) - this.obj:Fire("OnClick", button) - AceGUI:ClearFocus() - end - - local function OnEnter(this) - this.obj.highlight:Show() - this.obj:Fire("OnEnter") - end - - local function OnLeave(this) - this.obj.highlight:Hide() - this.obj:Fire("OnLeave") - end +} - local function Constructor() - local frame = CreateFrame("Button",nil,UIParent) - local self = {} - self.type = Type - - self.OnRelease = OnRelease - self.OnAcquire = OnAcquire - self.SetLabel = SetLabel - self.frame = frame - self.SetImage = SetImage - self.SetImageSize = SetImageSize - - -- SetText should be deprecated along the way - self.SetText = SetLabel - self.SetDisabled = SetDisabled +--[[----------------------------------------------------------------------------- +Constructor +-------------------------------------------------------------------------------]] +local function Constructor() + local frame = CreateFrame("Button", nil, UIParent) + frame:Hide() - frame.obj = self - - frame:SetHeight(110) - frame:SetWidth(110) - frame:EnableMouse(true) - frame:SetScript("OnClick", OnClick) - frame:SetScript("OnLeave", OnLeave) - frame:SetScript("OnEnter", OnEnter) - local label = frame:CreateFontString(nil,"BACKGROUND","GameFontHighlight") - label:SetPoint("BOTTOMLEFT",frame,"BOTTOMLEFT",0,0) - label:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,0) - label:SetJustifyH("CENTER") - label:SetJustifyV("TOP") - label:SetHeight(18) - self.label = label - - local image = frame:CreateTexture(nil,"BACKGROUND") - self.image = image - image:SetWidth(64) - image:SetHeight(64) - image:SetPoint("TOP",frame,"TOP",0,-5) - - local highlight = frame:CreateTexture(nil,"OVERLAY") - self.highlight = highlight - highlight:SetAllPoints(image) - highlight:SetTexture("Interface\\PaperDollInfoFrame\\UI-Character-Tab-Highlight") - highlight:SetTexCoord(0,1,0.23,0.77) - highlight:SetBlendMode("ADD") - highlight:Hide() - - AceGUI:RegisterAsWidget(self) - return self + 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 - - AceGUI:RegisterWidgetType(Type,Constructor,Version) + -- 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-InlineGroup.lua b/libs/AceGUI-3.0/widgets/AceGUIWidget-InlineGroup.lua deleted file mode 100644 index 68742c4..0000000 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-InlineGroup.lua +++ /dev/null @@ -1,138 +0,0 @@ -local AceGUI = LibStub("AceGUI-3.0") - --- WoW APIs -local CreateFrame, UIParent = CreateFrame, UIParent - -------------- --- Widgets -- -------------- ---[[ - Widgets must provide the following functions - Acquire() - Called when the object is aquired, should set everything to a default hidden state - Release() - Called when the object is Released, should remove any anchors and hide the Widget - - 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 - - -]] - --------------------------- --- Inline Group -- --------------------------- ---[[ - This is a simple grouping container, no selection - It will resize automatically to the height of the controls added to it -]] - -do - local Type = "InlineGroup" - local Version = 6 - - local function OnAcquire(self) - self:SetWidth(300) - self:SetHeight(100) - end - - local function OnRelease(self) - self.frame:ClearAllPoints() - self.frame:Hide() - end - - 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 SetTitle(self,title) - self.titletext:SetText(title) - end - - - local function LayoutFinished(self, width, height) - if self.noAutoHeight then return end - self:SetHeight((height or 0) + 40) - end - - local function OnWidthSet(self, width) - local content = self.content - local contentwidth = width - 20 - 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 - 20 - if contentheight < 0 then - contentheight = 0 - end - content:SetHeight(contentheight) - content.height = contentheight - end - - local function Constructor() - local frame = CreateFrame("Frame",nil,UIParent) - local self = {} - self.type = Type - - self.OnRelease = OnRelease - self.OnAcquire = OnAcquire - self.SetTitle = SetTitle - self.frame = frame - self.LayoutFinished = LayoutFinished - self.OnWidthSet = OnWidthSet - self.OnHeightSet = OnHeightSet - - frame.obj = self - - frame:SetHeight(100) - frame:SetWidth(100) - frame:SetFrameStrata("FULLSCREEN_DIALOG") - - local titletext = frame:CreateFontString(nil,"OVERLAY","GameFontNormal") - titletext:SetPoint("TOPLEFT",frame,"TOPLEFT",14,0) - titletext:SetPoint("TOPRIGHT",frame,"TOPRIGHT",-14,0) - titletext:SetJustifyH("LEFT") - titletext:SetHeight(18) - - self.titletext = titletext - - local border = CreateFrame("Frame",nil,frame) - self.border = border - border:SetPoint("TOPLEFT",frame,"TOPLEFT",0,-17) - border:SetPoint("BOTTOMRIGHT",frame,"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) - self.content = content - content.obj = self - content:SetPoint("TOPLEFT",border,"TOPLEFT",10,-10) - content:SetPoint("BOTTOMRIGHT",border,"BOTTOMRIGHT",-10,10) - - AceGUI:RegisterAsContainer(self) - return self - end - - AceGUI:RegisterWidgetType(Type,Constructor,Version) -end 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 1e8dde3..e1388a1 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-InteractiveLabel.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-InteractiveLabel.lua @@ -1,7 +1,12 @@ -local AceGUI = LibStub("AceGUI-3.0") +--[[----------------------------------------------------------------------------- +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, max = select, math.max +local select, pairs = select, pairs -- WoW APIs local CreateFrame, UIParent = CreateFrame, UIParent @@ -10,137 +15,49 @@ local CreateFrame, UIParent = CreateFrame, UIParent -- List them here for Mikk's FindGlobals script -- GLOBALS: GameFontHighlightSmall --------------------------- --- Label -- --------------------------- -do - local Type = "InteractiveLabel" - local Version = 6 - - local function OnAcquire(self) - self:SetHeight(18) - self:SetWidth(200) - self:SetText("") - self:SetImage(nil) - self:SetColor() - self:SetFontObject() +--[[----------------------------------------------------------------------------- +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() - end - - local function OnRelease(self) self:SetDisabled(false) - self.frame:ClearAllPoints() - self.frame:Hide() - end - - local function UpdateImageAnchor(self) - local width = self.frame.width or self.frame:GetWidth() or 0 - local image = self.image - local label = self.label - local frame = self.frame - 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",frame,"TOP",0,0) - label:SetPoint("TOP",image,"BOTTOM",0,0) - label:SetPoint("LEFT",frame,"LEFT",0,0) - label:SetWidth(width) - height = image:GetHeight() + label:GetHeight() - else - --image on the left - local imageheight = image:GetHeight() - local labelheight = label:GetHeight() - --center image with label - if imageheight > labelheight then - image:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0) - label:SetPoint("LEFT",image,"RIGHT",0,0) - else - label:SetPoint("TOPLEFT",frame,"TOPLEFT",imagewidth,0) - image:SetPoint("RIGHT",label,"LEFT",0,0) - end - label:SetWidth(width - imagewidth) - height = max(imageheight, labelheight) - end - else - --no image shown - label:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0) - label:SetWidth(width) - height = self.label:GetHeight() - end - - self.resizing = true - self.frame:SetHeight(height) - self.frame.height = height - self.resizing = nil - end - - local function SetText(self, text) - self.label:SetText(text or "") - UpdateImageAnchor(self) - end - - local function SetColor(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 - - local function OnWidthSet(self, width) - if self.resizing then return end - UpdateImageAnchor(self) - end - - local function SetImage(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(...) - end - else - self.imageshown = nil - end - UpdateImageAnchor(self) - end - - local function SetFont(self, font, height, flags) - self.label:SetFont(font, height, flags) - end - - local function SetFontObject(self, font) - self.label:SetFontObject(font or GameFontHighlightSmall) - end - - local function SetImageSize(self, width, height) - self.image:SetWidth(width) - self.image:SetHeight(height) - UpdateImageAnchor(self) - end - - local function SetHighlight(self, ...) + end, + + -- ["OnRelease"] = nil, + + ["SetHighlight"] = function(self, ...) self.highlight:SetTexture(...) - end - - local function SetHighlightTexCoord(self, ...) - if select('#', ...) >= 1 then + 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 - - local function SetDisabled(self,disabled) + end, + + ["SetDisabled"] = function(self,disabled) self.disabled = disabled if disabled then self.frame:EnableMouse(false) @@ -150,70 +67,35 @@ do self.label:SetTextColor(1, 1, 1) end end - - local function OnEnter(this) - this.obj.highlight:Show() - this.obj:Fire("OnEnter") - end - - local function OnLeave(this) - this.obj.highlight:Hide() - this.obj:Fire("OnLeave") - end - - local function OnClick(this, ...) - this.obj:Fire("OnClick", ...) - AceGUI:ClearFocus() - end +} + +--[[----------------------------------------------------------------------------- +Constructor +-------------------------------------------------------------------------------]] +local function Constructor() + -- create a Label type that we will hijack + local label = AceGUI:Create("Label") - local function Constructor() - local frame = CreateFrame("Frame",nil,UIParent) - local self = {} - self.type = Type - - frame:EnableMouse(true) - frame:SetScript("OnEnter", OnEnter) - frame:SetScript("OnLeave", OnLeave) - frame:SetScript("OnMouseDown", OnClick) - - self.OnRelease = OnRelease - self.OnAcquire = OnAcquire - self.SetText = SetText - self.SetColor = SetColor - self.frame = frame - self.OnWidthSet = OnWidthSet - self.SetImage = SetImage - self.SetImageSize = SetImageSize - self.SetFont = SetFont - self.SetFontObject = SetFontObject - self.SetHighlight = SetHighlight - self.SetHighlightTexCoord = SetHighlightTexCoord - self.SetDisabled = SetDisabled - frame.obj = self - - frame:SetHeight(18) - frame:SetWidth(200) - local label = frame:CreateFontString(nil,"BACKGROUND","GameFontHighlightSmall") - label:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0) - label:SetWidth(200) - label:SetJustifyH("LEFT") - label:SetJustifyV("TOP") - self.label = label - - local highlight = frame:CreateTexture(nil, "OVERLAY") - highlight:SetTexture(nil) - highlight:SetAllPoints() - highlight:SetBlendMode("ADD") - highlight:Hide() - self.highlight = highlight - - local image = frame:CreateTexture(nil,"BACKGROUND") - self.image = image - - AceGUI:RegisterAsWidget(self) - return self + 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 - - AceGUI:RegisterWidgetType(Type,Constructor,Version) + + 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 7d6b13a..ebff255 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua @@ -1,6 +1,13 @@ -local AceGUI = LibStub("AceGUI-3.0") +--[[----------------------------------------------------------------------------- +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 @@ -10,121 +17,103 @@ local CreateFrame, UIParent = CreateFrame, UIParent -- List them here for Mikk's FindGlobals script -- GLOBALS: NOT_BOUND --------------------------- --- Keybinding -- --------------------------- +--[[----------------------------------------------------------------------------- +Scripts +-------------------------------------------------------------------------------]] -do - local Type = "Keybinding" - local Version = 13 - - 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 Control_OnEnter(this) - this.obj:Fire("OnEnter") - end +local function Control_OnEnter(frame) + frame.obj:Fire("OnEnter") +end - local function Control_OnLeave(this) - this.obj:Fire("OnLeave") - end - - local function keybindingMsgFixWidth(this) - this:SetWidth(this.msg:GetWidth()+10) - this:SetScript("OnUpdate",nil) - end +local function Control_OnLeave(frame) + frame.obj:Fire("OnLeave") +end - local function Keybinding_OnClick(this, button) - if button == "LeftButton" or button == "RightButton" then - local self = this.obj - if self.waitingForKey then - this:EnableKeyboard(false) - self.msgframe:Hide() - this:UnlockHighlight() - self.waitingForKey = nil - else - this:EnableKeyboard(true) - self.msgframe:Show() - this:LockHighlight() - self.waitingForKey = true - 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 - AceGUI:ClearFocus() end + AceGUI:ClearFocus() +end - local ignoreKeys = nil - local function Keybinding_OnKeyDown(this, key) - local self = this.obj - if self.waitingForKey then - local keyPressed = key - if keyPressed == "ESCAPE" then - keyPressed = "" - else - if not ignoreKeys then - ignoreKeys = { - ["BUTTON1"] = true, ["BUTTON2"] = true, - ["UNKNOWN"] = true, - ["LSHIFT"] = true, ["LCTRL"] = true, ["LALT"] = true, - ["RSHIFT"] = true, ["RCTRL"] = true, ["RALT"] = true, - } - end - 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 +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 - - this:EnableKeyboard(false) - self.msgframe:Hide() - this:UnlockHighlight() - self.waitingForKey = nil - - if not self.disabled then - self:SetKey(keyPressed) - self:Fire("OnKeyChanged",keyPressed) + if IsControlKeyDown() then + keyPressed = "CTRL-"..keyPressed + end + if IsAltKeyDown() then + keyPressed = "ALT-"..keyPressed end end - end - - local function Keybinding_OnMouseDown(this, 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" + + frame:EnableKeyboard(false) + self.msgframe:Hide() + frame:UnlockHighlight() + self.waitingForKey = nil + + if not self.disabled then + self:SetKey(keyPressed) + self:Fire("OnKeyChanged", keyPressed) end - Keybinding_OnKeyDown(this, button) end - - local function OnAcquire(self) +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:SetHeight(44) self:SetLabel("") self:SetKey("") - end - - local function OnRelease(self) - self.frame:ClearAllPoints() - self.frame:Hide() self.waitingForKey = nil self.msgframe:Hide() self:SetDisabled(false) - end - - local function SetDisabled(self, disabled) + self.button:EnableKeyboard(false) + end, + + -- ["OnRelease"] = nil, + + ["SetDisabled"] = function(self, disabled) self.disabled = disabled if disabled then self.button:Disable() @@ -133,9 +122,9 @@ do self.button:Enable() self.label:SetTextColor(1,1,1) end - end - - local function SetKey(self, key) + end, + + ["SetKey"] = function(self, key) if (key or "") == "" then self.button:SetText(NOT_BOUND) self.button:SetNormalFontObject("GameFontNormal") @@ -143,9 +132,17 @@ do self.button:SetText(key) self.button:SetNormalFontObject("GameFontHighlight") end - end - - local function SetLabel(self, label) + 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 @@ -154,77 +151,82 @@ do self.alignoffset = 30 self:SetHeight(44) end - end + end, +} + +--[[----------------------------------------------------------------------------- +Constructor +-------------------------------------------------------------------------------]] - local function Constructor() - local num = AceGUI:GetNextWidgetNum(Type) - local frame = CreateFrame("Frame",nil,UIParent) - - local button = CreateFrame("Button","AceGUI-3.0 KeybindingButton"..num,frame,"UIPanelButtonTemplate2") - - local self = {} - self.type = Type - self.num = num - - local text = button:GetFontString() - text:SetPoint("LEFT",button,"LEFT",7,0) - text:SetPoint("RIGHT",button,"RIGHT",-7,0) - - button:SetScript("OnClick",Keybinding_OnClick) - button:SetScript("OnKeyDown",Keybinding_OnKeyDown) - button:SetScript("OnEnter",Control_OnEnter) - button:SetScript("OnLeave",Control_OnLeave) - button:SetScript("OnMouseDown",Keybinding_OnMouseDown) - button:RegisterForClicks("AnyDown") - button:EnableMouse() - - button:SetHeight(24) - button:SetWidth(200) - button:SetPoint("BOTTOMLEFT", frame, "BOTTOMLEFT",0,0) - button:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,0) - - frame:SetWidth(200) - frame:SetHeight(44) - - self.alignoffset = 30 - - self.button = button - - local label = frame:CreateFontString(nil,"OVERLAY","GameFontHighlight") - label:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0) - label:SetPoint("TOPRIGHT",frame,"TOPRIGHT",0,0) - label:SetJustifyH("CENTER") - label:SetHeight(18) - self.label = label - - local msgframe = CreateFrame("Frame",nil,UIParent) - msgframe:SetHeight(30) - msgframe:SetBackdrop(ControlBackdrop) - msgframe:SetBackdropColor(0,0,0) - msgframe:SetFrameStrata("FULLSCREEN_DIALOG") - msgframe:SetFrameLevel(1000) - self.msgframe = msgframe - 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",msgframe,"TOPLEFT",5,-5) - msgframe:SetScript("OnUpdate", keybindingMsgFixWidth) - msgframe:SetPoint("BOTTOM",button,"TOP",0,0) - msgframe:Hide() - - self.OnRelease = OnRelease - self.OnAcquire = OnAcquire - self.SetLabel = SetLabel - self.SetDisabled = SetDisabled - self.SetKey = SetKey - - self.frame = frame - frame.obj = self - button.obj = self - - AceGUI:RegisterAsWidget(self) - return self +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 - - AceGUI:RegisterWidgetType(Type,Constructor,Version) + 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 538faf0..18c86ee --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua @@ -1,7 +1,13 @@ -local AceGUI = LibStub("AceGUI-3.0") +--[[----------------------------------------------------------------------------- +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 = math.max, select +local max, select, pairs = math.max, select, pairs -- WoW APIs local CreateFrame, UIParent = CreateFrame, UIParent @@ -10,91 +16,96 @@ local CreateFrame, UIParent = CreateFrame, UIParent -- List them here for Mikk's FindGlobals script -- GLOBALS: GameFontHighlightSmall --------------------------- --- Label -- --------------------------- -do - local Type = "Label" - local Version = 12 +--[[----------------------------------------------------------------------------- +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 - local function OnAcquire(self) - self:SetHeight(18) + 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:SetText() self:SetImage(nil) self:SetImageSize(16, 16) self:SetColor() self:SetFontObject() - end - - local function OnRelease(self) - self.frame:ClearAllPoints() - self.frame:Hide() - end - - local function UpdateImageAnchor(self) - local width = self.frame.width or self.frame:GetWidth() or 0 - local image = self.image - local label = self.label - local frame = self.frame - 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",frame,"TOP",0,0) - label:SetPoint("TOP",image,"BOTTOM",0,0) - label:SetPoint("LEFT",frame,"LEFT",0,0) - label:SetWidth(width) - height = image:GetHeight() + label:GetHeight() - else - --image on the left - image:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0) - label:SetPoint("TOPLEFT",image,"TOPRIGHT",4,0) - label:SetWidth(width - imagewidth) - height = max(image:GetHeight(), label:GetHeight()) - end - else - --no image shown - label:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0) - label:SetWidth(width) - height = self.label:GetHeight() - end - - self.resizing = true - self.frame:SetHeight(height) - self.frame.height = height + + -- reset the flag self.resizing = nil - end - - local function SetText(self, text) - self.label:SetText(text or "") + -- run the update explicitly UpdateImageAnchor(self) - end - - local function SetColor(self, r, g, b) + 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 - - local function OnWidthSet(self, width) - if self.resizing then return end - UpdateImageAnchor(self) - end - - local function SetImage(self, path, ...) + end, + + ["SetImage"] = function(self, path, ...) local image = self.image image:SetTexture(path) if image:GetTexture() then self.imageshown = true - local n = select('#', ...) + local n = select("#", ...) if n == 4 or n == 8 then image:SetTexCoord(...) else @@ -104,55 +115,48 @@ do self.imageshown = nil end UpdateImageAnchor(self) - end - - local function SetFont(self, font, height, flags) + end, + + ["SetFont"] = function(self, font, height, flags) self.label:SetFont(font, height, flags) - end - - local function SetFontObject(self, font) - self.label:SetFontObject(font or GameFontHighlightSmall) - end - - local function SetImageSize(self, width, height) + 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 + end, +} - local function Constructor() - local frame = CreateFrame("Frame",nil,UIParent) - local self = {} - self.type = Type - - self.OnRelease = OnRelease - self.OnAcquire = OnAcquire - self.SetText = SetText - self.SetColor = SetColor - self.frame = frame - self.OnWidthSet = OnWidthSet - self.SetImage = SetImage - self.SetImageSize = SetImageSize - self.SetFont = SetFont - self.SetFontObject = SetFontObject - frame.obj = self - - frame:SetHeight(18) - frame:SetWidth(200) - local label = frame:CreateFontString(nil,"BACKGROUND","GameFontHighlightSmall") - label:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0) - label:SetWidth(200) - label:SetJustifyH("LEFT") - label:SetJustifyV("TOP") - self.label = label - - local image = frame:CreateTexture(nil,"BACKGROUND") - self.image = image - - AceGUI:RegisterAsWidget(self) - return self +--[[----------------------------------------------------------------------------- +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 - - AceGUI:RegisterWidgetType(Type,Constructor,Version) + + 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 22833b6..83b7e95 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua @@ -1,309 +1,345 @@ - ---[[ ---Multiline Editbox Widget, Originally by bam - ---]] -local AceGUI = LibStub("AceGUI-3.0") +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 format, pairs, tostring = string.format, pairs, tostring +local pairs = pairs -- WoW APIs -local GetCursorInfo, ClearCursor, GetSpellName = GetCursorInfo, ClearCursor, GetSpellName +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: ChatFontNormal, ACCEPT - -local Version = 11 ---------------------- --- Common Elements -- ---------------------- - -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 } -} +-- GLOBALS: ACCEPT, ChatFontNormal -local PaneBackdrop = { +--[[----------------------------------------------------------------------------- +Support functions +-------------------------------------------------------------------------------]] +local function Layout(self) + self:SetHeight(self.numlines * 14 + (self.disablebutton and 19 or 41) + self.labelHeight) - 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 } -} + 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 -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 } -} + 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 --------------------------- --- Edit box -- --------------------------- ---[[ - Events : - OnTextChanged - OnEnterPressed - -]] -do - local Type = "MultiLineEditBox" - - local MultiLineEditBox = {} - - local function EditBox_OnEnterPressed(this) - local self = this.obj - local value = this:GetText() - local cancel = self:Fire("OnEnterPressed",value) - if not cancel then - self.button:Disable() +--[[----------------------------------------------------------------------------- +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 - - local function Button_OnClick(this) - local editbox = this.obj.editbox - editbox:ClearFocus() - EditBox_OnEnterPressed(editbox) +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 - - local function EditBox_OnReceiveDrag(this) - local self = this.obj - local type, id, info = GetCursorInfo() - if type == "item" then - self:SetText(info) - self:Fire("OnEnterPressed",info) - ClearCursor() - elseif type == "spell" then - local name, rank = GetSpellName(id, info) - if rank and rank:match("%d") then - name = name.."("..rank..")" - end - self:SetText(name) - self:Fire("OnEnterPressed",name) - ClearCursor() - end - --self.button:Disable() - AceGUI:ClearFocus() +end + +local function OnLeave(self) -- EditBox / ScrollFrame + self = self.obj + if self.entered then + self.entered = nil + self:Fire("OnLeave") end - - function MultiLineEditBox:OnAcquire() - self:SetWidth(200) - self:SetHeight(116) - self:SetNumLines(4) - self:SetDisabled(false) - self:ShowButton(true) +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 - - function MultiLineEditBox:OnRelease() - self.frame:ClearAllPoints() - self.frame:Hide() - self:SetDisabled(false) + ClearCursor() + self = self.obj + local editBox = self.editBox + if not editBox:HasFocus() then + editBox:SetFocus() + editBox:SetCursorPosition(editBox:GetNumLetters()) end - - function MultiLineEditBox:SetDisabled(disabled) - self.disabled = disabled + 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 - self.editbox:EnableMouse(false) - self.scrollframe:EnableMouse(false) - self.editbox:ClearFocus() - self.editbox:SetTextColor(0.5, 0.5, 0.5) - self.label:SetTextColor(0.5,0.5,0.5) + 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 - self.editbox:EnableMouse(true) - self.scrollframe:EnableMouse(true) - self.editbox:SetTextColor(1, 1, 1) - self.label:SetTextColor(1,.82,0) - self.button:Enable() + editBox:EnableMouse(true) + editBox:SetTextColor(1, 1, 1) + self.label:SetTextColor(1, 0.82, 0) + self.scrollFrame:EnableMouse(true) end - end + end, - function MultiLineEditBox:SetText(text) - text = text or "" - local editbox = self.editbox - local oldText = editbox:GetText() - local dummy = format(" %s", text) - self.lasttext = dummy -- prevents OnTextChanged from firing - editbox:SetText(dummy) - editbox:HighlightText(0, 1) - self.lasttext = oldText - editbox:Insert("") - end - - function MultiLineEditBox:SetLabel(text) - if (text or "") == "" then - self.backdrop:SetPoint("TOPLEFT",self.frame,"TOPLEFT",0,0) - self.label:Hide() - self.label:SetText("") - else - self.backdrop:SetPoint("TOPLEFT",self.frame,"TOPLEFT",0,-20) - self.label:Show() + ["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 - end - - function MultiLineEditBox:SetNumLines(number) - number = number or 4 - self:SetHeight(60 + (14*number)) - end + Layout(self) + end, - function MultiLineEditBox:GetText() - return self.editbox:GetText() - end - - function MultiLineEditBox:ShowButton(show) - if show then - self.backdrop:SetPoint("BOTTOMRIGHT",self.frame,"BOTTOMRIGHT",0,22) - self.button:Show() - else - self.backdrop:SetPoint("BOTTOMRIGHT",self.frame,"BOTTOMRIGHT",0,0) + ["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 - end + Layout(self) + end, + + ["ClearFocus"] = function(self) + self.editBox:ClearFocus() + self.frame:SetScript("OnShow", nil) + end, - local function Constructor() - local frame = CreateFrame("Frame", nil, UIParent) - local backdrop = CreateFrame("Frame", nil, frame) - local self = {} - for k, v in pairs(MultiLineEditBox) do self[k] = v end - self.type = Type - self.frame = frame - self.backdrop = backdrop - frame.obj = self - - backdrop:SetBackdrop(ControlBackdrop) - backdrop:SetBackdropColor(0, 0, 0) - backdrop:SetBackdropBorderColor(0.4, 0.4, 0.4) + ["SetFocus"] = function(self) + self.editBox:SetFocus() + if not self.frame:IsShown() then + self.frame:SetScript("OnShow", OnShowFocus) + end + end, - backdrop:SetPoint("TOPLEFT",frame,"TOPLEFT",0, -20) - backdrop:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,22) - - local scrollframe = CreateFrame("ScrollFrame", format("%s@%s@%s", Type, "ScrollFrame", tostring(self)), backdrop, "UIPanelScrollFrameTemplate") - scrollframe:SetPoint("TOPLEFT", 5, -6) - scrollframe:SetPoint("BOTTOMRIGHT", -28, 6) - scrollframe.obj = self - self.scrollframe = scrollframe - - --local scrollchild = CreateFrame("Frame", nil, scrollframe) - --scrollframe:SetScrollChild(scrollchild) - --scrollchild:SetHeight(2) - --scrollchild:SetWidth(2) + ["GetCursorPosition"] = function(self) + return self.editBox:GetCursorPosition() + end, - local label = frame:CreateFontString(nil,"OVERLAY","GameFontNormalSmall") - label:SetPoint("TOPLEFT",frame,"TOPLEFT",0,-2) - label:SetPoint("TOPRIGHT",frame,"TOPRIGHT",0,-2) - label:SetJustifyH("LEFT") - label:SetHeight(18) - self.label = label - - local editbox = CreateFrame("EditBox", nil, scrollframe) - self.editbox = editbox - editbox.obj = self - editbox:SetPoint("TOPLEFT") - editbox:SetPoint("BOTTOMLEFT") - editbox:SetHeight(50) - editbox:SetWidth(50) - editbox:SetMultiLine(true) - -- editbox:SetMaxLetters(7500) - editbox:SetTextInsets(5, 5, 3, 3) - editbox:EnableMouse(true) - editbox:SetAutoFocus(false) - editbox:SetFontObject(ChatFontNormal) - scrollframe:SetScrollChild(editbox) - - local button = CreateFrame("Button",nil,scrollframe,"UIPanelButtonTemplate") - button:SetWidth(80) - button:SetHeight(20) - button:SetPoint("BOTTOMLEFT",frame,"BOTTOMLEFT",0,2) - button:SetText(ACCEPT) - button:SetScript("OnClick", Button_OnClick) - button:SetFrameLevel(editbox:GetFrameLevel() + 1) - button:Disable() - button:Hide() - self.button = button - button.obj = self - - scrollframe:EnableMouse(true) - scrollframe:SetScript("OnMouseUp", function() editbox:SetFocus() end) - scrollframe:SetScript("OnEnter", function(this) this.obj:Fire("OnEnter") end) - scrollframe:SetScript("OnLeave", function(this) this.obj:Fire("OnLeave") end) - - editbox:SetScript("OnEnter", function(this) this.obj:Fire("OnEnter") end) - editbox:SetScript("OnLeave", function(this) this.obj:Fire("OnLeave") end) - - local function FixSize() - --scrollchild:SetHeight(scrollframe:GetHeight()) - --scrollchild:SetWidth(scrollframe:GetWidth()) - editbox:SetWidth(scrollframe:GetWidth()) - end - scrollframe:SetScript("OnShow", FixSize) - scrollframe:SetScript("OnSizeChanged", FixSize) + ["SetCursorPosition"] = function(self, ...) + return self.editBox:SetCursorPosition(...) + end, - editbox:SetScript("OnEscapePressed", editbox.ClearFocus) - editbox:SetScript("OnTextChanged", function(_, ...) - scrollframe:UpdateScrollChildRect() - local value = editbox:GetText() - if value ~= self.lasttext then - self:Fire("OnTextChanged", value) - self.lasttext = value - if not self.disabled then - self.button:Enable() - end - end - end) - editbox:SetScript("OnReceiveDrag", EditBox_OnReceiveDrag) - editbox:SetScript("OnMouseDown", EditBox_OnReceiveDrag) - - do - local cursorOffset, cursorHeight - local idleTime - local function FixScroll(_, elapsed) - if cursorOffset and cursorHeight then - idleTime = 0 - local height = scrollframe:GetHeight() - local range = scrollframe:GetVerticalScrollRange() - local scroll = scrollframe:GetVerticalScroll() - local size = height + range - cursorOffset = -cursorOffset - while cursorOffset < scroll do - scroll = scroll - (height / 2) - if scroll < 0 then scroll = 0 end - scrollframe:SetVerticalScroll(scroll) - end - while cursorOffset + cursorHeight > scroll + height and scroll < range do - scroll = scroll + (height / 2) - if scroll > range then scroll = range end - scrollframe:SetVerticalScroll(scroll) - end - elseif not idleTime or idleTime > 2 then - frame:SetScript("OnUpdate", nil) - idleTime = nil - else - idleTime = idleTime + elapsed - end - cursorOffset = nil - end - editbox:SetScript("OnCursorChanged", function(_, x, y, w, h) - cursorOffset, cursorHeight = y, h - if not idleTime then - frame:SetScript("OnUpdate", FixScroll) - end - end) - 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() - AceGUI:RegisterAsWidget(self) - return self - end + local widgetNum = AceGUI:GetNextWidgetNum(Type) - AceGUI:RegisterWidgetType(Type, Constructor, Version) -end + 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) diff --git a/libs/AceGUI-3.0/widgets/AceGUIWidget-ScrollFrame.lua b/libs/AceGUI-3.0/widgets/AceGUIWidget-ScrollFrame.lua deleted file mode 100644 index 0a9f3ad..0000000 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-ScrollFrame.lua +++ /dev/null @@ -1,241 +0,0 @@ -local AceGUI = LibStub("AceGUI-3.0") - --- Lua APIs -local pairs, assert, type = pairs, assert, type -local min, max, floor = math.min, math.max, math.floor - --- WoW APIs -local CreateFrame, UIParent = CreateFrame, UIParent - - -------------- --- Widgets -- -------------- ---[[ - Widgets must provide the following functions - Acquire() - Called when the object is aquired, should set everything to a default hidden state - Release() - Called when the object is Released, should remove any anchors and hide the Widget - - 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 - - -]] - --------------------------- --- Scroll Frame -- --------------------------- -do - local Type = "ScrollFrame" - local Version = 9 - - local function OnAcquire(self) - - end - - local function OnRelease(self) - self.frame:ClearAllPoints() - self.frame:Hide() - self.status = nil - -- do SetScroll after niling status, but before clearing localstatus - -- so the scroll value isnt populated back into status, but not kept in localstatus either - self:SetScroll(0) - for k in pairs(self.localstatus) do - self.localstatus[k] = nil - end - self.scrollframe:SetPoint("BOTTOMRIGHT",self.frame,"BOTTOMRIGHT",0,0) - self.scrollbar:Hide() - self.scrollBarShown = nil - self.content.height, self.content.width = nil, nil - end - - local function SetScroll(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", self.scrollframe, "TOPLEFT", 0, offset) - self.content:SetPoint("TOPRIGHT", self.scrollframe, "TOPRIGHT", 0, offset) - status.offset = offset - status.scrollvalue = value - end - - local function MoveScroll(self, value) - local status = self.status or self.localstatus - local height, viewheight = self.scrollframe:GetHeight(), self.content:GetHeight() - - if height > viewheight then - self.scrollbar:Hide() - else - self.scrollbar:Show() - 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 - - - local function FixScroll(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() - if viewheight < height then - if self.scrollBarShown then - self.scrollBarShown = nil - self.scrollbar:Hide() - self.scrollbar:SetValue(0) - self.scrollframe:SetPoint("BOTTOMRIGHT",self.frame,"BOTTOMRIGHT",0,0) - self:DoLayout() - end - else - if not self.scrollBarShown then - self.scrollBarShown = true - self.scrollbar:Show() - self.scrollframe:SetPoint("BOTTOMRIGHT", self.frame,"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", self.scrollframe, "TOPLEFT", 0, offset) - self.content:SetPoint("TOPRIGHT", self.scrollframe, "TOPRIGHT", 0, offset) - status.offset = offset - end - end - self.updateLock = nil - end - - local function OnMouseWheel(this, value) - this.obj:MoveScroll(value) - end - - local function OnScrollValueChanged(this, value) - this.obj:SetScroll(value) - end - - local function FixScrollOnUpdate(this) - this:SetScript("OnUpdate", nil) - this.obj:FixScroll() - end - - local function OnSizeChanged(this) - this:SetScript("OnUpdate", FixScrollOnUpdate) - end - - local function LayoutFinished(self, width, height) - self.content:SetHeight(height or 0 + 20) - self.scrollframe:SetScript("OnUpdate", FixScrollOnUpdate) - end - - -- called to set an external table to store status in - local function SetStatusTable(self, status) - assert(type(status) == "table") - self.status = status - if not status.scrollvalue then - status.scrollvalue = 0 - end - end - - local function OnWidthSet(self, width) - local content = self.content - content.width = width - end - - - local function OnHeightSet(self, height) - local content = self.content - content.height = height - end - - local function Constructor() - local frame = CreateFrame("Frame", nil, UIParent) - local self = {} - self.type = Type - - self.OnRelease = OnRelease - self.OnAcquire = OnAcquire - - self.MoveScroll = MoveScroll - self.FixScroll = FixScroll - self.SetScroll = SetScroll - self.LayoutFinished = LayoutFinished - self.SetStatusTable = SetStatusTable - self.OnWidthSet = OnWidthSet - self.OnHeightSet = OnHeightSet - - self.localstatus = {} - self.frame = frame - frame.obj = self - - --Container Support - local scrollframe = CreateFrame("ScrollFrame", nil, frame) - scrollframe.obj = self - scrollframe:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, 0) - scrollframe:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", 0, 0) - scrollframe:EnableMouseWheel(true) - scrollframe:SetScript("OnMouseWheel", OnMouseWheel) - scrollframe:SetScript("OnSizeChanged", OnSizeChanged) - self.scrollframe = scrollframe - - local content = CreateFrame("Frame", nil, scrollframe) - content.obj = self - content:SetPoint("TOPLEFT", scrollframe, "TOPLEFT", 0, 0) - content:SetPoint("TOPRIGHT", scrollframe, "TOPRIGHT", 0, 0) - content:SetHeight(400) - self.content = content - scrollframe:SetScrollChild(content) - - local num = AceGUI:GetNextWidgetNum(Type) - local name = ("AceConfigDialogScrollFrame%dScrollBar"):format(num) - local scrollbar = CreateFrame("Slider", name, scrollframe, "UIPanelScrollBarTemplate") - scrollbar.obj = self - scrollbar:SetPoint("TOPLEFT", scrollframe, "TOPRIGHT", 4, -16) - scrollbar:SetPoint("BOTTOMLEFT", scrollframe, "BOTTOMRIGHT", 4, 16) - scrollbar:SetScript("OnValueChanged", OnScrollValueChanged) - scrollbar:SetMinMaxValues(0, 1000) - scrollbar:SetValueStep(1) - scrollbar:SetValue(0) - scrollbar:SetWidth(16) - scrollbar:Hide() - self.scrollbar = scrollbar - - local scrollbg = scrollbar:CreateTexture(nil, "BACKGROUND") - scrollbg:SetAllPoints(scrollbar) - scrollbg:SetTexture(0, 0, 0, 0.4) - - self.localstatus.scrollvalue = 0 - - --self:FixScroll() - AceGUI:RegisterAsContainer(self) - --AceGUI:RegisterAsWidget(self) - return self - end - - AceGUI:RegisterWidgetType(Type,Constructor,Version) -end diff --git a/libs/AceGUI-3.0/widgets/AceGUIWidget-SimpleGroup.lua b/libs/AceGUI-3.0/widgets/AceGUIWidget-SimpleGroup.lua deleted file mode 100644 index 9f9def5..0000000 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-SimpleGroup.lua +++ /dev/null @@ -1,99 +0,0 @@ -local AceGUI = LibStub("AceGUI-3.0") - --- WoW APIs -local CreateFrame, UIParent = CreateFrame, UIParent - -------------- --- Widgets -- -------------- ---[[ - Widgets must provide the following functions - Acquire() - Called when the object is aquired, should set everything to a default hidden state - Release() - Called when the object is Released, should remove any anchors and hide the Widget - - 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 - - -]] - --------------------------- --- Simple Group -- --------------------------- ---[[ - This is a simple grouping container, no selection, no borders - It will resize automatically to the height of the controls added to it -]] - -do - local Type = "SimpleGroup" - local Version = 5 - - local function OnAcquire(self) - self:SetWidth(300) - self:SetHeight(100) - end - - local function OnRelease(self) - self.frame:ClearAllPoints() - self.frame:Hide() - end - - local function LayoutFinished(self, width, height) - if self.noAutoHeight then return end - self:SetHeight(height or 0) - end - - local function OnWidthSet(self, width) - local content = self.content - content:SetWidth(width) - content.width = width - end - - local function OnHeightSet(self, height) - local content = self.content - content:SetHeight(height) - content.height = height - end - - local function Constructor() - local frame = CreateFrame("Frame",nil,UIParent) - local self = {} - self.type = Type - - self.OnRelease = OnRelease - self.OnAcquire = OnAcquire - self.frame = frame - self.LayoutFinished = LayoutFinished - self.OnWidthSet = OnWidthSet - self.OnHeightSet = OnHeightSet - - frame.obj = self - - frame:SetHeight(100) - frame:SetWidth(100) - frame:SetFrameStrata("FULLSCREEN_DIALOG") - - --Container Support - local content = CreateFrame("Frame",nil,frame) - self.content = content - content.obj = self - content:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0) - content:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,0) - - AceGUI:RegisterAsContainer(self) - return self - end - - AceGUI:RegisterWidgetType(Type,Constructor,Version) -end 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 14f2867..26c72a0 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua +++ b/libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua @@ -1,136 +1,178 @@ -local AceGUI = LibStub("AceGUI-3.0") +--[[----------------------------------------------------------------------------- +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 = tonumber +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 --------------------------- --- Slider -- --------------------------- -do - local Type = "Slider" - local Version = 9 - - local function OnAcquire(self) - self:SetWidth(200) - self:SetHeight(44) - self:SetDisabled(false) - self:SetIsPercent(nil) - self:SetSliderValues(0,100,1) - self:SetValue(0) - end - - local function OnRelease(self) - self.frame:ClearAllPoints() - self.frame:Hide() - self.slider:EnableMouseWheel(false) - self:SetDisabled(false) +--[[----------------------------------------------------------------------------- +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 Control_OnEnter(this) - this.obj:Fire("OnEnter") - end - - local function Control_OnLeave(this) - this.obj:Fire("OnLeave") +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 - - 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 + +--[[----------------------------------------------------------------------------- +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 - 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) + if self.value then + UpdateText(self) end end - - local function Slider_OnValueChanged(this) - local self = this.obj - if not this.setup then - local newvalue - newvalue = this:GetValue() - if newvalue ~= self.value and not self.disabled then - self.value = newvalue - self:Fire("OnValueChanged", newvalue) - end - if self.value then - local value = self.value - UpdateText(self) - 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 - - local function Slider_OnMouseUp(this) - local self = this.obj - self:Fire("OnMouseUp",this:GetValue()) +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 - local function Slider_OnMouseWheel(this, v) - local self = this.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 + if value then + PlaySound("igMainMenuOptionCheckBoxOn") + self.slider:SetValue(value) + self:Fire("OnMouseUp", value) end - - local function SetDisabled(self, disabled) +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.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.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 - - local function SetValue(self, value) + end, + + ["SetValue"] = function(self, value) self.slider.setup = true self.slider:SetValue(value) self.value = value UpdateText(self) self.slider.setup = nil - end - - local function SetLabel(self, text) + end, + + ["GetValue"] = function(self) + return self.value + end, + + ["SetLabel"] = function(self, text) self.label:SetText(text) - end - - local function SetSliderValues(self, min, max, step) + end, + + ["SetSliderValues"] = function(self, min, max, step) local frame = self.slider frame.setup = true self.min = min @@ -143,140 +185,97 @@ do frame:SetValue(self.value) end frame.setup = nil - end - - local function EditBox_OnEscapePressed(this) - this:ClearFocus() - end - - local function EditBox_OnEnterPressed(this) - local self = this.obj - local value = this:GetText() - if self.ispercent then - value = value:gsub('%%','') - value = tonumber(value) / 100 - else - value = tonumber(value) - end - - if value then - self:Fire("OnMouseUp",value) - end - end - - local function EditBox_OnEnter(this) - this:SetBackdropBorderColor(0.5,0.5,0.5,1) - end - - local function EditBox_OnLeave(this) - this:SetBackdropBorderColor(0.3,0.3,0.3,0.8) - end - - local function SetIsPercent(self, value) + end, + + ["SetIsPercent"] = function(self, value) self.ispercent = value UpdateLabels(self) UpdateText(self) end - - local function FrameOnMouseDown(this) - this.obj.slider:EnableMouseWheel(true) - AceGUI:ClearFocus() - end - - 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) - local self = {} - self.type = Type - - self.OnRelease = OnRelease - self.OnAcquire = OnAcquire - - self.frame = frame - frame.obj = self - - self.SetDisabled = SetDisabled - self.SetValue = SetValue - self.SetSliderValues = SetSliderValues - self.SetLabel = SetLabel - self.SetIsPercent = SetIsPercent - - self.alignoffset = 25 - - frame:EnableMouse(true) - frame:SetScript("OnMouseDown",FrameOnMouseDown) - self.slider = CreateFrame("Slider",nil,frame) - local slider = self.slider - slider:SetScript("OnEnter",Control_OnEnter) - slider:SetScript("OnLeave",Control_OnLeave) - slider:SetScript("OnMouseUp", Slider_OnMouseUp) - slider.obj = self - slider:SetOrientation("HORIZONTAL") - slider:SetHeight(15) - slider:SetHitRectInsets(0,0,-10,0) - slider:SetBackdrop(SliderBackdrop) - --slider:EnableMouseWheel(true) - slider:SetScript("OnMouseWheel", Slider_OnMouseWheel) - - local label = frame:CreateFontString(nil,"OVERLAY","GameFontNormal") - label:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0) - label:SetPoint("TOPRIGHT",frame,"TOPRIGHT",0,0) - label:SetJustifyH("CENTER") - label:SetHeight(15) - self.label = label - - self.lowtext = slider:CreateFontString(nil,"ARTWORK","GameFontHighlightSmall") - self.lowtext:SetPoint("TOPLEFT",slider,"BOTTOMLEFT",2,3) - - self.hightext = slider:CreateFontString(nil,"ARTWORK","GameFontHighlightSmall") - self.hightext:SetPoint("TOPRIGHT",slider,"BOTTOMRIGHT",-2,3) - - - local editbox = CreateFrame("EditBox",nil,frame) - editbox:SetAutoFocus(false) - editbox:SetFontObject(GameFontHighlightSmall) - editbox:SetPoint("TOP",slider,"BOTTOM",0,0) - editbox:SetHeight(14) - editbox:SetWidth(70) - editbox:SetJustifyH("CENTER") - editbox:EnableMouse(true) - editbox:SetScript("OnEscapePressed",EditBox_OnEscapePressed) - editbox:SetScript("OnEnterPressed",EditBox_OnEnterPressed) - editbox:SetScript("OnEnter",EditBox_OnEnter) - editbox:SetScript("OnLeave",EditBox_OnLeave) - editbox:SetBackdrop(ManualBackdrop) - editbox:SetBackdropColor(0,0,0,0.5) - editbox:SetBackdropBorderColor(0.3,0.3,0.30,0.80) - self.editbox = editbox - editbox.obj = self - - slider:SetThumbTexture("Interface\\Buttons\\UI-SliderBar-Button-Horizontal") - - frame:SetWidth(200) - frame:SetHeight(44) - slider:SetPoint("TOP",label,"BOTTOM",0,0) - slider:SetPoint("LEFT",frame,"LEFT",3,0) - slider:SetPoint("RIGHT",frame,"RIGHT",-3,0) - +} - slider:SetValue(self.value or 0) - slider:SetScript("OnValueChanged",Slider_OnValueChanged) - - AceGUI:RegisterAsWidget(self) - return self +--[[----------------------------------------------------------------------------- +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 - - AceGUI:RegisterWidgetType(Type,Constructor,Version) + slider.obj, editbox.obj = widget, widget + + return AceGUI:RegisterAsWidget(widget) end + +AceGUI:RegisterWidgetType(Type,Constructor,Version) diff --git a/libs/AceGUI-3.0/widgets/AceGUIWidget-TabGroup.lua b/libs/AceGUI-3.0/widgets/AceGUIWidget-TabGroup.lua deleted file mode 100644 index 12de334..0000000 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-TabGroup.lua +++ /dev/null @@ -1,387 +0,0 @@ -local AceGUI = LibStub("AceGUI-3.0") - --- Lua APIs -local pairs, ipairs, assert, type = pairs, ipairs, assert, type - --- WoW APIs -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 - -------------- --- Widgets -- -------------- ---[[ - Widgets must provide the following functions - Acquire() - Called when the object is aquired, should set everything to a default hidden state - Release() - Called when the object is Released, should remove any anchors and hide the Widget - - 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 - - -]] - --------------------------- --- Tab Group -- --------------------------- - -do - local Type = "TabGroup" - local Version = 24 - - 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 OnAcquire(self) - - end - - local function OnRelease(self) - self.frame:ClearAllPoints() - self.frame:Hide() - 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 - self:SetTitle() - end - - local function Tab_SetText(self, text) - self:_SetText(text) - local width = self.obj.frame.width or self.obj.frame:GetWidth() or 0 - PanelTemplates_TabResize(self, 0, nil, width) - end - - local function UpdateTabLook(self) - if self.disabled then - PanelTemplates_SetDisabledTabState(self) - elseif self.selected then - PanelTemplates_SelectTab(self) - else - PanelTemplates_DeselectTab(self) - end - end - - local function Tab_SetSelected(self, selected) - self.selected = selected - UpdateTabLook(self) - end - - local function Tab_OnClick(self) - if not (self.selected or self.disabled) then - self.obj:SelectTab(self.value) - end - end - - local function Tab_SetDisabled(self, disabled) - self.disabled = disabled - UpdateTabLook(self) - end - - local function Tab_OnEnter(this) - local self = this.obj - self:Fire("OnTabEnter", self.tabs[this.id].value, this) - end - - local function Tab_OnLeave(this) - local self = this.obj - self:Fire("OnTabLeave", self.tabs[this.id].value, this) - end - - local function Tab_OnShow(this) - _G[this:GetName().."HighlightTexture"]:SetWidth(this:GetTextWidth() + 30) - end - - local function CreateTab(self, id) - local tabname = "AceGUITabGroup"..self.num.."Tab"..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", tab, "LEFT", 14, -3) - tab.text:SetPoint("RIGHT", tab, "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 - - local function SetTitle(self, text) - self.titletext:SetText(text or "") - if text and text ~= "" then - self.alignoffset = 25 - else - self.alignoffset = 18 - end - self:BuildTabs() - end - - -- called to set an external table to store status in - local function SetStatusTable(self, status) - assert(type(status) == "table") - self.status = status - end - - local function SelectTab(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 - - local function SetTabs(self, tabs) - self.tablist = tabs - self:BuildTabs() - end - - - local widths = {} - local rowwidths = {} - local rowends = {} - local function BuildTabs(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 - - for i = #widths, 1, -1 do - widths[i] = nil - end - for i = #rowwidths, 1, -1 do - rowwidths[i] = nil - end - for i = #rowends, 1, -1 do - rowends[i] = nil - end - - --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 - local padding = 0 - if not (numrows == 1 and rowwidths[1] < width*0.75) then - padding = (width - rowwidths[row]) / (endtab - starttab+1) - end - - for i = starttab, endtab do - PanelTemplates_TabResize(tabs[i], padding + 4, nil, width) - end - starttab = endtab + 1 - end - - self.borderoffset = (hastitle and 17 or 10)+((numrows)*20) - self.border:SetPoint("TOPLEFT",self.frame,"TOPLEFT",1,-self.borderoffset) - end - - local function BuildTabsOnUpdate(this) - BuildTabs(this.obj) - this:SetScript("OnUpdate", nil) - end - - local function OnWidthSet(self, width) - local content = self.content - local contentwidth = width - 60 - if contentwidth < 0 then - contentwidth = 0 - end - content:SetWidth(contentwidth) - content.width = contentwidth - BuildTabs(self) - self.frame:SetScript("OnUpdate", BuildTabsOnUpdate) - end - - - local function OnHeightSet(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 - - local function LayoutFinished(self, width, height) - if self.noAutoHeight then return end - self:SetHeight((height or 0) + (self.borderoffset + 23)) - end - - local function Constructor() - local frame = CreateFrame("Frame",nil,UIParent) - local self = {} - self.type = Type - - self.num = AceGUI:GetNextWidgetNum(Type) - - self.localstatus = {} - - self.OnRelease = OnRelease - self.OnAcquire = OnAcquire - self.SetTitle = SetTitle - self.CreateTab = CreateTab - self.SelectTab = SelectTab - self.BuildTabs = BuildTabs - self.SetStatusTable = SetStatusTable - self.SetTabs = SetTabs - self.LayoutFinished = LayoutFinished - self.frame = frame - - self.OnWidthSet = OnWidthSet - self.OnHeightSet = OnHeightSet - - frame.obj = self - - frame:SetHeight(100) - frame:SetWidth(100) - frame:SetFrameStrata("FULLSCREEN_DIALOG") - - self.alignoffset = 18 - - local titletext = frame:CreateFontString(nil,"OVERLAY","GameFontNormal") - titletext:SetPoint("TOPLEFT",frame,"TOPLEFT",14,0) - titletext:SetPoint("TOPRIGHT",frame,"TOPRIGHT",-14,0) - titletext:SetJustifyH("LEFT") - titletext:SetHeight(18) - titletext:SetText("") - - self.titletext = titletext - - local border = CreateFrame("Frame",nil,frame) - self.border = border - self.borderoffset = 27 - border:SetPoint("TOPLEFT",frame,"TOPLEFT",1,-27) - border:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-1,3) - - border:SetBackdrop(PaneBackdrop) - border:SetBackdropColor(0.1,0.1,0.1,0.5) - border:SetBackdropBorderColor(0.4,0.4,0.4) - - self.tabs = {} - - --Container Support - local content = CreateFrame("Frame",nil,border) - self.content = content - content.obj = self - content:SetPoint("TOPLEFT",border,"TOPLEFT",10,-7) - content:SetPoint("BOTTOMRIGHT",border,"BOTTOMRIGHT",-10,7) - - AceGUI:RegisterAsContainer(self) - return self - end - - AceGUI:RegisterWidgetType(Type,Constructor,Version) -end diff --git a/libs/AceGUI-3.0/widgets/AceGUIWidget-TreeGroup.lua b/libs/AceGUI-3.0/widgets/AceGUIWidget-TreeGroup.lua deleted file mode 100644 index cd5ecbc..0000000 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-TreeGroup.lua +++ /dev/null @@ -1,746 +0,0 @@ -local AceGUI = LibStub("AceGUI-3.0") - --- 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 = select, table.remove, unpack - --- 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 - --------------- --- TreeView -- --------------- - -do - local Type = "TreeGroup" - local Version = 23 - - local DEFAULT_TREE_WIDTH = 175 - local DEFAULT_TREE_SIZABLE = true - - 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 OnAcquire(self) - self:SetTreeWidth(DEFAULT_TREE_WIDTH,DEFAULT_TREE_SIZABLE) - self:EnableButtonTooltips(true) - end - - local function OnRelease(self) - - self.frame:ClearAllPoints() - self.frame:Hide() - 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 - - local function GetButtonParents(line) - local parent = line.parent - if parent and parent.value then - return parent.value, GetButtonParents(parent) - end - end - - 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 ButtonOnClick(this) - local self = this.obj - self:Fire("OnClick",this.uniquevalue, this.selected) - if not this.selected then - self:SetSelected(this.uniquevalue) - this.selected = true - this:LockHighlight() - self:RefreshTree() - end - AceGUI:ClearFocus() - end - - local function ExpandOnClick(this) - local button = this.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 ButtonOnDoubleClick(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 EnableButtonTooltips(self, enable) - self.enabletooltips = enable - end - - local function Button_OnEnter(this) - local self = this.obj - self:Fire("OnButtonEnter", this.uniquevalue, this) - - if self.enabletooltips then - GameTooltip:SetOwner(this, "ANCHOR_NONE") - GameTooltip:SetPoint("LEFT",this,"RIGHT") - GameTooltip:SetText(this.text:GetText() or "", 1, .82, 0, 1) - - GameTooltip:Show() - end - end - - local function Button_OnLeave(this) - local self = this.obj - self:Fire("OnButtonLeave", this.uniquevalue, this) - - if self.enabletooltips then - GameTooltip:Hide() - end - end - - - local buttoncount = 1 - local function CreateButton(self) - local button = CreateFrame("Button",("AceGUI30TreeButton%d"):format(buttoncount),self.treeframe, "OptionsListButtonTemplate") - buttoncount = buttoncount + 1 - button.obj = self - - local icon = button:CreateTexture(nil, "OVERLAY") - icon:SetWidth(14) - icon:SetHeight(14) - button.icon = icon - - button:SetScript("OnClick",ButtonOnClick) - button:SetScript("OnDoubleClick", ButtonOnDoubleClick) - button:SetScript("OnEnter",Button_OnEnter) - button:SetScript("OnLeave",Button_OnLeave) - - button.toggle.button = button - button.toggle:SetScript("OnClick",ExpandOnClick) - - return button - 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", button, "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 OnScrollValueChanged(this, value) - if this.obj.noupdate then return end - local self = this.obj - local status = self.status or self.localstatus - status.scrollvalue = value - self:RefreshTree() - AceGUI:ClearFocus() - end - - -- called to set an external table to store status in - local function SetStatusTable(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 not status.treesizable then - status.treesizable = DEFAULT_TREE_SIZABLE - end - self:SetTreeWidth(status.treewidth,status.treesizable) - self:RefreshTree() - end - - --sets the tree to be displayed - --[[ - example tree - - Alpha - Bravo - -Charlie - -Delta - -Echo - Foxtrot - - tree = { - { - value = "A", - text = "Alpha" - }, - { - value = "B", - text = "Bravo", - children = { - { - value = "C", - text = "Charlie" - }, - { - value = "D", - text = "Delta" - children = { - { - value = "E", - text = "Echo" - } - } - } - } - }, - { - value = "F", - text = "Foxtrot" - }, - } - ]] - local function SetTree(self, tree, filter) - self.filter = filter - if tree then - assert(type(tree) == "table") - end - self.tree = tree - self:RefreshTree() - 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 - - local function BuildLevel(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 - - --fire an update after one frame to catch the treeframes height - local function FirstFrameUpdate(this) - local self = this.obj - this:SetScript("OnUpdate",nil) - self:RefreshTree() - end - - local function ResizeUpdate(this) - this.obj:RefreshTree() - end - - local function RefreshTree(self) - 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 - - self:BuildLevel(tree, 1) - - local numlines = #lines - - local maxlines = (floor(((self.treeframe:GetHeight()or 0) - 20 ) / 18)) - - local first, last - - 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 - self.scrollbar:SetValue(status.scrollvalue) - end - self.noupdate = nil - first, last = status.scrollvalue+1, status.scrollvalue + maxlines - 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 i == 1 then - if self.showscroll then - button:SetPoint("TOPRIGHT", self.treeframe,"TOPRIGHT",-22,-10) - button:SetPoint("TOPLEFT", self.treeframe, "TOPLEFT", 0, -10) - else - button:SetPoint("TOPRIGHT", self.treeframe,"TOPRIGHT",0,-10) - button:SetPoint("TOPLEFT", self.treeframe, "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 - - local function SetSelected(self, value) - local status = self.status or self.localstatus - if status.selected ~= value then - status.selected = value - self:Fire("OnGroupSelected", value) - end - end - - local function BuildUniqueValue(...) - local n = select('#', ...) - if n == 1 then - return ... - else - return (...).."\001"..BuildUniqueValue(select(2,...)) - end - end - - local function Select(self, uniquevalue, ...) - self.filter = false - local status = self.status or self.localstatus - local groups = status.groups - for i = 1, select('#', ...) do - groups[BuildUniqueValue(select(i, ...))] = true - end - status.selected = uniquevalue - self:RefreshTree() - self:Fire("OnGroupSelected", uniquevalue) - end - - local function SelectByPath(self, ...) - self:Select(BuildUniqueValue(...), ...) - end - - --Selects a tree node by UniqueValue - local function SelectByValue(self, uniquevalue) - self:Select(uniquevalue, ("\001"):split(uniquevalue)) - end - - - local function ShowScroll(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 - - local function OnWidthSet(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 - - - local function OnHeightSet(self, height) - local content = self.content - local contentheight = height - 20 - if contentheight < 0 then - contentheight = 0 - end - content:SetHeight(contentheight) - content.height = contentheight - end - - - local function TreeOnMouseWheel(this, delta) - local self = this.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 SetTreeWidth(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 - - local function draggerLeave(this) - this:SetBackdropColor(1, 1, 1, 0) - end - - local function draggerEnter(this) - this:SetBackdropColor(1, 1, 1, 0.8) - end - - local function draggerDown(this) - local treeframe = this:GetParent() - treeframe:StartSizing("RIGHT") - end - - local function draggerUp(this) - local treeframe = this: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 - - local function LayoutFinished(self, width, height) - if self.noAutoHeight then return end - self:SetHeight((height or 0) + 20) - end - - local createdcount = 0 - local function Constructor() - local frame = CreateFrame("Frame",nil,UIParent) - local self = {} - self.type = Type - self.lines = {} - self.levels = {} - self.buttons = {} - self.hasChildren = {} - self.localstatus = {} - self.localstatus.groups = {} - self.filter = false - - local treeframe = CreateFrame("Frame",nil,frame) - treeframe.obj = self - treeframe:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0) - treeframe:SetPoint("BOTTOMLEFT",frame,"BOTTOMLEFT",0,0) - treeframe:SetWidth(DEFAULT_TREE_WIDTH) - treeframe:SetScript("OnUpdate",FirstFrameUpdate) - treeframe:SetScript("OnSizeChanged",ResizeUpdate) - - treeframe:EnableMouseWheel(true) - treeframe:SetScript("OnMouseWheel", TreeOnMouseWheel) - 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) - 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("OnMouseDown", draggerDown) - dragger:SetScript("OnMouseUp", draggerUp) - dragger:SetScript("OnEnter", draggerEnter) - dragger:SetScript("OnLeave", draggerLeave) - - self.dragger = dragger - self.treeframe = treeframe - self.OnRelease = OnRelease - self.OnAcquire = OnAcquire - - self.SetTree = SetTree - self.SetTreeWidth = SetTreeWidth - self.RefreshTree = RefreshTree - self.SetStatusTable = SetStatusTable - self.BuildLevel = BuildLevel - self.CreateButton = CreateButton - self.SetSelected = SetSelected - self.ShowScroll = ShowScroll - self.SetStatusTable = SetStatusTable - self.Select = Select - self.SelectByValue = SelectByValue - self.SelectByPath = SelectByPath - self.OnWidthSet = OnWidthSet - self.OnHeightSet = OnHeightSet - self.EnableButtonTooltips = EnableButtonTooltips - --self.Filter = Filter - self.LayoutFinished = LayoutFinished - - self.frame = frame - frame.obj = self - - createdcount = createdcount + 1 - local scrollbar = CreateFrame("Slider",("AceConfigDialogTreeGroup%dScrollBar"):format(createdcount),treeframe,"UIPanelScrollBarTemplate") - self.scrollbar = scrollbar - local scrollbg = scrollbar:CreateTexture(nil,"BACKGROUND") - scrollbg:SetAllPoints(scrollbar) - scrollbg:SetTexture(0,0,0,0.4) - scrollbar.obj = self - self.noupdate = true - scrollbar:SetPoint("TOPRIGHT",treeframe,"TOPRIGHT",-10,-26) - scrollbar:SetPoint("BOTTOMRIGHT",treeframe,"BOTTOMRIGHT",-10,26) - scrollbar:SetScript("OnValueChanged", OnScrollValueChanged) - scrollbar:SetMinMaxValues(0,0) - self.localstatus.scrollvalue = 0 - scrollbar:SetValueStep(1) - scrollbar:SetValue(0) - scrollbar:SetWidth(16) - self.noupdate = nil - - local border = CreateFrame("Frame",nil,frame) - self.border = border - border:SetPoint("TOPLEFT",treeframe,"TOPRIGHT", 0,0) - border:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,0) - - 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) - self.content = content - content.obj = self - content:SetPoint("TOPLEFT",border,"TOPLEFT",10,-10) - content:SetPoint("BOTTOMRIGHT",border,"BOTTOMRIGHT",-10,10) - - AceGUI:RegisterAsContainer(self) - --AceGUI:RegisterAsWidget(self) - return self - end - - AceGUI:RegisterWidgetType(Type,Constructor,Version) -end diff --git a/libs/AceGUI-3.0/widgets/AceGUIWidget-Window.lua b/libs/AceGUI-3.0/widgets/AceGUIWidget-Window.lua deleted file mode 100644 index 3474e3a..0000000 --- a/libs/AceGUI-3.0/widgets/AceGUIWidget-Window.lua +++ /dev/null @@ -1,328 +0,0 @@ -local AceGUI = LibStub("AceGUI-3.0") - --- Lua APIs -local pairs, assert, type = pairs, assert, type - --- 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: GameFontNormal - ----------------- --- Main Frame -- ----------------- ---[[ - Events : - OnClose - -]] -do - local Type = "Window" - local Version = 2 - - local function frameOnClose(this) - this.obj:Fire("OnClose") - end - - local function closeOnClick(this) - 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) - 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/AceTimer-3.0/.AceTimer-3.0.lua.swp b/libs/AceTimer-3.0/.AceTimer-3.0.lua.swp new file mode 100755 index 0000000..f7779e7 Binary files /dev/null and b/libs/AceTimer-3.0/.AceTimer-3.0.lua.swp differ diff --git a/libs/AceTimer-3.0/AceTimer-3.0.lua b/libs/AceTimer-3.0/AceTimer-3.0.lua new file mode 100755 index 0000000..1f40e1e --- /dev/null +++ b/libs/AceTimer-3.0/AceTimer-3.0.lua @@ -0,0 +1,473 @@ +--- **AceTimer-3.0** provides a central facility for registering timers. +-- AceTimer supports one-shot timers and repeating timers. All timers are stored in an efficient +-- data structure that allows easy dispatching and fast rescheduling. Timers can be registered, rescheduled +-- or canceled at any time, even from within a running timer, without conflict or large overhead.\\ +-- AceTimer is currently limited to firing timers at a frequency of 0.1s. This constant may change +-- in the future, but for now it seemed like a good compromise in efficiency and accuracy. +-- +-- All `:Schedule` functions will return a handle to the current timer, which you will need to store if you +-- need to cancel or reschedule the timer you just registered. +-- +-- **AceTimer-3.0** can be embeded into your addon, either explicitly by calling AceTimer: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 AceTimer itself.\\ +-- It is recommended to embed AceTimer, otherwise you'll have to specify a custom `self` on all calls you +-- make into AceTimer. +-- @class file +-- @name AceTimer-3.0 +-- @release $Id: AceTimer-3.0.lua 895 2009-12-06 16:28:55Z nevcairiel $ + +--[[ + Basic assumptions: + * In a typical system, we do more re-scheduling per second than there are timer pulses per second + * Regardless of timer implementation, we cannot guarantee timely delivery due to FPS restriction (may be as low as 10) + + This implementation: + CON: The smallest timer interval is constrained by HZ (currently 1/10s). + PRO: It will still correctly fire any timer slower than HZ over a length of time, e.g. 0.11s interval -> 90 times over 10 seconds + PRO: In lag bursts, the system simly skips missed timer intervals to decrease load + CON: Algorithms depending on a timer firing "N times per minute" will fail + PRO: (Re-)scheduling is O(1) with a VERY small constant. It's a simple linked list insertion in a hash bucket. + CAUTION: The BUCKETS constant constrains how many timers can be efficiently handled. With too many hash collisions, performance will decrease. + + Major assumptions upheld: + - ALLOWS scheduling multiple timers with the same funcref/method + - ALLOWS scheduling more timers during OnUpdate processing + - ALLOWS unscheduling ANY timer (including the current running one) at any time, including during OnUpdate processing +]] + +local MAJOR, MINOR = "AceTimer-3.0", 5 +local AceTimer, oldminor = LibStub:NewLibrary(MAJOR, MINOR) + +if not AceTimer then return end -- No upgrade needed + +AceTimer.hash = AceTimer.hash or {} -- Array of [0..BUCKET-1] = linked list of timers (using .next member) + -- Linked list gets around ACE-88 and ACE-90. +AceTimer.selfs = AceTimer.selfs or {} -- Array of [self]={[handle]=timerobj, [handle2]=timerobj2, ...} +AceTimer.frame = AceTimer.frame or CreateFrame("Frame", "AceTimer30Frame") + +-- Lua APIs +local assert, error, loadstring = assert, error, loadstring +local setmetatable, rawset, rawget = setmetatable, rawset, rawget +local select, pairs, type, next, tostring = select, pairs, type, next, tostring +local floor, max, min = math.floor, math.max, math.min +local tconcat = table.concat + +-- WoW APIs +local GetTime = GetTime + +-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded +-- List them here for Mikk's FindGlobals script +-- GLOBALS: DEFAULT_CHAT_FRAME, geterrorhandler + +-- Simple ONE-SHOT timer cache. Much more efficient than a full compost for our purposes. +local timerCache = nil + +--[[ + Timers will not be fired more often than HZ-1 times per second. + Keep at intended speed PLUS ONE or we get bitten by floating point rounding errors (n.5 + 0.1 can be n.599999) + If this is ever LOWERED, all existing timers need to be enforced to have a delay >= 1/HZ on lib upgrade. + If this number is ever changed, all entries need to be rehashed on lib upgrade. + ]] +local HZ = 11 + +--[[ + Prime for good distribution + If this number is ever changed, all entries need to be rehashed on lib upgrade. +]] +local BUCKETS = 131 + +local hash = AceTimer.hash +for i=1,BUCKETS do + hash[i] = hash[i] or false -- make it an integer-indexed array; it's faster than hashes +end + +--[[ + xpcall safecall implementation +]] +local xpcall = xpcall + +local function errorhandler(err) + return geterrorhandler()(err) +end + +local function CreateDispatcher(argCount) + local code = [[ + local xpcall, eh = ... -- our arguments are received as unnamed values in "..." since we don't have a proper function declaration + 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 lastint = floor(GetTime() * HZ) + +-- -------------------------------------------------------------------- +-- OnUpdate handler +-- +-- traverse buckets, always chasing "now", and fire timers that have expired + +local function OnUpdate() + local now = GetTime() + local nowint = floor(now * HZ) + + -- Have we passed into a new hash bucket? + if nowint == lastint then return end + + local soon = now + 1 -- +1 is safe as long as 1 < HZ < BUCKETS/2 + + -- Pass through each bucket at most once + -- Happens on e.g. instance loads, but COULD happen on high local load situations also + for curint = (max(lastint, nowint - BUCKETS) + 1), nowint do -- loop until we catch up with "now", usually only 1 iteration + local curbucket = (curint % BUCKETS)+1 + -- Yank the list of timers out of the bucket and empty it. This allows reinsertion in the currently-processed bucket from callbacks. + local nexttimer = hash[curbucket] + hash[curbucket] = false -- false rather than nil to prevent the array from becoming a hash + + while nexttimer do + local timer = nexttimer + nexttimer = timer.next + local when = timer.when + + if when < soon then + -- Call the timer func, either as a method on given object, or a straight function ref + local callback = timer.callback + if type(callback) == "string" then + safecall(timer.object[callback], timer.object, timer.arg) + elseif callback then + safecall(callback, timer.arg) + else + -- probably nilled out by CancelTimer + timer.delay = nil -- don't reschedule it + end + + local delay = timer.delay -- NOW make a local copy, can't do it earlier in case the timer cancelled itself in the callback + + if not delay then + -- single-shot timer (or cancelled) + AceTimer.selfs[timer.object][tostring(timer)] = nil + timerCache = timer + else + -- repeating timer + local newtime = when + delay + if newtime < now then -- Keep lag from making us firing a timer unnecessarily. (Note that this still won't catch too-short-delay timers though.) + newtime = now + delay + end + timer.when = newtime + + -- add next timer execution to the correct bucket + local bucket = (floor(newtime * HZ) % BUCKETS) + 1 + timer.next = hash[bucket] + hash[bucket] = timer + end + else -- if when>=soon + -- reinsert (yeah, somewhat expensive, but shouldn't be happening too often either due to hash distribution) + timer.next = hash[curbucket] + hash[curbucket] = timer + end -- if when<soon ... else + end -- while nexttimer do + end -- for curint=lastint,nowint + + lastint = nowint +end + +-- --------------------------------------------------------------------- +-- Reg( callback, delay, arg, repeating ) +-- +-- callback( function or string ) - direct function ref or method name in our object for the callback +-- delay(int) - delay for the timer +-- arg(variant) - any argument to be passed to the callback function +-- repeating(boolean) - repeating timer, or oneshot +-- +-- returns the handle of the timer for later processing (canceling etc) +local function Reg(self, callback, delay, arg, repeating) + if type(callback) ~= "string" and type(callback) ~= "function" then + local error_origin = repeating and "ScheduleRepeatingTimer" or "ScheduleTimer" + error(MAJOR..": " .. error_origin .. "(callback, delay, arg): 'callback' - function or method name expected.", 3) + end + if type(callback) == "string" then + if type(self)~="table" then + local error_origin = repeating and "ScheduleRepeatingTimer" or "ScheduleTimer" + error(MAJOR..": " .. error_origin .. "(\"methodName\", delay, arg): 'self' - must be a table.", 3) + end + if type(self[callback]) ~= "function" then + local error_origin = repeating and "ScheduleRepeatingTimer" or "ScheduleTimer" + error(MAJOR..": " .. error_origin .. "(\"methodName\", delay, arg): 'methodName' - method not found on target object.", 3) + end + end + + if delay < (1 / (HZ - 1)) then + delay = 1 / (HZ - 1) + end + + -- Create and stuff timer in the correct hash bucket + local now = GetTime() + + local timer = timerCache or {} -- Get new timer object (from cache if available) + timerCache = nil + + timer.object = self + timer.callback = callback + timer.delay = (repeating and delay) + timer.arg = arg + timer.when = now + delay + + local bucket = (floor((now+delay)*HZ) % BUCKETS) + 1 + timer.next = hash[bucket] + hash[bucket] = timer + + -- Insert timer in our self->handle->timer registry + local handle = tostring(timer) + + local selftimers = AceTimer.selfs[self] + if not selftimers then + selftimers = {} + AceTimer.selfs[self] = selftimers + end + selftimers[handle] = timer + selftimers.__ops = (selftimers.__ops or 0) + 1 + + return handle +end + +--- Schedule a new one-shot timer. +-- The timer will fire once in `delay` seconds, unless canceled before. +-- @param callback Callback function for the timer pulse (funcref or method name). +-- @param delay Delay for the timer, in seconds. +-- @param arg An optional argument to be passed to the callback function. +-- @usage +-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("TimerTest", "AceTimer-3.0") +-- +-- function MyAddon:OnEnable() +-- self:ScheduleTimer("TimerFeedback", 5) +-- end +-- +-- function MyAddon:TimerFeedback() +-- print("5 seconds passed") +-- end +function AceTimer:ScheduleTimer(callback, delay, arg) + return Reg(self, callback, delay, arg) +end + +--- Schedule a repeating timer. +-- The timer will fire every `delay` seconds, until canceled. +-- @param callback Callback function for the timer pulse (funcref or method name). +-- @param delay Delay for the timer, in seconds. +-- @param arg An optional argument to be passed to the callback function. +-- @usage +-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("TimerTest", "AceTimer-3.0") +-- +-- function MyAddon:OnEnable() +-- self.timerCount = 0 +-- self.testTimer = self:ScheduleRepeatingTimer("TimerFeedback", 5) +-- end +-- +-- function MyAddon:TimerFeedback() +-- self.timerCount = self.timerCount + 1 +-- print(("%d seconds passed"):format(5 * self.timerCount)) +-- -- run 30 seconds in total +-- if self.timerCount == 6 then +-- self:CancelTimer(self.testTimer) +-- end +-- end +function AceTimer:ScheduleRepeatingTimer(callback, delay, arg) + return Reg(self, callback, delay, arg, true) +end + +--- Cancels a timer with the given handle, registered by the same addon object as used for `:ScheduleTimer` +-- Both one-shot and repeating timers can be canceled with this function, as long as the `handle` is valid +-- and the timer has not fired yet or was canceled before. +-- @param handle The handle of the timer, as returned by `:ScheduleTimer` or `:ScheduleRepeatingTimer` +-- @param silent If true, no error is raised if the timer handle is invalid (expired or already canceled) +-- @return True if the timer was successfully cancelled. +function AceTimer:CancelTimer(handle, silent) + if not handle then return end -- nil handle -> bail out without erroring + if type(handle) ~= "string" then + error(MAJOR..": CancelTimer(handle): 'handle' - expected a string", 2) -- for now, anyway + end + local selftimers = AceTimer.selfs[self] + local timer = selftimers and selftimers[handle] + if silent then + if timer then + timer.callback = nil -- don't run it again + timer.delay = nil -- if this is the currently-executing one: don't even reschedule + -- The timer object is removed in the OnUpdate loop + end + return not not timer -- might return "true" even if we double-cancel. we'll live. + else + if not timer then + geterrorhandler()(MAJOR..": CancelTimer(handle[, silent]): '"..tostring(handle).."' - no such timer registered") + return false + end + if not timer.callback then + geterrorhandler()(MAJOR..": CancelTimer(handle[, silent]): '"..tostring(handle).."' - timer already cancelled or expired") + return false + end + timer.callback = nil -- don't run it again + timer.delay = nil -- if this is the currently-executing one: don't even reschedule + return true + end +end + +--- Cancels all timers registered to the current addon object ('self') +function AceTimer:CancelAllTimers() + if not(type(self) == "string" or type(self) == "table") then + error(MAJOR..": CancelAllTimers(): 'self' - must be a string or a table",2) + end + if self == AceTimer then + error(MAJOR..": CancelAllTimers(): supply a meaningful 'self'", 2) + end + + local selftimers = AceTimer.selfs[self] + if selftimers then + for handle,v in pairs(selftimers) do + if type(v) == "table" then -- avoid __ops, etc + AceTimer.CancelTimer(self, handle, true) + end + end + end +end + +--- Returns the time left for a timer with the given handle, registered by the current addon object ('self'). +-- This function will raise a warning when the handle is invalid, but not stop execution. +-- @param handle The handle of the timer, as returned by `:ScheduleTimer` or `:ScheduleRepeatingTimer` +-- @return The time left on the timer, or false if the handle is invalid. +function AceTimer:TimeLeft(handle) + if not handle then return end + if type(handle) ~= "string" then + error(MAJOR..": TimeLeft(handle): 'handle' - expected a string", 2) -- for now, anyway + end + local selftimers = AceTimer.selfs[self] + local timer = selftimers and selftimers[handle] + if not timer then + geterrorhandler()(MAJOR..": TimeLeft(handle): '"..tostring(handle).."' - no such timer registered") + return false + end + return timer.when - GetTime() +end + + +-- --------------------------------------------------------------------- +-- PLAYER_REGEN_ENABLED: Run through our .selfs[] array step by step +-- and clean it out - otherwise the table indices can grow indefinitely +-- if an addon starts and stops a lot of timers. AceBucket does this! +-- +-- See ACE-94 and tests/AceTimer-3.0-ACE-94.lua + +local lastCleaned = nil + +local function OnEvent(this, event) + if event~="PLAYER_REGEN_ENABLED" then + return + end + + -- Get the next 'self' to process + local selfs = AceTimer.selfs + local self = next(selfs, lastCleaned) + if not self then + self = next(selfs) + end + lastCleaned = self + if not self then -- should only happen if .selfs[] is empty + return + end + + -- Time to clean it out? + local list = selfs[self] + if (list.__ops or 0) < 250 then -- 250 slosh indices = ~10KB wasted (max!). For one 'self'. + return + end + + -- Create a new table and copy all members over + local newlist = {} + local n=0 + for k,v in pairs(list) do + newlist[k] = v + n=n+1 + end + newlist.__ops = 0 -- Reset operation count + + -- And since we now have a count of the number of live timers, check that it's reasonable. Emit a warning if not. + if n>BUCKETS then + DEFAULT_CHAT_FRAME:AddMessage(MAJOR..": Warning: The addon/module '"..tostring(self).."' has "..n.." live timers. Surely that's not intended?") + end + + selfs[self] = newlist +end + +-- --------------------------------------------------------------------- +-- Embed handling + +AceTimer.embeds = AceTimer.embeds or {} + +local mixins = { + "ScheduleTimer", "ScheduleRepeatingTimer", + "CancelTimer", "CancelAllTimers", + "TimeLeft" +} + +function AceTimer:Embed(target) + AceTimer.embeds[target] = true + for _,v in pairs(mixins) do + target[v] = AceTimer[v] + end + return target +end + +-- AceTimer:OnEmbedDisable( target ) +-- target (object) - target object that AceTimer is embedded in. +-- +-- cancel all timers registered for the object +function AceTimer:OnEmbedDisable( target ) + target:CancelAllTimers() +end + + +for addon in pairs(AceTimer.embeds) do + AceTimer:Embed(addon) +end + +-- --------------------------------------------------------------------- +-- Debug tools (expose copies of internals to test suites) +AceTimer.debug = AceTimer.debug or {} +AceTimer.debug.HZ = HZ +AceTimer.debug.BUCKETS = BUCKETS + +-- --------------------------------------------------------------------- +-- Finishing touchups + +AceTimer.frame:SetScript("OnUpdate", OnUpdate) +AceTimer.frame:SetScript("OnEvent", OnEvent) +AceTimer.frame:RegisterEvent("PLAYER_REGEN_ENABLED") + +-- In theory, we should hide&show the frame based on there being timers or not. +-- However, this job is fairly expensive, and the chance that there will +-- actually be zero timers running is diminuitive to say the lest. diff --git a/libs/AceTimer-3.0/AceTimer-3.0.xml b/libs/AceTimer-3.0/AceTimer-3.0.xml new file mode 100755 index 0000000..7c478a4 --- /dev/null +++ b/libs/AceTimer-3.0/AceTimer-3.0.xml @@ -0,0 +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="AceTimer-3.0.lua"/> +</Ui> \ No newline at end of file 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 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 diff --git a/libs/LibStub-1.0/LibStub-1.0.lua b/libs/LibStub-1.0/LibStub-1.0.lua old mode 100644 new mode 100755 diff --git a/libs/LibStub-1.0/LibStub-1.0.xml b/libs/LibStub-1.0/LibStub-1.0.xml old mode 100644 new mode 100755 diff --git a/libs/tekKonfigAboutPanel.lua b/libs/tekKonfigAboutPanel.lua old mode 100644 new mode 100755 diff --git a/locale/enGB.lua b/locale/enGB.lua old mode 100644 new mode 100755