strip newlines from msg in cmdRoomSay; improved i18n in MessageLogWidget

cockatrice/src/messagelogwidget.h

@@ -31,6 +31,7 @@ private:
 	bool isFemale(Player *player) const;
 	QPair<QString, QString> getFromStr(CardZone *zone, QString cardName, int position) const;
 	MessageContext currentContext;
+	bool female;
 	
 	QList<LogMoveCard> moveCardQueue;
 	QMap<CardItem *, QString> moveCardPT;
@@ -39,13 +40,6 @@ private:
 	Player *mulliganPlayer;
 	int mulliganNumber;
 public slots:
-	void logConnecting(QString hostname);
-	void logConnected();
-	void logDisconnected();
-	void logSocketError(const QString &errorString);
-	void logServerError(ResponseCode response);
-	void logProtocolVersionMismatch(int clientVersion, int serverVersion);
-	void logProtocolError();
 	void logGameJoined(int gameId);
 	void logJoin(Player *player);
 	void logLeave(Player *player);
@@ -88,7 +82,7 @@ public slots:
 	void containerProcessingDone();
 public:
 	void connectToPlayer(Player *player);
-	MessageLogWidget(const QString &_ownName, QWidget *parent = 0);
+	MessageLogWidget(const QString &_ownName, bool _female, QWidget *parent = 0);
 };
 
 #endif

cockatrice/src/tab_game.cpp

@@ -158,7 +158,7 @@ void DeckViewContainer::setDeck(DeckList *deck)
 	readyStartButton->setEnabled(true);
 }
 
-TabGame::TabGame(TabSupervisor *_tabSupervisor, QList<AbstractClient *> &_clients, int _gameId, const QString &_gameDescription, int _localPlayerId, const QString &_userName, bool _spectator, bool _spectatorsCanTalk, bool _spectatorsSeeEverything, bool _resuming)
+TabGame::TabGame(TabSupervisor *_tabSupervisor, QList<AbstractClient *> &_clients, int _gameId, const QString &_gameDescription, int _localPlayerId, ServerInfo_User *_userInfo, bool _spectator, bool _spectatorsCanTalk, bool _spectatorsSeeEverything, bool _resuming)
 	: Tab(_tabSupervisor), clients(_clients), gameId(_gameId), gameDescription(_gameDescription), localPlayerId(_localPlayerId), spectator(_spectator), spectatorsCanTalk(_spectatorsCanTalk), spectatorsSeeEverything(_spectatorsSeeEverything), started(false), resuming(_resuming), currentPhase(-1)
 {
 	phasesToolbar = new PhasesToolbar;
@@ -176,7 +176,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, QList<AbstractClient *> &_client
 	
 	timeElapsedLabel = new QLabel;
 	timeElapsedLabel->setAlignment(Qt::AlignCenter);
-	messageLog = new MessageLogWidget(_userName);
+	messageLog = new MessageLogWidget(_userInfo->getName(), _userInfo->getGender() == ServerInfo_User::Female);
 	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)));

cockatrice/src/tab_game.h

@@ -155,7 +155,7 @@ private slots:
 	void actNextPhase();
 	void actNextTurn();
 public:
-	TabGame(TabSupervisor *_tabSupervisor, QList<AbstractClient *> &_clients, int _gameId, const QString &_gameDescription, int _localPlayerId, const QString &_userName, bool _spectator, bool _spectatorsCanTalk, bool _spectatorsSeeEverything, bool _resuming);
+	TabGame(TabSupervisor *_tabSupervisor, QList<AbstractClient *> &_clients, int _gameId, const QString &_gameDescription, int _localPlayerId, ServerInfo_User *_userInfo, bool _spectator, bool _spectatorsCanTalk, bool _spectatorsSeeEverything, bool _resuming);
 	~TabGame();
 	void retranslateUi();
 	void closeRequest();

cockatrice/src/tab_supervisor.cpp

@@ -105,11 +105,10 @@ int TabSupervisor::myAddTab(Tab *tab)
 	return addTab(tab, tab->getTabText());
 }
 
