Skip to content

Commit fcc81fc

Browse files
committed
Fixed an error when trying to open the config UI in Midnight
1 parent a840c28 commit fcc81fc

File tree

6 files changed

+12
-11
lines changed

6 files changed

+12
-11
lines changed

MacroToolkit/MacroToolkit.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
2-
https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
2+
https://raw.githubusercontent.com/Gethe/wow-ui-source/refs/heads/live/Interface/AddOns/Blizzard_SharedXML/UI.xsd">
33
<CheckButton name="MacroToolkitButtonTemplate" inherits="SelectorButtonTemplate" virtual="true">
44
<Layers>
55
<Layer level="OVERLAY">

MacroToolkit/embeds.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<Ui xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.blizzard.com/wow/ui/" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ http://www.blizzard.com/wow/ui/../../FrameXML/UI.xsd">
1+
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
2+
https://raw.githubusercontent.com/Gethe/wow-ui-source/refs/heads/live/Interface/AddOns/Blizzard_SharedXML/UI.xsd">
23
<Script file="libs\LibStub\LibStub.lua"/>
34
<Include file="libs\CallbackHandler-1.0\CallbackHandler-1.0.xml"/>
45
<Include file="libs\AceDB-3.0\AceDB-3.0.xml"/>

MacroToolkit/locales/locales.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
2-
..\FrameXML\UI.xsd">
2+
https://raw.githubusercontent.com/Gethe/wow-ui-source/refs/heads/live/Interface/AddOns/Blizzard_SharedXML/UI.xsd">
33
<Script file="enUS.lua"/>
44
<Script file="deDE.lua"/>
55
<Script file="frFR.lua"/>

MacroToolkit/modules/mainframe.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@ function MT:CreateMTFrame()
906906
mtopt:SetSize(80, 22)
907907
mtopt:SetText(_G.MAIN_MENU)
908908
mtopt:SetPoint("RIGHT", mtcustom, "LEFT", -14, 0)
909-
mtopt:SetScript("OnClick", function() if MT.MTPF then MT.MTPF:Hide() end Settings.OpenToCategory('Macro Toolkit') end)
909+
mtopt:SetScript("OnClick", function() if MT.MTPF then MT.MTPF:Hide() end Settings.OpenToCategory(MT.categoryID) end)
910910
end
911911

912912
local mtcon = CreateFrame("Button", "MacroToolkitConditions", mtframe, "BackdropTemplate,UIPanelButtonTemplate")

MacroToolkit/modules/modules.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
2-
..\FrameXML\UI.xsd">
2+
https://raw.githubusercontent.com/Gethe/wow-ui-source/refs/heads/live/Interface/AddOns/Blizzard_SharedXML/UI.xsd">
33
<Script file="package.lua"/>
44
<Script file="initialise.lua"/>
55
<Script file="parser.lua"/>

MacroToolkit/modules/options.lua

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -913,20 +913,20 @@ function MT:CreateOptions()
913913
local mainPanel = createMainPanel()
914914
mainPanel.name = "Macro Toolkit"
915915
local category, _ = Settings.RegisterCanvasLayoutCategory(mainPanel, mainPanel.name)
916-
category.ID = mainPanel.name
916+
self.categoryID = category:GetID()
917917
Settings.RegisterAddOnCategory(category)
918918
AceConfig:RegisterOptionsTable("MacroToolkitOptionsCheck", checkPanel)
919919
AceConfig:RegisterOptionsTable("MacroToolkitOptionsColours", coloursPanel)
920920
AceConfig:RegisterOptionsTable("MacroToolkitOptionsIcons", iconsPanel)
921921
AceConfig:RegisterOptionsTable("MacroToolkitOptionsInterface", interfacePanel)
922922
AceConfig:RegisterOptionsTable("MacroToolkitOptionsProfiles", AceDBOptions:GetOptionsTable(MT.db))
923-
MT.OptionsFrame = AceConfigDialog:AddToBlizOptions("MacroToolkitOptionsCheck", _G.MAIN_MENU, "Macro Toolkit")
923+
MT.OptionsFrame = AceConfigDialog:AddToBlizOptions("MacroToolkitOptionsCheck", _G.MAIN_MENU, self.categoryID)
924924
MT.OptionsFrame.default = function() resetoptions() end
925-
MT.ColoursFrame = AceConfigDialog:AddToBlizOptions("MacroToolkitOptionsColours", L["Syntax Highlighting"], "Macro Toolkit")
925+
MT.ColoursFrame = AceConfigDialog:AddToBlizOptions("MacroToolkitOptionsColours", L["Syntax Highlighting"], self.categoryID)
926926
MT.ColoursFrame.default = function() resetcolours() end
927-
MT.IconsFrame = AceConfigDialog:AddToBlizOptions("MacroToolkitOptionsIcons", L["Icons"], "Macro Toolkit")
927+
MT.IconsFrame = AceConfigDialog:AddToBlizOptions("MacroToolkitOptionsIcons", L["Icons"], self.categoryID)
928928
MT.IconsFrame.default = function() reseticons() end
929-
MT.InterfaceFrame = AceConfigDialog:AddToBlizOptions("MacroToolkitOptionsInterface", _G.UIOPTIONS_MENU, "Macro Toolkit")
929+
MT.InterfaceFrame = AceConfigDialog:AddToBlizOptions("MacroToolkitOptionsInterface", _G.UIOPTIONS_MENU, self.categoryID)
930930
MT.InterfaceFrame.default = function() resetinterface() end
931-
AceConfigDialog:AddToBlizOptions("MacroToolkitOptionsProfiles", L["Profiles"], "Macro Toolkit")
931+
AceConfigDialog:AddToBlizOptions("MacroToolkitOptionsProfiles", L["Profiles"], self.categoryID)
932932
end

0 commit comments

Comments
 (0)