diff --git a/Images/GoldBlueDotNew.tga b/Images/GoldBlueDotNew.tga new file mode 100644 index 0000000..6d8719e Binary files /dev/null and b/Images/GoldBlueDotNew.tga differ diff --git a/Images/GoldGreenDotNew.tga b/Images/GoldGreenDotNew.tga new file mode 100644 index 0000000..8bc3c33 Binary files /dev/null and b/Images/GoldGreenDotNew.tga differ diff --git a/Images/GoldPurpleDotNew.tga b/Images/GoldPurpleDotNew.tga new file mode 100644 index 0000000..1d44aa9 Binary files /dev/null and b/Images/GoldPurpleDotNew.tga differ diff --git a/Images/GoldRedDotNew.tga b/Images/GoldRedDotNew.tga new file mode 100644 index 0000000..36fafd8 Binary files /dev/null and b/Images/GoldRedDotNew.tga differ diff --git a/Images/src/GoldBlueDotNew.png b/Images/src/GoldBlueDotNew.png new file mode 100644 index 0000000..2c884a2 Binary files /dev/null and b/Images/src/GoldBlueDotNew.png differ diff --git a/Images/src/GoldBlueDotNew.psd b/Images/src/GoldBlueDotNew.psd new file mode 100644 index 0000000..fbc412e Binary files /dev/null and b/Images/src/GoldBlueDotNew.psd differ diff --git a/Images/src/GoldGreenDotNew.png b/Images/src/GoldGreenDotNew.png new file mode 100644 index 0000000..521c8f1 Binary files /dev/null and b/Images/src/GoldGreenDotNew.png differ diff --git a/Images/src/GoldGreenDotNew.psd b/Images/src/GoldGreenDotNew.psd new file mode 100644 index 0000000..bcb5457 Binary files /dev/null and b/Images/src/GoldGreenDotNew.psd differ diff --git a/Images/src/GoldPurpleDotNew.png b/Images/src/GoldPurpleDotNew.png new file mode 100644 index 0000000..2f4c136 Binary files /dev/null and b/Images/src/GoldPurpleDotNew.png differ diff --git a/Images/src/GoldPurpleDotNew.psd b/Images/src/GoldPurpleDotNew.psd new file mode 100644 index 0000000..0a20110 Binary files /dev/null and b/Images/src/GoldPurpleDotNew.psd differ diff --git a/Images/src/GoldRedDotNew.png b/Images/src/GoldRedDotNew.png new file mode 100644 index 0000000..5bf2f0c Binary files /dev/null and b/Images/src/GoldRedDotNew.png differ diff --git a/Images/src/GoldRedDotNew.psd b/Images/src/GoldRedDotNew.psd new file mode 100644 index 0000000..3020941 Binary files /dev/null and b/Images/src/GoldRedDotNew.psd differ diff --git a/TomTom.lua b/TomTom.lua index 74e0db7..c6fea07 100755 --- a/TomTom.lua +++ b/TomTom.lua @@ -85,6 +85,7 @@ function TomTom:Initialize(event, addon) tooltip = true, menu = true, default_iconsize = 16, + default_icon = "Interface\\AddOns\\TomTom\\Images\\GoldGreenDot", }, worldmap = { enable = true, @@ -94,6 +95,7 @@ function TomTom:Initialize(event, addon) menu = true, create_modifier = "C", default_iconsize = 16, + default_icon = "Interface\\AddOns\\TomTom\\Images\\GoldGreenDot", }, comm = { enable = true, diff --git a/TomTom_Config.lua b/TomTom_Config.lua index 09f9a6d..4845e29 100755 --- a/TomTom_Config.lua +++ b/TomTom_Config.lua @@ -417,6 +417,7 @@ local function createconfig() arg = "minimap.enable", }, otherzone = { + order = 3, type = "toggle", name = L["Display waypoints from other zones"], desc = L["TomTom can hide waypoints in other zones, this setting toggles that functionality"], @@ -425,6 +426,7 @@ local function createconfig() disabled = true, }, tooltip = { + order = 4, type = "toggle", name = L["Enable mouseover tooltips"], desc = L["TomTom can display a tooltip containing information abouto waypoints, when they are moused over. This setting toggles that functionality"], @@ -432,6 +434,7 @@ local function createconfig() arg = "minimap.tooltip", }, rightclick = { + order = 5, type = "toggle", name = L["Enable the right-click contextual menu"], desc = L["Enables a menu when right-clicking on a waypoint allowing you to clear or remove waypoints"], @@ -439,12 +442,27 @@ local function createconfig() arg = "minimap.menu", }, iconsize = { + order = 10, type = "range", name = L["Minimap Icon Size"], desc = L["This setting allows you to control the default size of the minimap icon. "], min = 4, max = 64, step = 2, arg = "minimap.default_iconsize", }, + icon = { + order = 11, + type = "select", + name = L["Minimap Icon"], + desc = L["This setting allows you to select the default icon for the minimap"], + values = { + ["Interface\\AddOns\\TomTom\\Images\\GoldGreenDot"] = "Old Gold Green Dot", + ["Interface\\AddOns\\TomTom\\Images\\GoldBlueDotNew"] = "New Gold Blue Dot", + ["Interface\\AddOns\\TomTom\\Images\\GoldGreenDotNew"] = "New Gold Green Dot", + ["Interface\\AddOns\\TomTom\\Images\\GoldPurpleDotNew"] = "New Gold Purple Dot", + ["Interface\\AddOns\\TomTom\\Images\\GoldRedDotNew"] = "New Gold Red Dot", + }, + arg = "minimap.default_icon", + }, }, } -- End minimap options @@ -575,16 +593,37 @@ local function createconfig() min = -32, max = 64, step = 1, arg = "mapcoords.cursoroffset", }, - }, }, - iconsize = { - order = 10, - type = "range", - name = L["World Map Icon Size"], - desc = L["This setting allows you to control the default size of the world map icon"], - min = 4, max = 64, step = 2, - arg = "worldmap.default_iconsize", + icon = { + order = 9, + type = "group", + inline = true, + name = L["Icon Control"], + args = { + iconsize = { + order = 20, + type = "range", + name = L["World Map Icon Size"], + desc = L["This setting allows you to control the default size of the world map icon"], + min = 4, max = 64, step = 2, + arg = "worldmap.default_iconsize", + }, + icon_default = { + order = 21, + type = "select", + name = L["World Map Icon"], + desc = L["This setting allows you to select the default icon for the world map"], + values = { + ["Interface\\AddOns\\TomTom\\Images\\GoldGreenDot"] = "Old Gold Green Dot", + ["Interface\\AddOns\\TomTom\\Images\\GoldBlueDotNew"] = "New Gold Blue Dot", + ["Interface\\AddOns\\TomTom\\Images\\GoldGreenDotNew"] = "New Gold Green Dot", + ["Interface\\AddOns\\TomTom\\Images\\GoldPurpleDotNew"] = "New Gold Purple Dot", + ["Interface\\AddOns\\TomTom\\Images\\GoldRedDotNew"] = "New Gold Red Dot", + }, + arg = "worldmap.default_icon", + }, + }, }, }, } -- End world map options diff --git a/TomTom_Waypoints.lua b/TomTom_Waypoints.lua index 8001096..d9fb262 100755 --- a/TomTom_Waypoints.lua +++ b/TomTom_Waypoints.lua @@ -88,7 +88,7 @@ function TomTom:SetWaypoint(waypoint, callbacks, show_minimap, show_world) minimap.icon = minimap:CreateTexture(nil,"OVERLAY") minimap.icon:SetPoint("CENTER", 0, 0) - minimap.icon:SetBlendMode("ADD") -- ADD/BLEND + minimap.icon:SetBlendMode("BLEND") -- ADD/BLEND minimap.arrow = minimap:CreateTexture(nil,"OVERLAY") minimap.arrow:SetTexture("Interface\\AddOns\\TomTom\\Images\\MinimapArrow-Green") @@ -141,7 +141,7 @@ function TomTom:SetWaypoint(waypoint, callbacks, show_minimap, show_world) if waypoint.minimap_displayID then SetPortraitTextureFromCreatureDisplayID(point.minimap.icon, waypoint.minimap_displayID) else - point.minimap.icon:SetTexture(waypoint.minimap_icon or "Interface\\AddOns\\TomTom\\Images\\GoldGreenDot") + point.minimap.icon:SetTexture(waypoint.minimap_icon or profile.minimap.default_icon) end point.minimap.icon:SetHeight(waypoint.minimap_icon_size or profile.minimap.default_iconsize) point.minimap.icon:SetWidth(waypoint.minimap_icon_size or profile.minimap.default_iconsize) @@ -150,7 +150,7 @@ function TomTom:SetWaypoint(waypoint, callbacks, show_minimap, show_world) if waypoint.worldmap_displayID then SetPortraitTextureFromCreatureDisplayID(point.worldmap.icon, waypoint.worldmap_displayID) else - point.worldmap.icon:SetTexture(waypoint.worldmap_icon or "Interface\\AddOns\\TomTom\\Images\\GoldGreenDot") + point.worldmap.icon:SetTexture(waypoint.worldmap_icon or profile.worldmap.default_icon) end point.worldmap:SetHeight(waypoint.worldmap_icon_size or profile.worldmap.default_iconsize) point.worldmap:SetWidth(waypoint.worldmap_icon_size or profile.worldmap.default_iconsize)
