diff --git a/Titan/TitanPanel.lua b/Titan/TitanPanel.lua index 2cf7c96..bdc1d20 100644 --- a/Titan/TitanPanel.lua +++ b/Titan/TitanPanel.lua @@ -1691,7 +1691,7 @@ local function TitanPanel_MainMenu() ----------------- -- Menu title TitanPanelRightClickMenu_AddTitle(L["TITAN_PANEL_MENU_TITLE"]); - TitanPanelRightClickMenu_AddSpacer(L_UIDROPDOWNMENU_MENU_LEVEL); + TitanPanelRightClickMenu_AddSpacer(UIDROPDOWNMENU_MENU_LEVEL); TitanPanelRightClickMenu_AddTitle(L["TITAN_PANEL_MENU_PLUGINS"]); @@ -1703,7 +1703,7 @@ local function TitanPanel_MainMenu() info.text = L["TITAN_PANEL_MENU_CATEGORIES"][index]; info.value = "Addons_" .. TITAN_PANEL_BUTTONS_PLUGIN_CATEGORY[index]; info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); end TitanPanelRightClickMenu_AddSpacer(); @@ -1718,7 +1718,7 @@ local function TitanPanel_MainMenu() InterfaceOptionsFrame_OpenToCategory(L["TITAN_PANEL_MENU_TOP_BARS"]); InterfaceOptionsFrame_OpenToCategory(L["TITAN_PANEL_MENU_TOP_BARS"]); -- hack for a Blizz bug... end - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); TitanPanelRightClickMenu_AddSpacer(); @@ -1741,7 +1741,7 @@ local function TitanPanel_MainMenu() .._G["GREEN_FONT_COLOR_CODE"] ..L["TITAN_PANEL_MENU_IN_COMBAT_LOCKDOWN"]; end - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); ----------------- -- Save @@ -1757,7 +1757,7 @@ local function TitanPanel_MainMenu() .._G["GREEN_FONT_COLOR_CODE"] ..L["TITAN_PANEL_MENU_IN_COMBAT_LOCKDOWN"]; end - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); local glob, name, player, server = TitanUtils_GetGlobalProfile() info = {}; @@ -1769,20 +1769,20 @@ local function TitanPanel_MainMenu() end; info.checked = glob --TitanAllGetVar("GlobalProfileUse") info.keepShownOnClick = nil - L_UIDropDownMenu_AddButton(info, L_UIDROPDOWNMENU_MENU_LEVEL); + UIDropDownMenu_AddButton(info, UIDROPDOWNMENU_MENU_LEVEL); --local player, server = TitanUtils_ParseName(TitanAllGetVar("GlobalProfileName")) info = {}; info.notCheckable = true info.text = " "..TitanUtils_GetGreenText(server) info.value = "server"; - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); info = {}; info.notCheckable = true info.text = " "..TitanUtils_GetGreenText(player) info.value = "player"; - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); end @@ -1800,9 +1800,9 @@ local function TitanPanel_ServerSettingsMenu() local s, e, ident; local setonce = 0; - if ( L_UIDROPDOWNMENU_MENU_VALUE == "Settings" ) then + if ( UIDROPDOWNMENU_MENU_VALUE == "Settings" ) then TitanPanelRightClickMenu_AddTitle(L["TITAN_PANEL_MENU_PROFILE_SERVERS"], - L_UIDROPDOWNMENU_MENU_LEVEL); + UIDROPDOWNMENU_MENU_LEVEL); -- Normal profile per toon for index, id in pairs(TitanSettings.Players) do player, server = TitanUtils_ParseName(index) @@ -1815,7 +1815,7 @@ local function TitanPanel_ServerSettingsMenu() info.text = server; info.value = server; info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info, L_UIDROPDOWNMENU_MENU_LEVEL); + UIDropDownMenu_AddButton(info, UIDROPDOWNMENU_MENU_LEVEL); end end end @@ -1826,8 +1826,8 @@ local function TitanPanel_ServerSettingsMenu() if TitanUtils_GetCurrentIndex(servers, server) == nil then if server == TITAN_CUSTOM_PROFILE_POSTFIX then if setonce and setonce == 0 then - TitanPanelRightClickMenu_AddTitle("", L_UIDROPDOWNMENU_MENU_LEVEL); - TitanPanelRightClickMenu_AddTitle(L["TITAN_PANEL_MENU_PROFILE_CUSTOM"], L_UIDROPDOWNMENU_MENU_LEVEL); + TitanPanelRightClickMenu_AddTitle("", UIDROPDOWNMENU_MENU_LEVEL); + TitanPanelRightClickMenu_AddTitle(L["TITAN_PANEL_MENU_PROFILE_CUSTOM"], UIDROPDOWNMENU_MENU_LEVEL); setonce = 1; end info = {}; @@ -1835,7 +1835,7 @@ local function TitanPanel_ServerSettingsMenu() info.text = player; info.value = player; info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info, L_UIDROPDOWNMENU_MENU_LEVEL); + UIDropDownMenu_AddButton(info, UIDROPDOWNMENU_MENU_LEVEL); end end end @@ -1873,7 +1873,7 @@ local function TitanPanel_PlayerSettingsMenu() -- handle custom profiles here if server == TITAN_CUSTOM_PROFILE_POSTFIX - and player == L_UIDROPDOWNMENU_MENU_VALUE then + and player == UIDROPDOWNMENU_MENU_VALUE then info = {}; info.notCheckable = true info.disabled = TitanAllGetVar("GlobalProfileUse") @@ -1882,7 +1882,7 @@ local function TitanPanel_PlayerSettingsMenu() info.func = function() TitanVariables_UseSettings(index, TITAN_PROFILE_USE) end - L_UIDropDownMenu_AddButton(info, L_UIDROPDOWNMENU_MENU_LEVEL); + UIDropDownMenu_AddButton(info, UIDROPDOWNMENU_MENU_LEVEL); info = {}; info.notCheckable = true @@ -1901,14 +1901,14 @@ local function TitanPanel_PlayerSettingsMenu() TitanPanelRightClickMenu_Close(); end end - L_UIDropDownMenu_AddButton(info, L_UIDROPDOWNMENU_MENU_LEVEL); + UIDropDownMenu_AddButton(info, UIDROPDOWNMENU_MENU_LEVEL); end -- if server and player -- handle regular profiles here - if server == L_UIDROPDOWNMENU_MENU_VALUE then + if server == UIDROPDOWNMENU_MENU_VALUE then -- Set the label once if setonce and setonce == 0 then - TitanPanelRightClickMenu_AddTitle(L["TITAN_PANEL_MENU_PROFILE_CHARS"], L_UIDROPDOWNMENU_MENU_LEVEL); + TitanPanelRightClickMenu_AddTitle(L["TITAN_PANEL_MENU_PROFILE_CHARS"], UIDROPDOWNMENU_MENU_LEVEL); setonce = 1; end info = {}; @@ -1916,7 +1916,7 @@ local function TitanPanel_PlayerSettingsMenu() info.text = player; info.value = index; info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info, L_UIDROPDOWNMENU_MENU_LEVEL); + UIDropDownMenu_AddButton(info, UIDROPDOWNMENU_MENU_LEVEL); end end -- for players @@ -1924,14 +1924,14 @@ local function TitanPanel_PlayerSettingsMenu() for index, id in pairs(TitanPluginsIndex) do plugin = TitanUtils_GetPlugin(id); - if plugin.id and plugin.id == L_UIDROPDOWNMENU_MENU_VALUE then + if plugin.id and plugin.id == UIDROPDOWNMENU_MENU_VALUE then --title info = {}; info.text = TitanPlugins[plugin.id].menuText; info.notCheckable = true info.notClickable = 1; info.isTitle = 1; - L_UIDropDownMenu_AddButton(info, L_UIDROPDOWNMENU_MENU_LEVEL); + UIDropDownMenu_AddButton(info, UIDROPDOWNMENU_MENU_LEVEL); --ShowIcon if plugin.controlVariables.ShowIcon then @@ -1944,7 +1944,7 @@ local function TitanPanel_PlayerSettingsMenu() info.keepShownOnClick = 1; info.checked = TitanGetVar(id, "ShowIcon"); info.disabled = nil; - L_UIDropDownMenu_AddButton(info, L_UIDROPDOWNMENU_MENU_LEVEL); + UIDropDownMenu_AddButton(info, UIDROPDOWNMENU_MENU_LEVEL); end --ShowLabel @@ -1958,7 +1958,7 @@ local function TitanPanel_PlayerSettingsMenu() info.keepShownOnClick = 1; info.checked = TitanGetVar(id, "ShowLabelText"); info.disabled = nil; - L_UIDropDownMenu_AddButton(info, L_UIDROPDOWNMENU_MENU_LEVEL); + UIDropDownMenu_AddButton(info, UIDROPDOWNMENU_MENU_LEVEL); end --ShowRegularText (LDB data sources only atm) @@ -1972,7 +1972,7 @@ local function TitanPanel_PlayerSettingsMenu() info.keepShownOnClick = 1; info.checked = TitanGetVar(id, "ShowRegularText"); info.disabled = nil; - L_UIDropDownMenu_AddButton(info, L_UIDROPDOWNMENU_MENU_LEVEL); + UIDropDownMenu_AddButton(info, UIDROPDOWNMENU_MENU_LEVEL); end --ShowColoredText @@ -1986,7 +1986,7 @@ local function TitanPanel_PlayerSettingsMenu() info.keepShownOnClick = 1; info.checked = TitanGetVar(id, "ShowColoredText"); info.disabled = nil; - L_UIDropDownMenu_AddButton(info, L_UIDROPDOWNMENU_MENU_LEVEL); + UIDropDownMenu_AddButton(info, UIDROPDOWNMENU_MENU_LEVEL); end -- Right-side plugin @@ -2001,7 +2001,7 @@ local function TitanPanel_PlayerSettingsMenu() end info.checked = TitanGetVar(id, "DisplayOnRightSide"); info.disabled = nil; - L_UIDropDownMenu_AddButton(info, L_UIDROPDOWNMENU_MENU_LEVEL); + UIDropDownMenu_AddButton(info, UIDROPDOWNMENU_MENU_LEVEL); end end end @@ -2020,19 +2020,19 @@ local function TitanPanel_SettingsSelectionMenu() info.notCheckable = true info.disabled = TitanAllGetVar("GlobalProfileUse") info.text = L["TITAN_PANEL_MENU_LOAD_SETTINGS"]; - info.value = L_UIDROPDOWNMENU_MENU_VALUE; + info.value = UIDROPDOWNMENU_MENU_VALUE; info.func = function() - TitanVariables_UseSettings(L_UIDROPDOWNMENU_MENU_VALUE, TITAN_PROFILE_USE) + TitanVariables_UseSettings(UIDROPDOWNMENU_MENU_VALUE, TITAN_PROFILE_USE) end - L_UIDropDownMenu_AddButton(info, L_UIDROPDOWNMENU_MENU_LEVEL); + UIDropDownMenu_AddButton(info, UIDROPDOWNMENU_MENU_LEVEL); info = {}; info.notCheckable = true - info.disabled = (L_UIDROPDOWNMENU_MENU_VALUE == TitanSettings.Player) - or ((L_UIDROPDOWNMENU_MENU_VALUE == TitanAllGetVar("GlobalProfileName")) + info.disabled = (UIDROPDOWNMENU_MENU_VALUE == TitanSettings.Player) + or ((UIDROPDOWNMENU_MENU_VALUE == TitanAllGetVar("GlobalProfileName")) and (TitanAllGetVar("GlobalProfileUse"))) info.text = L["TITAN_PANEL_MENU_DELETE_SETTINGS"]; - info.value = L_UIDROPDOWNMENU_MENU_VALUE; + info.value = UIDROPDOWNMENU_MENU_VALUE; info.func = function() -- do not delete if current profile - .disabled --[[ @@ -2053,7 +2053,7 @@ local function TitanPanel_SettingsSelectionMenu() TitanPanelRightClickMenu_Close(); end end - L_UIDropDownMenu_AddButton(info, L_UIDROPDOWNMENU_MENU_LEVEL); + UIDropDownMenu_AddButton(info, UIDROPDOWNMENU_MENU_LEVEL); end --[[ Titan @@ -2071,7 +2071,7 @@ local function TitanPanel_BuildOtherPluginsMenu(frame) if not plugin.category then plugin.category = "General"; end - if ( L_UIDROPDOWNMENU_MENU_VALUE == "Addons_" .. plugin.category ) then + if ( UIDROPDOWNMENU_MENU_VALUE == "Addons_" .. plugin.category ) then if not TitanGetVar(id, "ForceBar") or (TitanGetVar(id, "ForceBar") == TitanBarData[frame].name) then info = {}; @@ -2091,7 +2091,7 @@ local function TitanPanel_BuildOtherPluginsMenu(frame) end; info.checked = TitanPanel_IsPluginShown(id) or nil info.keepShownOnClick = 1; - L_UIDropDownMenu_AddButton(info, L_UIDROPDOWNMENU_MENU_LEVEL); + UIDropDownMenu_AddButton(info, UIDROPDOWNMENU_MENU_LEVEL); end end end @@ -2110,20 +2110,20 @@ function TitanPanelRightClickMenu_PrepareBarMenu(self) local s, e, frame = string.find(self:GetName(), "(.*)RightClickMenu"); -- Level 2 - if ( L_UIDROPDOWNMENU_MENU_LEVEL == 2 ) then + if ( UIDROPDOWNMENU_MENU_LEVEL == 2 ) then TitanPanel_BuildOtherPluginsMenu(frame); TitanPanel_ServerSettingsMenu(); return; end -- Level 3 - if ( L_UIDROPDOWNMENU_MENU_LEVEL == 3 ) then + if ( UIDROPDOWNMENU_MENU_LEVEL == 3 ) then TitanPanel_PlayerSettingsMenu(); return; end -- Level 4 - if ( L_UIDROPDOWNMENU_MENU_LEVEL == 4 ) then + if ( UIDROPDOWNMENU_MENU_LEVEL == 4 ) then TitanPanel_SettingsSelectionMenu(); return; end diff --git a/Titan/TitanPanel.xml b/Titan/TitanPanel.xml index f72b77e..227a5a3 100644 --- a/Titan/TitanPanel.xml +++ b/Titan/TitanPanel.xml @@ -36,7 +36,7 @@ </ButtonText> --> <Frames> - <Frame name="$parentRightClickMenu" inherits="L_UIDropDownMenuTemplate" hidden="true"> + <Frame name="$parentRightClickMenu" inherits="UIDropDownMenuTemplate" hidden="true"> </Frame> </Frames> </Button> diff --git a/Titan/TitanPanelTemplate.xml b/Titan/TitanPanelTemplate.xml index 1f857c7..e0d7ff2 100644 --- a/Titan/TitanPanelTemplate.xml +++ b/Titan/TitanPanelTemplate.xml @@ -3,7 +3,7 @@ <Script file="TitanPanelTemplate.lua" /> <Button name="TitanPanelButtonTemplate" hidden="true" movable="true" virtual="true"> <Frames> - <Frame name="$parentRightClickMenu" inherits="L_UIDropDownMenuTemplate" id="1" hidden="true"> + <Frame name="$parentRightClickMenu" inherits="UIDropDownMenuTemplate" id="1" hidden="true"> </Frame> </Frames> <Scripts> @@ -26,7 +26,7 @@ </Button> <Button name="TitanPanelChildButtonTemplate" hidden="true" virtual="true"> <Frames> - <Frame name="$parentRightClickMenu" inherits="L_UIDropDownMenuTemplate" id="1" hidden="true"> + <Frame name="$parentRightClickMenu" inherits="UIDropDownMenuTemplate" id="1" hidden="true"> </Frame> </Frames> <Scripts> diff --git a/Titan/TitanUtils.lua b/Titan/TitanUtils.lua index 609ddac..fa12f8e 100644 --- a/Titan/TitanUtils.lua +++ b/Titan/TitanUtils.lua @@ -684,7 +684,7 @@ function TitanPanelRightClickMenu_AddTitle(title, level) info.notCheckable = true; info.notClickable = true; info.isTitle = 1; - L_UIDropDownMenu_AddButton(info, level); + UIDropDownMenu_AddButton(info, level); end end @@ -709,7 +709,7 @@ function TitanPanelRightClickMenu_AddCommand(text, value, functionName, level) callback(value) end end - L_UIDropDownMenu_AddButton(info, level); + UIDropDownMenu_AddButton(info, level); end --[[ API @@ -723,7 +723,7 @@ function TitanPanelRightClickMenu_AddSpacer(level) info.notCheckable = true; info.notClickable = true; info.disabled = 1; - L_UIDropDownMenu_AddButton(info, level); + UIDropDownMenu_AddButton(info, level); end --[[ API @@ -755,7 +755,7 @@ function TitanPanelRightClickMenu_AddToggleVar(text, id, var, toggleTable, level end info.checked = TitanGetVar(id, var); info.keepShownOnClick = 1; - L_UIDropDownMenu_AddButton(info, level); + UIDropDownMenu_AddButton(info, level); end --[[ API @@ -809,7 +809,7 @@ function TitanPanelRightClickMenu_AddHide(id, level) info.func = function() TitanPanelRightClickMenu_Hide(id) end - L_UIDropDownMenu_AddButton(info, level); + UIDropDownMenu_AddButton(info, level); end --[[ API @@ -1510,7 +1510,7 @@ local function TitanRightClickMenu_OnLoad(self) if id then local prepareFunction = _G["TitanPanelRightClickMenu_Prepare"..id.."Menu"] if prepareFunction and type(prepareFunction) == "function" then - L_UIDropDownMenu_Initialize(self, prepareFunction, "MENU"); + UIDropDownMenu_Initialize(self, prepareFunction, "MENU"); end else -- TitanDebug("Could not display tooltip. " @@ -1542,7 +1542,7 @@ local function TitanDisplayRightClickMenu_OnLoad(self, func) -- not good practice but there seems to be no other way to get -- the actual bar (frame parent) to the dropdown implementation TitanPanel_DropMenu = self - L_UIDropDownMenu_Initialize(self, prepareFunction, "MENU"); + UIDropDownMenu_Initialize(self, prepareFunction, "MENU"); end end @@ -1592,9 +1592,9 @@ function TitanPanelRightClickMenu_Toggle(self, isChildButton) x, y, scale = TitanRightClick_UIScale() - L_ToggleDropDownMenu(1, nil, menu, frame, TitanUtils_Max(x - 40, 0), 0, nil, self); + ToggleDropDownMenu(1, nil, menu, frame, TitanUtils_Max(x - 40, 0), 0, nil, self); --[[ was not used... - local listFrame = _G["DropDownList"..L_UIDROPDOWNMENU_MENU_LEVEL]; + local listFrame = _G["DropDownList"..UIDROPDOWNMENU_MENU_LEVEL]; local offscreenX, offscreenY = TitanUtils_GetOffscreen(listFrame); if offscreenX == 1 then @@ -1651,10 +1651,10 @@ function TitanPanelDisplayRightClickMenu_Toggle(self, isChildButton) x, y, scale = TitanRightClick_UIScale() - L_ToggleDropDownMenu(1, nil, menu, frame, TitanUtils_Max(x - 40, 0), 0, nil, self) + ToggleDropDownMenu(1, nil, menu, frame, TitanUtils_Max(x - 40, 0), 0, nil, self) --[[ was not used... - local listFrame = _G["DropDownList"..L_UIDROPDOWNMENU_MENU_LEVEL]; + local listFrame = _G["DropDownList"..UIDROPDOWNMENU_MENU_LEVEL]; local offscreenX, offscreenY = TitanUtils_GetOffscreen(listFrame); if offscreenX == 1 then if position == TITAN_PANEL_PLACE_TOP then diff --git a/Titan/embeds.xml b/Titan/embeds.xml index 770d0b1..cb2f89a 100644 --- a/Titan/embeds.xml +++ b/Titan/embeds.xml @@ -12,5 +12,4 @@ <Include file="libs\LibSharedMedia-3.0\lib.xml"/> <Include file="libs\AceGUI-3.0-SharedMediaWidgets\widget.xml"/> <Include file="libs\LibQTip-1.0\lib.xml"/> -<Include file="libs\!LibUIDropDownMenu\LibUIDropDownMenu\LibUIDropDownMenu.xml"/> </Ui> diff --git a/TitanBag/TitanBag.lua b/TitanBag/TitanBag.lua index 0c1c2d7..3296d50 100644 --- a/TitanBag/TitanBag.lua +++ b/TitanBag/TitanBag.lua @@ -228,26 +228,26 @@ end function TitanPanelRightClickMenu_PrepareBagMenu() local info -- level 2 - if _G["L_UIDROPDOWNMENU_MENU_LEVEL"] == 2 then - if _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "Options" then - TitanPanelRightClickMenu_AddTitle(L["TITAN_PANEL_OPTIONS"], _G["L_UIDROPDOWNMENU_MENU_LEVEL"]) + if _G["UIDROPDOWNMENU_MENU_LEVEL"] == 2 then + if _G["UIDROPDOWNMENU_MENU_VALUE"] == "Options" then + TitanPanelRightClickMenu_AddTitle(L["TITAN_PANEL_OPTIONS"], _G["UIDROPDOWNMENU_MENU_LEVEL"]) info = {}; info.text = L["TITAN_BAG_MENU_SHOW_USED_SLOTS"]; info.func = TitanPanelBagButton_ShowUsedSlots; info.checked = TitanGetVar(TITAN_BAG_ID, "ShowUsedSlots"); - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["TITAN_BAG_MENU_SHOW_AVAILABLE_SLOTS"]; info.func = TitanPanelBagButton_ShowAvailableSlots; info.checked = TitanUtils_Toggle(TitanGetVar(TITAN_BAG_ID, "ShowUsedSlots")); - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["TITAN_BAG_MENU_SHOW_DETAILED"]; info.func = TitanPanelBagButton_ShowDetailedInfo; info.checked = TitanGetVar(TITAN_BAG_ID, "ShowDetailedInfo"); - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); end return end @@ -260,14 +260,14 @@ function TitanPanelRightClickMenu_PrepareBagMenu() info.text = L["TITAN_PANEL_OPTIONS"]; info.value = "Options" info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); TitanPanelRightClickMenu_AddSpacer(); info = {}; info.text = L["TITAN_BAG_MENU_IGNORE_PROF_BAGS_SLOTS"]; info.func = TitanPanelBagButton_ToggleIgnoreProfBagSlots; info.checked = TitanUtils_Toggle(TitanGetVar(TITAN_BAG_ID, "CountProfBagSlots")); - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); TitanPanelRightClickMenu_AddSpacer(); TitanPanelRightClickMenu_AddToggleIcon(TITAN_BAG_ID); diff --git a/TitanClock/TitanClock.lua b/TitanClock/TitanClock.lua index 8da85ec..e493b26 100644 --- a/TitanClock/TitanClock.lua +++ b/TitanClock/TitanClock.lua @@ -439,19 +439,19 @@ function TitanPanelRightClickMenu_PrepareClockMenu() info.text = L["TITAN_CLOCK_MENU_LOCAL_TIME"]; info.func = function() TitanSetVar(TITAN_CLOCK_ID, "TimeMode", "Local") TitanPanelButton_UpdateButton(TITAN_CLOCK_ID) end info.checked = function() return TitanGetVar(TITAN_CLOCK_ID, "TimeMode") == "Local" end - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); info = {}; info.text = L["TITAN_CLOCK_MENU_SERVER_TIME"]; info.func = function() TitanSetVar(TITAN_CLOCK_ID, "TimeMode", "Server") TitanPanelButton_UpdateButton(TITAN_CLOCK_ID) end info.checked = function() return TitanGetVar(TITAN_CLOCK_ID, "TimeMode") == "Server" end - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); info = {}; info.text = L["TITAN_CLOCK_MENU_SERVER_ADJUSTED_TIME"]; info.func = function() TitanSetVar(TITAN_CLOCK_ID, "TimeMode", "ServerAdjusted") TitanPanelButton_UpdateButton(TITAN_CLOCK_ID) end info.checked = function() return TitanGetVar(TITAN_CLOCK_ID, "TimeMode") == "ServerAdjusted" end - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); TitanPanelRightClickMenu_AddSpacer(); @@ -460,20 +460,20 @@ function TitanPanelRightClickMenu_PrepareClockMenu() info.func = TitanPanelClockButton_ToggleMapTime; info.checked = TitanGetVar(TITAN_CLOCK_ID, "HideMapTime"); info.keepShownOnClick = 1; - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); info = {}; info.text = L["TITAN_CLOCK_MENU_HIDE_CALENDAR"]; info.func = TitanPanelClockButton_ToggleGameTimeFrameShown; info.checked = TitanGetVar(TITAN_CLOCK_ID, "HideGameTimeMinimap"); info.keepShownOnClick = 1; - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); info = {}; info.text = L["TITAN_CLOCK_MENU_DISPLAY_ON_RIGHT_SIDE"]; info.func = TitanPanelClockButton_ToggleRightSideDisplay; info.checked = TitanGetVar(TITAN_CLOCK_ID, "DisplayOnRightSide"); - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); TitanPanelRightClickMenu_AddToggleLabelText(TITAN_CLOCK_ID); TitanPanelRightClickMenu_AddToggleColoredText(TITAN_CLOCK_ID); diff --git a/TitanGold/TitanGold.lua b/TitanGold/TitanGold.lua index b8bd39a..5e3f413 100644 --- a/TitanGold/TitanGold.lua +++ b/TitanGold/TitanGold.lua @@ -507,7 +507,7 @@ local function ShowMenuButtons(faction) GoldSave[rementry].show = not GoldSave[rementry].show; TitanPanelButton_UpdateButton(TITAN_GOLD_ID) end - L_UIDropDownMenu_AddButton(info, L_UIDROPDOWNMENU_MENU_LEVEL); + UIDropDownMenu_AddButton(info, UIDROPDOWNMENU_MENU_LEVEL); end end end @@ -533,7 +533,7 @@ local function DeleteMenuButtons(faction) else info.disabled = nil; end - L_UIDropDownMenu_AddButton(info, L_UIDROPDOWNMENU_MENU_LEVEL); + UIDropDownMenu_AddButton(info, UIDROPDOWNMENU_MENU_LEVEL); end end end @@ -592,7 +592,7 @@ end -- DESC: Builds the right click config menu -- ******************************************************************************************* function TitanPanelRightClickMenu_PrepareGoldMenu() - if L_UIDROPDOWNMENU_MENU_LEVEL == 1 then + if UIDROPDOWNMENU_MENU_LEVEL == 1 then -- Menu title TitanPanelRightClickMenu_AddTitle(L["TITAN_GOLD_ITEMNAME"]); @@ -626,21 +626,21 @@ function TitanPanelRightClickMenu_PrepareGoldMenu() info.func = function() ShowProperLabels("ShowCoinNone") end - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); local info = {}; info.text = L["TITAN_GOLD_COIN_LABELS"]; info.checked = TitanGetVar(TITAN_GOLD_ID, "ShowCoinLabels"); info.func = function() ShowProperLabels("ShowCoinLabels") end - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); local info = {}; info.text = L["TITAN_GOLD_COIN_ICONS"]; info.checked = TitanGetVar(TITAN_GOLD_ID, "ShowCoinIcons"); info.func = function() ShowProperLabels("ShowCoinIcons") end - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); TitanPanelRightClickMenu_AddSpacer(); @@ -650,14 +650,14 @@ function TitanPanelRightClickMenu_PrepareGoldMenu() info.func = function() Seperator("UseSeperatorComma") end - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); local info = {}; info.text = L["TITAN_USE_PERIOD"]; info.checked = TitanGetVar(TITAN_GOLD_ID, "UseSeperatorPeriod"); info.func = function() Seperator("UseSeperatorPeriod") end - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); TitanPanelRightClickMenu_AddSpacer(); @@ -667,14 +667,14 @@ function TitanPanelRightClickMenu_PrepareGoldMenu() info.func = function() Merger("MergeServers") end - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); local info = {}; info.text = L["TITAN_GOLD_SEPARATE"]; info.checked = TitanGetVar(TITAN_GOLD_ID, "SeparateServers"); info.func = function() Merger("SeparateServers") end - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); TitanPanelRightClickMenu_AddSpacer(); @@ -685,7 +685,7 @@ function TitanPanelRightClickMenu_PrepareGoldMenu() TitanToggleVar(TITAN_GOLD_ID, "ShowGoldOnly"); TitanPanelButton_UpdateButton(TITAN_GOLD_ID); end - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); -- A blank line in the menu TitanPanelRightClickMenu_AddSpacer(); @@ -696,7 +696,7 @@ function TitanPanelRightClickMenu_PrepareGoldMenu() info.text = L["TITAN_GOLD_SHOW_PLAYER"]; info.value = "ToonShow"; info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); -- Delete toon info = {}; @@ -704,7 +704,7 @@ function TitanPanelRightClickMenu_PrepareGoldMenu() info.text = L["TITAN_GOLD_DELETE_PLAYER"]; info.value = "ToonDelete"; info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); -- A blank line in the menu TitanPanelRightClickMenu_AddSpacer(); @@ -714,7 +714,7 @@ function TitanPanelRightClickMenu_PrepareGoldMenu() info.notCheckable = true info.text = L["TITAN_GOLD_CLEAR_DATA_TEXT"]; info.func = TitanGold_ClearDB; - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); TitanPanelRightClickMenu_AddCommand(L["TITAN_GOLD_RESET_SESS_TEXT"], TITAN_GOLD_ID, "TitanPanelGoldButton_ResetSession"); @@ -729,39 +729,39 @@ function TitanPanelRightClickMenu_PrepareGoldMenu() TitanPanelRightClickMenu_AddCommand(L["TITAN_PANEL_MENU_HIDE"], TITAN_GOLD_ID, TITAN_PANEL_MENU_FUNC_HIDE); end - if L_UIDROPDOWNMENU_MENU_LEVEL == 2 and L_UIDROPDOWNMENU_MENU_VALUE == "ToonDelete" then + if UIDROPDOWNMENU_MENU_LEVEL == 2 and UIDROPDOWNMENU_MENU_VALUE == "ToonDelete" then local info = {}; info.notCheckable = true info.text = L["TITAN_GOLD_FACTION_PLAYER_ALLY"]; info.value = "DeleteAlliance"; info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info, L_UIDROPDOWNMENU_MENU_LEVEL); + UIDropDownMenu_AddButton(info, UIDROPDOWNMENU_MENU_LEVEL); info.text = L["TITAN_GOLD_FACTION_PLAYER_HORDE"]; info.value = "DeleteHorde"; info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info, L_UIDROPDOWNMENU_MENU_LEVEL); - elseif L_UIDROPDOWNMENU_MENU_LEVEL == 2 and L_UIDROPDOWNMENU_MENU_VALUE == "ToonShow" then + UIDropDownMenu_AddButton(info, UIDROPDOWNMENU_MENU_LEVEL); + elseif UIDROPDOWNMENU_MENU_LEVEL == 2 and UIDROPDOWNMENU_MENU_VALUE == "ToonShow" then local info = {}; info.notCheckable = true info.text = L["TITAN_GOLD_FACTION_PLAYER_ALLY"]; info.value = "ShowAlliance"; info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info, L_UIDROPDOWNMENU_MENU_LEVEL); + UIDropDownMenu_AddButton(info, UIDROPDOWNMENU_MENU_LEVEL); info.text = L["TITAN_GOLD_FACTION_PLAYER_HORDE"]; info.value = "ShowHorde"; info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info, L_UIDROPDOWNMENU_MENU_LEVEL); + UIDropDownMenu_AddButton(info, UIDROPDOWNMENU_MENU_LEVEL); end - if L_UIDROPDOWNMENU_MENU_LEVEL == 3 and L_UIDROPDOWNMENU_MENU_VALUE == "DeleteAlliance" then + if UIDROPDOWNMENU_MENU_LEVEL == 3 and UIDROPDOWNMENU_MENU_VALUE == "DeleteAlliance" then DeleteMenuButtons("Alliance") - elseif L_UIDROPDOWNMENU_MENU_LEVEL == 3 and L_UIDROPDOWNMENU_MENU_VALUE == "DeleteHorde" then + elseif UIDROPDOWNMENU_MENU_LEVEL == 3 and UIDROPDOWNMENU_MENU_VALUE == "DeleteHorde" then DeleteMenuButtons("Horde") - elseif L_UIDROPDOWNMENU_MENU_LEVEL == 3 and L_UIDROPDOWNMENU_MENU_VALUE == "ShowAlliance" then + elseif UIDROPDOWNMENU_MENU_LEVEL == 3 and UIDROPDOWNMENU_MENU_VALUE == "ShowAlliance" then ShowMenuButtons("Alliance") - elseif L_UIDROPDOWNMENU_MENU_LEVEL == 3 and L_UIDROPDOWNMENU_MENU_VALUE == "ShowHorde" then + elseif UIDROPDOWNMENU_MENU_LEVEL == 3 and UIDROPDOWNMENU_MENU_VALUE == "ShowHorde" then ShowMenuButtons("Horde") end end diff --git a/TitanLocation/TitanLocation.lua b/TitanLocation/TitanLocation.lua index dc85e9d..7bdbd63 100755 --- a/TitanLocation/TitanLocation.lua +++ b/TitanLocation/TitanLocation.lua @@ -282,27 +282,27 @@ function TitanPanelRightClickMenu_PrepareLocationMenu() local info -- level 2 - if _G["L_UIDROPDOWNMENU_MENU_LEVEL"] == 2 then - if _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "Options" then - TitanPanelRightClickMenu_AddTitle(L["TITAN_PANEL_OPTIONS"], _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + if _G["UIDROPDOWNMENU_MENU_LEVEL"] == 2 then + if _G["UIDROPDOWNMENU_MENU_VALUE"] == "Options" then + TitanPanelRightClickMenu_AddTitle(L["TITAN_PANEL_OPTIONS"], _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["TITAN_LOCATION_MENU_SHOW_ZONE_ON_PANEL_TEXT"]; info.func = TitanPanelLocationButton_ToggleDisplay; info.checked = TitanGetVar(TITAN_LOCATION_ID, "ShowZoneText"); - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"]; info.func = TitanPanelLocationButton_ToggleLocationOnMap; info.checked = TitanGetVar(TITAN_LOCATION_ID, "ShowCoordsOnMap"); - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["TITAN_LOCATION_MENU_SHOW_LOC_ON_MINIMAP_TEXT"]; info.func = TitanPanelLocationButton_ToggleLocOnMiniMap; info.checked = TitanGetVar(TITAN_LOCATION_ID, "ShowLocOnMiniMap"); info.disabled = InCombatLockdown() - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["TITAN_LOCATION_MENU_UPDATE_WORLD_MAP"]; @@ -311,10 +311,10 @@ function TitanPanelRightClickMenu_PrepareLocationMenu() end info.checked = TitanGetVar(TITAN_LOCATION_ID, "UpdateWorldmap"); info.disabled = InCombatLockdown() - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["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"]); + if _G["UIDROPDOWNMENU_MENU_VALUE"] == "CoordFormat" then + TitanPanelRightClickMenu_AddTitle(L["TITAN_LOCATION_FORMAT_COORD_LABEL"], _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["TITAN_LOCATION_FORMAT_LABEL"]; info.func = function() @@ -324,7 +324,7 @@ function TitanPanelRightClickMenu_PrepareLocationMenu() TitanPanelButton_UpdateButton(TITAN_LOCATION_ID); end info.checked = TitanGetVar(TITAN_LOCATION_ID, "CoordsFormat1"); - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["TITAN_LOCATION_FORMAT2_LABEL"]; @@ -335,7 +335,7 @@ function TitanPanelRightClickMenu_PrepareLocationMenu() TitanPanelButton_UpdateButton(TITAN_LOCATION_ID); end info.checked = TitanGetVar(TITAN_LOCATION_ID, "CoordsFormat2"); - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["TITAN_LOCATION_FORMAT3_LABEL"]; @@ -346,7 +346,7 @@ function TitanPanelRightClickMenu_PrepareLocationMenu() TitanPanelButton_UpdateButton(TITAN_LOCATION_ID); end info.checked = TitanGetVar(TITAN_LOCATION_ID, "CoordsFormat3"); - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); end return end @@ -359,14 +359,14 @@ function TitanPanelRightClickMenu_PrepareLocationMenu() info.text = L["TITAN_PANEL_OPTIONS"]; info.value = "Options" info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); info = {}; info.notCheckable = true info.text = L["TITAN_LOCATION_FORMAT_COORD_LABEL"]; info.value = "CoordFormat" info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); TitanPanelRightClickMenu_AddSpacer(); TitanPanelRightClickMenu_AddToggleIcon(TITAN_LOCATION_ID); diff --git a/TitanLootType/TitanLootType.lua b/TitanLootType/TitanLootType.lua index 8c5914c..4f2e268 100644 --- a/TitanLootType/TitanLootType.lua +++ b/TitanLootType/TitanLootType.lua @@ -229,36 +229,36 @@ end -- ************************************************************************** function TitanPanelRightClickMenu_PrepareLootTypeMenu() local info = {}; - if _G["L_UIDROPDOWNMENU_MENU_LEVEL"] == 2 and _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "RandomRoll" then + if _G["UIDROPDOWNMENU_MENU_LEVEL"] == 2 and _G["UIDROPDOWNMENU_MENU_VALUE"] == "RandomRoll" then info = {}; info.text = "100"; info.value = 100; info.func = TitanPanelLootType_Random100; info.checked = TitanPanelLootType_GetRoll(info.value); - L_UIDropDownMenu_AddButton(info,_G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info,_G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = "1000"; info.value = 1000; info.func = TitanPanelLootType_Random1000; info.checked = TitanPanelLootType_GetRoll(info.value); - L_UIDropDownMenu_AddButton(info,_G["L_UIDROPDOWNMENU_MENU_LEVEL"]); - elseif _G["L_UIDROPDOWNMENU_MENU_LEVEL"] == 2 and _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "ShowDungeonDiffMenu" then + UIDropDownMenu_AddButton(info,_G["UIDROPDOWNMENU_MENU_LEVEL"]); + elseif _G["UIDROPDOWNMENU_MENU_LEVEL"] == 2 and _G["UIDROPDOWNMENU_MENU_VALUE"] == "ShowDungeonDiffMenu" then info = {}; info.text = _G["LFG_TYPE_DUNGEON"]; info.func = function() TitanSetVar(TITAN_LOOTTYPE_ID, "DungeonDiffType", "DUNGEON"); TitanPanelButton_UpdateButton(TITAN_LOOTTYPE_ID) end info.checked = function() if TitanGetVar(TITAN_LOOTTYPE_ID, "DungeonDiffType") == "DUNGEON" then return true end return false end - L_UIDropDownMenu_AddButton(info,_G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info,_G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = _G["LFG_TYPE_RAID"]; info.func = function() TitanSetVar(TITAN_LOOTTYPE_ID, "DungeonDiffType", "RAID"); TitanPanelButton_UpdateButton(TITAN_LOOTTYPE_ID) end info.checked = function() if TitanGetVar(TITAN_LOOTTYPE_ID, "DungeonDiffType") == "RAID" then return true end return false end - L_UIDropDownMenu_AddButton(info,_G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info,_G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["TITAN_LOOTTYPE_AUTODIFF_LABEL"]; info.func = function() TitanSetVar(TITAN_LOOTTYPE_ID, "DungeonDiffType", "AUTO"); TitanPanelButton_UpdateButton(TITAN_LOOTTYPE_ID) end info.checked = function() if TitanGetVar(TITAN_LOOTTYPE_ID, "DungeonDiffType") == "AUTO" then return true end return false end - L_UIDropDownMenu_AddButton(info,_G["L_UIDROPDOWNMENU_MENU_LEVEL"]); - elseif _G["L_UIDROPDOWNMENU_MENU_LEVEL"] == 2 and _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "SetDungeonDiff" then + UIDropDownMenu_AddButton(info,_G["UIDROPDOWNMENU_MENU_LEVEL"]); + elseif _G["UIDROPDOWNMENU_MENU_LEVEL"] == 2 and _G["UIDROPDOWNMENU_MENU_VALUE"] == "SetDungeonDiff" then info = {}; info.text = _G["GREEN_FONT_COLOR_CODE"].._G["PLAYER_DIFFICULTY1"].."|r"; info.func = function() SetDungeonDifficultyID(1) end @@ -278,7 +278,7 @@ function TitanPanelRightClickMenu_PrepareLootTypeMenu() else info.disabled = false end - L_UIDropDownMenu_AddButton(info,_G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info,_G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {} info.text = _G["ORANGE_FONT_COLOR_CODE"].._G["PLAYER_DIFFICULTY2"].."|r"; @@ -299,7 +299,7 @@ function TitanPanelRightClickMenu_PrepareLootTypeMenu() else info.disabled = false end - L_UIDropDownMenu_AddButton(info,_G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info,_G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {} info.text = _G["RED_FONT_COLOR_CODE"].._G["PLAYER_DIFFICULTY6"].."|r"; @@ -320,7 +320,7 @@ function TitanPanelRightClickMenu_PrepareLootTypeMenu() else info.disabled = false end - L_UIDropDownMenu_AddButton(info,_G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info,_G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {} info.text = _G["RED_FONT_COLOR_CODE"].._G["PLAYER_DIFFICULTY5"].."|r"; @@ -341,10 +341,10 @@ function TitanPanelRightClickMenu_PrepareLootTypeMenu() else info.disabled = false end - L_UIDropDownMenu_AddButton(info,_G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info,_G["UIDROPDOWNMENU_MENU_LEVEL"]); - elseif _G["L_UIDROPDOWNMENU_MENU_LEVEL"] == 2 and _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "SetRaidDiff" then + elseif _G["UIDROPDOWNMENU_MENU_LEVEL"] == 2 and _G["UIDROPDOWNMENU_MENU_VALUE"] == "SetRaidDiff" then info = {}; info.text = _G["GREEN_FONT_COLOR_CODE"].._G["PLAYER_DIFFICULTY1"].."|r"; info.func = function() SetRaidDifficultyID(1) end @@ -364,7 +364,7 @@ function TitanPanelRightClickMenu_PrepareLootTypeMenu() else info.disabled = false end - L_UIDropDownMenu_AddButton(info,_G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info,_G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = _G["ORANGE_FONT_COLOR_CODE"].._G["PLAYER_DIFFICULTY2"].."|r"; @@ -385,7 +385,7 @@ function TitanPanelRightClickMenu_PrepareLootTypeMenu() else info.disabled = false end - L_UIDropDownMenu_AddButton(info,_G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info,_G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = _G["RED_FONT_COLOR_CODE"].._G["PLAYER_DIFFICULTY6"].."|r"; @@ -406,7 +406,7 @@ function TitanPanelRightClickMenu_PrepareLootTypeMenu() else info.disabled = false end - L_UIDropDownMenu_AddButton(info,_G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info,_G["UIDROPDOWNMENU_MENU_LEVEL"]); --[[ info = {}; info.text = _G["RED_FONT_COLOR_CODE"].._G["RAID_DIFFICULTY4"].."|r"; @@ -427,7 +427,7 @@ function TitanPanelRightClickMenu_PrepareLootTypeMenu() else info.disabled = false end - L_UIDropDownMenu_AddButton(info,_G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info,_G["UIDROPDOWNMENU_MENU_LEVEL"]); --]] else @@ -440,25 +440,25 @@ function TitanPanelRightClickMenu_PrepareLootTypeMenu() info.checked = TitanGetVar(TITAN_LOOTTYPE_ID, "ShowDungeonDiff"); info.keepShownOnClick = 1; info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); info = {} info.notCheckable = true info.text = L["TITAN_LOOTTYPE_SETDUNGEONDIFF_LABEL"]; info.value = "SetDungeonDiff"; info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); info = {} info.notCheckable = true info.text = L["TITAN_LOOTTYPE_SETRAIDDIFF_LABEL"]; info.value = "SetRaidDiff"; info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); info = {}; info.notCheckable = true info.text = L["TITAN_LOOTTYPE_RANDOM_ROLL_LABEL"]; info.value = "RandomRoll"; info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); TitanPanelRightClickMenu_AddSpacer(); TitanPanelRightClickMenu_AddToggleIcon(TITAN_LOOTTYPE_ID); TitanPanelRightClickMenu_AddToggleLabelText(TITAN_LOOTTYPE_ID); diff --git a/TitanPerformance/TitanPerformance.lua b/TitanPerformance/TitanPerformance.lua index 7317d5e..1b70a46 100644 --- a/TitanPerformance/TitanPerformance.lua +++ b/TitanPerformance/TitanPerformance.lua @@ -427,15 +427,15 @@ function TitanPanelRightClickMenu_PreparePerformanceMenu() local info -- level 3 - if _G["L_UIDROPDOWNMENU_MENU_LEVEL"] == 3 and _G["L_UIDROPDOWNMENU_MENU_VALUE"]== "AddonControlFrame" then + if _G["UIDROPDOWNMENU_MENU_LEVEL"] == 3 and _G["UIDROPDOWNMENU_MENU_VALUE"]== "AddonControlFrame" then TitanPanelPerfControlFrame:Show() return end -- level 2 - if _G["L_UIDROPDOWNMENU_MENU_LEVEL"] == 2 then - if _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "Options" then - TitanPanelRightClickMenu_AddTitle(L["TITAN_PANEL_OPTIONS"], _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + if _G["UIDROPDOWNMENU_MENU_LEVEL"] == 2 then + if _G["UIDROPDOWNMENU_MENU_VALUE"] == "Options" then + TitanPanelRightClickMenu_AddTitle(L["TITAN_PANEL_OPTIONS"], _G["UIDROPDOWNMENU_MENU_LEVEL"]); local temptable = {TITAN_PERFORMANCE_ID, "ShowFPS"}; info = {}; @@ -446,7 +446,7 @@ function TitanPanelRightClickMenu_PreparePerformanceMenu() end info.checked = TitanGetVar(TITAN_PERFORMANCE_ID, "ShowFPS"); info.keepShownOnClick = 1; - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); local temptable = {TITAN_PERFORMANCE_ID, "ShowLatency"}; info = {}; @@ -457,7 +457,7 @@ function TitanPanelRightClickMenu_PreparePerformanceMenu() end info.checked = TitanGetVar(TITAN_PERFORMANCE_ID, "ShowLatency"); info.keepShownOnClick = 1; - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); local temptable = {TITAN_PERFORMANCE_ID, "ShowWorldLatency"}; info = {}; @@ -468,7 +468,7 @@ function TitanPanelRightClickMenu_PreparePerformanceMenu() end info.checked = TitanGetVar(TITAN_PERFORMANCE_ID, "ShowWorldLatency"); info.keepShownOnClick = 1; - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); local temptable = {TITAN_PERFORMANCE_ID, "ShowMemory"}; info = {}; @@ -479,11 +479,11 @@ function TitanPanelRightClickMenu_PreparePerformanceMenu() end info.checked = TitanGetVar(TITAN_PERFORMANCE_ID, "ShowMemory"); info.keepShownOnClick = 1; - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); end - if _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "AddonUsage" then - TitanPanelRightClickMenu_AddTitle(L["TITAN_PERFORMANCE_ADDONS"], _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + if _G["UIDROPDOWNMENU_MENU_VALUE"] == "AddonUsage" then + TitanPanelRightClickMenu_AddTitle(L["TITAN_PERFORMANCE_ADDONS"], _G["UIDROPDOWNMENU_MENU_LEVEL"]); local temptable = {TITAN_PERFORMANCE_ID, "ShowAddonMemory"}; info = {}; @@ -494,7 +494,7 @@ function TitanPanelRightClickMenu_PreparePerformanceMenu() end info.checked = TitanGetVar(TITAN_PERFORMANCE_ID, "ShowAddonMemory"); info.keepShownOnClick = 1; - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); local temptable = {TITAN_PERFORMANCE_ID, "ShowAddonIncRate"}; info = {}; @@ -505,45 +505,45 @@ function TitanPanelRightClickMenu_PreparePerformanceMenu() end info.checked = TitanGetVar(TITAN_PERFORMANCE_ID, "ShowAddonIncRate"); info.keepShownOnClick = 1; - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.notCheckable = true info.text = L["TITAN_PERFORMANCE_CONTROL_TOOLTIP"]..LIGHTYELLOW_FONT_COLOR_CODE..tostring(TitanGetVar(TITAN_PERFORMANCE_ID, "NumOfAddons")); info.value = "AddonControlFrame" info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); end - if _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "AddonMemoryFormat" then - TitanPanelRightClickMenu_AddTitle(L["TITAN_PERFORMANCE_ADDON_MEM_FORMAT_LABEL"], _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + if _G["UIDROPDOWNMENU_MENU_VALUE"] == "AddonMemoryFormat" then + TitanPanelRightClickMenu_AddTitle(L["TITAN_PERFORMANCE_ADDON_MEM_FORMAT_LABEL"], _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["TITAN_MEGABYTE"]; info.checked = function() if TitanGetVar(TITAN_PERFORMANCE_ID, "AddonMemoryType") == 1 then return true else return nil end end info.func = function() TitanSetVar(TITAN_PERFORMANCE_ID, "AddonMemoryType", 1) end - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["TITAN_MEMORY_KBMB_LABEL"]; info.checked = function() if TitanGetVar(TITAN_PERFORMANCE_ID, "AddonMemoryType") == 2 then return true else return nil end end info.func = function() TitanSetVar(TITAN_PERFORMANCE_ID, "AddonMemoryType", 2) end - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); end - if _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "CPUProfiling" then + if _G["UIDROPDOWNMENU_MENU_VALUE"] == "CPUProfiling" then if ( GetCVar("scriptProfile") == "1" ) then - TitanPanelRightClickMenu_AddTitle(L["TITAN_PERFORMANCE_MENU_CPUPROF_LABEL"]..": "..GREEN_FONT_COLOR_CODE..L["TITAN_PANEL_MENU_ENABLED"], _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + TitanPanelRightClickMenu_AddTitle(L["TITAN_PERFORMANCE_MENU_CPUPROF_LABEL"]..": "..GREEN_FONT_COLOR_CODE..L["TITAN_PANEL_MENU_ENABLED"], _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["TITAN_PERFORMANCE_MENU_CPUPROF_LABEL_OFF"]..GREEN_FONT_COLOR_CODE..L["TITAN_PANEL_MENU_RELOADUI"]; info.func = function() SetCVar("scriptProfile", "0", 1) ReloadUI() end - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); else - TitanPanelRightClickMenu_AddTitle(L["TITAN_PERFORMANCE_MENU_CPUPROF_LABEL"]..": "..RED_FONT_COLOR_CODE..L["TITAN_PANEL_MENU_DISABLED"], _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + TitanPanelRightClickMenu_AddTitle(L["TITAN_PERFORMANCE_MENU_CPUPROF_LABEL"]..": "..RED_FONT_COLOR_CODE..L["TITAN_PANEL_MENU_DISABLED"], _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["TITAN_PERFORMANCE_MENU_CPUPROF_LABEL_ON"]..GREEN_FONT_COLOR_CODE..L["TITAN_PANEL_MENU_RELOADUI"]; info.func = function() SetCVar("scriptProfile", "1", 1) ReloadUI() end - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); end end return @@ -557,28 +557,28 @@ function TitanPanelRightClickMenu_PreparePerformanceMenu() info.text = L["TITAN_PANEL_OPTIONS"]; info.value = "Options" info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); info = {}; info.notCheckable = true info.text = L["TITAN_PERFORMANCE_ADDONS"]; info.value = "AddonUsage" info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); info = {}; info.notCheckable = true info.text = L["TITAN_PERFORMANCE_ADDON_MEM_FORMAT_LABEL"]; info.value = "AddonMemoryFormat" info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); info = {}; info.notCheckable = true info.text = L["TITAN_PERFORMANCE_MENU_CPUPROF_LABEL"]; info.value = "CPUProfiling" info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); TitanPanelRightClickMenu_AddSpacer(); TitanPanelRightClickMenu_AddToggleIcon(TITAN_PERFORMANCE_ID); diff --git a/TitanRepair/TitanRepair.lua b/TitanRepair/TitanRepair.lua index 23e4bee..2303ae2 100644 --- a/TitanRepair/TitanRepair.lua +++ b/TitanRepair/TitanRepair.lua @@ -1115,9 +1115,9 @@ function TitanPanelRightClickMenu_PrepareRepairMenu() local info; -- level 2 - if _G["L_UIDROPDOWNMENU_MENU_LEVEL"] == 2 then - if _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "Discount" then - TitanPanelRightClickMenu_AddTitle(L["REPAIR_LOCALE"]["discount"], _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + if _G["UIDROPDOWNMENU_MENU_LEVEL"] == 2 then + if _G["UIDROPDOWNMENU_MENU_VALUE"] == "Discount" then + TitanPanelRightClickMenu_AddTitle(L["REPAIR_LOCALE"]["discount"], _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["REPAIR_LOCALE"]["buttonNormal"]; @@ -1130,7 +1130,7 @@ local info; TitanSetVar(TITAN_REPAIR_ID,"DiscountExalted", nil) TitanPanelButton_UpdateButton(TITAN_REPAIR_ID) end - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["REPAIR_LOCALE"]["buttonFriendly"]; @@ -1143,7 +1143,7 @@ local info; TitanSetVar(TITAN_REPAIR_ID,"DiscountExalted", nil) TitanPanelButton_UpdateButton(TITAN_REPAIR_ID) end - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["REPAIR_LOCALE"]["buttonHonored"]; @@ -1156,7 +1156,7 @@ local info; TitanSetVar(TITAN_REPAIR_ID,"DiscountExalted", nil) TitanPanelButton_UpdateButton(TITAN_REPAIR_ID) end - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["REPAIR_LOCALE"]["buttonRevered"]; @@ -1169,7 +1169,7 @@ local info; TitanSetVar(TITAN_REPAIR_ID,"DiscountExalted", nil) TitanPanelButton_UpdateButton(TITAN_REPAIR_ID) end - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["REPAIR_LOCALE"]["buttonExalted"]; @@ -1182,11 +1182,11 @@ local info; TitanSetVar(TITAN_REPAIR_ID,"DiscountExalted", 1) TitanPanelButton_UpdateButton(TITAN_REPAIR_ID) end - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); end - if _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "Options" then - TitanPanelRightClickMenu_AddTitle(L["TITAN_PANEL_OPTIONS"], _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + if _G["UIDROPDOWNMENU_MENU_VALUE"] == "Options" then + TitanPanelRightClickMenu_AddTitle(L["TITAN_PANEL_OPTIONS"], _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["REPAIR_LOCALE"]["percentage"]; @@ -1196,31 +1196,31 @@ local info; TitanPanelButton_UpdateButton(TITAN_REPAIR_ID); end info.checked = TitanGetVar(TITAN_REPAIR_ID,"ShowPercentage"); - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["REPAIR_LOCALE"]["mostdamaged"]; info.func = TitanRepair_ShowMostDamaged; info.checked = TitanGetVar(TITAN_REPAIR_ID,"ShowMostDamaged"); - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["REPAIR_LOCALE"]["undamaged"]; info.func = TitanRepair_ShowUndamaged; info.checked = TitanGetVar(TITAN_REPAIR_ID,"ShowUndamaged"); - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["REPAIR_LOCALE"]["showinventory"]; info.func = TitanRepair_ShowInventory; info.checked = TitanGetVar(TITAN_REPAIR_ID,"ShowInventory"); - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["REPAIR_LOCALE"]["ShowRepairCost"]; --"Show Repair Cost" info.func = TitanRepair_ShowRepairCost; info.checked = TitanGetVar(TITAN_REPAIR_ID,"ShowRepairCost"); - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["REPAIR_LOCALE"]["showdurabilityframe"]; @@ -1229,38 +1229,38 @@ local info; TitanRepair_DurabilityFrame(); end info.checked = TitanGetVar(TITAN_REPAIR_ID,"ShowDurabilityFrame"); - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["REPAIR_LOCALE"]["ignoreThrown"]; info.func = TitanRepair_IgnoreThrown; info.checked = TitanGetVar(TITAN_REPAIR_ID,"IgnoreThrown"); - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); end - if _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "AutoRepair" then - TitanPanelRightClickMenu_AddTitle(L["REPAIR_LOCALE"]["AutoReplabel"], _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + if _G["UIDROPDOWNMENU_MENU_VALUE"] == "AutoRepair" then + TitanPanelRightClickMenu_AddTitle(L["REPAIR_LOCALE"]["AutoReplabel"], _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["REPAIR_LOCALE"]["popup"]; info.func = TitanRepair_ShowPop; info.checked = TitanGetVar(TITAN_REPAIR_ID,"ShowPopup"); - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["REPAIR_LOCALE"]["AutoRepitemlabel"]; info.func = TitanRepair_AutoRep; info.checked = TitanGetVar(TITAN_REPAIR_ID,"AutoRepair"); - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["TITAN_REPAIR_REPORT_COST_MENU"] info.func = function() TitanToggleVar(TITAN_REPAIR_ID, "AutoRepairReport"); end info.checked = TitanGetVar(TITAN_REPAIR_ID,"AutoRepairReport"); - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); end - if _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "GuildBank" then + if _G["UIDROPDOWNMENU_MENU_VALUE"] == "GuildBank" then totalGBCP = GetGuildBankMoney(); withdrawGBCP = GetGuildBankWithdrawMoney(); if IsGuildLeader() ~= true then @@ -1270,38 +1270,38 @@ local info; if (totalGBCP < withdrawGBCP) or IsGuildLeader() == true then withdrawGB = totalGB; end - TitanPanelRightClickMenu_AddTitle(L["TITAN_REPAIR_GBANK_TOTAL"].." "..totalGB, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); - TitanPanelRightClickMenu_AddTitle(L["TITAN_REPAIR_GBANK_WITHDRAW"].." "..withdrawGB, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + TitanPanelRightClickMenu_AddTitle(L["TITAN_REPAIR_GBANK_TOTAL"].." "..totalGB, _G["UIDROPDOWNMENU_MENU_LEVEL"]); + TitanPanelRightClickMenu_AddTitle(L["TITAN_REPAIR_GBANK_WITHDRAW"].." "..withdrawGB, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {} info.text = L["TITAN_REPAIR_GBANK_USEFUNDS"] info.func = function() TitanToggleVar(TITAN_REPAIR_ID, "UseGuildBank"); end info.checked = TitanGetVar(TITAN_REPAIR_ID,"UseGuildBank"); - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); end - if _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "TooltipOptions" then - TitanPanelRightClickMenu_AddTitle(L["REPAIR_LOCALE"]["TooltipOptions"], _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + if _G["UIDROPDOWNMENU_MENU_VALUE"] == "TooltipOptions" then + TitanPanelRightClickMenu_AddTitle(L["REPAIR_LOCALE"]["TooltipOptions"], _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["REPAIR_LOCALE"]["ShowItems"]; info.func = function() TitanToggleVar(TITAN_REPAIR_ID, "ShowItems"); end info.checked = TitanGetVar(TITAN_REPAIR_ID,"ShowItems"); info.keepShownOnClick = 1 - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["REPAIR_LOCALE"]["ShowDiscounts"]; info.func = function() TitanToggleVar(TITAN_REPAIR_ID, "ShowDiscounts"); end info.checked = TitanGetVar(TITAN_REPAIR_ID,"ShowDiscounts"); info.keepShownOnClick = 1 - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; info.text = L["REPAIR_LOCALE"]["ShowCosts"]; info.func = function() TitanToggleVar(TITAN_REPAIR_ID, "ShowCosts"); end info.checked = TitanGetVar(TITAN_REPAIR_ID,"ShowCosts"); info.keepShownOnClick = 1 - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); end return @@ -1315,14 +1315,14 @@ local info; info.text = L["TITAN_PANEL_OPTIONS"]; info.value = "Options" info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); info = {}; info.notCheckable = true info.text = L["REPAIR_LOCALE"]["AutoReplabel"]; info.value = "AutoRepair" info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); local guildName, _, _ = GetGuildInfo("player") info = {}; @@ -1334,21 +1334,21 @@ local info; else info.disabled = true end - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); info = {}; info.notCheckable = true info.text = L["REPAIR_LOCALE"]["discount"]; info.value = "Discount" info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); info = {}; info.notCheckable = true info.text = L["REPAIR_LOCALE"]["TooltipOptions"]; info.value = "TooltipOptions" info.hasArrow = 1; - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); TitanPanelRightClickMenu_AddSpacer(); TitanPanelRightClickMenu_AddToggleIcon(TITAN_REPAIR_ID); diff --git a/TitanVolume/TitanVolume.lua b/TitanVolume/TitanVolume.lua index 13c6128..a182c30 100644 --- a/TitanVolume/TitanVolume.lua +++ b/TitanVolume/TitanVolume.lua @@ -408,7 +408,7 @@ function TitanPanelRightClickMenu_PrepareVolumeMenu() info.func = function() ShowUIPanel(VideoOptionsFrame); end - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); info.text = L["TITAN_VOLUME_MENU_OVERRIDE_BLIZZ_SETTINGS"]; info.notCheckable = false @@ -416,7 +416,7 @@ function TitanPanelRightClickMenu_PrepareVolumeMenu() TitanToggleVar(TITAN_VOLUME_ID, "OverrideBlizzSettings"); end info.checked = TitanGetVar(TITAN_VOLUME_ID, "OverrideBlizzSettings"); - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); TitanPanelRightClickMenu_AddSpacer(); TitanPanelRightClickMenu_AddCommand(L["TITAN_PANEL_MENU_HIDE"], TITAN_VOLUME_ID, TITAN_PANEL_MENU_FUNC_HIDE); diff --git a/TitanXP/TitanXP.lua b/TitanXP/TitanXP.lua index 2ecb0cc..19cb8c8 100644 --- a/TitanXP/TitanXP.lua +++ b/TitanXP/TitanXP.lua @@ -342,7 +342,7 @@ end function TitanPanelRightClickMenu_PrepareXPMenu() local info = {}; - if L_UIDROPDOWNMENU_MENU_LEVEL == 2 then + if UIDROPDOWNMENU_MENU_LEVEL == 2 then TitanPanelRightClickMenu_AddTitle(L["TITAN_XP_MENU_SIMPLE_BUTTON_TITLE"], 2); info = {}; @@ -350,52 +350,52 @@ function TitanPanelRightClickMenu_PrepareXPMenu() info.func = function() TitanPanelRightClickMenu_ToggleVar({TITAN_XP_ID, "ShowSimpleRested"}) end info.checked = TitanUtils_Ternary(TitanGetVar(TITAN_XP_ID, "ShowSimpleRested"), 1, nil); info.keepShownOnClick = 1; - L_UIDropDownMenu_AddButton(info, 2); + UIDropDownMenu_AddButton(info, 2); info = {}; info.text = L["TITAN_XP_MENU_SIMPLE_BUTTON_TOLEVELUP"]; info.func = function() TitanPanelRightClickMenu_ToggleVar({TITAN_XP_ID, "ShowSimpleToLevel"}) end info.checked = TitanUtils_Ternary(TitanGetVar(TITAN_XP_ID, "ShowSimpleToLevel"), 1, nil); info.keepShownOnClick = 1; - L_UIDropDownMenu_AddButton(info, 2); + UIDropDownMenu_AddButton(info, 2); info = {}; info.text = L["TITAN_XP_MENU_SIMPLE_BUTTON_KILLS"]; info.func = function() TitanSetVar(TITAN_XP_ID, "ShowSimpleNumOfKills", true) TitanSetVar(TITAN_XP_ID, "ShowSimpleNumOfGains", false) end info.checked = TitanUtils_Ternary(TitanGetVar(TITAN_XP_ID, "ShowSimpleNumOfKills"), 1, nil); - L_UIDropDownMenu_AddButton(info, 2); + UIDropDownMenu_AddButton(info, 2); info = {}; info.text = L["TITAN_XP_MENU_SIMPLE_BUTTON_XPGAIN"]; info.func = function() TitanSetVar(TITAN_XP_ID, "ShowSimpleNumOfGains", true) TitanSetVar(TITAN_XP_ID, "ShowSimpleNumOfKills", false) end info.checked = TitanUtils_Ternary(TitanGetVar(TITAN_XP_ID, "ShowSimpleNumOfGains"), 1, nil); - L_UIDropDownMenu_AddButton(info, 2); + UIDropDownMenu_AddButton(info, 2); else TitanPanelRightClickMenu_AddTitle(TitanPlugins[TITAN_XP_ID].menuText); info = {}; info.text = L["TITAN_XP_MENU_SHOW_XPHR_THIS_SESSION"]; info.func = TitanPanelXPButton_ShowXPPerHourSession; info.checked = TitanUtils_Ternary("ShowXPPerHourSession" == TitanGetVar(TITAN_XP_ID, "DisplayType"), 1, nil); - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); info = {}; info.text = L["TITAN_XP_MENU_SHOW_XPHR_THIS_LEVEL"]; info.func = TitanPanelXPButton_ShowXPPerHourLevel; info.checked = TitanUtils_Ternary("ShowXPPerHourLevel" == TitanGetVar(TITAN_XP_ID, "DisplayType"), 1, nil); - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); info = {}; info.text = L["TITAN_XP_MENU_SHOW_SESSION_TIME"]; info.func = TitanPanelXPButton_ShowSessionTime; info.checked = TitanUtils_Ternary("ShowSessionTime" == TitanGetVar(TITAN_XP_ID, "DisplayType"), 1, nil); - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); info = {}; info.text = L["TITAN_XP_MENU_SHOW_RESTED_TOLEVELUP"]; info.func = TitanPanelXPButton_ShowXPSimple; info.hasArrow = 1; info.checked = TitanUtils_Ternary("ShowXPSimple" == TitanGetVar(TITAN_XP_ID, "DisplayType"), 1, nil); - L_UIDropDownMenu_AddButton(info); + UIDropDownMenu_AddButton(info); TitanPanelRightClickMenu_AddSpacer(); TitanPanelRightClickMenu_AddCommand(L["TITAN_XP_MENU_RESET_SESSION"], TITAN_XP_ID, "TitanPanelXPButton_ResetSession"); @@ -413,14 +413,14 @@ function TitanPanelRightClickMenu_PrepareXPMenu() info.func = function() Seperator("UseSeperatorComma") end - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); local info = {}; info.text = L["TITAN_USE_PERIOD"]; info.checked = TitanGetVar(TITAN_XP_ID, "UseSeperatorPeriod"); info.func = function() Seperator("UseSeperatorPeriod") end - L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + UIDropDownMenu_AddButton(info, _G["UIDROPDOWNMENU_MENU_LEVEL"]); TitanPanelRightClickMenu_AddSpacer(); TitanPanelRightClickMenu_AddCommand(L["TITAN_PANEL_MENU_HIDE"], TITAN_XP_ID, TITAN_PANEL_MENU_FUNC_HIDE);