From 67b10a7297be3a45d24a4ebe254115bf5b176949 Mon Sep 17 00:00:00 2001 From: Jarth Date: Fri, 14 Jun 2019 22:46:03 +0200 Subject: [PATCH] Version 1.0.2 (14-06-2019) - Removed files for library: LibAddonMenu-2.0 -- It is still required, but files needs to be downloaded seperately - Updated the activation by hotkey, so it always tries to activate the collectible, even if a button does not exist - Made labels clamp to the screen Menu - Removed sub pages in the menu, it now has a divider where one used to be - Added tooltips declaring why items are disabled - Moved selection of collectibles to the new "settings panel" - Added "Toggle settings" button, to toggle settings mode - Removed reload requirement, when toggling a collection type Settings panel - Added settings panel, for setting up specific collection type settings - Right click a label to toggle settings mode - In settings mode, all labels are shown, when collection type is selected - Open the settings panel by pressing the cog on the label - Functionality in the settings panel: -- Toggle move frame -- Reload collection -- Show disabled collectibles of type -- Select all collectibles of type -- Select specific collectible of type --- .luacheckrc | 17 +- CBs_Bindings.lua | 22 +- CBs_Button.lua | 56 +- CBs_Buttons.lua | 51 +- CBs_Constants.lua | 174 +-- CBs_Fragment.lua | 36 +- CBs_Helpers.lua | 33 +- CBs_Labels.lua | 121 +- CBs_List.lua | 164 +++ CBs_Menu.lua | 1488 ++++++++++---------- CBs_MoveFrame.lua | 6 +- CBs_Settings.lua | 132 ++ Changelog | 25 + CollectionBars.lua | 52 +- CollectionBars.txt | 21 +- CollectionBars.xml | 100 +- Libs/LibAddonMenu-2.0/LibAddonMenu-2.0.txt | 33 - Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/LICENSE | 201 --- .../LibAddonMenu-2.0/LibAddonMenu-2.0.lua | 1282 ----------------- .../LibAddonMenu-2.0/controls/button.lua | 91 -- .../LibAddonMenu-2.0/controls/checkbox.lua | 142 -- .../LibAddonMenu-2.0/controls/colorpicker.lua | 106 -- .../LibAddonMenu-2.0/controls/custom.lua | 35 - .../LibAddonMenu-2.0/controls/description.lua | 80 -- .../LibAddonMenu-2.0/controls/divider.lua | 45 - .../LibAddonMenu-2.0/controls/dropdown.lua | 429 ------ .../LibAddonMenu-2.0/controls/editbox.lua | 156 -- .../LibAddonMenu-2.0/controls/header.lua | 42 - .../LibAddonMenu-2.0/controls/iconpicker.lua | 436 ------ .../LibAddonMenu-2.0/controls/panel.lua | 168 --- .../LibAddonMenu-2.0/controls/slider.lua | 220 --- .../LibAddonMenu-2.0/controls/submenu.lua | 182 --- .../LibAddonMenu-2.0/controls/texture.lua | 45 - Libs/LibAddonMenu-2.0/LibStub/LibStub.lua | 38 - 34 files changed, 1442 insertions(+), 4787 deletions(-) create mode 100644 CBs_List.lua create mode 100644 CBs_Settings.lua delete mode 100644 Libs/LibAddonMenu-2.0/LibAddonMenu-2.0.txt delete mode 100644 Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/LICENSE delete mode 100644 Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/LibAddonMenu-2.0.lua delete mode 100644 Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/button.lua delete mode 100644 Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/checkbox.lua delete mode 100644 Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/colorpicker.lua delete mode 100644 Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/custom.lua delete mode 100644 Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/description.lua delete mode 100644 Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/divider.lua delete mode 100644 Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/dropdown.lua delete mode 100644 Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/editbox.lua delete mode 100644 Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/header.lua delete mode 100644 Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/iconpicker.lua delete mode 100644 Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/panel.lua delete mode 100644 Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/slider.lua delete mode 100644 Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/submenu.lua delete mode 100644 Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/texture.lua delete mode 100644 Libs/LibAddonMenu-2.0/LibStub/LibStub.lua diff --git a/.luacheckrc b/.luacheckrc index 0fd0ba5..da25fd7 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -3,6 +3,7 @@ std = "luajit" globals = { "base", + "LibAddonMenu2", "CollectionBars", "CBs_Button", "CBs_Clicked", @@ -100,5 +101,19 @@ globals = { "TEXT_ALIGN_TOP", -- 3 "TEXT_ALIGN_BOTTOM", -- 4 "IsSlotToggled", - "FORCE_SUPPRESS_COOLDOWN_SOUND" + "FORCE_SUPPRESS_COOLDOWN_SOUND", + "SLASH_COMMANDS", + "CBs_List", + "ZO_SortFilterList", + "ZO_ScrollList_AddDataType", + "ZO_ScrollList_GetDataList", + "ZO_ClearNumericallyIndexedTable", + "ZO_ScrollList_CreateDataEntry", + "ZO_CheckButton_SetCheckState", + "ZO_CheckButton_SetToggleFunction", + "ZO_CheckButton_SetEnableState", + "MOUSE_BUTTON_INDEX_LEFT", + "MOUSE_BUTTON_INDEX_RIGHT", + "ZO_CheckButton_SetLabelText", + "ZO_DEFAULT_ENABLED_COLOR" } diff --git a/CBs_Bindings.lua b/CBs_Bindings.lua index 29cdc4d..b6861cf 100644 --- a/CBs_Bindings.lua +++ b/CBs_Bindings.lua @@ -9,14 +9,15 @@ Filename: CBs_Bindings.lua local base = CollectionBars ------------------------------------------------------------------------------------------------- --- PUBLIC FUNCTIONS -- +-- FUNCTIONS -- ------------------------------------------------------------------------------------------------- function CBs_Clicked(keyId) local control = base.WM:GetMouseOverControl() + local collectibleId = base.Saved.Bindings[keyId] if control ~= nil and control.CBs then local newCId = control:GetId() - local previousCId = base.Saved.Bindings[keyId] + local previousCId = collectibleId if previousCId ~= newCId then for _keyId, cid in pairs(base.Saved.Bindings) do @@ -39,15 +40,15 @@ function CBs_Clicked(keyId) base.Buttons[newCId]:SetBindingText(base.Saved.ShowBinding, base.GetBindingNameFromCId(newCId)) end end - elseif base.Saved.Bindings[keyId] > 0 and base.Buttons[base.Saved.Bindings[keyId]] then - base.Activate(base.Buttons[base.Saved.Bindings[keyId]]) + elseif collectibleId > 0 then + if base.Buttons[collectibleId] then + base.Activate(base.Buttons[collectibleId]) + else + UseCollectible(collectibleId) + end end end -------------------------------------------------------------------------------------------------- --- PRIVATE FUNCTIONS -- -------------------------------------------------------------------------------------------------- - function base.SetbindingText(cid, text) if base.Buttons[cid] then base.Buttons[cid]:SetBindingText(base.Saved.ShowBinding, text) @@ -86,3 +87,8 @@ function base.GetBindingNameFromCId(cid) end return result end + +--- +--- TODO: Implement a listener, that is set/unset when a field is selected. +--- Inspiration: "keybindingutils.lua":"function ZO_Keybindings_RegisterLabelForBindingUpdate(label, actionName, showUnbound, gamepadActionName, onChangedCallback, alwaysPreferGamepadMode)" +--- \ No newline at end of file diff --git a/CBs_Button.lua b/CBs_Button.lua index fc3e719..963fe1c 100644 --- a/CBs_Button.lua +++ b/CBs_Button.lua @@ -4,9 +4,8 @@ Filename: CBs_Button.lua ]] -- ------------------------------------------------------------------------------------------------- --- PUBLIC FUNCTIONS -- +-- FUNCTIONS -- ------------------------------------------------------------------------------------------------- - CBs_Button = ZO_Object:Subclass() function CBs_Button:New(_type, frame, cId, saved) @@ -45,36 +44,40 @@ end function CBs_Button:Setup(base) self.ctrl:SetHidden(false) + local texture = self.type.Collection[self.cId].EnabledTexture - self.icon:SetHidden(false) self.icon:SetTexture(texture) + self.icon:SetHidden(false) - if self.cooldownIcon then + if self.cooldownIcon ~= nil then self.cooldownIcon:SetTexture(texture) self.cooldownIcon:SetDesaturation(1) end - self.button:SetNormalTexture("/EsoUI/Art/ActionBar/abilityFrame64_up.dds") - self.button:SetPressedTexture("/EsoUI/Art/ActionBar/abilityFrame64_down.dds") - - local function Button_OnClicked() - base.Activate(self) - end - self.button:SetHandler("OnClicked", Button_OnClicked) - local function Button_OnMouseEnter() - if self.playSounds then - PlaySound(SOUNDS.QUICKSLOT_MOUSEOVER) + self.button:SetHandler( + "OnClicked", + function() + base.Activate(self) + end + ) + self.button:SetHandler( + "OnMouseEnter", + function() + if self.playSounds then + PlaySound(SOUNDS.QUICKSLOT_MOUSEOVER) + end + if self.type.Saved.Tooltip.Show then + local text = self.type.Collection[self.cId].Name + ZO_Tooltips_ShowTextTooltip(self.button, self.type.Saved.Tooltip.Position, text) + end end - if self.type.Saved.Tooltip.Show then - local text = self.type.Collection[self.cId].Name - ZO_Tooltips_ShowTextTooltip(self.button, self.type.Saved.Tooltip.Position, text) + ) + self.button:SetHandler( + "OnMouseExit", + function() + ZO_Tooltips_HideTextTooltip() end - end - self.button:SetHandler("OnMouseEnter", Button_OnMouseEnter) - local function Button_OnMouseExit() - ZO_Tooltips_HideTextTooltip() - end - self.button:SetHandler("OnMouseExit", Button_OnMouseExit) + ) end function CBs_Button:SetShowBindingText(visible) @@ -92,7 +95,6 @@ function CBs_Button:SetBindingText(show, text) if self.buttonText ~= nil and show then self.buttonText:SetHeight(self.ctrl:GetHeight()) self.buttonText:SetWidth(self.ctrl:GetWidth()) - -- self.buttonText:SetDrawLevel(3) self.buttonText:ClearAnchors() self.buttonText:SetAnchor(BOTTOM, self.ctrl, BOTTOM, 0, 0) self.buttonText:SetText(text) @@ -109,7 +111,7 @@ end function CBs_Button:UpdateState(forceId, isAttempting) local show = false - if (self.saved.IsActiveActivationEnabled) then + if self.saved.IsActiveActivationEnabled then show = self.cId == forceId and isAttempting or not forceId and IsCollectibleActive(self.cId) end self.status:SetHidden(show == false) @@ -191,3 +193,7 @@ function CBs_Button:UpdateCooldown(remaining, duration, cooldown) self:UpdateUsable() end + +function CBs_Button:SetHidden(value) + self.ctrl:SetHidden(value) +end diff --git a/CBs_Buttons.lua b/CBs_Buttons.lua index 9e833dd..3d8fc42 100644 --- a/CBs_Buttons.lua +++ b/CBs_Buttons.lua @@ -11,7 +11,6 @@ local base = CollectionBars ------------------------------------------------------------------------------------------------- -- FUNCTIONS -- ------------------------------------------------------------------------------------------------- - function base.SetFrameAndCombineSize(_type) local width, height = base.GetBarWidthHeight(_type) base.SetFrameSizeIfExists(_type.Frame, width, height) @@ -23,9 +22,11 @@ end function base.GetFrame(name, virtual) local frame = GetControl(name) - if not frame then + + if frame == nil then frame = base.WM:CreateControlFromVirtual(name, GuiRoot, virtual) end + frame:SetDrawLayer(5) return frame end @@ -33,6 +34,7 @@ end function base.GetButtonPosition(_type, index) local x = ((index - 1) % _type.BarDepth) * base.Saved.ButtonXY local y = (math.floor((index - 1) / _type.BarDepth)) * base.Saved.ButtonXY + if not _type.Saved.Horizontal then return y, x else @@ -44,13 +46,10 @@ function base.SetupButtons(_type) local index = 1 local selected = _type.Saved.Selected local frame = _type.Frame - _type.IsEmpty = true - - if base.Global.IsDebugEnabled then - d(string.format("SetupButtons: %s Depth: %s Width: %s", tostring(_type.Name), tostring(_type.BarDepth), tostring(_type.BarWidth))) - end local maxIndex = (_type.BarDepth or 0) * (_type.BarWidth or 0) + _type.IsEmpty = true + for _, _value in ipairs(_type.OrderedCollection) do local hideButton = true if selected[_value.Id] and IsCollectibleUnlocked(_value.Id) and IsCollectibleValidForPlayer(_value.Id) then @@ -80,17 +79,18 @@ function base.SetupButtons(_type) end if _type.Frame then - _type.Frame:SetHidden(_type.IsEmpty) + _type.Frame:SetHidden(_type.IsEmpty and not base.Global.EnableSettings) end if _type.FrameLabel then - _type.FrameLabel:SetHidden(_type.IsEmpty) + _type.FrameLabel:SetHidden(_type.IsEmpty and not base.Global.EnableSettings) end end function base.UpdateButtonsState(_type, forceId, isAttemptingActivation) for _, _value in ipairs(_type.OrderedCollection) do local button = base.Buttons[_value.Id] + if button ~= nil then button:UpdateState(forceId, isAttemptingActivation) end @@ -107,37 +107,29 @@ end function base.GetCooldownText(countDown, duration) local cooldown = "" + if type(duration) == "number" and countDown.StartTime ~= nil then local secondsRemaining = math.max(countDown.StartTime + duration - GetFrameTimeMilliseconds(), 0) / 1000 cooldown = ZO_FormatTimeAsDecimalWhenBelowThreshold(secondsRemaining, 60) end + return cooldown end function base.IsCollectibleUsable(button) local isCollectibleUsable = button ~= nil and button.type.Cooldown.StartTime == nil and IsCollectibleUsable(button.cId) - if base.Global.IsDebugEnabled then - d(string.format("IsCollectibleUsable: %s;", tostring(isCollectibleUsable))) - end + if not isCollectibleUsable and button.cId then local _, duration = GetCollectibleCooldownAndDuration(button.cId) isCollectibleUsable = button.type.Cooldown.StartTime + duration < GetFrameTimeMilliseconds() - if base.Global.IsDebugEnabled then - d(string.format("IsCollectibleUsable: %s; StartTime: %s; Time:~%s", tostring(isCollectibleUsable), tostring(button.type.Cooldown.StartTime + duration), tostring(GetFrameTimeMilliseconds()))) - end end + return isCollectibleUsable end function base.Activate(button) if base.IsCollectibleUsable(button) then - if base.Global.IsDebugEnabled then - d(string.format("Name: %s; IsActiveActivationEnabled: %s; ", base.Addon.Abbreviation .. button.type.Name, tostring(base.Saved.IsActiveActivationEnabled))) - end - if (base.Saved.IsActiveActivationEnabled) then - if base.Global.IsDebugEnabled then - d(string.format("Name: %s; RegisterForEvent: %s; Collectible: %s; EventTS: %s; Unregister..", base.Addon.Abbreviation .. button.type.Name, EVENT_COLLECTIBLE_USE_RESULT, button.cId, tostring(button.type.EventTS))) - end + if button and base.Saved.IsActiveActivationEnabled then EVENT_MANAGER:UnregisterForEvent(base.Addon.Abbreviation .. button.type.Name .. tostring(button.type.EventTS), EVENT_COLLECTIBLE_USE_RESULT) button.type.EventTS = GetTimeStamp() EVENT_MANAGER:RegisterForEvent( @@ -156,16 +148,9 @@ function base.Activate(button) local successActivate = isAttemptingActivation and success countDown.StartTime = GetFrameTimeMilliseconds() - if base.Global.IsDebugEnabled then - d(string.format("Event: %s; Result: %s; isAttemptingActivation: %s; successActivate: %s; EvnetTS: %s;", EVENT_COLLECTIBLE_USE_RESULT, result, tostring(isAttemptingActivation), tostring(successActivate), tostring(button.type.EventTS))) - end - EVENT_MANAGER:UnregisterForEvent(base.Addon.Abbreviation .. button.type.Name .. tostring(button.type.EventTS), EVENT_COLLECTIBLE_USE_RESULT) if success then - if base.Global.IsDebugEnabled then - d(string.format("RegisterForUpdate: %s", (base.Addon.Abbreviation .. button.type.Name .. countDown.Event))) - end EVENT_MANAGER:UnregisterForUpdate(base.Addon.Abbreviation .. button.type.Name .. countDown.Event) EVENT_MANAGER:RegisterForUpdate( base.Addon.Abbreviation .. button.type.Name .. countDown.Event, @@ -175,19 +160,11 @@ function base.Activate(button) local cooldown = base.GetCooldownText(countDown, duration) base.UpdateButtonsCooldown(button.type, remaining, duration, cooldown) - - if base.Global.IsDebugEnabled then - d(string.format("TICK: Event: %s; Duration: %s;", (base.Addon.Abbreviation .. button.type.Name .. countDown.Event), duration)) - end if duration == 0 then countDown.StartTime = nil local isActive = successActivate or IsCollectibleActive(button.cId) base.UpdateButtonsState(button.type, button.cId, isActive) EVENT_MANAGER:UnregisterForUpdate(base.Addon.Abbreviation .. button.type.Name .. countDown.Event) - - if base.Global.IsDebugEnabled then - d(string.format("TICK: Event: %s; Duration: %s; isActive: %s;", (base.Addon.Abbreviation .. button.type.Name .. countDown.Event), duration, tostring(isActive))) - end end end ) diff --git a/CBs_Constants.lua b/CBs_Constants.lua index 6d00d21..9d77fee 100644 --- a/CBs_Constants.lua +++ b/CBs_Constants.lua @@ -13,7 +13,7 @@ CollectionBars = { DisplayName = "Collection Bars", Abbreviation = "CBs", Version = 1.0, - MinorVersion = 0.1, + MinorVersion = 0.2, Command = "/cb", Author = "Jarth", Website = "" @@ -54,9 +54,12 @@ CollectionBars = { }, Global = { HideAllId = "CBs_HideAll", - IsDebugEnabled = false, + SettingsSlash = "/cb_settings", + EnableSettings = false, IsMoveEnabled = false, ReverseBindings = {}, + SettingsFrame = nil, + SettingsList = nil, Combine = { Name = "Combine", EventTS = nil, @@ -115,89 +118,92 @@ CollectionBars = { TypeOrdered = {} } -local setupElements = { - [1] = {Name = "Assistants", Display = "Assistants", TypeId = COLLECTIBLE_CATEGORY_TYPE_ASSISTANT}, - [2] = {Name = "Mementos", Display = "Mementos", TypeId = COLLECTIBLE_CATEGORY_TYPE_MEMENTO}, - [3] = {Name = "Mounts", Display = "Mounts", TypeId = COLLECTIBLE_CATEGORY_TYPE_MOUNT}, - [4] = {Name = "Vanity_Pets", Display = "Non-Combat Pets", TypeId = COLLECTIBLE_CATEGORY_TYPE_VANITY_PET}, - [5] = {Name = "Ability_Skins", Display = "Special", TypeId = COLLECTIBLE_CATEGORY_TYPE_ABILITY_SKIN}, - [6] = {Name = "Hats", Display = "Hats", TypeId = COLLECTIBLE_CATEGORY_TYPE_HAT}, - [7] = {Name = "Head_Markings", Display = "Head Markings", TypeId = COLLECTIBLE_CATEGORY_TYPE_HEAD_MARKING}, - [8] = {Name = "Facial_Accessories", Display = "Major Adornments", TypeId = COLLECTIBLE_CATEGORY_TYPE_FACIAL_ACCESSORY}, - [9] = {Name = "Costumes", Display = "Costumes", TypeId = COLLECTIBLE_CATEGORY_TYPE_COSTUME}, - [10] = {Name = "Body_Markings", Display = "Body Markings", TypeId = COLLECTIBLE_CATEGORY_TYPE_BODY_MARKING}, - [11] = {Name = "Skins", Display = "Skins", TypeId = COLLECTIBLE_CATEGORY_TYPE_SKIN}, - [12] = {Name = "Personalities", Display = "Personalities", TypeId = COLLECTIBLE_CATEGORY_TYPE_PERSONALITY}, - [13] = {Name = "Polymorph", Display = "Polymorphs", TypeId = COLLECTIBLE_CATEGORY_TYPE_POLYMORPH}, - [14] = {Name = "Emotes", Display = "Emotes", TypeId = COLLECTIBLE_CATEGORY_TYPE_EMOTE}, - [15] = {Name = "Hairs", Display = "Hairs", TypeId = COLLECTIBLE_CATEGORY_TYPE_HAIR}, - [16] = {Name = "Facial_Hair_Horns", Display = "Facial_Hair_Horns", TypeId = COLLECTIBLE_CATEGORY_TYPE_FACIAL_HAIR_HORNS}, - [17] = {Name = "Piercing_Jewelry", Display = "Piercing_Jewelry", TypeId = COLLECTIBLE_CATEGORY_TYPE_PIERCING_JEWELRY} -} +------------------------------------------------------------------------------------------------- +-- FUNCTIONS -- +------------------------------------------------------------------------------------------------- -local collectionIndex = 1 -for _, setupElement in ipairs(setupElements) do - local isUsable = IsCollectibleCategoryUsable(setupElement.TypeId) - if isUsable then - local unlocked = GetTotalUnlockedCollectiblesByCategoryType(setupElement.TypeId) - CollectionBars.Type[setupElement.Name] = { - Collection = {}, - OrderedCollection = {}, - TypeId = setupElement.TypeId, - Unlocked = unlocked, - Name = setupElement.Name, - Total = GetTotalCollectiblesByCategoryType(setupElement.TypeId), - IsUsable = IsCollectibleCategoryUsable(setupElement.TypeId), - FrameLabel = nil, - FrameLabelButton = nil, - MoveFrame = nil, - Frame = nil, - Count = nil, - BarDepth = 0, - BarWidth = nil, - Cooldown = { - Event = "Cooldown" .. setupElement.Name, - CollectibleId = nil, - StartTime = nil, - Tick = 100 - }, - Fragment = nil - } - CollectionBars.TypeOrdered[collectionIndex] = CollectionBars.Type[setupElement.Name] - collectionIndex = collectionIndex + 1 +function CollectionBars.GenerateCollectionTypes() + local setupElements = { + [1] = {Name = "Assistants", Display = "Assistants", TypeId = COLLECTIBLE_CATEGORY_TYPE_ASSISTANT}, + [2] = {Name = "Mementos", Display = "Mementos", TypeId = COLLECTIBLE_CATEGORY_TYPE_MEMENTO}, + [3] = {Name = "Mounts", Display = "Mounts", TypeId = COLLECTIBLE_CATEGORY_TYPE_MOUNT}, + [4] = {Name = "Vanity_Pets", Display = "Non-Combat Pets", TypeId = COLLECTIBLE_CATEGORY_TYPE_VANITY_PET}, + [5] = {Name = "Ability_Skins", Display = "Special", TypeId = COLLECTIBLE_CATEGORY_TYPE_ABILITY_SKIN}, + [6] = {Name = "Hats", Display = "Hats", TypeId = COLLECTIBLE_CATEGORY_TYPE_HAT}, + [7] = {Name = "Head_Markings", Display = "Head Markings", TypeId = COLLECTIBLE_CATEGORY_TYPE_HEAD_MARKING}, + [8] = {Name = "Facial_Accessories", Display = "Major Adornments", TypeId = COLLECTIBLE_CATEGORY_TYPE_FACIAL_ACCESSORY}, + [9] = {Name = "Costumes", Display = "Costumes", TypeId = COLLECTIBLE_CATEGORY_TYPE_COSTUME}, + [10] = {Name = "Body_Markings", Display = "Body Markings", TypeId = COLLECTIBLE_CATEGORY_TYPE_BODY_MARKING}, + [11] = {Name = "Skins", Display = "Skins", TypeId = COLLECTIBLE_CATEGORY_TYPE_SKIN}, + [12] = {Name = "Personalities", Display = "Personalities", TypeId = COLLECTIBLE_CATEGORY_TYPE_PERSONALITY}, + [13] = {Name = "Polymorph", Display = "Polymorphs", TypeId = COLLECTIBLE_CATEGORY_TYPE_POLYMORPH}, + [14] = {Name = "Emotes", Display = "Emotes", TypeId = COLLECTIBLE_CATEGORY_TYPE_EMOTE}, + [15] = {Name = "Hairs", Display = "Hairs", TypeId = COLLECTIBLE_CATEGORY_TYPE_HAIR}, + [16] = {Name = "Facial_Hair_Horns", Display = "Facial_Hair_Horns", TypeId = COLLECTIBLE_CATEGORY_TYPE_FACIAL_HAIR_HORNS}, + [17] = {Name = "Piercing_Jewelry", Display = "Piercing_Jewelry", TypeId = COLLECTIBLE_CATEGORY_TYPE_PIERCING_JEWELRY} + } - if unlocked > CollectionBars.Global.HighestUnlocked then - CollectionBars.Global.HighestUnlocked = unlocked - end + CollectionBars.Type = {} + local collectionIndex = 1 + for _, setupElement in ipairs(setupElements) do + local isUsable = IsCollectibleCategoryUsable(setupElement.TypeId) + if isUsable then + CollectionBars.Type[setupElement.Name] = { + Collection = {}, + OrderedCollection = {}, + TypeId = setupElement.TypeId, + Unlocked = 0, + Name = setupElement.Name, + Total = 0, + IsUsable = 0, + FrameLabel = nil, + FrameLabelButton = nil, + FrameToggleSettings = nil, + MoveFrame = nil, + Frame = nil, + Count = nil, + BarDepth = 0, + BarWidth = nil, + Cooldown = { + Event = "Cooldown" .. setupElement.Name, + CollectibleId = nil, + StartTime = nil, + Tick = 100 + }, + Fragment = nil + } + CollectionBars.TypeOrdered[collectionIndex] = CollectionBars.Type[setupElement.Name] + collectionIndex = collectionIndex + 1 - CollectionBars.Default[setupElement.Name] = { - Selected = {}, - Enabled = false, - HideAll = true, - HideAllEnabled = true, - MenuShowDisabled = false, - Tooltip = { - Show = true, - Position = TOP - }, - Horizontal = true, - BarDepth = 0, - BarWidth = 0, - X = CENTER, - Y = CENTER, - AnchorXY = TOPLEFT, - Display = setupElement.Display, - LabelShow = true, - Label = { - OffsetX = 0, - OffsetY = 0, - Height = 19, - Width = 75, - Font = "ZoFontGameSmall", - Position = BOTTOMLEFT, - PositionTarget = TOPLEFT - }, - Combine = true - } + CollectionBars.Default[setupElement.Name] = { + Selected = {}, + Enabled = false, + HideAll = true, + HideAllEnabled = true, + MenuShowDisabled = false, + Tooltip = { + Show = true, + Position = TOP + }, + Horizontal = true, + BarDepth = 0, + BarWidth = 0, + X = CENTER, + Y = CENTER, + AnchorXY = TOPLEFT, + Display = setupElement.Display, + LabelShow = true, + Label = { + OffsetX = 0, + OffsetY = 0, + Height = 19, + Width = 75, + Font = "ZoFontGameSmall", + Position = BOTTOMLEFT, + PositionTarget = TOPLEFT + }, + Combine = true + } + end end -end +end \ No newline at end of file diff --git a/CBs_Fragment.lua b/CBs_Fragment.lua index 8a40866..15aa5aa 100644 --- a/CBs_Fragment.lua +++ b/CBs_Fragment.lua @@ -9,9 +9,8 @@ Filename: CBs_Fragment.lua local base = CollectionBars ------------------------------------------------------------------------------------------------- --- PRIVATE FUNCTIONS -- +-- FUNCTIONS -- ------------------------------------------------------------------------------------------------- - function base.UpdateFragments(fragmentType) for _, _type in pairs(base.Type) do if _type.Saved.Enabled then @@ -23,28 +22,35 @@ end function base.UpdateFragment(_type, fragmentType) local currentScene = SCENE_MANAGER:GetCurrentScene() - local isHidden = currentScene == SCENE_MANAGER:GetScene("gameMenuInGame") and not base.Saved.ShowBarInMenu + local isHidden = (currentScene == nil or currentScene:GetName() == "empty") and not base.Saved.ShowBarOnHud if _type.Fragment == nil then _type.Fragment = ZO_HUDFadeSceneFragment:New(_type.Frame) end for key, scene in pairs(base.Global.ScenePairs) do - if not fragmentType or key == fragmentType then - if scene ~= nil then - if base.Saved[key] then - if scene == currentScene then - isHidden = false - end - if not scene:HasFragment(_type.Fragment) then - scene:AddFragment(_type.Fragment) - end - else - scene:RemoveFragment(_type.Fragment) + if (not fragmentType or key == fragmentType) and scene ~= nil then + if base.Saved[key] then + if not scene:HasFragment(_type.Fragment) then + scene:AddFragment(_type.Fragment) end + else + scene:RemoveFragment(_type.Fragment) end end + if scene == currentScene then + isHidden = isHidden or not base.Saved[key] + end end - _type.Frame:SetHidden(isHidden) end + +function base.RemoveFragments(_type) + if _type.Fragment ~= nil then + for _, scene in pairs(base.Global.ScenePairs) do + if scene ~= nil then + scene:RemoveFragment(_type.Fragment) + end + end + end +end diff --git a/CBs_Helpers.lua b/CBs_Helpers.lua index 9a69023..9416261 100644 --- a/CBs_Helpers.lua +++ b/CBs_Helpers.lua @@ -9,9 +9,8 @@ Filename: CBs_Helpers.lua local base = CollectionBars ------------------------------------------------------------------------------------------------- --- PRIVATE FUNCTIONS -- +-- FUNCTIONS -- ------------------------------------------------------------------------------------------------- - function base.GetLocationValue(value) local result @@ -68,10 +67,6 @@ function base.RestorePosition(_type) _type.Frame:ClearAnchors() local combineFrame = base.Global.Combine.Frame if not _type.Saved.Combine or not combineFrame then - if base.Global.IsDebugEnabled then - d(_type.Name .. "-Combine-" .. tostring(_type.Saved.Combine) .. "-IsEmpty-" .. tostring(_type.IsEmpty) .. "-Hideall-" .. tostring(_type.Saved.HideAll)) - d(string.format("RestorePosition: %s-%s-%s-%s", _type.Name, tostring(_type.Saved.AnchorXY), tostring(_type.Saved.X), tostring(_type.Saved.Y))) - end _type.Frame:SetAnchor(_type.Saved.AnchorXY, GuiRoot, TOPLEFT, _type.Saved.X, _type.Saved.Y) elseif _type.Saved.Combine then if not _type.Saved.HideAll then @@ -82,6 +77,19 @@ function base.RestorePosition(_type) end end +function base.GetLabelPostFix(_type) + local postFix = "" + if _type.Saved.HideAllEnabled then + if not _type.Saved.HideAll then + postFix = " -" + else + postFix = " +" + end + end + return postFix +end + + function base.IsAllSelected(_type) local isAllSelected = true for _, collection in pairs(_type.Collection) do @@ -105,7 +113,7 @@ function base.SelectAll(_type, newValue) end function base.GetVersion(showMinor) - if showMinor == false or ADDON_MINOR_VERSION == nil then + if showMinor == false or base.Addon.MinorVersion == nil then return tostring(base.Addon.Version) end @@ -153,10 +161,6 @@ function base.GetBarWidthHeight(_type) _type.BarDepth, _type.BarWidth = GetBarMaxCount("BarDepth"), GetBarMaxCount("BarWidth") - if base.Global.IsDebugEnabled then - d("SetButtonFrameSize:Type: " .. _type.Name .. "-BarDepth: " .. _type.BarDepth .. "-BarWidth: " .. _type.BarWidth) - end - if count > 0 then local barWidth = math.ceil(count / _type.BarDepth) local maxBarWidth = _type.BarWidth @@ -177,3 +181,10 @@ function base.SetFrameSizeIfExists(frame, width, height) frame:SetWidth(width) end end + +function base.HasAny(array) + for _ in pairs(array) do + return true + end + return false +end \ No newline at end of file diff --git a/CBs_Labels.lua b/CBs_Labels.lua index e6c7da9..dbed0a0 100644 --- a/CBs_Labels.lua +++ b/CBs_Labels.lua @@ -11,67 +11,83 @@ local base = CollectionBars ------------------------------------------------------------------------------------------------- -- FUNCTIONS -- ------------------------------------------------------------------------------------------------- - function base.SetupLabel(_type) - -- SetupLabelFrame if _type.FrameLabel == nil then _type.FrameLabel = GetControl(base.Global.HideAllId .. _type.Name) - _type.FrameLabelButton = GetControl(base.Global.HideAllId .. _type.Name .. "Button") - if not _type.FrameLabel then + if _type.FrameLabel == nil then _type.FrameLabel = base.WM:CreateControlFromVirtual(base.Global.HideAllId, _type.Frame, base.Global.HideAllId, _type.Name) - _type.FrameLabelButton = GetControl(base.Global.HideAllId .. _type.Name .. "Button") _type.FrameLabel:SetDrawLevel(2) end end _type.FrameLabel:SetHidden(not _type.Saved.LabelShow and not _type.Saved.Combine) - -- SetupLabelButton - local button = GetControl(base.Global.HideAllId .. _type.Name .. "Button") - if button then - local hideAllFunc = nil - if _type.Saved.HideAllEnabled or _type.Saved.Combine then - hideAllFunc = function() - _type.Saved.HideAll = not _type.Saved.HideAll - -- Hide other Combine panels.. - if _type.Saved.Combine then - base.HideOther(_type) + _type.FrameToggleSettings = GetControl(base.Global.HideAllId .. _type.Name .. "ToggleSettings") + _type.FrameLabelButton = GetControl(base.Global.HideAllId .. _type.Name .. "Button") + if _type.FrameLabelButton ~= nil then + _type.FrameLabelButton:SetHandler( + "OnClicked", + function(_, button) + if button == MOUSE_BUTTON_INDEX_LEFT then + if _type.Saved.HideAllEnabled or _type.Saved.Combine then + _type.Saved.HideAll = not _type.Saved.HideAll + if _type.Saved.Combine then + base.HideOther(_type) + end + base.RestoreFrame(_type) + base.RestoreCombine() + end + elseif button == MOUSE_BUTTON_INDEX_RIGHT then + base.ToggleEnableSettings() end - base.RestoreFrame(_type) - base.RestoreCombine() end - button:SetMouseOverTexture("/EsoUI/Art/Buttons/decline_over.dds") - button:SetPressedTexture("/EsoUI/Art/Buttons/decline_down.dds") - end - button:SetHandler("OnClicked", hideAllFunc) + ) end + + base.SetupToggleSettings(_type) end function base.RestoreLabel(_type) - local frameLabel = _type.FrameLabel - local frameLabelButton = _type.FrameLabelButton + local label = _type.Saved.Label - if frameLabel ~= nil and frameLabelButton ~= nil then - local postFix = "" - if _type.Saved.HideAllEnabled then - if not _type.Saved.HideAll then - postFix = " -" - else - postFix = " +" - end - end - local label = _type.Saved.Label + local frameLabel = _type.FrameLabel + if frameLabel ~= nil then frameLabel:ClearAnchors() + frameLabel:SetHeight(label.Height) + frameLabel:SetWidth(label.Width) if not _type.Saved.Combine then frameLabel:SetAnchor(label.Position, _type.Frame, label.PositionTarget, label.OffsetX, label.OffsetY) end - frameLabel:SetHeight(label.Height) - frameLabel:SetWidth(label.Width) + frameLabel:SetHidden(not _type.Saved.Combine and not _type.Saved.LabelShow) + end + + local frameLabelButton = _type.FrameLabelButton + if frameLabelButton ~= nil then + frameLabelButton:SetHidden(false) frameLabelButton:SetFont(label.Font) frameLabelButton:SetHorizontalAlignment(TEXT_ALIGN_LEFT) frameLabelButton:SetVerticalAlignment(TOP) - frameLabelButton:SetText(_type.Saved.Display .. postFix) + frameLabelButton:SetText(_type.Saved.Display .. base.GetLabelPostFix(_type)) + end + + local frameLabelToggleSettings = _type.FrameToggleSettings + if frameLabelToggleSettings ~= nil then + frameLabelToggleSettings:SetHidden(false) + end +end + +function base.RemoveLabel(_type) + if _type.FrameLabel ~= nil then + _type.FrameLabel:ClearAnchors() + _type.FrameLabel:SetHidden(true) + end + + if _type.FrameLabelButton ~= nil then + _type.FrameLabelButton:SetHidden(true) + end + + if _type.FrameToggleSettings ~= nil then + _type.FrameToggleSettings:SetHidden(true) end - frameLabel:SetHidden(not _type.Saved.LabelShow and not _type.Saved.Combine) end function base.RestoreCombineLabels() @@ -81,17 +97,19 @@ function base.RestoreCombineLabels() local positionTarget = combineLabel.PositionTarget local position = combineLabel.Position for _, _type in pairs(base.TypeOrdered) do - if _type.Saved.Combine and _type.FrameLabel and not _type.IsEmpty then - _type.FrameLabel:ClearAnchors() - _type.FrameLabel:SetHidden(not _type.Saved.LabelShow and not _type.Saved.Combine and not base.HasSelected(_type)) - if not _type.FrameLabel:IsHidden() or (_type.Saved.LabelShow and base.HasSelected(_type)) then - width = width + _type.Saved.Label.OffsetX - local offsetY = _type.Saved.Label.OffsetY + combineLabel.OffsetY - _type.FrameLabel:SetAnchor(TOPLEFT, base.Global.Combine.HideAll, TOPLEFT, width, offsetY) - width = width + _type.FrameLabel:GetWidth() - local labelHeight = _type.FrameLabel:GetHeight() - if labelHeight > height then - height = labelHeight + if _type.Saved.Enabled and _type.Saved.Combine and _type.FrameLabel then + if (not _type.IsEmpty or base.Global.EnableSettings) then + _type.FrameLabel:ClearAnchors() + _type.FrameLabel:SetHidden(not _type.Saved.Combine and not base.HasAny(_type.Saved.Selected) and not _type.Saved.LabelShow and not base.Global.EnableSettings) + if not _type.FrameLabel:IsHidden() or (_type.Saved.LabelShow and base.HasAny(_type.Saved.Selected)) or base.Global.EnableSettings then + width = width + _type.Saved.Label.OffsetX + local offsetY = _type.Saved.Label.OffsetY + combineLabel.OffsetY + _type.FrameLabel:SetAnchor(TOPLEFT, base.Global.Combine.HideAll, TOPLEFT, width, offsetY) + width = width + _type.FrameLabel:GetWidth() + local labelHeight = _type.FrameLabel:GetHeight() + if labelHeight > height then + height = labelHeight + end end end end @@ -105,10 +123,3 @@ function base.RestoreCombineLabels() frame:SetAnchor(position, base.Global.Combine.Frame, positionTarget, combineLabel.OffsetX, combineLabel.OffsetY) end end - -function base.HasSelected(_type) - for _ in pairs(_type.Saved.Selected) do - return true - end - return false -end diff --git a/CBs_List.lua b/CBs_List.lua new file mode 100644 index 0000000..b422a0b --- /dev/null +++ b/CBs_List.lua @@ -0,0 +1,164 @@ +--[[ +Author: Jarth +Filename: CBs_List.lua +]] -- + +------------------------------------------------------------------------------------------------- +-- FUNCTIONS -- +------------------------------------------------------------------------------------------------- +CBs_List = ZO_SortFilterList:Subclass() + +function CBs_List:New(...) + self.list = ZO_SortFilterList.New(self, ...) + return self.list +end + +function CBs_List:Initialize(base, _type, ...) + ZO_SortFilterList.Initialize(self, ...) + self.base = base + self._type = _type + self.masterList = {} + + self:SetAlternateRowBackgrounds(false) + ZO_ScrollList_AddDataType( + self.list, + 1, + "CBs_ListRow", + 40, + function(control, data) + control._type = self._type + control.base = self.base + control.data = data + self:SetupListRow(control, data) + end + ) + ZO_ScrollList_AddDataType( + self.list, + 2, + "CBs_Divider", + 6, + function(control, data) + ZO_SortFilterList.SetupRow(self, control, data) + end + ) +end + +function CBs_List:SetupListRow(control, data) + ZO_SortFilterList.SetupRow(self, control, data) + + control.checkbox = GetControl(control, "Checkbox") + if control.checkbox then + control.checkbox.tooltipText = data.tooltipText + ZO_CheckButton_SetCheckState(control.checkbox, control.data.valueFunc and control.data.valueFunc()) + ZO_CheckButton_SetLabelText(control.checkbox, data.name) + if control.checkbox.label then + control.checkbox.label.defaultNormalColor = ZO_DEFAULT_ENABLED_COLOR + control.checkbox.label:ClearAnchors() + control.checkbox.label:SetAnchor(TOPLEFT, control.checkbox, TOPLEFT, -425) + control.checkbox.label:SetAnchor(BOTTOMRIGHT, control.checkbox, BOTTOMLEFT) + end + ZO_CheckButton_SetToggleFunction(control.checkbox, control.data.func) + ZO_CheckButton_SetEnableState(control.checkbox, not (control.data.disabledFunc and control.data.disabledFunc())) + end +end + +function CBs_List:BuildMasterList() + self.masterList = {} + + local function CBs_List_Show_Disabled_Collectible(checkBoxControl, newValue) + local control = checkBoxControl:GetParent() + control._type.Saved.MenuShowDisabled = newValue + control.base.CreateCollection(control._type) + control.base.Global.SettingsList:RefreshData() + end + + local function CBs_List_Select_All_Collectible(checkBoxControl, newValue) + local control = checkBoxControl:GetParent() + control.base.SelectAll(control._type, newValue) + control.base.RestoreFrame(control._type) + control.base.RestoreCombineLabels() + control.base.Global.SettingsList:RefreshData() + end + + local function CBs_List_Select_Collectible(checkBoxControl, newValue) + local control = checkBoxControl:GetParent() + if not (control.data.disabledFunc and control.data.disabledFunc()) then + if newValue == true then + control._type.Saved.Selected[control.data.cId] = newValue + else + control._type.Saved.Selected[control.data.cId] = nil + end + control.base.RestoreFrame(control._type) + control.base.RestoreCombineLabels() + control.base.Global.SettingsList:RefreshData() + end + end + + if self._type then + table.insert( + self.masterList, + { + name = "Show disabled " .. self._type.Name, + tooltipText = "When ON disabled elements will be shown for " .. self._type.Name, + valueFunc = function() + return self._type.Saved.MenuShowDisabled + end, + func = CBs_List_Show_Disabled_Collectible, + type = "show_disabled_collectible" + } + ) + table.insert(self.masterList, {type = "divider"}) + table.insert( + self.masterList, + { + name = "Select all " .. self._type.Name, + tooltipText = "When pressed all " .. self._type.Name .. " will either be selected or deselected", + valueFunc = function() + return self.base.IsAllSelected(self._type) + end, + func = CBs_List_Select_All_Collectible, + type = "select_all_collectible" + } + ) + table.insert(self.masterList, {type = "divider"}) + + if self._type.OrderedCollection then + for _, collection in ipairs(self._type.OrderedCollection) do + if self._type.Saved.MenuShowDisabled and collection.Disabled or not collection.Disabled then + table.insert( + self.masterList, + { + cId = collection.Id, + name = "Show " .. collection.Name, + tooltipText = collection.Tooltip, + valueFunc = function() + return self._type.Saved.Selected[collection.Id] + end, + disabledFunc = function() + return collection.Disabled + end, + func = CBs_List_Select_Collectible, + type = "select_collectible" + } + ) + end + end + end + end +end + +function CBs_List:FilterScrollList() + local scrollData = ZO_ScrollList_GetDataList(self.list) + ZO_ClearNumericallyIndexedTable(scrollData) + + for i = 1, #self.masterList do + if self.masterList[i].type == "divider" then + scrollData[#scrollData + 1] = ZO_ScrollList_CreateDataEntry(2, self.masterList[i]) + else + scrollData[#scrollData + 1] = ZO_ScrollList_CreateDataEntry(1, self.masterList[i]) + end + end +end + +function CBs_List:SortScrollList() +end diff --git a/CBs_Menu.lua b/CBs_Menu.lua index 6201175..9a8ab58 100644 --- a/CBs_Menu.lua +++ b/CBs_Menu.lua @@ -6,7 +6,7 @@ Filename: CBs_Menu.lua ------------------------------------------------------------------------------------------------- -- Libraries -- ------------------------------------------------------------------------------------------------- -local LAM2 = LibStub:GetLibrary("LibAddonMenu-2.0") +local LAM2 = LibAddonMenu2 ------------------------------------------------------------------------------------------------- -- VARIABLES -- @@ -14,21 +14,27 @@ local LAM2 = LibStub:GetLibrary("LibAddonMenu-2.0") local base = CollectionBars ------------------------------------------------------------------------------------------------- --- Menu Functions -- +-- FUNCTIONS -- ------------------------------------------------------------------------------------------------- function base.CreateSettingsWindow() - local panelData = { - _type = "panel", - name = base.Addon.DisplayName, - displayName = base.Addon.DisplayName, - author = base.Addon.Author, - version = base.GetVersion(true), - slashCommand = base.Addon.Command, - registerForRefresh = true, - registerForDefaults = true - } - LAM2:RegisterAddonPanel(base.Addon.Name, panelData) + LAM2:RegisterAddonPanel( + base.Addon.Name, + { + _type = "panel", + name = base.Addon.DisplayName, + displayName = base.Addon.DisplayName, + author = base.Addon.Author, + version = base.GetVersion(true), + slashCommand = base.Addon.Command, + registerForRefresh = true, + registerForDefaults = true + } + ) + local whenOnTheBar = "When ON the bar will show the bar " + local disabledWhenTooltipIsHidden = "Disabled when tooltip is not shown" + local disabledWhenLabelIsHidden = "Disabled when label is not shown" + local disabledWhenCombined = "Disabled when Collection is included in combine bar" local optionsData = { { @@ -51,7 +57,17 @@ function base.CreateSettingsWindow() end, setFunc = function(newValue) base.SetAndUpdateAccountSettings(newValue) - end + end, + width = "half" + }, + { + type = "button", + name = "Toggle settings", + tooltip = "When ON all enabled collection types will display a label\nOpen a settings panel for each collection type, and select what collectibles you want to enable.", + func = function() + base.ToggleEnableSettings() + end, + width = "half" }, { type = "submenu", @@ -60,280 +76,250 @@ function base.CreateSettingsWindow() controls = { { type = "description", - text = "Setup some general settings" + text = "Here you can setup position and size" + }, + { + type = "checkbox", + name = "Unlock movement of bar", + tooltip = "When ON the bar will show the X,Y position of the top left corner, and is draggable", + default = function() + return base.Global.IsMoveEnabled + end, + getFunc = function() + return base.Global.IsMoveEnabled + end, + setFunc = function(newValue) + base.Global.IsMoveEnabled = newValue + base.RestoreFrames() + end + }, + { + type = "slider", + name = "Choose snap size when moving", + default = base.Default.SnapSize, + getFunc = function() + return base.Saved.SnapSize + end, + setFunc = function(value) + base.Saved.SnapSize = value + base.RestoreFrames() + end, + min = 1, + max = 10 + }, + { + type = "slider", + name = "Choose default bar depth (number of rows/columns)", + default = base.Default.BarDepth, + getFunc = function() + return base.Saved.BarDepth + end, + setFunc = function(value) + base.Saved.BarDepth = value + base.RestoreFrames() + end, + min = 1, + max = base.Global.HighestUnlocked + }, + { + type = "slider", + name = "Choose max bar height (number of inverse rows/columns)", + default = base.Default.BarWidth, + getFunc = function() + return base.Saved.BarWidth + end, + setFunc = function(value) + base.Saved.BarWidth = value + base.RestoreFrames() + end, + min = 0, + max = base.Global.HighestUnlocked + }, + { + type = "checkbox", + name = "Show binding's on bar", + tooltip = "When ON the binding's will be shown on the bar", + default = base.Default.ShowBinding, + getFunc = function() + return base.Saved.ShowBinding + end, + setFunc = function(newValue) + base.Saved.ShowBinding = newValue + base.RestoreFrames() + end, + width = "half" + }, + { + type = "slider", + name = "Button size", + default = ZO_GAMEPAD_ACTION_BUTTON_SIZE, + getFunc = function() + return base.Saved.ButtonXY + end, + setFunc = function(value) + base.Saved.ButtonXY = value + base.RestoreFrames() + end, + min = 1, + max = 100, + width = "half" + }, + { + type = "divider", + width = "full" + }, + { + type = "description", + text = "Here you can setup the audio" + }, + { + type = "checkbox", + name = "Play hover audio", + tooltip = "When ON hover events on the bar, will play audio", + default = function() + return base.Saved.IsAudioEnabled + end, + getFunc = function() + return base.Saved.IsAudioEnabled + end, + setFunc = function(newValue) + base.Saved.IsAudioEnabled = newValue + base.RestoreFrames() + end + }, + { + type = "divider", + width = "full" + }, + { + type = "description", + text = "Here you can setup what views/scenes the bars are visible in" + }, + { + type = "checkbox", + name = "Show bar " .. "on main view/hud", + tooltip = whenOnTheBar .. "on main view/hud", + default = base.Default.ShowBarOnHud, + getFunc = function() + return base.Saved.ShowBarOnHud + end, + setFunc = function(newValue) + base.Saved.ShowBarOnHud = newValue + base.UpdateFragments("ShowBarOnHud") + end + }, + { + type = "checkbox", + name = "Show bar " .. "on the main view when an overlay is activated/hudui", + tooltip = whenOnTheBar .. "on the main view when an overlay is activated/hudui", + default = base.Default.ShowBarOnHudUI, + getFunc = function() + return base.Saved.ShowBarOnHudUI + end, + setFunc = function(newValue) + base.Saved.ShowBarOnHudUI = newValue + base.UpdateFragments("ShowBarOnHudUI") + end + }, + { + type = "checkbox", + name = "Show bar " .. "in menu", + tooltip = whenOnTheBar .. "in menu", + default = base.Default.ShowBarInMenu, + getFunc = function() + return base.Saved.ShowBarInMenu + end, + setFunc = function(newValue) + base.Saved.ShowBarInMenu = newValue + base.UpdateFragments("ShowBarInMenu") + end + }, + { + type = "checkbox", + name = "Show bar " .. "in the inventory", + tooltip = whenOnTheBar .. "in the inventory", + default = base.Default.ShowBarInInventory, + getFunc = function() + return base.Saved.ShowBarInInventory + end, + setFunc = function(newValue) + base.Saved.ShowBarInInventory = newValue + base.UpdateFragments("ShowBarInInventory") + end + }, + { + type = "checkbox", + name = "Show bar " .. "in interactions", + tooltip = whenOnTheBar .. "in interactions", + default = base.Default.ShowBarInInteract, + getFunc = function() + return base.Saved.ShowBarInInteract + end, + setFunc = function(newValue) + base.Saved.ShowBarInInteract = newValue + base.UpdateFragments("ShowBarInInteract") + end + }, + { + type = "checkbox", + name = "Show bar " .. "at a bank", + tooltip = whenOnTheBar .. "at a bank", + default = base.Default.ShowBarInBank, + getFunc = function() + return base.Saved.ShowBarInBank + end, + setFunc = function(newValue) + base.Saved.ShowBarInBank = newValue + base.UpdateFragments("ShowBarInBank") + end }, { - type = "submenu", - name = "Position and size", - tooltip = "Setup position and size", - controls = { - { - type = "description", - text = "Here you can setup position and size \n(Unlock to move the bar)" - }, - { - type = "checkbox", - name = "Unlock movement of bar", - tooltip = "When ON the bar will show the X,Y position of the top left corner, and is draggable", - default = function() - return base.Global.IsMoveEnabled - end, - getFunc = function() - return base.Global.IsMoveEnabled - end, - setFunc = function(newValue) - base.Global.IsMoveEnabled = newValue - base.RestoreFrames() - end - }, - { - type = "slider", - name = "Choose snap size when moving", - default = base.Default.SnapSize, - getFunc = function() - return base.Saved.SnapSize - end, - setFunc = function(value) - base.Saved.SnapSize = value - base.RestoreFrames() - end, - min = 1, - max = 10 - }, - { - type = "slider", - name = "Choose default bar depth (number of rows/columns)", - default = base.Default.BarDepth, - getFunc = function() - return base.Saved.BarDepth - end, - setFunc = function(value) - base.Saved.BarDepth = value - base.RestoreFrames() - end, - min = 1, - max = base.Global.HighestUnlocked - }, - { - type = "slider", - name = "Choose max bar height (number of inverse rows/columns)", - default = base.Default.BarWidth, - getFunc = function() - return base.Saved.BarWidth - end, - setFunc = function(value) - base.Saved.BarWidth = value - base.RestoreFrames() - end, - min = 0, - max = base.Global.HighestUnlocked - }, - { - type = "checkbox", - name = "Show binding's on bar", - tooltip = "When ON the binding's will be shown on the bar", - default = base.Default.ShowBinding, - getFunc = function() - return base.Saved.ShowBinding - end, - setFunc = function(newValue) - base.Saved.ShowBinding = newValue - base.RestoreFrames() - end - }, - { - type = "slider", - name = "Button size", - default = ZO_GAMEPAD_ACTION_BUTTON_SIZE, - getFunc = function() - return base.Saved.ButtonXY - end, - setFunc = function(value) - base.Saved.ButtonXY = value - base.RestoreFrames() - end, - min = 1, - max = 100, - width = "half" - } - } + type = "checkbox", + name = "Show bar " .. "at a fence", + tooltip = whenOnTheBar .. "at a fence", + default = base.Default.ShowBarInFence, + getFunc = function() + return base.Saved.ShowBarInFence + end, + setFunc = function(newValue) + base.Saved.ShowBarInFence = newValue + base.UpdateFragments("ShowBarInFence") + end }, { - type = "submenu", - name = "Audio", - tooltip = "Setup audio", - controls = { - { - type = "description", - text = "Here you can setup the audio" - }, - { - type = "checkbox", - name = "Play hover audio", - tooltip = "When ON hover events on the bar, will play audio", - default = function() - return base.Saved.IsAudioEnabled - end, - getFunc = function() - return base.Saved.IsAudioEnabled - end, - setFunc = function(newValue) - base.Saved.IsAudioEnabled = newValue - base.RestoreFrames() - end - } - } + type = "checkbox", + name = "Show bar " .. "at a store", + tooltip = whenOnTheBar .. "at a store", + default = base.Default.ShowBarInStore, + getFunc = function() + return base.Saved.ShowBarInStore + end, + setFunc = function(newValue) + base.Saved.ShowBarInStore = newValue + base.UpdateFragments("ShowBarInStore") + end }, { - type = "submenu", - name = "Visibility", - tooltip = "Setup visibility", - controls = { - { - type = "description", - text = "Here you can setup what views the bars are visible in" - }, - { - type = "checkbox", - name = "Show bar " .. "on main view/hud", - tooltip = whenOnTheBar .. "on main view/hud", - default = base.Default.ShowBarOnHud, - getFunc = function() - return base.Saved.ShowBarOnHud - end, - setFunc = function(newValue) - base.Saved.ShowBarOnHud = newValue - base.UpdateFragments("ShowBarOnHud") - end - }, - { - type = "checkbox", - name = "Show bar " .. "on the main view when an overlay is activated/hudui", - tooltip = whenOnTheBar .. "on the main view when an overlay is activated/hudui", - default = base.Default.ShowBarOnHudUI, - getFunc = function() - return base.Saved.ShowBarOnHudUI - end, - setFunc = function(newValue) - base.Saved.ShowBarOnHudUI = newValue - base.UpdateFragments("ShowBarOnHudUI") - end - }, - { - type = "checkbox", - name = "Show bar " .. "in menu", - tooltip = whenOnTheBar .. "in menu", - default = base.Default.ShowBarInMenu, - getFunc = function() - return base.Saved.ShowBarInMenu - end, - setFunc = function(newValue) - base.Saved.ShowBarInMenu = newValue - base.UpdateFragments("ShowBarInMenu") - end - }, - { - type = "checkbox", - name = "Show bar " .. "in the inventory", - tooltip = whenOnTheBar .. "in the inventory", - default = base.Default.ShowBarInInventory, - getFunc = function() - return base.Saved.ShowBarInInventory - end, - setFunc = function(newValue) - base.Saved.ShowBarInInventory = newValue - base.UpdateFragments("ShowBarInInventory") - end - }, - { - type = "checkbox", - name = "Show bar " .. "in interactions", - tooltip = whenOnTheBar .. "in interactions", - default = base.Default.ShowBarInInteract, - getFunc = function() - return base.Saved.ShowBarInInteract - end, - setFunc = function(newValue) - base.Saved.ShowBarInInteract = newValue - base.UpdateFragments("ShowBarInInteract") - end - }, - { - type = "checkbox", - name = "Show bar " .. "at a bank", - tooltip = whenOnTheBar .. "at a bank", - default = base.Default.ShowBarInBank, - getFunc = function() - return base.Saved.ShowBarInBank - end, - setFunc = function(newValue) - base.Saved.ShowBarInBank = newValue - base.UpdateFragments("ShowBarInBank") - end - }, - { - type = "checkbox", - name = "Show bar " .. "at a fence", - tooltip = whenOnTheBar .. "at a fence", - default = base.Default.ShowBarInFence, - getFunc = function() - return base.Saved.ShowBarInFence - end, - setFunc = function(newValue) - base.Saved.ShowBarInFence = newValue - base.UpdateFragments("ShowBarInFence") - end - }, - { - type = "checkbox", - name = "Show bar " .. "at a store", - tooltip = whenOnTheBar .. "at a store", - default = base.Default.ShowBarInStore, - getFunc = function() - return base.Saved.ShowBarInStore - end, - setFunc = function(newValue) - base.Saved.ShowBarInStore = newValue - base.UpdateFragments("ShowBarInStore") - end - } - } + type = "divider", + width = "full" }, { - type = "submenu", - name = "Active and activation", - tooltip = "Setup active and activation indication", - controls = { - { - type = "description", - text = "Here you can setup the active and activation indication" - }, - { - type = "checkbox", - name = "Show active and activation", - tooltip = "When ON the active collectibles will be highlighted, and activation animation will display", - default = function() - return base.Saved.IsActiveActivationEnabled - end, - getFunc = function() - return base.Saved.IsActiveActivationEnabled - end, - setFunc = function(newValue) - base.Saved.IsActiveActivationEnabled = newValue - base.RestoreFrames() - end - } - } + type = "description", + text = "Here you can setup the active and activation indication" }, { type = "checkbox", - name = "Show debug messages", - default = false, + name = "Show active and activation", + tooltip = "When ON the active collectibles will be highlighted, and activation animation will display", + default = function() + return base.Saved.IsActiveActivationEnabled + end, getFunc = function() - return base.Global.IsDebugEnabled + return base.Saved.IsActiveActivationEnabled end, setFunc = function(newValue) - base.Global.IsDebugEnabled = newValue + base.Saved.IsActiveActivationEnabled = newValue + base.RestoreFrames() end } } @@ -344,126 +330,120 @@ function base.CreateSettingsWindow() tooltip = "Setup the combined bar", controls = { { - type = "submenu", - name = "Display name and labels", - tooltip = "Setup display name, labels", - controls = { - { - type = "slider", - name = "Display name offset horizontal (X)", - default = base.Default.Combine.Label.OffsetX, - getFunc = function() - return base.Saved.Combine.Label.OffsetX - end, - setFunc = function(value) - base.Saved.Combine.Label.OffsetX = value - base.RestoreCombineLabels() - end, - min = -500, - max = 500, - width = "half" - }, - { - type = "slider", - name = "Display name offset vertical (Y)", - default = base.Default.Combine.Label.OffsetY, - getFunc = function() - return base.Saved.Combine.Label.OffsetY - end, - setFunc = function(value) - base.Saved.Combine.Label.OffsetY = value - base.RestoreCombineLabels() - end, - min = -500, - max = 500, - width = "half" - }, - { - type = "dropdown", - name = "Display name anchor position on button", - tooltip = "Select display name anchor position on the button", - choices = base.Global.ChoiceCornerLocations, - default = base.Default.Combine.Label.PositionTarget, - getFunc = function() - return base.GetLocationText(base.Saved.Combine.Label.PositionTarget) - end, - setFunc = function(value) - base.Saved.Combine.Label.PositionTarget = base.GetLocationValue(value) - base.Saved.Combine.AnchorXY = base.GetLocationValue(value) - base.RestoreCombineLabels() - end, - width = "half" - }, - { - type = "dropdown", - name = "Display name anchor position on label", - tooltip = "Select display name anchor position on the label", - choices = base.Global.ChoiceLocations, - default = base.Default.Combine.Label.Position, - getFunc = function() - return base.GetLocationText(base.Saved.Combine.Label.Position) - end, - setFunc = function(value) - base.Saved.Combine.Label.Position = base.GetLocationValue(value) - base.RestoreCombineLabels() - end, - width = "half" - }, - { - type = "dropdown", - name = "Bar anchor location", - tooltip = "Select Bar anchor location, used when bar is collapsed", - choices = base.Global.ChoiceCornerLocations, - default = base.Default.Combine.AnchorXY, - getFunc = function() - return base.GetLocationText(base.Saved.Combine.AnchorXY) - end, - setFunc = function(value) - base.Saved.Combine.AnchorXY = base.GetLocationValue(value) - base.RestoreCombineLabels() - end, - width = "half" - } - } + type = "description", + text = "Here you can setup the display name and labels" + }, + { + type = "slider", + name = "Display name offset horizontal (X)", + default = base.Default.Combine.Label.OffsetX, + getFunc = function() + return base.Saved.Combine.Label.OffsetX + end, + setFunc = function(value) + base.Saved.Combine.Label.OffsetX = value + base.RestoreCombineLabels() + end, + min = -500, + max = 500, + width = "half" + }, + { + type = "slider", + name = "Display name offset vertical (Y)", + default = base.Default.Combine.Label.OffsetY, + getFunc = function() + return base.Saved.Combine.Label.OffsetY + end, + setFunc = function(value) + base.Saved.Combine.Label.OffsetY = value + base.RestoreCombineLabels() + end, + min = -500, + max = 500, + width = "half" + }, + { + type = "dropdown", + name = "Display name anchor position on button", + tooltip = "Select display name anchor position on the button", + choices = base.Global.ChoiceCornerLocations, + default = base.Default.Combine.Label.PositionTarget, + getFunc = function() + return base.GetLocationText(base.Saved.Combine.Label.PositionTarget) + end, + setFunc = function(value) + base.Saved.Combine.Label.PositionTarget = base.GetLocationValue(value) + base.Saved.Combine.AnchorXY = base.GetLocationValue(value) + base.RestoreCombineLabels() + end, + width = "half" + }, + { + type = "dropdown", + name = "Display name anchor position on label", + tooltip = "Select display name anchor position on the label", + choices = base.Global.ChoiceLocations, + default = base.Default.Combine.Label.Position, + getFunc = function() + return base.GetLocationText(base.Saved.Combine.Label.Position) + end, + setFunc = function(value) + base.Saved.Combine.Label.Position = base.GetLocationValue(value) + base.RestoreCombineLabels() + end, + width = "half" + }, + { + type = "dropdown", + name = "Bar anchor location", + tooltip = "Select Bar anchor location, used when bar is collapsed", + choices = base.Global.ChoiceCornerLocations, + default = base.Default.Combine.AnchorXY, + getFunc = function() + return base.GetLocationText(base.Saved.Combine.AnchorXY) + end, + setFunc = function(value) + base.Saved.Combine.AnchorXY = base.GetLocationValue(value) + base.RestoreCombineLabels() + end, + width = "half" + }, + { + type = "divider", + width = "full" + }, + { + type = "description", + text = "Here you can setup position and size" + }, + { + type = "slider", + name = "Choose default bar depth (number of rows/columns)", + default = base.Default.BarDepth, + getFunc = function() + return base.Saved.Combine.BarDepth + end, + setFunc = function(value) + base.Saved.Combine.BarDepth = value + base.RestoreFrames() + end, + min = 0, + max = base.Global.HighestUnlocked }, { - type = "submenu", - name = "Position and size", - tooltip = "Setup position and size", - controls = { - { - type = "description", - text = "Here you can setup position and size \n(Unlock to move the bar)" - }, - { - type = "slider", - name = "Choose default bar depth (number of rows/columns)", - default = base.Default.BarDepth, - getFunc = function() - return base.Saved.Combine.BarDepth - end, - setFunc = function(value) - base.Saved.Combine.BarDepth = value - base.RestoreFrames() - end, - min = 0, - max = base.Global.HighestUnlocked - }, - { - type = "slider", - name = "Choose max bar height (number of inverse rows/columns)", - default = base.Default.BarWidth, - getFunc = function() - return base.Saved.Combine.BarWidth - end, - setFunc = function(value) - base.Saved.Combine.BarWidth = value - base.RestoreFrames() - end, - min = 0, - max = base.Global.HighestUnlocked - } - } + type = "slider", + name = "Choose max bar height (number of inverse rows/columns)", + default = base.Default.BarWidth, + getFunc = function() + return base.Saved.Combine.BarWidth + end, + setFunc = function(value) + base.Saved.Combine.BarWidth = value + base.RestoreFrames() + end, + min = 0, + max = base.Global.HighestUnlocked } } }, @@ -480,357 +460,39 @@ function base.CreateSettingsWindow() } } - local function AppendShowCollection(controlIndex, _type) + local function AppendCollectionType(controlIndex, _type) table.insert( optionsData[controlIndex].controls, { type = "checkbox", - name = string.format("Show %s (Total: %s Unlocked: %s) ", _type.Name, _type.Total, _type.Unlocked), + name = string.format("Show %s", _type.Name), tooltip = "When ON the menu item " .. _type.Name .. " will be available for selection", default = base.Default[_type.Name].Enabled, - warning = "Reload to see full effect", - requiresReload = true, getFunc = function() return _type.Saved.Enabled end, setFunc = function(newValue) _type.Saved.Enabled = newValue + if newValue then + base.InitializeType(_type) + else + base.RemoveLabel(_type) + base.RemoveFrame(_type) + end + if _type.Saved.Combine then + base.RestoreCombineLabels() + end end } ) end - local function AppendDataToMenu(controlIndex, _type) + local function AppendCollectionMenuItem(controlIndex, _type) local typeName = _type.Name local controls = { { - type = "submenu", - name = "Tooltip", - tooltip = "Setup tooltip for " .. typeName, - controls = { - { - type = "checkbox", - name = "Show tooltip", - tooltip = "When ON tooltips will be shown, when hovering buttons on the bar", - default = base.Default[typeName].Tooltip.Show, - getFunc = function() - return _type.Saved.Tooltip.Show - end, - setFunc = function(newValue) - _type.Saved.Tooltip.Show = newValue - base.SetupButtons(_type) - end, - width = "half" - }, - { - type = "dropdown", - name = "Show tooltip anchor position", - tooltip = "Select tooltip anchor position", - choices = base.Global.ChoiceSideLocations, - default = base.Default[typeName].Tooltip.Position, - disabled = function() - return not _type.Saved.Tooltip.Show - end, - getFunc = function() - return base.GetLocationText(_type.Saved.Tooltip.Position) - end, - setFunc = function(value) - _type.Saved.Tooltip.Position = base.GetLocationValue(value) - base.SetupButtons(_type) - end, - width = "half" - } - } - }, - { - type = "submenu", - name = "Display name and labels", - tooltip = "Setup display name, labels", - controls = { - { - type = "checkbox", - name = "Enable hide", - disabled = function() - return _type.Saved.Combine - end, - default = base.Default[typeName].HideAllEnabled, - getFunc = function() - return _type.Saved.Combine or _type.Saved.HideAllEnabled - end, - setFunc = function(newValue) - if (not newValue) then - _type.Saved.HideAll = newValue - base.RestoreFrame(_type) - end - _type.Saved.HideAllEnabled = newValue - _type.Saved.LabelShow = true - base.SetupLabel(_type) - base.RestoreLabel(_type) - end, - width = "half" - }, - { - type = "checkbox", - name = "Show label", - disabled = function() - return _type.Saved.HideAllEnabled or _type.Saved.Combine - end, - default = base.Default[typeName].LabelShow, - getFunc = function() - return _type.Saved.LabelShow or _type.Saved.Combine - end, - setFunc = function(newValue) - _type.Saved.LabelShow = newValue - base.SetupLabel(_type) - base.RestoreLabel(_type) - end, - width = "half" - }, - { - type = "editbox", - name = "Display name", - disabled = function() - return not _type.Saved.LabelShow - end, - default = base.Default[typeName].Display, - getFunc = function() - return _type.Saved.Display - end, - setFunc = function(value) - _type.Saved.Display = value - base.RestoreFrame(_type) - base.RestoreCombineLabels() - end, - width = "half" - }, - { - type = "dropdown", - name = "Display name font", - disabled = function() - return not _type.Saved.LabelShow - end, - choices = base.Global.AvailableFonts, - default = base.Default[typeName].Label.Font, - getFunc = function() - return _type.Saved.Label.Font - end, - setFunc = function(value) - _type.Saved.Label.Font = value - base.RestoreFrame(_type) - base.RestoreCombineLabels() - end, - width = "half" - }, - { - type = "slider", - name = "Display name height", - disabled = function() - return not _type.Saved.LabelShow - end, - default = base.Default[typeName].Label.Height, - getFunc = function() - return _type.Saved.Label.Height - end, - setFunc = function(value) - _type.Saved.Label.Height = value - base.RestoreFrame(_type) - base.RestoreCombineLabels() - end, - min = 0, - max = 500, - width = "half" - }, - { - type = "slider", - name = "Display name width", - disabled = function() - return not _type.Saved.LabelShow - end, - default = base.Default[typeName].Label.Width, - getFunc = function() - return _type.Saved.Label.Width - end, - setFunc = function(value) - _type.Saved.Label.Width = value - base.RestoreFrame(_type) - base.RestoreCombineLabels() - end, - min = 0, - max = 500, - width = "half" - }, - { - type = "slider", - name = "Display name offset horizontal (X)", - disabled = function() - return not _type.Saved.LabelShow - end, - default = base.Default[typeName].Label.OffsetX, - getFunc = function() - return _type.Saved.Label.OffsetX - end, - setFunc = function(value) - _type.Saved.Label.OffsetX = value - base.RestoreFrame(_type) - base.RestoreCombineLabels() - end, - min = -500, - max = 500, - width = "half" - }, - { - type = "slider", - name = "Display name offset vertical (Y)", - disabled = function() - return not _type.Saved.LabelShow - end, - default = base.Default[typeName].Label.OffsetY, - getFunc = function() - return _type.Saved.Label.OffsetY - end, - setFunc = function(value) - _type.Saved.Label.OffsetY = value - base.RestoreFrame(_type) - base.RestoreCombineLabels() - end, - min = -500, - max = 500, - width = "half" - }, - { - type = "dropdown", - name = "Display name anchor position on button", - tooltip = "Select display name anchor position on the button", - disabled = function() - return not _type.Saved.LabelShow or not _type.Saved.Label.PositionTarget or _type.Saved.Combine - end, - choices = base.Global.ChoiceLocations, - default = base.Default.BindingLocation, - getFunc = function() - if _type.Saved.Combine then - return base.GetLocationText(base.Saved.Combine.Label.PositionTarget) - else - return base.GetLocationText(_type.Saved.Label.PositionTarget) - end - end, - setFunc = function(value) - _type.Saved.Label.PositionTarget = base.GetLocationValue(value) - _type.Saved.AnchorXY = base.GetLocationValue(value) - base.RestoreFrame(_type) - base.RestoreCombineLabels() - end, - width = "half" - }, - { - type = "dropdown", - name = "Display name anchor position on label", - tooltip = "Select display name anchor position on the label", - disabled = function() - return not _type.Saved.LabelShow or not _type.Saved.Label.Position or _type.Saved.Combine - end, - choices = base.Global.ChoiceLocations, - default = base.Default.BindingLocation, - getFunc = function() - if _type.Saved.Combine then - return base.GetLocationText(base.Saved.Combine.Label.Position) - else - return base.GetLocationText(_type.Saved.Label.Position) - end - end, - setFunc = function(value) - _type.Saved.Label.Position = base.GetLocationValue(value) - base.RestoreFrame(_type) - base.RestoreCombineLabels() - end, - width = "half" - }, - { - type = "dropdown", - name = "Bar anchor location", - tooltip = "Select Bar anchor location, used when bar is collapsed", - choices = base.Global.ChoiceCornerLocations, - default = base.Default[typeName].AnchorXY, - disabled = function() - return not _type.Saved.AnchorXY or _type.Saved.Combine - end, - getFunc = function() - if _type.Saved.Combine then - return base.GetLocationText(base.Saved.Combine.AnchorXY) - else - return base.GetLocationText(_type.Saved.AnchorXY) - end - end, - setFunc = function(value) - _type.Saved.AnchorXY = base.GetLocationValue(value) - base.RestoreFrame(_type) - base.RestoreCombineLabels() - end, - width = "half" - } - } - }, - { - type = "submenu", - name = "Position and size", - tooltip = "Setup position and size for " .. typeName, - controls = { - { - type = "slider", - name = "Choose bar depth (number of rows/columns)", - default = base.Default[typeName].BarDepth, - disabled = function() - return _type.Saved.Combine - end, - getFunc = function() - return _type.Saved.BarDepth - end, - setFunc = function(value) - _type.Saved.BarDepth = value - base.RestoreFrame(_type) - base.RestoreCombineLabels() - end, - min = 0, - max = _type.Unlocked - }, - { - type = "slider", - name = "Choose max bar height (number of inverse rows/columns)", - default = base.Default[typeName].BarWidth, - disabled = function() - return _type.Saved.Combine - end, - getFunc = function() - return _type.Saved.BarWidth - end, - setFunc = function(value) - _type.Saved.BarWidth = value - base.RestoreFrame(_type) - base.RestoreCombineLabels() - end, - min = 0, - max = _type.Unlocked - }, - { - type = "checkbox", - name = "Bar orientation horizontal", - default = base.Default[typeName].Horizontal, - disabled = function() - return _type.Saved.Combine - end, - getFunc = function() - return _type.Saved.Horizontal - end, - setFunc = function(newValue) - _type.Saved.Horizontal = newValue - base.RestoreFrame(_type) - base.RestoreCombineLabels() - end - } - } - }, - { type = "checkbox", - name = "Combine bar " .. typeName, + name = "Include " .. typeName .. " in combine bar", tooltip = "When ON " .. typeName .. " will be attached to a combined bar", default = base.Default[typeName].Combine, getFunc = function() @@ -843,84 +505,366 @@ function base.CreateSettingsWindow() end }, { + type = "divider", + width = "full" + }, + { + type = "description", + text = "Here you can setup tooltips" + }, + { type = "checkbox", - name = "Show disabled " .. typeName, - tooltip = "When ON disabled elements will be shown for " .. typeName, - warning = "Reload to see full effect", - requiresReload = true, - default = base.Default[typeName].MenuShowDisabled, + name = "Show tooltip", + tooltip = "When ON tooltips will be shown, when hovering buttons on the bar", + default = base.Default[typeName].Tooltip.Show, getFunc = function() - return _type.Saved.MenuShowDisabled + return _type.Saved.Tooltip.Show end, setFunc = function(newValue) - _type.Saved.MenuShowDisabled = newValue - end + _type.Saved.Tooltip.Show = newValue + base.SetupButtons(_type) + end, + width = "half" + }, + { + type = "dropdown", + name = "Show tooltip anchor position", + tooltip = "Select tooltip anchor position\n" .. disabledWhenTooltipIsHidden, + choices = base.Global.ChoiceSideLocations, + default = base.Default[typeName].Tooltip.Position, + disabled = function() + return not _type.Saved.Tooltip.Show + end, + getFunc = function() + return base.GetLocationText(_type.Saved.Tooltip.Position) + end, + setFunc = function(value) + _type.Saved.Tooltip.Position = base.GetLocationValue(value) + base.SetupButtons(_type) + end, + width = "half" + }, + { + type = "divider", + width = "full" + }, + { + type = "description", + text = "Here you can setup the name and labels" + }, + { + type = "checkbox", + name = "Enable hide/toggle visibility of the label", + tooltip = "When enabled a +/- at the end of the label indicates if the label is hidden or shown\n" .. disabledWhenCombined, + disabled = function() + return _type.Saved.Combine + end, + default = base.Default[typeName].HideAllEnabled, + getFunc = function() + return _type.Saved.Combine or _type.Saved.HideAllEnabled + end, + setFunc = function(newValue) + if (not newValue) then + _type.Saved.HideAll = newValue + base.RestoreFrame(_type) + end + _type.Saved.HideAllEnabled = newValue + _type.Saved.LabelShow = true + base.SetupLabel(_type) + base.RestoreLabel(_type) + end, + width = "half" }, { type = "checkbox", - name = "Show all " .. typeName, - warning = "When pressed all " .. typeName .. " will either be selected or deselected", - default = function() - return base.IsAllSelected(_type) + name = "Show label", + tooltip = disabledWhenCombined .. " or hide/toggle visibility is enabled", + disabled = function() + return _type.Saved.HideAllEnabled or _type.Saved.Combine end, + default = base.Default[typeName].LabelShow, getFunc = function() - return base.IsAllSelected(_type) + return _type.Saved.LabelShow or _type.Saved.Combine end, setFunc = function(newValue) - base.SelectAll(_type, newValue) + _type.Saved.LabelShow = newValue + base.SetupLabel(_type) + base.RestoreLabel(_type) + end, + width = "half" + }, + { + type = "editbox", + name = "Display name", + tooltip = disabledWhenLabelIsHidden, + disabled = function() + return not _type.Saved.LabelShow + end, + default = base.Default[typeName].Display, + getFunc = function() + return _type.Saved.Display + end, + setFunc = function(value) + _type.Saved.Display = value base.RestoreFrame(_type) base.RestoreCombineLabels() - end + end, + width = "half" + }, + { + type = "dropdown", + name = "Display name font", + tooltip = disabledWhenLabelIsHidden, + disabled = function() + return not _type.Saved.LabelShow + end, + choices = base.Global.AvailableFonts, + default = base.Default[typeName].Label.Font, + getFunc = function() + return _type.Saved.Label.Font + end, + setFunc = function(value) + _type.Saved.Label.Font = value + base.RestoreFrame(_type) + base.RestoreCombineLabels() + end, + width = "half" + }, + { + type = "slider", + name = "Display name height", + tooltip = disabledWhenLabelIsHidden, + disabled = function() + return not _type.Saved.LabelShow + end, + default = base.Default[typeName].Label.Height, + getFunc = function() + return _type.Saved.Label.Height + end, + setFunc = function(value) + _type.Saved.Label.Height = value + base.RestoreFrame(_type) + base.RestoreCombineLabels() + end, + min = 0, + max = 500, + width = "half" + }, + { + type = "slider", + name = "Display name width", + tooltip = disabledWhenLabelIsHidden, + disabled = function() + return not _type.Saved.LabelShow + end, + default = base.Default[typeName].Label.Width, + getFunc = function() + return _type.Saved.Label.Width + end, + setFunc = function(value) + _type.Saved.Label.Width = value + base.RestoreFrame(_type) + base.RestoreCombineLabels() + end, + min = 0, + max = 500, + width = "half" + }, + { + type = "slider", + name = "Display name offset horizontal (X)", + tooltip = disabledWhenLabelIsHidden, + disabled = function() + return not _type.Saved.LabelShow + end, + default = base.Default[typeName].Label.OffsetX, + getFunc = function() + return _type.Saved.Label.OffsetX + end, + setFunc = function(value) + _type.Saved.Label.OffsetX = value + base.RestoreFrame(_type) + base.RestoreCombineLabels() + end, + min = -500, + max = 500, + width = "half" + }, + { + type = "slider", + name = "Display name offset vertical (Y)", + tooltip = disabledWhenLabelIsHidden, + disabled = function() + return not _type.Saved.LabelShow + end, + default = base.Default[typeName].Label.OffsetY, + getFunc = function() + return _type.Saved.Label.OffsetY + end, + setFunc = function(value) + _type.Saved.Label.OffsetY = value + base.RestoreFrame(_type) + base.RestoreCombineLabels() + end, + min = -500, + max = 500, + width = "half" + }, + { + type = "dropdown", + name = "Display name anchor position on button", + tooltip = "Select display name anchor position on the button\n" .. disabledWhenLabelIsHidden .. "\n or Collection is included in combine bar", + disabled = function() + return not _type.Saved.LabelShow or _type.Saved.Combine + end, + choices = base.Global.ChoiceLocations, + default = base.Default.BindingLocation, + getFunc = function() + if _type.Saved.Combine then + return base.GetLocationText(base.Saved.Combine.Label.PositionTarget) + else + return base.GetLocationText(_type.Saved.Label.PositionTarget) + end + end, + setFunc = function(value) + _type.Saved.Label.PositionTarget = base.GetLocationValue(value) + _type.Saved.AnchorXY = base.GetLocationValue(value) + base.RestoreFrame(_type) + base.RestoreCombineLabels() + end, + width = "half" + }, + { + type = "dropdown", + name = "Display name anchor position on label", + tooltip = "Select display name anchor position on the label\n" .. disabledWhenLabelIsHidden .. "\n or Collection is included in combine bar", + disabled = function() + return not _type.Saved.LabelShow or _type.Saved.Combine + end, + choices = base.Global.ChoiceLocations, + default = base.Default.BindingLocation, + getFunc = function() + if _type.Saved.Combine then + return base.GetLocationText(base.Saved.Combine.Label.Position) + else + return base.GetLocationText(_type.Saved.Label.Position) + end + end, + setFunc = function(value) + _type.Saved.Label.Position = base.GetLocationValue(value) + base.RestoreFrame(_type) + base.RestoreCombineLabels() + end, + width = "half" + }, + { + type = "dropdown", + name = "Bar anchor location", + tooltip = "Select Bar anchor location, used when bar is collapsed\n" .. disabledWhenCombined, + choices = base.Global.ChoiceCornerLocations, + default = base.Default[typeName].AnchorXY, + disabled = function() + return _type.Saved.Combine + end, + getFunc = function() + if _type.Saved.Combine then + return base.GetLocationText(base.Saved.Combine.AnchorXY) + else + return base.GetLocationText(_type.Saved.AnchorXY) + end + end, + setFunc = function(value) + _type.Saved.AnchorXY = base.GetLocationValue(value) + base.RestoreFrame(_type) + base.RestoreCombineLabels() + end, + width = "half" + }, + { + type = "divider", + width = "full" }, { type = "description", - text = "Choose what collection's you want enabled" + text = "Here you can setup the position and size" + }, + { + type = "slider", + name = "Choose bar depth (number of rows/columns)", + default = base.Default[typeName].BarDepth, + tooltip = disabledWhenCombined, + disabled = function() + return _type.Saved.Combine + end, + getFunc = function() + return _type.Saved.BarDepth + end, + setFunc = function(value) + _type.Saved.BarDepth = value + base.RestoreFrame(_type) + base.RestoreCombineLabels() + end, + min = 0, + max = _type.Unlocked + }, + { + type = "slider", + name = "Choose max bar height (number of inverse rows/columns)", + default = base.Default[typeName].BarWidth, + tooltip = disabledWhenCombined, + disabled = function() + return _type.Saved.Combine + end, + getFunc = function() + return _type.Saved.BarWidth + end, + setFunc = function(value) + _type.Saved.BarWidth = value + base.RestoreFrame(_type) + base.RestoreCombineLabels() + end, + min = 0, + max = _type.Unlocked + }, + { + type = "checkbox", + name = "Bar orientation horizontal", + default = base.Default[typeName].Horizontal, + tooltip = disabledWhenCombined, + disabled = function() + return _type.Saved.Combine + end, + getFunc = function() + return _type.Saved.Horizontal + end, + setFunc = function(newValue) + _type.Saved.Horizontal = newValue + base.RestoreFrame(_type) + base.RestoreCombineLabels() + end } } - for _, collection in ipairs(_type.OrderedCollection) do - table.insert( - controls, - { - type = "checkbox", - name = "Show " .. collection.Name, - tooltip = collection.Tooltip, - default = not collection.Disabled, - disabled = collection.Disabled, - getFunc = function() - return _type.Saved.Selected[collection.Id] - end, - setFunc = function(newValue) - if newValue == true then - _type.Saved.Selected[collection.Id] = newValue - else - _type.Saved.Selected[collection.Id] = nil - end - base.RestoreFrame(_type) - base.RestoreCombineLabels() - end - } - ) - end table.insert( optionsData, controlIndex, { type = "submenu", - name = string.format("%s (Total: %s Unlocked: %s) ", typeName, _type.Total, _type.Unlocked), - tooltip = "Choose what collection's you want on the bar", + name = string.format("Setup %s", typeName), + tooltip = 'Choose what collection\'s you want on the bar\nDisabled when collection is disabled in "Collection Types"', + disabled = function() + return not _type.Saved.Enabled + end, controls = controls } ) end - local indexShowCollection = 6 - local indexDataToMenu = 7 + local indexShowCollection = 7 + local indexCollectionMenuItem = 8 for _, _type in ipairs(base.TypeOrdered) do - AppendShowCollection(indexShowCollection, _type) - if _type.Saved.Enabled then - AppendDataToMenu(indexDataToMenu, _type) - indexDataToMenu = indexDataToMenu + 1 - end + AppendCollectionType(indexShowCollection, _type) + AppendCollectionMenuItem(indexCollectionMenuItem, _type) + indexCollectionMenuItem = indexCollectionMenuItem + 1 end LAM2:RegisterOptionControls(base.Addon.Name, optionsData) diff --git a/CBs_MoveFrame.lua b/CBs_MoveFrame.lua index 7178a33..3125ef4 100644 --- a/CBs_MoveFrame.lua +++ b/CBs_MoveFrame.lua @@ -9,9 +9,8 @@ Filename: CBs_MoveFrame.lua local base = CollectionBars ------------------------------------------------------------------------------------------------- --- PRIVATE FUNCTIONS -- +-- FUNCTIONS -- ------------------------------------------------------------------------------------------------- - function base.GetMoveFrameSnapPosition(frame, anchorXY) local snapSize = frame.Saved.SnapSize local x = frame:GetLeft() @@ -106,9 +105,6 @@ function base.GetOrCreateMoveFrame(targetFrame, _type) newMoveFrame:SetDimensions(targetFrame:GetWidth(), targetFrame:GetHeight()) newMoveFrame:SetDrawLayer(4) newMoveFrame:SetParent(GuiRoot) - newMoveFrame:SetMouseEnabled(true) - newMoveFrame:SetMovable(true) - newMoveFrame:SetClampedToScreen(true) -- overlay if newMoveFrame.overlay == nil then diff --git a/CBs_Settings.lua b/CBs_Settings.lua new file mode 100644 index 0000000..403ca83 --- /dev/null +++ b/CBs_Settings.lua @@ -0,0 +1,132 @@ +--[[ +Author: Jarth +Filename: CBs_Settings.lua +]] -- + +------------------------------------------------------------------------------------------------- +-- VARIABLES -- +------------------------------------------------------------------------------------------------- +local base = CollectionBars + +------------------------------------------------------------------------------------------------- +-- FUNCTIONS -- +------------------------------------------------------------------------------------------------- +function base.InitializeSettingsSlash() + SLASH_COMMANDS[base.Global.SettingsSlash] = function() + base.ToggleEnableSettings() + end +end + +function base.ToggleEnableSettings() + base.Global.EnableSettings = not base.Global.EnableSettings + base.RestoreFrames() + base.RestoreCombineLabels() +end + +function base.SetupToggleSettings(_type) + local toggleSettings = GetControl(base.Global.HideAllId .. _type.Name .. "ToggleSettings") + if toggleSettings then + local hideAllSettingsFunc = function() + base.ShowSettings(_type) + end + toggleSettings:SetHandler("OnClicked", hideAllSettingsFunc) + end +end + +function base.UpdateToggleSettings(_type) + local offsetX = 0 + if base.Global.EnableSettings then + offsetX = -19 + end + + if _type.FrameLabel and _type.FrameToggleSettings then + _type.FrameToggleSettings:ClearAnchors() + _type.FrameToggleSettings:SetAnchor(TOPLEFT, _type.FrameLabel, TOPRIGHT, offsetX, 0) + _type.FrameToggleSettings:SetAnchor(BOTTOMRIGHT, _type.FrameLabel, BOTTOMRIGHT, 0, 0) + end + if _type.FrameLabel and _type.FrameLabelButton then + _type.FrameLabelButton:ClearAnchors() + _type.FrameLabelButton:SetAnchor(TOPLEFT, _type.FrameLabel, TOPLEFT, 0, 0) + _type.FrameLabelButton:SetAnchor(BOTTOMRIGHT, _type.FrameLabel, BOTTOMRIGHT, offsetX, 0) + end +end + +function base.SetupSettingsFrameHandlers(control, text, onClicked) + control.tooltipText = text + control:SetHandler("OnClicked", onClicked) + control:SetHandler( + "OnMouseEnter", + function(_control) + ZO_Tooltips_ShowTextTooltip(_control, BOTTOM, _control.tooltipText) + end + ) + control:SetHandler( + "OnMouseExit", + function() + ZO_Tooltips_HideTextTooltip() + end + ) +end + +function base.SetupSetttingsFrame(_type) + local selector = base.Addon.Abbreviation .. "_Settings" + + base.Global.SettingsFrame = base.WM:CreateControlFromVirtual(selector, GuiRoot, selector) + base.Global.SettingsLabel = GetControl(selector .. "Label") + base.Global.SettingsList = CBs_List:New(base, _type, base.Global.SettingsFrame) + + local titleControl = GetControl(selector .. "Title") + titleControl:SetText(base.Addon.DisplayName .. " Settings") + + local closeFrame = GetControl(base.Global.SettingsFrame, "Close") + if closeFrame then + base.SetupSettingsFrameHandlers( + closeFrame, + "Close", + function(buttonControl) + local control = buttonControl:GetParent() + control:SetHidden(true) + end + ) + end + local moveFrame = GetControl(base.Global.SettingsFrame, "Move") + if moveFrame then + base.SetupSettingsFrameHandlers( + moveFrame, + "Toggle move frame", + function() + base.Global.IsMoveEnabled = not base.Global.IsMoveEnabled + base.RestoreFrames() + end + ) + end + local refreshFrame = GetControl(base.Global.SettingsFrame, "Refresh") + if refreshFrame then + base.SetupSettingsFrameHandlers( + refreshFrame, + "Reload collection list", + function() + base.CreateCollection(_type) + base.RestoreFrame(_type) + base.RestoreCombineLabels() + base.Global.SettingsList:RefreshData() + end + ) + end +end + +function base.ShowSettings(_type) + local show = false + if base.Global.SettingsFrame == nil then + base.SetupSetttingsFrame(_type) + show = true + end + + show = show or base.Global.SettingsFrame:IsHidden() or _type ~= base.Global.SettingsList._type + base.Global.SettingsFrame:SetHidden(not show) + if show then + base.Global.SettingsLabel:SetText(show and _type.Name or "") + base.Global.SettingsList._type = show and _type or nil + base.Global.SettingsList:RefreshData() + end +end diff --git a/Changelog b/Changelog index 8419405..fed83e8 100644 --- a/Changelog +++ b/Changelog @@ -1,6 +1,31 @@ ------------------------------------------------------------------------------- Collection bars ------------------------------------------------------------------------------- +Version 1.0.2 (14-06-2019) +- Removed files for library: LibAddonMenu-2.0 +-- It is still required, but files needs to be downloaded seperately +- Updated the activation by hotkey, so it always tries to activate the collectible, even if a button does not exist +- Made labels clamp to the screen + +Menu +- Removed sub pages in the menu, it now has a divider where one used to be +- Added tooltips declaring why items are disabled +- Moved selection of collectibles to the new "settings panel" +- Added "Toggle settings" button, to toggle settings mode +- Removed reload requirement, when toggling a collection type + +Settings panel +- Added settings panel, for setting up specific collection type settings +- Right click a label to toggle settings mode +- In settings mode, all labels are shown, when collection type is selected +- Open the settings panel by pressing the cog on the label +- Functionality in the settings panel: +-- Toggle move frame +-- Reload collection +-- Show disabled collectibles of type +-- Select all collectibles of type +-- Select specific collectible of type + Version 1.0.1 (06-05-2019) - Removed dublicate LibStub from lib: Libs\LibStub diff --git a/CollectionBars.lua b/CollectionBars.lua index 3dc079c..e5cc4e4 100644 --- a/CollectionBars.lua +++ b/CollectionBars.lua @@ -14,30 +14,25 @@ local base = CollectionBars function base.OnAddOnLoaded(_, addonName) if addonName == base.Addon.Name then + base.GenerateCollectionTypes() base.Initialize() end end function base.Initialize() - -- Load saved values.. base.SetAndUpdateAccountSettings() - -- Initialize frames base.InitializeCombineFrame() - -- Initialize bindings base.InitializeBindings() + base.InitializeSettingsSlash() base.InitializeReverseBinding() - -- Initialize and setup types for _, _type in pairs(base.Type) do _type.Saved = base.Saved[_type.Name] if _type.Saved.Enabled then - base.CreateCollection(_type) - base.SetupLabel(_type) - base.RestoreFrame(_type) + base.InitializeType(_type) end end - -- Initialize and setup Combine base.InitializeCombine() base.RestoreCombine() @@ -46,9 +41,11 @@ function base.Initialize() EVENT_MANAGER:UnregisterForEvent(base.Addon.Name, EVENT_ADD_ON_LOADED) end -------------------------------------------------------------------------------------------------- --- PRIVATE FUNCTIONS -- -------------------------------------------------------------------------------------------------- +function base.InitializeType(_type) + base.CreateCollection(_type) + base.SetupLabel(_type) + base.RestoreFrame(_type) +end function base.InitializeCombineFrame() local name = base.Addon.Abbreviation .. "_CombineFrame" @@ -58,16 +55,26 @@ function base.InitializeCombineFrame() end function base.CreateCollection(_type) + local unlocked = GetTotalUnlockedCollectiblesByCategoryType(_type.TypeId) + _type.Collection = {} + _type.OrderedCollection = {} + _type.Unlocked = unlocked + _type.Total = GetTotalCollectiblesByCategoryType(_type.TypeId) + _type.IsUsable = IsCollectibleCategoryUsable(_type.TypeId) + + if unlocked > base.Global.HighestUnlocked then + base.Global.HighestUnlocked = unlocked + end local elementsAdded = 1 for index = 1, _type.Total do local id = GetCollectibleIdFromType(_type.TypeId, index) - local name, description, icon, _, unlocked, _, _, _, hint, _ = GetCollectibleInfo(id) - if unlocked or _type.Saved.MenuShowDisabled then + local name, description, icon, _, _unlocked, _, _, _, hint, _ = GetCollectibleInfo(id) + if _unlocked or _type.Saved.MenuShowDisabled then _type.Collection[id] = { Id = id, Name = name, EnabledTexture = icon, - Disabled = not unlocked, + Disabled = not _unlocked, Tooltip = string.format("Description: %s \nHint: %s", description, hint) } _type.OrderedCollection[elementsAdded] = _type.Collection[id] @@ -95,18 +102,29 @@ end function base.RestoreFrame(_type) if _type.Saved.Enabled then - --Label base.RestoreLabel(_type) - --Combine and Frame base.SetFrameAndCombineSize(_type) - --Frame base.SetupButtons(_type) base.RestorePosition(_type) + base.UpdateToggleSettings(_type) base.UpdateMoveFrame(_type) base.UpdateFragment(_type) end end +function base.RemoveFrame(_type) + base.RemoveFragments(_type) + for _, _value in ipairs(_type.OrderedCollection) do + if base.Buttons[_value.Id] ~= nil then + base.Buttons[_value.Id]:SetHidden(true) + end + end + + if _type.Frame ~= nil then + _type.Frame:SetHidden(true) + end +end + function base.InitializeCombine() base.Global.Combine.Saved = base.Saved.Combine end diff --git a/CollectionBars.txt b/CollectionBars.txt index f240445..bf56b0c 100644 --- a/CollectionBars.txt +++ b/CollectionBars.txt @@ -4,9 +4,9 @@ ; States and/or other countries. All rights reserved. ; You can read the full terms at https://account.elderscrollsonline.com/add-on-terms -## APIVersion: 100026 +## APIVersion: 100027 ## Title: Collection Bars -## Version: 1.0.1 +## Version: 1.0.2 ## Author: Jarth ## Description: Show collection bars and activate collections with key or button press ## @@ -19,21 +19,6 @@ ## SavedVariables: CollectionBars_Character ## DependsOn: LibAddonMenu-2.0 -Libs\LibAddonMenu-2.0\LibAddonMenu-2.0.lua -libs\LibAddonMenu-2.0\controls\panel.lua -libs\LibAddonMenu-2.0\controls\submenu.lua -libs\LibAddonMenu-2.0\controls\button.lua -libs\LibAddonMenu-2.0\controls\checkbox.lua -libs\LibAddonMenu-2.0\controls\colorpicker.lua -libs\LibAddonMenu-2.0\controls\custom.lua -libs\LibAddonMenu-2.0\controls\description.lua -libs\LibAddonMenu-2.0\controls\dropdown.lua -libs\LibAddonMenu-2.0\controls\editbox.lua -libs\LibAddonMenu-2.0\controls\header.lua -libs\LibAddonMenu-2.0\controls\slider.lua -libs\LibAddonMenu-2.0\controls\texture.lua -libs\LibAddonMenu-2.0\controls\iconpicker.lua -libs\LibAddonMenu-2.0\controls\divider.lua CollectionBars.xml CBs_Constants.lua @@ -44,6 +29,8 @@ CBs_Menu.lua CBs_MoveFrame.lua CBs_Fragment.lua CBs_Buttons.lua +CBs_List.lua +CBs_Settings.lua CBs_Labels.lua CollectionBars.lua Bindings.xml \ No newline at end of file diff --git a/CollectionBars.xml b/CollectionBars.xml index b65c7ed..5f72f92 100644 --- a/CollectionBars.xml +++ b/CollectionBars.xml @@ -1,32 +1,43 @@ - + - + - + - + - + @@ -59,11 +70,82 @@ - + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0.txt b/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0.txt deleted file mode 100644 index f846e26..0000000 --- a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0.txt +++ /dev/null @@ -1,33 +0,0 @@ -## APIVersion: 100026 100027 -## Title: LibAddonMenu-2.0 -## Version: 2.0 r27 -## AddOnVersion: 27 -## OptionalDependsOn: LibStub LibDebugLogger -## Author: Seerah, sirinsidiator, et al. -## Contributors: votan, merlight, Garkin, Randactyl, KuroiLight, silvereyes333, Baertram, kyoma, klingo -## Description: A library to aid in the creation of option panels. -## -## This Add-on is not created by, affiliated with or sponsored by ZeniMax Media Inc. or its affiliates. -## The Elder Scrolls® and related logos are registered trademarks or trademarks of ZeniMax Media Inc. in the United States and/or other countries. -## All rights reserved -## -## You can read the full terms at https://account.elderscrollsonline.com/add-on-terms - -LibStub\LibStub.lua - -LibAddonMenu-2.0\LibAddonMenu-2.0.lua - -LibAddonMenu-2.0\controls\panel.lua -LibAddonMenu-2.0\controls\submenu.lua -LibAddonMenu-2.0\controls\button.lua -LibAddonMenu-2.0\controls\checkbox.lua -LibAddonMenu-2.0\controls\colorpicker.lua -LibAddonMenu-2.0\controls\custom.lua -LibAddonMenu-2.0\controls\description.lua -LibAddonMenu-2.0\controls\dropdown.lua -LibAddonMenu-2.0\controls\editbox.lua -LibAddonMenu-2.0\controls\header.lua -LibAddonMenu-2.0\controls\slider.lua -LibAddonMenu-2.0\controls\texture.lua -LibAddonMenu-2.0\controls\iconpicker.lua -LibAddonMenu-2.0\controls\divider.lua diff --git a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/LICENSE b/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/LICENSE deleted file mode 100644 index f69cbd4..0000000 --- a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - The Artistic License 2.0 - - Copyright (c) 2016 Ryan Lakanen (Seerah) - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -Preamble - -This license establishes the terms under which a given free software -Package may be copied, modified, distributed, and/or redistributed. -The intent is that the Copyright Holder maintains some artistic -control over the development of that Package while still keeping the -Package available as open source and free software. - -You are always permitted to make arrangements wholly outside of this -license directly with the Copyright Holder of a given Package. If the -terms of this license do not permit the full use that you propose to -make of the Package, you should contact the Copyright Holder and seek -a different licensing arrangement. - -Definitions - - "Copyright Holder" means the individual(s) or organization(s) - named in the copyright notice for the entire Package. - - "Contributor" means any party that has contributed code or other - material to the Package, in accordance with the Copyright Holder's - procedures. - - "You" and "your" means any person who would like to copy, - distribute, or modify the Package. - - "Package" means the collection of files distributed by the - Copyright Holder, and derivatives of that collection and/or of - those files. A given Package may consist of either the Standard - Version, or a Modified Version. - - "Distribute" means providing a copy of the Package or making it - accessible to anyone else, or in the case of a company or - organization, to others outside of your company or organization. - - "Distributor Fee" means any fee that you charge for Distributing - this Package or providing support for this Package to another - party. It does not mean licensing fees. - - "Standard Version" refers to the Package if it has not been - modified, or has been modified only in ways explicitly requested - by the Copyright Holder. - - "Modified Version" means the Package, if it has been changed, and - such changes were not explicitly requested by the Copyright - Holder. - - "Original License" means this Artistic License as Distributed with - the Standard Version of the Package, in its current version or as - it may be modified by The Perl Foundation in the future. - - "Source" form means the source code, documentation source, and - configuration files for the Package. - - "Compiled" form means the compiled bytecode, object code, binary, - or any other form resulting from mechanical transformation or - translation of the Source form. - - -Permission for Use and Modification Without Distribution - -(1) You are permitted to use the Standard Version and create and use -Modified Versions for any purpose without restriction, provided that -you do not Distribute the Modified Version. - - -Permissions for Redistribution of the Standard Version - -(2) You may Distribute verbatim copies of the Source form of the -Standard Version of this Package in any medium without restriction, -either gratis or for a Distributor Fee, provided that you duplicate -all of the original copyright notices and associated disclaimers. At -your discretion, such verbatim copies may or may not include a -Compiled form of the Package. - -(3) You may apply any bug fixes, portability changes, and other -modifications made available from the Copyright Holder. The resulting -Package will still be considered the Standard Version, and as such -will be subject to the Original License. - - -Distribution of Modified Versions of the Package as Source - -(4) You may Distribute your Modified Version as Source (either gratis -or for a Distributor Fee, and with or without a Compiled form of the -Modified Version) provided that you clearly document how it differs -from the Standard Version, including, but not limited to, documenting -any non-standard features, executables, or modules, and provided that -you do at least ONE of the following: - - (a) make the Modified Version available to the Copyright Holder - of the Standard Version, under the Original License, so that the - Copyright Holder may include your modifications in the Standard - Version. - - (b) ensure that installation of your Modified Version does not - prevent the user installing or running the Standard Version. In - addition, the Modified Version must bear a name that is different - from the name of the Standard Version. - - (c) allow anyone who receives a copy of the Modified Version to - make the Source form of the Modified Version available to others - under - - (i) the Original License or - - (ii) a license that permits the licensee to freely copy, - modify and redistribute the Modified Version using the same - licensing terms that apply to the copy that the licensee - received, and requires that the Source form of the Modified - Version, and of any works derived from it, be made freely - available in that license fees are prohibited but Distributor - Fees are allowed. - - -Distribution of Compiled Forms of the Standard Version -or Modified Versions without the Source - -(5) You may Distribute Compiled forms of the Standard Version without -the Source, provided that you include complete instructions on how to -get the Source of the Standard Version. Such instructions must be -valid at the time of your distribution. If these instructions, at any -time while you are carrying out such distribution, become invalid, you -must provide new instructions on demand or cease further distribution. -If you provide valid instructions or cease distribution within thirty -days after you become aware that the instructions are invalid, then -you do not forfeit any of your rights under this license. - -(6) You may Distribute a Modified Version in Compiled form without -the Source, provided that you comply with Section 4 with respect to -the Source of the Modified Version. - - -Aggregating or Linking the Package - -(7) You may aggregate the Package (either the Standard Version or -Modified Version) with other packages and Distribute the resulting -aggregation provided that you do not charge a licensing fee for the -Package. Distributor Fees are permitted, and licensing fees for other -components in the aggregation are permitted. The terms of this license -apply to the use and Distribution of the Standard or Modified Versions -as included in the aggregation. - -(8) You are permitted to link Modified and Standard Versions with -other works, to embed the Package in a larger work of your own, or to -build stand-alone binary or bytecode versions of applications that -include the Package, and Distribute the result without restriction, -provided the result does not expose a direct interface to the Package. - - -Items That are Not Considered Part of a Modified Version - -(9) Works (including, but not limited to, modules and scripts) that -merely extend or make use of the Package, do not, by themselves, cause -the Package to be a Modified Version. In addition, such works are not -considered parts of the Package itself, and are not subject to the -terms of this license. - - -General Provisions - -(10) Any use, modification, and distribution of the Standard or -Modified Versions is governed by this Artistic License. By using, -modifying or distributing the Package, you accept this license. Do not -use, modify, or distribute the Package, if you do not accept this -license. - -(11) If your Modified Version has been derived from a Modified -Version made by someone other than you, you are nevertheless required -to ensure that your Modified Version complies with the requirements of -this license. - -(12) This license does not grant you the right to use any trademark, -service mark, tradename, or logo of the Copyright Holder. - -(13) This license includes the non-exclusive, worldwide, -free-of-charge patent license to make, have made, use, offer to sell, -sell, import and otherwise transfer the Package with respect to any -patent claims licensable by the Copyright Holder that are necessarily -infringed by the Package. If you institute patent litigation -(including a cross-claim or counterclaim) against any party alleging -that the Package constitutes direct or contributory patent -infringement, then this Artistic License to you shall terminate on the -date that such litigation is filed. - -(14) Disclaimer of Warranty: -THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS -IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR -NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL -LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL -BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF -ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/LibAddonMenu-2.0.lua b/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/LibAddonMenu-2.0.lua deleted file mode 100644 index cdca233..0000000 --- a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/LibAddonMenu-2.0.lua +++ /dev/null @@ -1,1282 +0,0 @@ --- LibAddonMenu-2.0 & its files © Ryan Lakanen (Seerah) -- --- Distributed under The Artistic License 2.0 (see LICENSE) -- ------------------------------------------------------------------- - - ---Register LAM with LibStub -local MAJOR, MINOR = "LibAddonMenu-2.0", 27 -local lam, oldminor = LibStub:NewLibrary(MAJOR, MINOR) -if not lam then return end --the same or newer version of this lib is already loaded into memory - -local messages = {} -local MESSAGE_PREFIX = "[LAM2] " -local function PrintLater(msg) - if CHAT_SYSTEM.primaryContainer then - d(MESSAGE_PREFIX .. msg) - else - messages[#messages + 1] = msg - end -end - -local function FlushMessages() - for i = 1, #messages do - d(MESSAGE_PREFIX .. messages[i]) - end - messages = {} -end - -local logger -if LibDebugLogger then - logger = LibDebugLogger(MAJOR) -end - -if LAMSettingsPanelCreated and not LAMCompatibilityWarning then - PrintLater("An old version of LibAddonMenu with compatibility issues was detected. For more information on how to proceed search for LibAddonMenu on esoui.com") - LAMCompatibilityWarning = true -end - ---UPVALUES-- -local wm = WINDOW_MANAGER -local em = EVENT_MANAGER -local sm = SCENE_MANAGER -local cm = CALLBACK_MANAGER -local tconcat = table.concat -local tinsert = table.insert - -local MIN_HEIGHT = 26 -local HALF_WIDTH_LINE_SPACING = 2 -local OPTIONS_CREATION_RUNNING = 1 -local OPTIONS_CREATED = 2 -local LAM_CONFIRM_DIALOG = "LAM_CONFIRM_DIALOG" -local LAM_DEFAULTS_DIALOG = "LAM_DEFAULTS" -local LAM_RELOAD_DIALOG = "LAM_RELOAD_DIALOG" - -local addonsForList = {} -local addonToOptionsMap = {} -local optionsState = {} -lam.widgets = lam.widgets or {} -local widgets = lam.widgets -lam.util = lam.util or {} -local util = lam.util -lam.controlsForReload = lam.controlsForReload or {} -local controlsForReload = lam.controlsForReload - -local function GetDefaultValue(default) - if type(default) == "function" then - return default() - end - return default -end - -local function GetStringFromValue(value) - if type(value) == "function" then - return value() - elseif type(value) == "number" then - return GetString(value) - end - return value -end - -local function GetColorForState(disabled) - return disabled and ZO_DEFAULT_DISABLED_COLOR or ZO_DEFAULT_ENABLED_COLOR -end - -local function CreateBaseControl(parent, controlData, controlName) - local control = wm:CreateControl(controlName or controlData.reference, parent.scroll or parent, CT_CONTROL) - control.panel = parent.panel or parent -- if this is in a submenu, panel is the submenu's parent - control.data = controlData - - control.isHalfWidth = controlData.width == "half" - local width = 510 -- set default width in case a custom parent object is passed - if control.panel.GetWidth ~= nil then width = control.panel:GetWidth() - 60 end - control:SetWidth(width) - return control -end - -local function CreateLabelAndContainerControl(parent, controlData, controlName) - local control = CreateBaseControl(parent, controlData, controlName) - local width = control:GetWidth() - - local container = wm:CreateControl(nil, control, CT_CONTROL) - container:SetDimensions(width / 3, MIN_HEIGHT) - control.container = container - - local label = wm:CreateControl(nil, control, CT_LABEL) - label:SetFont("ZoFontWinH4") - label:SetHeight(MIN_HEIGHT) - label:SetWrapMode(TEXT_WRAP_MODE_ELLIPSIS) - label:SetText(GetStringFromValue(controlData.name)) - control.label = label - - if control.isHalfWidth then - control:SetDimensions(width / 2, MIN_HEIGHT * 2 + HALF_WIDTH_LINE_SPACING) - label:SetAnchor(TOPLEFT, control, TOPLEFT, 0, 0) - label:SetAnchor(TOPRIGHT, control, TOPRIGHT, 0, 0) - container:SetAnchor(TOPRIGHT, control.label, BOTTOMRIGHT, 0, HALF_WIDTH_LINE_SPACING) - else - control:SetDimensions(width, MIN_HEIGHT) - container:SetAnchor(TOPRIGHT, control, TOPRIGHT, 0, 0) - label:SetAnchor(TOPLEFT, control, TOPLEFT, 0, 0) - label:SetAnchor(TOPRIGHT, container, TOPLEFT, 5, 0) - end - - control.data.tooltipText = GetStringFromValue(control.data.tooltip) - control:SetMouseEnabled(true) - control:SetHandler("OnMouseEnter", ZO_Options_OnMouseEnter) - control:SetHandler("OnMouseExit", ZO_Options_OnMouseExit) - return control -end - -local function GetTopPanel(panel) - while panel.panel and panel.panel ~= panel do - panel = panel.panel - end - return panel -end - -local function IsSame(objA, objB) - if #objA ~= #objB then return false end - for i = 1, #objA do - if objA[i] ~= objB[i] then return false end - end - return true -end - -local function RefreshReloadUIButton() - lam.requiresReload = false - - for i = 1, #controlsForReload do - local reloadControl = controlsForReload[i] - if not IsSame(reloadControl.startValue, {reloadControl.data.getFunc()}) then - lam.requiresReload = true - break - end - end - - lam.applyButton:SetHidden(not lam.requiresReload) -end - -local function RequestRefreshIfNeeded(control) - -- if our parent window wants to refresh controls, then fire the callback - local panel = GetTopPanel(control) - local panelData = panel.data - if panelData.registerForRefresh then - cm:FireCallbacks("LAM-RefreshPanel", control) - end - RefreshReloadUIButton() -end - -local function RegisterForRefreshIfNeeded(control) - -- if our parent window wants to refresh controls, then add this to the list - local panel = GetTopPanel(control.panel) - local panelData = panel.data - if panelData.registerForRefresh or panelData.registerForDefaults then - tinsert(panel.controlsToRefresh or {}, control) -- prevent errors on custom panels - end -end - -local function RegisterForReloadIfNeeded(control) - if control.data.requiresReload then - tinsert(controlsForReload, control) - control.startValue = {control.data.getFunc()} - end -end - -local function GetConfirmDialog() - if(not ESO_Dialogs[LAM_CONFIRM_DIALOG]) then - ESO_Dialogs[LAM_CONFIRM_DIALOG] = { - canQueue = true, - title = { - text = "", - }, - mainText = { - text = "", - }, - buttons = { - [1] = { - text = SI_DIALOG_CONFIRM, - callback = function(dialog) end, - }, - [2] = { - text = SI_DIALOG_CANCEL, - } - } - } - end - return ESO_Dialogs[LAM_CONFIRM_DIALOG] -end - -local function ShowConfirmationDialog(title, body, callback) - local dialog = GetConfirmDialog() - dialog.title.text = title - dialog.mainText.text = body - dialog.buttons[1].callback = callback - ZO_Dialogs_ShowDialog(LAM_CONFIRM_DIALOG) -end - -local function GetDefaultsDialog() - if(not ESO_Dialogs[LAM_DEFAULTS_DIALOG]) then - ESO_Dialogs[LAM_DEFAULTS_DIALOG] = { - canQueue = true, - title = { - text = SI_INTERFACE_OPTIONS_RESET_TO_DEFAULT_TOOLTIP, - }, - mainText = { - text = SI_OPTIONS_RESET_PROMPT, - }, - buttons = { - [1] = { - text = SI_OPTIONS_RESET, - callback = function(dialog) end, - }, - [2] = { - text = SI_DIALOG_CANCEL, - } - } - } - end - return ESO_Dialogs[LAM_DEFAULTS_DIALOG] -end - -local function ShowDefaultsDialog(panel) - local dialog = GetDefaultsDialog() - dialog.buttons[1].callback = function() - panel:ForceDefaults() - RefreshReloadUIButton() - end - ZO_Dialogs_ShowDialog(LAM_DEFAULTS_DIALOG) -end - -local function DiscardChangesOnReloadControls() - for i = 1, #controlsForReload do - local reloadControl = controlsForReload[i] - if not IsSame(reloadControl.startValue, {reloadControl.data.getFunc()}) then - reloadControl:UpdateValue(false, unpack(reloadControl.startValue)) - end - end - lam.requiresReload = false - lam.applyButton:SetHidden(true) -end - -local function StorePanelForReopening() - local saveData = ZO_Ingame_SavedVariables["LAM"] or {} - saveData.reopenPanel = lam.currentAddonPanel:GetName() - ZO_Ingame_SavedVariables["LAM"] = saveData -end - -local function RetrievePanelForReopening() - local saveData = ZO_Ingame_SavedVariables["LAM"] - if(saveData) then - ZO_Ingame_SavedVariables["LAM"] = nil - return _G[saveData.reopenPanel] - end -end - -local function HandleReloadUIPressed() - StorePanelForReopening() - ReloadUI() -end - -local function HandleLoadDefaultsPressed() - ShowDefaultsDialog(lam.currentAddonPanel) -end - -local function GetReloadDialog() - if(not ESO_Dialogs[LAM_RELOAD_DIALOG]) then - ESO_Dialogs[LAM_RELOAD_DIALOG] = { - canQueue = true, - title = { - text = util.L["RELOAD_DIALOG_TITLE"], - }, - mainText = { - text = util.L["RELOAD_DIALOG_TEXT"], - }, - buttons = { - [1] = { - text = util.L["RELOAD_DIALOG_RELOAD_BUTTON"], - callback = function() ReloadUI() end, - }, - [2] = { - text = util.L["RELOAD_DIALOG_DISCARD_BUTTON"], - callback = DiscardChangesOnReloadControls, - } - }, - noChoiceCallback = DiscardChangesOnReloadControls, - } - end - return ESO_Dialogs[LAM_CONFIRM_DIALOG] -end - -local function ShowReloadDialogIfNeeded() - if lam.requiresReload then - local dialog = GetReloadDialog() - ZO_Dialogs_ShowDialog(LAM_RELOAD_DIALOG) - end -end - -local function UpdateWarning(control) - local warning - if control.data.warning ~= nil then - warning = util.GetStringFromValue(control.data.warning) - end - - if control.data.requiresReload then - if not warning then - warning = string.format("|cff0000%s", util.L["RELOAD_UI_WARNING"]) - else - warning = string.format("%s\n\n|cff0000%s", warning, util.L["RELOAD_UI_WARNING"]) - end - end - - if not warning then - control.warning:SetHidden(true) - else - control.warning.data = {tooltipText = warning} - control.warning:SetHidden(false) - end -end - -local localization = { - en = { - PANEL_NAME = "Addons", - AUTHOR = string.format("%s: <>", GetString(SI_ADDON_MANAGER_AUTHOR)), -- "Author: <>" - VERSION = "Version: <>", - WEBSITE = "Visit Website", - FEEDBACK = "Feedback", - TRANSLATION = "Translation", - DONATION = "Donate", - PANEL_INFO_FONT = "$(CHAT_FONT)|14|soft-shadow-thin", - RELOAD_UI_WARNING = "Changes to this setting require an UI reload in order to take effect.", - RELOAD_DIALOG_TITLE = "UI Reload required", - RELOAD_DIALOG_TEXT = "Some changes require an UI reload in order to take effect. Do you want to reload now or discard the changes?", - RELOAD_DIALOG_RELOAD_BUTTON = "Reload", - RELOAD_DIALOG_DISCARD_BUTTON = "Discard", - }, - it = { -- provided by JohnnyKing - PANEL_NAME = "Addon", - VERSION = "Versione: <>", - WEBSITE = "Visita il Sitoweb", - FEEDBACK = "Feedback", - TRANSLATION = "Traduzione", - DONATION = "Donare", - RELOAD_UI_WARNING = "Cambiare questa impostazione richiede un Ricarica UI al fine che faccia effetto.", - RELOAD_DIALOG_TITLE = "Ricarica UI richiesto", - RELOAD_DIALOG_TEXT = "Alcune modifiche richiedono un Ricarica UI al fine che facciano effetto. Sei sicuro di voler ricaricare ora o di voler annullare le modifiche?", - RELOAD_DIALOG_RELOAD_BUTTON = "Ricarica", - RELOAD_DIALOG_DISCARD_BUTTON = "Annulla", - }, - fr = { -- provided by Ayantir - PANEL_NAME = "Extensions", - WEBSITE = "Visiter le site Web", - FEEDBACK = "Réaction", - TRANSLATION = "Traduction", - DONATION = "Donner", - RELOAD_UI_WARNING = "La modification de ce paramètre requiert un rechargement de l'UI pour qu'il soit pris en compte.", - RELOAD_DIALOG_TITLE = "Reload UI requis", - RELOAD_DIALOG_TEXT = "Certaines modifications requièrent un rechargement de l'UI pour qu'ils soient pris en compte. Souhaitez-vous recharger l'interface maintenant ou annuler les modifications ?", - RELOAD_DIALOG_RELOAD_BUTTON = "Recharger", - RELOAD_DIALOG_DISCARD_BUTTON = "Annuler", - }, - de = { -- provided by sirinsidiator - PANEL_NAME = "Erweiterungen", - WEBSITE = "Webseite besuchen", - FEEDBACK = "Feedback", - TRANSLATION = "Übersetzung", - DONATION = "Spende", - RELOAD_UI_WARNING = "Änderungen an dieser Option werden erst übernommen nachdem die Benutzeroberfläche neu geladen wird.", - RELOAD_DIALOG_TITLE = "Neuladen benötigt", - RELOAD_DIALOG_TEXT = "Einige Änderungen werden erst übernommen nachdem die Benutzeroberfläche neu geladen wird. Wollt Ihr sie jetzt neu laden oder die Änderungen verwerfen?", - RELOAD_DIALOG_RELOAD_BUTTON = "Neu laden", - RELOAD_DIALOG_DISCARD_BUTTON = "Verwerfen", - }, - ru = { -- provided by TERAB1T - PANEL_NAME = "Дополнения", - VERSION = "Версия: <>", - WEBSITE = "Посетить сайт", - FEEDBACK = "отзыв", - TRANSLATION = "Перевод", - DONATION = "жертвовать", - PANEL_INFO_FONT = "RuESO/fonts/Univers57.otf|14|soft-shadow-thin", - RELOAD_UI_WARNING = "Для применения этой настройки необходима перезагрузка интерфейса.", - RELOAD_DIALOG_TITLE = "Необходима перезагрузка интерфейса", - RELOAD_DIALOG_TEXT = "Для применения некоторых изменений необходима перезагрузка интерфейса. Перезагрузить интерфейс сейчас или отменить изменения?", - RELOAD_DIALOG_RELOAD_BUTTON = "Перезагрузить", - RELOAD_DIALOG_DISCARD_BUTTON = "Отменить изменения", - }, - es = { -- provided by Morganlefai, checked by Kwisatz - PANEL_NAME = "Configuración", - VERSION = "Versión: <>", - WEBSITE = "Visita la página web", - FEEDBACK = "Reaccion", - TRANSLATION = "Traducción", - DONATION = "Donar", - RELOAD_UI_WARNING = "Cambiar este ajuste recargará la interfaz del usuario.", - RELOAD_DIALOG_TITLE = "Requiere recargar la interfaz", - RELOAD_DIALOG_TEXT = "Algunos cambios requieren recargar la interfaz para poder aplicarse. Quieres aplicar los cambios y recargar la interfaz?", - RELOAD_DIALOG_RELOAD_BUTTON = "Recargar", - RELOAD_DIALOG_DISCARD_BUTTON = "Cancelar", - }, - jp = { -- provided by k0ta0uchi - PANEL_NAME = "アドオン設定", - WEBSITE = "ウェブサイトを見る", - FEEDBACK = "フィードバック", - TRANSLATION = "訳書", - DONATION = "寄贈する", - }, - zh = { -- provided by bssthu - PANEL_NAME = "插件", - VERSION = "版本: <>", - WEBSITE = "访问网站", - PANEL_INFO_FONT = "EsoZh/fonts/univers57.otf|14|soft-shadow-thin", - }, - pl = { -- provided by EmiruTegryfon - PANEL_NAME = "Dodatki", - VERSION = "Wersja: <>", - WEBSITE = "Odwiedź stronę", - RELOAD_UI_WARNING = "Zmiany będą widoczne po ponownym załadowaniu UI.", - RELOAD_DIALOG_TITLE = "Wymagane przeładowanie UI", - RELOAD_DIALOG_TEXT = "Niektóre zmiany wymagają ponownego załadowania UI. Czy chcesz teraz ponownie załadować, czy porzucić zmiany?", - RELOAD_DIALOG_RELOAD_BUTTON = "Przeładuj", - RELOAD_DIALOG_DISCARD_BUTTON = "Porzuć", - }, - kr = { -- provided by p.walker - PANEL_NAME = "蝠盜蠨", - VERSION = "纄訄: <>", - WEBSITE = "裹芬襴钸 縩紸", - PANEL_INFO_FONT = "EsoKR/fonts/Univers57.otf|14|soft-shadow-thin", - RELOAD_UI_WARNING = "襴 茤訕襄 绀溽靘籴 風滼筼 訁袩靘瀰褄靴 UI 苈穜滠遨襴 靄袔革瓈瓤.", - RELOAD_DIALOG_TITLE = "UI 苈穜滠遨 靄袔", - RELOAD_DIALOG_TEXT = "绀溽瘜 茤訕 謑 UI 苈穜滠遨襄 靄袔穜靘璔 芬靭襴 覈蒵瓈瓤. 诀瀈 苈穜滠遨靘蓜溠蒵瓈灌? 蝄瓈籴 绀溽襄 迨莌靘蓜溠蒵瓈灌?", - RELOAD_DIALOG_RELOAD_BUTTON = "苈穜滠遨", - RELOAD_DIALOG_DISCARD_BUTTON = "绀溽迨莌", - }, - br = { -- provided by mlsevero - PANEL_NAME = "Addons", - AUTHOR = string.format("%s: <>", GetString(SI_ADDON_MANAGER_AUTHOR)), -- "Autor: <>" - VERSION = "Versão: <>", - WEBSITE = "Visite o Website", - RELOAD_UI_WARNING = "Mudanças nessa configuração requer a releitura da UI para ter efeito.", - RELOAD_DIALOG_TITLE = "Releitura da UI requerida", - RELOAD_DIALOG_TEXT = "Algumas mudanças requerem a releitura da UI para ter efeito. Você deseja reler agora ou descartar as mudanças?", - RELOAD_DIALOG_RELOAD_BUTTON = "Relê", - RELOAD_DIALOG_DISCARD_BUTTON = "Descarta", - }, -} - -util.L = ZO_ShallowTableCopy(localization[GetCVar("Language.2")] or {}, localization["en"]) -util.GetTooltipText = GetStringFromValue -- deprecated, use util.GetStringFromValue instead -util.GetStringFromValue = GetStringFromValue -util.GetDefaultValue = GetDefaultValue -util.GetColorForState = GetColorForState -util.CreateBaseControl = CreateBaseControl -util.CreateLabelAndContainerControl = CreateLabelAndContainerControl -util.RequestRefreshIfNeeded = RequestRefreshIfNeeded -util.RegisterForRefreshIfNeeded = RegisterForRefreshIfNeeded -util.RegisterForReloadIfNeeded = RegisterForReloadIfNeeded -util.GetTopPanel = GetTopPanel -util.ShowConfirmationDialog = ShowConfirmationDialog -util.UpdateWarning = UpdateWarning - -local ADDON_DATA_TYPE = 1 -local RESELECTING_DURING_REBUILD = true -local USER_REQUESTED_OPEN = true - - ---INTERNAL FUNCTION ---scrolls ZO_ScrollList `list` to move the row corresponding to `data` --- into view (does nothing if there is no such row in the list) ---unlike ZO_ScrollList_ScrollDataIntoView, this function accounts for --- fading near the list's edges - it avoids the fading area by scrolling --- a little further than the ZO function -local function ScrollDataIntoView(list, data) - local targetIndex = data.sortIndex - if not targetIndex then return end - - local scrollMin, scrollMax = list.scrollbar:GetMinMax() - local scrollTop = list.scrollbar:GetValue() - local controlHeight = list.uniformControlHeight or list.controlHeight - local targetMin = controlHeight * (targetIndex - 1) - 64 - -- subtracting 64 ain't arbitrary, it's the maximum fading height - -- (libraries/zo_templates/scrolltemplates.lua/UpdateScrollFade) - - if targetMin < scrollTop then - ZO_ScrollList_ScrollAbsolute(list, zo_max(targetMin, scrollMin)) - else - local listHeight = ZO_ScrollList_GetHeight(list) - local targetMax = controlHeight * targetIndex + 64 - listHeight - - if targetMax > scrollTop then - ZO_ScrollList_ScrollAbsolute(list, zo_min(targetMax, scrollMax)) - end - end -end - - ---INTERNAL FUNCTION ---constructs a string pattern from the text in `searchEdit` control --- * metacharacters are escaped, losing their special meaning --- * whitespace matches anything (including empty substring) ---if there is nothing but whitespace, returns nil ---otherwise returns a filter function, which takes a `data` table argument --- and returns true iff `data.filterText` matches the pattern -local function GetSearchFilterFunc(searchEdit) - local text = searchEdit:GetText():lower() - local pattern = text:match("(%S+.-)%s*$") - - if not pattern then -- nothing but whitespace - return nil - end - - -- escape metacharacters, e.g. "ESO-Datenbank.de" => "ESO%-Datenbank%.de" - pattern = pattern:gsub("[-*+?^$().[%]%%]", "%%%0") - - -- replace whitespace with "match shortest anything" - pattern = pattern:gsub("%s+", ".-") - - return function(data) - return data.filterText:lower():find(pattern) ~= nil - end -end - - ---INTERNAL FUNCTION ---populates `addonList` with entries from `addonsForList` --- addonList = ZO_ScrollList control --- filter = [optional] function(data) -local function PopulateAddonList(addonList, filter) - local entryList = ZO_ScrollList_GetDataList(addonList) - local numEntries = 0 - local selectedData = nil - local selectionIsFinal = false - - ZO_ScrollList_Clear(addonList) - - for i, data in ipairs(addonsForList) do - if not filter or filter(data) then - local dataEntry = ZO_ScrollList_CreateDataEntry(ADDON_DATA_TYPE, data) - numEntries = numEntries + 1 - data.sortIndex = numEntries - entryList[numEntries] = dataEntry - -- select the first panel passing the filter, or the currently - -- shown panel, but only if it passes the filter as well - if selectedData == nil or data.panel == lam.pendingAddonPanel or data.panel == lam.currentAddonPanel then - if not selectionIsFinal then - selectedData = data - end - if data.panel == lam.pendingAddonPanel then - lam.pendingAddonPanel = nil - selectionIsFinal = true - end - end - else - data.sortIndex = nil - end - end - - ZO_ScrollList_Commit(addonList) - - if selectedData then - if selectedData.panel == lam.currentAddonPanel then - ZO_ScrollList_SelectData(addonList, selectedData, nil, RESELECTING_DURING_REBUILD) - else - ZO_ScrollList_SelectData(addonList, selectedData, nil) - end - ScrollDataIntoView(addonList, selectedData) - end -end - - ---METHOD: REGISTER WIDGET-- ---each widget has its version checked before loading, ---so we only have the most recent one in memory ---Usage: --- widgetType = "string"; the type of widget being registered --- widgetVersion = integer; the widget's version number -LAMCreateControl = LAMCreateControl or {} -local lamcc = LAMCreateControl - -function lam:RegisterWidget(widgetType, widgetVersion) - if widgets[widgetType] and widgets[widgetType] >= widgetVersion then - return false - else - widgets[widgetType] = widgetVersion - return true - end -end - --- INTERNAL METHOD: hijacks the handlers for the actions in the OptionsWindow layer if not already done -local function InitKeybindActions() - if not lam.keybindsInitialized then - lam.keybindsInitialized = true - ZO_PreHook(KEYBOARD_OPTIONS, "ApplySettings", function() - if lam.currentPanelOpened then - if not lam.applyButton:IsHidden() then - HandleReloadUIPressed() - end - return true - end - end) - ZO_PreHook("ZO_Dialogs_ShowDialog", function(dialogName) - if lam.currentPanelOpened and dialogName == "OPTIONS_RESET_TO_DEFAULTS" then - if not lam.defaultButton:IsHidden() then - HandleLoadDefaultsPressed() - end - return true - end - end) - end -end - --- INTERNAL METHOD: fires the LAM-PanelOpened callback if not already done -local function OpenCurrentPanel() - if lam.currentAddonPanel and not lam.currentPanelOpened then - lam.currentPanelOpened = true - lam.defaultButton:SetHidden(not lam.currentAddonPanel.data.registerForDefaults) - cm:FireCallbacks("LAM-PanelOpened", lam.currentAddonPanel) - end -end - --- INTERNAL METHOD: fires the LAM-PanelClosed callback if not already done -local function CloseCurrentPanel() - if lam.currentAddonPanel and lam.currentPanelOpened then - lam.currentPanelOpened = false - cm:FireCallbacks("LAM-PanelClosed", lam.currentAddonPanel) - end -end - ---METHOD: OPEN TO ADDON PANEL-- ---opens to a specific addon's option panel ---Usage: --- panel = userdata; the panel returned by the :RegisterOptionsPanel method -local locSettings = GetString(SI_GAME_MENU_SETTINGS) -function lam:OpenToPanel(panel) - - -- find and select the panel's row in addon list - - local addonList = lam.addonList - local selectedData = nil - - for _, addonData in ipairs(addonsForList) do - if addonData.panel == panel then - selectedData = addonData - ScrollDataIntoView(addonList, selectedData) - lam.pendingAddonPanel = addonData.panel - break - end - end - - ZO_ScrollList_SelectData(addonList, selectedData) - ZO_ScrollList_RefreshVisible(addonList, selectedData) - - local srchEdit = LAMAddonSettingsWindow:GetNamedChild("SearchFilterEdit") - srchEdit:Clear() - - -- note that ZO_ScrollList doesn't require `selectedData` to be actually - -- present in the list, and that the list will only be populated once LAM - -- "Addon Settings" menu entry is selected for the first time - - local function openAddonSettingsMenu() - local gameMenu = ZO_GameMenu_InGame.gameMenu - local settingsMenu = gameMenu.headerControls[locSettings] - - if settingsMenu then -- an instance of ZO_TreeNode - local children = settingsMenu:GetChildren() - for i = 1, (children and #children or 0) do - local childNode = children[i] - local data = childNode:GetData() - if data and data.id == lam.panelId then - -- found LAM "Addon Settings" node, yay! - childNode:GetTree():SelectNode(childNode) - break - end - end - end - end - - if sm:GetScene("gameMenuInGame"):GetState() == SCENE_SHOWN then - openAddonSettingsMenu() - else - sm:CallWhen("gameMenuInGame", SCENE_SHOWN, openAddonSettingsMenu) - sm:Show("gameMenuInGame") - end -end - -local TwinOptionsContainer_Index = 0 -local function TwinOptionsContainer(parent, leftWidget, rightWidget) - TwinOptionsContainer_Index = TwinOptionsContainer_Index + 1 - local cParent = parent.scroll or parent - local panel = parent.panel or cParent - local container = wm:CreateControl("$(parent)TwinContainer" .. tostring(TwinOptionsContainer_Index), - cParent, CT_CONTROL) - container:SetResizeToFitDescendents(true) - container:SetAnchor(select(2, leftWidget:GetAnchor(0) )) - - leftWidget:ClearAnchors() - leftWidget:SetAnchor(TOPLEFT, container, TOPLEFT) - rightWidget:SetAnchor(TOPLEFT, leftWidget, TOPRIGHT, 5, 0) - - leftWidget:SetWidth( leftWidget:GetWidth() - 2.5 ) -- fixes bad alignment with 'full' controls - rightWidget:SetWidth( rightWidget:GetWidth() - 2.5 ) - - leftWidget:SetParent(container) - rightWidget:SetParent(container) - - container.data = {type = "container"} - container.panel = panel - return container -end - ---INTERNAL FUNCTION ---creates controls when options panel is first shown ---controls anchoring of these controls in the panel -local function CreateOptionsControls(panel) - local addonID = panel:GetName() - if(optionsState[addonID] == OPTIONS_CREATED) then - return false - elseif(optionsState[addonID] == OPTIONS_CREATION_RUNNING) then - return true - end - optionsState[addonID] = OPTIONS_CREATION_RUNNING - - local function CreationFinished() - optionsState[addonID] = OPTIONS_CREATED - cm:FireCallbacks("LAM-PanelControlsCreated", panel) - OpenCurrentPanel() - end - - local optionsTable = addonToOptionsMap[addonID] - if optionsTable then - local function CreateAndAnchorWidget(parent, widgetData, offsetX, offsetY, anchorTarget, wasHalf) - local widget - local status, err = pcall(function() widget = LAMCreateControl[widgetData.type](parent, widgetData) end) - if not status then - return err or true, offsetY, anchorTarget, wasHalf - else - local isHalf = (widgetData.width == "half") - if not anchorTarget then -- the first widget in a panel is just placed in the top left corner - widget:SetAnchor(TOPLEFT) - anchorTarget = widget - elseif wasHalf and isHalf then -- when the previous widget was only half width and this one is too, we place it on the right side - widget.lineControl = anchorTarget - isHalf = false - offsetY = 0 - anchorTarget = TwinOptionsContainer(parent, anchorTarget, widget) - else -- otherwise we just put it below the previous one normally - widget:SetAnchor(TOPLEFT, anchorTarget, BOTTOMLEFT, 0, 15) - offsetY = 0 - anchorTarget = widget - end - return false, offsetY, anchorTarget, isHalf - end - end - - local THROTTLE_TIMEOUT, THROTTLE_COUNT = 10, 20 - local fifo = {} - local anchorOffset, lastAddedControl, wasHalf - local CreateWidgetsInPanel, err - - local function PrepareForNextPanel() - anchorOffset, lastAddedControl, wasHalf = 0, nil, false - end - - local function SetupCreationCalls(parent, widgetDataTable) - fifo[#fifo + 1] = PrepareForNextPanel - local count = #widgetDataTable - for i = 1, count, THROTTLE_COUNT do - fifo[#fifo + 1] = function() - CreateWidgetsInPanel(parent, widgetDataTable, i, zo_min(i + THROTTLE_COUNT - 1, count)) - end - end - return count ~= NonContiguousCount(widgetDataTable) - end - - CreateWidgetsInPanel = function(parent, widgetDataTable, startIndex, endIndex) - for i=startIndex,endIndex do - local widgetData = widgetDataTable[i] - if not widgetData then - PrintLater("Skipped creation of missing entry in the settings menu of " .. addonID .. ".") - else - local widgetType = widgetData.type - local offsetX = 0 - local isSubmenu = (widgetType == "submenu") - if isSubmenu then - wasHalf = false - offsetX = 5 - end - - err, anchorOffset, lastAddedControl, wasHalf = CreateAndAnchorWidget(parent, widgetData, offsetX, anchorOffset, lastAddedControl, wasHalf) - if err then - PrintLater(("Could not create %s '%s' of %s."):format(widgetData.type, GetStringFromValue(widgetData.name or "unnamed"), addonID)) - if logger then - logger:Error(err) - end - end - - if isSubmenu then - if SetupCreationCalls(lastAddedControl, widgetData.controls) then - PrintLater(("The sub menu '%s' of %s is missing some entries."):format(GetStringFromValue(widgetData.name or "unnamed"), addonID)) - end - end - end - end - end - - local function DoCreateSettings() - if #fifo > 0 then - local nextCall = table.remove(fifo, 1) - nextCall() - if(nextCall == PrepareForNextPanel) then - DoCreateSettings() - else - zo_callLater(DoCreateSettings, THROTTLE_TIMEOUT) - end - else - CreationFinished() - end - end - - if SetupCreationCalls(panel, optionsTable) then - PrintLater(("The settings menu of %s is missing some entries."):format(addonID)) - end - DoCreateSettings() - else - CreationFinished() - end - - return true -end - ---INTERNAL FUNCTION ---handles switching between panels -local function ToggleAddonPanels(panel) --called in OnShow of newly shown panel - local currentlySelected = lam.currentAddonPanel - if currentlySelected and currentlySelected ~= panel then - currentlySelected:SetHidden(true) - CloseCurrentPanel() - end - lam.currentAddonPanel = panel - - -- refresh visible rows to reflect panel IsHidden status - ZO_ScrollList_RefreshVisible(lam.addonList) - - if not CreateOptionsControls(panel) then - OpenCurrentPanel() - end - - cm:FireCallbacks("LAM-RefreshPanel", panel) -end - -local CheckSafetyAndInitialize - ---METHOD: REGISTER ADDON PANEL ---registers your addon with LibAddonMenu and creates a panel ---Usage: --- addonID = "string"; unique ID which will be the global name of your panel --- panelData = table; data object for your panel - see controls\panel.lua -function lam:RegisterAddonPanel(addonID, panelData) - CheckSafetyAndInitialize(addonID) - local container = lam:GetAddonPanelContainer() - local panel = lamcc.panel(container, panelData, addonID) --addonID==global name of panel - panel:SetHidden(true) - panel:SetAnchorFill(container) - panel:SetHandler("OnEffectivelyShown", ToggleAddonPanels) - - local function stripMarkup(str) - return str:gsub("|[Cc]%x%x%x%x%x%x", ""):gsub("|[Rr]", "") - end - - local filterParts = {panelData.name, nil, nil} - -- append keywords and author separately, the may be nil - filterParts[#filterParts + 1] = panelData.keywords - filterParts[#filterParts + 1] = panelData.author - - local addonData = { - panel = panel, - name = stripMarkup(panelData.name), - filterText = stripMarkup(tconcat(filterParts, "\t")):lower(), - } - - tinsert(addonsForList, addonData) - - if panelData.slashCommand then - SLASH_COMMANDS[panelData.slashCommand] = function() - lam:OpenToPanel(panel) - end - end - - return panel --return for authors creating options manually -end - - ---METHOD: REGISTER OPTION CONTROLS ---registers the options you want shown for your addon ---these are stored in a table where each key-value pair is the order ---of the options in the panel and the data for that control, respectively ---see exampleoptions.lua for an example ---see controls\.lua for each widget type ---Usage: --- addonID = "string"; the same string passed to :RegisterAddonPanel --- optionsTable = table; the table containing all of the options controls and their data -function lam:RegisterOptionControls(addonID, optionsTable) --optionsTable = {sliderData, buttonData, etc} - addonToOptionsMap[addonID] = optionsTable -end - ---INTERNAL FUNCTION ---creates LAM's Addon Settings entry in ZO_GameMenu -local function CreateAddonSettingsMenuEntry() - local panelData = { - id = KEYBOARD_OPTIONS.currentPanelId, - name = util.L["PANEL_NAME"], - } - - KEYBOARD_OPTIONS.currentPanelId = panelData.id + 1 - KEYBOARD_OPTIONS.panelNames[panelData.id] = panelData.name - - lam.panelId = panelData.id - - local addonListSorted = false - - function panelData.callback() - sm:AddFragment(lam:GetAddonSettingsFragment()) - KEYBOARD_OPTIONS:ChangePanels(lam.panelId) - - local title = LAMAddonSettingsWindow:GetNamedChild("Title") - title:SetText(panelData.name) - - if not addonListSorted and #addonsForList > 0 then - local searchEdit = LAMAddonSettingsWindow:GetNamedChild("SearchFilterEdit") - --we're about to show our list for the first time - let's sort it - table.sort(addonsForList, function(a, b) return a.name < b.name end) - PopulateAddonList(lam.addonList, GetSearchFilterFunc(searchEdit)) - addonListSorted = true - end - end - - function panelData.unselectedCallback() - sm:RemoveFragment(lam:GetAddonSettingsFragment()) - if SetCameraOptionsPreviewModeEnabled then -- available since API version 100011 - SetCameraOptionsPreviewModeEnabled(false) - end - end - - ZO_GameMenu_AddSettingPanel(panelData) -end - - ---INTERNAL FUNCTION ---creates the left-hand menu in LAM's window -local function CreateAddonList(name, parent) - local addonList = wm:CreateControlFromVirtual(name, parent, "ZO_ScrollList") - - local function addonListRow_OnMouseDown(control, button) - if button == 1 then - local data = ZO_ScrollList_GetData(control) - ZO_ScrollList_SelectData(addonList, data, control) - end - end - - local function addonListRow_OnMouseEnter(control) - ZO_ScrollList_MouseEnter(addonList, control) - end - - local function addonListRow_OnMouseExit(control) - ZO_ScrollList_MouseExit(addonList, control) - end - - local function addonListRow_Select(previouslySelectedData, selectedData, reselectingDuringRebuild) - if not reselectingDuringRebuild then - if previouslySelectedData then - previouslySelectedData.panel:SetHidden(true) - end - if selectedData then - selectedData.panel:SetHidden(false) - PlaySound(SOUNDS.MENU_SUBCATEGORY_SELECTION) - end - end - end - - local function addonListRow_Setup(control, data) - control:SetText(data.name) - control:SetSelected(not data.panel:IsHidden()) - end - - ZO_ScrollList_AddDataType(addonList, ADDON_DATA_TYPE, "ZO_SelectableLabel", 28, addonListRow_Setup) - -- I don't know how to make highlights clear properly; they often - -- get stuck and after a while the list is full of highlighted rows - --ZO_ScrollList_EnableHighlight(addonList, "ZO_ThinListHighlight") - ZO_ScrollList_EnableSelection(addonList, "ZO_ThinListHighlight", addonListRow_Select) - - local addonDataType = ZO_ScrollList_GetDataTypeTable(addonList, ADDON_DATA_TYPE) - local addonListRow_CreateRaw = addonDataType.pool.m_Factory - - local function addonListRow_Create(pool) - local control = addonListRow_CreateRaw(pool) - control:SetHandler("OnMouseDown", addonListRow_OnMouseDown) - --control:SetHandler("OnMouseEnter", addonListRow_OnMouseEnter) - --control:SetHandler("OnMouseExit", addonListRow_OnMouseExit) - control:SetHeight(28) - control:SetFont("ZoFontHeader") - control:SetHorizontalAlignment(TEXT_ALIGN_LEFT) - control:SetVerticalAlignment(TEXT_ALIGN_CENTER) - control:SetWrapMode(TEXT_WRAP_MODE_ELLIPSIS) - return control - end - - addonDataType.pool.m_Factory = addonListRow_Create - - return addonList -end - - ---INTERNAL FUNCTION -local function CreateSearchFilterBox(name, parent) - local boxControl = wm:CreateControl(name, parent, CT_CONTROL) - - local srchButton = wm:CreateControl("$(parent)Button", boxControl, CT_BUTTON) - srchButton:SetDimensions(32, 32) - srchButton:SetAnchor(LEFT, nil, LEFT, 2, 0) - srchButton:SetNormalTexture("EsoUI/Art/LFG/LFG_tabIcon_groupTools_up.dds") - srchButton:SetPressedTexture("EsoUI/Art/LFG/LFG_tabIcon_groupTools_down.dds") - srchButton:SetMouseOverTexture("EsoUI/Art/LFG/LFG_tabIcon_groupTools_over.dds") - - local srchEdit = wm:CreateControlFromVirtual("$(parent)Edit", boxControl, "ZO_DefaultEdit") - srchEdit:SetAnchor(LEFT, srchButton, RIGHT, 4, 1) - srchEdit:SetAnchor(RIGHT, nil, RIGHT, -4, 1) - srchEdit:SetColor(ZO_NORMAL_TEXT:UnpackRGBA()) - - local srchBg = wm:CreateControl("$(parent)Bg", boxControl, CT_BACKDROP) - srchBg:SetAnchorFill() - srchBg:SetAlpha(0) - srchBg:SetCenterColor(0, 0, 0, 0.5) - srchBg:SetEdgeColor(ZO_DISABLED_TEXT:UnpackRGBA()) - srchBg:SetEdgeTexture("", 1, 1, 0, 0) - - -- search backdrop should appear whenever you hover over either - -- the magnifying glass button or the edit field (which is only - -- visible when it contains some text), and also while the edit - -- field has keyboard focus - - local srchActive = false - local srchHover = false - - local function srchBgUpdateAlpha() - if srchActive or srchEdit:HasFocus() then - srchBg:SetAlpha(srchHover and 0.8 or 0.6) - else - srchBg:SetAlpha(srchHover and 0.6 or 0.0) - end - end - - local function srchMouseEnter(control) - srchHover = true - srchBgUpdateAlpha() - end - - local function srchMouseExit(control) - srchHover = false - srchBgUpdateAlpha() - end - - boxControl:SetMouseEnabled(true) - boxControl:SetHitInsets(1, 1, -1, -1) - boxControl:SetHandler("OnMouseEnter", srchMouseEnter) - boxControl:SetHandler("OnMouseExit", srchMouseExit) - - srchButton:SetHandler("OnMouseEnter", srchMouseEnter) - srchButton:SetHandler("OnMouseExit", srchMouseExit) - - local focusLostTime = 0 - - srchButton:SetHandler("OnClicked", function(self) - srchEdit:Clear() - if GetFrameTimeMilliseconds() - focusLostTime < 100 then - -- re-focus the edit box if it lost focus due to this - -- button click (note that this handler may run a few - -- frames later) - srchEdit:TakeFocus() - end - end) - - srchEdit:SetHandler("OnMouseEnter", srchMouseEnter) - srchEdit:SetHandler("OnMouseExit", srchMouseExit) - srchEdit:SetHandler("OnFocusGained", srchBgUpdateAlpha) - - srchEdit:SetHandler("OnFocusLost", function() - focusLostTime = GetFrameTimeMilliseconds() - srchBgUpdateAlpha() - end) - - srchEdit:SetHandler("OnEscape", function(self) - self:Clear() - self:LoseFocus() - end) - - srchEdit:SetHandler("OnTextChanged", function(self) - local filterFunc = GetSearchFilterFunc(self) - if filterFunc then - srchActive = true - srchBg:SetEdgeColor(ZO_SECOND_CONTRAST_TEXT:UnpackRGBA()) - srchButton:SetState(BSTATE_PRESSED) - else - srchActive = false - srchBg:SetEdgeColor(ZO_DISABLED_TEXT:UnpackRGBA()) - srchButton:SetState(BSTATE_NORMAL) - end - srchBgUpdateAlpha() - PopulateAddonList(lam.addonList, filterFunc) - PlaySound(SOUNDS.SPINNER_DOWN) - end) - - return boxControl -end - - ---INTERNAL FUNCTION ---creates LAM's Addon Settings top-level window -local function CreateAddonSettingsWindow() - local tlw = wm:CreateTopLevelWindow("LAMAddonSettingsWindow") - tlw:SetHidden(true) - tlw:SetDimensions(1010, 914) -- same height as ZO_OptionsWindow - - ZO_ReanchorControlForLeftSidePanel(tlw) - - -- create black background for the window (mimic ZO_RightFootPrintBackground) - - local bgLeft = wm:CreateControl("$(parent)BackgroundLeft", tlw, CT_TEXTURE) - bgLeft:SetTexture("EsoUI/Art/Miscellaneous/centerscreen_left.dds") - bgLeft:SetDimensions(1024, 1024) - bgLeft:SetAnchor(TOPLEFT, nil, TOPLEFT) - bgLeft:SetDrawLayer(DL_BACKGROUND) - bgLeft:SetExcludeFromResizeToFitExtents(true) - - local bgRight = wm:CreateControl("$(parent)BackgroundRight", tlw, CT_TEXTURE) - bgRight:SetTexture("EsoUI/Art/Miscellaneous/centerscreen_right.dds") - bgRight:SetDimensions(64, 1024) - bgRight:SetAnchor(TOPLEFT, bgLeft, TOPRIGHT) - bgRight:SetDrawLayer(DL_BACKGROUND) - bgRight:SetExcludeFromResizeToFitExtents(true) - - -- create gray background for addon list (mimic ZO_TreeUnderlay) - - local underlayLeft = wm:CreateControl("$(parent)UnderlayLeft", tlw, CT_TEXTURE) - underlayLeft:SetTexture("EsoUI/Art/Miscellaneous/centerscreen_indexArea_left.dds") - underlayLeft:SetDimensions(256, 1024) - underlayLeft:SetAnchor(TOPLEFT, bgLeft, TOPLEFT) - underlayLeft:SetDrawLayer(DL_BACKGROUND) - underlayLeft:SetExcludeFromResizeToFitExtents(true) - - local underlayRight = wm:CreateControl("$(parent)UnderlayRight", tlw, CT_TEXTURE) - underlayRight:SetTexture("EsoUI/Art/Miscellaneous/centerscreen_indexArea_right.dds") - underlayRight:SetDimensions(128, 1024) - underlayRight:SetAnchor(TOPLEFT, underlayLeft, TOPRIGHT) - underlayRight:SetDrawLayer(DL_BACKGROUND) - underlayRight:SetExcludeFromResizeToFitExtents(true) - - -- create title bar (mimic ZO_OptionsWindow) - - local title = wm:CreateControl("$(parent)Title", tlw, CT_LABEL) - title:SetAnchor(TOPLEFT, nil, TOPLEFT, 65, 70) - title:SetFont("ZoFontWinH1") - title:SetModifyTextType(MODIFY_TEXT_TYPE_UPPERCASE) - - local divider = wm:CreateControlFromVirtual("$(parent)Divider", tlw, "ZO_Options_Divider") - divider:SetAnchor(TOPLEFT, nil, TOPLEFT, 65, 108) - - -- create search filter box - - local srchBox = CreateSearchFilterBox("$(parent)SearchFilter", tlw) - srchBox:SetAnchor(TOPLEFT, nil, TOPLEFT, 63, 120) - srchBox:SetDimensions(260, 30) - - -- create scrollable addon list - - local addonList = CreateAddonList("$(parent)AddonList", tlw) - addonList:SetAnchor(TOPLEFT, nil, TOPLEFT, 65, 160) - addonList:SetDimensions(285, 665) - - lam.addonList = addonList -- for easy access from elsewhere - - -- create container for option panels - - local panelContainer = wm:CreateControl("$(parent)PanelContainer", tlw, CT_CONTROL) - panelContainer:SetAnchor(TOPLEFT, nil, TOPLEFT, 365, 120) - panelContainer:SetDimensions(645, 675) - - local defaultButton = wm:CreateControlFromVirtual("$(parent)ResetToDefaultButton", tlw, "ZO_DialogButton") - ZO_KeybindButtonTemplate_Setup(defaultButton, "OPTIONS_LOAD_DEFAULTS", HandleLoadDefaultsPressed, GetString(SI_OPTIONS_DEFAULTS)) - defaultButton:SetAnchor(TOPLEFT, panelContainer, BOTTOMLEFT, 0, 2) - lam.defaultButton = defaultButton - - local applyButton = wm:CreateControlFromVirtual("$(parent)ApplyButton", tlw, "ZO_DialogButton") - ZO_KeybindButtonTemplate_Setup(applyButton, "OPTIONS_APPLY_CHANGES", HandleReloadUIPressed, GetString(SI_ADDON_MANAGER_RELOAD)) - applyButton:SetAnchor(TOPRIGHT, panelContainer, BOTTOMRIGHT, 0, 2) - applyButton:SetHidden(true) - lam.applyButton = applyButton - - return tlw -end - - ---INITIALIZING -local safeToInitialize = false -local hasInitialized = false - -local eventHandle = table.concat({MAJOR, MINOR}, "r") -local function OnLoad(_, addonName) - -- wait for the first loaded event - em:UnregisterForEvent(eventHandle, EVENT_ADD_ON_LOADED) - safeToInitialize = true -end -em:RegisterForEvent(eventHandle, EVENT_ADD_ON_LOADED, OnLoad) - -local function OnActivated(_, initial) - em:UnregisterForEvent(eventHandle, EVENT_PLAYER_ACTIVATED) - FlushMessages() - - local reopenPanel = RetrievePanelForReopening() - if not initial and reopenPanel then - lam:OpenToPanel(reopenPanel) - end -end -em:RegisterForEvent(eventHandle, EVENT_PLAYER_ACTIVATED, OnActivated) - -function CheckSafetyAndInitialize(addonID) - if not safeToInitialize then - local msg = string.format("The panel with id '%s' was registered before addon loading has completed. This might break the AddOn Settings menu.", addonID) - PrintLater(msg) - end - if not hasInitialized then - hasInitialized = true - end -end - - ---TODO documentation -function lam:GetAddonPanelContainer() - local fragment = lam:GetAddonSettingsFragment() - local window = fragment:GetControl() - return window:GetNamedChild("PanelContainer") -end - - ---TODO documentation -function lam:GetAddonSettingsFragment() - assert(hasInitialized or safeToInitialize) - if not LAMAddonSettingsFragment then - local window = CreateAddonSettingsWindow() - LAMAddonSettingsFragment = ZO_FadeSceneFragment:New(window, true, 100) - LAMAddonSettingsFragment:RegisterCallback("StateChange", function(oldState, newState) - if(newState == SCENE_FRAGMENT_SHOWN) then - InitKeybindActions() - PushActionLayerByName("OptionsWindow") - OpenCurrentPanel() - elseif(newState == SCENE_FRAGMENT_HIDDEN) then - CloseCurrentPanel() - RemoveActionLayerByName("OptionsWindow") - ShowReloadDialogIfNeeded() - end - end) - CreateAddonSettingsMenuEntry() - end - return LAMAddonSettingsFragment -end diff --git a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/button.lua b/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/button.lua deleted file mode 100644 index 82b5032..0000000 --- a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/button.lua +++ /dev/null @@ -1,91 +0,0 @@ ---[[buttonData = { - type = "button", - name = "My Button", -- string id or function returning a string - func = function() end, - tooltip = "Button's tooltip text.", -- string id or function returning a string (optional) - width = "full", --or "half" (optional) - disabled = function() return db.someBooleanSetting end, --or boolean (optional) - icon = "icon\\path.dds", --(optional) - isDangerous = false, -- boolean, if set to true, the button text will be red and a confirmation dialog with the button label and warning text will show on click before the callback is executed (optional) - warning = "Will need to reload the UI.", --(optional) - reference = "MyAddonButton", -- unique global reference to control (optional) -} ]] - -local widgetVersion = 11 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("button", widgetVersion) then return end - -local wm = WINDOW_MANAGER - -local function UpdateDisabled(control) - local disable = control.data.disabled - if type(disable) == "function" then - disable = disable() - end - control.button:SetEnabled(not disable) -end - ---controlName is optional -local MIN_HEIGHT = 28 -- default_button height -local HALF_WIDTH_LINE_SPACING = 2 -function LAMCreateControl.button(parent, buttonData, controlName) - local control = LAM.util.CreateBaseControl(parent, buttonData, controlName) - control:SetMouseEnabled(true) - - local width = control:GetWidth() - if control.isHalfWidth then - control:SetDimensions(width / 2, MIN_HEIGHT * 2 + HALF_WIDTH_LINE_SPACING) - else - control:SetDimensions(width, MIN_HEIGHT) - end - - if buttonData.icon then - control.button = wm:CreateControl(nil, control, CT_BUTTON) - control.button:SetDimensions(26, 26) - control.button:SetNormalTexture(buttonData.icon) - control.button:SetPressedOffset(2, 2) - else - --control.button = wm:CreateControlFromVirtual(controlName.."Button", control, "ZO_DefaultButton") - control.button = wm:CreateControlFromVirtual(nil, control, "ZO_DefaultButton") - control.button:SetWidth(width / 3) - control.button:SetText(LAM.util.GetStringFromValue(buttonData.name)) - if buttonData.isDangerous then control.button:SetNormalFontColor(ZO_ERROR_COLOR:UnpackRGBA()) end - end - local button = control.button - button:SetAnchor(control.isHalfWidth and CENTER or RIGHT) - button:SetClickSound("Click") - button.data = {tooltipText = LAM.util.GetStringFromValue(buttonData.tooltip)} - button:SetHandler("OnMouseEnter", ZO_Options_OnMouseEnter) - button:SetHandler("OnMouseExit", ZO_Options_OnMouseExit) - button:SetHandler("OnClicked", function(...) - local args = {...} - local function callback() - buttonData.func(unpack(args)) - LAM.util.RequestRefreshIfNeeded(control) - end - - if(buttonData.isDangerous) then - local title = LAM.util.GetStringFromValue(buttonData.name) - local body = LAM.util.GetStringFromValue(buttonData.warning) - LAM.util.ShowConfirmationDialog(title, body, callback) - else - callback() - end - end) - - if buttonData.warning ~= nil then - control.warning = wm:CreateControlFromVirtual(nil, control, "ZO_Options_WarningIcon") - control.warning:SetAnchor(RIGHT, button, LEFT, -5, 0) - control.UpdateWarning = LAM.util.UpdateWarning - control:UpdateWarning() - end - - if buttonData.disabled ~= nil then - control.UpdateDisabled = UpdateDisabled - control:UpdateDisabled() - end - - LAM.util.RegisterForRefreshIfNeeded(control) - - return control -end diff --git a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/checkbox.lua b/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/checkbox.lua deleted file mode 100644 index 6696dd7..0000000 --- a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/checkbox.lua +++ /dev/null @@ -1,142 +0,0 @@ ---[[checkboxData = { - type = "checkbox", - name = "My Checkbox", -- or string id or function returning a string - getFunc = function() return db.var end, - setFunc = function(value) db.var = value doStuff() end, - tooltip = "Checkbox's tooltip text.", -- or string id or function returning a string (optional) - width = "full", -- or "half" (optional) - disabled = function() return db.someBooleanSetting end, --or boolean (optional) - warning = "May cause permanent awesomeness.", -- or string id or function returning a string (optional) - requiresReload = false, -- boolean, if set to true, the warning text will contain a notice that changes are only applied after an UI reload and any change to the value will make the "Apply Settings" button appear on the panel which will reload the UI when pressed (optional) - default = defaults.var, -- a boolean or function that returns a boolean (optional) - reference = "MyAddonCheckbox", -- unique global reference to control (optional) -} ]] - - -local widgetVersion = 14 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("checkbox", widgetVersion) then return end - -local wm = WINDOW_MANAGER - ---label -local enabledColor = ZO_DEFAULT_ENABLED_COLOR -local enabledHLcolor = ZO_HIGHLIGHT_TEXT -local disabledColor = ZO_DEFAULT_DISABLED_COLOR -local disabledHLcolor = ZO_DEFAULT_DISABLED_MOUSEOVER_COLOR ---checkbox -local checkboxColor = ZO_NORMAL_TEXT -local checkboxHLcolor = ZO_HIGHLIGHT_TEXT - - -local function UpdateDisabled(control) - local disable - if type(control.data.disabled) == "function" then - disable = control.data.disabled() - else - disable = control.data.disabled - end - - control.label:SetColor((disable and ZO_DEFAULT_DISABLED_COLOR or control.value and ZO_DEFAULT_ENABLED_COLOR or ZO_DEFAULT_DISABLED_COLOR):UnpackRGBA()) - control.checkbox:SetColor((disable and ZO_DEFAULT_DISABLED_COLOR or ZO_NORMAL_TEXT):UnpackRGBA()) - --control:SetMouseEnabled(not disable) - --control:SetMouseEnabled(true) - - control.isDisabled = disable -end - -local function ToggleCheckbox(control) - if control.value then - control.label:SetColor(ZO_DEFAULT_ENABLED_COLOR:UnpackRGBA()) - control.checkbox:SetText(control.checkedText) - else - control.label:SetColor(ZO_DEFAULT_DISABLED_COLOR:UnpackRGBA()) - control.checkbox:SetText(control.uncheckedText) - end -end - -local function UpdateValue(control, forceDefault, value) - if forceDefault then --if we are forcing defaults - value = LAM.util.GetDefaultValue(control.data.default) - control.data.setFunc(value) - elseif value ~= nil then --our value could be false - control.data.setFunc(value) - --after setting this value, let's refresh the others to see if any should be disabled or have their settings changed - LAM.util.RequestRefreshIfNeeded(control) - else - value = control.data.getFunc() - end - control.value = value - - ToggleCheckbox(control) -end - -local function OnMouseEnter(control) - ZO_Options_OnMouseEnter(control) - - if control.isDisabled then return end - - local label = control.label - if control.value then - label:SetColor(ZO_HIGHLIGHT_TEXT:UnpackRGBA()) - else - label:SetColor(ZO_DEFAULT_DISABLED_MOUSEOVER_COLOR:UnpackRGBA()) - end - control.checkbox:SetColor(ZO_HIGHLIGHT_TEXT:UnpackRGBA()) -end - -local function OnMouseExit(control) - ZO_Options_OnMouseExit(control) - - if control.isDisabled then return end - - local label = control.label - if control.value then - label:SetColor(ZO_DEFAULT_ENABLED_COLOR:UnpackRGBA()) - else - label:SetColor(ZO_DEFAULT_DISABLED_COLOR:UnpackRGBA()) - end - control.checkbox:SetColor(ZO_NORMAL_TEXT:UnpackRGBA()) -end - ---controlName is optional -function LAMCreateControl.checkbox(parent, checkboxData, controlName) - local control = LAM.util.CreateLabelAndContainerControl(parent, checkboxData, controlName) - control:SetHandler("OnMouseEnter", OnMouseEnter) - control:SetHandler("OnMouseExit", OnMouseExit) - control:SetHandler("OnMouseUp", function(control) - if control.isDisabled then return end - PlaySound(SOUNDS.DEFAULT_CLICK) - control.value = not control.value - control:UpdateValue(false, control.value) - end) - - control.checkbox = wm:CreateControl(nil, control.container, CT_LABEL) - local checkbox = control.checkbox - checkbox:SetAnchor(LEFT, control.container, LEFT, 0, 0) - checkbox:SetFont("ZoFontGameBold") - checkbox:SetColor(ZO_NORMAL_TEXT:UnpackRGBA()) - control.checkedText = GetString(SI_CHECK_BUTTON_ON):upper() - control.uncheckedText = GetString(SI_CHECK_BUTTON_OFF):upper() - - if checkboxData.warning ~= nil or checkboxData.requiresReload then - control.warning = wm:CreateControlFromVirtual(nil, control, "ZO_Options_WarningIcon") - control.warning:SetAnchor(RIGHT, checkbox, LEFT, -5, 0) - control.UpdateWarning = LAM.util.UpdateWarning - control:UpdateWarning() - end - - control.data.tooltipText = LAM.util.GetStringFromValue(checkboxData.tooltip) - - control.UpdateValue = UpdateValue - control:UpdateValue() - if checkboxData.disabled ~= nil then - control.UpdateDisabled = UpdateDisabled - control:UpdateDisabled() - end - - LAM.util.RegisterForRefreshIfNeeded(control) - LAM.util.RegisterForReloadIfNeeded(control) - - return control -end diff --git a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/colorpicker.lua b/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/colorpicker.lua deleted file mode 100644 index a57aab0..0000000 --- a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/colorpicker.lua +++ /dev/null @@ -1,106 +0,0 @@ ---[[colorpickerData = { - type = "colorpicker", - name = "My Color Picker", -- or string id or function returning a string - getFunc = function() return db.r, db.g, db.b, db.a end, --(alpha is optional) - setFunc = function(r,g,b,a) db.r=r, db.g=g, db.b=b, db.a=a end, --(alpha is optional) - tooltip = "Color Picker's tooltip text.", -- or string id or function returning a string (optional) - width = "full", --or "half" (optional) - disabled = function() return db.someBooleanSetting end, --or boolean (optional) - warning = "May cause permanent awesomeness.", -- or string id or function returning a string (optional) - requiresReload = false, -- boolean, if set to true, the warning text will contain a notice that changes are only applied after an UI reload and any change to the value will make the "Apply Settings" button appear on the panel which will reload the UI when pressed (optional) - default = {r = defaults.r, g = defaults.g, b = defaults.b, a = defaults.a}, --(optional) table of default color values (or default = defaultColor, where defaultColor is a table with keys of r, g, b[, a]) or a function that returns the color - reference = "MyAddonColorpicker" -- unique global reference to control (optional) -} ]] - - -local widgetVersion = 13 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("colorpicker", widgetVersion) then return end - -local wm = WINDOW_MANAGER - -local function UpdateDisabled(control) - local disable - if type(control.data.disabled) == "function" then - disable = control.data.disabled() - else - disable = control.data.disabled - end - - if disable then - control.label:SetColor(ZO_DEFAULT_DISABLED_COLOR:UnpackRGBA()) - else - control.label:SetColor(ZO_DEFAULT_ENABLED_COLOR:UnpackRGBA()) - end - - control.isDisabled = disable -end - -local function UpdateValue(control, forceDefault, valueR, valueG, valueB, valueA) - if forceDefault then --if we are forcing defaults - local color = LAM.util.GetDefaultValue(control.data.default) - valueR, valueG, valueB, valueA = color.r, color.g, color.b, color.a - control.data.setFunc(valueR, valueG, valueB, valueA) - elseif valueR and valueG and valueB then - control.data.setFunc(valueR, valueG, valueB, valueA or 1) - --after setting this value, let's refresh the others to see if any should be disabled or have their settings changed - LAM.util.RequestRefreshIfNeeded(control) - else - valueR, valueG, valueB, valueA = control.data.getFunc() - end - - control.thumb:SetColor(valueR, valueG, valueB, valueA or 1) -end - -function LAMCreateControl.colorpicker(parent, colorpickerData, controlName) - local control = LAM.util.CreateLabelAndContainerControl(parent, colorpickerData, controlName) - - control.color = control.container - local color = control.color - - control.thumb = wm:CreateControl(nil, color, CT_TEXTURE) - local thumb = control.thumb - thumb:SetDimensions(36, 18) - thumb:SetAnchor(LEFT, color, LEFT, 4, 0) - - color.border = wm:CreateControl(nil, color, CT_TEXTURE) - local border = color.border - border:SetTexture("EsoUI\\Art\\ChatWindow\\chatOptions_bgColSwatch_frame.dds") - border:SetTextureCoords(0, .625, 0, .8125) - border:SetDimensions(40, 22) - border:SetAnchor(CENTER, thumb, CENTER, 0, 0) - - local function ColorPickerCallback(r, g, b, a) - control:UpdateValue(false, r, g, b, a) - end - - control:SetHandler("OnMouseUp", function(self, btn, upInside) - if self.isDisabled then return end - - if upInside then - local r, g, b, a = colorpickerData.getFunc() - COLOR_PICKER:Show(ColorPickerCallback, r, g, b, a, LAM.util.GetStringFromValue(colorpickerData.name)) - end - end) - - if colorpickerData.warning ~= nil or colorpickerData.requiresReload then - control.warning = wm:CreateControlFromVirtual(nil, control, "ZO_Options_WarningIcon") - control.warning:SetAnchor(RIGHT, control.color, LEFT, -5, 0) - control.UpdateWarning = LAM.util.UpdateWarning - control:UpdateWarning() - end - - control.data.tooltipText = LAM.util.GetStringFromValue(colorpickerData.tooltip) - - control.UpdateValue = UpdateValue - control:UpdateValue() - if colorpickerData.disabled ~= nil then - control.UpdateDisabled = UpdateDisabled - control:UpdateDisabled() - end - - LAM.util.RegisterForRefreshIfNeeded(control) - LAM.util.RegisterForReloadIfNeeded(control) - - return control -end diff --git a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/custom.lua b/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/custom.lua deleted file mode 100644 index 40a7c42..0000000 --- a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/custom.lua +++ /dev/null @@ -1,35 +0,0 @@ ---[[customData = { - type = "custom", - reference = "MyAddonCustomControl", --(optional) unique name for your control to use as reference - refreshFunc = function(customControl) end, --(optional) function to call when panel/controls refresh - width = "full", --or "half" (optional) -} ]] - -local widgetVersion = 7 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("custom", widgetVersion) then return end - -local function UpdateValue(control) - if control.data.refreshFunc then - control.data.refreshFunc(control) - end -end - -local MIN_HEIGHT = 26 -function LAMCreateControl.custom(parent, customData, controlName) - local control = LAM.util.CreateBaseControl(parent, customData, controlName) - local width = control:GetWidth() - control:SetResizeToFitDescendents(true) - - if control.isHalfWidth then --note these restrictions - control:SetDimensionConstraints(width / 2, MIN_HEIGHT, width / 2, MIN_HEIGHT * 4) - else - control:SetDimensionConstraints(width, MIN_HEIGHT, width, MIN_HEIGHT * 4) - end - - control.UpdateValue = UpdateValue - - LAM.util.RegisterForRefreshIfNeeded(control) - - return control -end diff --git a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/description.lua b/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/description.lua deleted file mode 100644 index 6b0eb55..0000000 --- a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/description.lua +++ /dev/null @@ -1,80 +0,0 @@ ---[[descriptionData = { - type = "description", - text = "My description text to display.", -- or string id or function returning a string - title = "My Title", -- or string id or function returning a string (optional) - width = "full", --or "half" (optional) - disabled = function() return db.someBooleanSetting end, --or boolean (optional) - reference = "MyAddonDescription" -- unique global reference to control (optional) -} ]] - - -local widgetVersion = 9 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("description", widgetVersion) then return end - -local wm = WINDOW_MANAGER - -local GetDefaultValue = LAM.util.GetDefaultValue -local GetColorForState = LAM.util.GetColorForState - -local function UpdateDisabled(control) - local disable = GetDefaultValue(control.data.disabled) - if disable ~= control.disabled then - local color = GetColorForState(disable) - control.desc:SetColor(color:UnpackRGBA()) - if control.title then - control.title:SetColor(color:UnpackRGBA()) - end - control.disabled = disable - end -end - -local function UpdateValue(control) - if control.title then - control.title:SetText(LAM.util.GetStringFromValue(control.data.title)) - end - control.desc:SetText(LAM.util.GetStringFromValue(control.data.text)) -end - -function LAMCreateControl.description(parent, descriptionData, controlName) - local control = LAM.util.CreateBaseControl(parent, descriptionData, controlName) - local isHalfWidth = control.isHalfWidth - local width = control:GetWidth() - control:SetResizeToFitDescendents(true) - - if isHalfWidth then - control:SetDimensionConstraints(width / 2, 0, width / 2, 0) - else - control:SetDimensionConstraints(width, 0, width, 0) - end - - control.desc = wm:CreateControl(nil, control, CT_LABEL) - local desc = control.desc - desc:SetVerticalAlignment(TEXT_ALIGN_TOP) - desc:SetFont("ZoFontGame") - desc:SetText(LAM.util.GetStringFromValue(descriptionData.text)) - desc:SetWidth(isHalfWidth and width / 2 or width) - - if descriptionData.title then - control.title = wm:CreateControl(nil, control, CT_LABEL) - local title = control.title - title:SetWidth(isHalfWidth and width / 2 or width) - title:SetAnchor(TOPLEFT, control, TOPLEFT) - title:SetFont("ZoFontWinH4") - title:SetText(LAM.util.GetStringFromValue(descriptionData.title)) - desc:SetAnchor(TOPLEFT, title, BOTTOMLEFT) - else - desc:SetAnchor(TOPLEFT) - end - - control.UpdateValue = UpdateValue - if descriptionData.disabled ~= nil then - control.UpdateDisabled = UpdateDisabled - control:UpdateDisabled() - end - - LAM.util.RegisterForRefreshIfNeeded(control) - - return control - -end diff --git a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/divider.lua b/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/divider.lua deleted file mode 100644 index 8089539..0000000 --- a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/divider.lua +++ /dev/null @@ -1,45 +0,0 @@ ---[[dividerData = { - type = "divider", - width = "full", --or "half" (optional) - height = 10, (optional) - alpha = 0.25, (optional) - reference = "MyAddonDivider" -- unique global reference to control (optional) -} ]] - - -local widgetVersion = 2 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("divider", widgetVersion) then return end - -local wm = WINDOW_MANAGER - -local MIN_HEIGHT = 10 -local MAX_HEIGHT = 50 -local MIN_ALPHA = 0 -local MAX_ALPHA = 1 -local DEFAULT_ALPHA = 0.25 - -local function GetValueInRange(value, min, max, default) - if not value or type(value) ~= "number" then - return default - end - return math.min(math.max(min, value), max) -end - -function LAMCreateControl.divider(parent, dividerData, controlName) - local control = LAM.util.CreateBaseControl(parent, dividerData, controlName) - local isHalfWidth = control.isHalfWidth - local width = control:GetWidth() - local height = GetValueInRange(dividerData.height, MIN_HEIGHT, MAX_HEIGHT, MIN_HEIGHT) - local alpha = GetValueInRange(dividerData.alpha, MIN_ALPHA, MAX_ALPHA, DEFAULT_ALPHA) - - control:SetDimensions(isHalfWidth and width / 2 or width, height) - - control.divider = wm:CreateControlFromVirtual(nil, control, "ZO_Options_Divider") - local divider = control.divider - divider:SetWidth(isHalfWidth and width / 2 or width) - divider:SetAnchor(TOPLEFT) - divider:SetAlpha(alpha) - - return control -end diff --git a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/dropdown.lua b/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/dropdown.lua deleted file mode 100644 index 9a87e2a..0000000 --- a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/dropdown.lua +++ /dev/null @@ -1,429 +0,0 @@ ---[[dropdownData = { - type = "dropdown", - name = "My Dropdown", -- or string id or function returning a string - choices = {"table", "of", "choices"}, - choicesValues = {"foo", 2, "three"}, -- if specified, these values will get passed to setFunc instead (optional) - getFunc = function() return db.var end, - setFunc = function(var) db.var = var doStuff() end, - tooltip = "Dropdown's tooltip text.", -- or string id or function returning a string (optional) - choicesTooltips = {"tooltip 1", "tooltip 2", "tooltip 3"}, -- or array of string ids or array of functions returning a string (optional) - sort = "name-up", --or "name-down", "numeric-up", "numeric-down", "value-up", "value-down", "numericvalue-up", "numericvalue-down" (optional) - if not provided, list will not be sorted - width = "full", --or "half" (optional) - scrollable = true, -- boolean or number, if set the dropdown will feature a scroll bar if there are a large amount of choices and limit the visible lines to the specified number or 10 if true is used (optional) - disabled = function() return db.someBooleanSetting end, --or boolean (optional) - warning = "May cause permanent awesomeness.", -- or string id or function returning a string (optional) - requiresReload = false, -- boolean, if set to true, the warning text will contain a notice that changes are only applied after an UI reload and any change to the value will make the "Apply Settings" button appear on the panel which will reload the UI when pressed (optional) - default = defaults.var, -- default value or function that returns the default value (optional) - reference = "MyAddonDropdown" -- unique global reference to control (optional) -} ]] - - -local widgetVersion = 19 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("dropdown", widgetVersion) then return end - -local wm = WINDOW_MANAGER -local SORT_BY_VALUE = { ["value"] = {} } -local SORT_BY_VALUE_NUMERIC = { ["value"] = { isNumeric = true } } -local SORT_TYPES = { - name = ZO_SORT_BY_NAME, - numeric = ZO_SORT_BY_NAME_NUMERIC, - value = SORT_BY_VALUE, - numericvalue = SORT_BY_VALUE_NUMERIC, -} -local SORT_ORDERS = { - up = ZO_SORT_ORDER_UP, - down = ZO_SORT_ORDER_DOWN, -} - -local function UpdateDisabled(control) - local disable - if type(control.data.disabled) == "function" then - disable = control.data.disabled() - else - disable = control.data.disabled - end - - control.dropdown:SetEnabled(not disable) - if disable then - control.label:SetColor(ZO_DEFAULT_DISABLED_COLOR:UnpackRGBA()) - else - control.label:SetColor(ZO_DEFAULT_ENABLED_COLOR:UnpackRGBA()) - end -end - -local function UpdateValue(control, forceDefault, value) - if forceDefault then --if we are forcing defaults - value = LAM.util.GetDefaultValue(control.data.default) - control.data.setFunc(value) - control.dropdown:SetSelectedItem(control.choices[value]) - elseif value then - control.data.setFunc(value) - --after setting this value, let's refresh the others to see if any should be disabled or have their settings changed - LAM.util.RequestRefreshIfNeeded(control) - else - value = control.data.getFunc() - control.dropdown:SetSelectedItem(control.choices[value]) - end -end - -local function DropdownCallback(control, choiceText, choice) - choice.control:UpdateValue(false, choice.value or choiceText) -end - -local function SetupTooltips(comboBox, choicesTooltips) - local function ShowTooltip(control) - InitializeTooltip(InformationTooltip, control, TOPLEFT, 0, 0, BOTTOMRIGHT) - SetTooltipText(InformationTooltip, LAM.util.GetStringFromValue(control.tooltip)) - InformationTooltipTopLevel:BringWindowToTop() - end - local function HideTooltip(control) - ClearTooltip(InformationTooltip) - end - - -- allow for tooltips on the drop down entries - local originalShow = comboBox.ShowDropdownInternal - comboBox.ShowDropdownInternal = function(comboBox) - originalShow(comboBox) - local entries = ZO_Menu.items - for i = 1, #entries do - local entry = entries[i] - local control = entries[i].item - control.tooltip = choicesTooltips[i] - entry.onMouseEnter = control:GetHandler("OnMouseEnter") - entry.onMouseExit = control:GetHandler("OnMouseExit") - ZO_PreHookHandler(control, "OnMouseEnter", ShowTooltip) - ZO_PreHookHandler(control, "OnMouseExit", HideTooltip) - end - end - - local originalHide = comboBox.HideDropdownInternal - comboBox.HideDropdownInternal = function(self) - local entries = ZO_Menu.items - for i = 1, #entries do - local entry = entries[i] - local control = entries[i].item - control:SetHandler("OnMouseEnter", entry.onMouseEnter) - control:SetHandler("OnMouseExit", entry.onMouseExit) - control.tooltip = nil - end - originalHide(self) - end -end - -local function UpdateChoices(control, choices, choicesValues, choicesTooltips) - control.dropdown:ClearItems() --remove previous choices --(need to call :SetSelectedItem()?) - ZO_ClearTable(control.choices) - - --build new list of choices - local choices = choices or control.data.choices - local choicesValues = choicesValues or control.data.choicesValues - local choicesTooltips = choicesTooltips or control.data.choicesTooltips - - if choicesValues then - assert(#choices == #choicesValues, "choices and choicesValues need to have the same size") - end - - if choicesTooltips then - assert(#choices == #choicesTooltips, "choices and choicesTooltips need to have the same size") - if not control.scrollHelper then -- only do this for non-scrollable - SetupTooltips(control.dropdown, choicesTooltips) - end - end - - for i = 1, #choices do - local entry = control.dropdown:CreateItemEntry(choices[i], DropdownCallback) - entry.control = control - if choicesValues then - entry.value = choicesValues[i] - end - if choicesTooltips and control.scrollHelper then - entry.tooltip = choicesTooltips[i] - end - control.choices[entry.value or entry.name] = entry.name - control.dropdown:AddItem(entry, not control.data.sort and ZO_COMBOBOX_SUPRESS_UPDATE) --if sort type/order isn't specified, then don't sort - end -end - -local function GrabSortingInfo(sortInfo) - local t, i = {}, 1 - for info in string.gmatch(sortInfo, "([^%-]+)") do - t[i] = info - i = i + 1 - end - - return t -end - -local ENTRY_ID = 1 -local LAST_ENTRY_ID = 2 -local OFFSET_X_INDEX = 4 -local DEFAULT_VISIBLE_ROWS = 10 -local SCROLLABLE_ENTRY_TEMPLATE_HEIGHT = ZO_SCROLLABLE_ENTRY_TEMPLATE_HEIGHT -local SCROLLBAR_PADDING = ZO_SCROLL_BAR_WIDTH -local PADDING_X = GetMenuPadding() -local PADDING_Y = ZO_SCROLLABLE_COMBO_BOX_LIST_PADDING_Y -local LABEL_OFFSET_X = 2 -local CONTENT_PADDING = PADDING_X * 4 -local ROUNDING_MARGIN = 0.01 -- needed to avoid rare issue with too many anchors processed -local ScrollableDropdownHelper = ZO_Object:Subclass() - -function ScrollableDropdownHelper:New(...) - local object = ZO_Object.New(self) - object:Initialize(...) - return object -end - -function ScrollableDropdownHelper:Initialize(parent, control, visibleRows) - local combobox = control.combobox - local dropdown = control.dropdown - self.parent = parent - self.control = control - self.combobox = combobox - self.dropdown = dropdown - self.visibleRows = visibleRows - - -- clear anchors so we can adjust the width dynamically - dropdown.m_dropdown:ClearAnchors() - dropdown.m_dropdown:SetAnchor(TOPLEFT, combobox, BOTTOMLEFT) - - -- handle dropdown or settingsmenu opening/closing - local function onShow() return self:OnShow() end - local function onHide() self:OnHide() end - local function doHide() self:DoHide() end - - ZO_PreHook(dropdown, "ShowDropdownOnMouseUp", onShow) - ZO_PreHook(dropdown, "HideDropdownInternal", onHide) - combobox:SetHandler("OnEffectivelyHidden", onHide) - parent:SetHandler("OnEffectivelyHidden", doHide) - - -- dont fade entries near the edges - local scrollList = dropdown.m_scroll - scrollList.selectionTemplate = nil - scrollList.highlightTemplate = nil - ZO_ScrollList_EnableSelection(scrollList, "ZO_SelectionHighlight") - ZO_ScrollList_EnableHighlight(scrollList, "ZO_SelectionHighlight") - ZO_Scroll_SetUseFadeGradient(scrollList, false) - - -- adjust scroll content anchor to mimic menu padding - local scroll = dropdown.m_dropdown:GetNamedChild("Scroll") - local anchor1 = {select(2, scroll:GetAnchor(0))} - local anchor2 = {select(2, scroll:GetAnchor(1))} - anchor1[OFFSET_X_INDEX] = PADDING_X - LABEL_OFFSET_X - anchor2[OFFSET_X_INDEX] = -anchor1[OFFSET_X_INDEX] - scroll:ClearAnchors() - scroll:SetAnchor(unpack(anchor1)) - scroll:SetAnchor(unpack(anchor2)) - ZO_ScrollList_Commit(scrollList) - - -- hook mouse enter/exit - local function onMouseEnter(control) self:OnMouseEnter(control) end - local function onMouseExit(control) self:OnMouseExit(control) end - - -- adjust row setup to mimic the highlight padding - local dataType1 = ZO_ScrollList_GetDataTypeTable(dropdown.m_scroll, ENTRY_ID) - local dataType2 = ZO_ScrollList_GetDataTypeTable(dropdown.m_scroll, LAST_ENTRY_ID) - local oSetup = dataType1.setupCallback -- both types have the same setup function - local function SetupEntry(control, data, list) - oSetup(control, data, list) - control.m_label:SetAnchor(LEFT, nil, nil, LABEL_OFFSET_X) - control.m_label:SetAnchor(RIGHT, nil, nil, -LABEL_OFFSET_X) - -- no need to store old ones since we have full ownership of our dropdown controls - if not control.hookedMouseHandlers then --only do it once per control - control.hookedMouseHandlers = true - ZO_PreHookHandler(control, "OnMouseEnter", onMouseEnter) - ZO_PreHookHandler(control, "OnMouseExit", onMouseExit) - end - end - dataType1.setupCallback = SetupEntry - dataType2.setupCallback = SetupEntry - - -- adjust dimensions based on entries - local scrollContent = scroll:GetNamedChild("Contents") - dropdown.AddMenuItems = ScrollableDropdownHelper.AddMenuItems - - dropdown.AdjustDimensions = function() - local numItems = #dropdown.m_sortedItems - local contentWidth = self:CalculateContentWidth() + CONTENT_PADDING - local anchorOffset = 0 - if(numItems > self.visibleRows) then - numItems = self.visibleRows - contentWidth = contentWidth + SCROLLBAR_PADDING - anchorOffset = -SCROLLBAR_PADDING - end - - local width = zo_max(contentWidth, dropdown.m_container:GetWidth()) - local height = dropdown:GetEntryTemplateHeightWithSpacing() * numItems - dropdown.m_spacing + (PADDING_Y * 2) + ROUNDING_MARGIN - - dropdown.m_dropdown:SetWidth(width) - dropdown.m_dropdown:SetHeight(height) - ZO_ScrollList_SetHeight(dropdown.m_scroll, height) - - scrollContent:SetAnchor(BOTTOMRIGHT, nil, nil, anchorOffset) - end -end - -local function CreateScrollableComboBoxEntry(self, item, index, isLast) - item.m_index = index - item.m_owner = self - local entryType = isLast and LAST_ENTRY_ID or ENTRY_ID - local entry = ZO_ScrollList_CreateDataEntry(entryType, item) - - return entry -end - -function ScrollableDropdownHelper.AddMenuItems(self) -- self refers to the ZO_ScrollableComboBox here - ZO_ScrollList_Clear(self.m_scroll) - - local numItems = #self.m_sortedItems - local dataList = ZO_ScrollList_GetDataList(self.m_scroll) - - for i = 1, numItems do - local item = self.m_sortedItems[i] - local entry = CreateScrollableComboBoxEntry(self, item, i, i == numItems) - table.insert(dataList, entry) - end - - self:AdjustDimensions() - - ZO_ScrollList_Commit(self.m_scroll) -end - -function ScrollableDropdownHelper:OnShow() - local dropdown = self.dropdown - - -- don't show if there are no entries - if #dropdown.m_sortedItems == 0 then return true end - - if dropdown.m_lastParent ~= ZO_Menus then - dropdown.m_lastParent = dropdown.m_dropdown:GetParent() - dropdown.m_dropdown:SetParent(ZO_Menus) - ZO_Menus:BringWindowToTop() - end -end - -function ScrollableDropdownHelper:OnHide() - local dropdown = self.dropdown - if dropdown.m_lastParent then - dropdown.m_dropdown:SetParent(dropdown.m_lastParent) - dropdown.m_lastParent = nil - end -end - -function ScrollableDropdownHelper:DoHide() - local dropdown = self.dropdown - if dropdown:IsDropdownVisible() then - dropdown:HideDropdown() - end -end - -function ScrollableDropdownHelper:CalculateContentWidth() - local dropdown = self.dropdown - local dataType = ZO_ScrollList_GetDataTypeTable(dropdown.m_scroll, 1) - - local dummy = dataType.pool:AcquireObject() - dataType.setupCallback(dummy, { - m_owner = dropdown, - name = "Dummy" - }, dropdown) - - local maxWidth = 0 - local label = dummy.m_label - local entries = dropdown.m_sortedItems - local numItems = #entries - for index = 1, numItems do - label:SetText(entries[index].name) - local width = label:GetTextWidth() - if (width > maxWidth) then - maxWidth = width - end - end - - dataType.pool:ReleaseObject(dummy.key) - return maxWidth -end - -function ScrollableDropdownHelper:OnMouseEnter(control) - -- call original code if we replace instead of hook the handler - --ZO_ScrollableComboBox_Entry_OnMouseEnter(control) - -- show tooltip - if control.m_data.tooltip then - InitializeTooltip(InformationTooltip, control, TOPLEFT, 0, 0, BOTTOMRIGHT) - SetTooltipText(InformationTooltip, LAM.util.GetStringFromValue(control.m_data.tooltip)) - InformationTooltipTopLevel:BringWindowToTop() - end -end -function ScrollableDropdownHelper:OnMouseExit(control) - -- call original code if we replace instead of hook the handler - --ZO_ScrollableComboBox_Entry_OnMouseExit(control) - -- hide tooltip - if control.m_data.tooltip then - ClearTooltip(InformationTooltip) - end -end - -function LAMCreateControl.dropdown(parent, dropdownData, controlName) - local control = LAM.util.CreateLabelAndContainerControl(parent, dropdownData, controlName) - control.choices = {} - - local countControl = parent - local name = parent:GetName() - if not name or #name == 0 then - countControl = LAMCreateControl - name = "LAM" - end - local comboboxCount = (countControl.comboboxCount or 0) + 1 - countControl.comboboxCount = comboboxCount - control.combobox = wm:CreateControlFromVirtual(zo_strjoin(nil, name, "Combobox", comboboxCount), control.container, dropdownData.scrollable and "ZO_ScrollableComboBox" or "ZO_ComboBox") - - local combobox = control.combobox - combobox:SetAnchor(TOPLEFT) - combobox:SetDimensions(control.container:GetDimensions()) - combobox:SetHandler("OnMouseEnter", function() ZO_Options_OnMouseEnter(control) end) - combobox:SetHandler("OnMouseExit", function() ZO_Options_OnMouseExit(control) end) - control.dropdown = ZO_ComboBox_ObjectFromContainer(combobox) - local dropdown = control.dropdown - dropdown:SetSortsItems(false) -- need to sort ourselves in order to be able to sort by value - - if dropdownData.scrollable then - local visibleRows = type(dropdownData.scrollable) == "number" and dropdownData.scrollable or DEFAULT_VISIBLE_ROWS - control.scrollHelper = ScrollableDropdownHelper:New(parent, control, visibleRows) - end - - ZO_PreHook(dropdown, "UpdateItems", function(self) - assert(not self.m_sortsItems, "built-in dropdown sorting was reactivated, sorting is handled by LAM") - if control.m_sortOrder ~= nil and control.m_sortType then - local sortKey = next(control.m_sortType) - local sortFunc = function(item1, item2) return ZO_TableOrderingFunction(item1, item2, sortKey, control.m_sortType, control.m_sortOrder) end - table.sort(self.m_sortedItems, sortFunc) - end - end) - - if dropdownData.sort then - local sortInfo = GrabSortingInfo(dropdownData.sort) - control.m_sortType, control.m_sortOrder = SORT_TYPES[sortInfo[1]], SORT_ORDERS[sortInfo[2]] - elseif dropdownData.choicesValues then - control.m_sortType, control.m_sortOrder = ZO_SORT_ORDER_UP, SORT_BY_VALUE - end - - if dropdownData.warning ~= nil or dropdownData.requiresReload then - control.warning = wm:CreateControlFromVirtual(nil, control, "ZO_Options_WarningIcon") - control.warning:SetAnchor(RIGHT, combobox, LEFT, -5, 0) - control.UpdateWarning = LAM.util.UpdateWarning - control:UpdateWarning() - end - - control.UpdateChoices = UpdateChoices - control:UpdateChoices(dropdownData.choices, dropdownData.choicesValues) - control.UpdateValue = UpdateValue - control:UpdateValue() - if dropdownData.disabled ~= nil then - control.UpdateDisabled = UpdateDisabled - control:UpdateDisabled() - end - - LAM.util.RegisterForRefreshIfNeeded(control) - LAM.util.RegisterForReloadIfNeeded(control) - - return control -end diff --git a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/editbox.lua b/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/editbox.lua deleted file mode 100644 index d6baf11..0000000 --- a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/editbox.lua +++ /dev/null @@ -1,156 +0,0 @@ ---[[editboxData = { - type = "editbox", - name = "My Editbox", -- or string id or function returning a string - getFunc = function() return db.text end, - setFunc = function(text) db.text = text doStuff() end, - tooltip = "Editbox's tooltip text.", -- or string id or function returning a string (optional) - isMultiline = true, --boolean (optional) - isExtraWide = true, --boolean (optional) - width = "full", --or "half" (optional) - disabled = function() return db.someBooleanSetting end, --or boolean (optional) - warning = "May cause permanent awesomeness.", -- or string id or function returning a string (optional) - requiresReload = false, -- boolean, if set to true, the warning text will contain a notice that changes are only applied after an UI reload and any change to the value will make the "Apply Settings" button appear on the panel which will reload the UI when pressed (optional) - default = defaults.text, -- default value or function that returns the default value (optional) - reference = "MyAddonEditbox" -- unique global reference to control (optional) -} ]] - - -local widgetVersion = 14 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("editbox", widgetVersion) then return end - -local wm = WINDOW_MANAGER - -local function UpdateDisabled(control) - local disable - if type(control.data.disabled) == "function" then - disable = control.data.disabled() - else - disable = control.data.disabled - end - - if disable then - control.label:SetColor(ZO_DEFAULT_DISABLED_COLOR:UnpackRGBA()) - control.editbox:SetColor(ZO_DEFAULT_DISABLED_MOUSEOVER_COLOR:UnpackRGBA()) - else - control.label:SetColor(ZO_DEFAULT_ENABLED_COLOR:UnpackRGBA()) - control.editbox:SetColor(ZO_DEFAULT_ENABLED_COLOR:UnpackRGBA()) - end - --control.editbox:SetEditEnabled(not disable) - control.editbox:SetMouseEnabled(not disable) -end - -local function UpdateValue(control, forceDefault, value) - if forceDefault then --if we are forcing defaults - value = LAM.util.GetDefaultValue(control.data.default) - control.data.setFunc(value) - control.editbox:SetText(value) - elseif value then - control.data.setFunc(value) - --after setting this value, let's refresh the others to see if any should be disabled or have their settings changed - LAM.util.RequestRefreshIfNeeded(control) - else - value = control.data.getFunc() - control.editbox:SetText(value) - end -end - -local MIN_HEIGHT = 24 -local HALF_WIDTH_LINE_SPACING = 2 -function LAMCreateControl.editbox(parent, editboxData, controlName) - local control = LAM.util.CreateLabelAndContainerControl(parent, editboxData, controlName) - - local container = control.container - control.bg = wm:CreateControlFromVirtual(nil, container, "ZO_EditBackdrop") - local bg = control.bg - bg:SetAnchorFill() - - if editboxData.isMultiline then - control.editbox = wm:CreateControlFromVirtual(nil, bg, "ZO_DefaultEditMultiLineForBackdrop") - control.editbox:SetHandler("OnMouseWheel", function(self, delta) - if self:HasFocus() then --only set focus to new spots if the editbox is currently in use - local cursorPos = self:GetCursorPosition() - local text = self:GetText() - local textLen = text:len() - local newPos - if delta > 0 then --scrolling up - local reverseText = text:reverse() - local revCursorPos = textLen - cursorPos - local revPos = reverseText:find("\n", revCursorPos+1) - newPos = revPos and textLen - revPos - else --scrolling down - newPos = text:find("\n", cursorPos+1) - end - if newPos then --if we found a new line, then scroll, otherwise don't - self:SetCursorPosition(newPos) - end - end - end) - else - control.editbox = wm:CreateControlFromVirtual(nil, bg, "ZO_DefaultEditForBackdrop") - end - local editbox = control.editbox - editbox:SetText(editboxData.getFunc()) - editbox:SetMaxInputChars(3000) - editbox:SetHandler("OnFocusLost", function(self) control:UpdateValue(false, self:GetText()) end) - editbox:SetHandler("OnEscape", function(self) self:LoseFocus() control:UpdateValue(false, self:GetText()) end) - editbox:SetHandler("OnMouseEnter", function() ZO_Options_OnMouseEnter(control) end) - editbox:SetHandler("OnMouseExit", function() ZO_Options_OnMouseExit(control) end) - - local MIN_WIDTH = (parent.GetWidth and (parent:GetWidth() / 10)) or (parent.panel.GetWidth and (parent.panel:GetWidth() / 10)) or 0 - - control.label:ClearAnchors() - container:ClearAnchors() - - control.label:SetAnchor(TOPLEFT, control, TOPLEFT, 0, 0) - container:SetAnchor(BOTTOMRIGHT, control, BOTTOMRIGHT, 0, 0) - - if control.isHalfWidth then - container:SetAnchor(BOTTOMRIGHT, control, BOTTOMRIGHT, 0, 0) - end - - if editboxData.isExtraWide then - container:SetAnchor(BOTTOMLEFT, control, BOTTOMLEFT, 0, 0) - else - container:SetWidth(MIN_WIDTH * 3.2) - end - - if editboxData.isMultiline then - container:SetHeight(MIN_HEIGHT * 3) - else - container:SetHeight(MIN_HEIGHT) - end - - if control.isHalfWidth ~= true and editboxData.isExtraWide ~= true then - control:SetHeight(container:GetHeight()) - else - control:SetHeight(container:GetHeight() + control.label:GetHeight()) - end - - editbox:ClearAnchors() - editbox:SetAnchor(TOPLEFT, container, TOPLEFT, 2, 2) - editbox:SetAnchor(BOTTOMRIGHT, container, BOTTOMRIGHT, -2, -2) - - if editboxData.warning ~= nil or editboxData.requiresReload then - control.warning = wm:CreateControlFromVirtual(nil, control, "ZO_Options_WarningIcon") - if editboxData.isExtraWide then - control.warning:SetAnchor(BOTTOMRIGHT, control.bg, TOPRIGHT, 2, 0) - else - control.warning:SetAnchor(TOPRIGHT, control.bg, TOPLEFT, -5, 0) - end - control.UpdateWarning = LAM.util.UpdateWarning - control:UpdateWarning() - end - - control.UpdateValue = UpdateValue - control:UpdateValue() - if editboxData.disabled ~= nil then - control.UpdateDisabled = UpdateDisabled - control:UpdateDisabled() - end - - LAM.util.RegisterForRefreshIfNeeded(control) - LAM.util.RegisterForReloadIfNeeded(control) - - return control -end diff --git a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/header.lua b/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/header.lua deleted file mode 100644 index eadff38..0000000 --- a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/header.lua +++ /dev/null @@ -1,42 +0,0 @@ ---[[headerData = { - type = "header", - name = "My Header", -- or string id or function returning a string - width = "full", --or "half" (optional) - reference = "MyAddonHeader" -- unique global reference to control (optional) -} ]] - - -local widgetVersion = 8 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("header", widgetVersion) then return end - -local wm = WINDOW_MANAGER - -local function UpdateValue(control) - control.header:SetText(LAM.util.GetStringFromValue(control.data.name)) -end - -local MIN_HEIGHT = 30 -function LAMCreateControl.header(parent, headerData, controlName) - local control = LAM.util.CreateBaseControl(parent, headerData, controlName) - local isHalfWidth = control.isHalfWidth - local width = control:GetWidth() - control:SetDimensions(isHalfWidth and width / 2 or width, MIN_HEIGHT) - - control.divider = wm:CreateControlFromVirtual(nil, control, "ZO_Options_Divider") - local divider = control.divider - divider:SetWidth(isHalfWidth and width / 2 or width) - divider:SetAnchor(TOPLEFT) - - control.header = wm:CreateControlFromVirtual(nil, control, "ZO_Options_SectionTitleLabel") - local header = control.header - header:SetAnchor(TOPLEFT, divider, BOTTOMLEFT) - header:SetAnchor(BOTTOMRIGHT) - header:SetText(LAM.util.GetStringFromValue(headerData.name)) - - control.UpdateValue = UpdateValue - - LAM.util.RegisterForRefreshIfNeeded(control) - - return control -end diff --git a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/iconpicker.lua b/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/iconpicker.lua deleted file mode 100644 index 65c7782..0000000 --- a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/iconpicker.lua +++ /dev/null @@ -1,436 +0,0 @@ ---[[iconpickerData = { - type = "iconpicker", - name = "My Icon Picker", -- or string id or function returning a string - choices = {"texture path 1", "texture path 2", "texture path 3"}, - getFunc = function() return db.var end, - setFunc = function(var) db.var = var doStuff() end, - tooltip = "Color Picker's tooltip text.", -- or string id or function returning a string (optional) - choicesTooltips = {"icon tooltip 1", "icon tooltip 2", "icon tooltip 3"}, -- or array of string ids or array of functions returning a string (optional) - maxColumns = 5, -- number of icons in one row (optional) - visibleRows = 4.5, -- number of visible rows (optional) - iconSize = 28, -- size of the icons (optional) - defaultColor = ZO_ColorDef:New("FFFFFF"), -- default color of the icons (optional) - width = "full", --or "half" (optional) - beforeShow = function(control, iconPicker) return preventShow end, --(optional) - disabled = function() return db.someBooleanSetting end, --or boolean (optional) - warning = "May cause permanent awesomeness.", -- or string id or function returning a string (optional) - requiresReload = false, -- boolean, if set to true, the warning text will contain a notice that changes are only applied after an UI reload and any change to the value will make the "Apply Settings" button appear on the panel which will reload the UI when pressed (optional) - default = defaults.var, -- default value or function that returns the default value (optional) - reference = "MyAddonIconPicker" -- unique global reference to control (optional) -} ]] - -local widgetVersion = 8 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("iconpicker", widgetVersion) then return end - -local wm = WINDOW_MANAGER - -local IconPickerMenu = ZO_Object:Subclass() -local iconPicker -LAM.util.GetIconPickerMenu = function() - if not iconPicker then - iconPicker = IconPickerMenu:New("LAMIconPicker") - local sceneFragment = LAM:GetAddonSettingsFragment() - ZO_PreHook(sceneFragment, "OnHidden", function() - if not iconPicker.control:IsHidden() then - iconPicker:Clear() - end - end) - end - return iconPicker -end - -function IconPickerMenu:New(...) - local object = ZO_Object.New(self) - object:Initialize(...) - return object -end - -function IconPickerMenu:Initialize(name) - local control = wm:CreateTopLevelWindow(name) - control:SetDrawTier(DT_HIGH) - control:SetHidden(true) - self.control = control - - local scrollContainer = wm:CreateControlFromVirtual(name .. "ScrollContainer", control, "ZO_ScrollContainer") - -- control:SetDimensions(control.container:GetWidth(), height) -- adjust to icon size / col count - scrollContainer:SetAnchorFill() - ZO_Scroll_SetUseFadeGradient(scrollContainer, false) - ZO_Scroll_SetHideScrollbarOnDisable(scrollContainer, false) - ZO_VerticalScrollbarBase_OnMouseExit(scrollContainer:GetNamedChild("ScrollBar")) -- scrollbar initialization seems to be broken so we force it to update the correct alpha value - local scroll = GetControl(scrollContainer, "ScrollChild") - self.scroll = scroll - self.scrollContainer = scrollContainer - - local bg = wm:CreateControl(nil, scrollContainer, CT_BACKDROP) - bg:SetAnchor(TOPLEFT, scrollContainer, TOPLEFT, 0, -3) - bg:SetAnchor(BOTTOMRIGHT, scrollContainer, BOTTOMRIGHT, 2, 5) - bg:SetEdgeTexture("EsoUI\\Art\\Tooltips\\UI-Border.dds", 128, 16) - bg:SetCenterTexture("EsoUI\\Art\\Tooltips\\UI-TooltipCenter.dds") - bg:SetInsets(16, 16, -16, -16) - - local mungeOverlay = wm:CreateControl(nil, bg, CT_TEXTURE) - mungeOverlay:SetTexture("EsoUI/Art/Tooltips/munge_overlay.dds") - mungeOverlay:SetDrawLevel(1) - mungeOverlay:SetAddressMode(TEX_MODE_WRAP) - mungeOverlay:SetAnchorFill() - - local mouseOver = wm:CreateControl(nil, scrollContainer, CT_TEXTURE) - mouseOver:SetDrawLevel(2) - mouseOver:SetTexture("EsoUI/Art/Buttons/minmax_mouseover.dds") - mouseOver:SetHidden(true) - - local function IconFactory(pool) - local icon = wm:CreateControl(name .. "Entry" .. pool:GetNextControlId(), scroll, CT_TEXTURE) - icon:SetMouseEnabled(true) - icon:SetDrawLevel(3) - icon:SetHandler("OnMouseEnter", function() - mouseOver:SetAnchor(TOPLEFT, icon, TOPLEFT, 0, 0) - mouseOver:SetAnchor(BOTTOMRIGHT, icon, BOTTOMRIGHT, 0, 0) - mouseOver:SetHidden(false) - if self.customOnMouseEnter then - self.customOnMouseEnter(icon) - else - self:OnMouseEnter(icon) - end - end) - icon:SetHandler("OnMouseExit", function() - mouseOver:ClearAnchors() - mouseOver:SetHidden(true) - if self.customOnMouseExit then - self.customOnMouseExit(icon) - else - self:OnMouseExit(icon) - end - end) - icon:SetHandler("OnMouseUp", function(control, ...) - PlaySound("Click") - icon.OnSelect(icon, icon.texture) - self:Clear() - end) - return icon - end - - local function ResetFunction(icon) - icon:ClearAnchors() - end - - self.iconPool = ZO_ObjectPool:New(IconFactory, ResetFunction) - self:SetMaxColumns(1) - self.icons = {} - self.color = ZO_DEFAULT_ENABLED_COLOR - - EVENT_MANAGER:RegisterForEvent(name .. "_OnGlobalMouseUp", EVENT_GLOBAL_MOUSE_UP, function() - if self.refCount ~= nil then - local moc = wm:GetMouseOverControl() - if(moc:GetOwningWindow() ~= control) then - self.refCount = self.refCount - 1 - if self.refCount <= 0 then - self:Clear() - end - end - end - end) -end - -function IconPickerMenu:OnMouseEnter(icon) - InitializeTooltip(InformationTooltip, icon, TOPLEFT, 0, 0, BOTTOMRIGHT) - SetTooltipText(InformationTooltip, LAM.util.GetStringFromValue(icon.tooltip)) - InformationTooltipTopLevel:BringWindowToTop() -end - -function IconPickerMenu:OnMouseExit(icon) - ClearTooltip(InformationTooltip) -end - -function IconPickerMenu:SetMaxColumns(value) - self.maxCols = value ~= nil and value or 5 -end - -local DEFAULT_SIZE = 28 -function IconPickerMenu:SetIconSize(value) - local iconSize = DEFAULT_SIZE - if value ~= nil then iconSize = math.max(iconSize, value) end - self.iconSize = iconSize -end - -function IconPickerMenu:SetVisibleRows(value) - self.visibleRows = value ~= nil and value or 4.5 -end - -function IconPickerMenu:SetMouseHandlers(onEnter, onExit) - self.customOnMouseEnter = onEnter - self.customOnMouseExit = onExit -end - -function IconPickerMenu:UpdateDimensions() - local iconSize = self.iconSize - local width = iconSize * self.maxCols + 20 - local height = iconSize * self.visibleRows - self.control:SetDimensions(width, height) - - local icons = self.icons - for i = 1, #icons do - local icon = icons[i] - icon:SetDimensions(iconSize, iconSize) - end -end - -function IconPickerMenu:UpdateAnchors() - local iconSize = self.iconSize - local col, maxCols = 1, self.maxCols - local previousCol, previousRow - local scroll = self.scroll - local icons = self.icons - - for i = 1, #icons do - local icon = icons[i] - icon:ClearAnchors() - if i == 1 then - icon:SetAnchor(TOPLEFT, scroll, TOPLEFT, 0, 0) - previousRow = icon - elseif col == 1 then - icon:SetAnchor(TOPLEFT, previousRow, BOTTOMLEFT, 0, 0) - previousRow = icon - else - icon:SetAnchor(TOPLEFT, previousCol, TOPRIGHT, 0, 0) - end - previousCol = icon - col = col >= maxCols and 1 or col + 1 - end -end - -function IconPickerMenu:Clear() - self.icons = {} - self.iconPool:ReleaseAllObjects() - self.control:SetHidden(true) - self.color = ZO_DEFAULT_ENABLED_COLOR - self.refCount = nil - self.parent = nil - self.customOnMouseEnter = nil - self.customOnMouseExit = nil -end - -function IconPickerMenu:AddIcon(texturePath, callback, tooltip) - local icon, key = self.iconPool:AcquireObject() - icon:SetTexture(texturePath) - icon:SetColor(self.color:UnpackRGBA()) - icon.texture = texturePath - icon.tooltip = tooltip - icon.OnSelect = callback - self.icons[#self.icons + 1] = icon -end - -function IconPickerMenu:Show(parent) - if #self.icons == 0 then return false end - if not self.control:IsHidden() then self:Clear() return false end - self:UpdateDimensions() - self:UpdateAnchors() - - local control = self.control - control:ClearAnchors() - control:SetAnchor(TOPLEFT, parent, BOTTOMLEFT, 0, 8) - control:SetHidden(false) - control:BringWindowToTop() - self.parent = parent - self.refCount = 2 - - return true -end - -function IconPickerMenu:SetColor(color) - local icons = self.icons - self.color = color - for i = 1, #icons do - local icon = icons[i] - icon:SetColor(color:UnpackRGBA()) - end -end - -------------------------------------------------------------- - -local function UpdateChoices(control, choices, choicesTooltips) - local data = control.data - if not choices then - choices, choicesTooltips = data.choices, data.choicesTooltips or {} - end - local addedChoices = {} - - local iconPicker = LAM.util.GetIconPickerMenu() - iconPicker:Clear() - for i = 1, #choices do - local texture = choices[i] - if not addedChoices[texture] then -- remove duplicates - iconPicker:AddIcon(choices[i], function(self, texture) - control.icon:SetTexture(texture) - data.setFunc(texture) - LAM.util.RequestRefreshIfNeeded(control) - end, LAM.util.GetStringFromValue(choicesTooltips[i])) - addedChoices[texture] = true - end - end -end - -local function IsDisabled(control) - if type(control.data.disabled) == "function" then - return control.data.disabled() - else - return control.data.disabled - end -end - -local function SetColor(control, color) - local icon = control.icon - if IsDisabled(control) then - icon:SetColor(ZO_DEFAULT_DISABLED_COLOR:UnpackRGBA()) - else - icon.color = color or control.data.defaultColor or ZO_DEFAULT_ENABLED_COLOR - icon:SetColor(icon.color:UnpackRGBA()) - end - - local iconPicker = LAM.util.GetIconPickerMenu() - if iconPicker.parent == control.container and not iconPicker.control:IsHidden() then - iconPicker:SetColor(icon.color) - end -end - -local function UpdateDisabled(control) - local disable = IsDisabled(control) - - control.dropdown:SetMouseEnabled(not disable) - control.dropdownButton:SetEnabled(not disable) - - local iconPicker = LAM.util.GetIconPickerMenu() - if iconPicker.parent == control.container and not iconPicker.control:IsHidden() then - iconPicker:Clear() - end - - SetColor(control, control.icon.color) - if disable then - control.label:SetColor(ZO_DEFAULT_DISABLED_COLOR:UnpackRGBA()) - else - control.label:SetColor(ZO_DEFAULT_ENABLED_COLOR:UnpackRGBA()) - end -end - -local function UpdateValue(control, forceDefault, value) - if forceDefault then --if we are forcing defaults - value = LAM.util.GetDefaultValue(control.data.default) - control.data.setFunc(value) - control.icon:SetTexture(value) - elseif value then - control.data.setFunc(value) - --after setting this value, let's refresh the others to see if any should be disabled or have their settings changed - LAM.util.RequestRefreshIfNeeded(control) - else - value = control.data.getFunc() - control.icon:SetTexture(value) - end -end - -local MIN_HEIGHT = 26 -local HALF_WIDTH_LINE_SPACING = 2 -local function SetIconSize(control, size) - local icon = control.icon - icon.size = size - icon:SetDimensions(size, size) - - local height = size + 4 - control.dropdown:SetDimensions(size + 20, height) - height = math.max(height, MIN_HEIGHT) - control.container:SetHeight(height) - if control.lineControl then - control.lineControl:SetHeight(MIN_HEIGHT + size + HALF_WIDTH_LINE_SPACING) - else - control:SetHeight(height) - end - - local iconPicker = LAM.util.GetIconPickerMenu() - if iconPicker.parent == control.container and not iconPicker.control:IsHidden() then - iconPicker:SetIconSize(size) - iconPicker:UpdateDimensions() - iconPicker:UpdateAnchors() - end -end - -function LAMCreateControl.iconpicker(parent, iconpickerData, controlName) - local control = LAM.util.CreateLabelAndContainerControl(parent, iconpickerData, controlName) - - local function ShowIconPicker() - local iconPicker = LAM.util.GetIconPickerMenu() - if iconPicker.parent == control.container then - iconPicker:Clear() - else - iconPicker:SetMaxColumns(iconpickerData.maxColumns) - iconPicker:SetVisibleRows(iconpickerData.visibleRows) - iconPicker:SetIconSize(control.icon.size) - UpdateChoices(control) - iconPicker:SetColor(control.icon.color) - if iconpickerData.beforeShow then - if iconpickerData.beforeShow(control, iconPicker) then - iconPicker:Clear() - return - end - end - iconPicker:Show(control.container) - end - end - - local iconSize = iconpickerData.iconSize ~= nil and iconpickerData.iconSize or DEFAULT_SIZE - control.dropdown = wm:CreateControl(nil, control.container, CT_CONTROL) - local dropdown = control.dropdown - dropdown:SetAnchor(LEFT, control.container, LEFT, 0, 0) - dropdown:SetMouseEnabled(true) - dropdown:SetHandler("OnMouseUp", ShowIconPicker) - dropdown:SetHandler("OnMouseEnter", function() ZO_Options_OnMouseEnter(control) end) - dropdown:SetHandler("OnMouseExit", function() ZO_Options_OnMouseExit(control) end) - - control.icon = wm:CreateControl(nil, dropdown, CT_TEXTURE) - local icon = control.icon - icon:SetAnchor(LEFT, dropdown, LEFT, 3, 0) - icon:SetDrawLevel(2) - - local dropdownButton = wm:CreateControlFromVirtual(nil, dropdown, "ZO_DropdownButton") - dropdownButton:SetDimensions(16, 16) - dropdownButton:SetHandler("OnClicked", ShowIconPicker) - dropdownButton:SetAnchor(RIGHT, dropdown, RIGHT, -3, 0) - control.dropdownButton = dropdownButton - - control.bg = wm:CreateControl(nil, dropdown, CT_BACKDROP) - local bg = control.bg - bg:SetAnchor(TOPLEFT, dropdown, TOPLEFT, 0, -3) - bg:SetAnchor(BOTTOMRIGHT, dropdown, BOTTOMRIGHT, 2, 5) - bg:SetEdgeTexture("EsoUI/Art/Tooltips/UI-Border.dds", 128, 16) - bg:SetCenterTexture("EsoUI/Art/Tooltips/UI-TooltipCenter.dds") - bg:SetInsets(16, 16, -16, -16) - local mungeOverlay = wm:CreateControl(nil, bg, CT_TEXTURE) - mungeOverlay:SetTexture("EsoUI/Art/Tooltips/munge_overlay.dds") - mungeOverlay:SetDrawLevel(1) - mungeOverlay:SetAddressMode(TEX_MODE_WRAP) - mungeOverlay:SetAnchorFill() - - if iconpickerData.warning ~= nil or iconpickerData.requiresReload then - control.warning = wm:CreateControlFromVirtual(nil, control, "ZO_Options_WarningIcon") - control.warning:SetAnchor(RIGHT, control.container, LEFT, -5, 0) - control.UpdateWarning = LAM.util.UpdateWarning - control:UpdateWarning() - end - - control.UpdateChoices = UpdateChoices - control.UpdateValue = UpdateValue - control:UpdateValue() - control.SetColor = SetColor - control:SetColor() - control.SetIconSize = SetIconSize - control:SetIconSize(iconSize) - - if iconpickerData.disabled ~= nil then - control.UpdateDisabled = UpdateDisabled - control:UpdateDisabled() - end - - LAM.util.RegisterForRefreshIfNeeded(control) - LAM.util.RegisterForReloadIfNeeded(control) - - return control -end diff --git a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/panel.lua b/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/panel.lua deleted file mode 100644 index d440a9e..0000000 --- a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/panel.lua +++ /dev/null @@ -1,168 +0,0 @@ ---[[panelData = { - type = "panel", - name = "Window Title", -- or string id or function returning a string - displayName = "My Longer Window Title", -- or string id or function returning a string (optional) (can be useful for long addon names or if you want to colorize it) - author = "Seerah", -- or string id or function returning a string (optional) - version = "2.0", -- or string id or function returning a string (optional) - website = "http://www.esoui.com/downloads/info7-LibAddonMenu.html", -- URL of website where the addon can be updated or function (optional) - feedback = "https://www.esoui.com/portal.php?uid=5815", -- URL of website where feedback/feature requests/bugs can be reported for the addon or function (optional) - translation = "https://www.esoui.com/portal.php?uid=5815", -- URL of website where translation texts of the addon can be helped with or function (optional) - donation = "http://www.esoui.com/downloads/info7-LibAddonMenu.html", -- URL of website where a donation for the addon author can be raised or function (optional) - keywords = "settings", -- additional keywords for search filter (it looks for matches in name..keywords..author) (optional) - slashCommand = "/myaddon", -- will register a keybind to open to this panel (don't forget to include the slash!) (optional) - registerForRefresh = true, --boolean (optional) (will refresh all options controls when a setting is changed and when the panel is shown) - registerForDefaults = true, --boolean (optional) (will set all options controls back to default values) - resetFunc = function() print("defaults reset") end, --(optional) custom function to run after settings are reset to defaults -} ]] - - -local widgetVersion = 15 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("panel", widgetVersion) then return end - -local wm = WINDOW_MANAGER -local cm = CALLBACK_MANAGER - -local function RefreshPanel(control) - local panel = LAM.util.GetTopPanel(control) --callback can be fired by a single control, by the panel showing or by a nested submenu - if LAM.currentAddonPanel ~= panel or not LAM.currentPanelOpened then return end -- we refresh it later when the panel is opened - - local panelControls = panel.controlsToRefresh - - for i = 1, #panelControls do - local updateControl = panelControls[i] - if updateControl ~= control and updateControl.UpdateValue then - updateControl:UpdateValue() - end - if updateControl.UpdateDisabled then - updateControl:UpdateDisabled() - end - if updateControl.UpdateWarning then - updateControl:UpdateWarning() - end - end -end - -local function ForceDefaults(panel) - local panelControls = panel.controlsToRefresh - - for i = 1, #panelControls do - local updateControl = panelControls[i] - if updateControl.UpdateValue and updateControl.data.default ~= nil then - updateControl:UpdateValue(true) - end - end - - if panel.data.resetFunc then - panel.data.resetFunc() - end - - cm:FireCallbacks("LAM-RefreshPanel", panel) -end - -local callbackRegistered = false -LAMCreateControl.scrollCount = LAMCreateControl.scrollCount or 1 -local SEPARATOR = " - " -local COLORED_SEPARATOR = ZO_WHITE:Colorize(SEPARATOR) -local LINK_COLOR = ZO_ColorDef:New("5959D5") -local LINK_MOUSE_OVER_COLOR = ZO_ColorDef:New("B8B8D3") -local LINK_COLOR_DONATE = ZO_ColorDef:New("FFD700") -- golden -local LINK_MOUSE_OVER_COLOR_DONATE = ZO_ColorDef:New("FFF6CC") - -local function CreateButtonControl(control, label, clickAction, relativeTo) - local button = wm:CreateControl(nil, control, CT_BUTTON) - button:SetClickSound("Click") - button:SetFont(LAM.util.L["PANEL_INFO_FONT"]) - button:SetNormalFontColor(LINK_COLOR:UnpackRGBA()) - button:SetMouseOverFontColor(LINK_MOUSE_OVER_COLOR:UnpackRGBA()) - - local OnClicked - local actionType = type(clickAction) - if actionType == "string" then - OnClicked = function() RequestOpenUnsafeURL(clickAction) end - elseif actionType == "function" then - OnClicked = clickAction - end - button:SetHandler("OnClicked", OnClicked) - - if relativeTo then - button:SetAnchor(TOPLEFT, relativeTo, TOPRIGHT, 0, 0) - button:SetText(COLORED_SEPARATOR .. label) - else - button:SetAnchor(TOPLEFT, control.label, BOTTOMLEFT, 0, -2) - button:SetText(label) - end - button:SetDimensions(button:GetLabelControl():GetTextDimensions()) - - return button -end - -function LAMCreateControl.panel(parent, panelData, controlName) - local control = wm:CreateControl(controlName, parent, CT_CONTROL) - - control.label = wm:CreateControlFromVirtual(nil, control, "ZO_Options_SectionTitleLabel") - local label = control.label - label:SetAnchor(TOPLEFT, control, TOPLEFT, 0, 4) - label:SetText(LAM.util.GetStringFromValue(panelData.displayName or panelData.name)) - - local previousInfoControl - if panelData.author or panelData.version then - control.info = wm:CreateControl(nil, control, CT_LABEL) - local info = control.info - info:SetFont(LAM.util.L["PANEL_INFO_FONT"]) - info:SetAnchor(TOPLEFT, label, BOTTOMLEFT, 0, -2) - - local output = {} - if panelData.author then - output[#output + 1] = zo_strformat(LAM.util.L["AUTHOR"], LAM.util.GetStringFromValue(panelData.author)) - end - if panelData.version then - output[#output + 1] = zo_strformat(LAM.util.L["VERSION"], LAM.util.GetStringFromValue(panelData.version)) - end - info:SetText(table.concat(output, SEPARATOR)) - previousInfoControl = info - end - - if panelData.website then - control.website = CreateButtonControl(control, LAM.util.L["WEBSITE"], panelData.website, previousInfoControl) - previousInfoControl = control.website - end - - if panelData.feedback then - control.feedback = CreateButtonControl(control, LAM.util.L["FEEDBACK"], panelData.feedback, previousInfoControl) - previousInfoControl = control.feedback - end - - if panelData.translation then - control.translation = CreateButtonControl(control, LAM.util.L["TRANSLATION"], panelData.translation, previousInfoControl) - previousInfoControl = control.translation - end - - if panelData.donation then - control.donation = CreateButtonControl(control, LAM.util.L["DONATION"], panelData.donation, previousInfoControl) - local donation = control.donation - previousInfoControl = donation - donation:SetNormalFontColor(LINK_COLOR_DONATE:UnpackRGBA()) - donation:SetMouseOverFontColor(LINK_MOUSE_OVER_COLOR_DONATE:UnpackRGBA()) - end - - control.container = wm:CreateControlFromVirtual("LAMAddonPanelContainer"..LAMCreateControl.scrollCount, control, "ZO_ScrollContainer") - LAMCreateControl.scrollCount = LAMCreateControl.scrollCount + 1 - local container = control.container - container:SetAnchor(TOPLEFT, control.info or label, BOTTOMLEFT, 0, 20) - container:SetAnchor(BOTTOMRIGHT, control, BOTTOMRIGHT, -3, -3) - control.scroll = GetControl(control.container, "ScrollChild") - control.scroll:SetResizeToFitPadding(0, 20) - - if panelData.registerForRefresh and not callbackRegistered then --don't want to register our callback more than once - cm:RegisterCallback("LAM-RefreshPanel", RefreshPanel) - callbackRegistered = true - end - - control.ForceDefaults = ForceDefaults - control.RefreshPanel = LAM.util.RequestRefreshIfNeeded - control.data = panelData - control.controlsToRefresh = {} - - return control -end diff --git a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/slider.lua b/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/slider.lua deleted file mode 100644 index c4d44dd..0000000 --- a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/slider.lua +++ /dev/null @@ -1,220 +0,0 @@ ---[[sliderData = { - type = "slider", - name = "My Slider", -- or string id or function returning a string - getFunc = function() return db.var end, - setFunc = function(value) db.var = value doStuff() end, - min = 0, - max = 20, - step = 1, --(optional) - clampInput = true, -- boolean, if set to false the input won't clamp to min and max and allow any number instead (optional) - clampFunction = function(value, min, max) return math.max(math.min(value, max), min) end, -- function that is called to clamp the value (optional) - decimals = 0, -- when specified the input value is rounded to the specified number of decimals (optional) - autoSelect = false, -- boolean, automatically select everything in the text input field when it gains focus (optional) - inputLocation = "below", -- or "right", determines where the input field is shown. This should not be used within the addon menu and is for custom sliders (optional) - tooltip = "Slider's tooltip text.", -- or string id or function returning a string (optional) - width = "full", --or "half" (optional) - disabled = function() return db.someBooleanSetting end, --or boolean (optional) - warning = "May cause permanent awesomeness.", -- or string id or function returning a string (optional) - requiresReload = false, -- boolean, if set to true, the warning text will contain a notice that changes are only applied after an UI reload and any change to the value will make the "Apply Settings" button appear on the panel which will reload the UI when pressed (optional) - default = defaults.var, -- default value or function that returns the default value (optional) - reference = "MyAddonSlider" -- unique global reference to control (optional) -} ]] - -local widgetVersion = 13 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("slider", widgetVersion) then return end - -local wm = WINDOW_MANAGER -local strformat = string.format - -local function RoundDecimalToPlace(d, place) - return tonumber(strformat("%." .. tostring(place) .. "f", d)) -end - -local function ClampValue(value, min, max) - return math.max(math.min(value, max), min) -end - -local function UpdateDisabled(control) - local disable - if type(control.data.disabled) == "function" then - disable = control.data.disabled() - else - disable = control.data.disabled - end - - control.slider:SetEnabled(not disable) - control.slidervalue:SetEditEnabled(not disable) - if disable then - control.label:SetColor(ZO_DEFAULT_DISABLED_COLOR:UnpackRGBA()) - control.minText:SetColor(ZO_DEFAULT_DISABLED_COLOR:UnpackRGBA()) - control.maxText:SetColor(ZO_DEFAULT_DISABLED_COLOR:UnpackRGBA()) - control.slidervalue:SetColor(ZO_DEFAULT_DISABLED_MOUSEOVER_COLOR:UnpackRGBA()) - else - control.label:SetColor(ZO_DEFAULT_ENABLED_COLOR:UnpackRGBA()) - control.minText:SetColor(ZO_DEFAULT_ENABLED_COLOR:UnpackRGBA()) - control.maxText:SetColor(ZO_DEFAULT_ENABLED_COLOR:UnpackRGBA()) - control.slidervalue:SetColor(ZO_DEFAULT_ENABLED_COLOR:UnpackRGBA()) - end -end - -local function UpdateValue(control, forceDefault, value) - if forceDefault then --if we are forcing defaults - value = LAM.util.GetDefaultValue(control.data.default) - control.data.setFunc(value) - elseif value then - if control.data.decimals then - value = RoundDecimalToPlace(value, control.data.decimals) - end - if control.data.clampInput ~= false then - local clamp = control.data.clampFunction or ClampValue - value = clamp(value, control.data.min, control.data.max) - end - control.data.setFunc(value) - --after setting this value, let's refresh the others to see if any should be disabled or have their settings changed - LAM.util.RequestRefreshIfNeeded(control) - else - value = control.data.getFunc() - end - - control.slider:SetValue(value) - control.slidervalue:SetText(value) -end - -function LAMCreateControl.slider(parent, sliderData, controlName) - local control = LAM.util.CreateLabelAndContainerControl(parent, sliderData, controlName) - local isInputOnRight = sliderData.inputLocation == "right" - - --skipping creating the backdrop... Is this the actual slider texture? - control.slider = wm:CreateControl(nil, control.container, CT_SLIDER) - local slider = control.slider - slider:SetAnchor(TOPLEFT) - slider:SetHeight(14) - if(isInputOnRight) then - slider:SetAnchor(TOPRIGHT, nil, nil, -60) - else - slider:SetAnchor(TOPRIGHT) - end - slider:SetMouseEnabled(true) - slider:SetOrientation(ORIENTATION_HORIZONTAL) - --put nil for highlighted texture file path, and what look to be texture coords - slider:SetThumbTexture("EsoUI\\Art\\Miscellaneous\\scrollbox_elevator.dds", "EsoUI\\Art\\Miscellaneous\\scrollbox_elevator_disabled.dds", nil, 8, 16) - local minValue = sliderData.min - local maxValue = sliderData.max - slider:SetMinMax(minValue, maxValue) - slider:SetHandler("OnMouseEnter", function() ZO_Options_OnMouseEnter(control) end) - slider:SetHandler("OnMouseExit", function() ZO_Options_OnMouseExit(control) end) - - slider.bg = wm:CreateControl(nil, slider, CT_BACKDROP) - local bg = slider.bg - bg:SetCenterColor(0, 0, 0) - bg:SetAnchor(TOPLEFT, slider, TOPLEFT, 0, 4) - bg:SetAnchor(BOTTOMRIGHT, slider, BOTTOMRIGHT, 0, -4) - bg:SetEdgeTexture("EsoUI\\Art\\Tooltips\\UI-SliderBackdrop.dds", 32, 4) - - control.minText = wm:CreateControl(nil, slider, CT_LABEL) - local minText = control.minText - minText:SetFont("ZoFontGameSmall") - minText:SetAnchor(TOPLEFT, slider, BOTTOMLEFT) - minText:SetText(sliderData.min) - - control.maxText = wm:CreateControl(nil, slider, CT_LABEL) - local maxText = control.maxText - maxText:SetFont("ZoFontGameSmall") - maxText:SetAnchor(TOPRIGHT, slider, BOTTOMRIGHT) - maxText:SetText(sliderData.max) - - control.slidervalueBG = wm:CreateControlFromVirtual(nil, slider, "ZO_EditBackdrop") - if(isInputOnRight) then - control.slidervalueBG:SetDimensions(60, 26) - control.slidervalueBG:SetAnchor(LEFT, slider, RIGHT, 5, 0) - else - control.slidervalueBG:SetDimensions(50, 16) - control.slidervalueBG:SetAnchor(TOP, slider, BOTTOM, 0, 0) - end - control.slidervalue = wm:CreateControlFromVirtual(nil, control.slidervalueBG, "ZO_DefaultEditForBackdrop") - local slidervalue = control.slidervalue - slidervalue:ClearAnchors() - slidervalue:SetAnchor(TOPLEFT, control.slidervalueBG, TOPLEFT, 3, 1) - slidervalue:SetAnchor(BOTTOMRIGHT, control.slidervalueBG, BOTTOMRIGHT, -3, -1) - slidervalue:SetTextType(TEXT_TYPE_NUMERIC) - if(isInputOnRight) then - slidervalue:SetFont("ZoFontGameLarge") - else - slidervalue:SetFont("ZoFontGameSmall") - end - - local isHandlingChange = false - local function HandleValueChanged(value) - if isHandlingChange then return end - if sliderData.decimals then - value = RoundDecimalToPlace(value, sliderData.decimals) - end - isHandlingChange = true - slider:SetValue(value) - slidervalue:SetText(value) - isHandlingChange = false - end - - slidervalue:SetHandler("OnEscape", function(self) - HandleValueChanged(sliderData.getFunc()) - self:LoseFocus() - end) - slidervalue:SetHandler("OnEnter", function(self) - self:LoseFocus() - end) - slidervalue:SetHandler("OnFocusLost", function(self) - local value = tonumber(self:GetText()) - control:UpdateValue(false, value) - end) - slidervalue:SetHandler("OnTextChanged", function(self) - local input = self:GetText() - if(#input > 1 and not input:sub(-1):match("[0-9]")) then return end - local value = tonumber(input) - if(value) then - HandleValueChanged(value) - end - end) - if(sliderData.autoSelect) then - ZO_PreHookHandler(slidervalue, "OnFocusGained", function(self) - self:SelectAll() - end) - end - - local range = maxValue - minValue - slider:SetValueStep(sliderData.step or 1) - slider:SetHandler("OnValueChanged", function(self, value, eventReason) - if eventReason == EVENT_REASON_SOFTWARE then return end - HandleValueChanged(value) - end) - slider:SetHandler("OnSliderReleased", function(self, value) - if self:GetEnabled() then - control:UpdateValue(false, value) - end - end) - slider:SetHandler("OnMouseWheel", function(self, value) - if(not self:GetEnabled()) then return end - local new_value = (tonumber(slidervalue:GetText()) or sliderData.min or 0) + ((sliderData.step or 1) * value) - control:UpdateValue(false, new_value) - end) - - if sliderData.warning ~= nil or sliderData.requiresReload then - control.warning = wm:CreateControlFromVirtual(nil, control, "ZO_Options_WarningIcon") - control.warning:SetAnchor(RIGHT, slider, LEFT, -5, 0) - control.UpdateWarning = LAM.util.UpdateWarning - control:UpdateWarning() - end - - control.UpdateValue = UpdateValue - control:UpdateValue() - - if sliderData.disabled ~= nil then - control.UpdateDisabled = UpdateDisabled - control:UpdateDisabled() - end - - LAM.util.RegisterForRefreshIfNeeded(control) - LAM.util.RegisterForReloadIfNeeded(control) - - return control -end diff --git a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/submenu.lua b/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/submenu.lua deleted file mode 100644 index b5b0f06..0000000 --- a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/submenu.lua +++ /dev/null @@ -1,182 +0,0 @@ ---[[submenuData = { - type = "submenu", - name = "Submenu Title", -- or string id or function returning a string - icon = "path/to/my/icon.dds", -- or function returning a string (optional) - iconTextureCoords = {left, right, top, bottom}, -- or function returning a table (optional) - tooltip = "My submenu tooltip", -- -- or string id or function returning a string (optional) - controls = {sliderData, buttonData} --(optional) used by LAM - disabled = function() return db.someBooleanSetting end, --or boolean (optional) - disabledLabel = function() return db.someBooleanSetting end, --or boolean (optional) - reference = "MyAddonSubmenu" --(optional) unique global reference to control -} ]] - -local widgetVersion = 13 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("submenu", widgetVersion) then return end - -local wm = WINDOW_MANAGER -local am = ANIMATION_MANAGER -local ICON_SIZE = 32 - -local GetDefaultValue = LAM.util.GetDefaultValue -local GetColorForState = LAM.util.GetColorForState - -local function UpdateDisabled(control) - local disable = GetDefaultValue(control.data.disabled) - if disable ~= control.disabled then - local color = GetColorForState(disable) - if disable and control.open then - control.open = false - control.animation:PlayFromStart() - end - - control.arrow:SetColor(color:UnpackRGBA()) - control.disabled = disable - end - - local disableLabel = control.disabled or GetDefaultValue(control.data.disabledLabel) - if disableLabel ~= control.disabledLabel then - local color = GetColorForState(disableLabel) - control.label:SetColor(color:UnpackRGBA()) - if(control.icon) then - control.icon:SetDesaturation(disableLabel and 1 or 0) - end - control.disabledLabel = disableLabel - end -end - -local function UpdateValue(control) - control.label:SetText(LAM.util.GetStringFromValue(control.data.name)) - - if control.icon then - control.icon:SetTexture(GetDefaultValue(control.data.icon)) - if(control.data.iconTextureCoords) then - local coords = GetDefaultValue(control.data.iconTextureCoords) - control.icon:SetTextureCoords(unpack(coords)) - end - end - - if control.data.tooltip then - control.label.data.tooltipText = LAM.util.GetStringFromValue(control.data.tooltip) - end -end - -local function AnimateSubmenu(clicked) - local control = clicked:GetParent() - if control.disabled then return end - - control.open = not control.open - if control.open then - control.animation:PlayFromStart() - else - control.animation:PlayFromEnd() - end -end - -function LAMCreateControl.submenu(parent, submenuData, controlName) - local width = parent:GetWidth() - 45 - local control = wm:CreateControl(controlName or submenuData.reference, parent.scroll or parent, CT_CONTROL) - control.panel = parent - control.data = submenuData - - control.label = wm:CreateControlFromVirtual(nil, control, "ZO_Options_SectionTitleLabel") - local label = control.label - label:SetWrapMode(TEXT_WRAP_MODE_ELLIPSIS) - label:SetText(LAM.util.GetStringFromValue(submenuData.name)) - label:SetMouseEnabled(true) - - if submenuData.icon then - control.icon = wm:CreateControl(nil, control, CT_TEXTURE) - local icon = control.icon - icon:SetTexture(GetDefaultValue(submenuData.icon)) - if(submenuData.iconTextureCoords) then - local coords = GetDefaultValue(submenuData.iconTextureCoords) - icon:SetTextureCoords(unpack(coords)) - end - icon:SetDimensions(ICON_SIZE, ICON_SIZE) - icon:SetAnchor(TOPLEFT, control, TOPLEFT, 5, 5) - icon:SetMouseEnabled(true) - icon:SetDrawLayer(DL_CONTROLS) - label:SetAnchor(TOP, control, TOP, 0, 5, ANCHOR_CONSTRAINS_Y) - label:SetAnchor(LEFT, icon, RIGHT, 10, 0, ANCHOR_CONSTRAINS_X) - label:SetDimensions(width - ICON_SIZE - 5, 30) - else - label:SetAnchor(TOPLEFT, control, TOPLEFT, 5, 5) - label:SetDimensions(width, 30) - end - - if submenuData.tooltip then - label.data = {tooltipText = LAM.util.GetStringFromValue(submenuData.tooltip)} - label:SetHandler("OnMouseEnter", ZO_Options_OnMouseEnter) - label:SetHandler("OnMouseExit", ZO_Options_OnMouseExit) - if control.icon then - control.icon.data = label.data - control.icon:SetHandler("OnMouseEnter", ZO_Options_OnMouseEnter) - control.icon:SetHandler("OnMouseExit", ZO_Options_OnMouseExit) - end - end - - control.scroll = wm:CreateControl(nil, control, CT_SCROLL) - local scroll = control.scroll - scroll:SetParent(control) - scroll:SetAnchor(TOPLEFT, control.icon or label, BOTTOMLEFT, 0, 10) - scroll:SetDimensionConstraints(width + 5, 0, width + 5, 0) - - control.bg = wm:CreateControl(nil, control.icon or label, CT_BACKDROP) - local bg = control.bg - bg:SetAnchor(TOPLEFT, control.icon or label, TOPLEFT, -5, -5) - bg:SetAnchor(BOTTOMRIGHT, scroll, BOTTOMRIGHT, -7, 0) - bg:SetEdgeTexture("EsoUI\\Art\\Tooltips\\UI-Border.dds", 128, 16) - bg:SetCenterTexture("EsoUI\\Art\\Tooltips\\UI-TooltipCenter.dds") - bg:SetInsets(16, 16, -16, -16) - bg:SetDrawLayer(DL_BACKGROUND) - - control.arrow = wm:CreateControl(nil, bg, CT_TEXTURE) - local arrow = control.arrow - arrow:SetDimensions(28, 28) - arrow:SetTexture("EsoUI\\Art\\Miscellaneous\\list_sortdown.dds") --list_sortup for the other way - arrow:SetAnchor(TOPRIGHT, bg, TOPRIGHT, -5, 5) - - --figure out the cool animation later... - control.animation = am:CreateTimeline() - local animation = control.animation - animation:SetPlaybackType(ANIMATION_SIZE, 0) --2nd arg = loop count - - control:SetResizeToFitDescendents(true) - control.open = false - label:SetHandler("OnMouseUp", AnimateSubmenu) - if(control.icon) then - control.icon:SetHandler("OnMouseUp", AnimateSubmenu) - end - animation:SetHandler("OnStop", function(self, completedPlaying) - scroll:SetResizeToFitDescendents(control.open) - if control.open then - control.arrow:SetTexture("EsoUI\\Art\\Miscellaneous\\list_sortup.dds") - scroll:SetResizeToFitPadding(5, 20) - else - control.arrow:SetTexture("EsoUI\\Art\\Miscellaneous\\list_sortdown.dds") - scroll:SetResizeToFitPadding(5, 0) - scroll:SetHeight(0) - end - end) - - --small strip at the bottom of the submenu that you can click to close it - control.btmToggle = wm:CreateControl(nil, control, CT_TEXTURE) - local btmToggle = control.btmToggle - btmToggle:SetMouseEnabled(true) - btmToggle:SetAnchor(BOTTOMLEFT, control.scroll, BOTTOMLEFT) - btmToggle:SetAnchor(BOTTOMRIGHT, control.scroll, BOTTOMRIGHT) - btmToggle:SetHeight(15) - btmToggle:SetAlpha(0) - btmToggle:SetHandler("OnMouseUp", AnimateSubmenu) - - control.UpdateValue = UpdateValue - if submenuData.disabled ~= nil or submenuData.disabledLabel ~= nil then - control.UpdateDisabled = UpdateDisabled - control:UpdateDisabled() - end - - LAM.util.RegisterForRefreshIfNeeded(control) - - return control -end diff --git a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/texture.lua b/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/texture.lua deleted file mode 100644 index 29dda7c..0000000 --- a/Libs/LibAddonMenu-2.0/LibAddonMenu-2.0/controls/texture.lua +++ /dev/null @@ -1,45 +0,0 @@ ---[[textureData = { - type = "texture", - image = "file/path.dds", - imageWidth = 64, --max of 250 for half width, 510 for full - imageHeight = 32, --max of 100 - tooltip = "Image's tooltip text.", -- or string id or function returning a string (optional) - width = "full", --or "half" (optional) - reference = "MyAddonTexture" --(optional) unique global reference to control -} ]] - ---add texture coords support? - -local widgetVersion = 9 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("texture", widgetVersion) then return end - -local wm = WINDOW_MANAGER - -local MIN_HEIGHT = 26 -function LAMCreateControl.texture(parent, textureData, controlName) - local control = LAM.util.CreateBaseControl(parent, textureData, controlName) - local width = control:GetWidth() - control:SetResizeToFitDescendents(true) - - if control.isHalfWidth then --note these restrictions - control:SetDimensionConstraints(width / 2, MIN_HEIGHT, width / 2, MIN_HEIGHT * 4) - else - control:SetDimensionConstraints(width, MIN_HEIGHT, width, MIN_HEIGHT * 4) - end - - control.texture = wm:CreateControl(nil, control, CT_TEXTURE) - local texture = control.texture - texture:SetAnchor(CENTER) - texture:SetDimensions(textureData.imageWidth, textureData.imageHeight) - texture:SetTexture(textureData.image) - - if textureData.tooltip then - texture:SetMouseEnabled(true) - texture.data = {tooltipText = LAM.util.GetStringFromValue(textureData.tooltip)} - texture:SetHandler("OnMouseEnter", ZO_Options_OnMouseEnter) - texture:SetHandler("OnMouseExit", ZO_Options_OnMouseExit) - end - - return control -end diff --git a/Libs/LibAddonMenu-2.0/LibStub/LibStub.lua b/Libs/LibAddonMenu-2.0/LibStub/LibStub.lua deleted file mode 100644 index e6b8997..0000000 --- a/Libs/LibAddonMenu-2.0/LibStub/LibStub.lua +++ /dev/null @@ -1,38 +0,0 @@ --- LibStub is a simple versioning stub meant for use in Libraries. http://www.wowace.com/wiki/LibStub for more info --- LibStub is hereby placed in the Public Domain Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel, joshborke --- LibStub developed for World of Warcraft by above members of the WowAce community. --- Ported to Elder Scrolls Online by Seerah - -local LIBSTUB_MAJOR, LIBSTUB_MINOR = "LibStub", 5 -local LibStub = _G[LIBSTUB_MAJOR] - -local strformat = string.format -if not LibStub or LibStub.minor < LIBSTUB_MINOR then - LibStub = LibStub or {libs = {}, minors = {} } - _G[LIBSTUB_MAJOR] = LibStub - LibStub.minor = LIBSTUB_MINOR - - function LibStub:NewLibrary(major, minor) - assert(type(major) == "string", "Bad argument #2 to `NewLibrary' (string expected)") - if type(minor) ~= "number" then - minor = assert(tonumber(zo_strmatch(minor, "%d+%.?%d*")), "Minor version must either be a number or contain a number.") - end - - local oldminor = self.minors[major] - if oldminor and oldminor >= minor then return nil end - self.minors[major], self.libs[major] = minor, self.libs[major] or {} - return self.libs[major], oldminor - end - - function LibStub:GetLibrary(major, silent) - if not self.libs[major] and not silent then - error(strformat("Cannot find a library instance of %q.", tostring(major)), 2) - end - return self.libs[major], self.minors[major] - end - - function LibStub:IterateLibraries() return pairs(self.libs) end - setmetatable(LibStub, { __call = LibStub.GetLibrary }) -end - -LibStub.SILENT = true \ No newline at end of file -- 1.7.9.5