Merge branch 'devel' of git://github.com/mbruker/Cockatrice into devel

cockatrice/CMakeLists.txt

@@ -63,6 +63,7 @@ SET(cockatrice_SOURCES
  src/chatview.cpp 
  src/userlist.cpp 
  src/userinfobox.cpp 
+ src/user_context_menu.cpp
  src/remotedecklist_treewidget.cpp 
  src/remotereplaylist_treewidget.cpp 
  src/deckview.cpp 
@@ -135,6 +136,7 @@ SET(cockatrice_HEADERS
  src/chatview.h 
  src/userlist.h 
  src/userinfobox.h 
+ src/user_context_menu.h
  src/remotedecklist_treewidget.h 
  src/remotereplaylist_treewidget.h 
  src/deckview.h 

cockatrice/src/abstractcarditem.cpp

@@ -25,7 +25,6 @@ AbstractCardItem::AbstractCardItem(const QString &_name, Player *_owner, int _id
 
 AbstractCardItem::~AbstractCardItem()
 {
-	qDebug() << "AbstractCardItem destructor:" << name;
 	emit deleteCardInfoPopup(name);
 }
 

cockatrice/src/carddatabase.cpp

@@ -234,6 +234,7 @@ void PictureLoader::setPicDownload(bool _picDownload)
 
 CardInfo::CardInfo(CardDatabase *_db,
 				   const QString &_name,
+				   bool _isToken,
 				   const QString &_manacost,
 				   const QString &_cardtype,
 				   const QString &_powtough,
@@ -248,6 +249,7 @@ CardInfo::CardInfo(CardDatabase *_db,
 				   const QMap<QString, QString> &_picURLsSt)
 	: db(_db),
 	  name(_name),
+	  isToken(_isToken),
 	  sets(_sets),
 	  manacost(_manacost),
 	  cardtype(_cardtype),
@@ -426,6 +428,8 @@ QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfo *info)
 		xml.writeTextElement("loyalty", QString::number(info->getLoyalty()));
 	if (info->getCipt())
 		xml.writeTextElement("cipt", "1");
+	if (info->getIsToken())
+		xml.writeTextElement("token", "1");
 	xml.writeEndElement(); // card
 
 	return xml;
@@ -469,7 +473,7 @@ void CardDatabase::clear()
 		delete setIt.value();
 	}
 	setHash.clear();
-
+	
 	QHashIterator<QString, CardInfo *> i(cardHash);
 	while (i.hasNext()) {
 		i.next();
@@ -485,7 +489,7 @@ CardInfo *CardDatabase::getCard(const QString &cardName)
 	else if (cardHash.contains(cardName))
 		return cardHash.value(cardName);
 	else {
-		CardInfo *newCard = new CardInfo(this, cardName);
+		CardInfo *newCard = new CardInfo(this, cardName, true);
 		newCard->addToSet(getSet("TK"));
 		cardHash.insert(cardName, newCard);
 		return newCard;
@@ -558,6 +562,7 @@ void CardDatabase::loadCardsFromXml(QXmlStreamReader &xml)
 			int tableRow = 0;
 			int loyalty = 0;
 			bool cipt = false;
+			bool isToken = false;
 			while (!xml.atEnd()) {
 				if (xml.readNext() == QXmlStreamReader::EndElement)
 					break;
@@ -588,8 +593,10 @@ void CardDatabase::loadCardsFromXml(QXmlStreamReader &xml)
 					cipt = (xml.readElementText() == "1");
 				else if (xml.name() == "loyalty")
 					loyalty = xml.readElementText().toInt();
+				else if (xml.name() == "token")
+					isToken = xml.readElementText().toInt();
 			}
-			cardHash.insert(name, new CardInfo(this, name, manacost, type, pt, text, colors, loyalty, cipt, tableRow, sets, picURLs, picURLsHq, picURLsSt));
+			cardHash.insert(name, new CardInfo(this, name, isToken, manacost, type, pt, text, colors, loyalty, cipt, tableRow, sets, picURLs, picURLsHq, picURLsSt));
 		}
 	}
 }

cockatrice/src/carddatabase.h

@@ -91,6 +91,7 @@ private:
 	CardDatabase *db;
 
 	QString name;
+	bool isToken;
 	SetList sets;
 	QString manacost;
 	QString cardtype;
@@ -106,6 +107,7 @@ private:
 public:
 	CardInfo(CardDatabase *_db,
 		const QString &_name = QString(),
+		bool _isToken = false,
 		const QString &_manacost = QString(),
 		const QString &_cardtype = QString(),
 		const QString &_powtough = QString(),
@@ -120,6 +122,7 @@ public:
 		const QStringMap &_picURLsSt = QStringMap());
 	~CardInfo();
 	const QString &getName() const { return name; }
+	bool getIsToken() const { return isToken; }
 	const SetList &getSets() const { return sets; }
 	const QString &getManaCost() const { return manacost; }
 	const QString &getCardType() const { return cardtype; }

cockatrice/src/carddatabasemodel.cpp

@@ -71,7 +71,8 @@ void CardDatabaseModel::updateCardList()
 }
 
 CardDatabaseDisplayModel::CardDatabaseDisplayModel(QObject *parent)
