diff --git a/Titan/LDBToTitan.lua b/Titan/LDBToTitan.lua index b5f6bc7..52dab47 100644 --- a/Titan/LDBToTitan.lua +++ b/Titan/LDBToTitan.lua @@ -115,37 +115,11 @@ VAR: frame --]] function LDBToTitan:TitanLDBSetOwnerPosition(parent, anchorPoint, relativeToFrame, relativePoint, xOffset, yOffset, frame) if frame:GetName() == "GameTooltip" then + -- Changes for 9.1.5 Removed the background template from the GameTooltip + -- Making changes to it difficult and possibly changing the tooltip globally. - -- Changes for 9.1.5. The background template was removed from the GameTooltip; backdrop color was changed to a NineSlice scheme... - local tool_trans = TitanPanelGetVar("TooltipTrans") - local bgR, bgG, bgB = TOOLTIP_DEFAULT_BACKGROUND_COLOR:GetRGB(); - frame.NineSlice:SetCenterColor(bgR, bgG, bgB, tool_trans); - ---[[ - -- Changes for 9.1.5. The background template was removed from the GameTooltip - local tip_name = frame:GetName() - - local tip_back_name = tip_name.."Backdrop" - local tip_back_frame = _G[tip_back_name] or CreateFrame("Frame", tip_back_name, frame, BackdropTemplateMixin and "BackdropTemplate" or nil) - tip_back_frame:SetFrameLevel(frame:GetFrameLevel() - 1) -- By creating this after the parent, need to set it behind the parent - - tip_back_frame:SetAllPoints() - tip_back_frame:SetBackdrop(back_drop_info) - -- set alpha (transparency) for the Game Tooltip - local tool_trans = TitanPanelGetVar("TooltipTrans") - tip_back_frame:SetBackdropBorderColor(TOOLTIP_DEFAULT_COLOR.r, TOOLTIP_DEFAULT_COLOR.g, TOOLTIP_DEFAULT_COLOR.b, tool_trans) - tip_back_frame:SetBackdropColor(TOOLTIP_DEFAULT_BACKGROUND_COLOR.r, TOOLTIP_DEFAULT_BACKGROUND_COLOR.g, TOOLTIP_DEFAULT_BACKGROUND_COLOR.b, tool_trans) - frame.MenuBackdrop = tip_back_frame ---]] frame:SetOwner(parent, "ANCHOR_NONE"); ---[[ - -- set alpha (transparency) for the Game Tooltip - local red, green, blue = GameTooltip:GetBackdropColor(); - local red2, green2, blue2 = GameTooltip:GetBackdropBorderColor(); - frame:SetBackdropColor(red,green,blue,TitanPanelGetVar("TooltipTrans")); - frame:SetBackdropBorderColor(red2,green2,blue2, - TitanPanelGetVar("TooltipTrans")); ---]] + -- set font size for the Game Tooltip if not TitanPanelGetVar("DisableTooltipFont") then if TitanTooltipScaleSet < 1 then diff --git a/Titan/Titan.toc b/Titan/Titan.toc index 53586e0..d858a56 100644 --- a/Titan/Titan.toc +++ b/Titan/Titan.toc @@ -1,7 +1,7 @@ ## Interface: 90204 -## Title: Titan Panel |cff00aa005.23.0.90204|r +## Title: Titan Panel |cff00aa005.23.1.90204|r ## Author: Titan Panel Development Team -## Version: 5.23.0.90204 +## Version: 5.23.1.90204 ## SavedVariables: TitanAll, TitanSettings, TitanSkins, ServerTimeOffsets, ServerHourFormat ## OptionalDeps: Ace3, AceGUI-3.0-SharedMediaWidgets, LibSharedMedia-3.0, LibQTip-1.0, !LibUIDropDownMenu ## Notes: Adds a display bar on the top and/or bottom of the screen. Allows users to show and control information/launcher plugins. diff --git a/Titan/TitanConfig.lua b/Titan/TitanConfig.lua index bb28c19..5411a87 100644 --- a/Titan/TitanConfig.lua +++ b/Titan/TitanConfig.lua @@ -229,7 +229,10 @@ local optionsTrans = { name = L["TITAN_TRANS_MENU_DESC"].."\n", cmdHidden = true }, - tooltiptrans = { + }, + } + --[[ + tooltiptrans = { name = L["TITAN_TRANS_CONTROL_TITLE_TOOLTIP"], desc = L["TITAN_TRANS_TOOLTIP_DESC"], order = 50, type = "range", width = "full", @@ -239,8 +242,7 @@ local optionsTrans = { TitanPanelSetVar("TooltipTrans", a); end, }, - }, - } +--]] --[[ local NAME: TitanPanel_TransOptions DESC: This will add each Titan bar to the transparency option table so it can be adjusted by the user. Each bar is shown whether ot not the user has them displayed. diff --git a/Titan/TitanPanelTemplate.lua b/Titan/TitanPanelTemplate.lua index d4ce8a1..3c94e22 100644 --- a/Titan/TitanPanelTemplate.lua +++ b/Titan/TitanPanelTemplate.lua @@ -91,21 +91,6 @@ local function TitanTooltip_AddTooltipText(text) end end -local back_drop_info = - { - bgFile="Interface\\Tooltips\\UI-Tooltip-Background", - edgeFile="Interface\\Tooltips\\UI-Tooltip-Border", - tile = true, - insets = { - left = 6, - right = 6, - top = 3, - bottom = 3, - }, - tileSize = 8, - edgeSize = 8, - } - --[[ local NAME: TitanTooltip_SetOwnerPosition DESC: Set both the parent and the position of GameTooltip for the plugin tooltip. @@ -122,32 +107,13 @@ local function TitanTooltip_SetOwnerPosition(parent, anchorPoint, relativeToFram if not frame then frame = _G["GameTooltip"] end - -- Changes for 9.1.5. The background template was removed from the GameTooltip - local tip_name = frame:GetName() - - local tip_back_name = tip_name.."Backdrop" - local tip_back_frame = _G[tip_back_name] or CreateFrame("Frame", tip_back_name, frame, BackdropTemplateMixin and "BackdropTemplate" or nil) - tip_back_frame:SetFrameLevel(frame:GetFrameLevel() - 1) -- By creating this after the parent, need to set it behind the parent - - tip_back_frame:SetAllPoints() - tip_back_frame:SetBackdrop(back_drop_info) - -- set alpha (transparency) for the Game Tooltip - local tool_trans = TitanPanelGetVar("TooltipTrans") - tip_back_frame:SetBackdropBorderColor(TOOLTIP_DEFAULT_COLOR.r, TOOLTIP_DEFAULT_COLOR.g, TOOLTIP_DEFAULT_COLOR.b, tool_trans) - tip_back_frame:SetBackdropColor(TOOLTIP_DEFAULT_BACKGROUND_COLOR.r, TOOLTIP_DEFAULT_BACKGROUND_COLOR.g, TOOLTIP_DEFAULT_BACKGROUND_COLOR.b, tool_trans) - frame.MenuBackdrop = tip_back_frame + -- Changes for 9.1.5 Removed the background template from the GameTooltip + -- Making changes to it difficult and possibly changing the tooltip globally. frame:SetOwner(parent, "ANCHOR_NONE"); frame:SetPoint(anchorPoint, relativeToFrame, relativePoint, xOffset, yOffset); ---[[ - -- set alpha (transparency) for the Game Tooltip - local red, green, blue = tip_back_frame:GetBackdropColor(); - local red2, green2, blue2 = tip_back_frame:GetBackdropBorderColor(); - local tool_trans = TitanPanelGetVar("TooltipTrans") - tip_back_frame:SetBackdropColor(red,green,blue,tool_trans); - tip_back_frame:SetBackdropBorderColor(red2,green2,blue2,tool_trans); ---]] + -- set font size for the Game Tooltip if not TitanPanelGetVar("DisableTooltipFont") then if TitanTooltipScaleSet < 1 then diff --git a/TitanBag/TitanBag.lua b/TitanBag/TitanBag.lua index 0c19787..0bcfa8f 100644 --- a/TitanBag/TitanBag.lua +++ b/TitanBag/TitanBag.lua @@ -30,6 +30,8 @@ local bag_info = { } -- "Khorium Toolbox" removed??? -- names are for debug only + -- Can use wowdb.com to look at bags by profession + local bags = { [333] = {style = "", name = ""}, [21858] = {style = "ENCHANTING", name = "Spellfire Bag"}, @@ -70,9 +72,9 @@ local bags = { [67396] = {style = "MINING", name = "\"Carriage - Christina\" Precious Metal Bag"}, [70136] = {style = "INSCRIPTION", name = "Royal Scribe's Satchel"}, -- * [70137] = {style = "MINING", name = "Triple-Reinforced Mining Bag"},-- * - [92746] = {style = "COOKING", name = "Portable Refrigerator"}, -- repeat, which one is real? + [92746] = {style = "COOKING", name = "Portable Refrigerator [28]"}, -- repeat, which one is real? [92747] = {style = "COOKING", name = "Advanced Refrigeration Unit"}, - [92748] = {style = "COOKING", name = "Portable Refrigerator"}, -- repeat, which one is real? + [92748] = {style = "COOKING", name = "Portable Refrigerator [32]"}, [70138] = {style = "JEWELCRAFTING", name = "Luxurious Silk Gem Bag"}, -- * [95536] = {style = "LEATHERWORKING", name = "Magnificent Hide Pack"}, -- * [116259] = {style = "LEATHERWORKING", name = "Burnished Leather Bag"}, @@ -82,11 +84,11 @@ local bags = { [130943] = {style = "COOKING", name = "Reusable Tote Bag"}, -- * [162588] = {style = "INSCRIPTION", name = "Weathered Scrollcase"}, --[[ +ZZbags = bags print("--") print(ZZbags[21858].style) --]] } -ZZbags = bags -- ******************************** Functions ******************************* diff --git a/TitanBag/TitanBag.toc b/TitanBag/TitanBag.toc index 2cc7bd3..62ab474 100644 --- a/TitanBag/TitanBag.toc +++ b/TitanBag/TitanBag.toc @@ -1,10 +1,10 @@ ## Interface: 90204 -## Title: Titan Panel [|cffeda55fBag|r] |cff00aa005.23.0.90204|r +## Title: Titan Panel [|cffeda55fBag|r] |cff00aa005.23.1.90204|r ## Notes: Adds bag and free slot information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.23.0.90204 +## Version: 5.23.1.90204 ## X-Child-Of: Titan TitanBag.xml diff --git a/TitanClock/TitanClock.toc b/TitanClock/TitanClock.toc index 4166b92..487a10a 100644 --- a/TitanClock/TitanClock.toc +++ b/TitanClock/TitanClock.toc @@ -1,10 +1,10 @@ ## Interface: 90204 -## Title: Titan Panel [|cffeda55fClock|r] |cff00aa005.23.0.90204|r +## Title: Titan Panel [|cffeda55fClock|r] |cff00aa005.23.1.90204|r ## Notes: Adds a clock to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.23.0.90204 +## Version: 5.23.1.90204 ## X-Child-Of: Titan TitanClock.xml diff --git a/TitanGold/TitanGold.toc b/TitanGold/TitanGold.toc index 7d22f01..31870db 100644 --- a/TitanGold/TitanGold.toc +++ b/TitanGold/TitanGold.toc @@ -1,10 +1,10 @@ ## Interface: 90204 -## Title: Titan Panel [|cffeda55fGold|r] |cff00aa005.23.0.90204|r +## Title: Titan Panel [|cffeda55fGold|r] |cff00aa005.23.1.90204|r ## Notes: Keeps track of all gold held by a player's toons on a per server/faction basis. ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: GoldSave ## OptionalDeps: ## Dependencies: Titan -## Version: 5.23.0.90204 +## Version: 5.23.1.90204 ## X-Child-Of: Titan TitanGold.xml diff --git a/TitanLocation/TitanLocation.lua b/TitanLocation/TitanLocation.lua index e8c76b3..3d1bb26 100755 --- a/TitanLocation/TitanLocation.lua +++ b/TitanLocation/TitanLocation.lua @@ -1,9 +1,10 @@ +--[[ -- ************************************************************************** -- * TitanLocation.lua -- * -- * By: The Titan Panel Development Team -- ************************************************************************** - +--]] -- ******************************** Constants ******************************* local _G = getfenv(0); local TITAN_LOCATION_ID = "Location"; @@ -16,12 +17,17 @@ local updateTable = {TITAN_LOCATION_ID, TITAN_PANEL_UPDATE_BUTTON}; local L = LibStub("AceLocale-3.0"):GetLocale("Titan", true); local AceTimer = LibStub("AceTimer-3.0"); local LocationTimer = nil; + + +local FormatToUse = "" -- ******************************** Functions ******************************* +--[[ -- ************************************************************************** -- NAME : TitanPanelLocationButton_OnLoad() -- DESC : Registers the plugin upon it loading -- ************************************************************************** +--]] function TitanPanelLocationButton_OnLoad(self) self.registry = { id = TITAN_LOCATION_ID, @@ -42,15 +48,14 @@ function TitanPanelLocationButton_OnLoad(self) }, savedVariables = { ShowZoneText = 1, + ShowCoordsText = true, ShowCoordsOnMap = true, ShowCursorOnMap = true, ShowLocOnMiniMap = 1, ShowIcon = 1, ShowLabelText = 1, ShowColoredText = 1, - CoordsFormat1 = 1, - CoordsFormat2 = false, - CoordsFormat3 = false, + CoordsFormat = L["TITAN_LOCATION_FORMAT"], UpdateWorldmap = false, DisplayOnRightSide = false, } @@ -64,54 +69,57 @@ function TitanPanelLocationButton_OnLoad(self) TitanPanelLocation_CreateMapFrames(); end +--[[ -- ************************************************************************** -- NAME : TitanPanelLocationButton_OnShow() -- DESC : Display button when plugin is visible -- ************************************************************************** +--]] function TitanPanelLocationButton_OnShow() - --local mapID = C_Map.GetBestMapForUnit("player"); - --if mapID ~= nil then - -- WorldMapFrame:SetMapID(mapID); - --end TitanPanelLocation_HandleUpdater(); end +--[[ -- ************************************************************************** -- NAME : TitanPanelLocationButton_OnHide() -- DESC : Destroy repeating timer when plugin is hidden -- ************************************************************************** +--]] function TitanPanelLocationButton_OnHide() AceTimer.CancelTimer("TitanPanelLocation", LocationTimer, true) LocationTimer = nil; end +--[[ -- ************************************************************************** -- NAME : TitanPanelLocationButton_GetButtonText(id) -- DESC : Calculate coordinates and then display data on button -- VARS : id = button ID -- ************************************************************************** +--]] function TitanPanelLocationButton_GetButtonText(id) local button, id = TitanUtils_GetButton(id, true); + local locationText = "" + + -- Coordinates text, if requested + if (TitanGetVar(TITAN_LOCATION_ID, "ShowCoordsText")) then + button.px, button.py = TitanPanelGetPlayerMapPosition(); + -- cache coordinates for update checking later on + cachedX = button.px; + cachedY = button.py; + if button.px == nil then button.px = 0 end + if button.py == nil then button.py = 0 end - button.px, button.py = TitanPanelGetPlayerMapPosition(); - -- cache coordinates for update checking later on - cachedX = button.px; - cachedY = button.py; - if button.px == nil then button.px = 0 end - if button.py == nil then button.py = 0 end - local locationText = ""; - if (TitanGetVar(TITAN_LOCATION_ID, "CoordsFormat1")) then - locationText = format(L["TITAN_LOCATION_FORMAT"], 100 * button.px, 100 * button.py); - elseif (TitanGetVar(TITAN_LOCATION_ID, "CoordsFormat2")) then - locationText = format(L["TITAN_LOCATION_FORMAT2"], 100 * button.px, 100 * button.py); - elseif (TitanGetVar(TITAN_LOCATION_ID, "CoordsFormat3")) then - locationText = format(L["TITAN_LOCATION_FORMAT3"], 100 * button.px, 100 * button.py); - end - - if button.px == 0 and button.py == 0 then + if button.px == 0 and button.py == 0 then + locationText = ""; + else + locationText = format(FormatToUse, 100 * button.px, 100 * button.py) + end + else locationText = ""; end + -- Zone text, if requested if (TitanGetVar(TITAN_LOCATION_ID, "ShowZoneText")) then if (TitanUtils_ToString(button.subZoneText) == '') then if (button.zoneText == '') then @@ -128,6 +136,7 @@ function TitanPanelLocationButton_GetButtonText(id) end end + -- Color per type of zone (friendly, contested, hostile) local locationRichText; if (TitanGetVar(TITAN_LOCATION_ID, "ShowColoredText")) then if (TitanPanelLocationButton.isArena) then @@ -148,10 +157,12 @@ function TitanPanelLocationButton_GetButtonText(id) return L["TITAN_LOCATION_BUTTON_LABEL"], locationRichText; end +--[[ -- ************************************************************************** -- NAME : TitanPanelLocationButton_GetTooltipText() -- DESC : Display tooltip text -- ************************************************************************** +--]] function TitanPanelLocationButton_GetTooltipText() local pvpInfoRichText; @@ -168,7 +179,7 @@ function TitanPanelLocationButton_GetTooltipText() elseif (TitanPanelLocationButton.pvpType == "contested") then pvpInfoRichText = TitanUtils_GetRedText(CONTESTED_TERRITORY); else - --pvpInfoRichText = TitanUtils_GetNormalText(CONTESTED_TERRITORY); + pvpInfoRichText = "" end return "".. @@ -182,24 +193,21 @@ function TitanPanelLocationButton_GetTooltipText() TitanUtils_GetGreenText(L["TITAN_LOCATION_TOOLTIP_HINTS_2"]); end +--[[ -- ************************************************************************** -- NAME : TitanPanelLocationButton_OnEvent() -- DESC : Parse events registered to plugin and act on them -- ************************************************************************** +--]] function TitanPanelLocationButton_OnEvent(self, event, ...) if event == "PLAYER_ENTERING_WORLD" then if not TitanGetVar(TITAN_LOCATION_ID, "ShowLocOnMiniMap") and MinimapBorderTop and MinimapBorderTop:IsShown() then TitanPanelLocationButton_LocOnMiniMap() end + + FormatToUse = TitanGetVar(TITAN_LOCATION_ID, "CoordsFormat") end ---[[ - if TitanGetVar(TITAN_LOCATION_ID, "UpdateWorldmap") then - local mapID = C_Map.GetBestMapForUnit("player") - if mapID ~= nil then - WorldMapFrame:SetMapID(mapID); - end - end ---]] + TitanPanelLocationButton_UpdateZoneInfo(self); TitanPanelPluginHandle_OnUpdate(updateTable); TitanPanelLocation_HandleUpdater(); @@ -209,7 +217,12 @@ function TitanPanelLocationButton_OnEvent(self, event, ...) end end --- function to throttle down unnecessary updates +--[[ +-- ************************************************************************** +-- NAME : TitanPanelLocationButton_CheckForUpdate() +-- DESC : Function to throttle down unnecessary updates +-- ************************************************************************** +--]] function TitanPanelLocationButton_CheckForUpdate() local mapID = C_Map.GetBestMapForUnit("player") local tempx, tempy = TitanPanelGetPlayerMapPosition(); @@ -218,75 +231,59 @@ function TitanPanelLocationButton_CheckForUpdate() end end +--[[ -- ************************************************************************** -- NAME : TitanPanelLocation_HandleUpdater() -- DESC : Check to see if you are inside an instance -- ************************************************************************** +--]] function TitanPanelLocation_HandleUpdater() if TitanPanelLocationButton:IsVisible() and not LocationTimer then LocationTimer = AceTimer.ScheduleRepeatingTimer("TitanPanelLocation", TitanPanelLocationButton_CheckForUpdate, 0.5) end end +--[[ -- ************************************************************************** -- NAME : TitanPanelLocationButton_OnClick(button) -- DESC : Copies coordinates to chat line for shift-LeftClick -- VARS : button = value of action -- ************************************************************************** +--]] function TitanPanelLocationButton_OnClick(self, button) if (button == "LeftButton") then if (IsShiftKeyDown()) then local activeWindow = ChatEdit_GetActiveWindow(); if ( activeWindow ) then - local message; - if (TitanGetVar(TITAN_LOCATION_ID, "CoordsFormat1")) then - message = TitanUtils_ToString(self.zoneText).." ".. - format(L["TITAN_LOCATION_FORMAT"], 100 * self.px, 100 * self.py); - elseif (TitanGetVar(TITAN_LOCATION_ID, "CoordsFormat2")) then - message = TitanUtils_ToString(self.zoneText).." ".. - format(L["TITAN_LOCATION_FORMAT2"], 100 * self.px, 100 * self.py); - elseif (TitanGetVar(TITAN_LOCATION_ID, "CoordsFormat3")) then - message = TitanUtils_ToString(self.zoneText).." ".. - format(L["TITAN_LOCATION_FORMAT3"], 100 * self.px, 100 * self.py); - end + local message = TitanUtils_ToString(self.zoneText).." ".. + format(FormatToUse, 100 * self.px, 100 * self.py); activeWindow:Insert(message); end else ToggleFrame(WorldMapFrame); end end ---[[ --- Works great when map is small. When map is large, Titan stays on top. --- Sometimes other buttons stay on top of map. --- Think we'd have to adjust strata of anything touched by TitanMovable - if (button == "LeftButton") then - if ( WORLDMAP_SETTINGS.size == WORLDMAP_WINDOWED_SIZE ) then - if ( WorldMapFrame:IsVisible() ) then - WorldMapFrame:Hide() - else - WorldMapFrame:Show() - end - end - end ---]] end +--[[ -- ************************************************************************** -- NAME : TitanPanelLocationButton_UpdateZoneInfo() -- DESC : Update data on button -- ************************************************************************** +--]] function TitanPanelLocationButton_UpdateZoneInfo(self) local _ = nil self.zoneText = GetZoneText(); self.subZoneText = GetSubZoneText(); - --self.minimapZoneText = GetMinimapZoneText(); self.pvpType, _, self.factionName = GetZonePVPInfo(); end +--[[ -- ************************************************************************** -- NAME : TitanPanelRightClickMenu_PrepareLocationMenu() -- DESC : Display rightclick menu options -- ************************************************************************** +--]] function TitanPanelRightClickMenu_PrepareLocationMenu() local info @@ -301,6 +298,15 @@ function TitanPanelRightClickMenu_PrepareLocationMenu() TitanPanelRightClickMenu_AddButton(info, TitanPanelRightClickMenu_GetDropdownLevel()); info = {}; + info.text = L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_PANEL_TEXT"]; + info.func = function() + TitanToggleVar(TITAN_LOCATION_ID, "ShowCoordsText"); + TitanPanelButton_UpdateButton(TITAN_LOCATION_ID); + end + info.checked = TitanGetVar(TITAN_LOCATION_ID, "ShowCoordsText"); + TitanPanelRightClickMenu_AddButton(info, TitanPanelRightClickMenu_GetDropdownLevel()); + + info = {}; info.text = L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"]; info.func = TitanPanelLocationButton_ToggleLocationOnMap; info.checked = TitanGetVar(TITAN_LOCATION_ID, "ShowCoordsOnMap"); @@ -308,7 +314,10 @@ function TitanPanelRightClickMenu_PrepareLocationMenu() info = {}; info.text = L["TITAN_LOCATION_MENU_SHOW_LOC_ON_MINIMAP_TEXT"]; - info.func = TitanPanelLocationButton_ToggleLocOnMiniMap; + info.func = function() + TitanToggleVar(TITAN_LOCATION_ID, "ShowLocOnMiniMap"); + TitanPanelLocationButton_LocOnMiniMap() + end info.checked = TitanGetVar(TITAN_LOCATION_ID, "ShowLocOnMiniMap"); info.disabled = InCombatLockdown() TitanPanelRightClickMenu_AddButton(info, TitanPanelRightClickMenu_GetDropdownLevel()); @@ -327,34 +336,31 @@ function TitanPanelRightClickMenu_PrepareLocationMenu() info = {}; info.text = L["TITAN_LOCATION_FORMAT_LABEL"]; info.func = function() - TitanSetVar(TITAN_LOCATION_ID, "CoordsFormat1", 1); - TitanSetVar(TITAN_LOCATION_ID, "CoordsFormat2", nil); - TitanSetVar(TITAN_LOCATION_ID, "CoordsFormat3", nil); + TitanSetVar(TITAN_LOCATION_ID, "CoordsFormat", L["TITAN_LOCATION_FORMAT"]); + FormatToUse = L["TITAN_LOCATION_FORMAT"] TitanPanelButton_UpdateButton(TITAN_LOCATION_ID); end - info.checked = TitanGetVar(TITAN_LOCATION_ID, "CoordsFormat1"); + info.checked = (FormatToUse == L["TITAN_LOCATION_FORMAT"]) TitanPanelRightClickMenu_AddButton(info, TitanPanelRightClickMenu_GetDropdownLevel()); info = {}; info.text = L["TITAN_LOCATION_FORMAT2_LABEL"]; info.func = function() - TitanSetVar(TITAN_LOCATION_ID, "CoordsFormat1", nil); - TitanSetVar(TITAN_LOCATION_ID, "CoordsFormat2", 1); - TitanSetVar(TITAN_LOCATION_ID, "CoordsFormat3", nil); + TitanSetVar(TITAN_LOCATION_ID, "CoordsFormat", L["TITAN_LOCATION_FORMAT2"]); + FormatToUse = L["TITAN_LOCATION_FORMAT2"] TitanPanelButton_UpdateButton(TITAN_LOCATION_ID); end - info.checked = TitanGetVar(TITAN_LOCATION_ID, "CoordsFormat2"); + info.checked = (FormatToUse == L["TITAN_LOCATION_FORMAT2"]) TitanPanelRightClickMenu_AddButton(info, TitanPanelRightClickMenu_GetDropdownLevel()); info = {}; info.text = L["TITAN_LOCATION_FORMAT3_LABEL"]; info.func = function() - TitanSetVar(TITAN_LOCATION_ID, "CoordsFormat1", nil); - TitanSetVar(TITAN_LOCATION_ID, "CoordsFormat2", nil); - TitanSetVar(TITAN_LOCATION_ID, "CoordsFormat3", 1); + TitanSetVar(TITAN_LOCATION_ID, "CoordsFormat", L["TITAN_LOCATION_FORMAT3"]); + FormatToUse = L["TITAN_LOCATION_FORMAT3"] TitanPanelButton_UpdateButton(TITAN_LOCATION_ID); end - info.checked = TitanGetVar(TITAN_LOCATION_ID, "CoordsFormat3"); + info.checked = (FormatToUse == L["TITAN_LOCATION_FORMAT3"]) TitanPanelRightClickMenu_AddButton(info, TitanPanelRightClickMenu_GetDropdownLevel()); end return @@ -386,19 +392,23 @@ function TitanPanelRightClickMenu_PrepareLocationMenu() TitanPanelRightClickMenu_AddCommand(L["TITAN_PANEL_MENU_HIDE"], TITAN_LOCATION_ID, TITAN_PANEL_MENU_FUNC_HIDE); end +--[[ -- ************************************************************************** -- NAME : TitanPanelLocationButton_ToggleDisplay() -- DESC : Set option to show zone text -- ************************************************************************** +--]] function TitanPanelLocationButton_ToggleDisplay() TitanToggleVar(TITAN_LOCATION_ID, "ShowZoneText"); TitanPanelButton_UpdateButton(TITAN_LOCATION_ID); end +--[[ -- ************************************************************************** -- NAME : TitanPanelLocationButton_ToggleLocationOnMap() -- DESC : Set option to show player coordinates on map -- ************************************************************************** +--]] function TitanPanelLocationButton_ToggleLocationOnMap() TitanToggleVar(TITAN_LOCATION_ID, "ShowCoordsOnMap"); if (TitanGetVar(TITAN_LOCATION_ID, "ShowCoordsOnMap")) then @@ -408,10 +418,12 @@ function TitanPanelLocationButton_ToggleLocationOnMap() end end +--[[ -- ************************************************************************** -- NAME : TitanPanelLocationButton_ToggleCursorLocationOnMap() -- DESC : Set option to show cursor coordinates on map -- ************************************************************************** +--]] function TitanPanelLocationButton_ToggleCursorLocationOnMap() TitanToggleVar(TITAN_LOCATION_ID, "ShowCursorOnMap"); if (TitanGetVar(TITAN_LOCATION_ID, "ShowCursorOnMap")) then @@ -421,11 +433,6 @@ function TitanPanelLocationButton_ToggleCursorLocationOnMap() end end -function TitanPanelLocationButton_ToggleLocOnMiniMap() - TitanToggleVar(TITAN_LOCATION_ID, "ShowLocOnMiniMap"); - TitanPanelLocationButton_LocOnMiniMap() -end - function TitanPanelLocationButton_LocOnMiniMap() if TitanGetVar(TITAN_LOCATION_ID, "ShowLocOnMiniMap") then MinimapBorderTop:Show() @@ -440,19 +447,12 @@ function TitanPanelLocationButton_LocOnMiniMap() TitanPanel_AdjustFrames(false); end --- ************************************************************************** --- NAME : TitanPanelLocationButton_ToggleColor() --- DESC : Set option to show colored text --- ************************************************************************** -function TitanPanelLocationButton_ToggleColor() - TitanToggleVar(TITAN_LOCATION_ID, "ShowColoredText"); - TitanPanelButton_UpdateButton(TITAN_LOCATION_ID); -end - +--[[ -- ************************************************************************** -- NAME : TitanMapFrame_OnUpdate() -- DESC : Update coordinates on map -- ************************************************************************** +--]] function TitanMapFrame_OnUpdate(self, elapsed) -- using :Hide / :Show prevents coords from running -- TitanMapFrame:Hide() -- hide parent @@ -466,20 +466,14 @@ function TitanMapFrame_OnUpdate(self, elapsed) if self.px == 0 and self.py == 0 then playerLocationText = L["TITAN_LOCATION_NO_COORDS"] else - if (TitanGetVar(TITAN_LOCATION_ID, "CoordsFormat1")) then - playerLocationText = format(L["TITAN_LOCATION_FORMAT"], 100 * self.px, 100 * self.py); - elseif (TitanGetVar(TITAN_LOCATION_ID, "CoordsFormat2")) then - playerLocationText = format(L["TITAN_LOCATION_FORMAT2"], 100 * self.px, 100 * self.py); - elseif (TitanGetVar(TITAN_LOCATION_ID, "CoordsFormat3")) then - playerLocationText = format(L["TITAN_LOCATION_FORMAT3"], 100 * self.px, 100 * self.py); - end + playerLocationText = format(FormatToUse, 100 * self.px, 100 * self.py); end TitanMapPlayerLocation:SetText(format(L["TITAN_LOCATION_MAP_PLAYER_COORDS_TEXT"], TitanUtils_GetHighlightText(playerLocationText))); - -- Determine the text to show for cursor coords + -- Determine the text to show for cursor coords + local cx, cy = GetCursorPosition(); -- use the global cursor position to confirm the cursor is over the map, but then use a normalized cursor position to account for map zooming - local cx, cy = GetCursorPosition(); local left, bottom, width, height = WorldMapFrame.ScrollContainer:GetScaledRect(); if (cx > left and cy > bottom and cx < left + width and cy < bottom+ height) then cx, cy = WorldMapFrame:GetNormalizedCursorPosition(); @@ -489,13 +483,7 @@ function TitanMapFrame_OnUpdate(self, elapsed) end -- per the user requested format - if (TitanGetVar(TITAN_LOCATION_ID, "CoordsFormat1")) then - cursorLocationText = format(L["TITAN_LOCATION_FORMAT"], 100 * cx, 100 * cy); - elseif (TitanGetVar(TITAN_LOCATION_ID, "CoordsFormat2")) then - cursorLocationText = format(L["TITAN_LOCATION_FORMAT2"], 100 * cx, 100 * cy); - elseif (TitanGetVar(TITAN_LOCATION_ID, "CoordsFormat3")) then - cursorLocationText = format(L["TITAN_LOCATION_FORMAT3"], 100 * cx, 100 * cy); - end + cursorLocationText = format(FormatToUse, 100 * cx, 100 * cy); if (TitanGetVar(TITAN_LOCATION_ID, "ShowCoordsOnMap")) then TitanMapCursorLocation:SetText(format(L["TITAN_LOCATION_MAP_CURSOR_COORDS_TEXT"], TitanUtils_GetHighlightText(cursorLocationText))); @@ -503,14 +491,15 @@ function TitanMapFrame_OnUpdate(self, elapsed) TitanMapPlayerLocation:SetText(""); TitanMapCursorLocation:SetText(""); end - end +--[[ -- ************************************************************************** -- NAME : TitanPanelGetPlayerMapPosition() -- DESC : Get the player coordinates -- VARS : x = location on x axis, y = location on y axis -- ************************************************************************** +--]] function TitanPanelGetPlayerMapPosition() local mapID = C_Map.GetBestMapForUnit("player") if mapID == nil then @@ -525,12 +514,13 @@ function TitanPanelGetPlayerMapPosition() end end - +--[[ -- ************************************************************************** -- NAME : TitanPanelLocation_CreateMapFrames() -- DESC : Adds player and cursor coords to the WorldMapFrame, unless the player has CT_MapMod -- VARS : none -- ************************************************************************** +--]] local TPL_CMF_IsFirstTime = true; function TitanPanelLocation_CreateMapFrames() if (TPL_CMF_IsFirstTime) then diff --git a/TitanLocation/TitanLocation.toc b/TitanLocation/TitanLocation.toc index d33617c..4cdd578 100644 --- a/TitanLocation/TitanLocation.toc +++ b/TitanLocation/TitanLocation.toc @@ -1,10 +1,10 @@ ## Interface: 90204 -## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa005.23.0.90204|r +## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa005.23.1.90204|r ## Notes: Adds coordinates and location information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.23.0.90204 +## Version: 5.23.1.90204 ## X-Child-Of: Titan TitanLocation.xml diff --git a/TitanLootType/TitanLootType.toc b/TitanLootType/TitanLootType.toc index 4f98953..cbed9c7 100644 --- a/TitanLootType/TitanLootType.toc +++ b/TitanLootType/TitanLootType.toc @@ -1,10 +1,10 @@ ## Interface: 90204 -## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa005.23.0.90204|r +## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa005.23.1.90204|r ## Notes: Adds group loot and instance difficulty information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.23.0.90204 +## Version: 5.23.1.90204 ## X-Child-Of: Titan TitanLootType.xml diff --git a/TitanPerformance/TitanPerformance.toc b/TitanPerformance/TitanPerformance.toc index 1972f90..489ae2b 100644 --- a/TitanPerformance/TitanPerformance.toc +++ b/TitanPerformance/TitanPerformance.toc @@ -1,10 +1,10 @@ ## Interface: 90204 -## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa005.23.0.90204|r +## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa005.23.1.90204|r ## Notes: Adds FPS and Garbage collection information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.23.0.90204 +## Version: 5.23.1.90204 ## X-Child-Of: Titan TitanPerformance.xml diff --git a/TitanRepair/TitanRepair.toc b/TitanRepair/TitanRepair.toc index 48bd418..778ec37 100644 --- a/TitanRepair/TitanRepair.toc +++ b/TitanRepair/TitanRepair.toc @@ -1,10 +1,10 @@ ## Interface: 90204 -## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa005.23.0.90204|r +## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa005.23.1.90204|r ## Notes: Provides a configurable durability display. Also adds the ability to auto repair items and inventory at vendors ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.23.0.90204 +## Version: 5.23.1.90204 ## X-Child-Of: Titan TitanRepair.xml diff --git a/TitanVolume/TitanVolume.toc b/TitanVolume/TitanVolume.toc index b11f8f2..7715ceb 100644 --- a/TitanVolume/TitanVolume.toc +++ b/TitanVolume/TitanVolume.toc @@ -1,10 +1,10 @@ ## Interface: 90204 -## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa005.23.0.90204|r +## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa005.23.1.90204|r ## Notes: Adds a volume control icon on your Titan Bar ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.23.0.90204 +## Version: 5.23.1.90204 ## X-Child-Of: Titan TitanVolume.xml diff --git a/TitanXP/TitanXP.toc b/TitanXP/TitanXP.toc index 5c70e1b..9453149 100644 --- a/TitanXP/TitanXP.toc +++ b/TitanXP/TitanXP.toc @@ -1,10 +1,10 @@ ## Interface: 90204 -## Title: Titan Panel [|cffeda55fXP|r] |cff00aa005.23.0.90204|r +## Title: Titan Panel [|cffeda55fXP|r] |cff00aa005.23.1.90204|r ## Notes: Adds information to Titan Panel about XP earned and time to level ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.23.0.90204 +## Version: 5.23.1.90204 ## X-Child-Of: Titan TitanXP.xml