Merge pull request #17 from h2oboi89/develop

v2.1

src/TradeSkillReagents.toc

@@ -1,7 +1,7 @@
 ## Interface: 90001
 ## Title: Trade Skill Reagents
 ## Author: Hotel2Oscar
-## Version: 2.0
+## Version: 2.1
 ## Notes: Shows which trade skills use the reagent in the tooltip
 ## X-Category: Tradeskill
 ## X-Embeds: Ace3
@@ -11,4 +11,4 @@
 
 embeds.xml
 
-Core.lua
+TradeSkillReagentsCore.lua

src/Core.lua → src/TradeSkillReagentsCore.lua

@@ -10,6 +10,7 @@ local defaults = {
         options = {
             debug = false,
             tooltip = {
+                disable = false,
                 useSingleColor = true,
                 singleColor = {r = 0, g = 1, b = 1, a = 1},
                 tradeSkills = {}
@@ -28,17 +29,20 @@ local options = {
             name = "Colors",
             type = "group",
             inline = true,
+            order = 0,
             args = {
                 useSingleColor = {
                     name = "Use single color for trade skills in tooltips",
                     desc = "Uncheck to use different colors for each trade skill",
                     type = "toggle",
+                    order = 0,
                     set = "SetOptionsSingleColorToggle",
                     get = "GetOptionsSingleColorToggle"
                 },
                 singleColor = {
                     name = "Single Color",
                     type = "color",
+                    order = 1,
                     set = "SetOptionsSingleColor",
                     get = "GetOptionsSingleColor"
                 },
@@ -52,10 +56,17 @@ local options = {
                 }
             }
         },
+        disableTooltip = {
+            name = "Disable tooltip",
+            desc = "Check to disable tooltip if Trade Skill Reagents is being used by another addon",
+            type = "toggle",
+            order = 1,
+            set = "SetOptionsDisableTooltip",
+            get = "GetOptionsDisableTooltip"
+        },
         debug = {
             name = "Debug",
             desc = "Enables debug print statements",
-            descStyle = "inline",
             type = "toggle",
             set = "SetOptionsDebug",
             get = "GetOptionsDebug",
@@ -180,12 +191,23 @@ end
 
 function TradeSkillReagents:OnEnable()
     self:RegisterEvent("TRADE_SKILL_LIST_UPDATE")
+    self:RegisterMessage("TRADE_SKILL_REAGENTS_QUERY")
 
     self:HookScript(GameTooltip, "OnToolTipSetItem", "AddTradeSkillTooltipInfo")
     self:HookScript(ItemRefTooltip, "OnToolTipSetItem",
                     "AddTradeSkillTooltipInfo")
 end
 
+function TradeSkillReagents:TRADE_SKILL_REAGENTS_QUERY(messageName, itemName)
+    local response = {itemName = itemName}
+
+    local tradeSkills = self.db.reagents[itemName]
+
+    if tradeSkills then response.tradeSkills = deepCopy(tradeSkills) end
+
+    self:SendMessage("TRADE_SKILL_REAGENTS_QUERY_RESPONSE", response)
+end
+
 function TradeSkillReagents:TRADE_SKILL_LIST_UPDATE()
     if self.ScanTimer then return end
 
@@ -287,7 +309,7 @@ function TradeSkillReagents:GetTooltipColor(tradeSkill)
 end
 
 function TradeSkillReagents:AddTradeSkillTooltipInfo(tooltip)
-    if IsShiftKeyDown() then return end
+    if IsShiftKeyDown() or self.db.options.tooltip.disable then return end
 
     local itemName, itemLink = tooltip:GetItem()
 
@@ -318,6 +340,14 @@ end
 
 function TradeSkillReagents:GetOptionsDebug(info) return self.db.options.debug end
 
+function TradeSkillReagents:SetOptionsDisableTooltip(info, value)
+    self.db.options.tooltip.disable = value
+end
+
+function TradeSkillReagents:GetOptionsDisableTooltip(info)
+    return self.db.options.tooltip.disable
+end
+
 function TradeSkillReagents:SetOptionsSingleColorToggle(info, value)
     self.db.options.tooltip.useSingleColor = value
 end
@@ -349,4 +379,4 @@ function TradeSkillReagents:GetOptionsTradeSkillColor(info)
     local tradeSkill = info[#info]
     local color = self.db.options.tooltip.tradeSkills[tradeSkill]
     return color.r, color.g, color.b, color.a
-end
+end

test/CommTest/CommTest.toc

@@ -0,0 +1,11 @@
+## Interface: 90001
+## Title: CommTest
+## Author: Hotel2Oscar
+## Version: 2.0
+## Notes: Addon to test Trade Skills Reagents inter addon communications
+## DefaultState: Enabled
+## LoadOnDemand: 0
+
+embeds.xml
+
+CommTestCore.lua

test/CommTest/CommTestCore.lua

@@ -0,0 +1,31 @@
+CommTest = LibStub("AceAddon-3.0"):NewAddon("CommTest", "AceConsole-3.0",
+                                            "AceEvent-3.0")
+
+function CommTest:OnInitialize()
+    self:RegisterChatCommand("commtest", "QueryItem")
+end
+
+function CommTest:OnEnable()
+    self:RegisterMessage("TRADE_SKILL_REAGENTS_QUERY_RESPONSE")
+end
+
+function CommTest:QueryItem(input)
+    self:Print("Sending " .. input)
+    self:SendMessage("TRADE_SKILL_REAGENTS_QUERY", input)
+end
+
+function CommTest:TRADE_SKILL_REAGENTS_QUERY_RESPONSE(messageName, response)
+    self:Print("Receiving " .. response.itemName)
+
+    if response.tradeSkills then
+        for tradeSkill, categories in pairs(response.tradeSkills) do
+            self:Print(" - " .. tradeSkill)
+
+            for _, category in ipairs(categories) do
+                self:Print("   - " .. category)
+            end
+        end
+    else
+        self:Print("  No trade skill info")
+    end
+end

test/CommTest/embeds.xml

@@ -0,0 +1,12 @@
+<Ui xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd">
+  <Script file="Libs\LibStub\LibStub.lua"/>
+  <Include file="Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml"/>
+  <Include file="Libs\AceAddon-3.0\AceAddon-3.0.xml"/>
+  <Include file="Libs\AceGUI-3.0\AceGUI-3.0.xml"/>
+  <Include file="Libs\AceConfig-3.0\AceConfig-3.0.xml"/>
+  <Include file="Libs\AceConsole-3.0\AceConsole-3.0.xml"/>
+  <Include file="Libs\AceDB-3.0\AceDB-3.0.xml"/>
+  <Include file="Libs\AceEvent-3.0\AceEvent-3.0.xml"/>
+  <Include file="Libs\AceHook-3.0\AceHook-3.0.xml"/>
+  <Include file="Libs\AceTimer-3.0\AceTimer-3.0.xml" />
+</Ui>