From 21f2c0ea59509abb94faebf3321ef9c337830dec Mon Sep 17 00:00:00 2001 From: Riasan Date: Tue, 12 Feb 2019 19:23:13 +0100 Subject: [PATCH] Added: Team Invite button by Guild Member List and Friend List --HG-- branch : compatibility-develop --- code/ryzom/client/src/interface_v3/guild_manager.cpp | 12 ++++++++---- code/ryzom/client/src/interface_v3/people_list.cpp | 4 ++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/code/ryzom/client/src/interface_v3/guild_manager.cpp b/code/ryzom/client/src/interface_v3/guild_manager.cpp index 8e6c0019a..0358d919a 100644 --- a/code/ryzom/client/src/interface_v3/guild_manager.cpp +++ b/code/ryzom/client/src/interface_v3/guild_manager.cpp @@ -60,13 +60,13 @@ NLMISC_REGISTER_OBJECT(CViewBase, CDBGroupListAscensor, std::string, "list_sheet #define WIN_GUILD "ui:interface:guild" #define WIN_GUILD_CHAT "ui:interface:guild_chat" #define WIN_GUILD_FORUM "ui:interface:guild_forum" -#define VIEW_TEXT_GUILD_QUIT "ui:interface:guild:content:tab_guild:quit_guild" -#define CTRL_SHEET_GUILD_BLASON "ui:interface:guild:content:tab_guild:blason" -#define VIEW_TEXT_GUILD_MEMBER_COUNT "ui:interface:guild:content:tab_guild:member_count" +#define VIEW_TEXT_GUILD_QUIT "ui:interface:guild:content:tab_guild_info:quit_guild" +#define CTRL_SHEET_GUILD_BLASON "ui:interface:guild:content:tab_guild_info:blason" +#define VIEW_TEXT_GUILD_MEMBER_COUNT "ui:interface:guild:content:tab_guild_info:member_count" #define LIST_GUILD_MEMBERS "ui:interface:guild:content:tab_guild:list_member:guild_members" -#define CTRL_QUIT_GUILD "ui:interface:guild:content:tab_guild:quit_guild" +#define CTRL_QUIT_GUILD "ui:interface:guild:content:tab_guild_info:quit_guild" #define TEMPLATE_GUILD_MEMBER "member_template" #define TEMPLATE_GUILD_MEMBER_NAME "name" #define TEMPLATE_GUILD_MEMBER_GRADE "grade" @@ -867,6 +867,10 @@ class CAHGuildSheetOpen : public IActionHandler break; } } + + CCtrlBase *inviteButton = pLine->getCtrl("invite_button"); + if (inviteButton != NULL) + inviteButton->setActive(rGuildMembers[i].Online != ccs_offline && rGuildMembers[i].Name != UserEntity->getEntityName()); // Enter Date CViewText *pViewEnterDate = dynamic_cast(pLine->getView(TEMPLATE_GUILD_MEMBER_ENTER_DATE)); diff --git a/code/ryzom/client/src/interface_v3/people_list.cpp b/code/ryzom/client/src/interface_v3/people_list.cpp index e8f2bc898..81f3e0013 100644 --- a/code/ryzom/client/src/interface_v3/people_list.cpp +++ b/code/ryzom/client/src/interface_v3/people_list.cpp @@ -774,6 +774,10 @@ void CPeopleList::setOnline(uint index, TCharConnectionState online) CCtrlBase *chatButton = hc->getCtrl("chat_button"); if (chatButton != NULL) chatButton->setActive(online != ccs_offline); + + CCtrlBase *inviteButton = hc->getCtrl("invite_button"); + if (inviteButton != NULL) + inviteButton->setActive(online != ccs_offline); } _Peoples[index].Online = online;