-void TabSupervisor::start(AbstractClient *_client, ServerInfo_User *userInfo)
+void TabSupervisor::start(AbstractClient *_client, ServerInfo_User *_userInfo)
 {
 	client = _client;
-	userName = userInfo->getName();
-	userLevel = userInfo->getUserLevel();
+	userInfo = new ServerInfo_User(_userInfo);
 	
 	connect(client, SIGNAL(roomEventReceived(RoomEvent *)), this, SLOT(processRoomEvent(RoomEvent *)));
 	connect(client, SIGNAL(gameEventContainerReceived(GameEventContainer *)), this, SLOT(processGameEventContainer(GameEventContainer *)));
@@ -146,6 +145,7 @@ void TabSupervisor::start(AbstractClient *_client, ServerInfo_User *userInfo)
 
 void TabSupervisor::startLocal(const QList<AbstractClient *> &_clients)
 {
+	userInfo = new ServerInfo_User;
 	localClients = _clients;
 	for (int i = 0; i < localClients.size(); ++i)
 		connect(localClients[i], SIGNAL(gameEventContainerReceived(GameEventContainer *)), this, SLOT(processGameEventContainer(GameEventContainer *)));
@@ -192,6 +192,9 @@ void TabSupervisor::stop()
 	while (messageIterator.hasNext())
 		messageIterator.next().value()->deleteLater();
 	messageTabs.clear();
+	
+	delete userInfo;
+	userInfo = 0;
 }
 
 void TabSupervisor::updatePingTime(int value, int max)
@@ -221,7 +224,7 @@ void TabSupervisor::addCloseButtonToTab(Tab *tab, int tabIndex)
 
 void TabSupervisor::gameJoined(Event_GameJoined *event)
 {
-	TabGame *tab = new TabGame(this, QList<AbstractClient *>() << client, event->getGameId(), event->getGameDescription(), event->getPlayerId(), userName, event->getSpectator(), event->getSpectatorsCanTalk(), event->getSpectatorsSeeEverything(), event->getResuming());
+	TabGame *tab = new TabGame(this, QList<AbstractClient *>() << client, event->getGameId(), event->getGameDescription(), event->getPlayerId(), userInfo, event->getSpectator(), event->getSpectatorsCanTalk(), event->getSpectatorsSeeEverything(), event->getResuming());
 	connect(tab, SIGNAL(gameClosing(TabGame *)), this, SLOT(gameLeft(TabGame *)));
 	connect(tab, SIGNAL(openMessageDialog(const QString &, bool)), this, SLOT(addMessageTab(const QString &, bool)));
 	int tabIndex = myAddTab(tab);
@@ -232,7 +235,7 @@ void TabSupervisor::gameJoined(Event_GameJoined *event)
 
 void TabSupervisor::localGameJoined(Event_GameJoined *event)
 {
-	TabGame *tab = new TabGame(this, localClients, event->getGameId(), event->getGameDescription(), event->getPlayerId(), QString(), event->getSpectator(), event->getSpectatorsCanTalk(), event->getSpectatorsSeeEverything(), event->getResuming());
+	TabGame *tab = new TabGame(this, localClients, event->getGameId(), event->getGameDescription(), event->getPlayerId(), userInfo, event->getSpectator(), event->getSpectatorsCanTalk(), event->getSpectatorsSeeEverything(), event->getResuming());
 	connect(tab, SIGNAL(gameClosing(TabGame *)), this, SLOT(gameLeft(TabGame *)));
 	int tabIndex = myAddTab(tab);
 	addCloseButtonToTab(tab, tabIndex);
@@ -258,7 +261,7 @@ void TabSupervisor::gameLeft(TabGame *tab)
 
 void TabSupervisor::addRoomTab(ServerInfo_Room *info, bool setCurrent)
 {
-	TabRoom *tab = new TabRoom(this, client, userName, info);
+	TabRoom *tab = new TabRoom(this, client, userInfo->getName(), info);
 	connect(tab, SIGNAL(roomClosing(TabRoom *)), this, SLOT(roomLeft(TabRoom *)));
 	connect(tab, SIGNAL(openMessageDialog(const QString &, bool)), this, SLOT(addMessageTab(const QString &, bool)));
 	int tabIndex = myAddTab(tab);
@@ -278,10 +281,10 @@ void TabSupervisor::roomLeft(TabRoom *tab)
 
 TabMessage *TabSupervisor::addMessageTab(const QString &receiverName, bool focus)
 {
-	if (receiverName == userName)
+	if (receiverName == userInfo->getName())
 		return 0;
 	
-	TabMessage *tab = new TabMessage(this, client, userName, receiverName);
+	TabMessage *tab = new TabMessage(this, client, userInfo->getName(), receiverName);
 	connect(tab, SIGNAL(talkClosing(TabMessage *)), this, SLOT(talkLeft(TabMessage *)));
 	int tabIndex = myAddTab(tab);
 	addCloseButtonToTab(tab, tabIndex);
@@ -372,3 +375,8 @@ bool TabSupervisor::getAdminLocked() const
 		return true;
 	return tabAdmin->getLocked();
 }
+
+int TabSupervisor::getUserLevel() const
+{
+	return userInfo->getUserLevel();
+}

cockatrice/src/tab_supervisor.h

@@ -37,8 +37,7 @@ protected:
 class TabSupervisor : public QTabWidget {
 	Q_OBJECT
 private:
-	QString userName;
-	int userLevel;
+	ServerInfo_User *userInfo;
 	QIcon *tabChangedIcon;
 	AbstractClient *client;
 	QList<AbstractClient *> localClients;
@@ -61,7 +60,7 @@ public:
 	int getGameCount() const { return gameTabs.size(); }
 	TabUserLists *getUserListsTab() const { return tabUserLists; }
 	bool getAdminLocked() const;
-	int getUserLevel() const { return userLevel; }
+	int getUserLevel() const;
 signals:
 	void setMenu(QMenu *menu);
 	void localGameEnded();

common/server_protocolhandler.cpp

@@ -468,8 +468,9 @@ ResponseCode Server_ProtocolHandler::cmdRoomSay(Command_RoomSay *cmd, CommandCon
 		if ((totalSize > server->getMaxMessageSizePerInterval()) || (totalCount > server->getMaxMessageCountPerInterval()))
 			return RespChatFlood;
 	}
+	msg.replace(QChar('\n'), QChar(' '));
 	
-	room->say(this, cmd->getMessage());
+	room->say(this, msg);
 	return RespOk;
 }