changeset 119:d94195157a6b

Moved the check for QAManager so it doesn't interfere with the tooltip or ArkInventory rule.
author Asa Ayers <Asa.Ayers@Gmail.com>
date Thu, 02 Sep 2010 21:16:04 -0700
parents 92b66533c386
children 09a38a382194
files CHANGELOG.txt Core.lua Modules/ArkInventoryRules.lua Modules/QuickAuctions.lua
diffstat 4 files changed, 27 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGELOG.txt	Thu Sep 02 21:04:07 2010 -0700
+++ b/CHANGELOG.txt	Thu Sep 02 21:16:04 2010 -0700
@@ -1,6 +1,7 @@
 2010-09-02  Asa Ayers  <Asa.Ayers@Gmail.com>
 
 - Updated the ArkInventory rule and tooltip to work in QA is compatible instead of if its enabled in ItemAuditor.
+- Moved the check for QAManager so it doesn't interfere with the tooltip or ArkInventory rule.
 
 2010-09-01  Asa Ayers  <Asa.Ayers@Gmail.com>
 
--- a/Core.lua	Thu Sep 02 21:04:07 2010 -0700
+++ b/Core.lua	Thu Sep 02 21:16:04 2010 -0700
@@ -100,7 +100,7 @@
 		self.db.char.crafting_threshold = nil
 	end
 
-	ItemAuditor:IsQACompatible()
+	ItemAuditor:IsQAEnabled()
 
 	--@debug@
 		-- ItemAuditor_DebugFrame:Show()
--- a/Modules/ArkInventoryRules.lua	Thu Sep 02 21:04:07 2010 -0700
+++ b/Modules/ArkInventoryRules.lua	Thu Sep 02 21:16:04 2010 -0700
@@ -56,9 +56,11 @@
 				if ItemAuditor:IsQACompatible() then
 					local groupName = QAAPI:GetItemGroup(link)
 					if groupName then
+						DevTools_Dump({link, groupName})
 						return true
 					end
 				end
+				DevTools_Dump({link, false})
 				return false
 			end
 			
--- a/Modules/QuickAuctions.lua	Thu Sep 02 21:04:07 2010 -0700
+++ b/Modules/QuickAuctions.lua	Thu Sep 02 21:16:04 2010 -0700
@@ -27,30 +27,33 @@
 
 
 function ItemAuditor:IsQACompatible()
-	local qam = GetAddOnInfo('QAManager')
-	if qam then
-		ItemAuditor.Options.args.qa_options.disabled = true
-		if ItemAuditor.db.char.use_quick_auctions then
-			ItemAuditor.db.char.use_quick_auctions = false
-			StaticPopupDialogs["ItemAuditor_QAOptionsReplaced"] = {
-				text = "The ability to have ItemAuditor adjust your QA thresholds is being moved to QAManager. If you have to use the options within ItemAuditor you can disable QAManager to restore them for now, but this option will change in the future.",
-				button1 = "OK",
-				timeout = 0,
-				whileDead = true,
-				hideOnEscape = true,
-				OnAccept = function()
-					-- StaticPopupDialogs["ItemAuditor_QAOptionsReplaced"] = nil
-				end,
-			}
-			StaticPopup_Show('ItemAuditor_QAOptionsReplaced')
-		end
-		return false
-	 end
 	return (QAAPI ~= nil and QAAPI.GetGroupConfig ~= nil)
 end
 
 function ItemAuditor:IsQAEnabled()
-	return ItemAuditor:IsQACompatible() and ItemAuditor.db.char.use_quick_auctions
+	if ItemAuditor:IsQACompatible() then
+		local qam = GetAddOnInfo('QAManager')
+		if qam then
+			ItemAuditor.Options.args.qa_options.disabled = true
+			if ItemAuditor.db.char.use_quick_auctions then
+				ItemAuditor.db.char.use_quick_auctions = false
+				StaticPopupDialogs["ItemAuditor_QAOptionsReplaced"] = {
+					text = "The ability to have ItemAuditor adjust your QA thresholds is being moved to QAManager. If you have to use the options within ItemAuditor you can disable QAManager to restore them for now, but this option will change in the future.",
+					button1 = "OK",
+					timeout = 0,
+					whileDead = true,
+					hideOnEscape = true,
+					OnAccept = function()
+						-- StaticPopupDialogs["ItemAuditor_QAOptionsReplaced"] = nil
+					end,
+				}
+				StaticPopup_Show('ItemAuditor_QAOptionsReplaced')
+			end
+			return false
+		end
+		return ItemAuditor.db.char.use_quick_auctions
+	end
+	return false
 end
 
 function ItemAuditor:IsQADisabled()