diff --git a/ElvUI/Locales/Chinese_UI.lua b/ElvUI/Locales/Chinese_UI.lua index 678f458..078b71e 100644 --- a/ElvUI/Locales/Chinese_UI.lua +++ b/ElvUI/Locales/Chinese_UI.lua @@ -38,7 +38,6 @@ L["Reset Position"] = "重设位置" L["Sort Bags"] = "背包整理" L["Temporary Move"] = "移动背包" L["Toggle Bags"] = "背包开关" -L["Toggle Key"] = true; L["Vendor Grays"] = "出售灰色物品" --Chat diff --git a/ElvUI/Locales/English_UI.lua b/ElvUI/Locales/English_UI.lua index 4f2210e..ffac9fa 100644 --- a/ElvUI/Locales/English_UI.lua +++ b/ElvUI/Locales/English_UI.lua @@ -38,7 +38,6 @@ L["Reset Position"] = true; L["Sort Bags"] = true; L["Temporary Move"] = true; L["Toggle Bags"] = true; -L["Toggle Key"] = true; L["Vendor Grays"] = true; --Chat diff --git a/ElvUI/Locales/French_UI.lua b/ElvUI/Locales/French_UI.lua index bc95f78..f9dcfa9 100644 --- a/ElvUI/Locales/French_UI.lua +++ b/ElvUI/Locales/French_UI.lua @@ -38,7 +38,6 @@ L["Reset Position"] = "Réinitialiser la position" L["Sort Bags"] = "Trier les sacs" L["Temporary Move"] = "Déplacer temporairement" L["Toggle Bags"] = "Afficher les sacs" -L["Toggle Key"] = true; L["Vendor Grays"] = "Vendre les objets gris" --Chat diff --git a/ElvUI/Locales/German_UI.lua b/ElvUI/Locales/German_UI.lua index cf3462d..1c3deb5 100644 --- a/ElvUI/Locales/German_UI.lua +++ b/ElvUI/Locales/German_UI.lua @@ -38,7 +38,6 @@ L["Reset Position"] = "Position zurücksetzen" L["Sort Bags"] = "Taschen sortieren" L["Temporary Move"] = "Temporäres Bewegen" L["Toggle Bags"] = "Taschen umschalten" -L["Toggle Key"] = true; L["Vendor Grays"] = "Graue Gegenstände verkaufen" --Chat diff --git a/ElvUI/Locales/Korean_UI.lua b/ElvUI/Locales/Korean_UI.lua index cf72b27..d569b65 100644 --- a/ElvUI/Locales/Korean_UI.lua +++ b/ElvUI/Locales/Korean_UI.lua @@ -38,7 +38,6 @@ L["Reset Position"] = "위치 초기화" L["Sort Bags"] = "가방 정렬" L["Temporary Move"] = "임시 이동" L["Toggle Bags"] = "가방슬롯 보기" -L["Toggle Key"] = true; L["Vendor Grays"] = "잡동사니 자동판매" --Chat diff --git a/ElvUI/Locales/Portuguese_UI.lua b/ElvUI/Locales/Portuguese_UI.lua index 64ddb33..c6ea094 100644 --- a/ElvUI/Locales/Portuguese_UI.lua +++ b/ElvUI/Locales/Portuguese_UI.lua @@ -38,7 +38,6 @@ L["Reset Position"] = "Redefinir Posição" L["Sort Bags"] = "Organizar Bolsas" L["Temporary Move"] = "Mover Temporariamente" L["Toggle Bags"] = "Mostrar/Ocultar Bolsas" -L["Toggle Key"] = true; L["Vendor Grays"] = "Vender Itens Cinzentos" --Chat diff --git a/ElvUI/Locales/Russian_UI.lua b/ElvUI/Locales/Russian_UI.lua index 35a9284..0e37664 100644 --- a/ElvUI/Locales/Russian_UI.lua +++ b/ElvUI/Locales/Russian_UI.lua @@ -38,7 +38,6 @@ L["Reset Position"] = "Сбросить позицию" L["Sort Bags"] = "Сортировать" L["Temporary Move"] = "Временное перемещение" L["Toggle Bags"] = "Показать сумки" -L["Toggle Key"] = "Показать ключи" L["Vendor Grays"] = "Продавать серые предметы" --Chat diff --git a/ElvUI/Locales/Spanish_UI.lua b/ElvUI/Locales/Spanish_UI.lua index 2376aa3..3117387 100644 --- a/ElvUI/Locales/Spanish_UI.lua +++ b/ElvUI/Locales/Spanish_UI.lua @@ -38,7 +38,6 @@ L["Reset Position"] = "Reestablecer Posición" L["Sort Bags"] = "Ordenar Bolsas" L["Temporary Move"] = "Movimiento Temporal" L["Toggle Bags"] = "Mostrar/Ocultar Bolsas" -L["Toggle Key"] = true; L["Vendor Grays"] = "Vender Objetos Grises" --Chat diff --git a/ElvUI/Locales/Taiwanese_UI.lua b/ElvUI/Locales/Taiwanese_UI.lua index c04b0ca..d835616 100644 --- a/ElvUI/Locales/Taiwanese_UI.lua +++ b/ElvUI/Locales/Taiwanese_UI.lua @@ -38,7 +38,6 @@ L["Reset Position"] = "重設位置" L["Sort Bags"] = "整理背包" L["Temporary Move"] = "移動背包" L["Toggle Bags"] = "開啟/關閉背包" -L["Toggle Key"] = true; L["Vendor Grays"] = "出售灰色物品" --Chat diff --git a/ElvUI/Modules/Bags/Bags.lua b/ElvUI/Modules/Bags/Bags.lua index b9a34ea..830bdda 100644 --- a/ElvUI/Modules/Bags/Bags.lua +++ b/ElvUI/Modules/Bags/Bags.lua @@ -47,6 +47,7 @@ local KEYRING_CONTAINER = KEYRING_CONTAINER local MAX_CONTAINER_ITEMS = MAX_CONTAINER_ITEMS local NUM_BAG_FRAMES = NUM_BAG_FRAMES local NUM_CONTAINER_FRAMES = NUM_CONTAINER_FRAMES +local BINDING_NAME_TOGGLEKEYRING = BINDING_NAME_TOGGLEKEYRING local SEARCH = SEARCH local SEARCH_STRING = "" @@ -973,7 +974,7 @@ function B:ContructContainerFrame(name, isBank) f.keyButton:GetPushedTexture():SetTexCoord(unpack(E.TexCoords)) E:SetInside(f.keyButton:GetPushedTexture()) E:StyleButton(f.keyButton, nil, true) - f.keyButton.ttText = L["Toggle Key"] + f.keyButton.ttText = BINDING_NAME_TOGGLEKEYRING f.keyButton:SetScript("OnEnter", self.Tooltip_Show) f.keyButton:SetScript("OnLeave", self.Tooltip_Hide) f.keyButton:SetScript("OnClick", function() ToggleFrame(f.keyFrame) end) diff --git a/ElvUI/Modules/DataTexts/Durability.lua b/ElvUI/Modules/DataTexts/Durability.lua index 9d3f4bd..9468403 100644 --- a/ElvUI/Modules/DataTexts/Durability.lua +++ b/ElvUI/Modules/DataTexts/Durability.lua @@ -8,11 +8,10 @@ local pairs = pairs local format, join, upper = string.format, string.join, string.upper --WoW API / Variables local GetInventoryItemDurability = GetInventoryItemDurability -local GetInventoryItemTexture = GetInventoryItemTexture local GetInventorySlotInfo = GetInventorySlotInfo local ToggleCharacter = ToggleCharacter -local DURABILITY = "Durability" +local DURABILITY = "Durability" -- Need add in locales local displayString = "" local tooltipString = "%d%%" @@ -33,7 +32,7 @@ local slots = { "HeadSlot" } -local function OnEvent(self, t) +local function OnEvent(self) lastPanel = self totalDurability = 100 @@ -42,8 +41,6 @@ local function OnEvent(self, t) current, max = GetInventoryItemDurability(slot) if current then - current, max = GetInventoryItemDurability(slot) - invDurability[value] = (current / max) * 100 if ((current / max) * 100) < totalDurability then diff --git a/ElvUI/Modules/DataTexts/Friends.lua b/ElvUI/Modules/DataTexts/Friends.lua index 65c26b8..ca32a29 100644 --- a/ElvUI/Modules/DataTexts/Friends.lua +++ b/ElvUI/Modules/DataTexts/Friends.lua @@ -3,31 +3,25 @@ local DT = E:GetModule("DataTexts"); --Cache global variables --Lua functions -local type, pairs = type, pairs -local sort, wipe = table.sort, wipe +local pairs = pairs +local tinsert, sort, wipe, next = table.insert, table.sort, wipe, next local format, find, join, gsub = string.format, string.find, string.join, string.gsub --WoW API / Variables -local UnitIsAFK = UnitIsAFK -local UnitIsDND = UnitIsDND local SendChatMessage = SendChatMessage local InviteByName = InviteByName local SetItemRef = SetItemRef local GetFriendInfo = GetFriendInfo local GetNumFriends = GetNumFriends local GetQuestDifficultyColor = GetQuestDifficultyColor -local UnitInParty = UnitInParty -local UnitInRaid = UnitInRaid local ToggleFriendsFrame = ToggleFriendsFrame -local L_EasyMenu = L_EasyMenu -local AVAILABLE, CHAT_MSG_AFK, CHAT_MSG_DND, CHAT_MSG_WHISPER_INFORM = AVAILABLE, CHAT_MSG_AFK, CHAT_MSG_DND, CHAT_MSG_WHISPER_INFORM -local ERR_FRIEND_ONLINE_SS, ERR_FRIEND_OFFLINE_S, FRIENDS, FRIENDS_LIST = ERR_FRIEND_ONLINE_SS, ERR_FRIEND_OFFLINE_S, FRIENDS, FRIENDS_LIST -local GUILD_ONLINE_LABEL, OPTIONS_MENU, PARTY_INVITE, PLAYER_STATUS = GUILD_ONLINE_LABEL, OPTIONS_MENU, PARTY_INVITE, PLAYER_STATUS - -local LOCALIZED_CLASS_NAMES_MALE = LOCALIZED_CLASS_NAMES_MALE +local CHAT_MSG_AFK = CHAT_MSG_AFK +local CHAT_MSG_DND = CHAT_MSG_DND +local FRIENDS = FRIENDS local LOCALIZED_CLASS_NAMES_FEMALE = LOCALIZED_CLASS_NAMES_FEMALE -local CUSTOM_CLASS_COLORS = CUSTOM_CLASS_COLORS -local RAID_CLASS_COLORS = RAID_CLASS_COLORS +local LOCALIZED_CLASS_NAMES_MALE = LOCALIZED_CLASS_NAMES_MALE + +local L_EasyMenu = L_EasyMenu local function GetNumberFriends() local numFriends = GetNumFriends() @@ -52,9 +46,9 @@ local menuList = { {text = CHAT_MSG_WHISPER_INFORM, hasArrow = true, notCheckable = true}, {text = PLAYER_STATUS, hasArrow = true, notCheckable = true, menuList = { - -- {text = "|cff2BC226" .. AVAILABLE .. "|r", notCheckable = true, func = function() end}, -- TODO - {text = "|cffE7E716" .. CHAT_MSG_AFK .. "|r", notCheckable = true, func = function() SendChatMessage("", "AFK") end}, - {text = "|cffFF0000" .. CHAT_MSG_DND .. "|r", notCheckable = true, func = function() SendChatMessage("", "DND") end} +-- {text = "|cff2BC226"..AVAILABLE.."|r", notCheckable = true, func = function() end}, -- TODO + {text = "|cffE7E716"..CHAT_MSG_AFK.."|r", notCheckable = true, func = function() SendChatMessage("", "AFK") end}, + {text = "|cffFF0000"..CHAT_MSG_DND.."|r", notCheckable = true, func = function() SendChatMessage("", "DND") end} } } } @@ -66,12 +60,12 @@ end local function whisperClick(playerName) menuFrame:Hide() - SetItemRef("player:" .. playerName, format("|Hplayer:%1$s|h[%1$s]|h", playerName), "LeftButton") + SetItemRef("player:"..playerName, format("|Hplayer:%1$s|h[%1$s]|h", playerName), "LeftButton") end local lastPanel local levelNameString = "|cff%02x%02x%02x%d|r |cff%02x%02x%02x%s|r" -local levelNameClassString = "|cff%02x%02x%02x%d|r %s%s" +local levelNameClassString = "|cff%02x%02x%02x%d|r %s" local totalOnlineString = join("", GUILD_ONLINE_LABEL, ": %s/%s") local tthead = {r = 0.4, g = 0.78, b = 1} local activezone, inactivezone = {r = 0.3, g = 1.0, b = 0.3}, {r = 0.65, g = 0.65, b = 0.65} @@ -82,37 +76,32 @@ local friendOnline, friendOffline = gsub(ERR_FRIEND_ONLINE_SS, "\124Hplayer:%%s\ local dataValid = false local function SortAlphabeticName(a, b) - if(a[1] and b[1]) then + if a[1] and b[1] then return a[1] < b[1] end end local function BuildFriendTable(total) wipe(friendTable) - local name, level, class, area, online, status, note + local name, level, class, area, online for i = 1, total do - name, level, class, area, online, status, note = GetFriendInfo(i) - - if status == CHAT_FLAG_AFK then - status = "|cffFFFFFF[|r|cfffaff00" .. CHAT_MSG_AFK .. "|r|cffFFFFFF]|r" - elseif status == CHAT_FLAG_DND then - status = "|cffFFFFFF[|r|cffff0000" .. CHAT_MSG_DND .. "|r|cffFFFFFF]|r" - end + name, level, class, area, online = GetFriendInfo(i) if online then for k, v in pairs(LOCALIZED_CLASS_NAMES_MALE) do if class == v then class = k end end for k, v in pairs(LOCALIZED_CLASS_NAMES_FEMALE) do if class == v then class = k end end - friendTable[i] = {name, level, class, area, online, status, note} + friendTable[i] = {name, level, class, area, online} end end - sort(friendTable, SortAlphabeticName) + if next(friendTable) then + sort(friendTable, SortAlphabeticName) + end end -local function OnEvent(self, event) +local function OnEvent(self, event, message) local _, onlineFriends = GetNumberFriends() if event == "CHAT_MSG_SYSTEM" then - local message = arg1 if not (find(message, friendOnline) or find(message, friendOffline)) then return end end @@ -127,8 +116,6 @@ local function OnClick() DT.tooltip:Hide() if arg1 == "RightButton" then - local menuCountWhispers = 0 - local menuCountInvites = 0 local classc, levelc menuList[2].menuList = {} @@ -136,14 +123,11 @@ local function OnClick() for _, info in friendTable do if info[5] then - menuCountInvites = menuCountInvites + 1 - menuCountWhispers = menuCountWhispers + 1 - classc, levelc = (CUSTOM_CLASS_COLORS or RAID_CLASS_COLORS)[info[3]], GetQuestDifficultyColor(info[2]) classc = classc or GetQuestDifficultyColor(info[2]) - menuList[2].menuList[menuCountInvites] = {text = format(levelNameString, levelc.r*255,levelc.g*255,levelc.b*255, info[2],classc.r*255,classc.g*255,classc.b*255, info[1]), arg1 = info[1], notCheckable = true, func = inviteClick} - menuList[3].menuList[menuCountWhispers] = {text = format(levelNameString, levelc.r*255,levelc.g*255,levelc.b*255, info[2],classc.r*255,classc.g*255,classc.b*255, info[1]), arg1 = info[1], notCheckable = true, func = whisperClick} + tinsert(menuList[2].menuList, {text = format(levelNameString, levelc.r*255,levelc.g*255,levelc.b*255, info[2],classc.r*255,classc.g*255,classc.b*255, info[1]), arg1 = info[1], notCheckable = true, func = inviteClick}) + tinsert(menuList[3].menuList, {text = format(levelNameString, levelc.r*255,levelc.g*255,levelc.b*255, info[2],classc.r*255,classc.g*255,classc.b*255, info[1]), arg1 = info[1], notCheckable = true, func = whisperClick}) end end L_EasyMenu(menuList, menuFrame, "cursor", 0, 0, "MENU", 2) @@ -173,7 +157,7 @@ local function OnEnter(self) classc, levelc = (CUSTOM_CLASS_COLORS or RAID_CLASS_COLORS)[info[3]], GetQuestDifficultyColor(info[2]) classc = classc or GetQuestDifficultyColor(info[2]) - DT.tooltip:AddDoubleLine(format(levelNameClassString, levelc.r*255,levelc.g*255,levelc.b*255, info[2], info[1], " " .. info[6]), info[4], classc.r,classc.g,classc.b, zonec.r,zonec.g,zonec.b) + DT.tooltip:AddDoubleLine(format(levelNameClassString, levelc.r*255,levelc.g*255,levelc.b*255, info[2], info[1]), info[4], classc.r,classc.g,classc.b, zonec.r,zonec.g,zonec.b) end end end