-	: QSortFilterProxyModel(parent)
+	: QSortFilterProxyModel(parent),
+	  isToken(ShowAll)
 {
 	setFilterCaseSensitivity(Qt::CaseInsensitive);
 	setSortCaseSensitivity(Qt::CaseInsensitive);
@@ -79,7 +80,10 @@ CardDatabaseDisplayModel::CardDatabaseDisplayModel(QObject *parent)
 
 bool CardDatabaseDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex & /*sourceParent*/) const
 {
-	CardInfo *info = static_cast<CardDatabaseModel *>(sourceModel())->getCard(sourceRow);
+	CardInfo const *info = static_cast<CardDatabaseModel *>(sourceModel())->getCard(sourceRow);
+	
+	if (((isToken == ShowTrue) && !info->getIsToken()) || (isToken == ShowFalse) && info->getIsToken())
+		return false;
 	
 	if (!cardNameBeginning.isEmpty())
 		if (!info->getName().startsWith(cardNameBeginning, Qt::CaseInsensitive))
@@ -89,6 +93,10 @@ bool CardDatabaseDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex
 		if (!info->getName().contains(cardName, Qt::CaseInsensitive))
 			return false;
 	
+	if (!cardNameSet.isEmpty())
+		if (!cardNameSet.contains(info->getName()))
+			return false;
+	
 	if (!cardText.isEmpty())
 		if (!info->getText().contains(cardText, Qt::CaseInsensitive))
 			return false;
@@ -96,7 +104,7 @@ bool CardDatabaseDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex
 	if (!cardColors.isEmpty())
 		if (QSet<QString>::fromList(info->getColors()).intersect(cardColors).isEmpty() && !(info->getColors().isEmpty() && cardColors.contains("X")))
 			return false;
-		
+	
 	if (!cardTypes.isEmpty())
 		if (!cardTypes.contains(info->getMainCardType()))
 			return false;

cockatrice/src/carddatabasemodel.h

@@ -16,7 +16,7 @@ public:
 	int columnCount(const QModelIndex &parent = QModelIndex()) const;
 	QVariant data(const QModelIndex &index, int role) const;
 	QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
-	CardInfo *getCard(int index) const { return cardList[index]; }
+	CardInfo const *getCard(int index) const { return cardList[index]; }
 private:
 	QList<CardInfo *> cardList;
 	CardDatabase *db;
@@ -26,13 +26,18 @@ private slots:
 
 class CardDatabaseDisplayModel : public QSortFilterProxyModel {
 	Q_OBJECT
+public:
+	enum FilterBool { ShowTrue, ShowFalse, ShowAll };
 private:
+	FilterBool isToken;
 	QString cardNameBeginning, cardName, cardText;
-	QSet<QString> cardTypes, cardColors;
+	QSet<QString> cardNameSet, cardTypes, cardColors;
 public:
 	CardDatabaseDisplayModel(QObject *parent = 0);
+	void setIsToken(FilterBool _isToken) { isToken = _isToken; invalidate(); }
 	void setCardNameBeginning(const QString &_beginning) { cardNameBeginning = _beginning; invalidate(); }
 	void setCardName(const QString &_cardName) { cardName = _cardName; invalidate(); }
+	void setCardNameSet(const QSet<QString> &_cardNameSet) { cardNameSet = _cardNameSet; invalidate(); }
 	void setCardText(const QString &_cardText) { cardText = _cardText; invalidate(); }
 	void setCardTypes(const QSet<QString> &_cardTypes) { cardTypes = _cardTypes; invalidate(); }
 	void setCardColors(const QSet<QString> &_cardColors) { cardColors = _cardColors; invalidate(); }

cockatrice/src/chatview.cpp

@@ -4,16 +4,29 @@
 #include <QMouseEvent>
 #include <QDesktopServices>
 #include "chatview.h"
+#include "user_level.h"
+#include "user_context_menu.h"
+#include "tab_supervisor.h"
+#include "pixmapgenerator.h"
 
-ChatView::ChatView(const QString &_ownName, bool _showTimestamps, QWidget *parent)
+ChatView::ChatView(const TabSupervisor *_tabSupervisor, TabGame *_game, bool _showTimestamps, QWidget *parent)
-	: QTextBrowser(parent), evenNumber(true), ownName(_ownName), showTimestamps(_showTimestamps)
+	: QTextBrowser(parent), tabSupervisor(_tabSupervisor), game(_game), evenNumber(true), showTimestamps(_showTimestamps), hoveredItemType(HoveredNothing)
 {
+	userContextMenu = new UserContextMenu(tabSupervisor, this, game);
+	connect(userContextMenu, SIGNAL(openMessageDialog(QString, bool)), this, SIGNAL(openMessageDialog(QString, bool)));
+	
+	viewport()->setCursor(Qt::IBeamCursor);
 	setReadOnly(true);
 	setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse);
 	setOpenLinks(false);
 	connect(this, SIGNAL(anchorClicked(const QUrl &)), this, SLOT(openLink(const QUrl &)));
 }
 
+void ChatView::retranslateUi()
+{
+	userContextMenu->retranslateUi();
+}
+
 QTextCursor ChatView::prepareBlock(bool same)
 {
 	lastSender.clear();
@@ -40,7 +53,7 @@ void ChatView::appendHtml(const QString &html)
 		verticalScrollBar()->setValue(verticalScrollBar()->maximum());
 }
 
-void ChatView::appendMessage(QString sender, QString message, QColor playerColor, bool playerBold)
+void ChatView::appendMessage(QString message, QString sender, UserLevelFlags userLevel, bool playerBold)
 {
 	bool atBottom = verticalScrollBar()->value() >= verticalScrollBar()->maximum();
 	bool sameSender = (sender == lastSender) && !lastSender.isEmpty();
@@ -55,18 +68,22 @@ void ChatView::appendMessage(QString sender, QString message, QColor playerColor
 	}
 	
 	QTextCharFormat senderFormat;
-	if (sender == ownName) {
+	if (tabSupervisor && (sender == QString::fromStdString(tabSupervisor->getUserInfo()->name()))) {
 		senderFormat.setFontWeight(QFont::Bold);
 		senderFormat.setForeground(Qt::red);
 	} else {
-		if (playerColor == QColor())
+		senderFormat.setForeground(Qt::blue);
-			senderFormat.setForeground(QColor(0, 0, 254));
-		else
-			senderFormat.setForeground(playerColor);
 		if (playerBold)
 			senderFormat.setFontWeight(QFont::Bold);
 	}
+	senderFormat.setAnchor(true);
+	senderFormat.setAnchorHref("user://" + QString::number(userLevel) + "_" + sender);
 	if (!sameSender) {
+		if (!sender.isEmpty()) {
+			const int pixelSize = QFontInfo(cursor.charFormat().font()).pixelSize();
+			cursor.insertImage(UserLevelPixmapGenerator::generatePixmap(pixelSize, userLevel).toImage(), QString::number(pixelSize) + "_" + QString::number((int) userLevel));
+			cursor.insertText(" ");
+		}
 		cursor.setCharFormat(senderFormat);
 		if (!sender.isEmpty())
 			sender.append(": ");
@@ -88,33 +105,41 @@ void ChatView::appendMessage(QString sender, QString message, QColor playerColor
 		
 		if (message.startsWith("[card]")) {
 			message = message.mid(6);
-			QTextCharFormat tempFormat = messageFormat;
-			tempFormat.setForeground(Qt::blue);
-			cursor.setCharFormat(tempFormat);
 			int closeTagIndex = message.indexOf("[/card]");
-			cursor.insertText(message.left(closeTagIndex));
+			QString cardName = message.left(closeTagIndex);
-			cursor.setCharFormat(messageFormat);
 			if (closeTagIndex == -1)
 				message.clear();
 			else
 				message = message.mid(closeTagIndex + 7);
+			
+			QTextCharFormat tempFormat = messageFormat;
+			tempFormat.setForeground(Qt::blue);
+			tempFormat.setAnchor(true);
+			tempFormat.setAnchorHref("card://" + cardName);
+			
+			cursor.setCharFormat(tempFormat);
+			cursor.insertText(cardName);
+			cursor.setCharFormat(messageFormat);
 		} else if (message.startsWith("[url]")) {
 			message = message.mid(5);
 			int closeTagIndex = message.indexOf("[/url]");
 			QString url = message.left(closeTagIndex);
-			if (!url.startsWith("http://"))
-				url.prepend("http://");
-			QTextCharFormat tempFormat = messageFormat;
-			tempFormat.setForeground(QColor(0, 0, 254));
-			tempFormat.setAnchor(true);
-			tempFormat.setAnchorHref(url);
-			cursor.setCharFormat(tempFormat);
-			cursor.insertText(url);
-			cursor.setCharFormat(messageFormat);
 			if (closeTagIndex == -1)
 				message.clear();
 			else
 				message = message.mid(closeTagIndex + 6);
+			
+			if (!url.contains("://"))
+				url.prepend("http://");
+			
+			QTextCharFormat tempFormat = messageFormat;
+			tempFormat.setForeground(Qt::blue);
+			tempFormat.setAnchor(true);
+			tempFormat.setAnchorHref(url);
+			
+			cursor.setCharFormat(tempFormat);
+			cursor.insertText(url);
+			cursor.setCharFormat(messageFormat);
 		} else
 			from = 1;
 	}
@@ -148,47 +173,61 @@ QTextFragment ChatView::getFragmentUnderMouse(const QPoint &pos) const
 	return QTextFragment();
 }
 
-QString ChatView::getCardNameUnderMouse(QTextFragment frag) const
-{
-	if (frag.charFormat().foreground().color() == Qt::blue)
-		return frag.text();
-	return QString();
-}
-
-QString ChatView::getCardNameUnderMouse(const QPoint &pos) const
-{
-	return getCardNameUnderMouse(getFragmentUnderMouse(pos));
-}
-
 void ChatView::mouseMoveEvent(QMouseEvent *event)
 {
-	QTextFragment frag = getFragmentUnderMouse(event->pos());
+	QString anchorHref = getFragmentUnderMouse(event->pos()).charFormat().anchorHref();
-	QString cardName = getCardNameUnderMouse(frag);
+	if (!anchorHref.isEmpty()) {
-	if (!cardName.isEmpty()) {
+		const int delimiterIndex = anchorHref.indexOf("://");
-		viewport()->setCursor(Qt::PointingHandCursor);
+		if (delimiterIndex != -1) {
-		emit cardNameHovered(cardName);
+			const QString scheme = anchorHref.left(delimiterIndex);
-	} else if (frag.charFormat().isAnchor())
+			hoveredContent = anchorHref.mid(delimiterIndex + 3);
-		viewport()->setCursor(Qt::PointingHandCursor);
+			if (scheme == "card") {
-	else
+				hoveredItemType = HoveredCard;
+				emit cardNameHovered(hoveredContent);
+			} else if (scheme == "user")
+				hoveredItemType = HoveredUser;
+			else
+				hoveredItemType = HoveredUrl;
+			viewport()->setCursor(Qt::PointingHandCursor);
+		} else {
+			hoveredItemType = HoveredNothing;
+			viewport()->setCursor(Qt::IBeamCursor);
+		}
+	} else {
+		hoveredItemType = HoveredNothing;
 		viewport()->setCursor(Qt::IBeamCursor);
-
+	}
+	
 	QTextBrowser::mouseMoveEvent(event);
 }
 
 void ChatView::mousePressEvent(QMouseEvent *event)
 {
-	if ((event->button() == Qt::MidButton) || (event->button() == Qt::LeftButton)) {
+	switch (hoveredItemType) {
-		QString cardName = getCardNameUnderMouse(event->pos());
+		case HoveredCard: {
-		if (!cardName.isEmpty())
+			if ((event->button() == Qt::MidButton) || (event->button() == Qt::LeftButton))
-			emit showCardInfoPopup(event->globalPos(), cardName);
+				emit showCardInfoPopup(event->globalPos(), hoveredContent);
+			break;
+		}
+		case HoveredUser: {
+			if (event->button() == Qt::RightButton) {
+				const int delimiterIndex = hoveredContent.indexOf("_");
+				UserLevelFlags userLevel(hoveredContent.left(delimiterIndex).toInt());
+				const QString userName = hoveredContent.mid(delimiterIndex + 1);
+				
+				userContextMenu->showContextMenu(event->globalPos(), userName, userLevel);
+			}
+			break;
+		}
+		default: {
+			QTextBrowser::mousePressEvent(event);
+		}
 	}
-	
-	QTextBrowser::mousePressEvent(event);
 }
 
 void ChatView::mouseReleaseEvent(QMouseEvent *event)
 {
-	if ((event->button() == Qt::MidButton) || (event->button() == Qt::LeftButton))
+	if (hoveredItemType == HoveredCard && ((event->button() == Qt::MidButton) || (event->button() == Qt::LeftButton)))
 		emit deleteCardInfoPopup(QString("_"));
 	
 	QTextBrowser::mouseReleaseEvent(event);
@@ -196,5 +235,8 @@ void ChatView::mouseReleaseEvent(QMouseEvent *event)
 
 void ChatView::openLink(const QUrl &link)
 {
+	if ((link.scheme() == "card") || (link.scheme() == "user"))
+		return;
+	
 	QDesktopServices::openUrl(link);
 }

cockatrice/src/chatview.h

@@ -5,27 +5,36 @@
 #include <QTextFragment>
 #include <QTextCursor>
 #include <QColor>
+#include "user_level.h"
 
 class QTextTable;
 class QMouseEvent;
+class UserContextMenu;
+class TabSupervisor;
+class TabGame;
 
 class ChatView : public QTextBrowser {
-	Q_OBJECT;
+	Q_OBJECT
+protected:
+	const TabSupervisor * const tabSupervisor;
+	TabGame * const game;
 private:
+	enum HoveredItemType { HoveredNothing, HoveredUrl, HoveredCard, HoveredUser };
+	UserContextMenu *userContextMenu;
 	QString lastSender;
 	bool evenNumber;
-	QString ownName;
 	bool showTimestamps;
+	HoveredItemType hoveredItemType;
+	QString hoveredContent;
 	QTextFragment getFragmentUnderMouse(const QPoint &pos) const;
-	QString getCardNameUnderMouse(QTextFragment frag) const;
-	QString getCardNameUnderMouse(const QPoint &pos) const;
 	QTextCursor prepareBlock(bool same = false);
 private slots:
 	void openLink(const QUrl &link);
 public:
-	ChatView(const QString &_ownName, bool _showTimestamps, QWidget *parent = 0);
+	ChatView(const TabSupervisor *_tabSupervisor, TabGame *_game, bool _showTimestamps, QWidget *parent = 0);
+	void retranslateUi();
 	void appendHtml(const QString &html);
-	void appendMessage(QString sender, QString message, QColor playerColor = QColor(), bool playerBold = false);
+	void appendMessage(QString message, QString sender = QString(), UserLevelFlags userLevel = UserLevelFlags(), bool playerBold = false);
 protected:
 	void enterEvent(QEvent *event);
 	void leaveEvent(QEvent *event);
@@ -33,6 +42,7 @@ protected:
 	void mousePressEvent(QMouseEvent *event);
 	void mouseReleaseEvent(QMouseEvent *event);
 signals:
+	void openMessageDialog(const QString &userName, bool focus);
 	void cardNameHovered(QString cardName);
 	void showCardInfoPopup(QPoint pos, QString cardName);
 	void deleteCardInfoPopup(QString cardName);

cockatrice/src/deckview.cpp

@@ -274,6 +274,7 @@ DeckViewScene::DeckViewScene(QObject *parent)
 DeckViewScene::~DeckViewScene()
 {
 	clearContents();
+	delete deck;
 }
 
 void DeckViewScene::clearContents()

cockatrice/src/dlg_create_token.cpp

@@ -6,10 +6,17 @@
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QDialogButtonBox>
+#include <QGroupBox>
+#include <QTreeView>
+#include <QRadioButton>
+#include <QHeaderView>
+#include "decklist.h"
 #include "dlg_create_token.h"
+#include "carddatabasemodel.h"
+#include "main.h"
 
-DlgCreateToken::DlgCreateToken(QWidget *parent)
+DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *parent)
-	: QDialog(parent)
+	: QDialog(parent), predefinedTokens(_predefinedTokens)
 {
 	nameLabel = new QLabel(tr("&Name:"));
 	nameEdit = new QLineEdit(tr("Token"));
@@ -24,7 +31,7 @@ DlgCreateToken::DlgCreateToken(QWidget *parent)
 	colorEdit->addItem(tr("red"), "r");
 	colorEdit->addItem(tr("green"), "g");
 	colorEdit->addItem(tr("multicolor"), "m");
-	colorEdit->addItem(tr("colorless"), "");
+	colorEdit->addItem(tr("colorless"), QString());
 	colorLabel->setBuddy(colorEdit);
 
 	ptLabel = new QLabel(tr("&P/T:"));
@@ -49,12 +56,62 @@ DlgCreateToken::DlgCreateToken(QWidget *parent)
 	grid->addWidget(annotationEdit, 3, 1);
 	grid->addWidget(destroyCheckBox, 4, 0, 1, 2);
 	
+	QGroupBox *tokenDataGroupBox = new QGroupBox(tr("Token data"));
+	tokenDataGroupBox->setLayout(grid);
+	
+	cardDatabaseModel = new CardDatabaseModel(db, this);
+	cardDatabaseDisplayModel = new CardDatabaseDisplayModel(this);
+	cardDatabaseDisplayModel->setSourceModel(cardDatabaseModel);
+	cardDatabaseDisplayModel->setIsToken(CardDatabaseDisplayModel::ShowTrue);
+	
+	chooseTokenFromAllRadioButton = new QRadioButton(tr("Show &all tokens"));
+	connect(chooseTokenFromAllRadioButton, SIGNAL(toggled(bool)), this, SLOT(actChooseTokenFromAll(bool)));
+	chooseTokenFromDeckRadioButton = new QRadioButton(tr("Show tokens from this &deck"));
+	connect(chooseTokenFromDeckRadioButton, SIGNAL(toggled(bool)), this, SLOT(actChooseTokenFromDeck(bool)));
+	QTreeView *chooseTokenView = new QTreeView;
+	chooseTokenView->setModel(cardDatabaseDisplayModel);
+	chooseTokenView->setUniformRowHeights(true);
+	chooseTokenView->setRootIsDecorated(false);
+	chooseTokenView->setAlternatingRowColors(true);
+	chooseTokenView->setSortingEnabled(true);
+	chooseTokenView->sortByColumn(0, Qt::AscendingOrder);
+	chooseTokenView->resizeColumnToContents(0);
+	chooseTokenView->header()->setStretchLastSection(false);
+	chooseTokenView->header()->hideSection(1);
+	chooseTokenView->header()->hideSection(2);
+	chooseTokenView->header()->setResizeMode(3, QHeaderView::ResizeToContents);
+	chooseTokenView->header()->setResizeMode(4, QHeaderView::ResizeToContents);
+	connect(chooseTokenView->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, SLOT(tokenSelectionChanged(QModelIndex, QModelIndex)));
+	
+	if (predefinedTokens.isEmpty())
+		chooseTokenFromAllRadioButton->setChecked(true);
+	else {
+		chooseTokenFromDeckRadioButton->setChecked(true);
+		cardDatabaseDisplayModel->setCardNameSet(QSet<QString>::fromList(predefinedTokens));
+	}
+	
+	QVBoxLayout *tokenChooseLayout = new QVBoxLayout;
+	tokenChooseLayout->addWidget(chooseTokenFromAllRadioButton);
+	tokenChooseLayout->addWidget(chooseTokenFromDeckRadioButton);
+	tokenChooseLayout->addWidget(chooseTokenView);
+	
+	QGroupBox *tokenChooseGroupBox = new QGroupBox(tr("Choose token from list"));
+	tokenChooseGroupBox->setLayout(tokenChooseLayout);
+	
+	QVBoxLayout *leftVBox = new QVBoxLayout;
+	leftVBox->addWidget(tokenDataGroupBox);
+	leftVBox->addStretch();
+	
+	QHBoxLayout *hbox = new QHBoxLayout;
+	hbox->addLayout(leftVBox);
+	hbox->addWidget(tokenChooseGroupBox);
+	
 	QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
 	connect(buttonBox, SIGNAL(accepted()), this, SLOT(actOk()));
 	connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
 	
 	QVBoxLayout *mainLayout = new QVBoxLayout;
-	mainLayout->addLayout(grid);
+	mainLayout->addLayout(hbox);
 	mainLayout->addWidget(buttonBox);
 	setLayout(mainLayout);
 
@@ -63,6 +120,30 @@ DlgCreateToken::DlgCreateToken(QWidget *parent)
 	setMinimumWidth(300);
 }
 
+void DlgCreateToken::tokenSelectionChanged(const QModelIndex &current, const QModelIndex & /*previous*/)
+{
+	const QModelIndex realIndex = cardDatabaseDisplayModel->mapToSource(current);
+	const CardInfo *cardInfo = cardDatabaseModel->getCard(realIndex.row());
+	
+	nameEdit->setText(cardInfo->getName());
+	const QString cardColor = cardInfo->getColors().isEmpty() ? QString() : (cardInfo->getColors().size() > 1 ? QString("m") : cardInfo->getColors().first());
+	colorEdit->setCurrentIndex(colorEdit->findData(cardColor, Qt::UserRole, Qt::MatchFixedString));
+	ptEdit->setText(cardInfo->getPowTough());
+	annotationEdit->setText(cardInfo->getText());
+}
+
+void DlgCreateToken::actChooseTokenFromAll(bool checked)
+{
+	if (checked)
+		cardDatabaseDisplayModel->setCardNameSet(QSet<QString>());
+}
+
+void DlgCreateToken::actChooseTokenFromDeck(bool checked)
+{
+	if (checked)
+		cardDatabaseDisplayModel->setCardNameSet(QSet<QString>::fromList(predefinedTokens));
+}
+
 void DlgCreateToken::actOk()
 {
 	accept();

cockatrice/src/dlg_create_token.h

@@ -2,29 +2,41 @@
 #define DLG_CREATETOKEN_H
 
 #include <QDialog>
-#include <QLineEdit>
+#include <QModelIndex>
 
 class QLabel;
+class QLineEdit;
 class QComboBox;
 class QCheckBox;
 class QPushButton;
+class QRadioButton;
+class DeckList;
+class CardDatabaseModel;
+class CardDatabaseDisplayModel;
 
 class DlgCreateToken : public QDialog {
 	Q_OBJECT
 public:
-	DlgCreateToken(QWidget *parent = 0);
+	DlgCreateToken(const QStringList &_predefinedTokens, QWidget *parent = 0);
 	QString getName() const;
 	QString getColor() const;
 	QString getPT() const;
 	QString getAnnotation() const;
 	bool getDestroy() const;
 private slots:
+	void tokenSelectionChanged(const QModelIndex &current, const QModelIndex &previous);
+	void actChooseTokenFromAll(bool checked);
+	void actChooseTokenFromDeck(bool checked);
 	void actOk();
 private:
+	CardDatabaseModel *cardDatabaseModel;
+	CardDatabaseDisplayModel *cardDatabaseDisplayModel;
+	QStringList predefinedTokens;
 	QLabel *nameLabel, *colorLabel, *ptLabel, *annotationLabel;
 	QComboBox *colorEdit;
 	QLineEdit *nameEdit, *ptEdit, *annotationEdit;
 	QCheckBox *destroyCheckBox;
+	QRadioButton *chooseTokenFromAllRadioButton, *chooseTokenFromDeckRadioButton;
 };
 
 #endif

cockatrice/src/dlg_creategame.cpp

@@ -55,7 +55,8 @@ void DlgCreateGame::sharedCtor()
 
 	onlyBuddiesCheckBox = new QCheckBox(tr("Only &buddies can join"));
 	onlyRegisteredCheckBox = new QCheckBox(tr("Only &registered users can join"));
-	onlyRegisteredCheckBox->setChecked(true);
+	if (room && room->getUserInfo()->user_level() & ServerInfo_User::IsRegistered)
+		onlyRegisteredCheckBox->setChecked(true);
 	
 	QGridLayout *joinRestrictionsLayout = new QGridLayout;
 	joinRestrictionsLayout->addWidget(passwordLabel, 0, 0);

cockatrice/src/dlg_filter_games.cpp

@@ -61,12 +61,17 @@ DlgFilterGames::DlgFilterGames(const QMap<int, QString> &allGameTypes, QWidget *
 	QGroupBox *maxPlayersGroupBox = new QGroupBox(tr("Maximum player count"));
 	maxPlayersGroupBox->setLayout(maxPlayersFilterLayout);
 	
-	QGridLayout *leftColumn = new QGridLayout;
+	QGridLayout *leftGrid = new QGridLayout;
-	leftColumn->addWidget(gameNameFilterLabel, 0, 0);
+	leftGrid->addWidget(gameNameFilterLabel, 0, 0);
-	leftColumn->addWidget(gameNameFilterEdit, 0, 1);
+	leftGrid->addWidget(gameNameFilterEdit, 0, 1);
-	leftColumn->addWidget(creatorNameFilterLabel, 1, 0);
+	leftGrid->addWidget(creatorNameFilterLabel, 1, 0);
-	leftColumn->addWidget(creatorNameFilterEdit, 1, 1);
+	leftGrid->addWidget(creatorNameFilterEdit, 1, 1);
-	leftColumn->addWidget(maxPlayersGroupBox, 2, 0, 1, 2);
+	leftGrid->addWidget(maxPlayersGroupBox, 2, 0, 1, 2);
+	leftGrid->addWidget(unavailableGamesVisibleCheckBox, 3, 0, 1, 2);
+	
+	QVBoxLayout *leftColumn = new QVBoxLayout;
+	leftColumn->addLayout(leftGrid);
+	leftColumn->addStretch();
 	
 	QVBoxLayout *rightColumn = new QVBoxLayout;
 	rightColumn->addWidget(gameTypeFilterGroupBox);

cockatrice/src/gameselector.cpp

@@ -17,7 +17,7 @@
 #include "pb/serverinfo_game.pb.h"
 #include "pb/response.pb.h"
 
-GameSelector::GameSelector(AbstractClient *_client, TabSupervisor *_tabSupervisor, TabRoom *_room, const QMap<int, QString> &_rooms, const QMap<int, GameTypeMap> &_gameTypes, QWidget *parent)
+GameSelector::GameSelector(AbstractClient *_client, const TabSupervisor *_tabSupervisor, TabRoom *_room, const QMap<int, QString> &_rooms, const QMap<int, GameTypeMap> &_gameTypes, QWidget *parent)
 	: QGroupBox(parent), client(_client), tabSupervisor(_tabSupervisor), room(_room)
 {
 	gameListView = new QTreeView;

cockatrice/src/gameselector.h

@@ -2,7 +2,6 @@
 #define GAMESELECTOR_H
 
 #include <QGroupBox>
-//#include "tab_room.h"
 #include "gametypemap.h"
 
 class QTreeView;
@@ -28,7 +27,7 @@ signals:
 	void gameJoined(int gameId);
 private:
 	AbstractClient *client;
-	TabSupervisor *tabSupervisor;
+	const TabSupervisor *tabSupervisor;
 	TabRoom *room;
 
 	QTreeView *gameListView;
@@ -36,7 +35,7 @@ private:
 	GamesProxyModel *gameListProxyModel;
 	QPushButton *filterButton, *clearFilterButton, *createButton, *joinButton, *spectateButton;
 public:
-	GameSelector(AbstractClient *_client, TabSupervisor *_tabSupervisor, TabRoom *_room, const QMap<int, QString> &_rooms, const QMap<int, GameTypeMap> &_gameTypes, QWidget *parent = 0);
+	GameSelector(AbstractClient *_client, const TabSupervisor *_tabSupervisor, TabRoom *_room, const QMap<int, QString> &_rooms, const QMap<int, GameTypeMap> &_gameTypes, QWidget *parent = 0);
 	void retranslateUi();
 	void processGameInfo(const ServerInfo_Game &info);
 };

cockatrice/src/gamesmodel.cpp

@@ -7,15 +7,6 @@ GamesModel::GamesModel(const QMap<int, QString> &_rooms, const QMap<int, GameTyp
 {
 }
 
-GamesModel::~GamesModel()
-{
-	if (!gameList.isEmpty()) {
-		beginRemoveRows(QModelIndex(), 0, gameList.size() - 1);
-		gameList.clear();
-		endRemoveRows();
-	}
-}
-
 QVariant GamesModel::data(const QModelIndex &index, int role) const
 {
 	if (!index.isValid())
@@ -81,12 +72,12 @@ void GamesModel::updateGameList(const ServerInfo_Game &game)
 {
 	for (int i = 0; i < gameList.size(); i++)
 		if (gameList[i].game_id() == game.game_id()) {
-			if (!game.has_player_count()) {
+			if (game.closed()) {
 				beginRemoveRows(QModelIndex(), i, i);
 				gameList.removeAt(i);
 				endRemoveRows();
 			} else {
-				gameList[i] = game;
+				gameList[i].MergeFrom(game);
 				emit dataChanged(index(i, 0), index(i, 7));
 			}
 			return;

cockatrice/src/gamesmodel.h

@@ -6,8 +6,8 @@
 #include <QList>
 #include <QSet>
 #include "gametypemap.h"
+#include "pb/serverinfo_game.pb.h"
 
-class ServerInfo_Game;
 class ServerInfo_User;
 
 class GamesModel : public QAbstractTableModel {
@@ -18,7 +18,6 @@ private:
 	QMap<int, GameTypeMap> gameTypes;
 public:
 	GamesModel(const QMap<int, QString> &_rooms, const QMap<int, GameTypeMap> &_gameTypes, QObject *parent = 0);
-	~GamesModel();
 	int rowCount(const QModelIndex &parent = QModelIndex()) const { return parent.isValid() ? 0 : gameList.size(); }
 	int columnCount(const QModelIndex &/*parent*/ = QModelIndex()) const { return 8; }
 	QVariant data(const QModelIndex &index, int role) const;

cockatrice/src/messagelogwidget.cpp

@@ -3,6 +3,7 @@
 #include "cardzone.h"
 #include "carditem.h"
 #include "soundengine.h"
+#include "tab_supervisor.h"
 #include "pb/serverinfo_user.pb.h"
 #include "pb/context_move_card.pb.h"
 #include "pb/context_mulligan.pb.h"
@@ -21,9 +22,14 @@ bool MessageLogWidget::isFemale(Player *player) const
 	return player->getUserInfo()->gender() == ServerInfo_User::Female;
 }
 
+bool MessageLogWidget::userIsFemale() const
+{
+	return (tabSupervisor && tabSupervisor->getUserInfo()->gender() & ServerInfo_User::Female);
+}
+
 void MessageLogWidget::logGameJoined(int gameId)
 {
-	if (female)
+	if (userIsFemale())
 		appendHtml(tr("You have joined game #%1.", "female").arg(gameId));
 	else
 		appendHtml(tr("You have joined game #%1.", "male").arg(gameId));
@@ -31,7 +37,7 @@ void MessageLogWidget::logGameJoined(int gameId)
 
 void MessageLogWidget::logReplayStarted(int gameId)
 {
-	if (female)
+	if (userIsFemale())
 		appendHtml(tr("You are watching a replay of game #%1.", "female").arg(gameId));
 	else
 		appendHtml(tr("You are watching a replay of game #%1.", "male").arg(gameId));
@@ -143,12 +149,12 @@ void MessageLogWidget::logConnectionStateChanged(Player *player, bool connection
 
 void MessageLogWidget::logSay(Player *player, QString message)
 {
-	appendMessage(player->getName(), message, QColor(), true);
+	appendMessage(message, player->getName(), UserLevelFlags(player->getUserInfo()->user_level()), true);
 }
 
-void MessageLogWidget::logSpectatorSay(QString spectatorName, QString message)
+void MessageLogWidget::logSpectatorSay(QString spectatorName, UserLevelFlags spectatorUserLevel, QString message)
 {
-	appendMessage(spectatorName, message, QColor(), false);
+	appendMessage(message, spectatorName, spectatorUserLevel, false);
 }
 
 void MessageLogWidget::logShuffle(Player *player, CardZone *zone)
@@ -858,7 +864,7 @@ void MessageLogWidget::connectToPlayer(Player *player)
 	connect(player, SIGNAL(logAlwaysRevealTopCard(Player *, CardZone *, bool)), this, SLOT(logAlwaysRevealTopCard(Player *, CardZone *, bool)));
 }
 
-MessageLogWidget::MessageLogWidget(const QString &_ownName, bool _female, QWidget *parent)
+MessageLogWidget::MessageLogWidget(const TabSupervisor *_tabSupervisor, TabGame *_game, QWidget *parent)
-	: ChatView(_ownName, false, parent), female(_female)
+	: ChatView(_tabSupervisor, _game, false, parent)
 {
 }

cockatrice/src/messagelogwidget.h

@@ -2,8 +2,8 @@
 #define MESSAGELOGWIDGET_H
 
 #include "chatview.h"
-#include <QAbstractSocket>
 #include "translation.h"
+#include "user_level.h"
 
 class Player;
 class CardZone;
@@ -28,9 +28,9 @@ private:
 	
 	QString sanitizeHtml(QString dirty) const;
 	bool isFemale(Player *player) const;
+	bool userIsFemale() const;
 	QPair<QString, QString> getFromStr(CardZone *zone, QString cardName, int position, bool ownerChange) const;
 	MessageContext currentContext;
-	bool female;
 	
 	QList<LogMoveCard> moveCardQueue;
 	QMap<CardItem *, QString> moveCardPT;
@@ -55,7 +55,7 @@ public slots:
 	void logGameStart();
 	void logConnectionStateChanged(Player *player, bool connectionState);
 	void logSay(Player *player, QString message);
-	void logSpectatorSay(QString spectatorName, QString message);
+	void logSpectatorSay(QString spectatorName, UserLevelFlags spectatorUserLevel, QString message);
 	void logShuffle(Player *player, CardZone *zone);
 	void logRollDie(Player *player, int sides, int roll);
 	void logDrawCards(Player *player, int number);
@@ -85,7 +85,7 @@ public slots:
 	void containerProcessingDone();
 public:
 	void connectToPlayer(Player *player);
-	MessageLogWidget(const QString &_ownName, bool _female, QWidget *parent = 0);
+	MessageLogWidget(const TabSupervisor *_tabSupervisor, TabGame *_game, QWidget *parent = 0);
 };
 
 #endif

cockatrice/src/pixmapgenerator.cpp

@@ -131,18 +131,18 @@ QPixmap CountryPixmapGenerator::generatePixmap(int height, const QString &countr
 
 QMap<QString, QPixmap> CountryPixmapGenerator::pmCache;
 
-QPixmap UserLevelPixmapGenerator::generatePixmap(int height, int userLevel)
+QPixmap UserLevelPixmapGenerator::generatePixmap(int height, UserLevelFlags userLevel)
 {
-	int key = height * 10000 + userLevel;
+	int key = height * 10000 + (int) userLevel;
 	if (pmCache.contains(key))
 		return pmCache.value(key);
 	
 	QString levelString;
-	if (userLevel & ServerInfo_User::IsAdmin)
+	if (userLevel.testFlag(ServerInfo_User::IsAdmin))
 		levelString = "admin";
-	else if (userLevel & ServerInfo_User::IsModerator)
+	else if (userLevel.testFlag(ServerInfo_User::IsModerator))
 		levelString = "moderator";
-	else if (userLevel &ServerInfo_User::IsRegistered)
+	else if (userLevel.testFlag(ServerInfo_User::IsRegistered))
 		levelString = "registered";
 	else
 		levelString = "normal";

cockatrice/src/pixmapgenerator.h

@@ -4,6 +4,8 @@
 #include <QPixmap>
 #include <QMap>
 
+#include "user_level.h"
+
 class PhasePixmapGenerator {
 private:
 	static QMap<QString, QPixmap> pmCache;
@@ -48,7 +50,7 @@ class UserLevelPixmapGenerator {
 private:
 	static QMap<int, QPixmap> pmCache;
 public:
-	static QPixmap generatePixmap(int height, int userLevel);
+	static QPixmap generatePixmap(int height, UserLevelFlags userLevel);
 	static void clear() { pmCache.clear(); }
 };
 

cockatrice/src/player.cpp

@@ -18,6 +18,8 @@
 #include "dlg_create_token.h"
 #include "carddatabase.h"
 #include "color.h"
+#include "decklist.h"
+#include "main.h"
 #include <QSettings>
 #include <QPainter>
 #include <QMenu>
@@ -95,7 +97,19 @@ void PlayerArea::setSize(qreal width, qreal height)
 }
 
 Player::Player(const ServerInfo_User &info, int _id, bool _local, TabGame *_parent)
-	: QObject(_parent), game(_parent), shortcutsActive(false), defaultNumberTopCards(3), lastTokenDestroy(true), id(_id), active(false), local(_local), mirrored(false), handVisible(false), conceded(false), dialogSemaphore(false)
+	: QObject(_parent),
+	  game(_parent),
+	  shortcutsActive(false),
+	  defaultNumberTopCards(3),
+	  lastTokenDestroy(true),
+	  id(_id),
+	  active(false),
+	  local(_local),
+	  mirrored(false),
+	  handVisible(false),
+	  conceded(false),
+	  dialogSemaphore(false),
+	  deck(0)
 {
 	userInfo = new ServerInfo_User;
 	userInfo->CopyFrom(info);
@@ -295,6 +309,8 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, TabGame *_pare
 		aCreateAnotherToken = new QAction(this);
 		connect(aCreateAnotherToken, SIGNAL(triggered()), this, SLOT(actCreateAnotherToken()));
 		aCreateAnotherToken->setEnabled(false);
+		
+		createPredefinedTokenMenu = new QMenu(QString());
 
 		playerMenu->addSeparator();
 		countersMenu = playerMenu->addMenu(QString());
@@ -305,6 +321,7 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, TabGame *_pare
 		playerMenu->addSeparator();
 		playerMenu->addAction(aCreateToken);
 		playerMenu->addAction(aCreateAnotherToken);
+		playerMenu->addMenu(createPredefinedTokenMenu);
 		playerMenu->addSeparator();
 		sayMenu = playerMenu->addMenu(QString());
 		initSayMenu();
@@ -320,11 +337,11 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, TabGame *_pare
 			allPlayersActions.append(newAction);
 			playerLists[i]->addSeparator();
 		}
-	
 	} else {
 		countersMenu = 0;
 		sbMenu = 0;
 		aCreateAnotherToken = 0;
+		createPredefinedTokenMenu = 0;
 		aCardMenu = 0;
 	}
 	
@@ -599,6 +616,7 @@ void Player::retranslateUi()
 		aRollDie->setText(tr("R&oll die..."));
 		aCreateToken->setText(tr("&Create token..."));
 		aCreateAnotherToken->setText(tr("C&reate another token"));
+		createPredefinedTokenMenu->setTitle(tr("Cr&eate predefined token"));
 		sayMenu->setTitle(tr("S&ay"));
 		
 		QMapIterator<int, AbstractCounter *> counterIterator(counters);
@@ -723,6 +741,24 @@ void Player::initSayMenu()
 	}
 }
 
+void Player::setDeck(DeckList *_deck)
+{
+	deck = _deck;
+	
+	createPredefinedTokenMenu->clear();
+	predefinedTokens.clear();
+	InnerDecklistNode *tokenZone = dynamic_cast<InnerDecklistNode *>(deck->getRoot()->findChild("tokens"));
+	if (tokenZone)
+		for (int i = 0; i < tokenZone->size(); ++i) {
+			const QString tokenName = tokenZone->at(i)->getName();
+			predefinedTokens.append(tokenName);
+			QAction *a = createPredefinedTokenMenu->addAction(tokenName);
+			if (i < 10)
+				a->setShortcut("Alt+" + QString::number((i + 1) % 10));
+			connect(a, SIGNAL(triggered()), this, SLOT(actCreatePredefinedToken()));
+		}
+}
+
 void Player::actViewLibrary()
 {
 	static_cast<GameScene *>(scene())->toggleZoneView(this, "deck", -1);
@@ -876,7 +912,7 @@ void Player::actRollDie()
 
 void Player::actCreateToken()
 {
-	DlgCreateToken dlg;
+	DlgCreateToken dlg(predefinedTokens);
 	if (!dlg.exec())
 		return;
 	
@@ -905,6 +941,21 @@ void Player::actCreateAnotherToken()
 	sendGameCommand(cmd);
 }
 
+void Player::actCreatePredefinedToken()
+{
+	QAction *action = static_cast<QAction *>(sender());
+	CardInfo *cardInfo = db->getCard(action->text());
+	
+	lastTokenName = cardInfo->getName();
+	lastTokenColor = cardInfo->getColors().isEmpty() ? QString() : cardInfo->getColors().first().toLower();
+	lastTokenPT = cardInfo->getPowTough();
+	lastTokenAnnotation = cardInfo->getText();
+	lastTokenDestroy = true;
+	aCreateAnotherToken->setEnabled(true);
+	
+	actCreateAnotherToken();
+}
+
 void Player::actSayMessage()
 {
 	QAction *a = qobject_cast<QAction *>(sender());

cockatrice/src/player.h

@@ -10,6 +10,7 @@
 
 namespace google { namespace protobuf { class Message; } }
 class CardDatabase;
+class DeckList;
 class QMenu;
 class QAction;
 class ZoneViewZone;
@@ -133,6 +134,7 @@ private slots:
 	void updateBoundingRect();
 	void rearrangeZones();
 	
+	void actCreatePredefinedToken();
 	void cardMenuAction();
 	void actCardCounterTrigger();
 	void actAttach();
@@ -152,7 +154,7 @@ private slots:
 
 private:
 	TabGame *game;
-	QMenu *playerMenu, *handMenu, *graveMenu, *rfgMenu, *libraryMenu, *sbMenu, *countersMenu, *sayMenu,
+	QMenu *playerMenu, *handMenu, *graveMenu, *rfgMenu, *libraryMenu, *sbMenu, *countersMenu, *sayMenu, *createPredefinedTokenMenu,
 		*mRevealLibrary, *mRevealTopCard, *mRevealHand, *mRevealRandomHandCard;
 	QList<QMenu *> playerLists;
 	QList<QAction *> allPlayersActions;
@@ -187,6 +189,9 @@ private:
 	bool clearCardsToDelete();
 	QList<CardItem *> cardsToDelete;
 	
+	DeckList *deck;
+	QStringList predefinedTokens;
+	
 	PlayerArea *playerArea;
 	QMap<QString, CardZone *> zones;
 	StackZone *stack;
@@ -256,6 +261,7 @@ public:
 	void retranslateUi();
 	void clear();
 	TabGame *getGame() const { return game; }
+	void setDeck(DeckList *_deck);
 	QMenu *getPlayerMenu() const { return playerMenu; }
 	int getId() const { return id; }
 	QString getName() const;

cockatrice/src/playerlistwidget.cpp

@@ -7,6 +7,7 @@
 #include "tab_userlists.h"
 #include "userlist.h"
 #include "userinfobox.h"
+#include "user_context_menu.h"
 #include <QMouseEvent>
 #include <QAction>
 #include <QMenu>
@@ -60,7 +61,11 @@ PlayerListWidget::PlayerListWidget(TabSupervisor *_tabSupervisor, AbstractClient
 	if (tabSupervisor) {
 		itemDelegate = new PlayerListItemDelegate(this);
 		setItemDelegate(itemDelegate);
-	}
+		
+		userContextMenu = new UserContextMenu(tabSupervisor, this, game);
+		connect(userContextMenu, SIGNAL(openMessageDialog(QString, bool)), this, SIGNAL(openMessageDialog(QString, bool)));
+	} else
+		userContextMenu = 0;
 	
 	setMinimumHeight(60);
 	setIconSize(QSize(20, 15));
@@ -105,7 +110,7 @@ void PlayerListWidget::updatePlayerProperties(const ServerInfo_PlayerProperties
 		player->setIcon(2, gameStarted ? (prop.conceded() ? concededIcon : QIcon()) : (prop.ready_start() ? readyIcon : notReadyIcon));
 	if (prop.has_user_info()) {
 		player->setData(3, Qt::UserRole, prop.user_info().user_level());
-		player->setIcon(3, QIcon(UserLevelPixmapGenerator::generatePixmap(12, prop.user_info().user_level())));
+		player->setIcon(3, QIcon(UserLevelPixmapGenerator::generatePixmap(12, UserLevelFlags(prop.user_info().user_level()))));
 		player->setText(4, QString::fromStdString(prop.user_info().name()));
 		const QString country = QString::fromStdString(prop.user_info().country());
 		if (!country.isEmpty())
@@ -162,93 +167,12 @@ void PlayerListWidget::setGameStarted(bool _gameStarted, bool resuming)
 
 void PlayerListWidget::showContextMenu(const QPoint &pos, const QModelIndex &index)
 {
+	if (!userContextMenu)
+		return;
+	
 	const QString &userName = index.sibling(index.row(), 4).data(Qt::UserRole).toString();
 	int playerId = index.sibling(index.row(), 4).data(Qt::UserRole + 1).toInt();
-	ServerInfo_User::UserLevelFlags userLevel = static_cast<ServerInfo_User::UserLevelFlags>(index.sibling(index.row(), 3).data(Qt::UserRole).toInt());
+	UserLevelFlags userLevel(index.sibling(index.row(), 3).data(Qt::UserRole).toInt());
 	
-	QAction *aUserName = new QAction(userName, this);
+	userContextMenu->showContextMenu(pos, userName, userLevel, playerId);
-	aUserName->setEnabled(false);
-	QAction *aDetails = new QAction(tr("User &details"), this);
-	QAction *aChat = new QAction(tr("Direct &chat"), this);
-	QAction *aAddToBuddyList = new QAction(tr("Add to &buddy list"), this);
-	QAction *aRemoveFromBuddyList = new QAction(tr("Remove from &buddy list"), this);
-	QAction *aAddToIgnoreList = new QAction(tr("Add to &ignore list"), this);
-	QAction *aRemoveFromIgnoreList = new QAction(tr("Remove from &ignore list"), this);
-	QAction *aKick = new QAction(tr("Kick from &game"), this);
-	
-	QMenu *menu = new QMenu(this);
-	menu->addAction(aUserName);
-	menu->addSeparator();
-	menu->addAction(aDetails);
-	menu->addAction(aChat);
-	if ((userLevel & ServerInfo_User::IsRegistered) && (tabSupervisor->getUserLevel() & ServerInfo_User::IsRegistered)) {
-		menu->addSeparator();
-		if (tabSupervisor->getUserListsTab()->getBuddyList()->getUsers().contains(userName))
-			menu->addAction(aRemoveFromBuddyList);
-		else
-			menu->addAction(aAddToBuddyList);
-		if (tabSupervisor->getUserListsTab()->getIgnoreList()->getUsers().contains(userName))
-			menu->addAction(aRemoveFromIgnoreList);
-		else
-			menu->addAction(aAddToIgnoreList);
-	}
-	if (game->isHost() || !game->getTabSupervisor()->getAdminLocked()) {
-		menu->addSeparator();
-		menu->addAction(aKick);
-	}
-	if (userName == QString::fromStdString(game->getTabSupervisor()->getUserInfo()->name())) {
-		aChat->setEnabled(false);
-		aAddToBuddyList->setEnabled(false);
-		aRemoveFromBuddyList->setEnabled(false);
-		aAddToIgnoreList->setEnabled(false);
-		aRemoveFromIgnoreList->setEnabled(false);
-		aKick->setEnabled(false);
-	}
-	
-	QAction *actionClicked = menu->exec(pos);
-	if (actionClicked == aDetails) {
-		UserInfoBox *infoWidget = new UserInfoBox(client, true, this, Qt::Dialog | Qt::WindowTitleHint | Qt::CustomizeWindowHint | Qt::WindowCloseButtonHint);
-		infoWidget->setAttribute(Qt::WA_DeleteOnClose);
-		infoWidget->updateInfo(userName);
-	} else if (actionClicked == aChat)
-		emit openMessageDialog(userName, true);
-	else if (actionClicked == aAddToBuddyList) {
-		Command_AddToList cmd;
-		cmd.set_list("buddy");
-		cmd.set_user_name(userName.toStdString());
-		
-		client->sendCommand(client->prepareSessionCommand(cmd));
-	} else if (actionClicked == aRemoveFromBuddyList) {
-		Command_RemoveFromList cmd;
-		cmd.set_list("buddy");
-		cmd.set_user_name(userName.toStdString());
-		
-		client->sendCommand(client->prepareSessionCommand(cmd));
-	} else if (actionClicked == aAddToIgnoreList) {
-		Command_AddToList cmd;
-		cmd.set_list("ignore");
-		cmd.set_user_name(userName.toStdString());
-		
-		client->sendCommand(client->prepareSessionCommand(cmd));
-	} else if (actionClicked == aRemoveFromIgnoreList) {
-		Command_RemoveFromList cmd;
-		cmd.set_list("ignore");
-		cmd.set_user_name(userName.toStdString());
-		
-		client->sendCommand(client->prepareSessionCommand(cmd));
-	} else if (actionClicked == aKick) {
-		Command_KickFromGame cmd;
-		cmd.set_player_id(playerId);
-		game->sendGameCommand(cmd);
-	}
-	
-	delete menu;
-	delete aUserName;
-	delete aDetails;
-	delete aChat;
-	delete aAddToBuddyList;
-	delete aRemoveFromBuddyList;
-	delete aAddToIgnoreList;
-	delete aRemoveFromIgnoreList;
-	delete aKick;
 }

cockatrice/src/playerlistwidget.h

@@ -10,6 +10,7 @@ class ServerInfo_PlayerProperties;
 class TabSupervisor;
 class AbstractClient;
 class TabGame;
+class UserContextMenu;
 
 class PlayerListItemDelegate : public QStyledItemDelegate {
 public:
@@ -31,6 +32,7 @@ private:
 	TabSupervisor *tabSupervisor;
 	AbstractClient *client;
 	TabGame *game;
+	UserContextMenu *userContextMenu;
 	QIcon readyIcon, notReadyIcon, concededIcon, playerIcon, spectatorIcon, lockIcon;
 	bool gameStarted;
 signals:

cockatrice/src/playertarget.cpp

@@ -87,7 +87,7 @@ void PlayerTarget::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*o
 		
 		QPixmap tempPixmap;
 		if (fullPixmap.isNull())
-			tempPixmap = UserLevelPixmapGenerator::generatePixmap(translatedSize.height(), info->user_level());
+			tempPixmap = UserLevelPixmapGenerator::generatePixmap(translatedSize.height(), UserLevelFlags(info->user_level()));
 		else
 			tempPixmap = fullPixmap.scaled(translatedSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
 		

cockatrice/src/remoteclient.cpp

@@ -118,7 +118,9 @@ void RemoteClient::readData()
 		
 		ServerMessage newServerMessage;
 		newServerMessage.ParseFromArray(inputBuffer.data(), messageLength);
-		qDebug(("IN " + QString::number(messageLength) + ": " + QString::fromStdString(newServerMessage.DebugString())).toUtf8());
+#ifdef QT_DEBUG
+		qDebug(("IN " + QString::number(messageLength) + ": " + QString::fromStdString(newServerMessage.ShortDebugString())).toUtf8());
+#endif
 		inputBuffer.remove(0, messageLength);
 		messageInProgress = false;
 		
@@ -133,7 +135,9 @@ void RemoteClient::sendCommandContainer(const CommandContainer &cont)
 {
 	QByteArray buf;
 	unsigned int size = cont.ByteSize();
-	qDebug(("OUT " + QString::number(size) + ": " + QString::fromStdString(cont.DebugString())).toUtf8());
+#ifdef QT_DEBUG
+	qDebug(("OUT " + QString::number(size) + ": " + QString::fromStdString(cont.ShortDebugString())).toUtf8());
+#endif
 	buf.resize(size + 4);
 	cont.SerializeToArray(buf.data() + 4, size);
 	buf.data()[3] = (unsigned char) size;

cockatrice/src/tab_game.cpp

@@ -7,6 +7,7 @@
 #include <QFileDialog>
 #include <QTimer>
 #include <QToolButton>
+#include <QDebug>
 
 #include "dlg_creategame.h"
 #include "tab_game.h"
@@ -234,8 +235,8 @@ void DeckViewContainer::setDeck(DeckList *deck)
 	sideboardLockButton->setEnabled(true);
 }
 
-TabGame::TabGame(GameReplay *_replay)
+TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
-	: Tab(0),
+	: Tab(_tabSupervisor),
 	hostId(-1),
 	localPlayerId(-1),
 	spectator(true),
@@ -282,7 +283,7 @@ TabGame::TabGame(GameReplay *_replay)
 	
 	timeElapsedLabel = new QLabel;
 	timeElapsedLabel->setAlignment(Qt::AlignCenter);
-	messageLog = new MessageLogWidget(QString(), false);
+	messageLog = new MessageLogWidget(tabSupervisor, this);
 	connect(messageLog, SIGNAL(cardNameHovered(QString)), cardInfo, SLOT(setCard(QString)));
 	connect(messageLog, SIGNAL(showCardInfoPopup(QPoint, QString)), this, SLOT(showCardInfoPopup(QPoint, QString)));
 	connect(messageLog, SIGNAL(deleteCardInfoPopup(QString)), this, SLOT(deleteCardInfoPopup(QString)));
@@ -411,7 +412,8 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, QList<AbstractClient *> &_client
 	
 	timeElapsedLabel = new QLabel;
 	timeElapsedLabel->setAlignment(Qt::AlignCenter);
-	messageLog = new MessageLogWidget(QString::fromStdString(tabSupervisor->getUserInfo()->name()), tabSupervisor->getUserInfo()->gender() == ServerInfo_User::Female);
+	messageLog = new MessageLogWidget(tabSupervisor, this);
+	connect(messageLog, SIGNAL(openMessageDialog(QString, bool)), this, SIGNAL(openMessageDialog(QString, bool)));
 	connect(messageLog, SIGNAL(cardNameHovered(QString)), cardInfo, SLOT(setCard(QString)));
 	connect(messageLog, SIGNAL(showCardInfoPopup(QPoint, QString)), this, SLOT(showCardInfoPopup(QPoint, QString)));
 	connect(messageLog, SIGNAL(deleteCardInfoPopup(QString)), this, SLOT(deleteCardInfoPopup(QString)));
@@ -813,6 +815,17 @@ AbstractClient *TabGame::getClientForPlayer(int playerId) const
 		return clients.first();
 }
 
+int TabGame::getPlayerIdByName(const QString &playerName) const
+{
+	QMapIterator<int, Player *> playerIterator(players);
+	while (playerIterator.hasNext()) {
+		const Player *const p = playerIterator.next().value();
+		if (p->getName() == playerName)
+			return p->getId();
+	}
+	return -1;
+}
+
 void TabGame::sendGameCommand(PendingCommand *pend, int playerId)
 {
 	getClientForPlayer(playerId)->sendCommand(pend);
@@ -898,12 +911,13 @@ void TabGame::closeGame()
 
 void TabGame::eventSpectatorSay(const Event_GameSay &event, int eventPlayerId, const GameEventContext & /*context*/)
 {
-	messageLog->logSpectatorSay(spectators.value(eventPlayerId), QString::fromStdString(event.message()));
+	const ServerInfo_User &userInfo = spectators.value(eventPlayerId);
+	messageLog->logSpectatorSay(QString::fromStdString(userInfo.name()), UserLevelFlags(userInfo.user_level()), QString::fromStdString(event.message()));
 }
 
 void TabGame::eventSpectatorLeave(const Event_Leave & /*event*/, int eventPlayerId, const GameEventContext & /*context*/)
 {
-	messageLog->logLeaveSpectator(spectators.value(eventPlayerId));
+	messageLog->logLeaveSpectator(QString::fromStdString(spectators.value(eventPlayerId).name()));
 	playerListWidget->removePlayer(eventPlayerId);
 	spectators.remove(eventPlayerId);
 	
@@ -919,7 +933,7 @@ void TabGame::eventGameStateChanged(const Event_GameStateChanged &event, int /*e
 		const int playerId = prop.player_id();
 		if (prop.spectator()) {
 			if (!spectators.contains(playerId)) {
-				spectators.insert(playerId, QString::fromStdString(prop.user_info().name()));
+				spectators.insert(playerId, prop.user_info());
 				playerListWidget->addPlayer(prop);
 			}
 		} else {
@@ -935,6 +949,7 @@ void TabGame::eventGameStateChanged(const Event_GameStateChanged &event, int /*e
 					DeckList *newDeck = new DeckList(QString::fromStdString(playerInfo.deck_list()));
 					db->cacheCardPixmaps(newDeck->getCardList());
 					deckViewContainer->setDeck(newDeck);
+					player->setDeck(newDeck);
 				}
 				deckViewContainer->setReadyStart(prop.ready_start());
 				deckViewContainer->setSideboardLocked(prop.sideboard_locked());
@@ -1023,7 +1038,7 @@ void TabGame::eventJoin(const Event_Join &event, int /*eventPlayerId*/, const Ga
 	if (players.contains(playerId))
 		return;
 	if (playerInfo.spectator()) {
-		spectators.insert(playerId, QString::fromStdString(playerInfo.user_info().name()));
+		spectators.insert(playerId, playerInfo.user_info());
 		messageLog->logJoinSpectator(QString::fromStdString(playerInfo.user_info().name()));
 	} else {
 		Player *newPlayer = addPlayer(playerId, playerInfo.user_info());

cockatrice/src/tab_game.h

@@ -107,7 +107,7 @@ private:
 	int localPlayerId;
 	bool spectator;
 	QMap<int, Player *> players;
-	QMap<int, QString> spectators;
+	QMap<int, ServerInfo_User> spectators;
 	bool gameStateKnown;
 	bool resuming;
 	QStringList phasesList;
@@ -195,7 +195,7 @@ private slots:
 	void actNextTurn();
 public:
 	TabGame(TabSupervisor *_tabSupervisor, QList<AbstractClient *> &_clients, const Event_GameJoined &event, const QMap<int, QString> &_roomGameTypes);
-	TabGame(GameReplay *replay);
+	TabGame(TabSupervisor *_tabSupervisor, GameReplay *replay);
 	~TabGame();
 	void retranslateUi();
 	void closeRequest();
@@ -208,6 +208,7 @@ public:
 	bool getSpectatorsSeeEverything() const { return gameInfo.spectators_omniscient(); }
 	Player *getActiveLocalPlayer() const;
 	AbstractClient *getClientForPlayer(int playerId) const;
+	int getPlayerIdByName(const QString &playerName) const;
 	
 	void setActiveCard(CardItem *_card) { activeCard = _card; }
 	CardItem *getActiveCard() const { return activeCard; }

cockatrice/src/tab_message.cpp

@@ -10,11 +10,12 @@
 #include "pending_command.h"
 #include "pb/session_commands.pb.h"
 #include "pb/event_user_message.pb.h"
+#include "pb/serverinfo_user.pb.h"
 
-TabMessage::TabMessage(TabSupervisor *_tabSupervisor, AbstractClient *_client, const QString &_ownName, const QString &_userName)
+TabMessage::TabMessage(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User &_ownUserInfo, const ServerInfo_User &_otherUserInfo)
-	: Tab(_tabSupervisor), client(_client), userName(_userName), userOnline(true)
+	: Tab(_tabSupervisor), client(_client), ownUserInfo(new ServerInfo_User(_ownUserInfo)), otherUserInfo(new ServerInfo_User(_otherUserInfo)), userOnline(true)
 {
-	chatView = new ChatView(_ownName, true);
+	chatView = new ChatView(tabSupervisor, 0, true);
 	connect(chatView, SIGNAL(showCardInfoPopup(QPoint, QString)), this, SLOT(showCardInfoPopup(QPoint, QString)));
 	connect(chatView, SIGNAL(deleteCardInfoPopup(QString)), this, SLOT(deleteCardInfoPopup(QString)));
 	sayEdit = new QLineEdit;
@@ -37,6 +38,8 @@ TabMessage::TabMessage(TabSupervisor *_tabSupervisor, AbstractClient *_client, c
 TabMessage::~TabMessage()
 {
 	emit talkClosing(this);
+	delete ownUserInfo;
+	delete otherUserInfo;
 }
 
 void TabMessage::retranslateUi()
@@ -45,6 +48,16 @@ void TabMessage::retranslateUi()
 	aLeave->setText(tr("&Leave"));
 }
 
+QString TabMessage::getUserName() const
+{
+	return QString::fromStdString(otherUserInfo->name());
+}
+
+QString TabMessage::getTabText() const
+{
+	return tr("Talking to %1").arg(QString::fromStdString(otherUserInfo->name()));
+}
+
 void TabMessage::closeRequest()
 {
 	actLeave();
@@ -56,7 +69,7 @@ void TabMessage::sendMessage()
 	  	return;
 	
 	Command_Message cmd;
-	cmd.set_user_name(userName.toStdString());
+	cmd.set_user_name(otherUserInfo->name());
 	cmd.set_message(sayEdit->text().toStdString());
 	
 	PendingCommand *pend = client->prepareSessionCommand(cmd);
@@ -69,7 +82,7 @@ void TabMessage::sendMessage()
 void TabMessage::messageSent(const Response &response)
 {
 	if (response.response_code() == Response::RespInIgnoreList)
-		chatView->appendMessage(QString(), tr("This user is ignoring you."));
+		chatView->appendMessage(tr("This user is ignoring you."));
 }
 
 void TabMessage::actLeave()
@@ -79,18 +92,20 @@ void TabMessage::actLeave()
 
 void TabMessage::processUserMessageEvent(const Event_UserMessage &event)
 {
-	chatView->appendMessage(QString::fromStdString(event.sender_name()), QString::fromStdString(event.message()));
+	const UserLevelFlags userLevel(event.sender_name() == otherUserInfo->name() ? otherUserInfo->user_level() : ownUserInfo->user_level());
+	chatView->appendMessage(QString::fromStdString(event.message()), QString::fromStdString(event.sender_name()), userLevel);
 	emit userEvent();
 }
 
 void TabMessage::processUserLeft()
 {
-	chatView->appendMessage(QString(), tr("%1 has left the server.").arg(userName));
+	chatView->appendMessage(tr("%1 has left the server.").arg(QString::fromStdString(otherUserInfo->name())));
 	userOnline = false;
 }
 
-void TabMessage::processUserJoined()
+void TabMessage::processUserJoined(const ServerInfo_User &_userInfo)
 {
-	chatView->appendMessage(QString(), tr("%1 has joined the server.").arg(userName));
+	chatView->appendMessage(tr("%1 has joined the server.").arg(QString::fromStdString(otherUserInfo->name())));
 	userOnline = true;
+	*otherUserInfo = _userInfo;
 }

cockatrice/src/tab_message.h

@@ -8,12 +8,14 @@ class ChatView;
 class QLineEdit;
 class Event_UserMessage;
 class Response;
+class ServerInfo_User;
 
 class TabMessage : public Tab {
 	Q_OBJECT
 private:
 	AbstractClient *client;
-	QString userName;
+	ServerInfo_User *ownUserInfo;
+	ServerInfo_User *otherUserInfo;
 	bool userOnline;
 	
 	ChatView *chatView;
@@ -27,16 +29,16 @@ private slots:
 	void actLeave();
 	void messageSent(const Response &response);
 public:
-	TabMessage(TabSupervisor *_tabSupervisor, AbstractClient *_client, const QString &_ownName, const QString &_userName);
+	TabMessage(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User &_ownUserInfo, const ServerInfo_User &_otherUserInfo);
 	~TabMessage();
 	void retranslateUi();
 	void closeRequest();
-	QString getUserName() const { return userName; }
+	QString getUserName() const;
-	QString getTabText() const { return tr("Talking to %1").arg(userName); }
+	QString getTabText() const;
 
 	void processUserMessageEvent(const Event_UserMessage &event);
 	void processUserLeft();
-	void processUserJoined();
+	void processUserJoined(const ServerInfo_User &_userInfo);
 };
 
 #endif

cockatrice/src/tab_room.cpp

@@ -40,7 +40,8 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor, AbstractClient *_client, ServerI
 	userList = new UserList(tabSupervisor, client, UserList::RoomList);
 	connect(userList, SIGNAL(openMessageDialog(const QString &, bool)), this, SIGNAL(openMessageDialog(const QString &, bool)));
 	
-	chatView = new ChatView(QString::fromStdString(ownUser->name()), true);
+	chatView = new ChatView(tabSupervisor, 0, true);
+	connect(chatView, SIGNAL(openMessageDialog(QString, bool)), this, SIGNAL(openMessageDialog(QString, bool)));
 	connect(chatView, SIGNAL(showCardInfoPopup(QPoint, QString)), this, SLOT(showCardInfoPopup(QPoint, QString)));
 	connect(chatView, SIGNAL(deleteCardInfoPopup(QString)), this, SLOT(deleteCardInfoPopup(QString)));
 	sayLabel = new QLabel;
@@ -105,6 +106,7 @@ TabRoom::~TabRoom()
 void TabRoom::retranslateUi()
 {
         gameSelector->retranslateUi();
+	chatView->retranslateUi();
 	sayLabel->setText(tr("&Say:"));
 	chatGroupBox->setTitle(tr("Chat"));
 	tabMenu->setTitle(tr("&Room"));
@@ -142,7 +144,7 @@ void TabRoom::sendMessage()
 void TabRoom::sayFinished(const Response &response)
 {
 	if (response.response_code() == Response::RespChatFlood)
-		chatView->appendMessage(QString(), tr("You are flooding the chat. Please wait a couple of seconds."));
+		chatView->appendMessage(tr("You are flooding the chat. Please wait a couple of seconds."));
 }
 
 void TabRoom::actLeaveRoom()
@@ -197,20 +199,13 @@ void TabRoom::processRoomSayEvent(const Event_RoomSay &event)
 	if (tabSupervisor->getUserListsTab()->getIgnoreList()->getUsers().contains(senderName))
 		return;
 	UserListTWI *twi = userList->getUsers().value(senderName);
-	QColor senderColor;
+	UserLevelFlags userLevel;
-	if (twi && (senderName != QString::fromStdString(ownUser->name()))) {
+	if (twi) {
-		ServerInfo_User::UserLevelFlags userLevel = static_cast<ServerInfo_User::UserLevelFlags>(twi->getUserLevel());
+		userLevel = UserLevelFlags(twi->getUserInfo().user_level());
-		if (userLevel & ServerInfo_User::IsModerator)
+		if (settingsCache->getIgnoreUnregisteredUsers() && !userLevel.testFlag(ServerInfo_User::IsRegistered))
-			senderColor = Qt::darkMagenta;
+			return;
-		else if (userLevel & ServerInfo_User::IsRegistered)
-			senderColor = Qt::darkGreen;
-		else {
-			if (settingsCache->getIgnoreUnregisteredUsers())
-				return;
-			senderColor = QColor(0, 0, 254);
-		}
 	}
-	chatView->appendMessage(QString::fromStdString(event.name()), QString::fromStdString(event.message()), senderColor);
+	chatView->appendMessage(QString::fromStdString(event.message()), senderName, userLevel);
 	emit userEvent(false);
 }
 

cockatrice/src/tab_room.h

@@ -68,6 +68,7 @@ public:
 	const QMap<int, QString> &getGameTypes() const { return gameTypes; }
 	QString getChannelName() const { return roomName; }
 	QString getTabText() const { return roomName; }
+	const ServerInfo_User *getUserInfo() const { return ownUser; }
 
 	PendingCommand *prepareRoomCommand(const ::google::protobuf::Message &cmd);
 	void sendRoomCommand(PendingCommand *pend);

cockatrice/src/tab_supervisor.cpp

@@ -10,6 +10,7 @@
 #include "tab_message.h"
 #include "tab_userlists.h"
 #include "pixmapgenerator.h"
+#include "userlist.h"
 #include <QDebug>
 #include <QPainter>
 
@@ -96,21 +97,31 @@ TabSupervisor::~TabSupervisor()
 void TabSupervisor::retranslateUi()
 {
 	QList<Tab *> tabs;
-	if (tabServer)
+	tabs.append(tabServer);
-		tabs.append(tabServer);
+	tabs.append(tabReplays);
-	if (tabDeckStorage)
+	tabs.append(tabDeckStorage);
-		tabs.append(tabDeckStorage);
+	tabs.append(tabAdmin);
+	tabs.append(tabUserLists);
 	QMapIterator<int, TabRoom *> roomIterator(roomTabs);
 	while (roomIterator.hasNext())
 		tabs.append(roomIterator.next().value());
 	QMapIterator<int, TabGame *> gameIterator(gameTabs);
 	while (gameIterator.hasNext())
 		tabs.append(gameIterator.next().value());
+	QListIterator<TabGame *> replayIterator(replayTabs);
+	while (replayIterator.hasNext())
+		tabs.append(replayIterator.next());
 	
-	for (int i = 0; i < tabs.size(); ++i) {
+	for (int i = 0; i < tabs.size(); ++i)
-		setTabText(indexOf(tabs[i]), tabs[i]->getTabText());
+		if (tabs[i]) {
-		tabs[i]->retranslateUi();
+			setTabText(indexOf(tabs[i]), tabs[i]->getTabText());
-	}
+			tabs[i]->retranslateUi();
+		}
+}
+
+AbstractClient *TabSupervisor::getClient() const
+{
+	return localClients.isEmpty() ? client : localClients.first();
 }
 
 int TabSupervisor::myAddTab(Tab *tab)
@@ -129,7 +140,7 @@ void TabSupervisor::start(const ServerInfo_User &_userInfo)
 	
 	tabUserLists = new TabUserLists(this, client, *userInfo);
 	connect(tabUserLists, SIGNAL(openMessageDialog(const QString &, bool)), this, SLOT(addMessageTab(const QString &, bool)));
-	connect(tabUserLists, SIGNAL(userJoined(const QString &)), this, SLOT(processUserJoined(const QString &)));
+	connect(tabUserLists, SIGNAL(userJoined(ServerInfo_User)), this, SLOT(processUserJoined(ServerInfo_User)));
 	connect(tabUserLists, SIGNAL(userLeft(const QString &)), this, SLOT(processUserLeft(const QString &)));
 	myAddTab(tabUserLists);
 	
@@ -316,7 +327,7 @@ void TabSupervisor::roomLeft(TabRoom *tab)
 
 void TabSupervisor::openReplay(GameReplay *replay)
 {
-	TabGame *replayTab = new TabGame(replay);
+	TabGame *replayTab = new TabGame(this, replay);
 	connect(replayTab, SIGNAL(gameClosing(TabGame *)), this, SLOT(replayLeft(TabGame *)));
 	int tabIndex = myAddTab(replayTab);
 	addCloseButtonToTab(replayTab, tabIndex);
@@ -337,7 +348,13 @@ TabMessage *TabSupervisor::addMessageTab(const QString &receiverName, bool focus
 	if (receiverName == QString::fromStdString(userInfo->name()))
 		return 0;
 	
-	TabMessage *tab = new TabMessage(this, client, QString::fromStdString(userInfo->name()), receiverName);
+	ServerInfo_User otherUser;
+	UserListTWI *twi = tabUserLists->getAllUsersList()->getUsers().value(receiverName);
+	if (twi)
+		otherUser = twi->getUserInfo();
+	else
+		otherUser.set_name(receiverName.toStdString());
+	TabMessage *tab = new TabMessage(this, client, *userInfo, otherUser);
 	connect(tab, SIGNAL(talkClosing(TabMessage *)), this, SLOT(talkLeft(TabMessage *)));
 	int tabIndex = myAddTab(tab);
 	addCloseButtonToTab(tab, tabIndex);
@@ -402,11 +419,11 @@ void TabSupervisor::processUserLeft(const QString &userName)
 		tab->processUserLeft();
 }
 
-void TabSupervisor::processUserJoined(const QString &userName)
+void TabSupervisor::processUserJoined(const ServerInfo_User &userInfo)
 {
-	TabMessage *tab = messageTabs.value(userName);
+	TabMessage *tab = messageTabs.value(QString::fromStdString(userInfo.name()));
 	if (tab)
-		tab->processUserJoined();
+		tab->processUserJoined(userInfo);
 }
 
 void TabSupervisor::updateCurrent(int index)
@@ -428,8 +445,3 @@ bool TabSupervisor::getAdminLocked() const
 		return true;
 	return tabAdmin->getLocked();
 }
-
-int TabSupervisor::getUserLevel() const
-{
-	return userInfo->user_level();
-}

cockatrice/src/tab_supervisor.h

@@ -64,9 +64,9 @@ public:
 	int getGameCount() const { return gameTabs.size(); }
 	TabUserLists *getUserListsTab() const { return tabUserLists; }
 	ServerInfo_User *getUserInfo() const { return userInfo; }
+	AbstractClient *getClient() const;
 	const QMap<int, TabRoom *> &getRoomTabs() const { return roomTabs; }
 	bool getAdminLocked() const;
-	int getUserLevel() const;
 signals:
 	void setMenu(QMenu *menu);
 	void localGameEnded();
@@ -84,7 +84,7 @@ private slots:
 	void openReplay(GameReplay *replay);
 	void replayLeft(TabGame *tab);
 	void processUserLeft(const QString &userName);
-	void processUserJoined(const QString &userName);
+	void processUserJoined(const ServerInfo_User &userInfo);
 	void talkLeft(TabMessage *tab);
 	void tabUserEvent(bool globalEvent);
 	void processRoomEvent(const RoomEvent &event);

cockatrice/src/tab_userlists.cpp

@@ -88,7 +88,7 @@ void TabUserLists::processUserJoinedEvent(const Event_UserJoined &event)
 	ignoreList->sortItems();
 	buddyList->sortItems();
 	
-	emit userJoined(userName);
+	emit userJoined(info);
 }
 
 void TabUserLists::processUserLeftEvent(const Event_UserLeft &event)

cockatrice/src/tab_userlists.h

@@ -21,7 +21,7 @@ class TabUserLists : public Tab {
 signals:
 	void openMessageDialog(const QString &userName, bool focus);
 	void userLeft(const QString &userName);
-	void userJoined(const QString &userName);
+	void userJoined(const ServerInfo_User &userInfo);
 private slots:
 	void processListUsersResponse(const Response &response);
 	void processUserJoinedEvent(const Event_UserJoined &event);
@@ -40,8 +40,9 @@ public:
 	TabUserLists(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User &userInfo, QWidget *parent = 0);
 	void retranslateUi();
 	QString getTabText() const { return tr("User lists"); }
-	UserList *getBuddyList() const { return buddyList; }
+	const UserList *getAllUsersList() const { return allUsersList; }
-	UserList *getIgnoreList() const { return ignoreList; }
+	const UserList *getBuddyList() const { return buddyList; }
+	const UserList *getIgnoreList() const { return ignoreList; }
 };
 
 #endif

cockatrice/src/user_context_menu.cpp

@@ -0,0 +1,198 @@
+#include <QAction>
+#include <QMenu>
+#include "user_context_menu.h"
+#include "tab_supervisor.h"
+#include "tab_userlists.h"
+#include "tab_game.h"
+#include "userlist.h"
+#include "abstractclient.h"
+#include "userinfobox.h"
+#include "gameselector.h"
+#include "pending_command.h"
+
+#include "pb/commands.pb.h"
+#include "pb/session_commands.pb.h"
+#include "pb/moderator_commands.pb.h"
+#include "pb/command_kick_from_game.pb.h"
+#include "pb/response_get_games_of_user.pb.h"
+#include "pb/response_get_user_info.pb.h"
+
+UserContextMenu::UserContextMenu(const TabSupervisor *_tabSupervisor, QWidget *parent, TabGame *_game)
+	: QObject(parent), client(_tabSupervisor->getClient()), tabSupervisor(_tabSupervisor), game(_game)
+{
+	aUserName = new QAction(QString(), this);
+	aUserName->setEnabled(false);
+	aDetails = new QAction(QString(), this);
+	aChat = new QAction(QString(), this);
+	aShowGames = new QAction(QString(), this);
+	aAddToBuddyList = new QAction(QString(), this);
+	aRemoveFromBuddyList = new QAction(QString(), this);
+	aAddToIgnoreList = new QAction(QString(), this);
+	aRemoveFromIgnoreList = new QAction(QString(), this);
+	aKick = new QAction(QString(), this);
+	aBan = new QAction(QString(), this);
+	
+	retranslateUi();
+}
+
+void UserContextMenu::retranslateUi()
+{
+	aDetails->setText(tr("User &details"));
+	aChat->setText(tr("Direct &chat"));
+	aShowGames->setText(tr("Show this user's &games"));
+	aAddToBuddyList->setText(tr("Add to &buddy list"));
+	aRemoveFromBuddyList->setText(tr("Remove from &buddy list"));
+	aAddToIgnoreList->setText(tr("Add to &ignore list"));
+	aRemoveFromIgnoreList->setText(tr("Remove from &ignore list"));
+	aKick->setText(tr("Kick from &game"));
+	aBan->setText(tr("Ban from &server"));
+}
+
+void UserContextMenu::gamesOfUserReceived(const Response &resp, const CommandContainer &commandContainer)
+{
+	const Response_GetGamesOfUser &response = resp.GetExtension(Response_GetGamesOfUser::ext);
+	const Command_GetGamesOfUser &cmd = commandContainer.session_command(0).GetExtension(Command_GetGamesOfUser::ext);
+	
+	QMap<int, GameTypeMap> gameTypeMap;
+	QMap<int, QString> roomMap;
+	const int roomListSize = response.room_list_size();
+	for (int i = 0; i < roomListSize; ++i) {
+		const ServerInfo_Room &roomInfo = response.room_list(i);
+		roomMap.insert(roomInfo.room_id(), QString::fromStdString(roomInfo.name()));
+		GameTypeMap tempMap;
+		const int gameTypeListSize = roomInfo.gametype_list_size();
+		for (int j = 0; j < gameTypeListSize; ++j) {
+			const ServerInfo_GameType &gameTypeInfo = roomInfo.gametype_list(j);
+			tempMap.insert(gameTypeInfo.game_type_id(), QString::fromStdString(gameTypeInfo.description()));
+		}
+		gameTypeMap.insert(roomInfo.room_id(), tempMap);
+	}
+	
+	GameSelector *selector = new GameSelector(client, tabSupervisor, 0, roomMap, gameTypeMap);
+	const int gameListSize = response.game_list_size();
+	for (int i = 0; i < gameListSize; ++i)
+		selector->processGameInfo(response.game_list(i));
+	
+	selector->setWindowTitle(tr("%1's games").arg(QString::fromStdString(cmd.user_name())));
+	selector->setAttribute(Qt::WA_DeleteOnClose);
+	selector->show();
+}
+
+void UserContextMenu::banUser_processUserInfoResponse(const Response &r)
+{
+	const Response_GetUserInfo &response = r.GetExtension(Response_GetUserInfo::ext);
+	
+	// The dialog needs to be non-modal in order to not block the event queue of the client.
+	BanDialog *dlg = new BanDialog(response.user_info(), static_cast<QWidget *>(parent()));
+	connect(dlg, SIGNAL(accepted()), this, SLOT(banUser_dialogFinished()));
+	dlg->show();
+}
+
+void UserContextMenu::banUser_dialogFinished()
+{
+	BanDialog *dlg = static_cast<BanDialog *>(sender());
+	
+	Command_BanFromServer cmd;
+	cmd.set_user_name(dlg->getBanName().toStdString());
+	cmd.set_address(dlg->getBanIP().toStdString());
+	cmd.set_minutes(dlg->getMinutes());
+	cmd.set_reason(dlg->getReason().toStdString());
+	cmd.set_visible_reason(dlg->getVisibleReason().toStdString());
+	
+	client->sendCommand(client->prepareModeratorCommand(cmd));
+}
+
+void UserContextMenu::showContextMenu(const QPoint &pos, const QString &userName, UserLevelFlags userLevel, int playerId)
+{
+	aUserName->setText(userName);
+	
+	QMenu *menu = new QMenu(static_cast<QWidget *>(parent()));
+	menu->addAction(aUserName);
+	menu->addSeparator();
+	menu->addAction(aDetails);
+	menu->addAction(aShowGames);
+	menu->addAction(aChat);
+	if (userLevel.testFlag(ServerInfo_User::IsRegistered) && (tabSupervisor->getUserInfo()->user_level() & ServerInfo_User::IsRegistered)) {
+		menu->addSeparator();
+		if (tabSupervisor->getUserListsTab()->getBuddyList()->getUsers().contains(userName))
+			menu->addAction(aRemoveFromBuddyList);
+		else
+			menu->addAction(aAddToBuddyList);
+		if (tabSupervisor->getUserListsTab()->getIgnoreList()->getUsers().contains(userName))
+			menu->addAction(aRemoveFromIgnoreList);
+		else
+			menu->addAction(aAddToIgnoreList);
+	}
+	if (game && (game->isHost() || !tabSupervisor->getAdminLocked())) {
+		menu->addSeparator();
+		menu->addAction(aKick);
+	}
+	if (!tabSupervisor->getAdminLocked()) {
+		menu->addSeparator();
+		menu->addAction(aBan);
+	}
+	bool anotherUser = userName != QString::fromStdString(tabSupervisor->getUserInfo()->name());
+	aChat->setEnabled(anotherUser);
+	aShowGames->setEnabled(anotherUser);
+	aAddToBuddyList->setEnabled(anotherUser);
+	aRemoveFromBuddyList->setEnabled(anotherUser);
+	aAddToIgnoreList->setEnabled(anotherUser);
+	aRemoveFromIgnoreList->setEnabled(anotherUser);
+	aKick->setEnabled(anotherUser);
+	aBan->setEnabled(anotherUser);
+	
+	QAction *actionClicked = menu->exec(pos);
+	if (actionClicked == aDetails) {
+		UserInfoBox *infoWidget = new UserInfoBox(client, true, static_cast<QWidget *>(parent()), Qt::Dialog | Qt::WindowTitleHint | Qt::CustomizeWindowHint | Qt::WindowCloseButtonHint);
+		infoWidget->setAttribute(Qt::WA_DeleteOnClose);
+		infoWidget->updateInfo(userName);
+	} else if (actionClicked == aChat)
+		emit openMessageDialog(userName, true);
+	else if (actionClicked == aShowGames) {
+		Command_GetGamesOfUser cmd;
+		cmd.set_user_name(userName.toStdString());
+		
+		PendingCommand *pend = client->prepareSessionCommand(cmd);
+		connect(pend, SIGNAL(finished(Response, CommandContainer, QVariant)), this, SLOT(gamesOfUserReceived(Response, CommandContainer)));
+		
+		client->sendCommand(pend);
+	} else if (actionClicked == aAddToBuddyList) {
+		Command_AddToList cmd;
+		cmd.set_list("buddy");
+		cmd.set_user_name(userName.toStdString());
+		
+		client->sendCommand(client->prepareSessionCommand(cmd));
+	} else if (actionClicked == aRemoveFromBuddyList) {
+		Command_RemoveFromList cmd;
+		cmd.set_list("buddy");
+		cmd.set_user_name(userName.toStdString());
+		
+		client->sendCommand(client->prepareSessionCommand(cmd));
+	} else if (actionClicked == aAddToIgnoreList) {
+		Command_AddToList cmd;
+		cmd.set_list("ignore");
+		cmd.set_user_name(userName.toStdString());
+		
+		client->sendCommand(client->prepareSessionCommand(cmd));
+	} else if (actionClicked == aRemoveFromIgnoreList) {
+		Command_RemoveFromList cmd;
+		cmd.set_list("ignore");
+		cmd.set_user_name(userName.toStdString());
+		
+		client->sendCommand(client->prepareSessionCommand(cmd));
+	} else if (actionClicked == aKick) {
+		Command_KickFromGame cmd;
+		cmd.set_player_id(game->getPlayerIdByName(userName));
+		game->sendGameCommand(cmd);
+	} else if (actionClicked == aBan) {
+		Command_GetUserInfo cmd;
+		cmd.set_user_name(userName.toStdString());
+		
+		PendingCommand *pend = client->prepareSessionCommand(cmd);
+		connect(pend, SIGNAL(finished(Response, CommandContainer, QVariant)), this, SLOT(banUser_processUserInfoResponse(Response)));
+		
+		client->sendCommand(pend);
+	}
+	
+	delete menu;
+}

cockatrice/src/user_context_menu.h

@@ -0,0 +1,42 @@
+#ifndef USER_CONTEXT_MENU_H
+#define USER_CONTEXT_MENU_H
+
+#include <QObject>
+#include "user_level.h"
+
+class QAction;
+class TabSupervisor;
+class TabGame;
+class QPoint;
+class CommandContainer;
+class Response;
+class AbstractClient;
+
+class UserContextMenu : public QObject {
+	Q_OBJECT
+private:
+	AbstractClient *client;
+	const TabSupervisor *tabSupervisor;
+	TabGame *game;
+	
+	QAction *aUserName;
+	QAction *aDetails;
+	QAction *aShowGames;
+	QAction *aChat;
+	QAction *aAddToBuddyList, *aRemoveFromBuddyList;
+	QAction *aAddToIgnoreList, *aRemoveFromIgnoreList;
+	QAction *aKick;
+	QAction *aBan;
+signals:
+	void openMessageDialog(const QString &userName, bool focus);
+private slots:
+	void banUser_processUserInfoResponse(const Response &resp);
+	void banUser_dialogFinished();
+	void gamesOfUserReceived(const Response &resp, const CommandContainer &commandContainer);
+public:
+	UserContextMenu(const TabSupervisor *_tabSupervisor, QWidget *_parent, TabGame *_game = 0);
+	void retranslateUi();
+	void showContextMenu(const QPoint &pos, const QString &userName, UserLevelFlags userLevel, int playerId = -1);
+};
+
+#endif

cockatrice/src/userinfobox.cpp

@@ -56,7 +56,7 @@ void UserInfoBox::retranslateUi()
 
 void UserInfoBox::updateInfo(const ServerInfo_User &user)
 {
-	const int userLevel = user.user_level();
+	const UserLevelFlags userLevel(user.user_level());
 	
 	QPixmap avatarPixmap;
 	const std::string bmp = user.avatar_bmp();
@@ -70,11 +70,11 @@ void UserInfoBox::updateInfo(const ServerInfo_User &user)
 	countryLabel2->setPixmap(CountryPixmapGenerator::generatePixmap(15, QString::fromStdString(user.country())));
 	userLevelLabel2->setPixmap(UserLevelPixmapGenerator::generatePixmap(15, userLevel));
 	QString userLevelText;
-	if (userLevel & ServerInfo_User::IsAdmin)
+	if (userLevel.testFlag(ServerInfo_User::IsAdmin))
 		userLevelText = tr("Administrator");
-	else if (userLevel & ServerInfo_User::IsModerator)
+	else if (userLevel.testFlag(ServerInfo_User::IsModerator))
 		userLevelText = tr("Moderator");
-	else if (userLevel & ServerInfo_User::IsRegistered)
+	else if (userLevel.testFlag(ServerInfo_User::IsRegistered))
 		userLevelText = tr("Registered user");
 	else
 		userLevelText = tr("Unregistered user");

cockatrice/src/userlist.cpp

@@ -4,6 +4,7 @@
 #include "abstractclient.h"
 #include "pixmapgenerator.h"
 #include "userinfobox.h"
+#include "user_context_menu.h"
 #include "gameselector.h"
 #include <QHeaderView>
 #include <QVBoxLayout>
@@ -169,19 +170,27 @@ bool UserListItemDelegate::editorEvent(QEvent *event, QAbstractItemModel *model,
 	return QStyledItemDelegate::editorEvent(event, model, option, index);
 }
 
-UserListTWI::UserListTWI()
+UserListTWI::UserListTWI(const ServerInfo_User &_userInfo)
 	: QTreeWidgetItem(Type)
 {
+	setUserInfo(_userInfo);
 }
 
-QString UserListTWI::getUserName() const
+void UserListTWI::setUserInfo(const ServerInfo_User &_userInfo)
 {
-	return data(2, Qt::UserRole).toString();
+	userInfo = _userInfo;
+
+	setData(0, Qt::UserRole, userInfo.user_level());
+	setIcon(0, QIcon(UserLevelPixmapGenerator::generatePixmap(12, UserLevelFlags(userInfo.user_level()))));
+	setIcon(1, QIcon(CountryPixmapGenerator::generatePixmap(12, QString::fromStdString(userInfo.country()))));
+	setData(2, Qt::UserRole, QString::fromStdString(userInfo.name()));
+	setData(2, Qt::DisplayRole, QString::fromStdString(userInfo.name()));
 }
 
-int UserListTWI::getUserLevel() const
+void UserListTWI::setOnline(bool online)
 {
-	return data(0, Qt::UserRole).toInt();
+	setData(0, Qt::UserRole + 1, online);
+	setData(2, Qt::ForegroundRole, online ? QBrush() : QBrush(Qt::gray));
 }
 
 bool UserListTWI::operator<(const QTreeWidgetItem &other) const
@@ -202,6 +211,8 @@ UserList::UserList(TabSupervisor *_tabSupervisor, AbstractClient *_client, UserL
 	: QGroupBox(parent), tabSupervisor(_tabSupervisor), client(_client), type(_type), onlineCount(0)
 {
 	itemDelegate = new UserListItemDelegate(this);
+	userContextMenu = new UserContextMenu(tabSupervisor, this);
+	connect(userContextMenu, SIGNAL(openMessageDialog(QString, bool)), this, SIGNAL(openMessageDialog(QString, bool)));
 	
 	userTree = new QTreeWidget;
 	userTree->setColumnCount(3);
@@ -236,25 +247,17 @@ void UserList::processUserInfo(const ServerInfo_User &user, bool online)
 {
 	const QString userName = QString::fromStdString(user.name());
 	UserListTWI *item = users.value(userName);
-	if (!item) {
+	if (item)
-		item = new UserListTWI;
+		item->setUserInfo(user);
+	else {
+		item = new UserListTWI(user);
 		users.insert(userName, item);
 		userTree->addTopLevelItem(item);
 		if (online)
 			++onlineCount;
 		updateCount();
 	}
-	item->setData(0, Qt::UserRole, user.user_level());
+	item->setOnline(online);
-	item->setIcon(0, QIcon(UserLevelPixmapGenerator::generatePixmap(12, user.user_level())));
-	item->setIcon(1, QIcon(CountryPixmapGenerator::generatePixmap(12, QString::fromStdString(user.country()))));
-	item->setData(2, Qt::UserRole, QString::fromStdString(user.name()));
-	item->setData(2, Qt::DisplayRole, QString::fromStdString(user.name()));
-	
-	item->setData(0, Qt::UserRole + 1, online);
-	if (online)
-		item->setData(2, Qt::ForegroundRole, QBrush());
-	else
-		item->setData(2, Qt::ForegroundRole, QBrush(Qt::gray));
 }
 
 bool UserList::deleteUser(const QString &userName)
@@ -273,25 +276,18 @@ bool UserList::deleteUser(const QString &userName)
 	return false;
 }
 
-void UserList::setUserOnline(QTreeWidgetItem *item, bool online)
-{
-	item->setData(0, Qt::UserRole + 1, online);
-	
-	if (online) {
-		item->setData(2, Qt::ForegroundRole, QBrush());
-		++onlineCount;
-	} else {
-		item->setData(2, Qt::ForegroundRole, QBrush(Qt::gray));
-		--onlineCount;
-	}
-	updateCount();
-}
-
 void UserList::setUserOnline(const QString &userName, bool online)
 {
 	UserListTWI *twi = users.value(userName);
-	if (twi)
+	if (!twi)
-		setUserOnline(twi, online);
+		return;
+	
+	twi->setOnline(online);
+	if (online)
+		++onlineCount;
+	else
+		--onlineCount;
+	updateCount();
 }
 
 void UserList::updateCount()
@@ -307,165 +303,11 @@ void UserList::userClicked(QTreeWidgetItem *item, int /*column*/)
 	emit openMessageDialog(item->data(2, Qt::UserRole).toString(), true);
 }
 
-void UserList::gamesOfUserReceived(const Response &resp, const CommandContainer &commandContainer)
-{
-	const Response_GetGamesOfUser &response = resp.GetExtension(Response_GetGamesOfUser::ext);
-	const Command_GetGamesOfUser &cmd = commandContainer.session_command(0).GetExtension(Command_GetGamesOfUser::ext);
-	
-	QMap<int, GameTypeMap> gameTypeMap;
-	QMap<int, QString> roomMap;
-	const int roomListSize = response.room_list_size();
-	for (int i = 0; i < roomListSize; ++i) {
-		const ServerInfo_Room &roomInfo = response.room_list(i);
-		roomMap.insert(roomInfo.room_id(), QString::fromStdString(roomInfo.name()));
-		GameTypeMap tempMap;
-		const int gameTypeListSize = roomInfo.gametype_list_size();
-		for (int j = 0; j < gameTypeListSize; ++j) {
-			const ServerInfo_GameType &gameTypeInfo = roomInfo.gametype_list(j);
-			tempMap.insert(gameTypeInfo.game_type_id(), QString::fromStdString(gameTypeInfo.description()));
-		}
-		gameTypeMap.insert(roomInfo.room_id(), tempMap);
-	}
-	
-	GameSelector *selector = new GameSelector(client, tabSupervisor, 0, roomMap, gameTypeMap);
-	const int gameListSize = response.game_list_size();
-	for (int i = 0; i < gameListSize; ++i)
-		selector->processGameInfo(response.game_list(i));
-	
-	selector->setWindowTitle(tr("%1's games").arg(QString::fromStdString(cmd.user_name())));
-	selector->setAttribute(Qt::WA_DeleteOnClose);
-	selector->show();
-}
-
-void UserList::banUser_processUserInfoResponse(const Response &r)
-{
-	const Response_GetUserInfo &response = r.GetExtension(Response_GetUserInfo::ext);
-	
-	// The dialog needs to be non-modal in order to not block the event queue of the client.
-	BanDialog *dlg = new BanDialog(response.user_info(), this);
-	connect(dlg, SIGNAL(accepted()), this, SLOT(banUser_dialogFinished()));
-	dlg->show();
-}
-
-void UserList::banUser_dialogFinished()
-{
-	BanDialog *dlg = static_cast<BanDialog *>(sender());
-	
-	Command_BanFromServer cmd;
-	cmd.set_user_name(dlg->getBanName().toStdString());
-	cmd.set_address(dlg->getBanIP().toStdString());
-	cmd.set_minutes(dlg->getMinutes());
-	cmd.set_reason(dlg->getReason().toStdString());
-	cmd.set_visible_reason(dlg->getVisibleReason().toStdString());
-	
-	client->sendCommand(client->prepareModeratorCommand(cmd));
-}
-
 void UserList::showContextMenu(const QPoint &pos, const QModelIndex &index)
 {
-	UserListTWI *twi = static_cast<UserListTWI *>(userTree->topLevelItem(index.row()));
+	const ServerInfo_User &userInfo = static_cast<UserListTWI *>(userTree->topLevelItem(index.row()))->getUserInfo();
-	const QString &userName = twi->getUserName();
-	ServerInfo_User::UserLevelFlags userLevel = static_cast<ServerInfo_User::UserLevelFlags>(twi->getUserLevel());
 	
-	QAction *aUserName = new QAction(userName, this);
+	userContextMenu->showContextMenu(pos, QString::fromStdString(userInfo.name()), UserLevelFlags(userInfo.user_level()));
-	aUserName->setEnabled(false);
-	QAction *aDetails = new QAction(tr("User &details"), this);
-	QAction *aChat = new QAction(tr("Direct &chat"), this);
-	QAction *aShowGames = new QAction(tr("Show this user's &games"), this);
-	QAction *aAddToBuddyList = new QAction(tr("Add to &buddy list"), this);
-	QAction *aRemoveFromBuddyList = new QAction(tr("Remove from &buddy list"), this);
-	QAction *aAddToIgnoreList = new QAction(tr("Add to &ignore list"), this);
-	QAction *aRemoveFromIgnoreList = new QAction(tr("Remove from &ignore list"), this);
-	QAction *aBan = new QAction(tr("Ban from &server"), this);
-	
-	QMenu *menu = new QMenu(this);
-	menu->addAction(aUserName);
-	menu->addSeparator();
-	menu->addAction(aDetails);
-	menu->addAction(aShowGames);
-	menu->addAction(aChat);
-	if ((userLevel & ServerInfo_User::IsRegistered) && (tabSupervisor->getUserLevel() & ServerInfo_User::IsRegistered)) {
-		menu->addSeparator();
-		if (tabSupervisor->getUserListsTab()->getBuddyList()->getUsers().contains(userName))
-			menu->addAction(aRemoveFromBuddyList);
-		else
-			menu->addAction(aAddToBuddyList);
-		if (tabSupervisor->getUserListsTab()->getIgnoreList()->getUsers().contains(userName))
-			menu->addAction(aRemoveFromIgnoreList);
-		else
-			menu->addAction(aAddToIgnoreList);
-	}
-	if (!tabSupervisor->getAdminLocked()) {
-		menu->addSeparator();
-		menu->addAction(aBan);
-	}
-	if (userName == QString::fromStdString(tabSupervisor->getUserInfo()->name())) {
-		aChat->setEnabled(false);
-		aAddToBuddyList->setEnabled(false);
-		aRemoveFromBuddyList->setEnabled(false);
-		aAddToIgnoreList->setEnabled(false);
-		aRemoveFromIgnoreList->setEnabled(false);
-		aBan->setEnabled(false);
-	}
-	
-	QAction *actionClicked = menu->exec(pos);
-	if (actionClicked == aDetails) {
-		UserInfoBox *infoWidget = new UserInfoBox(client, true, this, Qt::Dialog | Qt::WindowTitleHint | Qt::CustomizeWindowHint | Qt::WindowCloseButtonHint);
-		infoWidget->setAttribute(Qt::WA_DeleteOnClose);
-		infoWidget->updateInfo(userName);
-	} else if (actionClicked == aChat)
-		emit openMessageDialog(userName, true);
-	else if (actionClicked == aAddToBuddyList) {
-		Command_AddToList cmd;
-		cmd.set_list("buddy");
-		cmd.set_user_name(userName.toStdString());
-		
-		client->sendCommand(client->prepareSessionCommand(cmd));
-	} else if (actionClicked == aRemoveFromBuddyList) {
-		Command_RemoveFromList cmd;
-		cmd.set_list("buddy");
-		cmd.set_user_name(userName.toStdString());
-		
-		client->sendCommand(client->prepareSessionCommand(cmd));
-	} else if (actionClicked == aShowGames) {
-		Command_GetGamesOfUser cmd;
-		cmd.set_user_name(userName.toStdString());
-		
-		PendingCommand *pend = client->prepareSessionCommand(cmd);
-		connect(pend, SIGNAL(finished(Response, CommandContainer, QVariant)), this, SLOT(gamesOfUserReceived(Response, CommandContainer)));
-		
-		client->sendCommand(pend);
-	} else if (actionClicked == aAddToIgnoreList) {
-		Command_AddToList cmd;
-		cmd.set_list("ignore");
-		cmd.set_user_name(userName.toStdString());
-		
-		client->sendCommand(client->prepareSessionCommand(cmd));
-	} else if (actionClicked == aRemoveFromIgnoreList) {
-		Command_RemoveFromList cmd;
-		cmd.set_list("ignore");
-		cmd.set_user_name(userName.toStdString());
-		
-		client->sendCommand(client->prepareSessionCommand(cmd));
-	} else if (actionClicked == aBan) {
-		Command_GetUserInfo cmd;
-		cmd.set_user_name(userName.toStdString());
-		
-		PendingCommand *pend = client->prepareSessionCommand(cmd);
-		connect(pend, SIGNAL(finished(Response, CommandContainer, QVariant)), this, SLOT(banUser_processUserInfoResponse(Response)));
-		
-		client->sendCommand(pend);
-	}
-	
-	delete menu;
-	delete aUserName;
-	delete aDetails;
-	delete aChat;
-	delete aAddToBuddyList;
-	delete aRemoveFromBuddyList;
-	delete aAddToIgnoreList;
-	delete aRemoveFromIgnoreList;
-	delete aBan;
 }
 
 void UserList::sortItems()

cockatrice/src/userlist.h

@@ -5,6 +5,7 @@
 #include <QGroupBox>
 #include <QTreeWidgetItem>
 #include <QStyledItemDelegate>
+#include "user_level.h"
 
 class QTreeWidget;
 class ServerInfo_User;
@@ -17,6 +18,7 @@ class QRadioButton;
 class QPlainTextEdit;
 class Response;
 class CommandContainer;
+class UserContextMenu;
 
 class BanDialog : public QDialog {
 	Q_OBJECT
@@ -46,10 +48,13 @@ public:
 };
 
 class UserListTWI : public QTreeWidgetItem {
+private:
+	ServerInfo_User userInfo;
 public:
-	UserListTWI();
+	UserListTWI(const ServerInfo_User &_userInfo);
-	QString getUserName() const;
+	const ServerInfo_User &getUserInfo() const { return userInfo; }
-	int getUserLevel() const;
+	void setUserInfo(const ServerInfo_User &_userInfo);
+	void setOnline(bool online);
 	bool operator<(const QTreeWidgetItem &other) const;
 };
 
@@ -64,15 +69,12 @@ private:
 	UserListType type;
 	QTreeWidget *userTree;
 	UserListItemDelegate *itemDelegate;
+	UserContextMenu *userContextMenu;
 	int onlineCount;
 	QString titleStr;
 	void updateCount();
-	void setUserOnline(QTreeWidgetItem *user, bool online);
 private slots:
 	void userClicked(QTreeWidgetItem *item, int column);
-	void banUser_processUserInfoResponse(const Response &resp);
-	void banUser_dialogFinished();
-	void gamesOfUserReceived(const Response &resp, const CommandContainer &commandContainer);
 signals:
 	void openMessageDialog(const QString &userName, bool focus);
 	void addBuddy(const QString &userName);

cockatrice/src/window_deckeditor.cpp

@@ -437,13 +437,17 @@ void WndDeckEditor::recursiveExpand(const QModelIndex &index)
 	deckView->expand(index);
 }
 
-void WndDeckEditor::addCardHelper(const QString &zoneName)
+void WndDeckEditor::addCardHelper(QString zoneName)
 {
 	const QModelIndex currentIndex = databaseView->selectionModel()->currentIndex();
 	if (!currentIndex.isValid())
 		return;
 	const QString cardName = currentIndex.sibling(currentIndex.row(), 0).data().toString();
-
+	
+	CardInfo *info = db->getCard(cardName);
+	if (info->getIsToken())
+		zoneName = "tokens";
+	
 	QModelIndex newCardIndex = deckModel->addCard(cardName, zoneName);
 	recursiveExpand(newCardIndex);
 	deckView->setCurrentIndex(newCardIndex);

cockatrice/src/window_deckeditor.h

@@ -58,7 +58,7 @@ private slots:
 
         void finishedUpdatingPrices();
 private:
-	void addCardHelper(const QString &zoneName);
+	void addCardHelper(QString zoneName);
 	void recursiveExpand(const QModelIndex &index);
 	bool confirmClose();
 

cockatrice/src/window_main.cpp

@@ -176,7 +176,7 @@ void MainWindow::actWatchReplay()
 	GameReplay *replay = new GameReplay;
 	replay->ParseFromArray(buf.data(), buf.size());
 	
-	TabGame *replayWatcher = new TabGame(replay);
+	TabGame *replayWatcher = new TabGame(0, replay);
 	replayWatcher->show();
 }
 

common/decklist.cpp

@@ -98,6 +98,8 @@ QString InnerDecklistNode::visibleNameFromName(const QString &_name)
 		return QObject::tr("Maindeck");
 	else if (_name == "side")
 		return QObject::tr("Sideboard");
+	else if (_name == "tokens")
+		return QObject::tr("Tokens");
 	else
 		return _name;
 }

common/pb/serverinfo_game.proto

@@ -19,4 +19,5 @@ message ServerInfo_Game {
 	optional uint32 spectators_count = 31;
 	optional bool started = 50;
 	optional uint32 start_time = 51;
+	optional bool closed = 52;
 }

common/pb/serverinfo_user.proto

@@ -1,7 +1,7 @@
 message ServerInfo_User {
-	enum UserLevelFlags {
+	enum UserLevelFlag {
-		IsNothing = 0;
+        	IsNothing = 0;
-		IsUser = 1;
+	        IsUser = 1;
 		IsRegistered = 2;
 		IsModerator = 4;
 		IsAdmin = 8;

common/server_game.cpp

@@ -294,7 +294,9 @@ void Server_Game::doStartGameIfReady()
 	locker.unlock();
 	
 	ServerInfo_Game gameInfo;
-	getInfo(gameInfo);
+	gameInfo.set_room_id(room->getId());
+	gameInfo.set_game_id(gameId);
+	gameInfo.set_started(true);
 	emit gameInfoChanged(gameInfo);
 }
 
@@ -327,6 +329,14 @@ void Server_Game::stopGameIfFinished()
 	}
 
 	sendGameStateToPlayers();
+	
+	locker.unlock();
+	
+	ServerInfo_Game gameInfo;
+	gameInfo.set_room_id(room->getId());
+	gameInfo.set_game_id(gameId);
+	gameInfo.set_started(false);
+	emit gameInfoChanged(gameInfo);
 }
 
 Response::ResponseCode Server_Game::checkJoin(ServerInfo_User *user, const QString &_password, bool spectator, bool overrideRestrictions)
@@ -377,7 +387,7 @@ void Server_Game::addPlayer(Server_AbstractUserInterface *userInterface, Respons
 	newPlayer->moveToThread(thread());
 	
 	Event_Join joinEvent;
-	joinEvent.mutable_player_properties()->CopyFrom(newPlayer->getProperties(true));
+	newPlayer->getProperties(*joinEvent.mutable_player_properties(), true);
 	sendGameEventContainer(prepareGameEvent(joinEvent, -1));
 	
 	const QString playerName = QString::fromStdString(newPlayer->getUserInfo()->name());
@@ -393,7 +403,9 @@ void Server_Game::addPlayer(Server_AbstractUserInterface *userInterface, Respons
 	
 	if (broadcastUpdate) {
 		ServerInfo_Game gameInfo;
-		getInfo(gameInfo);
+		gameInfo.set_room_id(room->getId());
+		gameInfo.set_game_id(gameId);
+		gameInfo.set_player_count(getPlayerCount());
 		emit gameInfoChanged(gameInfo);
 	}
 	
@@ -421,9 +433,10 @@ void Server_Game::removePlayer(Server_Player *player)
 	bool spectator = player->getSpectator();
 	player->prepareDestroy();
 	
-	if (!getPlayerCount())
+	if (!getPlayerCount()) {
 		deleteLater();
-	else if (!spectator) {
+		return;
+	} else if (!spectator) {
 		if (playerHost) {
 			int newHostId = -1;
 			QMapIterator<int, Server_Player *> playerIterator(players);
@@ -445,7 +458,9 @@ void Server_Game::removePlayer(Server_Player *player)
 	}
 	
 	ServerInfo_Game gameInfo;
-	getInfo(gameInfo);
+	gameInfo.set_room_id(room->getId());
+	gameInfo.set_game_id(gameId);
+	gameInfo.set_player_count(getPlayerCount());
 	emit gameInfoChanged(gameInfo);
 }
 
@@ -645,8 +660,10 @@ void Server_Game::getInfo(ServerInfo_Game &result) const
 	QMutexLocker locker(&gameMutex);
 	
 	result.set_room_id(room->getId());
-	result.set_game_id(getGameId());
+	result.set_game_id(gameId);
-	if (!players.isEmpty()) {
+	if (players.isEmpty())
+		result.set_closed(true);
+	else {
 		for (int i = 0; i < gameTypes.size(); ++i)
 			result.add_game_types(gameTypes[i]);
 		

common/server_player.cpp

@@ -240,9 +240,8 @@ void Server_Player::clearZones()
 	lastDrawList.clear();
 }
 
-ServerInfo_PlayerProperties Server_Player::getProperties(bool withUserInfo)
+void Server_Player::getProperties(ServerInfo_PlayerProperties &result, bool withUserInfo)
 {
-	ServerInfo_PlayerProperties result;
 	result.set_player_id(playerId);
 	if (withUserInfo)
 		result.mutable_user_info()->CopyFrom(*userInfo);
@@ -253,8 +252,6 @@ ServerInfo_PlayerProperties Server_Player::getProperties(bool withUserInfo)
 	if (deck)
 		result.set_deck_hash(deck->getDeckHash().toStdString());
 	result.set_ping_seconds(pingTime);
-	
-	return result;
 }
 
 void Server_Player::addZone(Server_CardZone *zone)
@@ -1674,7 +1671,7 @@ void Server_Player::disconnectClient()
 
 void Server_Player::getInfo(ServerInfo_Player *info, Server_Player *playerWhosAsking, bool omniscient, bool withUserInfo)
 {
-	info->mutable_properties()->CopyFrom(getProperties(withUserInfo));
+	getProperties(*info->mutable_properties(), withUserInfo);
 	if (playerWhosAsking == this)
 		if (deck)
 			info->set_deck_list(deck->writeToString_Native().toStdString());

common/server_player.h

@@ -105,7 +105,7 @@ public:
 	
 	int getPingTime() const { return pingTime; }
 	void setPingTime(int _pingTime) { pingTime = _pingTime; }
-	ServerInfo_PlayerProperties getProperties(bool withUserInfo);
+	void getProperties(ServerInfo_PlayerProperties &result, bool withUserInfo);
 	
 	int newCardId();
 	int newCounterId() const;

common/server_protocolhandler.cpp

@@ -422,7 +422,7 @@ Response::ResponseCode Server_ProtocolHandler::cmdGetGamesOfUser(const Command_G
 	while (roomIterator.hasNext()) {
 		Server_Room *room = roomIterator.next().value();
 		room->gamesMutex.lock();
-		re->add_room_list()->CopyFrom(room->getInfo(false, true));
+		room->getInfo(*re->add_room_list(), false, true);
 		QListIterator<ServerInfo_Game> gameIterator(room->getGamesOfUser(QString::fromStdString(cmd.user_name())));
 		while (gameIterator.hasNext())
 			re->add_game_list()->CopyFrom(gameIterator.next());
@@ -470,7 +470,7 @@ Response::ResponseCode Server_ProtocolHandler::cmdListRooms(const Command_ListRo
 	Event_ListRooms event;
 	QMapIterator<int, Server_Room *> roomIterator(server->getRooms());
 	while (roomIterator.hasNext())
-		event.add_room_list()->CopyFrom(roomIterator.next().value()->getInfo(false));
+		roomIterator.next().value()->getInfo(*event.add_room_list(), false);
 	rc.enqueuePreResponseItem(ServerMessage::SESSION_EVENT, prepareSessionEvent(event));
 	
 	acceptsRoomListChanges = true;
@@ -498,7 +498,7 @@ Response::ResponseCode Server_ProtocolHandler::cmdJoinRoom(const Command_JoinRoo
 	rc.enqueuePostResponseItem(ServerMessage::ROOM_EVENT, r->prepareRoomEvent(joinMessageEvent));
 	
 	Response_JoinRoom *re = new Response_JoinRoom;
-	re->mutable_room_info()->CopyFrom(r->getInfo(true));
+	r->getInfo(*re->mutable_room_info(), true);
 	
 	rc.setResponseExtension(re);
 	return Response::RespOk;

common/server_room.cpp

@@ -9,6 +9,7 @@
 #include "pb/event_leave_room.pb.h"
 #include "pb/event_list_games.pb.h"
 #include "pb/event_room_say.pb.h"
+#include "pb/serverinfo_room.pb.h"
 #include <google/protobuf/descriptor.h>
 
 Server_Room::Server_Room(int _id, const QString &_name, const QString &_description, bool _autoJoin, const QString &_joinMessage, const QStringList &_gameTypes, Server *parent)
@@ -38,9 +39,8 @@ Server *Server_Room::getServer() const
 	return static_cast<Server *>(parent());
 }
 
-ServerInfo_Room Server_Room::getInfo(bool complete, bool showGameTypes, bool updating, bool includeExternalData) const
+const ServerInfo_Room &Server_Room::getInfo(ServerInfo_Room &result, bool complete, bool showGameTypes, bool updating, bool includeExternalData) const
 {
-	ServerInfo_Room result;
 	result.set_room_id(id);
 	
 	if (!updating) {
@@ -104,7 +104,8 @@ void Server_Room::addClient(Server_ProtocolHandler *client)
 	userList.append(client);
 	usersLock.unlock();
 	
-	emit roomInfoChanged(getInfo(false, false, true));
+	ServerInfo_Room roomInfo;
+	emit roomInfoChanged(getInfo(roomInfo, false, false, true));
 }
 
 void Server_Room::removeClient(Server_ProtocolHandler *client)
@@ -117,7 +118,8 @@ void Server_Room::removeClient(Server_ProtocolHandler *client)
 	event.set_name(client->getUserInfo()->name());
 	sendRoomEvent(prepareRoomEvent(event));
 	
-	emit roomInfoChanged(getInfo(false, false, true));
+	ServerInfo_Room roomInfo;
+	emit roomInfoChanged(getInfo(roomInfo, false, false, true));
 }
 
 void Server_Room::addExternalUser(const ServerInfo_User &userInfo)
@@ -132,7 +134,8 @@ void Server_Room::addExternalUser(const ServerInfo_User &userInfo)
 	externalUsers.insert(QString::fromStdString(userInfo.name()), userInfoContainer);
 	usersLock.unlock();
 	
-	emit roomInfoChanged(getInfo(false, false, true));
+	ServerInfo_Room roomInfo;
+	emit roomInfoChanged(getInfo(roomInfo, false, false, true));
 }
 
 void Server_Room::removeExternalUser(const QString &name)
@@ -147,7 +150,8 @@ void Server_Room::removeExternalUser(const QString &name)
 	event.set_name(name.toStdString());
 	sendRoomEvent(prepareRoomEvent(event), false);
 	
-	emit roomInfoChanged(getInfo(false, false, true));
+	ServerInfo_Room roomInfo;
+	emit roomInfoChanged(getInfo(roomInfo, false, false, true));
 }
 
 void Server_Room::updateExternalGameList(const ServerInfo_Game &gameInfo)
@@ -161,7 +165,8 @@ void Server_Room::updateExternalGameList(const ServerInfo_Game &gameInfo)
 	gamesMutex.unlock();
 	
 	broadcastGameListUpdate(gameInfo, false);
-	emit roomInfoChanged(getInfo(false, false, true));
+	ServerInfo_Room roomInfo;
+	emit roomInfoChanged(getInfo(roomInfo, false, false, true));
 }
 
 Response::ResponseCode Server_Room::processJoinGameCommand(const Command_JoinGame &cmd, ResponseContainer &rc, Server_AbstractUserInterface *userInterface)
@@ -215,7 +220,7 @@ void Server_Room::sendRoomEvent(RoomEvent *event, bool sendToIsl)
 	delete event;
 }
 
-void Server_Room::broadcastGameListUpdate(ServerInfo_Game gameInfo, bool sendToIsl)
+void Server_Room::broadcastGameListUpdate(const ServerInfo_Game &gameInfo, bool sendToIsl)
 {
 	Event_ListGames event;
 	event.add_game_list()->CopyFrom(gameInfo);
@@ -236,7 +241,8 @@ void Server_Room::addGame(Server_Game *game)
 	game->gameMutex.unlock();
 	
 	emit gameListChanged(gameInfo);
-	emit roomInfoChanged(getInfo(false, false, true));
+	ServerInfo_Room roomInfo;
+	emit roomInfoChanged(getInfo(roomInfo, false, false, true));
 }
 
 void Server_Room::removeGame(Server_Game *game)
@@ -252,7 +258,8 @@ void Server_Room::removeGame(Server_Game *game)
 	
 	games.remove(game->getGameId());
 	
-	emit roomInfoChanged(getInfo(false, false, true));
+	ServerInfo_Room roomInfo;
+	emit roomInfoChanged(getInfo(roomInfo, false, false, true));
 }
 
 int Server_Room::getGamesCreatedByUser(const QString &userName) const

common/server_room.h

@@ -8,7 +8,6 @@
 #include <QMutex>
 #include <QReadWriteLock>
 #include "serverinfo_user_container.h"
-#include "pb/serverinfo_room.pb.h"
 #include "pb/response.pb.h"
 
 class Server_ProtocolHandler;
@@ -26,8 +25,8 @@ class Server_AbstractUserInterface;
 class Server_Room : public QObject {
 	Q_OBJECT
 signals:
-	void roomInfoChanged(ServerInfo_Room roomInfo);
+	void roomInfoChanged(const ServerInfo_Room &roomInfo);
-	void gameListChanged(ServerInfo_Game gameInfo);
+	void gameListChanged(const ServerInfo_Game &gameInfo);
 private:
 	int id;
 	QString name;
@@ -40,7 +39,7 @@ private:
 	QList<Server_ProtocolHandler *> userList;
 	QMap<QString, ServerInfo_User_Container> externalUsers;
 private slots:
-	void broadcastGameListUpdate(ServerInfo_Game gameInfo, bool sendToIsl = true);
+	void broadcastGameListUpdate(const ServerInfo_Game &gameInfo, bool sendToIsl = true);
 public:
 	mutable QReadWriteLock usersLock;
 	mutable QMutex gamesMutex;
@@ -55,7 +54,7 @@ public:
 	const QMap<int, Server_Game *> &getGames() const { return games; }
 	const QMap<int, ServerInfo_Game> &getExternalGames() const { return externalGames; }
 	Server *getServer() const;
-	ServerInfo_Room getInfo(bool complete, bool showGameTypes = false, bool updating = false, bool includeExternalData = true) const;
+	const ServerInfo_Room &getInfo(ServerInfo_Room &result, bool complete, bool showGameTypes = false, bool updating = false, bool includeExternalData = true) const;
 	int getGamesCreatedByUser(const QString &name) const;
 	QList<ServerInfo_Game> getGamesOfUser(const QString &name) const;
 	

common/user_level.h

@@ -0,0 +1,10 @@
+#ifndef USER_LEVEL_H
+#define USER_LEVEL_H
+
+#include "pb/serverinfo_user.pb.h"
+#include <QFlags>
+
+Q_DECLARE_FLAGS(UserLevelFlags, ServerInfo_User::UserLevelFlag)
+Q_DECLARE_OPERATORS_FOR_FLAGS(UserLevelFlags)
+
+#endif

oracle/src/oracleimporter.cpp

@@ -75,6 +75,7 @@ bool OracleImporter::readSetsFromXml(QXmlStreamReader &xml)
 
 CardInfo *OracleImporter::addCard(const QString &setName,
 								  QString cardName,
+								  bool isToken,
 								  int cardId,
 								  const QString &cardCost,
 								  const QString &cardType,
@@ -125,7 +126,7 @@ CardInfo *OracleImporter::addCard(const QString &setName,
 		
 		bool cipt = (cardText.contains(cardName + " enters the battlefield tapped."));
 		
-		card = new CardInfo(this, cardName, cardCost, cardType, cardPT, fullCardText, colors, cardLoyalty, cipt);
+		card = new CardInfo(this, cardName, isToken, cardCost, cardType, cardPT, fullCardText, colors, cardLoyalty, cipt);
 		int tableRow = 1;
 		QString mainCardType = card->getMainCardType();
 		if ((mainCardType == "Land") || mArtifact)
@@ -183,7 +184,7 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QByteArray &data)
 					for (int i = 0; i < cardTextSplit.size(); ++i)
 						cardTextSplit[i] = cardTextSplit[i].trimmed();
 					
-					CardInfo *card = addCard(set->getShortName(), cardName, cardId, cardCost, cardType, cardPT, cardLoyalty, cardTextSplit);
+					CardInfo *card = addCard(set->getShortName(), cardName, false, cardId, cardCost, cardType, cardPT, cardLoyalty, cardTextSplit);
 					if (!set->contains(card)) {
 						card->addToSet(set);
 						cards++;

oracle/src/oracleimporter.h

@@ -35,7 +35,7 @@ private:
 	
 	void downloadNextFile();
 	bool readSetsFromXml(QXmlStreamReader &xml);
-	CardInfo *addCard(const QString &setName, QString cardName, int cardId, const QString &cardCost, const QString &cardType, const QString &cardPT, int cardLoyalty, const QStringList &cardText);
+	CardInfo *addCard(const QString &setName, QString cardName, bool isToken, int cardId, const QString &cardCost, const QString &cardType, const QString &cardPT, int cardLoyalty, const QStringList &cardText);
 private slots:
 	void httpRequestFinished(int requestId, bool error);
 	void readResponseHeader(const QHttpResponseHeader &responseHeader);

servatrice/src/isl_interface.cpp

@@ -129,7 +129,7 @@ void IslInterface::initServer()
 		Server_Room *room = roomIterator.next().value();
 		room->usersLock.lockForRead();
 		room->gamesMutex.lock();
-		event.add_room_list()->CopyFrom(room->getInfo(true, true, false, false));
+		room->getInfo(*event.add_room_list(), true, true, false, false);
 	}
 	
 	IslMessage message;

servatrice/src/servatrice.cpp

@@ -80,11 +80,11 @@ Servatrice::Servatrice(QSettings *_settings, QObject *parent)
 	else
 		databaseType = DatabaseNone;
 	dbPrefix = settings->value("database/prefix").toString();
-	if (databaseType != DatabaseNone)
+	if (databaseType != DatabaseNone) {
 		openDatabase();
-	
+		updateServerList();
-	updateServerList();
+		clearSessionTables();
-	clearSessionTables();
+	}
 	
 	const QString roomMethod = settings->value("rooms/method").toString();
 	if (roomMethod == "sql") {