From d9780e526f6a10e0ef978ac7b12eaf29299d5fb4 Mon Sep 17 00:00:00 2001
From: Hanchen-Yu <man661118@qq.com>
Date: Tue, 24 Dec 2024 17:19:21 +0800
Subject: [PATCH] 1.5.2 (Pre)

-New Module: Group Inviter Info
- Added Quick Slot API for third-party devs
---
 API.lua                                       |  24 ++
 .../Preview_PartyInviterInfo.jpg              | Bin 0 -> 15296 bytes
 Art/GossipIcons/MagnifyingGlass.tga           | Bin 0 -> 1823 bytes
 ControlCenter.lua                             |   4 +
 Initialization.lua                            |   3 +
 Locales/enUS.lua                              |  19 +
 Locales/zhCN.lua                              |  11 +
 Modules/ChatOptions.lua                       |   6 +
 Modules/Lockpicking.lua                       |  33 +-
 Modules/LootUI_Display.lua                    |   2 +-
 Modules/NameplateResources.lua                |   1 -
 Modules/QuickSlot.lua                         |  24 +-
 Modules/QuickSlot.xml                         |   4 +
 Modules/QuickSlot_External.lua                | 122 ++++++
 Modules/SharedWidgets.lua                     | 128 ++++++-
 Modules/StaticPopupEnhancement.xml            |   5 +
 Modules/StaticPopup_Basic.lua                 | 151 ++++++++
 Modules/StaticPopup_PartyInvite.lua           | 349 ++++++++++++++++++
 ... => StaticPopup_QuestItemDestroyAlert.lua} |  88 +----
 Modules/UnderlightAngler.lua                  |   2 +-
 Plumber.toc                                   |   4 +-
 Plumber_Vanilla.toc                           |   2 +-
 22 files changed, 887 insertions(+), 95 deletions(-)
 create mode 100644 Art/ControlCenter/Preview_PartyInviterInfo.jpg
 create mode 100644 Art/GossipIcons/MagnifyingGlass.tga
 create mode 100644 Modules/QuickSlot.xml
 create mode 100644 Modules/QuickSlot_External.lua
 create mode 100644 Modules/StaticPopupEnhancement.xml
 create mode 100644 Modules/StaticPopup_Basic.lua
 create mode 100644 Modules/StaticPopup_PartyInvite.lua
 rename Modules/{QuestItemDestroyAlert.lua => StaticPopup_QuestItemDestroyAlert.lua} (72%)

diff --git a/API.lua b/API.lua
index 7c37bd2..298ec88 100644
--- a/API.lua
+++ b/API.lua
@@ -61,6 +61,21 @@ do  -- Table
         return tbl
     end
     API.ReverseList = ReverseList;
+
+    local function CopyTable(tbl)
+        --Blizzard TableUtil.lua
+        if not tbl then return; end;
+        local copy = {};
+        for k, v in pairs(tbl) do
+            if type(v) == "table" then
+                copy[k] = CopyTable(v);
+            else
+                copy[k] = v;
+            end
+        end
+        return copy;
+    end
+    API.CopyTable = CopyTable;
 end
 
 do  -- String
@@ -131,6 +146,15 @@ do  -- String
         return obj
     end
     API.GetGlobalObject = GetGlobalObject;
+
+    local function JoinText(delimiter, l, r)
+        if l and r then
+            return l..delimiter..r
+        else
+            return l or r
+        end
+    end
+    API.JoinText = JoinText;
 end
 
 do  -- DEBUG
diff --git a/Art/ControlCenter/Preview_PartyInviterInfo.jpg b/Art/ControlCenter/Preview_PartyInviterInfo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..16ca6be65ebdc70b29b3fbba7b48eb30bc7433a1
GIT binary patch
literal 15296
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
CL70&M

literal 0
HcmV?d00001

