From 8d58e997f8f46b76d986842e0a0ba18ef132a702 Mon Sep 17 00:00:00 2001 From: "James D. Callahan III" Date: Wed, 7 Jul 2010 01:06:48 -0400 Subject: [PATCH] Changed the Map Options panel - moved things around and changed tooltip texts. --- Config.lua | 112 ++++++++++++++++++++++++++++++++---------------- Locales/devel-enUS.lua | 12 ++---- 2 files changed, 78 insertions(+), 46 deletions(-) diff --git a/Config.lua b/Config.lua index 1102b27..86839de 100644 --- a/Config.lua +++ b/Config.lua @@ -228,68 +228,104 @@ local function giveMap() type = "description", name = L["MAP_OPTIONS_DESC"] .. "\n", }, - autoscanmap = { + maptrainer = { order = 2, type = "toggle", - name = L["Auto Scan Map"], - desc = L["AUTOSCANMAP_DESC"], + name = L["Trainer"], + desc = string.format(L["WAYPOINT_TOGGLE_FORMAT"], L["Trainer"]), disabled = not has_waypoints, - get = function() return addon.db.profile.autoscanmap end, - set = function() addon.db.profile.autoscanmap = not addon.db.profile.autoscanmap end, + get = function() + return addon.db.profile.maptrainer + end, + set = function() + addon.db.profile.maptrainer = not addon.db.profile.maptrainer + end, }, - worldmap = { + mapvendor = { order = 3, type = "toggle", - name = _G.WORLD_MAP, - desc = L["WORLDMAP_DESC"], + name = L["Vendor"], + desc = string.format(L["WAYPOINT_TOGGLE_FORMAT"], L["Vendor"]), disabled = not has_waypoints, - get = function() return addon.db.profile.worldmap end, - set = function() addon.db.profile.worldmap = not addon.db.profile.worldmap end, + get = function() + return addon.db.profile.mapvendor + end, + set = function() + addon.db.profile.mapvendor = not addon.db.profile.mapvendor + end, }, - minimap = { + mapmob = { order = 4, type = "toggle", - name = L["Mini Map"], - desc = L["MINIMAP_DESC"], + name = L["Mob Drop"], + desc = string.format(L["WAYPOINT_TOGGLE_FORMAT"], L["Mob Drop"]), disabled = not has_waypoints, - get = function() return addon.db.profile.minimap end, - set = function() addon.db.profile.minimap = not addon.db.profile.minimap end, + get = function() + return addon.db.profile.mapmob + end, + set = function() + addon.db.profile.mapmob = not addon.db.profile.mapmob + end, }, - maptrainer = { + mapquest = { order = 5, type = "toggle", - name = L["Trainer"], - desc = L["MAP_TRAINER_DESC"], + name = L["Quest"], + desc = string.format(L["WAYPOINT_TOGGLE_FORMAT"], L["Quest"]), disabled = not has_waypoints, - get = function() return addon.db.profile.maptrainer end, - set = function() addon.db.profile.maptrainer = not addon.db.profile.maptrainer end, + get = function() + return addon.db.profile.mapquest + end, + set = function() + addon.db.profile.mapquest = not addon.db.profile.mapquest + end, }, - mapvendor = { - order = 6, + map_acquire_header = { + order = 10, + type = "header", + name = "", + }, + autoscanmap = { + order = 11, type = "toggle", - name = L["Vendor"], - desc = L["MAP_VENDOR_DESC"], + width = "full", + name = L["Auto Scan Map"], + desc = L["AUTOSCANMAP_DESC"], disabled = not has_waypoints, - get = function() return addon.db.profile.mapvendor end, - set = function() addon.db.profile.mapvendor = not addon.db.profile.mapvendor end, + get = function() + return addon.db.profile.autoscanmap + end, + set = function() + addon.db.profile.autoscanmap = not addon.db.profile.autoscanmap + end, }, - mapmob = { - order = 7, + worldmap = { + order = 12, type = "toggle", - name = L["Monster"], - desc = L["MAP_MONSTER_DESC"], + width = "full", + name = _G.WORLD_MAP, + desc = string.format(L["WAYPOINT_MAP_FORMAT"], _G.WORLD_MAP), disabled = not has_waypoints, - get = function() return addon.db.profile.mapmob end, - set = function() addon.db.profile.mapmob = not addon.db.profile.mapmob end, + get = function() + return addon.db.profile.worldmap + end, + set = function() + addon.db.profile.worldmap = not addon.db.profile.worldmap + end, }, - mapquest = { - order = 8, + minimap = { + order = 13, type = "toggle", - name = L["Quest"], - desc = L["MAP_QUEST_DESC"], + width = "full", + name = _G.MINIMAP_LABEL, + desc = string.format(L["WAYPOINT_MAP_FORMAT"], _G.MINIMAP_LABEL), disabled = not has_waypoints, - get = function() return addon.db.profile.mapquest end, - set = function() addon.db.profile.mapquest = not addon.db.profile.mapquest end, + get = function() + return addon.db.profile.minimap + end, + set = function() + addon.db.profile.minimap = not addon.db.profile.minimap + end, }, clearmap = { order = 20, diff --git a/Locales/devel-enUS.lua b/Locales/devel-enUS.lua index b9912b2..173939d 100644 --- a/Locales/devel-enUS.lua +++ b/Locales/devel-enUS.lua @@ -178,19 +178,16 @@ L["Skill (Desc)"] = true L["Location"] = true L["Acquisition"] = true L["Unhandled Recipe"] = true -L["Mini Map"] = true -L["WORLDMAP_DESC"] = "Do you want missing vendor recipes to appear on the world map." -L["MINIMAP_DESC"] = "Do you want missing vendor recipes to appear on the mini map." + +-- Waypoints +L["WAYPOINT_TOGGLE_FORMAT"] = "Create waypoints for %s recipes." +L["WAYPOINT_MAP_FORMAT"] = "Create waypoints for missing recipes on the %s." L["Clear Waypoints"] = true L["CLEAR_WAYPOINTS_DESC"] = "Remove all ARL waypoints from TomTom." L["Hide Pop-Up"] = true L["HIDEPOPUP_DESC"] = "Prevents pop-ups notifying you why the scan window is empty from showing. Pop-ups will always show for the first time after a new version has been added." L["Auto Scan Map"] = true L["AUTOSCANMAP_DESC"] = "Auto show all waypoints when doing a recipe scan." -L["MAP_TRAINER_DESC"] = "Display trainers on the map." -L["MAP_VENDOR_DESC"] = "Display vendors on the map." -L["MAP_MONSTER_DESC"] = "Display monsters on the map." -L["MAP_QUEST_DESC"] = "Display quests on the map." L["SKILL_TOGGLE_DESC"] = "Displays recipes according to their skill level rather than by name." -- Filter Config Options @@ -1066,7 +1063,6 @@ L["Mixie Farshot"] = true L["Mo'arg Weaponsmith"] = true L["Modoru"] = true L["Molt Thorn"] = true -L["Monster"] = true L["Montarr"] = true L["Moonrage Tailor"] = true L["Moordo"] = true -- 1.7.9.5