Skip to content

Commit 18a456d

Browse files
NumynumNumynum
committed
Removed some old unused code, and removed /mtc since it doesn't work (closes #84)
1 parent aedfb7c commit 18a456d

20 files changed

Lines changed: 2 additions & 370 deletions

‎.pkgmeta‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ externals:
1414
MacroToolkit/libs/AceLocale-3.0: https://repos.wowace.com/wow/ace3/trunk/AceLocale-3.0
1515
MacroToolkit/libs/AceTimer-3.0: https://repos.wowace.com/wow/ace3/trunk/AceTimer-3.0
1616
MacroToolkit/libs/CallbackHandler-1.0: https://repos.wowace.com/wow/ace3/trunk/CallbackHandler-1.0
17-
MacroToolkit/libs/LibDataBroker-1.1: https://github.com/tekkub/libdatabroker-1-1
1817
MacroToolkit/libs/LibSharedMedia-3.0: https://repos.wowace.com/wow/libsharedmedia-3-0/trunk/LibSharedMedia-3.0
1918
MacroToolkit/libs/LibStub: https://repos.wowace.com/wow/ace3/trunk/LibStub
2019
MacroToolkit/libs/LibTalentTree-1.0:

‎MacroToolkit/MacroToolkit.lua‎

Lines changed: 2 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,6 @@ local exFormat = "%s%s%s [btn:1]%s LeftButton 1;[btn:2]%s RightButton 1;[btn:3]%
1818
local ChatEdit_InsertLink = ChatFrameUtil and ChatFrameUtil.InsertLink or ChatEdit_InsertLink
1919
local SendChatMessage = C_ChatInfo and C_ChatInfo.SendChatMessage or SendChatMessage
2020

21-
-- GLOBALS: ChatEdit_InsertLink StaticPopupDialogs SpellBookFrame MacroToolkitText MacroToolkitEnterText MacroToolkitFauxText MacroToolkitSelMacroName MacroToolkitSelBg MacroToolkitDelete
22-
-- GLOBALS: MacroToolkitExtend MacroToolkitShorten MacroToolkitSelMacroButton MacroToolkitLimit MacroToolkitEdit MacroToolkitCopy GameTooltip MacroToolkitBind MacroToolkitConditions
23-
-- GLOBALS: MacroToolkitShare MacroToolkitClear MacroToolkitBackup MacroToolkitBrokerIcon MacroToolkitNew MacroToolkitCSelMacroName MacroToolkitSelMacroButton.Icon MacroToolkitCText
24-
-- GLOBALS: MacroToolkitCFauxText MacroToolkitCSelMacroButton MacroToolkitCSelMacroButton.Icon MacroToolkitBrokerButton MacroToolkitCopyButton MacroToolkitDB MacroToolkitButton1Name
25-
-- GLOBALS: MacroToolkitErrors MacroToolkitErrorIcon DEFAULT_CHAT_FRAME SendChatMessage SlashCmdList MacroFrame MacroDeleteButton TradeSkillLinkButton MacroToolkitFauxScrollFrame
26-
-- GLOBALS: MacroToolkitErrorBg MacroToolkitErrorScrollFrame ChatEdit_GetActiveWindow MacroFrameText ShowCloak ShowingCloak ShowHelm ShowingHelm CanEjectPassengerFromSeat
27-
-- GLOBALS: EjectPassengerFromSeat UIErrorsFrame SetMapToCurrentZone VehicleExit GetPlayerMapPosition SummonRandomCritter C_MountJournal ToggleDropDownMenu TradeSkillLinkDropDown
28-
-- GLOBALS: GetTradeSkillListLink LoadAddOn ShowMacroFrame IsAddOnLoaded
29-
3021
-- "extended" macros will no longer work beyond the 255 character limit, so we won't support extending macros, only un-extending them
3122
MT.extendedMacrosSupported = select(4, GetBuildInfo()) == 40400; -- right now, only cata 4.4.0 supports extended macros
3223

