From 9f3c09dc16ca97b01d935409a44cc277f83ad309 Mon Sep 17 00:00:00 2001
From: James Whitehead II <jnwhiteh@gmail.com>
Date: Wed, 20 Aug 2008 21:43:09 +0000
Subject: [PATCH] Altered the configuration options to always use the Blizz UI
 panel

---
 TomTom_Config.lua |  101 +++++++++++++++++++++++++----------------------------
 1 file changed, 48 insertions(+), 53 deletions(-)

diff --git a/TomTom_Config.lua b/TomTom_Config.lua
index a6a9be9..b04d304 100644
--- a/TomTom_Config.lua
+++ b/TomTom_Config.lua
@@ -531,67 +531,62 @@ local dialog = LibStub("AceConfigDialog-3.0")
 local registered = false;
 
 local options
+local function createBlizzOptions()
+	options = createconfig()
 
-SLASH_TOMTOM1 = "/tomtom"
-SlashCmdList["TOMTOM"] = function(msg)
-	if not registered then
-		options = options or createconfig()
-		config:RegisterOptionsTable("TomTom", options)
-		dialog:SetDefaultSize("TomTom", 600, 500)
-		registered = true
-	end
+	config:RegisterOptionsTable("TomTom-Bliz", {
+		name = L["TomTom"],
+		type = "group",
+		args = {
+			help = {
+				type = "description",
+				name = "TomTom is a simple navigation assistant",
+			},
+		},
+	})
+	dialog:SetDefaultSize("TomTom-Bliz", 600, 400)
+	dialog:AddToBlizOptions("TomTom-Bliz", "TomTom")
 
-	dialog:Open("TomTom")
-end
 
-local build = select(2, GetBuildInfo())
-if tonumber(build) > 8000 then
-	local hijack = CreateFrame("Frame", nil, InterfaceOptionsFrame)
-	hijack:SetScript("OnShow", function()
-		hijack:Hide()
-		options = createconfig()
+	-- General Options
+	config:RegisterOptionsTable("TomTom-General", options.args.general)
+	local blizzPanel = dialog:AddToBlizOptions("TomTom-General", options.args.general.name, "TomTom")
 
-		config:RegisterOptionsTable("TomTom-Bliz", {
-			name = L["TomTom"],
-			type = "group",
-			args = {
-				help = {
-					type = "description",
-					name = "TomTom is a simple navigation assistant",
-				},
-			},
-		})
-		dialog:SetDefaultSize("TomTom-Bliz", 600, 400)
-		dialog:AddToBlizOptions("TomTom-Bliz", "TomTom")
+	-- Coordinate Block Options
+	config:RegisterOptionsTable("TomTom-CoordBlock", options.args.coordblock)
+	dialog:AddToBlizOptions("TomTom-CoordBlock", options.args.coordblock.name, "TomTom")
 
+	-- Crazy Taxi Options
+	config:RegisterOptionsTable("TomTom-CrazyTaxi", options.args.crazytaxi)
+	dialog:AddToBlizOptions("TomTom-CrazyTaxi", options.args.crazytaxi.name, "TomTom")
 
-		-- General Options
-		config:RegisterOptionsTable("TomTom-General", options.args.general)
-		dialog:AddToBlizOptions("TomTom-General", options.args.general.name, "TomTom")
-		
-		-- Coordinate Block Options
-		config:RegisterOptionsTable("TomTom-CoordBlock", options.args.coordblock)
-		dialog:AddToBlizOptions("TomTom-CoordBlock", options.args.coordblock.name, "TomTom")
+	-- Minimap Options
+	config:RegisterOptionsTable("TomTom-Minimap", options.args.minimap)
+	dialog:AddToBlizOptions("TomTom-Minimap", options.args.minimap.name, "TomTom")
 
-		-- Crazy Taxi Options
-		config:RegisterOptionsTable("TomTom-CrazyTaxi", options.args.crazytaxi)
-		dialog:AddToBlizOptions("TomTom-CrazyTaxi", options.args.crazytaxi.name, "TomTom")
+	-- World Map Options
+	config:RegisterOptionsTable("TomTom-Worldmap", options.args.worldmap)
+	dialog:AddToBlizOptions("TomTom-Worldmap", options.args.worldmap.name, "TomTom")
 
-		-- Minimap Options
-		config:RegisterOptionsTable("TomTom-Minimap", options.args.minimap)
-		dialog:AddToBlizOptions("TomTom-Minimap", options.args.minimap.name, "TomTom")
+	-- Profile Options
+	local p_options = options.args.profile.args.options
+	local w_options = options.args.profile.args.waypoints
+	config:RegisterOptionsTable("TomTom-Profiles-Waypoints", w_options)
+	config:RegisterOptionsTable("TomTom-Profiles-Options", p_options)
+	dialog:AddToBlizOptions("TomTom-Profiles-Waypoints", w_options.name, "TomTom")
+	dialog:AddToBlizOptions("TomTom-Profiles-Options", p_options.name, "TomTom")
+	return blizzPanel
+end
 
-		-- World Map Options
-		config:RegisterOptionsTable("TomTom-Worldmap", options.args.worldmap)
-		dialog:AddToBlizOptions("TomTom-Worldmap", options.args.worldmap.name, "TomTom")
-		
-		-- Profile Options
-		local p_options = options.args.profile.args.options
-		local w_options = options.args.profile.args.waypoints
-		config:RegisterOptionsTable("TomTom-Profiles-Waypoints", w_options)
-		config:RegisterOptionsTable("TomTom-Profiles-Options", p_options)
-		dialog:AddToBlizOptions("TomTom-Profiles-Waypoints", w_options.name, "TomTom")
-		dialog:AddToBlizOptions("TomTom-Profiles-Options", p_options.name, "TomTom")
+SLASH_TOMTOM1 = "/tomtom"
+local blizzPanel
+SlashCmdList["TOMTOM"] = function(msg)
+	if not registered then
+		blizzPanel = createBlizzOptions()
+		registered = true
 	end
-	)
+
+	InterfaceOptionsFrame_OpenToFrame(blizzPanel)
 end
+
+
-- 
1.7.9.5