From 78ab9e29fd0fd43be6ed3baeb613d3159ccad6a6 Mon Sep 17 00:00:00 2001 From: urnati Date: Mon, 9 Sep 2019 15:09:04 -0400 Subject: [PATCH] - Update Movable to allow the player and target frames to be moved using the Blizz UI - Location / Locale updated to allow the user to select where they want the coords on the (large) world map #1255 but I think this was meant for Classic --- TitanClassic/TitanClassicMovable.lua | 8 +-- TitanClassic/locale/Localization.lua | 17 +++++- TitanClassicLocation/TitanClassicLocation.lua | 72 ++++++++++++++++++++++++- 3 files changed, 89 insertions(+), 8 deletions(-) diff --git a/TitanClassic/TitanClassicMovable.lua b/TitanClassic/TitanClassicMovable.lua index 6e84a44..c20d8b1 100755 --- a/TitanClassic/TitanClassicMovable.lua +++ b/TitanClassic/TitanClassicMovable.lua @@ -101,7 +101,7 @@ function TitanMovable_MenuBar_Disable() if DoAdjust(TITAN_PANEL_PLACE_BOTTOM, false) then --TitanPrint("TitanMovable_MenuBar_Disable - DoAdjust", "warning") MainMenuBar:SetMovable(true); - MainMenuBar:SetUserPlaced(false); +-- MainMenuBar:SetUserPlaced(false); end end @@ -125,7 +125,7 @@ function TitanMovable_MenuBar_Enable() else if DoAdjust(TITAN_PANEL_PLACE_BOTTOM, false) then MainMenuBar:SetMovable(true); - MainMenuBar:SetUserPlaced(true); +-- MainMenuBar:SetUserPlaced(true); MainMenuBar:SetMovable(false); end end @@ -249,7 +249,7 @@ local function SetPosition(frame, ...) if name then UIPARENT_MANAGED_FRAME_POSITIONS[name] = nil end - frame:SetMovable(true) -- allow frame to move +-- frame:SetMovable(true) -- allow frame to move; Classic does not have vehicles so this retail fix is not needed -- Titan honors a user placed frame so we don't need this -- frame:SetUserPlaced(true) -- tell Blizzard to back off frame:SetDontSavePosition(true) @@ -259,7 +259,7 @@ local function SetPosition(frame, ...) frame:ClearAllPoints() frame:SetPoint(...) end - frame:SetMovable(false) -- lock frame from moving +-- frame:SetMovable(false) -- lock frame from moving end end diff --git a/TitanClassic/locale/Localization.lua b/TitanClassic/locale/Localization.lua index 81896d6..73461f0 100644 --- a/TitanClassic/locale/Localization.lua +++ b/TitanClassic/locale/Localization.lua @@ -70,10 +70,12 @@ L["TITAN_PANEL_SLASH_PROFILE_2"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE..": L["TITAN_PANEL_SLASH_PROFILE_3"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE..": |cffffffffcan be either the server name or 'TitanCustomProfile'." L["TITAN_PANEL_SLASH_SILENT_0"] = LIGHTYELLOW_FONT_COLOR_CODE.."Usage: |cffffffff/titan {silent}"; L["TITAN_PANEL_SLASH_SILENT_1"] = LIGHTYELLOW_FONT_COLOR_CODE.."silent: |cffffffffToggles "..TITAN_PANEL.." to load silently."; +L["TITAN_PANEL_SLASH_ORDERHALL_0"] = LIGHTYELLOW_FONT_COLOR_CODE.."Usage: |cffffffff/titan {orderhall}"; +L["TITAN_PANEL_SLASH_ORDERHALL_1"] = LIGHTYELLOW_FONT_COLOR_CODE.."orderhall: |cffffffffToggles "..TITAN_PANEL.." to hide Order Hall Command Bar."; L["TITAN_PANEL_SLASH_HELP_0"] = LIGHTYELLOW_FONT_COLOR_CODE.."Usage: |cffffffff/titan {help | help }"; -L["TITAN_PANEL_SLASH_HELP_1"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE..": reset/gui/profile/silent/help "; +L["TITAN_PANEL_SLASH_HELP_1"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE..": reset/gui/profile/silent/orderhall/help "; L["TITAN_PANEL_SLASH_ALL_0"] = LIGHTYELLOW_FONT_COLOR_CODE.."Usage: |cffffffff/titan "; -L["TITAN_PANEL_SLASH_ALL_1"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE..": |cffffffffreset/gui/profile/silent/help "; +L["TITAN_PANEL_SLASH_ALL_1"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE..": |cffffffffreset/gui/profile/silent/orderhall/help "; -- slash command responses L["TITAN_PANEL_SLASH_RESP1"] = LIGHTYELLOW_FONT_COLOR_CODE..TITAN_PANEL.." tooltip font scale has been reset."; @@ -333,6 +335,12 @@ L["TITAN_LOCATION_MAP_PLAYER_COORDS_TEXT"] = "Player: %s"; L["TITAN_LOCATION_NO_COORDS"] = "No Coords"; L["TITAN_LOCATION_MENU_SHOW_LOC_ON_MINIMAP_TEXT"] = "Show Location Name Above Minimap"; L["TITAN_LOCATION_MENU_UPDATE_WORLD_MAP"] = "Update World Map When Zone Changes"; +L["TITAN_LOCATION_MENU_MAP_COORDS_TITLE"] = "Coordinates Location on Map"; +L["TITAN_LOCATION_MENU_MAP_COORDS_LOC_1"] = "Top Left"; +L["TITAN_LOCATION_MENU_MAP_COORDS_LOC_2"] = "Top Right"; +L["TITAN_LOCATION_MENU_MAP_COORDS_LOC_3"] = "Bottom Left"; +L["TITAN_LOCATION_MENU_MAP_COORDS_LOC_4"] = "Bottom"; +L["TITAN_LOCATION_MENU_MAP_COORDS_LOC_5"] = "Bottom Right"; L["TITAN_FPS_FORMAT"] = "%.1f"; L["TITAN_FPS_BUTTON_LABEL"] = "FPS: "; @@ -491,6 +499,11 @@ L["REPAIR_LOCALE"] = { TooltipOptions = "Tooltip", }; L["TITAN_REPAIR"] = "Titan Repair" +L["TITAN_REPAIR_GBANK_TOTAL"] = "Guild Bank Funds :" +L["TITAN_REPAIR_GBANK_WITHDRAW"] = "Guild Bank Withdrawal Allowed :" +L["TITAN_REPAIR_GBANK_USEFUNDS"] = "Use Guild Bank Funds" +L["TITAN_REPAIR_GBANK_NOMONEY"] = "Guild Bank can't afford the repair cost, or you can't withdraw that much." +L["TITAN_REPAIR_GBANK_NORIGHTS"] = "You are either not in a guild or you don't have permission to use the guild bank to repair your items." L["TITAN_REPAIR_CANNOT_AFFORD"] = "You cannot afford to repair, at this time." L["TITAN_REPAIR_REPORT_COST_MENU"] = "Report Repair Cost to Chat" L["TITAN_REPAIR_REPORT_COST_CHAT"] = "Repair cost was " diff --git a/TitanClassicLocation/TitanClassicLocation.lua b/TitanClassicLocation/TitanClassicLocation.lua index e4cad85..394c278 100755 --- a/TitanClassicLocation/TitanClassicLocation.lua +++ b/TitanClassicLocation/TitanClassicLocation.lua @@ -52,6 +52,7 @@ function TitanPanelLocationButton_OnLoad(self) CoordsFormat2 = false, CoordsFormat3 = false, UpdateWorldmap = false, + MapLocation = false, } }; @@ -278,6 +279,15 @@ function TitanPanelLocationButton_UpdateZoneInfo(self) self.pvpType, _, self.factionName = GetZonePVPInfo(); end +local function CoordLoc(loc) + local res = (TitanGetVar(TITAN_LOCATION_ID, "MapLocation") == loc) +TitanDebug("CoordLoc" +.." "..tostring(loc) +.." "..tostring(TitanGetVar(TITAN_LOCATION_ID, "MapLocation")) +.." "..tostring(res) +) + return res +end -- ************************************************************************** -- NAME : TitanPanelRightClickMenu_PrepareLocationMenu() -- DESC : Display rightclick menu options @@ -316,6 +326,46 @@ function TitanPanelRightClickMenu_PrepareLocationMenu() info.checked = TitanGetVar(TITAN_LOCATION_ID, "UpdateWorldmap"); info.disabled = InCombatLockdown() L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + + TitanPanelRightClickMenu_AddSpacer(_G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + TitanPanelRightClickMenu_AddTitle(L["TITAN_LOCATION_MENU_MAP_COORDS_TITLE"], _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + + info = {}; + info.text = L["TITAN_LOCATION_MENU_MAP_COORDS_LOC_1"] + info.func = function() + TitanSetVar(TITAN_LOCATION_ID, "MapLocation", "TOPLEFT") + end + info.checked = CoordLoc("TOPLEFT") + L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + info = {}; + info.text = L["TITAN_LOCATION_MENU_MAP_COORDS_LOC_2"] + info.func = function() + TitanSetVar(TITAN_LOCATION_ID, "MapLocation", "TOPRIGHT") + end + info.checked = CoordLoc("TOPRIGHT") + L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + info = {}; + info.text = L["TITAN_LOCATION_MENU_MAP_COORDS_LOC_3"] + info.func = function() + TitanSetVar(TITAN_LOCATION_ID, "MapLocation", "BOTTOMLEFT") + end + info.checked = CoordLoc("BOTTOMLEFT") + L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + info = {}; + info.text = L["TITAN_LOCATION_MENU_MAP_COORDS_LOC_4"] + info.func = function() + TitanSetVar(TITAN_LOCATION_ID, "MapLocation", "BOTTOM") + end + info.checked = CoordLoc("BOTTOM") + L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + info = {}; + info.text = L["TITAN_LOCATION_MENU_MAP_COORDS_LOC_5"] + info.func = function() + TitanSetVar(TITAN_LOCATION_ID, "MapLocation", "BOTTOMRIGHT") + end + info.checked = CoordLoc("BOTTOMRIGHT") + L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + end if _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "CoordFormat" then TitanPanelRightClickMenu_AddTitle(L["TITAN_LOCATION_FORMAT_COORD_LABEL"], _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); @@ -516,8 +566,26 @@ function TitanMapFrame_OnUpdate(self, elapsed) TitanMapPlayerLocation:ClearAllPoints() TitanMapCursorLocation:ClearAllPoints() - TitanMapPlayerLocation:SetPoint("TOPRIGHT", WorldMapFrame, "TOPRIGHT", -10, -28) - TitanMapCursorLocation:SetPoint("TOPRIGHT", WorldMapFrame, "TOPRIGHT", -10, -43) + local xbuff = 10 -- to get away from the frame border + local buff = 5 -- between the player and cursor frames + local mloc = TitanGetVar(TITAN_LOCATION_ID, "MapLocation") or "TOPRIGHT" + + if (mloc == "TOPRIGHT") then + TitanMapPlayerLocation:SetPoint("TOPRIGHT", WorldMapFrame, "TOPRIGHT", -10, -28) + TitanMapCursorLocation:SetPoint("TOPLEFT", TitanMapPlayerLocation, "BOTTOMLEFT", 0, 0) + elseif (mloc == "TOPLEFT") then + TitanMapPlayerLocation:SetPoint("TOPLEFT", WorldMapFrame, "TOPLEFT", 10, -28) + TitanMapCursorLocation:SetPoint("TOPLEFT", TitanMapPlayerLocation, "BOTTOMLEFT", 0, 0) + elseif (mloc == "BOTTOMLEFT") then + TitanMapPlayerLocation:SetPoint("BOTTOMLEFT", WorldMapFrame, "BOTTOMLEFT", 10, 10) + TitanMapCursorLocation:SetPoint("BOTTOMLEFT", TitanMapPlayerLocation, "BOTTOMRIGHT", buff, 0) + elseif (mloc == "BOTTOMRIGHT") then + TitanMapPlayerLocation:SetPoint("BOTTOMRIGHT", TitanMapCursorLocation, "BOTTOMLEFT", -buff, 0) + TitanMapCursorLocation:SetPoint("BOTTOMRIGHT", WorldMapFrame, "BOTTOMRIGHT", -xbuff, 10) + elseif (mloc == "BOTTOM") then + TitanMapPlayerLocation:SetPoint("BOTTOMRIGHT", WorldMapFrame, "BOTTOM", -buff, 10) + TitanMapCursorLocation:SetPoint("BOTTOMLEFT", WorldMapFrame, "BOTTOM", 0, 10) + end end -- ************************************************************************** -- 1.7.9.5