@@ -41,7 +32,7 @@ MT.defaults = {
4132
commandcolour = "ff00bfff", spellcolour = "ff9932cc", targetcolour = "ffffd700",
4233
conditioncolour = "ff8b5a2b", defaultcolour = "ffffffff", errorcolour = "ffff0000",
4334
itemcolour = "fff08080", mtcolour = "ffcd2ea9", seqcolour ="ff006600", comcolour="ff00aa00",
44-
usecolours = true, unknown = false, replacemt = true, doublewide = false, broker = false,
35+
usecolours = true, unknown = false, replacemt = true, doublewide = false,
4536
viscondtions = true, visoptionsbutton = true, viscustom = true, hidepopup = false,
4637
visaddscript = true, visaddslot = true, viscrest = false,
4738
visbackup = true, visclear = true, visshare = true, useiconlib = true,
@@ -58,7 +49,7 @@ MT.defaults = {
5849
mfont = "Friz Quadrata TT", mifont = "Friz Quadrata TT", misize = 10},
5950
},
6051
global = {custom = {}, extended = {}, extra = {}, allcharmacros = true},
61-
char = {extended = {}, wodupgrade = false, brokers = {}, macros = {}},
52+
char = {extended = {}, wodupgrade = false, macros = {}},
6253
}
6354

6455
local function showtoolkit()
@@ -277,9 +268,6 @@ function MT:eventHandler(this, event, arg1, ...)
277268
if C_AddOns.IsAddOnLoaded("ElvUI") then MT:ApplyElvSkin() end
278269
MT.AC = MT.LS("AceComm-3.0")
279270
MT.AC:RegisterComm("MacroToolkit", function(...) MT:ReceiveMacro(...) end)
280-
if countTables(MT.db.char.brokers) > 0 then
281-
for b, d in pairs(MT.db.char.brokers) do MT:CreateBrokerObject(b, d.label) end
282-
end
283271

