From 9cfb1fe3e3786c9aa2b4b78c11d68024f10f0d10 Mon Sep 17 00:00:00 2001
From: ackis <ackis@dummy.example.com>
Date: Sat, 7 Feb 2009 17:34:46 +0000
Subject: [PATCH] fix a bug or two, tooltips are back kinda

---
 ARLFrame.lua |  535 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 265 insertions(+), 270 deletions(-)

diff --git a/ARLFrame.lua b/ARLFrame.lua
index 4693452..080a506 100644
--- a/ARLFrame.lua
+++ b/ARLFrame.lua
@@ -6,10 +6,10 @@ ARLFrame.lua
 
 Frame functions for all of AckisRecipeList
 
-File date: @file-date-iso@ 
-File revision: @file-revision@ 
-Project revision: @project-revision@
-Project version: @project-version@
+File date: 2009-02-06T20:02:19Z 
+File revision: 1480 
+Project revision: 1481
+Project version: r1481
 
 ****************************************************************************************
 
@@ -306,9 +306,9 @@ function addon:SetupMiniMap()
 	end
 
 	for k, j in pairs(minimaplist) do
-		--@debug@
+		--[===[@debug@
 			addon:Print("Adding vendor ID: " .. k .. " to the mini-map.")
-		--@end-debug@
+		--@end-debug@]===]
 		-- continent continent 0 is the world of Azeroth, 1 is Kalimdor, 2 is Eastern Continent, 3 is Outland, 4 is northrend
 		-- zone http://www.wowwiki.com/LocalizedMapZones
 		local button = CreateFrame("Button", "TestButtonARL")
@@ -501,334 +501,330 @@ end
 local function GenerateTooltipContent(owner, rIndex, playerFaction, exclude)
 
 	local clr1, clr2 = "", ""
+	local spelltooltiplocation = addon.db.profile.spelltooltiplocation
+	local acquiretooltiplocation = addon.db.profile.acquiretooltiplocation
 
-	arlTooltip:ClearLines()
+	local spelllink = recipeDB[rIndex]["RecipeLink"]
 
-	gttAdd(0, 1, 0, 0, recipeDB[rIndex]["Name"], addon:hexcolor("HIGH"))
+	--@alpha@
+	addon:Print("Setting Spell Tooltip to " .. spelltooltiplocation)
+	addon:Print("Setting Acquire Tooltip to " .. acquiretooltiplocation)
+	--@end-alpha@
 
-	-- check if the recipe is excluded
-	if (exclude[rIndex] == true) then
-		clr1 = addon:hexcolor("RED")
-		gttAdd(0, -1, 1, 0, L["RECIPE_EXCLUDED"], clr1)
-	end
+	if (acquiretooltiplocation == L["Off"]) then
+		arlTooltip:Hide()
+		-- If we have the spell link tooltip, link it to the owner instead so it shows
+		if (spelltooltiplocation ~= L["Off"]) and (spelllink) then
+			SetSpellTooltip(owner, spelltooltiplocation)
+			arlTooltip2:SetHyperlink(spelllink)
+			arlTooltip2:Show()
+		else
+			arlTooltip2:Hide()
+		end
+	else
+		arlTooltip:SetOwner(owner)
+		if (acquiretooltiplocation == "Right") then
+			arlTooltip:SetPoint("TOPRIGHT", addon.Frame, "TOPLEFT")
+		elseif (acquiretooltiplocation == "Left") then
+			arlTooltip:SetPoint("TOPLEFT", owner, "TOPRIGHT")
+		elseif (acquiretooltiplocation == "Top") then
+			arlTooltip:SetPoint("BOTTOMLEFT", owner, "TOPLEFT")
+		elseif (acquiretooltiplocation == "Bottom") then
+			arlTooltip:SetPoint("TOPLEFT", owner, "BOTTOMLEFT")
+		elseif (acquiretooltiplocation == "Mouse") then
+			arlTooltip:SetPoint("TOPRIGHT", owner, "TOPLEFT")
+		end
+		arlTooltip:ClearLines()
 
