[ver. 3.40] - 05.06.2024 (#102)

## [ver. 3.40] - 05.06.2024 ### FIX - FIX - Removed empty space in Teleports Datatext Menu, and fixed Text formating - FIX - Settings for S Series Texturs to mMT Settings menu - FIX - Error with Execute Marker in Cata, diseabled event in cata, Execute Marker should not load in Cata ### Update - UPDATE - TRILINEAR Filtering for Dock Icons - UPDATE - mMT Datatext Dropdown Menu no can auto adjust size to font size ### NEW - NEW - mMT Datatext Dropdown Menu has now a own fontsize setting - NEW - mMT Portraits can now react on click, like targeting the unit or set it as focus or open unit menu
mBlinkii · Jun 5, 2024 · 157dbc8 · 157dbc8
2 parents 036a049 + 74db483
commit 157dbc8
Show file tree

Hide file tree

Showing 30 changed files with 190 additions and 51 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -586,7 +586,11 @@
         "VoiceTranscriptionFrame_UpdateEditBox",
         "GUILD_EVENT_LOG",
         "WHISPER",
-        "EXPANSION_NAME0"
+        "EXPANSION_NAME0",
+        "ToggleDropDownMenu",
+        "UnregisterUnitWatch",
+        "RegisterStateDriver",
+        "UnregisterStateDriver"
     ],
     "Lua.diagnostics.disable": [
         "undefined-field"

diff --git a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Cata.toc b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Cata.toc
@@ -1,6 +1,6 @@
 ## Interface: 40400
 ## Author: Blinkii
-## Version: 3.39
+## Version: 3.40
 ## Title: |CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|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
 ## IconTexture: Interface\AddOns\ElvUI_mMediaTag\media\logo\mmt_icon
 ## AddonCompartmentFunc: ElvUI_mMediaTag_OnAddonCompartmentClick

diff --git a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Classic.toc b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Classic.toc
@@ -1,6 +1,6 @@
 ## Interface: 11502
 ## Author: Blinkii
-## Version: 3.39
+## Version: 3.40
 ## Title: |CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|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: mMediaTag & Tools is a plugin for ElvUI. mMediaTag adds many media files like textures/ fonts/ icons and some tools to ElvUI.
 ## Notes-deDE: mMediaTag & Tools ist ein Plugin für ElvUI. mMediaTag fügt viele Mediendateien wie Texturen/ Schriften/ Symbole und einige Tools zu ElvUI hinzu.

diff --git a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Mainline.toc b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Mainline.toc
@@ -1,6 +1,6 @@
 ## Interface: 100207
 ## Author: Blinkii
-## Version: 3.39
+## Version: 3.40
 ## Title: |CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|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: [email protected]
 ## IconTexture: Interface\AddOns\ElvUI_mMediaTag\media\logo\mmt_icon

diff --git a/Addon/ElvUI_mMediaTag/core/dropdown.lua b/Addon/ElvUI_mMediaTag/core/dropdown.lua
@@ -52,7 +52,7 @@ end
 -- text = string, Secondtext = string, color = color string for first text, icon = texture, func = function, funcOnEnter = function,
 -- funcOnLeave = function, isTitle = bolean, macro = macrotext, tooltip = id or var you can use for the functions, notClickable = bolean
 function mMT:mDropDown(list, frame, menuparent, ButtonWidth, HideDelay)
-	local SAVE_HEIGHT = E.db.general.fontSize / 3 + 16
+	local SAVE_HEIGHT = (E.db.mMT.general.datatextfontsize or E.db.general.fontSize) / 3 + 16
 	local BUTTON_HEIGHT = 0
 	local BUTTON_WIDTH = 0
 
@@ -112,14 +112,14 @@ function mMT:mDropDown(list, frame, menuparent, ButtonWidth, HideDelay)
 		if list[i].text then
 			frame.buttons[i].text = frame.buttons[i]:CreateFontString(nil, "BORDER")
 			frame.buttons[i].text:SetAllPoints()
-			frame.buttons[i].text:FontTemplate(nil, nil, "")
+			frame.buttons[i].text:FontTemplate(nil, E.db.mMT.general.datatextfontsize, "")
 			frame.buttons[i].text:SetJustifyH("LEFT")
 		end
 
 		if list[i].Secondtext then
 			frame.buttons[i].Secondtext = frame.buttons[i]:CreateFontString(nil, "BORDER")
 			frame.buttons[i].Secondtext:SetAllPoints()
-			frame.buttons[i].Secondtext:FontTemplate(nil, nil, "")
+			frame.buttons[i].Secondtext:FontTemplate(nil, E.db.mMT.general.datatextfontsize, "")
 			frame.buttons[i].Secondtext:SetJustifyH("RIGHT")
 		end
 
@@ -186,7 +186,7 @@ function mMT:mDropDown(list, frame, menuparent, ButtonWidth, HideDelay)
 		frame.buttons[i]:Width(BUTTON_WIDTH + 2)
 	end
 
-	frame:Height((#list * BUTTON_HEIGHT + PADDING * 2) - BUTTON_HEIGHT)
+	frame:Height((#list * BUTTON_HEIGHT + PADDING * 2))
 	frame:Width(BUTTON_WIDTH + PADDING * 2)
 	frame:ClearAllPoints()
 

diff --git a/Addon/ElvUI_mMediaTag/core/options/changelog.lua b/Addon/ElvUI_mMediaTag/core/options/changelog.lua
@@ -16,28 +16,22 @@ local change_log_important = {
 	"This update will reset the Spell DB."
 }
 
-local releasdate = "31.05.2024"
+local releasdate = "05.06.2024"
 
 local change_log_new = {
-	"Statusbar Texture Pack Series S",
-	"Custom Unitframe Textures for Health, Power and Castbar",
-	"Healthmarkers now are available in Cata",
-	"Minimap Instance Difficuty is now available in Cata"
+	"mMT Datatext Dropdown Menu has now a own fontsize setting",
+	"mMT Portraits can now react on click, like targeting the unit or set it as focus or open unit menu"
 }
 
 local change_log_update = {
-	"Update Healthmarkers",
-	"Updated the Settings visibility for Cata",
-	"Firstaid is now available in the Professions Menulist in Cata",
-	"Dock Friends to take care of the changes in ElvUI",
-	"mMT - Dropdown menu, changes now automaticly width and height deppending on font size"
+	"TRILINEAR Filtering for Dock Icons",
+	"mMT Datatext Dropdown Menu no can auto adjust size to font size",
 }
 
 local change_log_fix = {
-	"Portraits Background Settings is only available when Class Icons are enabled",
-	"Missing module Error in Cata",
-	"Bug with Instance Difficulty for Datatexts and Dock in Cata",
-	"Bug with Dock Guild and Friends in Cata"
+	"Removed empty space in Teleports Datatext Menu, and fixed Text formating",
+	"Add Settings for S Series Texturs to mMT Settings menu",
+	"Error with Execute Marker in Cata, diseabled event in cata, Execute Marker should not load in Cata",
 }
 
 local function Concatenation(tbl, icon, color)

diff --git a/Addon/ElvUI_mMediaTag/core/options/core.lua b/Addon/ElvUI_mMediaTag/core/options/core.lua
@@ -84,11 +84,25 @@ local function configTable()
 				icon = "Interface\\Addons\\ElvUI_mMediaTag\\media\\system\\datatexts.tga",
 				childGroups = "tab",
 				args = {
-					colors = {
+					settings = {
 						order = 1,
 						type = "group",
-						name = mMT.NameShort .. " " .. L["Datatext Colors"],
-						args = {},
+						name = L["Datatext Settings"],
+						childGroups = "tab",
+						args = {
+							colors = {
+								order = 1,
+								type = "group",
+								name = L["Datatext Colors"],
+								args = {},
+							},
+							font = {
+								order = 1,
+								type = "group",
+								name = L["Font"],
+								args = {},
+							},
+						},
 					},
 					combat = {
 						order = 2,

diff --git a/Addon/ElvUI_mMediaTag/core/options/datatextcolors.lua b/Addon/ElvUI_mMediaTag/core/options/datatextcolors.lua
@@ -3,7 +3,7 @@ local L = mMT.Locales
 
 local tinsert = tinsert
 local function configTable()
-	E.Options.args.mMT.args.datatexts.args.colors.args = {
+	E.Options.args.mMT.args.datatexts.args.settings.args.colors.args = {
 		header_colors = {
 			order = 1,
 			type = "group",
@@ -120,4 +120,4 @@ local function configTable()
 	}
 end
 
-tinsert(mMT.Config, configTable)
+tinsert(mMT.Config, configTable)
diff --git a/Addon/ElvUI_mMediaTag/core/options/datatextfont.lua b/Addon/ElvUI_mMediaTag/core/options/datatextfont.lua
@@ -0,0 +1,34 @@
+local E = unpack(ElvUI)
+local L = mMT.Locales
+
+local tinsert = tinsert
+local function configTable()
+	E.Options.args.mMT.args.datatexts.args.settings.args.font.args = {
+		header_font = {
+			order = 1,
+			type = "group",
+			inline = true,
+			name = L["Font Settings"],
+			args = {
+				fontsize = {
+					order = 1,
+					name = L["Font Size"],
+					type = "range",
+					min = 1,
+					max = 64,
+					step = 1,
+					softMin = 8,
+					softMax = 32,
+					get = function(info)
+						return E.db.mMT.general.datatextfontsize
+					end,
+					set = function(info, value)
+						E.db.mMT.general.datatextfontsize = value
+					end,
+				},
+			},
+		},
+	}
+end
+
+tinsert(mMT.Config, configTable)
diff --git a/Addon/ElvUI_mMediaTag/core/options/load_options.xml b/Addon/ElvUI_mMediaTag/core/options/load_options.xml
@@ -39,6 +39,7 @@
 	<Script file="durabilityanditemlevel.lua"/>
 	<Script file="firstandsecondprofession.lua"/>
 	<Script file="datapanels.lua"/>
+	<Script file="datatextfont.lua"/>
 	<Script file="uftextures.lua"/>
 	<Script file="questicons.lua"/>
 </Ui>
diff --git a/Addon/ElvUI_mMediaTag/core/options/textures.lua b/Addon/ElvUI_mMediaTag/core/options/textures.lua
@@ -68,6 +68,7 @@ local function configTable()
 						db.p = false
 						db.q = false
 						db.r = false
+						db.s = false
 						E:StaticPopup_Show("CONFIG_RL")
 					end,
 				},
@@ -349,6 +350,21 @@ local function configTable()
 						E:StaticPopup_Show("CONFIG_RL")
 					end,
 				},
+				toggle_s = {
+					order = 19,
+					type = "toggle",
+					name = L["Load Pack"] .. " S",
+					disabled = function()
+						return mMTSettings.textures.all
+					end,
+					get = function(info)
+						return mMTSettings.textures.s
+					end,
+					set = function(info, value)
+						mMTSettings.textures.s = value
+						E:StaticPopup_Show("CONFIG_RL")
+					end,
+				},
 			},
 		},
 		preview = {

diff --git a/Addon/ElvUI_mMediaTag/core/settings/defaultSettings.lua b/Addon/ElvUI_mMediaTag/core/settings/defaultSettings.lua
@@ -2,7 +2,7 @@ local E, L, V, P, G = unpack(ElvUI)
 
 P.mMT = {
 	version = 0,
-	general = { greeting = true, keystochat = false, emediaenable = false },
+	general = { greeting = true, keystochat = false, emediaenable = false, datatextfontsize = 12 },
 	afk = {
 		enable = false,
 		logo = false,

diff --git a/Addon/ElvUI_mMediaTag/init.lua b/Addon/ElvUI_mMediaTag/init.lua
@@ -2,8 +2,7 @@ local E, _, V, P, G = unpack(ElvUI)
 local EP = E.Libs.EP
 
 local _G = _G
-local tinsert, type = tinsert, type
-local print = print
+local tinsert = tinsert
 
 local collectgarbage = collectgarbage
 local GetAddOnMetadata = _G.C_AddOns and _G.C_AddOns.GetAddOnMetadata or _G.GetAddOnMetadata
@@ -225,7 +224,7 @@ function mMT:Initialize()
 			self:RegisterEvent("CHAT_MSG_GUILD")
 		end
 
-		if (E.private.nameplates.enable and E.db.mMT.nameplate.executemarker.auto) or E.db.mMT.interruptoncd.enable then
+		if E.Retail and (E.private.nameplates.enable and E.db.mMT.nameplate.executemarker.auto) or E.db.mMT.interruptoncd.enable then
 			self:RegisterEvent("PLAYER_TALENT_UPDATE")
 		end
 

diff --git a/Addon/ElvUI_mMediaTag/localization/deDE.lua b/Addon/ElvUI_mMediaTag/localization/deDE.lua
@@ -168,6 +168,7 @@ L["DataTexts"] = "Infotexte"
 L["Datapanels"] = "Infotext Leisten"
 L["Datatext Colors"] = "Infotext Farben"
 L["Datatext Options Color (Tooltip)"] = "Infotext Einstellungen - Farben (Tooltip)"
+L["Datatext Settings"] = "Datentext Einstellungen"
 L["Date Style"] = "Datumsformat"
 L["Dead"] = "Tot"
 L["Death Counter color."] = "Todeszähler Farbe."
@@ -301,6 +302,7 @@ L["Filter Name"] = "Filtername"
 L["First and Second Profession"] = "Erster und Zweiter Beruf"
 L["Fix:"] = true
 L["Focus"] = "Fokus"
+L["Font Settings"] = "Schriftart Einstellungen"
 L["Font Size"] = "Schriftgröße"
 L["Font contour"] = "Schriftart Kontur"
 L["Font"] = "Schriftart"

diff --git a/Addon/ElvUI_mMediaTag/localization/enUS.lua b/Addon/ElvUI_mMediaTag/localization/enUS.lua
@@ -680,4 +680,6 @@ L["Enable Custom Power Texture"] = true
 L["Custom Castbar Texture"] = true
 L["Enable Custom Castbar Texture"] = true
 L["Custom Alternative Power Texture"] = true
-L["Enable Custom Alternative Power Texture"] = true
+L["Enable Custom Alternative Power Texture"] = true
+L["Datatext Settings"] = true
+L["Font Settings"] = true
diff --git a/Addon/ElvUI_mMediaTag/localization/esMX.lua b/Addon/ElvUI_mMediaTag/localization/esMX.lua
@@ -680,4 +680,6 @@ L["Enable Custom Power Texture"] = true
 L["Custom Castbar Texture"] = true
 L["Enable Custom Castbar Texture"] = true
 L["Custom Alternative Power Texture"] = true
-L["Enable Custom Alternative Power Texture"] = true
+L["Enable Custom Alternative Power Texture"] = true
+L["Datatext Settings"] = true
+L["Font Settings"] = true
diff --git a/Addon/ElvUI_mMediaTag/localization/frFR.lua b/Addon/ElvUI_mMediaTag/localization/frFR.lua
@@ -679,4 +679,6 @@ L["Enable Custom Power Texture"] = true
 L["Custom Castbar Texture"] = true
 L["Enable Custom Castbar Texture"] = true
 L["Custom Alternative Power Texture"] = true
-L["Enable Custom Alternative Power Texture"] = true
+L["Enable Custom Alternative Power Texture"] = true
+L["Datatext Settings"] = true
+L["Font Settings"] = true
diff --git a/Addon/ElvUI_mMediaTag/localization/itIT.lua b/Addon/ElvUI_mMediaTag/localization/itIT.lua
@@ -680,4 +680,6 @@ L["Enable Custom Power Texture"] = true
 L["Custom Castbar Texture"] = true
 L["Enable Custom Castbar Texture"] = true
 L["Custom Alternative Power Texture"] = true
-L["Enable Custom Alternative Power Texture"] = true
+L["Enable Custom Alternative Power Texture"] = true
+L["Datatext Settings"] = true
+L["Font Settings"] = true
diff --git a/Addon/ElvUI_mMediaTag/localization/koKR.lua b/Addon/ElvUI_mMediaTag/localization/koKR.lua
@@ -680,4 +680,6 @@ L["Enable Custom Power Texture"] = true
 L["Custom Castbar Texture"] = true
 L["Enable Custom Castbar Texture"] = true
 L["Custom Alternative Power Texture"] = true
-L["Enable Custom Alternative Power Texture"] = true
+L["Enable Custom Alternative Power Texture"] = true
+L["Datatext Settings"] = true
+L["Font Settings"] = true
diff --git a/Addon/ElvUI_mMediaTag/localization/ptBR.lua b/Addon/ElvUI_mMediaTag/localization/ptBR.lua
@@ -680,4 +680,6 @@ L["Enable Custom Power Texture"] = true
 L["Custom Castbar Texture"] = true
 L["Enable Custom Castbar Texture"] = true
 L["Custom Alternative Power Texture"] = true
-L["Enable Custom Alternative Power Texture"] = true
+L["Enable Custom Alternative Power Texture"] = true
+L["Datatext Settings"] = true
+L["Font Settings"] = true
diff --git a/Addon/ElvUI_mMediaTag/localization/ruRU.lua b/Addon/ElvUI_mMediaTag/localization/ruRU.lua
@@ -680,4 +680,6 @@ L["Enable Custom Power Texture"] = true
 L["Custom Castbar Texture"] = true
 L["Enable Custom Castbar Texture"] = true
 L["Custom Alternative Power Texture"] = true
-L["Enable Custom Alternative Power Texture"] = true
+L["Enable Custom Alternative Power Texture"] = true
+L["Datatext Settings"] = true
+L["Font Settings"] = true
diff --git a/Addon/ElvUI_mMediaTag/localization/zhCN.lua b/Addon/ElvUI_mMediaTag/localization/zhCN.lua
@@ -680,4 +680,6 @@ L["Enable Custom Power Texture"] = true
 L["Custom Castbar Texture"] = true
 L["Enable Custom Castbar Texture"] = true
 L["Custom Alternative Power Texture"] = true
-L["Enable Custom Alternative Power Texture"] = true
+L["Enable Custom Alternative Power Texture"] = true
+L["Datatext Settings"] = true
+L["Font Settings"] = true
diff --git a/Addon/ElvUI_mMediaTag/localization/zhTW.lua b/Addon/ElvUI_mMediaTag/localization/zhTW.lua
@@ -680,4 +680,6 @@ L["Enable Custom Power Texture"] = true
 L["Custom Castbar Texture"] = true
 L["Enable Custom Castbar Texture"] = true
 L["Custom Alternative Power Texture"] = true
-L["Enable Custom Alternative Power Texture"] = true
+L["Enable Custom Alternative Power Texture"] = true
+L["Datatext Settings"] = true
+L["Font Settings"] = true
diff --git a/Addon/ElvUI_mMediaTag/media/portraits/unknown.tga b/Addon/ElvUI_mMediaTag/media/portraits/unknown.tga
diff --git a/Addon/ElvUI_mMediaTag/media/portraits/unknownB.tga b/Addon/ElvUI_mMediaTag/media/portraits/unknownB.tga
diff --git a/Addon/ElvUI_mMediaTag/modules/Dock/mDockFunctions.lua b/Addon/ElvUI_mMediaTag/modules/Dock/mDockFunctions.lua
@@ -235,7 +235,7 @@ function mMT:InitializeDockIcon(DT, conf, event)
 
 	-- setup icon
 	DT.mMT_Dock.Icon:Size(DT.mMT_Dock.size, DT.mMT_Dock.size)
-	DT.mMT_Dock.Icon:SetTexture(conf.icon.texture)
+	DT.mMT_Dock.Icon:SetTexture(conf.icon.texture, "CLAMP", "CLAMP", "TRILINEAR")
 	mMT:SetTextureColor(DT.mMT_Dock.Icon, conf.icon.color or Defaults.normal)
 
 	-- create texts
@@ -289,7 +289,7 @@ function mMT:InitializeDockIcon(DT, conf, event)
 		-- setup icon
 		local size = Defaults.nfauto and ((DT:GetHeight() + 4) / 4) or Defaults.nfsize
 		DT.mMT_Dock.Notification:Size(size, size)
-		DT.mMT_Dock.Notification:SetTexture(Defaults.nficon)
+		DT.mMT_Dock.Notification:SetTexture(Defaults.nficon, "CLAMP", "CLAMP", "TRILINEAR")
 		mMT:SetTextureColor(DT.mMT_Dock.Notification, Defaults.nfcolor)
 		DT.mMT_Dock.Notification:Hide()
 	elseif DT.mMT_Dock.Notification then

diff --git a/Addon/ElvUI_mMediaTag/modules/datatexts/Teleports.lua b/Addon/ElvUI_mMediaTag/modules/datatexts/Teleports.lua
@@ -427,7 +427,6 @@ local function mUpdateTPList(button)
 		tinsert(Teleports.menu, { text = format("%s%s|r", title, L["DF Dungeons"]), isTitle = true, notClickable = true })
 
 		mGetInfos(Teleports.df, true, false, false)
-		tinsert(Teleports.menu, { text = "", isTitle = true, notClickable = true })
 	end
 
 	if Teleports.dungeonportals.available and button == "MiddleButton" then

diff --git a/Addon/ElvUI_mMediaTag/modules/misc/afk.lua b/Addon/ElvUI_mMediaTag/modules/misc/afk.lua
@@ -111,7 +111,7 @@ local function UpdateTexts()
 		PlayerStats.progress.title = L["Progress"]
 
 		if E.Retail then
-			tinsert(PlayerStats.progress.lines, DUNGEON_SCORE .. "|CFFFFFFFF:|r" .. mMT:GetDungeonScore())
+			tinsert(PlayerStats.progress.lines, DUNGEON_SCORE .. ": " .. mMT:GetDungeonScore())
 		end
 
 		PlayerStats.attributes.title = STAT_CATEGORY_ATTRIBUTES