diff --git a/Art/GossipIcons/MagnifyingGlass.tga b/Art/GossipIcons/MagnifyingGlass.tga
new file mode 100644
index 0000000000000000000000000000000000000000..3bd5d2a2f6232d6b3800dbc857142437d06ccce5
GIT binary patch
literal 1823
zcmY*aSxB5$6rRb<SQSH{jZ0LB+EimoMU7Y=#0P^>al>jGNkS3ZA_Wnbhp6B()>>OT
z6I*vp;=VmNJ}4@dzPLn_jzk@cxCJ#a)JELKL<ffd^nCY^gkIs!|Nr;9-#O<yiwcFk
z;%s>+_|LWpugb{C$h?@CnBr2rHDXf*2M6D&tE-dh>+2~tHnv!cuMOCgK0ZF-)z#G&
zEzXpUjg10;BSk$nrKhLo=T%iz#{zKf;lqd2+S*DjEiI%-NJuEI6Cg)N$19bUmH!Hm
zs=d9PUc7igJ3Bk{>eVYrk(QR0TPuJL4i1i`rKPI^sP69WrlX@Hdh_ND?d|PZQc_ax
z0;Z@DU^_dz3;Fr^v+u!Xvsr+d*?i;1jhiBnY5`WO)izmKS%3Z?e0+RN&!0d4ConKD
zNC@(~04sT=rlxkv;GUiy0yDsii;L@CUS3yz08W5aiHV82nwlD_t*xcb&Q8(-r<|Oe
zG&(ssIhO(W8#YyVczB*pr=$D#?-MkTfrEpCe{k66e*{Ksw(jok{z*wmIu6dL*X#G8
zJ$~_y?>HBssr>x>?yz1`d3m|eT?;>zj~+ehvf)(@O5v%JGw^YGdb*(kT()@f_xJxg
zCnv{p@7_J)1k%aL3B7&$mMSVL^oai_To#%r8JfrtvyelH{62m9l(d{XvR__arm?Xx
zVZEuTiNMcFSV0S~R#sMMcXwCH%*@RF8I;2D583f}zyN1=X?uH{BuOGHtJNy9`1<v0
z+S=Np_4Rd{o0}6RfMo|H&I1h(4_l(6qwoF#+K;d~J3D*BQLsW`!~@oag#{DGoPLeh
z#fujmxvH;mF{StR_L^pAXK8wRn!38WgoOtW9#}&{LeeTh_yM+zjEoU5qNq1FH|g;3
zP|C~8D>%nXq!$n8Zr{G0&*_)6FpLyXc6RoNV9{K@d^rdV&CShZG#Y7bZ4IYI6`<E}
zpA<q=Tx@G=6MA@fcm#>KG|9=y`m=cE=jUl?XlOyjOTNp7Rb^#mCivFh-!CHI$aLba
zn!WrBNtu|KATCH^OW(*RVPRq4qFGVfuv=16Vw6v~I`>!u8Xq5rEpl^n^OjFsTwHt*
z0etQ2>qDyd<dcSm1}oUOmIa%=z5NCG1U(85&isQd`Gn`eHtuwEbO=Ufe`klY=);Uc
z2gJmhyt7kKP%s1Ezyd}@A+v>shJFW?;2XT)nI*@gxpnK74tCD&aJ!hG+I#&93kyxK
zXD}FqQk-vDKMiN$I_w}TxDTGVxVU2ZE>F=S*u+<^Ffy4;<m>BuU3eraCpR~D1b4a4
zguiS>ii(OV;P#R$#|BUMg7J&#`sB$IdinAt&~ojZM~Sc^pRkH%@IZNF0hWu3ivDH|
zzQ1(o(x(`m_{BSaUlh%%8W<SB=%kH}4KvRzZ&8n;1=T$B;<@OpqoboD*$AT?tZGP%
z2E*JvI5@C!lg0lEKg2k&2?z*?VlNI*$*ZfYG&MCPbO(VJu4$kdI`;JRRP-Ou<AaEZ
zh$tOM#6VKJy1IIC2^gL|dnTd5*$!zj>@^sl7K=rU0&ZT3OTfVYWxVvbEDy-5SFieW
zE$G<wnWd$r?fw0I3wP%B<HwI@c*5#<VEI=8ezuao_%h<F=%na`_|H;qM#o0@DgFaz
Cn{?m+

literal 0
HcmV?d00001

diff --git a/ControlCenter.lua b/ControlCenter.lua
index e56e1a4..77b2b2e 100644
--- a/ControlCenter.lua
+++ b/ControlCenter.lua
@@ -433,6 +433,10 @@ local function CreateUI()
         if a.uiOrder ~= b.uiOrder then
             return a.uiOrder < b.uiOrder
             --should be finished here
+        else
+            if (a.categoryID == b.categoryID) and (a ~= b) then
+                print("Plumber: Duplicated Module uiOrder", a.uiOrder, a.name, b.name);
+            end
         end
 
         return a.name < b.name
diff --git a/Initialization.lua b/Initialization.lua
index 6e2e1e5..45bcdcd 100644
--- a/Initialization.lua
+++ b/Initialization.lua
@@ -108,6 +108,9 @@ local DefaultValues = {
     SpellcastingInfo = false,           --Show the spell info when hovering over target/focus cast bars. Logging target spells and displayed it on UnitPopupMenu
     ChatOptions = true,                 --Add Leave button to Channel Context Menu
     NameplateWidget = true,             --Show required items on nameplate widget set
+    PartyInviterInfo = false,           --Show the inviter's level and class
+        PartyInviter_Race = false,
+        PartyInviter_Faction = false,
 
 
     --Custom Loot Window
diff --git a/Locales/enUS.lua b/Locales/enUS.lua
index 8c8ecbb..d704d24 100644
--- a/Locales/enUS.lua
+++ b/Locales/enUS.lua
@@ -249,6 +249,17 @@ L["ModuleName NameplateWidget"] = "Nameplate: Keyflame";
 L["ModuleDescription NameplateWidget"] = "Show the number of owned Radiant Remnant on the nameplate.";
 
 
+--PartyInviterInfo
+L["ModuleName PartyInviterInfo"] = "Group Inviter Info";
+L["ModuleDescription PartyInviterInfo"] = "Show the inviter's level and class when you are invited to a group or a guild.";
+L["Additional Info"] = "Additional Info";
+L["Race"] = RACE or "Race";
+L["Faction"] = FACTION or "Faction";
+L["Click To Search Player"] = "Search This Player";
+L["Searching Player In Progress"] = FRIENDS_FRIENDS_WAITING or "Searching...";
+L["Player Not Found"] = ERR_FRIEND_NOT_FOUND or "Player not found.";
+
+
 --Loot UI
 L["ModuleName LootUI"] = HUD_EDIT_MODE_LOOT_FRAME_LABEL or "Loot Window";
 L["ModuleDescription LootUI"] = "Replace the default Loot Window and provide some optional features:\n\n- Loot items fast.\n\n- Fix Auto Loot failure bug.\n\n- Show a Take All button when looting manually.";
@@ -277,6 +288,14 @@ L["LootUI Option Use Default UI"] = "Use Default Loot Window";
 L["LootUI Option Use Default UI Tooltip"] = "Use WoW\'s default loot window.\n\n|cffff4800Enabling this option nullifies all settings above.|r";
 
 
+
+--Quick Slot For Third-party Dev
+L["Quickslot Module Info"] = "Module Info";
+L["QuickSlot Error 1"] = "Quick Slot: You have already added this controller.";
+L["QuickSlot Error 2"] = "Quick Slot: The controller is missing \"%s\"";
+L["QuickSlot Error 3"] = "Quick Slot: A controller with the same key \"%s\" already exists.";
+
+
 --Generic
 L["Reposition Button Horizontal"] = "Move Horizontally";   --Move the window horizontally
 L["Reposition Button Vertical"] = "Move Vertically";
diff --git a/Locales/zhCN.lua b/Locales/zhCN.lua
index a2c7885..138b396 100644
--- a/Locales/zhCN.lua
+++ b/Locales/zhCN.lua
@@ -249,6 +249,17 @@ L["ModuleName NameplateWidget"] = "姓名版: 钥焰";
 L["ModuleDescription NameplateWidget"] = "在钥焰的姓名版进度条上显示你拥有的光耀残渣的数量。";
 
 
+--PartyInviterInfo
+L["ModuleName PartyInviterInfo"] = "队伍邀请人信息";
+L["ModuleDescription PartyInviterInfo"] = "显示队伍以及公会邀请人的等级、职业等信息。";
+L["Additional Info"] = "额外信息";
+L["Race"] = "种族";
+L["Faction"] = "阵营";
+L["Click To Search Player"] = "搜索此玩家";
+L["Searching Player In Progress"] = "搜索中...";
+L["Player Not Found"] = "未找到玩家。";
+
+
 --Loot UI
 L["ModuleName LootUI"] = "拾取窗口";
 L["ModuleDescription LootUI"] = "替换默认的拾取窗口并提供以下功能：\n\n- 快速拾取所有物品\n\n- 修复自动拾取有时失效的问题\n\n- 手动拾取时显示“全部拾取”按钮";
diff --git a/Modules/ChatOptions.lua b/Modules/ChatOptions.lua
index 119d992..2f58ff2 100644
--- a/Modules/ChatOptions.lua
+++ b/Modules/ChatOptions.lua
@@ -102,6 +102,8 @@ function ChatOptions:Hook()
                                         ChatOptions:SetAutoLeaveChannel(channelID, true);
                                     end;
                                 };
+
+                                ChatOptions:SetupStaticPopup();
                                 StaticPopup_Show(STATIC_POPUP_WHICH, nil, nil, data);
                             end
                         end
@@ -135,7 +137,11 @@ function ChatOptions:Hook()
             end
         end);
     end
+end
 
+function ChatOptions:SetupStaticPopup()
+    if self.popupInserted then return end;
+    self.popupInserted = true;
     if StaticPopupDialogs then
         StaticPopupDialogs[STATIC_POPUP_WHICH] = {
             text = "",		-- supplied dynamically.
diff --git a/Modules/Lockpicking.lua b/Modules/Lockpicking.lua
index 39f1a51..58a2e37 100644
--- a/Modules/Lockpicking.lua
+++ b/Modules/Lockpicking.lua
@@ -11,6 +11,7 @@ if classID ~= 4 and raceID ~= 37 then return end;
 local API = addon.API;
 local IsWarningColor = API.IsWarningColor;
 
+local _G = _G;
 local InCombatLockdown = InCombatLockdown;
 local IsSpellKnown = IsSpellKnown;
 local SpellIsTargeting = SpellIsTargeting;
@@ -26,6 +27,7 @@ local SPELL_ID_PICK_LOCK = ((classID == 4) and 1804) or (312890);    --Rogue: Lo
 local SPELL_NAME_PICK_LOCK = nil;   --Localized with GetSpellInfo
 local INSTRUCTION_PICK_LOCK = addon.L["Instruction Pick Lock"];
 local NOT_TRADED_ITEM_SLOT_INDEX = 7;  --TRADE_ENCHANT_SLOT
+local TOOLTIP_DATA_TYPE = Enum.TooltipDataType and Enum.TooltipDataType.Item or 0;
 
 
 local MODULE_ENABLED = false;
@@ -298,10 +300,16 @@ local function SetupActionButton(bag, slot, tradeItem)
     return ActionButton
 end
 
-local function IsMouseoverItemLocked()
+local function IsMouseoverItemLocked(lineIndex)
+    local toIndex;
+    if lineIndex then
+        toIndex = 2;
+    else
+        toIndex = TooltipFrame:NumLines();
+    end
     local line;
-    for i = 2, 3 do
-        line = TooltipFrame["TextLeft"..i];
+    for i = 2, toIndex do
+        line = _G["GameTooltipTextLeft"..i];
         if line and line:GetText() == TEXT_LOCKED then
             local r, g, b = line:GetTextColor();
             if IsWarningColor(r, g, b) then
@@ -371,15 +379,26 @@ function Processor:ProcessItem()
             if info.getterName == "GetBagItem" then
                 local bag, slot = info.getterArgs[1], info.getterArgs[2];
                 if bag and slot then
-                    if IsMouseoverItemLocked() then
-                        SetupButtonAndTooltip(bag, slot);
-                        return
+                    local tooltipData = TooltipFrame.infoList and TooltipFrame.infoList[1] and TooltipFrame.infoList[1].tooltipData;
+                    if tooltipData and tooltipData.type == TOOLTIP_DATA_TYPE then
+                        local itemID = tooltipData.id;
+                        local lineIndex;
+                        if itemID == 220376 then
+                            --Bismuth Lockbox can have upgrade track on its item tooltip
+                        else
+                            lineIndex = 2;
+                        end
+                        if IsMouseoverItemLocked(lineIndex) then
+                            SetupButtonAndTooltip(bag, slot);
+                            return
+                        end
                     end
                 end
             elseif info.getterName == "GetTradeTargetItem" then
                 local tradeSlotIndex = info.getterArgs[1];
                 if tradeSlotIndex and tradeSlotIndex == NOT_TRADED_ITEM_SLOT_INDEX then
-                    if IsMouseoverItemLocked() then
+                    local lineIndex = 2;
+                    if IsMouseoverItemLocked(lineIndex) then
                         SetupButtonAndTooltip(nil, nil, true);
                         return
                     end
diff --git a/Modules/LootUI_Display.lua b/Modules/LootUI_Display.lua
index 71c6f53..f0c2b0c 100644
--- a/Modules/LootUI_Display.lua
+++ b/Modules/LootUI_Display.lua
@@ -1675,7 +1675,7 @@ do
 
 
     local function OptionToggle_OnClick(self, button)
-        if MainFrame.OptionFrame and MainFrame.OptionFrame:IsShown() then
+        if MainFrame.OptionFrame and MainFrame.OptionFrame:IsShown() and (MainFrame.OptionFrame:IsOwner(self) or MainFrame.OptionFrame:IsOwner(MainFrame)) then
             MainFrame:ShowOptions(false);
             MainFrame:ExitEditMode();
         else
diff --git a/Modules/NameplateResources.lua b/Modules/NameplateResources.lua
index 58036b0..7ab4a06 100644
--- a/Modules/NameplateResources.lua
+++ b/Modules/NameplateResources.lua
@@ -210,7 +210,6 @@ local function EnableModule(state)
 end
 
 do
-
     local moduleData = {
         name = addon.L["ModuleName NameplateWidget"],
         dbKey = "NameplateWidget",
diff --git a/Modules/QuickSlot.lua b/Modules/QuickSlot.lua
index e1ed80f..25077d3 100644
--- a/Modules/QuickSlot.lua
+++ b/Modules/QuickSlot.lua
@@ -287,7 +287,23 @@ local function RealActionButton_PostClick(self, button)
             menu:SetOwner(owner);
             menu:ClearAllPoints();
             menu:SetPoint("LEFT", owner, "RIGHT", 12, 0);
-            menu:SetContent(ContextMenuData);
+
+            local menuData;
+            if QuickSlot.buttonData.developerInfo then
+                menuData = API.CopyTable(ContextMenuData);
+                tinsert(menuData, {
+                    type = "divider",
+                });
+                tinsert(menuData, {
+                    --type == "info",
+                    color = {0.5, 0.5, 0.5},
+                    text = L["Quickslot Module Info"];
+                    tooltip = QuickSlot.buttonData.developerInfo,
+                });
+            else
+                menuData = ContextMenuData;
+            end
+            menu:SetContent(menuData);
             menu:Show();
         end
     end
@@ -341,7 +357,7 @@ local function ItemButton_OnEnter(self)
 
         local macroText;
         if self.onClickFunc then
-            
+
         elseif self.macroText then
             macroText = self.macroText;
         else
@@ -349,7 +365,9 @@ local function ItemButton_OnEnter(self)
                 macroText = string.format("/use item:%s", self.id);
             elseif self.actionType == "spell" then
                 local spellName = C_Spell.GetSpellName(self.id);
-                macroText = string.format("/cast %s", spellName);
+                if spellName then
+                    macroText = string.format("/cast %s", spellName);
+                end
             end
         end
         RealActionButton:SetAttribute("type1", "macro");
diff --git a/Modules/QuickSlot.xml b/Modules/QuickSlot.xml
new file mode 100644
index 0000000..c30ef59
--- /dev/null
+++ b/Modules/QuickSlot.xml
@@ -0,0 +1,4 @@
+<Ui xsi:schemaLocation="http://www.blizzard.com/wow/ui/..\FrameXML\UI.xsd">
+	<Script file="QuickSlot.lua"/>
+	<Script file="QuickSlot_External.lua"/>
+</Ui>
\ No newline at end of file
diff --git a/Modules/QuickSlot_External.lua b/Modules/QuickSlot_External.lua
new file mode 100644
index 0000000..cedb7f7
--- /dev/null
+++ b/Modules/QuickSlot_External.lua
@@ -0,0 +1,122 @@
+--Global API for 3rd-party devs
+
+local _, addon = ...
+local L = addon.L;
+local API = addon.API;
+local QuickSlot = addon.QuickSlot;
+local GetSpellName = C_Spell.GetSpellName;
+
+
+local CustomControllers = {};
+
+local ControllerMixin = {};
+
+do  --ControllerMixin
+--[[
+    ControllerMixin = {
+        key = "key",
+        title = "Module Name",
+        showError = false,
+        spellcastType = 0,      --1:Cast  2:Channel
+        developerInfo = "What does this module do. Developed by Whom";
+        buttons = {
+            {actionType = "spell", spellID = 0, icon = 134400, name = "Custom Name", onClickFunc = Nop, enabled = true},
+            {actionType = "item", itemID = 208067, spellID = 417645},
+        },
+    };
+--]]
+
+    function ControllerMixin:ShowQuickSlot(forceUpdate)
+        if forceUpdate then
+            QuickSlot.buttonData = nil;
+        else
+            if QuickSlot.buttonData == self and QuickSlot:IsShown() then
+                return
+            end
+        end
+        QuickSlot:SetButtonData(self);
+        QuickSlot:ShowUI();
+        QuickSlot:SetHeaderText(self.title, true);
+        QuickSlot:SetDefaultHeaderText(self.title);
+    end
+
+    function ControllerMixin:HideQuickSlot()
+        QuickSlot:RequestCloseUI(self.key);
+    end
+end
+
+local function AddQuickSlotController(controller)
+    local showError = controller.showError or false;
+
+    if CustomControllers[controller] ~= nil then
+        if showError then
+            API.PrintMessage(L["QuickSlot Error 1"]);
+        end
+        return false
+    end
+
+    local valid = true;
+    local requiredKeys = {
+        "key", "buttons", "developerInfo",
+    };
+
+    for _, k in ipairs(requiredKeys) do
+        if not controller[k] then
+            valid = false;
+            API.PrintMessage(L["QuickSlot Error 2"]:format(k));
+        end
+    end
+
+    if not valid then return end;
+
+    for c in pairs(CustomControllers) do
+        if c.key == controller.key then
+            API.PrintMessage(L["QuickSlot Error 3"]:format(controller.key));
+            return false
+        end
+    end
+
+    CustomControllers[controller] = true;
+    API.Mixin(controller, ControllerMixin);
+    controller.systemName = controller.key;
+
+    for _, v in ipairs(controller.buttons) do
+        if v.spellID then   --Cache
+            GetSpellName(v.spellID);
+        end
+    end
+
+    return true
+end
+
+PlumberAPI_AddQuickSlotController = AddQuickSlotController;
+
+
+do
+    --[[
+    local TestModule = {
+        key = "key",
+        title = nil,
+        showError = true,
+        spellcastType = 1,
+        developerInfo = "What does this module do. Developed by Whom",
+        buttons = {
+            {actionType = "spell", spellID = 2061, icon = nil, name = "Custom Name", onClickFunc = nil, enabled = true},
+            {actionType = "item", itemID = 208067, spellID = 417645},
+        },
+    };
+
+    PlumberAPI_AddQuickSlotController(TestModule);
+
+
+    local EL = CreateFrame("Frame");
+    EL:RegisterEvent("PLAYER_TARGET_CHANGED");
+    EL:SetScript("OnEvent", function()
+        if UnitExists("target") and UnitIsFriend("player", "target") then
+            TestModule:ShowQuickSlot();
+        else
+            TestModule:HideQuickSlot();
+        end
+    end);
+    --]]
+end
\ No newline at end of file
diff --git a/Modules/SharedWidgets.lua b/Modules/SharedWidgets.lua
index 677741b..ecf25e7 100644
--- a/Modules/SharedWidgets.lua
+++ b/Modules/SharedWidgets.lua
@@ -3818,7 +3818,6 @@ do  --Frame Reposition Button
 end
 
 do  --Slider
-    local Round = API.Round;
     local SliderFrameMixin = {};
 
     local TEXTURE_FILE = "Interface/AddOns/Plumber/Art/Frame/Slider";
@@ -4451,6 +4450,12 @@ do  --EditMode
     end
 
     function EditModeSettingsDialogMixin:ReleaseAllWidgets()
+        for _, widget in ipairs(self.activeWidgets) do
+            if widget.isCustomWidget then
+                widget:Hide();
+                widget:ClearAllPoints();
+            end
+        end
         self.activeWidgets = {};
 
         self.checkboxPool:ReleaseAll();
@@ -4478,13 +4483,16 @@ do  --EditMode
                 if widget.widgetType == "Divider" then
                     preOffset = 2;
                     postOffset = 2;
+                elseif widget.widgetType == "Custom" then
+                    preOffset = 0;
+                    postOffset = 2;
                 else
                     preOffset = 0;
                     postOffset = 0;
                 end
 
                 height = height + preOffset;
-
+                widget:ClearAllPoints();
                 if widget.align and widget.align ~= "left" then
                     if widget.align == "center" then
                         if widget.effectiveWidth then
@@ -4632,6 +4640,15 @@ do  --EditMode
                         widget = self:CreateHeader(widgetData);
                     elseif widgetData.type == "Keybind" then
                         widget = self:CreateKeybindButton(widgetData);
+                    elseif widgetData.type == "Custom" then
+                        widget = widgetData.onAcquire();
+                        if widget then
+                            widget:SetParent(self);
+                            widget:ClearAllPoints();
+                            widget:Show();
+                            widget.isCustomWidget = true;
+                            widget.align = widgetData.align or "center";
+                        end
                     end
 
                     if widget then
@@ -4661,6 +4678,16 @@ do  --EditMode
 
     function EditModeSettingsDialogMixin:OnDragStop()
         self:StopMovingOrSizing();
+        self:ConvertAnchor();
+    end
+
+    function EditModeSettingsDialogMixin:ConvertAnchor()
+        --Convert any anchor to the top left
+        --so that changing frame height don't affect the positions of most buttons
+        local left = self:GetLeft();
+        local top = self:GetTop();
+        self:ClearAllPoints();
+        self:SetPoint("TOPLEFT", UIParent, "BOTTOMLEFT", left, top);
     end
 
     function EditModeSettingsDialogMixin:SetTitle(title)
@@ -4671,6 +4698,10 @@ do  --EditMode
         return parent == self.parent
     end
 
+    function EditModeSettingsDialogMixin:IsFromSchematic(schematic)
+        return schematic and self.schematic == schematic;
+    end
+
     function EditModeSettingsDialogMixin:HideOption(parent)
         if (not parent) or self:IsOwner(parent) then
             self:Hide();
@@ -4742,6 +4773,10 @@ do  --EditMode
             f.keybindButtonPool = API.CreateObjectPool(CreateKeybindButton);
         end
 
+        if EditModeSettingsDialog:IsShown() and not EditModeSettingsDialog:IsOwner(parent) then
+            EditModeSettingsDialog:Exit();
+        end
+
         if (schematic ~= EditModeSettingsDialog.schematic) then
             EditModeSettingsDialog.requireResetPosition = true;
             EditModeSettingsDialog.schematic = schematic;
@@ -4757,6 +4792,21 @@ do  --EditMode
         return EditModeSettingsDialog
     end
     addon.SetupSettingsDialog = SetupSettingsDialog;
+
+    local function ToggleSettingsDialog(parent, schematic, forceUpdate)
+        if EditModeSettingsDialog and EditModeSettingsDialog:IsShown() and EditModeSettingsDialog:IsOwner(parent) then
+            EditModeSettingsDialog:Exit();
+        else
+            local f = SetupSettingsDialog(parent, schematic, forceUpdate);
+            if f then
+                f:Show();
+                f:ClearAllPoints();
+                f:SetPoint("LEFT", UIParent, "CENTER", 256, 0);
+                return f
+            end
+        end
+    end
+    addon.ToggleSettingsDialog = ToggleSettingsDialog;
 end
 
 do  --Radial Progress Bar
@@ -5399,4 +5449,78 @@ do  --Displayed required items on nameplate widget set
         f:SetInteractable(true);
         return f
     end
+end
+
+do  --Simple Tooltip (2 FontString)
+    local SimpleTooltipMixin = {};
+
+    function SimpleTooltipMixin:SetText(title, description)
+        local textHeight, textWidth;
+        if not (title or description) then
+            self.Text1:SetText(nil);
+            self.Text2:SetText(nil);
+            textHeight = 12;
+            textWidth = 12;
+        else
+            self.Text2:ClearAllPoints();
+            if description then
+                self.Text2:SetPoint("TOPLEFT", self.Text1, "BOTTOMLEFT", 0, -self.titleDescGap);
+                self.Text1:SetText(title);
+                self.Text2:SetText(description);
+                textHeight = self.Text1:GetHeight() + self.titleDescGap + self.Text2:GetHeight();
+                textWidth = math.max(self.Text1:GetWrappedWidth(), self.Text2:GetWrappedWidth());
+            else
+                self.Text2:SetPoint("TOPLEFT", self, "TOPLEFT", self.padding, -self.padding);
+                self.Text1:SetText(nil);
+                self.Text2:SetText(title);
+                textHeight = self.Text2:GetHeight();
+                textWidth = self.Text2:GetWrappedWidth();
+            end
+        end
+        self:SetSize(API.Round(textWidth + 2*self.padding), API.Round(textHeight + 2*self.padding));
+    end
+
+    function SimpleTooltipMixin:SetPadding()
+        self.padding = 8;
+    end
+
+    function SimpleTooltipMixin:SetTitleDescGap(titleDescGap)
+        self.titleDescGap = titleDescGap;
+    end
+
+    function SimpleTooltipMixin:SetMaxLineWidth(width)
+        self.Text1:SetWidth(width);
+        self.Text2:SetWidth(width);
+    end
+
+    local function CreateSimpleTooltip(parent)
+        local f = CreateFrame("Frame", nil, parent);
+        f.padding = 8;
+        f.titleDescGap = 4;
+
+        Mixin(f, SimpleTooltipMixin);
+
+        local bg = addon.CreateNineSliceFrame(f, "NineSlice_GenericBox_Black");
+        bg:SetUsingParentLevel(true);
+        bg:SetCornerSize(8);
+        bg:SetAllPoints(true);
+
+        f.Text1 = f:CreateFontString(nil, "OVERLAY", "GameTooltipHeaderText");
+        f.Text1:SetJustifyH("LEFT");
+        f.Text1:SetJustifyV("TOP");
+        f.Text1:SetPoint("TOPLEFT", f, "TOPLEFT", f.padding, -f.padding);
+        f.Text1:SetTextColor(1, 0.82, 0);
+        f.Text1:SetSpacing(2);
+
+        f.Text2 = f:CreateFontString(nil, "OVERLAY", "GameTooltipText");
+        f.Text2:SetJustifyH("LEFT");
+        f.Text2:SetJustifyV("TOP");
+        f.Text2:SetPoint("TOPLEFT", f.Text1, "BOTTOMLEFT", 0, -f.titleDescGap);
+        f.Text2:SetSpacing(2);
+
+        f:SetMaxLineWidth(290);
+
+        return f
+    end
+    addon.CreateSimpleTooltip = CreateSimpleTooltip;
 end
\ No newline at end of file
diff --git a/Modules/StaticPopupEnhancement.xml b/Modules/StaticPopupEnhancement.xml
new file mode 100644
index 0000000..7bffd4d
--- /dev/null
+++ b/Modules/StaticPopupEnhancement.xml
@@ -0,0 +1,5 @@
+<Ui xsi:schemaLocation="http://www.blizzard.com/wow/ui/..\FrameXML\UI.xsd">
+    <Script file="StaticPopup_Basic.lua"/>
+    <Script file="StaticPopup_QuestItemDestroyAlert.lua"/>
+    <Script file="StaticPopup_PartyInvite.lua"/>
+</Ui>
\ No newline at end of file
diff --git a/Modules/StaticPopup_Basic.lua b/Modules/StaticPopup_Basic.lua
new file mode 100644
index 0000000..ee00cb8
--- /dev/null
+++ b/Modules/StaticPopup_Basic.lua
@@ -0,0 +1,151 @@
+local _, addon = ...
+local L = addon.L;
+local API = addon.API;
+local _G = _G;
+local pairs = pairs;
+
+
+local SIDE_SPACING = 8;
+local TITLE_DESC_GAP = 4;
+local MAX_TEXT_WIDTH = 256;
+
+
+local StaticPopupUtil = CreateFrame("Frame");
+addon.StaticPopupUtil = StaticPopupUtil;
+
+
+function StaticPopupUtil:FindFrame(which)
+    local f;
+    for i = 1, 3 do
+        f = _G["StaticPopup"..i];
+        if f and f:IsShown() and f.which == which then
+            return f
+        end
+    end
+end
+
+function StaticPopupUtil:AddTooltipInfoCallback(dataInstanceID, callback)
+    if not self.dataInstanceCallbacks then
+        self.dataInstanceCallbacks = {};
+    end
+    self.dataInstanceCallbacks[dataInstanceID] = callback;
+    self:RegisterEvent("TOOLTIP_DATA_UPDATE");
+    self:RequestUpdate();
+end
+
+function StaticPopupUtil:OnEvent(event, ...)
+    if event == "TOOLTIP_DATA_UPDATE" then
+        local dataInstanceID = ...
+        if self.dataInstanceCallbacks[dataInstanceID] then
+            self.dataInstanceCallbacks[dataInstanceID]();
+        end
+    end
+end
+StaticPopupUtil:SetScript("OnEvent", StaticPopupUtil.OnEvent);
+
+function StaticPopupUtil:AttachWidgetToStaticPopup(which, widget, direction)
+    local f = self:FindFrame(which);
+    if not f then return false end;
+
+    local point, offsetY;
+
+    if direction == "TOP" then
+        point = "BOTTOM";
+        offsetY = f:GetTop() + 4;
+    else
+        point = "TOP";
+        offsetY = f:GetBottom() - 12;   --To avoide "YES" "NO" button
+    end
+
+    widget:ClearAllPoints();
+    widget:SetPoint(point, UIParent, "BOTTOM", 0, offsetY);
+
+    if not self.widgetOwners then
+        self.widgetOwners = {};
+    end
+    self.widgetOwners[f] = which;
+
+    if not self.popupWidgets then
+        self.popupWidgets = {};
+    end
+    self.popupWidgets[which] = widget;
+
+    self:RequestUpdate();
+
+    return true
+end
+
+function StaticPopupUtil:CreateSimpleTooltip()
+    if self.Tooltip then return end;
+    self.Tooltip = addon.CreateSimpleTooltip(UIParent);
+end
+
+function StaticPopupUtil:HideSimpleTooltip()
+    if self.Tooltip then
+        self.Tooltip:Hide();
+        self.Tooltip:ClearAllPoints();
+    end
+end
+
+function StaticPopupUtil:ShowSimpleTooltip(which, title, description, direction)
+    if title then
+        self:CreateSimpleTooltip();
+        self.Tooltip:SetText(title, description);
+        self.Tooltip:Show();
+        return self:AttachWidgetToStaticPopup(which, self.Tooltip, direction);
+    else
+        self:HideSimpleTooltip();
+        return false
+    end
+end
+
+function StaticPopupUtil:GetTooltipFrame()
+    return self.Tooltip
+end
+
+function StaticPopupUtil:HidePopupWidget(which)
+    if self.popupWidgets then
+        if self.popupWidgets[which] then
+            self.popupWidgets[which]:Hide();
+            self.popupWidgets[which]:ClearAllPoints();
+            self.popupWidgets[which] = nil;
+        end
+    end
+end
+
+function StaticPopupUtil:CheckPopupVisibilities()
+    if self.widgetOwners then
+        for popup, which in pairs(self.widgetOwners) do
+            if (popup:IsVisible() and popup.which == which) then
+                return
+            end
+        end
+    end
+
+    self:SetScript("OnUpdate", nil);
+    self.updateTimer = 0;
+    self.widgetOwners = nil;
+    self:UnregisterEvent("TOOLTIP_DATA_UPDATE");
+    self.dataInstanceCallbacks = nil;
+
+    if self.popupWidgets then
+        for which, widget in pairs(self.popupWidgets) do
+            widget:Hide();
+            widget:ClearAllPoints();
+        end
+        self.popupWidgets = nil;
+    end
+end
+
+function StaticPopupUtil:OnUpdate(elapsed)
+   self.updateTimer = self.updateTimer + elapsed;
+    if self.updateTimer > 0.2 then
+        self.updateTimer = 0;
+        self:CheckPopupVisibilities();
+    end
+end
+
+function StaticPopupUtil:RequestUpdate()
+    self.updateTimer = 0;
+    self:SetScript("OnUpdate", self.OnUpdate);
+end
\ No newline at end of file
diff --git a/Modules/StaticPopup_PartyInvite.lua b/Modules/StaticPopup_PartyInvite.lua
new file mode 100644
index 0000000..634499c
--- /dev/null
+++ b/Modules/StaticPopup_PartyInvite.lua
@@ -0,0 +1,349 @@
+local _, addon = ...
+local L = addon.L;
+local GetDBBool = addon.GetDBBool;
+local StaticPopupUtil = addon.StaticPopupUtil;
+local JoinText = addon.API.JoinText;
+local match = string.match;
+
+local POPUP_WHICH = "PARTY_INVITE";
+local FACTION_A = FACTION_ALLIANCE or "Alliance";
+local FACTION_H = FACTION_HORDE or "Horde";
+local EL = CreateFrame("Frame");
+--[[
+local Portrait = EL:CreateTexture("TTT")
+Portrait:SetSize(40, 40);
+Portrait:SetPoint("CENTER", UIParent, "CENTER", 0, 0);
+Portrait:SetColorTexture(1, 1, 1);
+--]]
+
+local WhoButton;
+local function WhoButton_Hide()
+    if WhoButton and WhoButton:IsVisible() then
+        WhoButton:Hide();
+    end
+end
+
+function EL:OnEvent(event, ...)
+    if event == "PARTY_INVITE_REQUEST" then
+        self:PARTY_INVITE_REQUEST(...);
+    elseif event == "GUILD_INVITE_REQUEST" then
+        self:GUILD_INVITE_REQUEST(...);
+    end
+end
+
+function EL:GUILD_INVITE_REQUEST(inviter, guildName, guildAchievementPoints, oldGuildName, isNewGuild, tabardInfo)
+    if not self.pauseUpdate then
+        self.pauseUpdate = true;
+        C_Timer.After(0, function()
+            self.pauseUpdate = nil;
+
+            local NORMAL_TEXT = "|TInterface\\AddOns\\Plumber\\Art\\GossipIcons\\MagnifyingGlass:0:0:0:-4:32:32:0:32:0:32:128:128:128|t |cffffd200"..L["Click To Search Player"].."|r";
+            local HIGHLIGHTED_TEXT = "|TInterface\\AddOns\\Plumber\\Art\\GossipIcons\\MagnifyingGlass:0:0:0:-4:32:32:0:32:0:32:255:255:255|t |cffffffff"..L["Click To Search Player"].."|r";
+
+            local tooltipFrame;
+
+            if StaticPopupUtil:ShowSimpleTooltip(POPUP_WHICH, NORMAL_TEXT, nil, "TOP") then
+                tooltipFrame = StaticPopupUtil:GetTooltipFrame();
+                if not tooltipFrame  then
+                    return
+                end
+            end
+
+            local function WhoButton_OnEnter()
+                tooltipFrame:SetText(HIGHLIGHTED_TEXT);
+            end
+
+            local function WhoButton_OnLeave()
+                tooltipFrame:SetText(NORMAL_TEXT);
+            end
+
+            local function WhoButton_OnClick(f)
+                local name = inviter;
+                f:SetScript("OnLeave", nil);
+                f:Hide();
+                tooltipFrame:SetText("|cff808080"..L["Searching Player In Progress"].."|r");
+                f:RegisterEvent("WHO_LIST_UPDATE");
+                f:SetScript("OnEvent", function(_, event)
+                    f:UnregisterEvent(event);
+                    if not (WhoFrame and WhoFrame:IsVisible()) then
+                        C_FriendList.SetWhoToUi(false);
+                    end
+                    if not tooltipFrame:IsVisible() then return end;
+                    local numWhos = C_FriendList.GetNumWhoResults();
+                    if numWhos > 0 then
+                        local info = C_FriendList.GetWhoInfo(1);
+                        if info then
+                            local text = string.format("Level %d %s %s - %s", info.level, info.raceStr, info.classStr, info.area);
+                            if text then
+                                tooltipFrame:SetText("|cffffff00"..text.."|r");
+                            end
+                        end
+                    else
+                        tooltipFrame:SetText(L["Player Not Found"]);
+                    end
+                end);
+                C_FriendList.SetWhoToUi(true);
+                local whoFormat = "n-\"%s\" g-\"%s\"";
+                C_FriendList.SendWho(string.format(whoFormat, name, guildName));
+            end
+
+            if not WhoButton then
+                WhoButton = CreateFrame("Button", nil, tooltipFrame);
+                WhoButton:SetScript("OnHide", function(f)
+                    f:Hide();
+                    f:ClearAllPoints();
+                    f:SetParent(nil);
+                end)
+            end
+
+            WhoButton:SetScript("OnEnter", WhoButton_OnEnter);
+            WhoButton:SetScript("OnLeave", WhoButton_OnLeave);
+            WhoButton:SetScript("OnClick", WhoButton_OnClick);
+
+            WhoButton:SetParent(tooltipFrame);
+            local w, h = tooltipFrame:GetSize();
+            WhoButton:SetSize(w, h);
+            WhoButton:SetPoint("CENTER", tooltipFrame, "CENTER", 0, 0);
+            WhoButton:SetFrameLevel(tooltipFrame:GetFrameLevel() + 1);
+            WhoButton:Show();
+        end);
+    end
+end
+
+function EL:PARTY_INVITE_REQUEST(name, tank, healer, damage, isXRealm, allowMultipleRoles, inviterGUID, isQuestSessionActive)
+    self.lastGUID = nil;
+
+    if (tank or healer or damage or isQuestSessionActive) then
+        return
+    end
+
+    self.lastGUID = inviterGUID;
+
+    --[[
+    if string.find(name, "%-") then
+        name = string.gsub(name, "%-.+", "");
+    end
+    print(name)
+    SetPortraitTexture(Portrait, name)  --Doesn't seem to work on characters with -ServerName
+    --]]
+
+    if not self.pauseUpdate then
+        self.pauseUpdate = true;
+        WhoButton_Hide();
+        C_Timer.After(0, function()
+            self.pauseUpdate = nil;
+            self:ProcessLastInviter();
+        end);
+    end
+end
+
+local function FormatLevelText(level)
+    return "|cffffd200"..string.format(TOOLTIP_UNIT_LEVEL, level).."|r";
+end
+
+local function FormatSubtext(spec, race, faction)
+    local subtext = spec;
+    local lineBreak = false;
+    if GetDBBool("PartyInviter_Race") and race then
+        race = "|cffcccccc"..race.."|r";
+        lineBreak = true;
+        subtext = JoinText("\n", subtext, race);
+    end
+    if GetDBBool("PartyInviter_Faction") and faction then
+        if faction == FACTION_A then
+            faction = "|cff009cde"..faction.."|r";
+        elseif faction == FACTION_H then
+            faction = "|cffee6159"..faction.."|r";
+        else
+            faction = nil;
+        end
+        if faction then
+            if lineBreak then
+                subtext = JoinText("  ", subtext, faction);
+            else
+                subtext = JoinText("\n", subtext, faction);
+            end
+        end
+    end
+    return subtext
+end
+
+function EL:GetPlayerInfoFromTooltip(guid)
+    local data = C_TooltipInfo.GetHyperlink("unit:"..guid);
+    if data and data.lines then
+        local level, spec, faction, classColorString, subtext;
+        --local playerLocation  = PlayerLocation:CreateFromGUID(guid);
+        --local className, classFilename = C_PlayerInfo.GetClass(playerLocation);
+        local className, classFilename, race = GetPlayerInfoByGUID(guid);
+        if classFilename then
+            classColorString = RAID_CLASS_COLORS[classFilename].colorStr;
+        end
+
+        for i, line in ipairs(data.lines) do
+            if i == 1 then
+
+            elseif i == 2 then  --Race is on the same line
+                level = match(line.leftText, "%d+");
+                if level then
+                    level = tonumber(level);
+                    if level and level > 0 then
+                        level = FormatLevelText(level);
+                    else
+                        level = nil;
+                    end
+                end
+            elseif i == 3 then
+                if className and classColorString then
+                    if match(line.leftText, className) then
+                        spec = "|c"..classColorString..line.leftText.."|r";
+                    end
+                end
+            elseif i == 4 then
+                faction = line.leftText;
+                if faction == FACTION_A then
+                    faction = "|cff009cde"..faction.."|r";
+                elseif faction == FACTION_H then
+                    faction = "|cffee6159"..faction.."|r";
+                else
+                    faction = nil;
+                end
+            end
+        end
+
+        subtext = FormatSubtext(spec, race, faction);
+
+        return level, subtext, data.dataInstanceID
+    end
+end
+
+function EL:ProcessLastInviter()
+    if not (self.lastGUID) then return end;
+    local level, subtext, dataInstanceID = self:GetPlayerInfoFromTooltip(self.lastGUID);
+    if level then
+        local text;
+        if subtext then
+            text = JoinText("  ", level, subtext);
+        else
+            text = level;
+        end
+
+        if StaticPopupUtil:ShowSimpleTooltip(POPUP_WHICH, text, nil, "TOP") then
+            StaticPopupUtil:AddTooltipInfoCallback(dataInstanceID, function ()
+                EL:ProcessLastInviter();
+            end)
+        end
+    end
+end
+
+function EL:EnableModule(state)
+    if state then
+        self.enabled = true;
+        self:RegisterEvent("PARTY_INVITE_REQUEST");
+        self:SetScript("OnEvent", self.OnEvent);
+    elseif self.enabled then
+        self.enabled = nil;
+        self:UnregisterEvent("PARTY_INVITE_REQUEST");
+        self:SetScript("OnEvent", nil);
+        StaticPopupUtil:HidePopupWidget(POPUP_WHICH);
+    end
+end
+
+
+local OptionToggle_OnClick;
+do  --Options
+    local DemoFrame;
+    local OptionFrame;
+
+    local function DemoFrame_ShowSearch()
+        local icon = "|TInterface\\AddOns\\Plumber\\Art\\GossipIcons\\MagnifyingGlass:0:0:0:-4:32:32:0:32:0:32:128:128:128|t ";
+        DemoFrame:SetText(icon..L["Click To Search Player"]);
+    end
+
+    local function DemoFrame_Update()
+        local primaryTalentTree = GetSpecialization();
+        local unit = "player";
+        local level = UnitLevel(unit);
+        local classDisplayName, class = UnitClass(unit);
+        local classColorString = RAID_CLASS_COLORS[class].colorStr;
+
+        local spec, _;
+        if primaryTalentTree then
+            _, spec = GetSpecializationInfo(primaryTalentTree, nil, nil, nil, UnitSex(unit));
+        end
+        if spec and spec ~= "" then
+            spec = spec.." "..classDisplayName;
+        else
+            spec = classDisplayName;
+        end
+        spec = "|c"..classColorString..spec.."|r";
+
+        local race = UnitRace(unit);
+        local faction = UnitFactionGroup(unit);
+        local levelText = FormatLevelText(level);
+        local subtext = FormatSubtext(spec, race, faction);
+        DemoFrame:SetText(JoinText("  ", levelText, subtext));
+    end
+
+    local function Checkbox_OnClick()
+        if OptionFrame then
+            DemoFrame_Update();
+            OptionFrame:Layout();
+        end
+    end
+
+    local function AcquireDemoFrame()
+        if not DemoFrame then
+            DemoFrame = addon.CreateSimpleTooltip(nil);
+        end
+        DemoFrame_Update();
+        return DemoFrame
+    end
+
+    local OPTIONS_SCHEMATIC = {
+        title = L["ModuleName PartyInviterInfo"],
+        widgets = {
+            {type = "Header", label = L["Additional Info"]};
+            {type = "Checkbox", label = L["Race"] , onClickFunc = Checkbox_OnClick, dbKey = "PartyInviter_Race", tooltip = nil},
+            {type = "Checkbox", label = L["Faction"], onClickFunc = Checkbox_OnClick, dbKey = "PartyInviter_Faction", tooltip = nil},
+
+            {type = "Divider"},
+            {type = "Custom", onAcquire = AcquireDemoFrame, align = "center"},
+        },
+    };
+
+    function OptionToggle_OnClick(self, button)
+        OptionFrame = addon.ToggleSettingsDialog(self, OPTIONS_SCHEMATIC);
+        if OptionFrame then
+            OptionFrame:ConvertAnchor();
+        end
+    end
+end
+
+
+do
+    local function EnableModule(state)
+        EL:EnableModule(state)
+    end
+
+    local moduleData = {
+        name = L["ModuleName PartyInviterInfo"],
+        dbKey = "PartyInviterInfo",
+        description = L["ModuleDescription PartyInviterInfo"],
+        toggleFunc = EnableModule,
+        categoryID = 1,
+        uiOrder = 1146,
+        moduleAddedTime = 1734950000,
+        optionToggleFunc = OptionToggle_OnClick,
+    };
+
+    addon.ControlCenter:AddModule(moduleData);
+end
+
+
+--[[    --Other events don't return playerGUID
+    TRADE_REQUEST: name
+    GUILD_INVITE_REQUEST: inviter, guildName, guildAchievementPoints, oldGuildName, isNewGuild, tabardInfo
+
+
+    C_FriendList.SendWho #hardware input
+--]]
\ No newline at end of file
diff --git a/Modules/QuestItemDestroyAlert.lua b/Modules/StaticPopup_QuestItemDestroyAlert.lua
similarity index 72%
rename from Modules/QuestItemDestroyAlert.lua
rename to Modules/StaticPopup_QuestItemDestroyAlert.lua
index 2530313..68bd192 100644
--- a/Modules/QuestItemDestroyAlert.lua
+++ b/Modules/StaticPopup_QuestItemDestroyAlert.lua
@@ -1,6 +1,7 @@
 local _, addon = ...
 local L = addon.L;
 local API = addon.API;
+local StaticPopupUtil = addon.StaticPopupUtil;
 
 local GetContainerNumSlots = C_Container.GetContainerNumSlots;
 local GetItemNameByID = C_Item.GetItemNameByID;
@@ -11,6 +12,7 @@ local GetNumQuestLeaderBoards = GetNumQuestLeaderBoards;
 local GetQuestLogLeaderBoard = GetQuestLogLeaderBoard;
 local CursorHasItem = CursorHasItem;
 
+local POPUP_WHICH = "DELETE_QUEST_ITEM";
 local EL = CreateFrame("Frame");
 
 EL.ItemNameToQuest = {};
@@ -39,12 +41,6 @@ function EL:BANKFRAME_CLOSED()
     self.isAtBank = false;
 end
 
-function EL:TOOLTIP_DATA_UPDATE(dataInstanceID)
-    if dataInstanceID == self.dataInstanceID and self.questID then
-        self:DisplayQuest(self.questID);
-    end
-end
-
 function EL:QUEST_DATA_LOAD_RESULT(questID, success)
     if questID == self.questID and success then
         self:DisplayQuest(questID);
@@ -60,9 +56,8 @@ end
 function EL:HideUI()
     self:UnregisterEvent("TOOLTIP_DATA_UPDATE");
     self:UnregisterEvent("CURSOR_CHANGED");
-    self.dataInstanceID = nil;
     self.questID = nil;
-    self:DisplayTooltip(nil);
+    StaticPopupUtil:HidePopupWidget(POPUP_WHICH);
 end
 
 function EL:EnableModule(state)
@@ -73,7 +68,7 @@ function EL:EnableModule(state)
         self:RegisterEvent("BANKFRAME_CLOSED");
         self:SetScript("OnEvent", self.OnEvent);
     elseif self.enabled then
-        self.enabled = false;
+        self.enabled = nil;
         self:UnregisterEvent("DELETE_ITEM_CONFIRM");
         self:UnregisterEvent("BANKFRAME_OPENED");
         self:UnregisterEvent("BANKFRAME_CLOSED");
@@ -134,14 +129,12 @@ function EL:OnUpdate_UnregisterDynamicEvents(elapsed)
     if self.t > 1.0 then
         self.t = nil;
         self:SetScript("OnUpdate", nil);
-        self:UnregisterEvent("TOOLTIP_DATA_UPDATE");
         self:UnregisterEvent("QUEST_DATA_LOAD_RESULT");
     end
 end
 
 function EL:ListenDynamicEvents()
     self:RegisterEvent("CURSOR_CHANGED");
-    self:RegisterEvent("TOOLTIP_DATA_UPDATE");
     self:RegisterEvent("QUEST_DATA_LOAD_RESULT");
     self.t = 0;
     self:SetScript("OnUpdate", self.OnUpdate_UnregisterDynamicEvents);
@@ -153,11 +146,13 @@ function EL:DisplayQuest(questID)
     local questName;
     local questLogIndex = GetLogIndexForQuestID(questID);
     local tooltipData = GetHyperlink("quest:"..questID);
-    self.dataInstanceID = tooltipData and tooltipData.dataInstanceID or nil;
     self:ListenDynamicEvents();
 
     local tooltipText;
+    local dataInstanceID;
+
     if tooltipData and tooltipData.lines then
+        dataInstanceID = tooltipData.dataInstanceID;
         local colorizedText;
         for i, line in ipairs(tooltipData.lines) do
             if i == 1 then
@@ -217,22 +212,10 @@ function EL:DisplayQuest(questID)
     end
     --]]
 
-    --Find Static Popup
-    local _G = _G;
-    local f, popup;
-
-    for i = 1, 3 do
-        f = _G["StaticPopup"..i];
-        if f and f:IsShown() and f.which == "DELETE_QUEST_ITEM" then
-            popup = f;
-            break
-        end
-    end
-
-    if popup then
-        self:DisplayTooltip(popup, questName, tooltipText);
-    else
-        self:DisplayTooltip(nil);
+    if StaticPopupUtil:ShowSimpleTooltip(POPUP_WHICH, questName, tooltipText, "BOTTOM") then
+        StaticPopupUtil:AddTooltipInfoCallback(dataInstanceID, function()
+            EL:DisplayQuest(questID);
+        end);
     end
 end
 
@@ -244,55 +227,6 @@ function EL:StoreItemQuest(itemID, questID)
     end
 end
 
-local SIDE_SPACING = 8;
-local TITLE_DESC_GAP = 4;
-local MAX_TEXT_WIDTH = 256;
-
-function EL:DisplayTooltip(anchorTo, title, description)
-    local f = self.Tooltip;
-    if title then
-        if not f then
-            f = CreateFrame("Frame", nil, UIParent);
-            self.Tooltip = f;
-            local bg = addon.CreateNineSliceFrame(f, "NineSlice_GenericBox_Black");
-            bg:SetCornerSize(8);
-            bg:SetFrameLevel(f:GetFrameLevel() - 1);
-            bg:SetAllPoints(true);
-
-            f.Title = f:CreateFontString(nil, "OVERLAY", "GameTooltipHeaderText");
-            f.Title:SetJustifyH("LEFT");
-            f.Title:SetJustifyV("TOP");
-            f.Title:SetWidth(MAX_TEXT_WIDTH);
-            f.Title:SetPoint("TOPLEFT", f, "TOPLEFT", SIDE_SPACING, -SIDE_SPACING);
-            f.Title:SetTextColor(1, 0.82, 0);
-
-            f.Desc = f:CreateFontString(nil, "OVERLAY", "GameTooltipText");
-            f.Desc:SetJustifyH("LEFT");
-            f.Desc:SetJustifyV("TOP");
-            f.Desc:SetWidth(MAX_TEXT_WIDTH);
-            f.Desc:SetPoint("TOPLEFT", f.Title, "BOTTOMLEFT", 0, -TITLE_DESC_GAP);
-        end
-
-        f.Title:SetText(title);
-        f.Desc:SetText(description);
-
-        local textHeight = f.Title:GetHeight() + TITLE_DESC_GAP + f.Desc:GetHeight();
-        local textWidth = math.max(f.Title:GetWrappedWidth(), f.Desc:GetWrappedWidth());
-        f:SetSize(API.Round(textWidth + 2*SIDE_SPACING), API.Round(textHeight + 2*SIDE_SPACING));
-        f:Show();
-        f:ClearAllPoints();
-
-        local bottom = anchorTo:GetBottom();
-        f:SetPoint("TOP", UIParent, "BOTTOM", 0, bottom - 12);
-        --f:SetPoint("TOP", anchorTo, "BOTTOM", 0, -12);
-    else
-        if f then
-            f:Hide();
-            f:ClearAllPoints();
-        end
-    end
-end
-
 function EL:GetQuesIDtByItemName(itemName)
     if itemName then
         return self.ItemNameToQuest[itemName]
diff --git a/Modules/UnderlightAngler.lua b/Modules/UnderlightAngler.lua
index 55fe895..469b1e2 100644
--- a/Modules/UnderlightAngler.lua
+++ b/Modules/UnderlightAngler.lua
@@ -71,7 +71,7 @@ do
         description = addon.L["ModuleDescription BlizzFixFishingArtifact"],
         toggleFunc = EnableModule,
         categoryID = 2,
-        uiOrder = 10,
+        uiOrder = 15,
         moduleAddedTime = 1728990000,
     };
 
diff --git a/Plumber.toc b/Plumber.toc
index 6fb6eb0..58702cc 100644
--- a/Plumber.toc
+++ b/Plumber.toc
@@ -28,7 +28,7 @@ Modules\BackpackItemTracker.lua
 Modules\AutoJoinEvents.lua
 Modules\PlayerChoiceFrameToken.lua
 #Modules\DruidModelFix.lua
-Modules\QuickSlot.lua
+Modules\QuickSlot.xml
 Modules\QuestAreaTrigger.lua
 Modules\Dreamseed.lua
 #Modules\EventMap.lua
@@ -50,10 +50,10 @@ Modules\GameTooltipExtension.xml
 Modules\LootUI.xml
 Modules\WoWAnniversary.lua
 Modules\UnderlightAngler.lua
-Modules\QuestItemDestroyAlert.lua
 Modules\SpellcastInfo.lua
 Modules\ChatOptions.lua
 Modules\NameplateResources.lua
+Modules\StaticPopupEnhancement.xml
 
 #Modules\QuestSpecialItemCooldown.lua
 #Modules\SecretOfAzeroth.lua
diff --git a/Plumber_Vanilla.toc b/Plumber_Vanilla.toc
index e59f14d..5bbf97b 100644
--- a/Plumber_Vanilla.toc
+++ b/Plumber_Vanilla.toc
@@ -1,4 +1,4 @@
-## Interface: 11505
+## Interface: 11505, 11506
 ## Version: 1.5.1
 
 ## Title: Plumber