-	-- Add in skill level requirement, colored correctly
-	clr1 = addon:hexcolor("NORMAL")
+		gttAdd(0, 1, 0, 0, recipeDB[rIndex]["Name"], addon:hexcolor("HIGH"))
 
-	local recipeSkill = recipeDB[rIndex]["Level"]
-	local playerSkill = playerData.playerProfessionLevel
+		-- check if the recipe is excluded
+		if (exclude[rIndex] == true) then
+			clr1 = addon:hexcolor("RED")
+			gttAdd(0, -1, 1, 0, L["RECIPE_EXCLUDED"], clr1)
+		end
 
-	if (recipeSkill > playerSkill) then
-		clr2 = addon:hexcolor("RED")
-	elseif ((playerSkill - recipeSkill) < 20) then
-		clr2 = addon:hexcolor("ORANGE")
-	elseif ((playerSkill - recipeSkill) < 30) then
-		clr2 = addon:hexcolor("YELLOW")
-	elseif ((playerSkill - recipeSkill) < 40) then
-		clr2 = addon:hexcolor("GREEN") 
-	else
-		clr2 = addon:hexcolor("MIDGREY")
-	end
+		-- Add in skill level requirement, colored correctly
+		clr1 = addon:hexcolor("NORMAL")
 
-	gttAdd(0, -1, 0, 0, L["Required Skill"] .. " :", clr1, recipeDB[rIndex]["Level"], clr2)
-	-- spacer
-	gttAdd(0, 0, 0, 0, ".", addon:hexcolor("BLACK"))
-	-- Binding info
-	clr1 = addon:hexcolor("NORMAL")
+		local recipeSkill = recipeDB[rIndex]["Level"]
+		local playerSkill = playerData.playerProfessionLevel
 
-	if (recipeDB[rIndex]["Flags"][36]) then
-		gttAdd(0, -1, 1, 0, L["BOEFilter"], clr1)
-	end
+		if (recipeSkill > playerSkill) then
+			clr2 = addon:hexcolor("RED")
+		elseif ((playerSkill - recipeSkill) < 20) then
+			clr2 = addon:hexcolor("ORANGE")
+		elseif ((playerSkill - recipeSkill) < 30) then
+			clr2 = addon:hexcolor("YELLOW")
+		elseif ((playerSkill - recipeSkill) < 40) then
+			clr2 = addon:hexcolor("GREEN") 
+		else
+			clr2 = addon:hexcolor("MIDGREY")
+		end
 
-	if (recipeDB[rIndex]["Flags"][37]) then
-		gttAdd(0, -1, 1, 0, L["BOPFilter"], clr1)
-	end
+		gttAdd(0, -1, 0, 0, L["Required Skill"] .. " :", clr1, recipeDB[rIndex]["Level"], clr2)
+		-- spacer
+		gttAdd(0, 0, 0, 0, ".", addon:hexcolor("BLACK"))
+		-- Binding info
+		clr1 = addon:hexcolor("NORMAL")
 
-	if (recipeDB[rIndex]["Flags"][38]) then
-		gttAdd(0, -1, 1, 0, L["BOAFilter"], clr1)
-	end
+		if (recipeDB[rIndex]["Flags"][36]) then
+			gttAdd(0, -1, 1, 0, L["BOEFilter"], clr1)
+		end
 
-	if (recipeDB[rIndex]["Flags"][40]) then
-		gttAdd(0, -1, 1, 0, L["RecipeBOEFilter"], clr1)
-	end
+		if (recipeDB[rIndex]["Flags"][37]) then
+			gttAdd(0, -1, 1, 0, L["BOPFilter"], clr1)
+		end
 
-	if (recipeDB[rIndex]["Flags"][41]) then
-		gttAdd(0, -1, 1, 0, L["RecipeBOPFilter"], clr1)
-	end
+		if (recipeDB[rIndex]["Flags"][38]) then
+			gttAdd(0, -1, 1, 0, L["BOAFilter"], clr1)
+		end
 
