diff --git a/Titan/Artwork/Custom/AllBlack Skin/TitanPanelBackgroundBottom1.tga b/Titan/Artwork/Custom/AllBlack Skin/TitanPanelBackgroundBottom1.tga deleted file mode 100644 index 25fabdb..0000000 Binary files a/Titan/Artwork/Custom/AllBlack Skin/TitanPanelBackgroundBottom1.tga and /dev/null differ diff --git a/Titan/Artwork/Custom/AllBlack Skin/TitanPanelBackgroundTop1.tga b/Titan/Artwork/Custom/AllBlack Skin/TitanPanelBackgroundTop1.tga deleted file mode 100644 index 25fabdb..0000000 Binary files a/Titan/Artwork/Custom/AllBlack Skin/TitanPanelBackgroundTop1.tga and /dev/null differ diff --git a/Titan/Artwork/Custom/BlackPlusOne Skin/TitanPanelBackgroundBottom1.tga b/Titan/Artwork/Custom/BlackPlusOne Skin/TitanPanelBackgroundBottom1.tga deleted file mode 100644 index e56e01f..0000000 Binary files a/Titan/Artwork/Custom/BlackPlusOne Skin/TitanPanelBackgroundBottom1.tga and /dev/null differ diff --git a/Titan/Artwork/Custom/BlackPlusOne Skin/TitanPanelBackgroundTop1.tga b/Titan/Artwork/Custom/BlackPlusOne Skin/TitanPanelBackgroundTop1.tga deleted file mode 100644 index e56e01f..0000000 Binary files a/Titan/Artwork/Custom/BlackPlusOne Skin/TitanPanelBackgroundTop1.tga and /dev/null differ diff --git a/Titan/Artwork/Custom/Charcoal Metal/TitanPanelBackgroundBottom1.blp b/Titan/Artwork/Custom/Charcoal Metal/TitanPanelBackgroundBottom1.blp deleted file mode 100644 index c0c6d28..0000000 Binary files a/Titan/Artwork/Custom/Charcoal Metal/TitanPanelBackgroundBottom1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Charcoal Metal/TitanPanelBackgroundTop1.blp b/Titan/Artwork/Custom/Charcoal Metal/TitanPanelBackgroundTop1.blp deleted file mode 100644 index 8cdf073..0000000 Binary files a/Titan/Artwork/Custom/Charcoal Metal/TitanPanelBackgroundTop1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Christmas Skin/TitanPanelBackgroundBottom1.blp b/Titan/Artwork/Custom/Christmas Skin/TitanPanelBackgroundBottom1.blp deleted file mode 100644 index f2304d2..0000000 Binary files a/Titan/Artwork/Custom/Christmas Skin/TitanPanelBackgroundBottom1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Christmas Skin/TitanPanelBackgroundTop1.blp b/Titan/Artwork/Custom/Christmas Skin/TitanPanelBackgroundTop1.blp deleted file mode 100644 index 058f5b6..0000000 Binary files a/Titan/Artwork/Custom/Christmas Skin/TitanPanelBackgroundTop1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Crusader Skin/TitanPanelBackgroundBottom1.blp b/Titan/Artwork/Custom/Crusader Skin/TitanPanelBackgroundBottom1.blp deleted file mode 100644 index 261a05a..0000000 Binary files a/Titan/Artwork/Custom/Crusader Skin/TitanPanelBackgroundBottom1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Crusader Skin/TitanPanelBackgroundTop1.blp b/Titan/Artwork/Custom/Crusader Skin/TitanPanelBackgroundTop1.blp deleted file mode 100644 index d623075..0000000 Binary files a/Titan/Artwork/Custom/Crusader Skin/TitanPanelBackgroundTop1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Cursed Orange Skin/TitanPanelBackgroundBottom1.blp b/Titan/Artwork/Custom/Cursed Orange Skin/TitanPanelBackgroundBottom1.blp deleted file mode 100644 index 8b7f79c..0000000 Binary files a/Titan/Artwork/Custom/Cursed Orange Skin/TitanPanelBackgroundBottom1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Cursed Orange Skin/TitanPanelBackgroundTop1.blp b/Titan/Artwork/Custom/Cursed Orange Skin/TitanPanelBackgroundTop1.blp deleted file mode 100644 index cfcf3cf..0000000 Binary files a/Titan/Artwork/Custom/Cursed Orange Skin/TitanPanelBackgroundTop1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Dark Wood Skin/TitanPanelBackgroundBottom1.blp b/Titan/Artwork/Custom/Dark Wood Skin/TitanPanelBackgroundBottom1.blp deleted file mode 100644 index a29b07c..0000000 Binary files a/Titan/Artwork/Custom/Dark Wood Skin/TitanPanelBackgroundBottom1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Dark Wood Skin/TitanPanelBackgroundTop1.blp b/Titan/Artwork/Custom/Dark Wood Skin/TitanPanelBackgroundTop1.blp deleted file mode 100644 index c6c2461..0000000 Binary files a/Titan/Artwork/Custom/Dark Wood Skin/TitanPanelBackgroundTop1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Deep Cave Skin/TitanPanelBackgroundBottom1.blp b/Titan/Artwork/Custom/Deep Cave Skin/TitanPanelBackgroundBottom1.blp deleted file mode 100644 index ed40f5c..0000000 Binary files a/Titan/Artwork/Custom/Deep Cave Skin/TitanPanelBackgroundBottom1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Deep Cave Skin/TitanPanelBackgroundTop1.blp b/Titan/Artwork/Custom/Deep Cave Skin/TitanPanelBackgroundTop1.blp deleted file mode 100644 index 0600d95..0000000 Binary files a/Titan/Artwork/Custom/Deep Cave Skin/TitanPanelBackgroundTop1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Elfwood Skin/TitanPanelBackgroundBottom1.blp b/Titan/Artwork/Custom/Elfwood Skin/TitanPanelBackgroundBottom1.blp deleted file mode 100644 index 3a91710..0000000 Binary files a/Titan/Artwork/Custom/Elfwood Skin/TitanPanelBackgroundBottom1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Elfwood Skin/TitanPanelBackgroundTop1.blp b/Titan/Artwork/Custom/Elfwood Skin/TitanPanelBackgroundTop1.blp deleted file mode 100644 index 84c6755..0000000 Binary files a/Titan/Artwork/Custom/Elfwood Skin/TitanPanelBackgroundTop1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Engineer Skin/TitanPanelBackgroundBottom1.blp b/Titan/Artwork/Custom/Engineer Skin/TitanPanelBackgroundBottom1.blp deleted file mode 100644 index b27b3cf..0000000 Binary files a/Titan/Artwork/Custom/Engineer Skin/TitanPanelBackgroundBottom1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Engineer Skin/TitanPanelBackgroundTop1.blp b/Titan/Artwork/Custom/Engineer Skin/TitanPanelBackgroundTop1.blp deleted file mode 100644 index 49c0074..0000000 Binary files a/Titan/Artwork/Custom/Engineer Skin/TitanPanelBackgroundTop1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Frozen Metal Skin/TitanPanelBackgroundBottom1.blp b/Titan/Artwork/Custom/Frozen Metal Skin/TitanPanelBackgroundBottom1.blp deleted file mode 100644 index 6e767ae..0000000 Binary files a/Titan/Artwork/Custom/Frozen Metal Skin/TitanPanelBackgroundBottom1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Frozen Metal Skin/TitanPanelBackgroundTop1.blp b/Titan/Artwork/Custom/Frozen Metal Skin/TitanPanelBackgroundTop1.blp deleted file mode 100644 index 64cda10..0000000 Binary files a/Titan/Artwork/Custom/Frozen Metal Skin/TitanPanelBackgroundTop1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Graphic Skin/TitanPanelBackgroundBottom1.blp b/Titan/Artwork/Custom/Graphic Skin/TitanPanelBackgroundBottom1.blp deleted file mode 100644 index ed19072..0000000 Binary files a/Titan/Artwork/Custom/Graphic Skin/TitanPanelBackgroundBottom1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Graphic Skin/TitanPanelBackgroundTop1.blp b/Titan/Artwork/Custom/Graphic Skin/TitanPanelBackgroundTop1.blp deleted file mode 100644 index 44a70cd..0000000 Binary files a/Titan/Artwork/Custom/Graphic Skin/TitanPanelBackgroundTop1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Graveyard Skin/TitanPanelBackgroundBottom1.blp b/Titan/Artwork/Custom/Graveyard Skin/TitanPanelBackgroundBottom1.blp deleted file mode 100644 index e0a82c9..0000000 Binary files a/Titan/Artwork/Custom/Graveyard Skin/TitanPanelBackgroundBottom1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Graveyard Skin/TitanPanelBackgroundTop1.blp b/Titan/Artwork/Custom/Graveyard Skin/TitanPanelBackgroundTop1.blp deleted file mode 100644 index 5b49166..0000000 Binary files a/Titan/Artwork/Custom/Graveyard Skin/TitanPanelBackgroundTop1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Hidden Leaf Skin/TitanPanelBackgroundBottom1.blp b/Titan/Artwork/Custom/Hidden Leaf Skin/TitanPanelBackgroundBottom1.blp deleted file mode 100644 index 74f8c69..0000000 Binary files a/Titan/Artwork/Custom/Hidden Leaf Skin/TitanPanelBackgroundBottom1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Hidden Leaf Skin/TitanPanelBackgroundTop1.blp b/Titan/Artwork/Custom/Hidden Leaf Skin/TitanPanelBackgroundTop1.blp deleted file mode 100644 index d5bc403..0000000 Binary files a/Titan/Artwork/Custom/Hidden Leaf Skin/TitanPanelBackgroundTop1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Holy Warrior Skin/TitanPanelBackgroundBottom1.blp b/Titan/Artwork/Custom/Holy Warrior Skin/TitanPanelBackgroundBottom1.blp deleted file mode 100644 index 882b24d..0000000 Binary files a/Titan/Artwork/Custom/Holy Warrior Skin/TitanPanelBackgroundBottom1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Holy Warrior Skin/TitanPanelBackgroundTop1.blp b/Titan/Artwork/Custom/Holy Warrior Skin/TitanPanelBackgroundTop1.blp deleted file mode 100644 index ac6c11e..0000000 Binary files a/Titan/Artwork/Custom/Holy Warrior Skin/TitanPanelBackgroundTop1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Nightlife Skin/TitanPanelBackgroundBottom1.blp b/Titan/Artwork/Custom/Nightlife Skin/TitanPanelBackgroundBottom1.blp deleted file mode 100644 index c454816..0000000 Binary files a/Titan/Artwork/Custom/Nightlife Skin/TitanPanelBackgroundBottom1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Nightlife Skin/TitanPanelBackgroundTop1.blp b/Titan/Artwork/Custom/Nightlife Skin/TitanPanelBackgroundTop1.blp deleted file mode 100644 index dafc5b9..0000000 Binary files a/Titan/Artwork/Custom/Nightlife Skin/TitanPanelBackgroundTop1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Orgrimmar Skin/TitanPanelBackgroundBottom1.blp b/Titan/Artwork/Custom/Orgrimmar Skin/TitanPanelBackgroundBottom1.blp deleted file mode 100644 index e4b14e1..0000000 Binary files a/Titan/Artwork/Custom/Orgrimmar Skin/TitanPanelBackgroundBottom1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Orgrimmar Skin/TitanPanelBackgroundTop1.blp b/Titan/Artwork/Custom/Orgrimmar Skin/TitanPanelBackgroundTop1.blp deleted file mode 100644 index 700f567..0000000 Binary files a/Titan/Artwork/Custom/Orgrimmar Skin/TitanPanelBackgroundTop1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Plate Skin/TitanPanelBackgroundBottom1.blp b/Titan/Artwork/Custom/Plate Skin/TitanPanelBackgroundBottom1.blp deleted file mode 100644 index 2ff44bc..0000000 Binary files a/Titan/Artwork/Custom/Plate Skin/TitanPanelBackgroundBottom1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Plate Skin/TitanPanelBackgroundTop1.blp b/Titan/Artwork/Custom/Plate Skin/TitanPanelBackgroundTop1.blp deleted file mode 100644 index 7525546..0000000 Binary files a/Titan/Artwork/Custom/Plate Skin/TitanPanelBackgroundTop1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Tribal Skin/TitanPanelBackgroundBottom1.blp b/Titan/Artwork/Custom/Tribal Skin/TitanPanelBackgroundBottom1.blp deleted file mode 100644 index 9915d0e..0000000 Binary files a/Titan/Artwork/Custom/Tribal Skin/TitanPanelBackgroundBottom1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/Tribal Skin/TitanPanelBackgroundTop1.blp b/Titan/Artwork/Custom/Tribal Skin/TitanPanelBackgroundTop1.blp deleted file mode 100644 index 9e75c6a..0000000 Binary files a/Titan/Artwork/Custom/Tribal Skin/TitanPanelBackgroundTop1.blp and /dev/null differ diff --git a/Titan/Artwork/Custom/X-Perl/TitanPanelBackgroundBottom1.tga b/Titan/Artwork/Custom/X-Perl/TitanPanelBackgroundBottom1.tga deleted file mode 100644 index 3a1d3fa..0000000 Binary files a/Titan/Artwork/Custom/X-Perl/TitanPanelBackgroundBottom1.tga and /dev/null differ diff --git a/Titan/Artwork/Custom/X-Perl/TitanPanelBackgroundTop1.tga b/Titan/Artwork/Custom/X-Perl/TitanPanelBackgroundTop1.tga deleted file mode 100644 index 84ebd84..0000000 Binary files a/Titan/Artwork/Custom/X-Perl/TitanPanelBackgroundTop1.tga and /dev/null differ diff --git a/Titan/Artwork/TitanPanelBackgroundBottom1.tga b/Titan/Artwork/TitanPanelBackgroundBottom1.tga deleted file mode 100644 index cf10acb..0000000 Binary files a/Titan/Artwork/TitanPanelBackgroundBottom1.tga and /dev/null differ diff --git a/Titan/Artwork/TitanPanelBackgroundTop1.tga b/Titan/Artwork/TitanPanelBackgroundTop1.tga deleted file mode 100644 index 4035c23..0000000 Binary files a/Titan/Artwork/TitanPanelBackgroundTop1.tga and /dev/null differ diff --git a/Titan/Titan.toc b/Titan/Titan.toc index 29e08b8..479612f 100644 --- a/Titan/Titan.toc +++ b/Titan/Titan.toc @@ -1,7 +1,7 @@ ## Interface: 80100 -## Title: Titan Panel |cff00aa005.16.2.80100|r +## Title: Titan Panel |cff00aa005.17.0.80100|r ## Author: Titan Development Team -## Version: 5.16.2.80100 +## Version: 5.17.0.80100 ## SavedVariables: TitanAll, TitanSettings, TitanSkins, ServerTimeOffsets, ServerHourFormat ## OptionalDeps: Ace3, AceGUI-3.0-SharedMediaWidgets, LibSharedMedia-3.0, LibQTip-1.0, !LibUIDropDownMenu ## Notes: Adds a display bar on the top and/or bottom of the screen. Allows users to show and control information/launcher plugins. diff --git a/Titan/TitanMovable.lua b/Titan/TitanMovable.lua index 70a9e41..ae92ad2 100755 --- a/Titan/TitanMovable.lua +++ b/Titan/TitanMovable.lua @@ -474,7 +474,7 @@ local MData = { move = function (force) MoveFrame("TargetFrame", 0, TITAN_PANEL_PLACE_TOP, force) end, addonAdj = false, }, [3] = {frameName = "PartyMemberFrame1", - move = function (force) MoveFrame("PartyMemberFrame1", 20, TITAN_PANEL_PLACE_TOP, force) end, + move = function (force) MoveFrame("PartyMemberFrame1", 0, TITAN_PANEL_PLACE_TOP, force) end, addonAdj = false, }, [4] = {frameName = "TicketStatusFrame", move = function (force) MoveFrame("TicketStatusFrame", 0, TITAN_PANEL_PLACE_TOP, force) end, diff --git a/Titan/TitanVariables.lua b/Titan/TitanVariables.lua index f376c04..d277877 100644 --- a/Titan/TitanVariables.lua +++ b/Titan/TitanVariables.lua @@ -304,6 +304,7 @@ TitanSkinsCustomPath = TitanSkinsDefaultPath.."Custom\\" TitanSkinsPathEnd = "\\" TitanSkinsDefault = { { name = "Titan Default", titan=true, path = TitanSkinsDefaultPath}, + { name = "AllBlack", titan=true, path = TitanSkinsCustomPath.."AllBlack Skin"..TitanSkinsPathEnd}, { name = "BlackPlusOne", titan=true, path = TitanSkinsCustomPath.."BlackPlusOne Skin"..TitanSkinsPathEnd}, { name = "Christmas", titan=true, path = TitanSkinsCustomPath.."Christmas Skin"..TitanSkinsPathEnd}, { name = "Charcoal Metal", titan=true, path = TitanSkinsCustomPath.."Charcoal Metal"..TitanSkinsPathEnd}, diff --git a/Titan/libs/Ace3.toc b/Titan/libs/Ace3.toc index 5099d33..0d3e5ce 100755 --- a/Titan/libs/Ace3.toc +++ b/Titan/libs/Ace3.toc @@ -1,4 +1,4 @@ -## Interface: 80000 +## Interface: 80100 ## Title: Lib: Ace3 ## Notes: AddOn development framework diff --git a/Titan/libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua b/Titan/libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua index c0309da..81885ae 100755 --- a/Titan/libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua +++ b/Titan/libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua @@ -1,13 +1,13 @@ --- 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 1169 2018-02-27 16:18:28Z nevcairiel $ +-- @release $Id: AceConfigDialog-3.0.lua 1197 2019-01-21 23:41:10Z nevcairiel $ local LibStub = LibStub local gui = LibStub("AceGUI-3.0") local reg = LibStub("AceConfigRegistry-3.0") -local MAJOR, MINOR = "AceConfigDialog-3.0", 66 +local MAJOR, MINOR = "AceConfigDialog-3.0", 69 local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR) if not AceConfigDialog then return end @@ -21,11 +21,11 @@ AceConfigDialog.frame.closing = AceConfigDialog.frame.closing or {} AceConfigDialog.frame.closeAllOverride = AceConfigDialog.frame.closeAllOverride or {} -- Lua APIs -local tconcat, tinsert, tsort, tremove, tsort = table.concat, table.insert, table.sort, table.remove, table.sort +local tinsert, tsort, tremove = table.insert, table.sort, table.remove local strmatch, format = string.match, string.format -local assert, loadstring, error = assert, loadstring, error +local error = error local pairs, next, select, type, unpack, wipe, ipairs = pairs, next, select, type, unpack, wipe, ipairs -local rawset, tostring, tonumber = rawset, tostring, tonumber +local tostring, tonumber = 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 @@ -45,39 +45,10 @@ local function errorhandler(err) return geterrorhandler()(err) end -local function CreateDispatcher(argCount) - local code = [[ - local xpcall, eh = ... - local method, ARGS - local function call() return method(ARGS) end - - local function dispatch(func, ...) - method = func - if not method then return end - ARGS = ... - return xpcall(call, eh) - end - - return dispatch - ]] - - local ARGS = {} - for i = 1, argCount do ARGS[i] = "arg"..i end - code = code:gsub("ARGS", tconcat(ARGS, ", ")) - return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(xpcall, errorhandler) -end - -local Dispatchers = setmetatable({}, {__index=function(self, argCount) - local dispatcher = CreateDispatcher(argCount) - rawset(self, argCount, dispatcher) - return dispatcher -end}) -Dispatchers[0] = function(func) - return xpcall(func, errorhandler) -end - local function safecall(func, ...) - return Dispatchers[select("#", ...)](func, ...) + if func then + return xpcall(func, errorhandler, ...) + end end local width_multiplier = 170 @@ -1064,6 +1035,19 @@ local function InjectInfo(control, options, option, path, rootframe, appName) control:SetCallback("OnEnter", OptionOnMouseOver) end +local function CreateControl(userControlType, fallbackControlType) + local control + if userControlType then + control = gui:Create(userControlType) + if not control then + geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(userControlType))) + end + end + if not control then + control = gui:Create(fallbackControlType) + end + return control +end --[[ options - root of the options table being fed @@ -1112,8 +1096,9 @@ 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" or type(image) == "number" then - control = gui:Create("Icon") + local iconControl = type(image) == "string" or type(image) == "number" + control = CreateControl(v.dialogControl or v.control, iconControl and "Icon" or "Button") + if iconControl then if not width then width = GetOptionsMemberValue("imageWidth",v, options, path, appName) end @@ -1134,18 +1119,12 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin control:SetImageSize(width, height) control:SetLabel(name) else - control = gui:Create("Button") control:SetText(name) end control:SetCallback("OnClick",ActivateControl) elseif v.type == "input" then - local controlType = v.dialogControl or v.control or (v.multiline and "MultiLineEditBox") or "EditBox" - control = gui:Create(controlType) - if not control then - geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(controlType))) - control = gui:Create(v.multiline and "MultiLineEditBox" or "EditBox") - end + control = CreateControl(v.dialogControl or v.control, v.multiline and "MultiLineEditBox" or "EditBox") if v.multiline and control.SetNumLines then control:SetNumLines(tonumber(v.multiline) or 4) @@ -1159,7 +1138,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin control:SetText(text) elseif v.type == "toggle" then - control = gui:Create("CheckBox") + control = CreateControl(v.dialogControl or v.control, "CheckBox") control:SetLabel(name) control:SetTriState(v.tristate) local value = GetOptionsMemberValue("get",v, options, path, appName) @@ -1182,7 +1161,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin end end elseif v.type == "range" then - control = gui:Create("Slider") + control = CreateControl(v.dialogControl or v.control, "Slider") control:SetLabel(name) control:SetSliderValues(v.softMin or v.min or 0, v.softMax or v.max or 100, v.bigStep or v.step or 0) control:SetIsPercent(v.isPercent) @@ -1238,12 +1217,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin 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 + control = CreateControl(v.dialogControl or v.control, "Dropdown") local itemType = v.itemControl if itemType and not gui:GetWidgetVersion(itemType) then geterrorhandler()(("Invalid Custom Item Type - %s"):format(tostring(itemType))) @@ -1263,8 +1237,6 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin local values = GetOptionsMemberValue("values", v, options, path, appName) local disabled = CheckOptionDisabled(v, options, path, appName) - local controlType = v.dialogControl or v.control - local valuesort = new() if values then for value, text in pairs(values) do @@ -1273,6 +1245,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin end tsort(valuesort) + local controlType = v.dialogControl or v.control if controlType then control = gui:Create(controlType) if not control then @@ -1346,7 +1319,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin del(valuesort) elseif v.type == "color" then - control = gui:Create("ColorPicker") + control = CreateControl(v.dialogControl or v.control, "ColorPicker") control:SetLabel(name) control:SetHasAlpha(GetOptionsMemberValue("hasAlpha",v, options, path, appName)) control:SetColor(GetOptionsMemberValue("get",v, options, path, appName)) @@ -1354,18 +1327,18 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin control:SetCallback("OnValueConfirmed",ActivateControl) elseif v.type == "keybinding" then - control = gui:Create("Keybinding") + control = CreateControl(v.dialogControl or v.control, "Keybinding") control:SetLabel(name) control:SetKey(GetOptionsMemberValue("get",v, options, path, appName)) control:SetCallback("OnKeyChanged",ActivateControl) elseif v.type == "header" then - control = gui:Create("Heading") + control = CreateControl(v.dialogControl or v.control, "Heading") control:SetText(name) control.width = "fill" elseif v.type == "description" then - control = gui:Create("Label") + control = CreateControl(v.dialogControl or v.control, "Label") control:SetText(name) local fontSize = GetOptionsMemberValue("fontSize",v, options, path, appName) @@ -1533,10 +1506,6 @@ local function GroupSelected(widget, event, uniquevalue) end BuildPath(feedpath, ("\001"):split(uniquevalue)) - local group = options - for i = 1, #feedpath do - group = GetSubOption(group, feedpath[i]) - end widget:ReleaseChildren() AceConfigDialog:FeedGroup(user.appName,options,widget,rootframe,feedpath) diff --git a/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua b/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua index d0c10b1..050bb63 100755 --- a/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua +++ b/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua @@ -1,7 +1,7 @@ --[[----------------------------------------------------------------------------- ColorPicker Widget -------------------------------------------------------------------------------]] -local Type, Version = "ColorPicker", 23 +local Type, Version = "ColorPicker", 24 local AceGUI = LibStub and LibStub("AceGUI-3.0", true) if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end @@ -140,10 +140,11 @@ local function Constructor() local colorSwatch = frame:CreateTexture(nil, "OVERLAY") colorSwatch:SetWidth(19) colorSwatch:SetHeight(19) - colorSwatch:SetTexture("Interface\\ChatFrame\\ChatFrameColorSwatch") + colorSwatch:SetTexture(130939) -- Interface\\ChatFrame\\ChatFrameColorSwatch colorSwatch:SetPoint("LEFT") local texture = frame:CreateTexture(nil, "BACKGROUND") + colorSwatch.background = texture texture:SetWidth(16) texture:SetHeight(16) texture:SetColorTexture(1, 1, 1) @@ -151,9 +152,10 @@ local function Constructor() texture:Show() local checkers = frame:CreateTexture(nil, "BACKGROUND") + colorSwatch.checkers = checkers checkers:SetWidth(14) checkers:SetHeight(14) - checkers:SetTexture("Tileset\\Generic\\Checkers") + checkers:SetTexture(188523) -- Tileset\\Generic\\Checkers checkers:SetTexCoord(.25, 0, 0.5, .25) checkers:SetDesaturated(true) checkers:SetVertexColor(1, 1, 1, 0.75) @@ -168,7 +170,7 @@ local function Constructor() text:SetPoint("RIGHT") --local highlight = frame:CreateTexture(nil, "HIGHLIGHT") - --highlight:SetTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight") + --highlight:SetTexture(136810) -- Interface\\QuestFrame\\UI-QuestTitleHighlight --highlight:SetBlendMode("ADD") --highlight:SetAllPoints(frame) diff --git a/Titan/libs/changelog.txt b/Titan/libs/changelog.txt index 65a2e06..3a7599d 100755 --- a/Titan/libs/changelog.txt +++ b/Titan/libs/changelog.txt @@ -1,3 +1,10 @@ +Ace3 Release - Revision r1200 (January 24th, 2019) +-------------------------------------------------- +- Cleanup for WoW 8.0 improvements +- AceGUI-3.0: Worked around various quirks in the WoW 8.0/8.1 API +- AceGUI-3.0: ColorPicker: Store references to the background/checkers textures (Ticket #473) +- AceConfigDialog-3.0: Allow custom controls for almost all option types (Ticket #475) + Ace3 Release - Revision r1182 (July 17th, 2018) ----------------------------------------------- - AceComm-3.0: Support numeric targets for custom channels (Ticket #419) diff --git a/TitanBag/TitanBag.toc b/TitanBag/TitanBag.toc index 6189130..3520cc8 100644 --- a/TitanBag/TitanBag.toc +++ b/TitanBag/TitanBag.toc @@ -1,10 +1,10 @@ ## Interface: 80100 -## Title: Titan Panel [|cffeda55fBag|r] |cff00aa005.16.2.80100|r +## Title: Titan Panel [|cffeda55fBag|r] |cff00aa005.17.0.80100|r ## Notes: Adds bag and free slot information to Titan Panel ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.16.2.80100 +## Version: 5.17.0.80100 ## X-Child-Of: Titan TitanBag.xml diff --git a/TitanClock/TitanClock.toc b/TitanClock/TitanClock.toc index 80bd2e7..3617585 100644 --- a/TitanClock/TitanClock.toc +++ b/TitanClock/TitanClock.toc @@ -1,10 +1,10 @@ ## Interface: 80100 -## Title: Titan Panel [|cffeda55fClock|r] |cff00aa005.16.2.80100|r +## Title: Titan Panel [|cffeda55fClock|r] |cff00aa005.17.0.80100|r ## Notes: Adds a clock to Titan Panel ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.16.2.80100 +## Version: 5.17.0.80100 ## X-Child-Of: Titan TitanClock.xml diff --git a/TitanGold/TitanGold.toc b/TitanGold/TitanGold.toc index d3b375e..9a2641d 100644 --- a/TitanGold/TitanGold.toc +++ b/TitanGold/TitanGold.toc @@ -1,10 +1,10 @@ ## Interface: 80100 -## Title: Titan Panel [|cffeda55fGold|r] |cff00aa005.16.2.80100|r +## Title: Titan Panel [|cffeda55fGold|r] |cff00aa005.17.0.80100|r ## Notes: Keeps track of all gold held by a player's toons on a per server/faction basis. ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: GoldSave ## OptionalDeps: ## Dependencies: Titan -## Version: 5.16.2.80100 +## Version: 5.17.0.80100 ## X-Child-Of: Titan TitanGold.xml diff --git a/TitanLocation/TitanLocation.toc b/TitanLocation/TitanLocation.toc index 65b2f6f..604c6c9 100644 --- a/TitanLocation/TitanLocation.toc +++ b/TitanLocation/TitanLocation.toc @@ -1,10 +1,10 @@ ## Interface: 80100 -## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa005.16.2.80100|r +## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa005.17.0.80100|r ## Notes: Adds coordinates and location information to Titan Panel ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.16.2.80100 +## Version: 5.17.0.80100 ## X-Child-Of: Titan TitanLocation.xml diff --git a/TitanLootType/TitanLootType.toc b/TitanLootType/TitanLootType.toc index 0eb9151..213f23e 100644 --- a/TitanLootType/TitanLootType.toc +++ b/TitanLootType/TitanLootType.toc @@ -1,10 +1,10 @@ ## Interface: 80100 -## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa005.16.2.80100|r +## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa005.17.0.80100|r ## Notes: Adds group loot and instance difficulty information to Titan Panel ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.16.2.80100 +## Version: 5.17.0.80100 ## X-Child-Of: Titan TitanLootType.xml diff --git a/TitanPerformance/TitanPerformance.toc b/TitanPerformance/TitanPerformance.toc index 8a3fb49..95c75e9 100644 --- a/TitanPerformance/TitanPerformance.toc +++ b/TitanPerformance/TitanPerformance.toc @@ -1,10 +1,10 @@ ## Interface: 80100 -## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa005.16.2.80100|r +## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa005.17.0.80100|r ## Notes: Adds FPS and Garbage collection information to Titan Panel ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.16.2.80100 +## Version: 5.17.0.80100 ## X-Child-Of: Titan TitanPerformance.xml diff --git a/TitanRepair/TitanRepair.toc b/TitanRepair/TitanRepair.toc index fac0b34..bd0fbbf 100644 --- a/TitanRepair/TitanRepair.toc +++ b/TitanRepair/TitanRepair.toc @@ -1,10 +1,10 @@ ## Interface: 80100 -## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa005.16.2.80100|r +## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa005.17.0.80100|r ## Notes: Provides a configurable durability display. Also adds the ability to auto repair items and inventory at vendors ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.16.2.80100 +## Version: 5.17.0.80100 ## X-Child-Of: Titan TitanRepair.xml diff --git a/TitanVolume/TitanVolume.toc b/TitanVolume/TitanVolume.toc index a1f2208..09f1b3f 100644 --- a/TitanVolume/TitanVolume.toc +++ b/TitanVolume/TitanVolume.toc @@ -1,10 +1,10 @@ ## Interface: 80100 -## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa005.16.2.80100|r +## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa005.17.0.80100|r ## Notes: Adds a volume control icon on your Titan Bar ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.16.2.80100 +## Version: 5.17.0.80100 ## X-Child-Of: Titan TitanVolume.xml diff --git a/TitanXP/TitanXP.toc b/TitanXP/TitanXP.toc index 1a1b248..1942cc4 100644 --- a/TitanXP/TitanXP.toc +++ b/TitanXP/TitanXP.toc @@ -1,10 +1,10 @@ ## Interface: 80100 -## Title: Titan Panel [|cffeda55fXP|r] |cff00aa005.16.2.80100|r +## Title: Titan Panel [|cffeda55fXP|r] |cff00aa005.17.0.80100|r ## Notes: Adds information to Titan Panel about XP earned and time to level ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.16.2.80100 +## Version: 5.17.0.80100 ## X-Child-Of: Titan TitanXP.xml