jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-12 13:00:01 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Switched sender and reciever roles

Browse source
This commit is contained in:
Ninja Ferret 2015-01-23 03:06:21 -05:00
parent 4d8f67df6a
commit 5c1a8e1d42
2 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
cockatrice/src/tab_room.cpp
View file

@ -9,6 +9,8 @@
#include <QLabel> #include <QLabel>
#include <QToolButton> #include <QToolButton>
#include <QSplitter> #include <QSplitter>
#include <QCompleter>
#include "tab_supervisor.h" #include "tab_supervisor.h"
#include "tab_room.h" #include "tab_room.h"
#include "tab_userlists.h" #include "tab_userlists.h"
@ -98,13 +100,29 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor, AbstractClient *_client, ServerI
setLayout(hbox); setLayout(hbox);
const int userListSize = info.user_list_size(); const int userListSize = info.user_list_size();
for (int i = 0; i < userListSize; ++i) for (int i = 0; i < userListSize; ++i)
userList->processUserInfo(info.user_list(i), true); userList->processUserInfo(info.user_list(i), true);
userList->sortItems(); userList->sortItems();
const int gameListSize = info.game_list_size();
const int gameListSize = info.game_list_size();
for (int i = 0; i < gameListSize; ++i) for (int i = 0; i < gameListSize; ++i)
gameSelector->processGameInfo(info.game_list(i)); gameSelector->processGameInfo(info.game_list(i));
QChar* alertPrefix = new QChar('@');
QList<QString> userNames = tabSupervisor->getUserListsTab()->getAllUsersList()->getUsers().keys();
for (int i = 0; i < userNames.size(); ++i) {
userNames[i].insert(0,alertPrefix,1);
}
QCompleter *completer = new QCompleter(userNames, this);
completer->setCompletionMode(QCompleter::InlineCompletion);
completer->setCaseSensitivity(Qt::CaseSensitive);
connect(sayEdit,SIGNAL(cursorPositionChanged(int,int)),completer,SLOT(setCompletionColumn(int)));
sayEdit->setCompleter(completer);
} }
TabRoom::~TabRoom() TabRoom::~TabRoom()

13
cockatrice/src/tab_supervisor.cpp
View file

@ -446,28 +446,27 @@ void TabSupervisor::processGameEventContainer(const GameEventContainer &cont)
void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event) void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event)
{ {
QString receiverName = QString::fromStdString(event.receiver_name()); QString senderName = QString::fromStdString(event.sender_name());
UserListTWI *twi = tabUserLists->getAllUsersList()->getUsers().value(receiverName); UserListTWI *twi = tabUserLists->getAllUsersList()->getUsers().value(senderName);
ServerInfo_User otherUser; ServerInfo_User otherUser;
if (twi) if (twi)
otherUser = twi->getUserInfo(); otherUser = twi->getUserInfo();
else else
otherUser.set_name(receiverName.toStdString()); otherUser.set_name(senderName.toStdString());
UserLevelFlags otherUserLevel = UserLevelFlags(otherUser.user_level()); UserLevelFlags otherUserLevel = UserLevelFlags(otherUser.user_level());
if (settingsCache->getIgnoreUnregisteredUsers() && !otherUserLevel.testFlag(ServerInfo_User::IsRegistered)) if (settingsCache->getIgnoreUnregisteredUsers() && !otherUserLevel.testFlag(ServerInfo_User::IsRegistered))
return; return;
TabMessage *tab = messageTabs.value(QString::fromStdString(event.sender_name())); TabMessage *tab = messageTabs.value(senderName);
if (!tab) if (!tab)
tab = messageTabs.value(receiverName); tab = messageTabs.value(QString::fromStdString(event.receiver_name()));
if (!tab) if (!tab)
tab = addMessageTab(QString::fromStdString(event.sender_name()), false); tab = addMessageTab(senderName, false);
if (!tab) if (!tab)
return; return;
tab->processUserMessageEvent(event); tab->processUserMessageEvent(event);