-	if (recipeDB[rIndex]["Flags"][42]) then
-		gttAdd(0, -1, 1, 0, L["RecipeBOAFilter"], clr1)
-	end
+		if (recipeDB[rIndex]["Flags"][40]) then
+			gttAdd(0, -1, 1, 0, L["RecipeBOEFilter"], clr1)
+		end
+
+		if (recipeDB[rIndex]["Flags"][41]) then
+			gttAdd(0, -1, 1, 0, L["RecipeBOPFilter"], clr1)
+		end
 
-	-- spacer
-	gttAdd(0, 0, 0, 0, ".", addon:hexcolor("BLACK"))
+		if (recipeDB[rIndex]["Flags"][42]) then
+			gttAdd(0, -1, 1, 0, L["RecipeBOAFilter"], clr1)
+		end
 
-	-- obtain info
-	gttAdd(0, -1, 0, 0, L["Obtained From"] .. " : ", addon:hexcolor("NORMAL"))
+		-- spacer
+		gttAdd(0, 0, 0, 0, ".", addon:hexcolor("BLACK"))
 
-	-- loop through acquire methods, display each
-	for k, v in pairs(recipeDB[rIndex]["Acquire"]) do
+		-- obtain info
+		gttAdd(0, -1, 0, 0, L["Obtained From"] .. " : ", addon:hexcolor("NORMAL"))
 
-		-- Trainer
-		if (v["Type"] == 1) then
-			-- Trainer:				TrainerName
-			-- TrainerZone			TrainerCoords
-			local trnr = trainerDB[v["ID"]]
-			local cStr = ""
-			-- Do we want to display this trainer?
-			local displaytt = false
-			clr1 = addon:hexcolor("TRAINER")
-			if (trnr["Faction"] == BFAC["Horde"]) then
-				clr2 = addon:hexcolor("HORDE")
-				if (playerFaction == BFAC["Horde"]) then
-					displaytt = true
+		-- loop through acquire methods, display each
+		for k, v in pairs(recipeDB[rIndex]["Acquire"]) do
+
+			-- Trainer
+			if (v["Type"] == 1) then
+				-- Trainer:				TrainerName
+				-- TrainerZone			TrainerCoords
+				local trnr = trainerDB[v["ID"]]
+				local cStr = ""
+				-- Do we want to display this trainer?
+				local displaytt = false
+				clr1 = addon:hexcolor("TRAINER")
+				if (trnr["Faction"] == BFAC["Horde"]) then
+					clr2 = addon:hexcolor("HORDE")
+					if (playerFaction == BFAC["Horde"]) then
+						displaytt = true
+					end
+				elseif (trnr["Faction"] == BFAC["Alliance"]) then
+					clr2 = addon:hexcolor("ALLIANCE")
+					if (playerFaction == BFAC["Alliance"]) then
+						displaytt = true
+					end
+				else
+					clr2 = addon:hexcolor("NEUTRAL")
 				end
-			elseif (trnr["Faction"] == BFAC["Alliance"]) then
-				clr2 = addon:hexcolor("ALLIANCE")
-				if (playerFaction == BFAC["Alliance"]) then
-					displaytt = true
+
+				if (displaytt) then
+					-- Add the trainer information to the tooltip
+					gttAdd(0, -2, 0, 0, L["Trainer"], clr1, trnr["Name"], clr2)
+					-- If we have a coordinate, add the coordinates to the tooltop
+					if (trnr["Coordx"] ~= 0) and (trnr["Coordy"] ~= 0) then
+						cStr = "(" .. trnr["Coordx"] .. ", " .. trnr["Coordy"] .. ")"
+					end
+					clr1 = addon:hexcolor("NORMAL")
+					clr2 = addon:hexcolor("HIGH")
+					gttAdd(1, -2, 1, 0, trnr["Location"], clr1, cStr, clr2)
 				end
-			else
-				clr2 = addon:hexcolor("NEUTRAL")
-			end
 
