diff --git a/.vscode/settings.json b/.vscode/settings.json index 4ab48a88..d4de00b3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -139,7 +139,14 @@ "DUNGEON_SCORE_OVERTIME_TIME", "NO", "UIParentLoadAddOn", - "BOOKTYPE_PROFESSION" + "BOOKTYPE_PROFESSION", + "InterfaceOptions_AddCategory", + "MainMenuBar", + "Settings", + "Add", + "CURRENCY", + "EasyMenu", + "ElvDB" ], "Lua.diagnostics.disable": [ "redundant-parameter", diff --git a/CHANGELOG b/CHANGELOG index 92ecddd4..39f06da9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,50 @@ # Changelog - ElvUI_mMediaTag [Eng] - All changes to this project will be documented in this file. The latest changes are at the top. -[Ger] - Alle Änderungen an diesem Projekt werden in dieser Datei dokumentiert. Die neuesten Änderungen stehen ganz oben. + +## [ver. 3.1] - 07.05.2023 +### Update +- Update Teleports for Season 2 +- Update Example Dock +### Fix +- Tag update function in Settings menu +### NEW +- Addon Compartment Tooltip +- Add in Game Changlog +- New Icons for Dock +- New Game Menu Icons +- New Teleport Datatext Icons +- Custom Ready Check Icons +- Custom Phase Icons and Color +- Custom Resurrection icons +- New Dock Icon for Bags +- New Quick Setup Menu + +## [ver. 3.0] - 02.05.2023 +### IMPORTANT +!!! Currently only for Retail + +### Update +- Code Update +- The settings will be reset +- Update logo and Name +- Add new Logo and Settings for Retail 10.1 +- More Mediafiles, for Dock, Role, Tags. Datatexts +- Interrupt on CD now shows when the Unit is out of range +- M+ Datatext got more functionality for the tooltip, now shows an overview. +- You can now choos a Icon for Chatbutton and Rollbutton +- Update Dungeon Name function for Dataext Dungeons +- Nameplate border and hover color can now be set separately +- Add new Target Arrows to ElvUI +- Add new Combat Icons to ElvUI +- Add new Mail Icons to ElvUI +- Add new Resting Icons to ElvUI +- Update the Tags, all aviable Tags under ElvUI > Tags +- Tags spelling is now consistent +- Removed old and unused Tags +- New Tag Classification Icon +- Objectivetracker Skin, skins now the Dungeon tracker +- New Dock Icons +- 3 special Styles for Dock Calendar ## [ver. 2.95.2] - 04.04.2023 ### Update diff --git a/ElvUI_mMediaTag_Mainline.toc b/ElvUI_mMediaTag_Mainline.toc index 5b2de596..68652b86 100644 --- a/ElvUI_mMediaTag_Mainline.toc +++ b/ElvUI_mMediaTag_Mainline.toc @@ -1,10 +1,12 @@ ## Interface: 100100 ## Author: Blinkii -## Version: 3.0 +## Version: 3.1 ## Title: |cff1784d1ElvUI|r |CFF6559F1m|r|CFF7A4DEFM|r|CFF8845ECe|r|CFFA037E9d|r|CFFA435E8i|r|CFFB32DE6a|r|CFFBC26E5T|r|CFFCB1EE3a|r|CFFDD14E0g|r |CFFFF006C&|r |CFFFF4C00T|r|CFFFF7300o|r|CFFFF9300o|r|CFFFFA800l|r|CFFFFC900s|r ## Notes: ElvUI Plugin from Blinkii | Support: mMediaTag@gmx.de ## IconTexture: Interface\AddOns\ElvUI_mMediaTag\media\logo\mmt_icon ## AddonCompartmentFunc: ElvUI_mMediaTag_OnAddonCompartmentClick +## AddonCompartmentFuncOnEnter: ElvUI_mMediaTag_OnAddonCompartmentOnEnter +## AddonCompartmentFuncOnLeave: ElvUI_mMediaTag_OnAddonCompartmentOnLeave ## RequiredDeps: ElvUI ## DefaultState: Enabled ## X-Tukui-ProjectID: 60 diff --git a/core/cmd.lua b/core/cmd.lua index d67ec8ad..26f24cf1 100644 --- a/core/cmd.lua +++ b/core/cmd.lua @@ -3,8 +3,7 @@ local mMT, E, L, V, P, G = unpack((select(2, ...))) function mMT:LoadCommands() self:RegisterChatCommand("mmt", function() if not InCombatLockdown() then - E:ToggleOptions() - E.Libs.AceConfigDialog:SelectGroup("ElvUI", "mMT") + E:ToggleOptions("mMT") HideUIPanel(_G["GameMenuFrame"]) end end) diff --git a/core/dropdown.lua b/core/dropdown.lua index 9c570b9e..4b8fc85a 100644 --- a/core/dropdown.lua +++ b/core/dropdown.lua @@ -91,7 +91,7 @@ function mMT:mDropDown(list, frame, menuparent, ButtonWidth, HideDelay) end end - local texture = [[Interface\AddOns\ElvUI_mMediaTag\media\textures\q1.tga]] + local texture = [[Interface\AddOns\ElvUI_mMediaTag\media\textures\k35.tga]] or [[Interface\QuestFrame\UI-QuestTitleHighlight]] if not list[i].isTitle then @@ -104,7 +104,7 @@ function mMT:mDropDown(list, frame, menuparent, ButtonWidth, HideDelay) frame.buttons[i].hoverTex:SetGradient("HORIZONTAL", {r = class[1], g = class[2], b = class[3], a = 0.75}, {r = mMT:ColorCheck(class[1] + 0.4), g = mMT:ColorCheck(class[2] + 0.4), b = mMT:ColorCheck(class[3] + 0.4), a = 0.75}) - frame.buttons[i].hoverTex:SetBlendMode("ADD") + frame.buttons[i].hoverTex:SetBlendMode("BLEND") frame.buttons[i].hoverTex:Hide() end diff --git a/core/options/about.lua b/core/options/about.lua index 66833e4b..f4e613f2 100644 --- a/core/options/about.lua +++ b/core/options/about.lua @@ -1,5 +1,6 @@ local mMT, E, L, V, P, G = unpack((select(2, ...))) +local _G = _G local tinsert = tinsert local tconcat = _G.table.concat @@ -80,7 +81,7 @@ local function configTable() type = "execute", name = L["Changelog"], func = function() - -- mMT:Changelog(true) + mMT:Changelog() end, }, }, diff --git a/core/options/changelog.lua b/core/options/changelog.lua new file mode 100644 index 00000000..794d79bc --- /dev/null +++ b/core/options/changelog.lua @@ -0,0 +1,181 @@ +local mMT, E, L, V, P, G = unpack((select(2, ...))) + +local _G = _G +local tinsert = tinsert +local tconcat = _G.table.concat +local green, blue, yellow, red, endtag = "|CFF00D80E", "|CFF00A9FF", "|CFFFFCC00", "|CFFFF0048", "|r" +local new, fix, update, important, dash = + "|TInterface\\Addons\\ElvUI_mMediaTag\\media\\icons\\misc\\star.tga:14:14|t", + "|TInterface\\Addons\\ElvUI_mMediaTag\\media\\icons\\misc\\done1.tga:14:14|t", + "|TInterface\\Addons\\ElvUI_mMediaTag\\media\\icons\\datatext\\upgrade7.tga:14:14|t", + "|TInterface\\Addons\\ElvUI_mMediaTag\\media\\icons\\tags\\quest2.tga:14:14|t", + "> " + +local change_log_important = { + red .. "!!! Currently only for Retail" .. endtag, + "Code Update", + "The settings will be rest if you update from v2 to v3", + "Removed old and unused Tags", +} + +local change_log_new = { + "Addon Compartment Tooltip", + "Add in Game Changlog", + "New Icons for Dock", + "New Game Menu Icons", + "New Teleport Datatext Icons", + "Custom Ready Check Icons", + "Custom Phase Icons and Color", + "Custom Resurrection icons", + "New Dock Icon for Bags", + "New Quick Setup Menu", +} + +local change_log_update = { + "Update Teleports for Season 2", + "Update Example Dock", +} + +local change_log_fix = { + "Tag update function in Settings menu", +} + +local function Concatenation(tbl, icon, color) + local string = "" + for key, line in pairs(tbl) do + if color then + line = color .. line .. endtag + end + + if icon then + line = icon .. " " .. line + end + + string = string .. dash .. " " .. line .. "\n" + end + return string +end + +local function configTable() + local releasdate = "07.05.2023" + local change_log_important_string = Concatenation(change_log_important) + local change_log_new_string = Concatenation(change_log_new) + local change_log_update_string = Concatenation(change_log_update) + local change_log_fix_string = Concatenation(change_log_fix) + E.Options.args.mMT.args.changelog.args = { + header_changelog = { + order = 1, + type = "group", + inline = true, + name = mMT.IconSquare .. " " .. mMT.Name .. " " .. L["Change Log"], + args = { + header_version = { + order = 1, + type = "group", + inline = true, + name = L["Version:"], + args = { + version = { + order = 1, + type = "description", + fontSize = "medium", + name = green .. mMT.Version .. endtag, + }, + date = { + order = 2, + type = "description", + fontSize = "medium", + name = green .. L["Releas date:"] .. endtag .. " " .. (releasdate or "ERROR"), + }, + }, + }, + header_important = { + order = 2, + type = "group", + inline = true, + name = important .. " " .. red .. L["Important:"] .. endtag, + hidden = function() + if change_log_important_string then + return false + else + return true + end + end, + args = { + important = { + order = 1, + type = "description", + fontSize = "large", + name = change_log_important_string or "", + }, + }, + }, + header_new = { + order = 3, + type = "group", + inline = true, + name = new .. " " .. green .. L["New:"] .. endtag, + hidden = function() + if change_log_new_string then + return false + else + return true + end + end, + args = { + new = { + order = 1, + type = "description", + fontSize = "medium", + name = change_log_new_string or "", + }, + }, + }, + header_update = { + order = 4, + type = "group", + inline = true, + name = update .. " " .. blue .. L["Update:"] .. endtag, + hidden = function() + if change_log_update_string then + return false + else + return true + end + end, + args = { + update = { + order = 1, + type = "description", + fontSize = "medium", + name = change_log_update_string or "", + }, + }, + }, + header_fix = { + order = 5, + type = "group", + inline = true, + name = fix .. " " .. yellow .. L["Fix:"] .. endtag, + hidden = function() + if change_log_fix_string then + return false + else + return true + end + end, + args = { + fix = { + order = 1, + type = "description", + fontSize = "medium", + name = change_log_fix_string or "", + }, + }, + }, + }, + }, + } +end + +tinsert(mMT.Config, configTable) diff --git a/core/options/core.lua b/core/options/core.lua index d0be16f7..2619e298 100644 --- a/core/options/core.lua +++ b/core/options/core.lua @@ -214,6 +214,13 @@ local function configTable() childGroups = "tab", args = {}, }, + unitframeicons = { + order = 6, + type = "group", + name = L["Unitframe Icons"], + childGroups = "tab", + args = {}, + }, -- textures = { -- order = 20, -- type = "group", @@ -231,8 +238,17 @@ local function configTable() args = { }, }, + changelog = { + order = 11, + type = "group", + name = format("|CFFFF0094%s|r", L["Changelog"]), + icon = "Interface\\Addons\\ElvUI_mMediaTag\\media\\system\\changelog.tga", + childGroups = "tab", + args = { + }, + }, setup = { - order = 10, + order = 20, type = "group", name = format("|CFF0094FF%s|r", L["Setup"]), icon = "Interface\\Addons\\ElvUI_mMediaTag\\media\\system\\setup.tga", diff --git a/core/options/dock.lua b/core/options/dock.lua index bee5b4c6..b29024c6 100644 --- a/core/options/dock.lua +++ b/core/options/dock.lua @@ -35,26 +35,6 @@ local function configTable() icons[key] = E:TextureString(icon, ":14:14") .. " " .. key end E.Options.args.mMT.args.dock.args = { - -- header_greeting = { - -- order = 1, - -- type = "group", - -- inline = true, - -- name = L["Welcome text"], - -- args = { - -- toggle_greeting = { - -- order = 2, - -- type = "toggle", - -- name = L["Show Welcome text"], - -- get = function(info) - -- return E.db.mMT.general.greeting - -- end, - -- set = function(info, value) - -- E.db.mMT.general.greeting = value - -- end, - -- }, - -- }, - -- }, - dockgeneral = { order = 10, type = "group", @@ -1678,6 +1658,76 @@ local function configTable() }, }, }, + dockbag = { + order = 220, + type = "group", + name = L["Bags"], + args = { + dockbagicon = { + order = 1, + type = "select", + name = L["Icon"], + get = function(info) + return E.db.mMT.dockdatatext.bag.icon + end, + set = function(info, value) + E.db.mMT.dockdatatext.bag.icon = value + DT:ForceUpdate_DataText("mBags") + end, + values = icons, + }, + dockbagtext = { + order = 2, + type = "select", + name = L["Text to display"], + get = function(info) + return E.db.mMT.dockdatatext.bag.text + end, + set = function(info, value) + E.db.mMT.dockdatatext.bag.text = value + DT:ForceUpdate_DataText("mBags") + end, + values = { + [1] = L["Bag - FREE"], + [2] = L["Bag - USED"], + [3] = L["Bag - FREE/TOTAL"], + [4] = L["GOLD"], + [5] = L["NONE"] + + }, + }, + bagtoggle = { + order = 3, + name = L["Custom color"], + type = "toggle", + get = function(info) + return E.db.mMT.dockdatatext.bag.customcolor + end, + set = function(info, value) + E.db.mMT.dockdatatext.bag.customcolor = value + DT:ForceUpdate_DataText("mBags") + end, + }, + bagcolor = { + type = "color", + order = 4, + name = L["Custom Icon Color"], + hasAlpha = true, + disabled = function() + return not E.db.mMT.dockdatatext.bag.customcolor + end, + get = function(info) + local t = E.db.mMT.dockdatatext.bag.iconcolor + return t.r, t.g, t.b, t.a + end, + set = function(info, r, g, b, a) + local t = E.db.mMT.dockdatatext.bag.iconcolor + t.r, t.g, t.b, t.a = r, g, b, a + DT:ForceUpdate_DataText("mBags") + end, + }, + }, + }, dockexample = { order = 300, type = "group", diff --git a/core/options/load_options.xml b/core/options/load_options.xml index 845ece65..826a71c3 100644 --- a/core/options/load_options.xml +++ b/core/options/load_options.xml @@ -27,4 +27,7 @@