284272
if MacroToolkit.db.profile.useiconlib == true then
285273
--Try loading the data addon
@@ -352,7 +340,6 @@ function MT:DoMTMacroCommand(command, parameters)
352340
if command == "mtce" then UIErrorsFrame:Clear()
353341
elseif command == "mteo" then UIErrorsFrame:RegisterEvent("UI_ERROR_MESSAGE")
354342
elseif command == "mtex" then UIErrorsFrame:UnregisterEvent("UI_ERROR_MESSAGE")
355-
elseif command == "mtc" then MT:Eval(parameters)
356343
elseif command == "mtrp" then SummonRandomCritter()
357344
elseif command == "mtso" then SetCVar("Sound_EnableSFX", 1)
358345
elseif command == "mtsx" then SetCVar("Sound_EnableSFX", 0)
@@ -876,35 +863,6 @@ function MT:MacroFrameUpdate()
876863
MacroToolkitCSelMacroButton:SetID(i)
877864
MacroToolkitCSelMacroButton.Icon:SetTexture(texture)
878865
end
879-
-- disabled broker code (issue #37)
880-
--if MT.db.profile.broker then
881-
-- local result, cmd = _G.ERR_NOT_IN_COMBAT, ""
882-
-- if not InCombatLockdown() then result, cmd = MT:RunCommands(true, body) end
883-
-- local mname = MacroToolkitSelMacroName:GetText()
884-
-- if result then
885-
-- MT.brokericon:SetTexture("Interface\\COMMON\\Indicator-Red")
886-
-- MacroToolkitBrokerIcon:SetScript("OnEnter",
887-
-- function(this)
888-
-- GameTooltip:SetOwner(this, "ANCHOR_RIGHT")
889-
-- GameTooltip:SetText("Macro Toolkit Broker")
890-
-- GameTooltip:AddLine(format("|cffff0000%s|r", cmd))
891-
-- GameTooltip:AddLine(format("|cffffffffReason: |cff4466cc%s|r", result))
892-
-- GameTooltip:Show()
893-
-- end)
894-
-- MTF.brokerok = false
895-
-- if MT:FindBrokerName(mname) then MT:BrokerRemove()
896-
-- else MacroToolkitBrokerButton:Hide() end
897-
-- else
898-
-- MT.brokericon:SetTexture("Interface\\COMMON\\Indicator-Green")
899-
-- MacroToolkitBrokerIcon:SetScript("OnEnter", nil)
900-
-- if MT:FindBrokerName(mname) then MT:BrokerRemove()
901-
-- else MT:BrokerAdd() end
902-
-- MTF.brokerok = true
903-
-- end
904-
-- MacroToolkitBrokerIcon:Show()
905-
--else
906-
MacroToolkitBrokerIcon:Hide()
907-
--end
908866
else macroButton:SetChecked(false) end
909867
if tab == 4 then macroButton.extended = exmacros[i].extended end
910868
else
@@ -937,7 +895,6 @@ function MT:MacroFrameUpdate()
937895
MacroToolkitShare:Disable()
938896
MacroToolkitBind:Disable()
939897
MacroToolkitConditions:Disable()
940-
MacroToolkitBrokerIcon:Hide()
941898
end
942899

943900
--Update New Button

‎MacroToolkit/MacroToolkit.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,4 @@ https://raw.githubusercontent.com/Gethe/wow-ui-source/refs/heads/live/Interface/
2626
</Scripts>
2727
</CheckButton>
2828

29-
<Script file="modules\macrobroker.lua"/>
30-
<EditBox name="MacroToolkit_EditBoxTemplate" inherits="ChatFrameEditBoxTemplate" hidden="true" virtual="true">
31-
<Scripts>
32-
<OnLoad>
33-
self.chatFrame = DEFAULT_CHAT_FRAME;
34-
ChatEdit_OnLoad(self);
35-
self.chatFrame = MacroToolkit:fauxChatFrame()
36-
</OnLoad>
37-
</Scripts>
38-
</EditBox>
3929
</Ui>

‎MacroToolkit/embeds.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,5 @@ https://raw.githubusercontent.com/Gethe/wow-ui-source/refs/heads/live/Interface/
1111
<Include file="libs\AceTimer-3.0\AceTimer-3.0.xml"/>
1212
<Include file="libs\LibSharedMedia-3.0\lib.xml"/>
1313
<Include file="libs\AceGUI-3.0-SharedMediaWidgets\widget.xml"/>
14-
<Script file="libs\LibDataBroker-1.1\LibDataBroker-1.1.lua"/>
1514
<Include file="libs\LibTalentTree-1.0\LibTalentTree-1.0.xml"/>
1615
</Ui>

‎MacroToolkit/locales/deDE.lua‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ L["%s is trying to send you a macro. Accept?"] = "%s versucht Dir ein Makro zuzu
88
L["(experimental)"] = "(experimental)"
99
L["Ability icons"] = "F\195\164higkeitssymbole"
1010
L["Achievement icons"] = "Erfolgssymbole"
11-
L["Add broker"] = "Broker hinzuf\195\188gen"
1211
L["Additional conditions"] = "Zus\195\164tzliche Bedingungen"
1312
L["alt"] = "ALT"
1413
L["Are you sure? This operation cannot be undone."] = "Bist Du Dir sicher? Dieser Vorgang kann nicht r\195\188ckg\195\164ngig gemacht werden."
@@ -37,8 +36,6 @@ L["Commands"] = "Befehle"
3736
--Translation missing
3837
L["Comments"] = "Comments"
3938
L["Condition Builder"] = "Bedingung Erstellen"
40-
--Translation missing
41-
L["Conditional execution"] = "Conditional execution"
4239
L["Conditions"] = "Bedingungen"
4340
--Translation missing
4441
L["Control which icons are available to pick for macros"] = "Control which icons are available to pick for macros"
@@ -70,8 +67,6 @@ L["Editor font"] = "Editor Font"
7067
L["Eject passenger"] = "Passagier auswerfen."
7168
L["Emotes"] = true
7269
--Translation missing
73-
L["Enable certain types of macro to be called via a data broker addon"] = "Enable certain types of macro to be called via a data broker addon"
74-
L["Enable data broker"] = "Data-Broker aktivieren"
7570
L["Enable sound effects"] = "Soundeffekte aktivieren"
7671
--Translation missing
7772
L["Enable UI errors"] = "Enable UI errors"
@@ -215,7 +210,6 @@ L["Question mark icon"] = "Fragezeichensymbol"
215210
L["raid"] = "in your raid group"
216211
L["Raid marker"] = "Raid Marker"
217212
L["Random non-combat pet"] = "Zuf\195\164lliges Nicht-Kampf-Haustier"
218-
L["Remove broker"] = "Broker entfernen"
219213
L["Replace known scripts with Macro Toolkit slash commands"] = "Ersetze bekannte Scripts mit MacroToolkit Slash-Befehlen"
220214
L["Replace scripts with slash command"] = "Ersetze Scripts mit Slash-Befehlen"
221215
L["Report to"] = "Bericht an"

‎MacroToolkit/locales/enUS.lua‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,8 @@ L["You will need to log into each of your characters with Macro Toolkit enabled
131131
L["This will remove Macro Toolkit's copy of all your character specific Macros. The macros themselves will not be affected."] = true
132132
L["Summon random favourite mount"] = true
133133
L["Print a message"] = true
134-
L["Enable data broker"] = true
135-
L["Enable certain types of macro to be called via a data broker addon"] = true
136-
L["Add broker"] = true
137-
L["Remove broker"] = true
138134
L["Do not skin for ElvUI"] = true
139135
L["Requires a UI reload to take effect"] = true
140-
L["Conditional execution"] = true
141136
L["Cannot execute secure commands"] = true
142137
L["Macro Toolkit can only handle tooltip commands up to a maximum of %d characters. Your tooltip will not work as expected unless you shorten it"] = true
143138
L["Are you sure you want to delete %s?"] = true

‎MacroToolkit/locales/esES.lua‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ L["%s is trying to send you a macro. Accept?"] = "%s te ha enviado un macro. \19
88
L["(experimental)"] = "(experimental)"
99
L["Ability icons"] = "Iconos de habilidades"
1010
L["Achievement icons"] = "Iconos de logros"
11-
L["Add broker"] = "A\195\177adir DataBroker"
1211
L["Additional conditions"] = "Condicionales adicionales"
1312
L["alt"] = true
1413
L["Are you sure? This operation cannot be undone."] = "\194\191Est\195\161s seguro? Esta operaci\195\179n no se puede deshacer."
@@ -36,7 +35,6 @@ L["Commands"] = "Comandos"
3635
--Translation missing
3736
L["Comments"] = "Comments"
3837
L["Condition Builder"] = "Constructor de condiciones"
39-
L["Conditional execution"] = "Ejecuci\195\179n condicional"
4038
L["Conditions"] = "Condiciones"
4139
L["Control which icons are available to pick for macros"] = "Controlar qu\195\169 iconos que puedes seleccionar en macros."
4240
L["Copy an extended macro from another character"] = "Copiar un macro extendido por un otro personaje"
@@ -63,8 +61,6 @@ L["Do not skin for ElvUI"] = "No cambiar apariencia por ElvUI"
6361
L["Editor font"] = "Fuente para editor"
6462
L["Eject passenger"] = "Expulsar pasajero"
6563
L["Emotes"] = true
66-
L["Enable certain types of macro to be called via a data broker addon"] = "Permitir que algunos tipos de macros para ser invocados por un addon de DataBroker."
67-
L["Enable data broker"] = "Activar DataBroker"
6864
L["Enable sound effects"] = "Activar efectos de sonido"
6965
L["Enable UI errors"] = "Activar errores de UI"
7066
L["Enhanced macro frame with additional tools"] = "Marco de macros mejorado con herramientas adicionales"
@@ -171,7 +167,6 @@ L["Question mark icon"] = "Signo de interrogaci\195\179n"
171167
L["raid"] = "en tu grupo de raid"
172168
L["Raid marker"] = "Marcador de raid"
173169
L["Random non-combat pet"] = "Mascota aleatoria mansa"
174-
L["Remove broker"] = "Eliminar DataBroker"
175170
L["Replace known scripts with Macro Toolkit slash commands"] = "Reemplaza scripts conocidos por comandos barra de Macro Toolkit"
176171
L["Replace scripts with slash command"] = "Reemplaza scripts por comandos barra"
177172
L["Report to"] = "Reportar a "

‎MacroToolkit/locales/esMX.lua‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ L["Ability icons"] = "Ability icons"
1313
--Translation missing
1414
L["Achievement icons"] = "Achievement icons"
1515
--Translation missing
16-
L["Add broker"] = "Add broker"
17-
--Translation missing
1816
L["Additional conditions"] = "Additional conditions"
1917
--Translation missing
2018
L["alt"] = "alt"
@@ -67,8 +65,6 @@ L["Comments"] = "Comments"
6765
--Translation missing
6866
L["Condition Builder"] = "Condition Builder"
6967
--Translation missing
70-
L["Conditional execution"] = "Conditional execution"
71-
--Translation missing
7268
L["Conditions"] = "Conditions"
7369
--Translation missing
7470
L["Control which icons are available to pick for macros"] = "Control which icons are available to pick for macros"
@@ -118,10 +114,6 @@ L["Eject passenger"] = "Eject passenger"
118114
--Translation missing
119115
L["Emotes"] = "Emotes"
120116
--Translation missing
121-
L["Enable certain types of macro to be called via a data broker addon"] = "Enable certain types of macro to be called via a data broker addon"
122-
--Translation missing
123-
L["Enable data broker"] = "Enable data broker"
124-
--Translation missing
125117
L["Enable sound effects"] = "Enable sound effects"
126118
--Translation missing
127119
L["Enable UI errors"] = "Enable UI errors"
@@ -324,8 +316,6 @@ L["Raid marker"] = "Raid marker"
324316
--Translation missing
325317
L["Random non-combat pet"] = "Random non-combat pet"
326318
--Translation missing
327-
L["Remove broker"] = "Remove broker"
328-
--Translation missing
329319
L["Replace known scripts with Macro Toolkit slash commands"] = "Replace known scripts with Macro Toolkit slash commands"
330320
--Translation missing
331321
L["Replace scripts with slash command"] = "Replace scripts with slash command"

‎MacroToolkit/locales/frFR.lua‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ L["%s is trying to send you a macro. Accept?"] = "%s veut vous envoyer une macro
88
L["(experimental)"] = "(experimental)"
99
L["Ability icons"] = "Ic\195\180ne de capacit\195\169"
1010
L["Achievement icons"] = "Ic\195\180ne de Haut-Fait"
11-
L["Add broker"] = "ajouter un afficheur de donn\195\169es"
1211
L["Additional conditions"] = "Conditions additionnelles"
1312
L["alt"] = true
1413
L["Are you sure? This operation cannot be undone."] = "Vous \195\170tes s\195\187r ? Cette op\195\169ration ne peut \195\170tre annul\195\169e."
@@ -36,7 +35,6 @@ L["Commands"] = "Commandes"
3635
--Translation missing
3736
L["Comments"] = "Comments"
3837
L["Condition Builder"] = "Constructeur conditionnel"
39-
L["Conditional execution"] = "Execution conditionnelle"
4038
L["Conditions"] = true
4139
--Translation missing
4240
L["Control which icons are available to pick for macros"] = "Control which icons are available to pick for macros"
@@ -65,8 +63,6 @@ L["Editor font"] = "police de caract\195\168re de l'editeur"
6563
L["Eject passenger"] = "\195\137jecter le passager"
6664
L["Emotes"] = true
6765
--Translation missing
68-
L["Enable certain types of macro to be called via a data broker addon"] = "Enable certain types of macro to be called via a data broker addon"
69-
L["Enable data broker"] = "Autoriser l'afficheur de donn\195\169es"
7066
L["Enable sound effects"] = "Activer les effets sonores"
7167
L["Enable UI errors"] = "Afficher les erreurs d'interface"
7268
L["Enhanced macro frame with additional tools"] = "Am\195\169liorer la fen\195\170tre de macro avec les outils additionnels"
@@ -175,7 +171,6 @@ L["Question mark icon"] = "Icone de question"
175171
L["raid"] = "dans votre groupe de raid"
176172
L["Raid marker"] = "Marqueur de raid"
177173
L["Random non-combat pet"] = "Mascotte non combattante al\195\169atoire"
178-
L["Remove broker"] = "retirer un afficheur de donn\195\169es"
179174
L["Replace known scripts with Macro Toolkit slash commands"] = "remplacer les scripts connus par les commandes Macro Toolkit"
180175
L["Replace scripts with slash command"] = "Remplacer les scripts par des commandes slash"
181176
L["Report to"] = "Envoyer un rapport \195\160 "

‎MacroToolkit/locales/itIT.lua‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ L["Ability icons"] = "Ability icons"
1313
--Translation missing
1414
L["Achievement icons"] = "Achievement icons"
1515
--Translation missing
16-
L["Add broker"] = "Add broker"
17-
--Translation missing
1816
L["Additional conditions"] = "Additional conditions"
1917
--Translation missing
2018
L["alt"] = "alt"
@@ -67,8 +65,6 @@ L["Comments"] = "Comments"
6765
--Translation missing
6866
L["Condition Builder"] = "Condition Builder"
6967
--Translation missing
70-
L["Conditional execution"] = "Conditional execution"
71-
--Translation missing
7268
L["Conditions"] = "Conditions"
7369
--Translation missing
7470
L["Control which icons are available to pick for macros"] = "Control which icons are available to pick for macros"
@@ -118,10 +114,6 @@ L["Eject passenger"] = "Eject passenger"
118114
--Translation missing
119115
L["Emotes"] = "Emotes"
120116
--Translation missing
121-
L["Enable certain types of macro to be called via a data broker addon"] = "Enable certain types of macro to be called via a data broker addon"
122-
--Translation missing
123-
L["Enable data broker"] = "Enable data broker"
124-
--Translation missing
125117
L["Enable sound effects"] = "Enable sound effects"
126118
--Translation missing
127119
L["Enable UI errors"] = "Enable UI errors"
@@ -323,8 +315,6 @@ L["Raid marker"] = "Raid marker"
323315
--Translation missing
324316
L["Random non-combat pet"] = "Random non-combat pet"
325317
--Translation missing
326-
L["Remove broker"] = "Remove broker"
327-
--Translation missing
328318
L["Replace known scripts with Macro Toolkit slash commands"] = "Replace known scripts with Macro Toolkit slash commands"
329319
--Translation missing
330320
L["Replace scripts with slash command"] = "Replace scripts with slash command"

0 commit comments

Comments
 (0)