-			if (displaytt) then
-				-- Add the trainer information to the tooltip
-				gttAdd(0, -2, 0, 0, L["Trainer"], clr1, trnr["Name"], clr2)
-				-- If we have a coordinate, add the coordinates to the tooltop
-				if (trnr["Coordx"] ~= 0) and (trnr["Coordy"] ~= 0) then
-					cStr = "(" .. trnr["Coordx"] .. ", " .. trnr["Coordy"] .. ")"
+			-- Vendor
+			elseif (v["Type"] == 2) then
+
+				-- Vendor:					VendorName
+				-- VendorZone				VendorCoords
+				local vndr = vendorDB[v["ID"]]
+				local cStr = ""
+
+				if (vndr["Coordx"] ~= 0) and (vndr["Coordy"] ~= 0) then
+					cStr = "(" .. vndr["Coordx"] .. ", " .. vndr["Coordy"] .. ")"
+				end
+
+				clr1 = addon:hexcolor("VENDOR")
+				if (vndr["Faction"] == BFAC["Horde"]) then
+					clr2 = addon:hexcolor("HORDE")
+				elseif (vndr["Faction"] == BFAC["Alliance"]) then
+					clr2 = addon:hexcolor("ALLIANCE")
+				else
+					clr2 = addon:hexcolor("NEUTRAL")
 				end
+
+				gttAdd(0, -1, 0, 0, L["Vendor"], clr1, vndr["Name"], clr2)
 				clr1 = addon:hexcolor("NORMAL")
 				clr2 = addon:hexcolor("HIGH")
-				gttAdd(1, -2, 1, 0, trnr["Location"], clr1, cStr, clr2)
-			end
+				gttAdd(1, -2, 1, 0, vndr["Location"], clr1, cStr, clr2)
 
-		-- Vendor
-		elseif (v["Type"] == 2) then
+			-- Mob Drop
+			elseif (v["Type"] == 3) then
 
-			-- Vendor:					VendorName
-			-- VendorZone				VendorCoords
-			local vndr = vendorDB[v["ID"]]
-			local cStr = ""
+				-- Mob Drop:				Mob Name
+				-- MobZone					MobCoords
+				local mob = mobDB[v["ID"]]
+				local cStr = ""
 
-			if (vndr["Coordx"] ~= 0) and (vndr["Coordy"] ~= 0) then
-				cStr = "(" .. vndr["Coordx"] .. ", " .. vndr["Coordy"] .. ")"
-			end
+				if (mob["Coordx"] ~= 0) and (mob["Coordy"] ~= 0) then
 
-			clr1 = addon:hexcolor("VENDOR")
-			if (vndr["Faction"] == BFAC["Horde"]) then
+					cStr = "(" .. mob["Coordx"] .. ", " .. mob["Coordy"] .. ")"
+
+				end
+
+				clr1 = addon:hexcolor("MOBDROP")
 				clr2 = addon:hexcolor("HORDE")
-			elseif (vndr["Faction"] == BFAC["Alliance"]) then
-				clr2 = addon:hexcolor("ALLIANCE")
-			else
-				clr2 = addon:hexcolor("NEUTRAL")
-			end
+				gttAdd(0, -1, 0, 0, L["Mob Drop"], clr1, mob["Name"], clr2)
+				clr1 = addon:hexcolor("NORMAL")
+				clr2 = addon:hexcolor("HIGH")
+				gttAdd(1, -2, 1, 0, mob["Location"], clr1, cStr, clr2)
 
-			gttAdd(0, -1, 0, 0, L["Vendor"], clr1, vndr["Name"], clr2)
-			clr1 = addon:hexcolor("NORMAL")
-			clr2 = addon:hexcolor("HIGH")
-			gttAdd(1, -2, 1, 0, vndr["Location"], clr1, cStr, clr2)
+			-- Quest
+			elseif (v["Type"] == 4) then
 
-		-- Mob Drop
-		elseif (v["Type"] == 3) then
+				-- Quest:					QuestName
+				-- QuestZone				QuestCoords
+				local qst = questDB[v["ID"]]
 
