Bluewhale/ElvUIModernized
1
0
Fork 0
mirror of https://github.com/Bluewhale1337/ElvUIModernized.git synced 2026-07-27 16:34:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Bunny67
2018-07-14 21:11:44 +03:00
parent e2cd058116
commit 7f34a602b9
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElvUI/Modules/DataTexts/Friends.lua
+11 -15
View File
@@ -129,24 +129,21 @@ local function OnClick()
if arg1 == "RightButton" then if arg1 == "RightButton" then
local menuCountWhispers = 0 local menuCountWhispers = 0
local menuCountInvites = 0 local menuCountInvites = 0
local classc, levelc, info local classc, levelc
menuList[2].menuList = {} menuList[2].menuList = {}
menuList[3].menuList = {} menuList[3].menuList = {}
if getn(friendTable) > 0 then for _, info in friendTable do
for i = 1, getn(friendTable) do if info[5] then
info = friendTable[i] menuCountInvites = menuCountInvites + 1
if info[5] then menuCountWhispers = menuCountWhispers + 1
menuCountInvites = menuCountInvites + 1
menuCountWhispers = menuCountWhispers + 1
classc, levelc = (CUSTOM_CLASS_COLORS or RAID_CLASS_COLORS)[info[3]], GetQuestDifficultyColor(info[2]) classc, levelc = (CUSTOM_CLASS_COLORS or RAID_CLASS_COLORS)[info[3]], GetQuestDifficultyColor(info[2])
classc = classc or 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[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} 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}
end
end end
end end
L_EasyMenu(menuList, menuFrame, "cursor", 0, 0, "MENU", 2) L_EasyMenu(menuList, menuFrame, "cursor", 0, 0, "MENU", 2)
@@ -166,11 +163,10 @@ local function OnEnter(self)
dataValid = true dataValid = true
end end
local zonec, classc, levelc, info local zonec, classc, levelc
DT.tooltip:AddDoubleLine(FRIENDS_LIST, format(totalOnlineString, onlineFriends, numberOfFriends), tthead.r, tthead.g, tthead.b, tthead.r, tthead.g, tthead.b) DT.tooltip:AddDoubleLine(FRIENDS_LIST, format(totalOnlineString, onlineFriends, numberOfFriends), tthead.r, tthead.g, tthead.b, tthead.r, tthead.g, tthead.b)
if onlineFriends > 0 then if onlineFriends > 0 then
for i = 1, getn(friendTable) do for _, info in friendTable do
info = friendTable[i]
if info[5] then if info[5] then
if GetRealZoneText() == info[4] then zonec = activezone else zonec = inactivezone end if GetRealZoneText() == info[4] then zonec = activezone else zonec = inactivezone end
ElvUI/Modules/DataTexts/Guild.lua
+7 -4
View File
@@ -5,7 +5,7 @@ local DT = E:GetModule("DataTexts")
--Lua functions --Lua functions
local select, unpack = select, unpack local select, unpack = select, unpack
local format, find, join, upper = string.format, string.find, string.join, string.upper local format, find, join, upper = string.format, string.find, string.join, string.upper
local getn, sort, wipe = table.getn, table.sort, table.wipe local getn, tinsert, sort, wipe = table.getn, table.insert, table.sort, table.wipe
--WoW API / Variables --WoW API / Variables
local CreateFrame = CreateFrame local CreateFrame = CreateFrame
local GetGuildInfo = GetGuildInfo local GetGuildInfo = GetGuildInfo
@@ -22,7 +22,8 @@ local IsShiftKeyDown = IsShiftKeyDown
local L_EasyMenu = L_EasyMenu local L_EasyMenu = L_EasyMenu
local SetItemRef = SetItemRef local SetItemRef = SetItemRef
local ToggleFriendsFrame = ToggleFriendsFrame local ToggleFriendsFrame = ToggleFriendsFrame
local LOCALIZED_CLASS_NAMES_MALE = LOCALIZED_CLASS_NAMES_MALE
local LOCALIZED_CLASS_NAMES_FEMALE = LOCALIZED_CLASS_NAMES_FEMALE
local CHAT_MSG_WHISPER_INFORM, GUILD, GUILD_MOTD, GUILD_ONLINE_LABEL, GUILD_RANK1_DESC = CHAT_MSG_WHISPER_INFORM, GUILD, GUILD_MOTD, GUILD_ONLINE_LABEL, GUILD_RANK1_DESC local CHAT_MSG_WHISPER_INFORM, GUILD, GUILD_MOTD, GUILD_ONLINE_LABEL, GUILD_RANK1_DESC = CHAT_MSG_WHISPER_INFORM, GUILD, GUILD_MOTD, GUILD_ONLINE_LABEL, GUILD_RANK1_DESC
local LABEL_NOTE, OPTIONS_MENU, PARTY_INVITE = LABEL_NOTE, OPTIONS_MENU, PARTY_INVITE local LABEL_NOTE, OPTIONS_MENU, PARTY_INVITE = LABEL_NOTE, OPTIONS_MENU, PARTY_INVITE
@@ -75,7 +76,9 @@ local function BuildGuildTable()
if not name then break end if not name then break end
if online then if online then
guildTable[getn(guildTable) + 1] = {name, rank, level, zone, note, officernote, online, upper(class), rankIndex} 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
tinsert(guildTable, {name, rank, level, zone, note, officernote, online, class, rankIndex})
end end
end end
end end
@@ -148,7 +151,7 @@ local function OnClick()
for i = 1, getn(guildTable) do for i = 1, getn(guildTable) do
info = guildTable[i] info = guildTable[i]
if info[7] and info[1] ~= E.myname then if info[7] and info[1] ~= E.myname then
classc, levelc = (CUSTOM_CLASS_COLORS or RAID_CLASS_COLORS)[info[8]], GetQuestDifficultyColor(info[3]) classc, levelc = (CUSTOM_CLASS_COLORS and CUSTOM_CLASS_COLORS or RAID_CLASS_COLORS)[info[8]], GetQuestDifficultyColor(info[3])
menuCountInvites = menuCountInvites + 1 menuCountInvites = menuCountInvites + 1
menuList[2].menuList[menuCountInvites] = {text = format(levelNameString, levelc.r*255,levelc.g*255,levelc.b*255, info[3], classc.r*255,classc.g*255,classc.b*255, info[1], ""), arg1 = info[1],notCheckable=true, func = inviteClick} menuList[2].menuList[menuCountInvites] = {text = format(levelNameString, levelc.r*255,levelc.g*255,levelc.b*255, info[3], classc.r*255,classc.g*255,classc.b*255, info[1], ""), arg1 = info[1],notCheckable=true, func = inviteClick}