From cb3ed2cc0707730e2072cf67c7d1b5b9c03ace9f Mon Sep 17 00:00:00 2001 From: Repooc Date: Mon, 18 Mar 2013 05:56:15 -0400 Subject: [PATCH] Some clean up and adjustments --- ElvUI_SLE/modules/datatexts/friends.lua | 32 ++----------------------------- ElvUI_SLE/modules/datatexts/guild.lua | 24 +++++++++++------------ ElvUI_SLE/modules/datatexts/options.lua | 5 ----- 3 files changed, 14 insertions(+), 47 deletions(-) diff --git a/ElvUI_SLE/modules/datatexts/friends.lua b/ElvUI_SLE/modules/datatexts/friends.lua index 5f7f7f2..95c90a3 100644 --- a/ElvUI_SLE/modules/datatexts/friends.lua +++ b/ElvUI_SLE/modules/datatexts/friends.lua @@ -15,7 +15,6 @@ local pairs = _G.pairs local frame = CreateFrame("frame") local tooltip local LDB_ANCHOR ---local update_Friends local GROUP_CHECKMARK = "|TInterface\\Buttons\\UI-CheckBox-Check:0|t" local AWAY_ICON = "|TInterface\\FriendsFrame\\StatusIcon-Away:18|t" @@ -24,9 +23,6 @@ local MOBILE_ICON = "|TInterface\\ChatFrame\\UI-ChatIcon-ArmoryChat:18|t" local MINIMIZE = "|TInterface\\BUTTONS\\UI-PlusButton-Up:0|t" local BROADCAST_ICON = "|TInterface\\FriendsFrame\\BroadcastIcon:0|t" ---local FACTION_COLOR_HORDE = RED_FONT_COLOR_CODE ---local FACTION_COLOR_ALLIANCE = "|cff0070dd" - -- Setup the Title Font. 14 local ssTitleFont = CreateFont("ssTitleFont") ssTitleFont:SetTextColor(1,0.823529,0) @@ -232,15 +228,11 @@ local function Entry_OnMouseUp(frame, info, button) end elseif button == "RightButton" then if IsControlKeyDown() then - --if i_type == "guild" and CanEditOfficerNote() then - -- SetGuildRosterSelection(guild_name_to_index(toon_name)) - -- StaticPopup_Show("SET_GUILDOFFICERNOTE") - --end + --Possibly Set BNetBroadcast + -- E:StaticPopup_Show("SET_BN_BROADCAST") end elseif button == "MiddleButton" then - -- Expand RealID Broadcast E.db.sle.dt.friends.expandBNBroadcast = not E.db.sle.dt.friends.expandBNBroadcast - --E.db.sle.socialstate.expand_realID = not E.db.sle.socialstate.expand_realID LDB.OnEnter(LDB_ANCHOR) end end @@ -335,7 +327,6 @@ function LDB.OnEnter(self) for toonidx = 1, BNGetNumFriendToons(i) do local fcolor local status = "" - local _, _, _, _, _, _, _, isOnline, lastOnline, isAFK, isDND, broadcast, note = BNGetFriendInfoByID(presenceID) local _, toonName, client, realmName, realmID, faction, race, class, guild, zoneName, level, gameText = BNGetFriendToonInfo(i, toonidx) @@ -344,7 +335,6 @@ function LDB.OnEnter(self) fcolor = RED_FONT_COLOR_CODE else fcolor = "|cff0070dd" - --fcolor = FACTION_COLOR_ALLIANCE end end @@ -379,7 +369,6 @@ function LDB.OnEnter(self) if (E.db.sle.dt.friends["sortBN"] ~= "REALID") and (E.db.sle.dt.friends["sortBN"] ~= "revREALID") then table.sort(realid_table, list_sort[E.db.sle.dt.friends["sortBN"]]) - end for _, player in ipairs(realid_table) do @@ -432,7 +421,6 @@ function LDB.OnEnter(self) local friend_table = {} for i = 1,numFriendsOnline do local toonName, level, class, zoneName, connected, status, note = GetFriendInfo(i) - note = note and "|cffff8800{"..note.."}|r" or "" if status == CHAT_FLAG_AFK then @@ -468,7 +456,6 @@ function LDB.OnEnter(self) if not E.db.sle.dt.friends.hideFriendsNotes then line = tooltip:SetCell(line, 7, player["NOTE"]) end - tooltip:SetLineScript(line, "OnMouseUp", Entry_OnMouseUp, string.format("friends:%s:%s", player["TOONNAME"], player["TOONNAME"])) end end @@ -486,21 +473,6 @@ function LDB.OnEnter(self) tooltip:SetCellScript(line, 1, "OnMouseUp", HideOnMouseUp, "minimize_hintline") if not E.db.sle.dt.friends.minimize_hintline then - --line = tooltip:AddLine() - --tooltip:SetCell(line, 1, "|cffeda55fLeft Click|r to open the friends panel. |cffeda55fRight Click|r to open configuration panel.", "LEFT", 0) - - --line = tooltip:AddLine() - --tooltip:SetCell(line, 1, "|cffeda55fClick|r a line to whisper a player. |cffeda55fShift-Click|r a line to lookup a player.", "LEFT", 0) - - --line = tooltip:AddLine() - --tooltip:SetCell(line, 1, "|cffeda55fCtrl-Click|r a line to edit a note. |cffeda55fCtrl-RightClick|r a line to edit an officer note.", "LEFT", 0) - - --line = tooltip:AddLine() - --tooltip:SetCell(line, 1, "|cffeda55fAlt-Click|r a line to invite. |cffeda55fMiddleClick|r a line to expand RealID.", "LEFT", 0) - - --line = tooltip:AddLine() - --tooltip:SetCell(line, 1, "|cffeda55fClick|r a Header to hide it or sort it.", "LEFT", 0) - line = tooltip:AddLine() tooltip:SetCell(line, 1, "", "LEFT", 1) tooltip:SetCell(line, 2, "|cffeda55fLeft Click|r to open the friends panel.", "LEFT", 3) diff --git a/ElvUI_SLE/modules/datatexts/guild.lua b/ElvUI_SLE/modules/datatexts/guild.lua index e022c1b..a020d9f 100644 --- a/ElvUI_SLE/modules/datatexts/guild.lua +++ b/ElvUI_SLE/modules/datatexts/guild.lua @@ -202,10 +202,6 @@ local function Entry_OnMouseUp(frame, info, button) StaticPopup_Show("SET_GUILDOFFICERNOTE") end end - --elseif button == "MiddleButton" then - -- Expand RealID Broadcast - -- E.db.sle.socialstate.expand_realID = not E.db.sle.socialstate.expand_realID - -- LDB.OnEnter(LDB_ANCHOR) end end @@ -378,17 +374,21 @@ function LDB.OnEnter(self) if not E.db.sle.dt.guild.minimize_hintline then line = tooltip:AddLine() - tooltip:SetCell(line, 1, "|cffeda55fClick|r to open the guild panel. |cffeda55fClick|r a Header to hide it or sort it.", "LEFT", 0) - + tooltip:SetCell(line, 1, "", "LEFT", 1) + tooltip:SetCell(line, 2, "|cffeda55fLeft Click|r to open the guild panel.", "LEFT", 3) + tooltip:SetCell(line, 5, "|cffeda55fRight Click|r to open configuration panel.", "LEFT", 3) line = tooltip:AddLine() - tooltip:SetCell(line, 1, "|cffeda55fClick|r a line to whisper a player. |cffeda55fShift-Click|r a line to lookup a player.", "LEFT", 0) - + tooltip:SetCell(line, 1, "", "LEFT", 1) + tooltip:SetCell(line, 2, "|cffeda55fLeft Click|r a line to whisper a player.", "LEFT", 3) + tooltip:SetCell(line, 5, "|cffeda55fShift+Left Click|r a line to lookup a player.", "LEFT", 3)-- line = tooltip:AddLine() - tooltip:SetCell(line, 1, "|cffeda55fCtrl-Click|r a line to edit a note. |cffeda55fCtrl-RightClick|r a line to edit an officer note.", "LEFT", 0) - + tooltip:SetCell(line, 1, "", "LEFT", 1) + tooltip:SetCell(line, 2, "|cffeda55fCtrl+Left Click|r a line to edit note.", "LEFT", 3) + tooltip:SetCell(line, 5, "|cffeda55fCtrl+Right Click|r a line to edit officer note.", "LEFT", 3) line = tooltip:AddLine() - tooltip:SetCell(line, 1, "|cffeda55fAlt-Click|r a line to invite.", "LEFT", 0) - + tooltip:SetCell(line, 1, "", "LEFT", 1) + tooltip:SetCell(line, 2, "|cffeda55fAlt+Left Click|r a line to invite.", "LEFT", 3)-- + tooltip:SetCell(line, 5, "|cffeda55fLeft Click|r a Header to hide it or sort it.", "LEFT", 3)-- end end diff --git a/ElvUI_SLE/modules/datatexts/options.lua b/ElvUI_SLE/modules/datatexts/options.lua index e8150ad..28f3e3d 100755 --- a/ElvUI_SLE/modules/datatexts/options.lua +++ b/ElvUI_SLE/modules/datatexts/options.lua @@ -175,11 +175,6 @@ E.Options.args.sle.args.sldatatext = { type = 'description', name = "", }, - --['combat'] = false, - --['hideFriends'] = false, - --['sortBN'] = 'TOONNAME', - --['tooltipAutohide'] = '0.25', - --['totals'] = false, slfriends = { type = "group", name = L["S&L Friends"], -- 1.7.9.5