-			-- Mob Drop:				Mob Name
-			-- MobZone					MobCoords
-			local mob = mobDB[v["ID"]]
-			local cStr = ""
+				if (qst ~= nil) then
 
-			if (mob["Coordx"] ~= 0) and (mob["Coordy"] ~= 0) then
+					local cStr = ""
 
-				cStr = "(" .. mob["Coordx"] .. ", " .. mob["Coordy"] .. ")"
+					if (qst["Coordx"] ~= 0) and (qst["Coordy"] ~= 0) then
 
-			end
+						cStr = "(" .. qst["Coordx"] .. ", " .. qst["Coordy"] .. ")"
 
-			clr1 = addon:hexcolor("MOBDROP")
-			clr2 = addon:hexcolor("HORDE")
-			gttAdd(0, -1, 0, 0, L["Mob Drop"], clr1, mob["Name"], clr2)
-			clr1 = addon:hexcolor("NORMAL")
-			clr2 = addon:hexcolor("HIGH")
-			gttAdd(1, -2, 1, 0, mob["Location"], clr1, cStr, clr2)
+					end
 
-		-- Quest
-		elseif (v["Type"] == 4) then
+					clr1 = addon:hexcolor("QUEST")
 
-			-- Quest:					QuestName
-			-- QuestZone				QuestCoords
-			local qst = questDB[v["ID"]]
+					if (qst["Faction"] == BFAC["Horde"]) then
+						clr2 = addon:hexcolor("HORDE")
+					elseif (qst["Faction"] == BFAC["Alliance"]) then
+						clr2 = addon:hexcolor("ALLIANCE")
+					else
+						clr2 = addon:hexcolor("NEUTRAL")
+					end
 
-			if (qst ~= nil) then
+					gttAdd(0, -1, 0, 0, L["Quest"], clr1, qst["Name"], clr2)
+					clr1 = addon:hexcolor("NORMAL")
+					clr2 = addon:hexcolor("HIGH")
+					gttAdd(1, -2, 1, 0, qst["Location"], clr1, cStr, clr2)
 
-				local cStr = ""
+				end
 
-				if (qst["Coordx"] ~= 0) and (qst["Coordy"] ~= 0) then
+			-- Seasonal
+			elseif (v["Type"] == 5) then
+
+				-- Seasonal:				SeasonEventName
+				local ssnname = seasonDB[v["ID"]]["Name"]
+
+				clr1 = addon:hexcolor("SEASON")
+				gttAdd(0, -1, 0, 0, L["Seasonal"], clr1, ssnname, clr1)
 
-					cStr = "(" .. qst["Coordx"] .. ", " .. qst["Coordy"] .. ")"
+			-- Reputation
+			elseif (v["Type"] == 6) then
+
+				-- Reputation:				Faction
+				-- FactionLevel				RepVendor				
+				-- RepVendorZone			RepVendorCoords
+
+				local repfac = repDB[v["ID"]]
+				local repname = repfac["Name"] -- name
+				local rplvl = v["RepLevel"]
+				local repvndr = vendorDB[v["RepVendor"]]
+				local cStr = ""
 
+				if (repvndr["Coordx"] ~= 0) and (repvndr["Coordy"] ~= 0) then
+					cStr = "(" .. repvndr["Coordx"] .. ", " .. repvndr["Coordy"] .. ")"
 				end
+				
+				clr1 = addon:hexcolor("REP")
+				clr2 = addon:hexcolor("NORMAL")
+				gttAdd(0, -1, 0, 0, L["Reputation"], clr1, repname, clr2)
 
-				clr1 = addon:hexcolor("QUEST")
+				local rStr = ""
+				if (rplvl == 0) then
+					rStr = BFAC["Neutral"]
+					clr1 = addon:hexcolor("NEUTRAL")
+				elseif (rplvl == 1) then
+					rStr = BFAC["Neutral"]
+					clr1 = addon:hexcolor("FRIENDLY")
+				elseif (rplvl == 2) then
+					rStr = BFAC["Honored"]
+					clr1 = addon:hexcolor("HONORED")
+				elseif (rplvl == 3) then
+					rStr = BFAC["Revered"]
+					clr1 = addon:hexcolor("REVERED")
+				else
+					rStr = BFAC["Exalted"]
+					clr1 = addon:hexcolor("EXALTED")
+				end
 
-				if (qst["Faction"] == BFAC["Horde"]) then
+				if (repvndr["Faction"] == BFAC["Horde"]) then
 					clr2 = addon:hexcolor("HORDE")
-				elseif (qst["Faction"] == BFAC["Alliance"]) then
+				elseif (repvndr["Faction"] == BFAC["Alliance"]) then
 					clr2 = addon:hexcolor("ALLIANCE")
 				else
 					clr2 = addon:hexcolor("NEUTRAL")
 				end
 
-				gttAdd(0, -1, 0, 0, L["Quest"], clr1, qst["Name"], clr2)
+				gttAdd(1, -2, 0, 0, rStr, clr1, repvndr["Name"], clr2)
 				clr1 = addon:hexcolor("NORMAL")
 				clr2 = addon:hexcolor("HIGH")
-				gttAdd(1, -2, 1, 0, qst["Location"], clr1, cStr, clr2)
-
-			end
-
-		-- Seasonal
-		elseif (v["Type"] == 5) then
-
-			-- Seasonal:				SeasonEventName
-			local ssnname = seasonDB[v["ID"]]["Name"]
-
-			clr1 = addon:hexcolor("SEASON")
-			gttAdd(0, -1, 0, 0, L["Seasonal"], clr1, ssnname, clr1)
-
-		-- Reputation
-		elseif (v["Type"] == 6) then
-
-			-- Reputation:				Faction
-			-- FactionLevel				RepVendor				
-			-- RepVendorZone			RepVendorCoords
+				gttAdd(2, -2, 1, 0, repvndr["Location"], clr1, cStr, clr2)
+
+			-- World Drop
+			elseif (v["Type"] == 7) then
+
+				-- World Drop				RarityLevel
+				if (v["ID"] == 1) then
+					clr1 = addon:hexcolor("COMMON")
+				elseif (v["ID"] == 2) then
+					clr1 = addon:hexcolor("UNCOMMON")
+				elseif (v["ID"] == 3) then
+					clr1 = addon:hexcolor("RARE")
+				elseif (v["ID"] == 4) then
+					clr1 = addon:hexcolor("EPIC")
+				else
+					clr1 = addon:hexcolor("NORMAL")
+				end
 
-			local repfac = repDB[v["ID"]]
-			local repname = repfac["Name"] -- name
-			local rplvl = v["RepLevel"]
-			local repvndr = vendorDB[v["RepVendor"]]
-			local cStr = ""
+				gttAdd(0, -1, 0, 0, L["World Drop"], clr1)
 
-			if (repvndr["Coordx"] ~= 0) and (repvndr["Coordy"] ~= 0) then
-				cStr = "(" .. repvndr["Coordx"] .. ", " .. repvndr["Coordy"] .. ")"
-			end
-			
-			clr1 = addon:hexcolor("REP")
-			clr2 = addon:hexcolor("NORMAL")
-			gttAdd(0, -1, 0, 0, L["Reputation"], clr1, repname, clr2)
-
-			local rStr = ""
-			if (rplvl == 0) then
-				rStr = BFAC["Neutral"]
-				clr1 = addon:hexcolor("NEUTRAL")
-			elseif (rplvl == 1) then
-				rStr = BFAC["Neutral"]
-				clr1 = addon:hexcolor("FRIENDLY")
-			elseif (rplvl == 2) then
-				rStr = BFAC["Honored"]
-				clr1 = addon:hexcolor("HONORED")
-			elseif (rplvl == 3) then
-				rStr = BFAC["Revered"]
-				clr1 = addon:hexcolor("REVERED")
-			else
-				rStr = BFAC["Exalted"]
-				clr1 = addon:hexcolor("EXALTED")
-			end
+			-- Custom entry
+			elseif (v["Type"] == 8) then
 
-			if (repvndr["Faction"] == BFAC["Horde"]) then
-				clr2 = addon:hexcolor("HORDE")
-			elseif (repvndr["Faction"] == BFAC["Alliance"]) then
-				clr2 = addon:hexcolor("ALLIANCE")
-			else
-				clr2 = addon:hexcolor("NEUTRAL")
-			end
+				-- Seasonal:				SeasonEventName
+				local customname = customDB[v["ID"]]["Name"]
 
-			gttAdd(1, -2, 0, 0, rStr, clr1, repvndr["Name"], clr2)
-			clr1 = addon:hexcolor("NORMAL")
-			clr2 = addon:hexcolor("HIGH")
-			gttAdd(2, -2, 1, 0, repvndr["Location"], clr1, cStr, clr2)
+				clr1 = addon:hexcolor("NORMAL")
+				gttAdd(0, -1, 0, 0, customname, clr1)
 
-		-- World Drop
-		elseif (v["Type"] == 7) then
-
-			-- World Drop				RarityLevel
-			if (v["ID"] == 1) then
-				clr1 = addon:hexcolor("COMMON")
-			elseif (v["ID"] == 2) then
-				clr1 = addon:hexcolor("UNCOMMON")
-			elseif (v["ID"] == 3) then
-				clr1 = addon:hexcolor("RARE")
-			elseif (v["ID"] == 4) then
-				clr1 = addon:hexcolor("EPIC")
+			-- Unhandled
 			else
 				clr1 = addon:hexcolor("NORMAL")
+				gttAdd(0, -1, 0, 0, L["Unhandled Recipe"], clr1)
 			end
 
-			gttAdd(0, -1, 0, 0, L["World Drop"], clr1)
-
-		-- Custom entry
-		elseif (v["Type"] == 8) then
-
-			-- Seasonal:				SeasonEventName
-			local customname = customDB[v["ID"]]["Name"]
-
-			clr1 = addon:hexcolor("NORMAL")
-			gttAdd(0, -1, 0, 0, customname, clr1)
-
-		-- Unhandled
-		else
-			clr1 = addon:hexcolor("NORMAL")
-			gttAdd(0, -1, 0, 0, L["Unhandled Recipe"], clr1)
 		end
 
-	end
-
-	-- Spacer
-	gttAdd(0, 0, 0, 0, ".", addon:hexcolor("BLACK"))
-
-	clr1 = addon:hexcolor("NORMAL")
+		-- Spacer
+		gttAdd(0, 0, 0, 0, ".", addon:hexcolor("BLACK"))
 
-	gttAdd(0, -1, 0, 0, L["ALT_CLICK"], clr1)
-	gttAdd(0, -1, 0, 1, L["CTRL_CLICK"], clr1)
-	gttAdd(0, -1, 0, 1, L["SHIFT_CLICK"], clr1)
-
-	local spelllink = recipeDB[rIndex]["RecipeLink"]
-	local spelltooltiplocation = addon.db.profile.spelltooltiplocation
-	local acquiretooltiplocation = addon.db.profile.acquiretooltiplocation
+		clr1 = addon:hexcolor("NORMAL")
 
-	--@alpha@
-	addon:Print("Setting Spell Tooltip to " .. spelltooltiplocation)
-	addon:Print("Setting Acquire Tooltip to " .. acquiretooltiplocation)
-	--@end-alpha@
-
-	-- Acquire Tooltip is off
-	if (acquiretooltiplocation == L["Off"]) then
-		arlTooltip:Hide()
-		-- If we have the spell link tooltip, link it to the owner instead so it shows
-		if (spelltooltiplocation ~= L["Off"]) and (spelllink) then
-			SetSpellTooltip(owner, spelltooltiplocation)
-			arlTooltip2:SetHyperlink(spelllink)
-			arlTooltip2:Show()
-		else
-			arlTooltip2:Hide()
-		end
-	-- Acquire tooltip is on
-	else
-		--arlTooltip:SetOwner(owner, "ANCHOR_RIGHT")
-		arlTooltip:SetOwner(owner)
-		if (acquiretooltiplocation == "Right") then
-			arlTooltip:SetPoint("TOPLEFT", owner, "TOPRIGHT")
-		elseif (acquiretooltiplocation == "Left") then
-			arlTooltip:SetPoint("TOPRIGHT", owner, "TOPLEFT")
-		elseif (acquiretooltiplocation == "Top") then
-			arlTooltip1:SetPoint("BOTTOMLEFT", owner, "TOPLEFT")
-		elseif (acquiretooltiplocation == "Bottom") then
-			arlTooltip1:SetPoint("TOPLEFT", owner, "BOTTOMLEFT")
-		elseif (acquiretooltiplocation == "Mouse") then
-			arlTooltip:SetOwner(owner, "ANCHOR_CURSOR")
-		end
+		gttAdd(0, -1, 0, 0, L["ALT_CLICK"], clr1)
+		gttAdd(0, -1, 0, 1, L["CTRL_CLICK"], clr1)
+		gttAdd(0, -1, 0, 1, L["SHIFT_CLICK"], clr1)
 
 		arlTooltip:Show()
 
-		-- Link the spell link tooltip to the acquire tooltip
+		-- If we have the spell link tooltip, link it to the owner instead so it shows
 		if (spelltooltiplocation ~= L["Off"]) and (spelllink) then
 			SetSpellTooltip(arlTooltip, spelltooltiplocation)
 			arlTooltip2:SetHyperlink(spelllink)
@@ -974,13 +970,13 @@ local function RecipeList_Update()
 		elseif (playerData.excluded_recipes_unknown ~= 0) then
 			StaticPopup_Show("ARL_ALLEXCLUDED")
 		else
-			--@debug@
+			--[===[@debug@
 			addon:Print("DEBUG: recipes_total: " .. playerData.recipes_total)
 			addon:Print("DEBUG: recipes_known: " .. playerData.recipes_known)
 			addon:Print("DEBUG: recipes_total_filtered: " .. playerData.recipes_total_filtered)
 			addon:Print("DEBUG: recipes_known_filtered: " .. playerData.recipes_known_filtered)
 			addon:Print("DEBUG: excluded_recipes_unknown: " .. playerData.excluded_recipes_unknown)			
-			--@end-debug@
+			--@end-debug@]===]
 			addon:Print(L["NO_DISPLAY"])
 		end
 
@@ -1175,7 +1171,6 @@ function addon:ShowScanButton()
 		addon.ScanButton:SetParent(CauldronFrame)
 		addon.ScanButton:ClearAllPoints()
 		addon.ScanButton:SetPoint("TOP", CauldronFrame, "BOTTOM", 0, 0)
-		--addon.ScanButton:SetHeight(ATSWOptionsButton:GetHeight())
 		addon.ScanButton:SetWidth(90)
 	-- Anchor to trade window
 	else
@@ -1189,9 +1184,9 @@ function addon:ShowScanButton()
 		elseif (loc == "TL") then
 			addon.ScanButton:SetPoint("LEFT",TradeSkillFramePortrait,"RIGHT",2,12)
 		elseif (loc == "BR") then
-			addon.ScanButton:SetPoint("RIGHT",TradeSkillFrameCloseButton,"LEFT",4,0)
+			addon.ScanButton:SetPoint("TOP",TradeSkillCancelButton,"BOTTOM",0,-5)
 		elseif (loc == "BL") then
-			addon.ScanButton:SetPoint("LEFT",TradeSkillFramePortrait,"RIGHT",2,12)
+			addon.ScanButton:SetPoint("TOP",TradeSkillCreateAllButton,"BOTTOM",0,-5)
 		end
 		addon.ScanButton:SetWidth(addon.ScanButton:GetTextWidth() + 10)
 	end
-- 
1.7.9.5