Chat messages are now working.

src/gui/generic/serverguiwrapper.cpp

@@ -94,14 +94,13 @@ void ServerGuiWrapper::meInAction() {}
 void ServerGuiWrapper::logPlayerActionMsg(string playerName, int action, int setValue) {}
 void ServerGuiWrapper::logNewGameHandMsg(int gameID, int handID) {}
 
-void ServerGuiWrapper::chatAppendMsg(std::string msg) {}
-
 void ServerGuiWrapper::SignalNetClientConnect(int actionID) { if (myClientcb) myClientcb->SignalNetClientConnect(actionID); }
 void ServerGuiWrapper::SignalNetClientGameInfo(int actionID) { if (myClientcb) myClientcb->SignalNetClientGameInfo(actionID); }
 void ServerGuiWrapper::SignalNetClientError(int errorID, int osErrorID) { if (myClientcb) myClientcb->SignalNetClientError(errorID, osErrorID); }
 void ServerGuiWrapper::SignalNetClientPlayerJoined(const string &playerName) { if (myClientcb) myClientcb->SignalNetClientPlayerJoined(playerName); }
 void ServerGuiWrapper::SignalNetClientPlayerLeft(const string &playerName) { if (myClientcb) myClientcb->SignalNetClientPlayerLeft(playerName); }
 void ServerGuiWrapper::SignalNetClientGameStart(boost::shared_ptr<Game> game) { if (myClientcb) myClientcb->SignalNetClientGameStart(game); }
+void ServerGuiWrapper::SignalNetClientChatMsg(const string &playerName, const string &msg) { if (myClientcb) myClientcb->SignalNetClientChatMsg(playerName, msg); }
 
 void ServerGuiWrapper::SignalNetServerSuccess(int actionID) { if (myServercb) myServercb->SignalNetServerSuccess(actionID); }
 void ServerGuiWrapper::SignalNetServerError(int errorID, int osErrorID) { if (myServercb) myServercb->SignalNetServerError(errorID, osErrorID); }

src/gui/generic/serverguiwrapper.h

@@ -77,13 +77,12 @@ public:
 	void logPlayerActionMsg(std::string playerName, int action, int setValue) ;
 	void logNewGameHandMsg(int gameID, int handID) ;
 
-	void chatAppendMsg(std::string msg);
-
 	void SignalNetClientConnect(int actionID);
 	void SignalNetClientGameInfo(int actionID);
 	void SignalNetClientError(int errorID, int osErrorID);
 	void SignalNetClientPlayerJoined(const std::string &playerName);
 	void SignalNetClientPlayerLeft(const std::string &playerName);
+	void SignalNetClientChatMsg(const std::string &playerName, const std::string &msg);
 
 	void SignalNetClientGameStart(boost::shared_ptr<Game> game);
 

src/gui/guiinterface.h

@@ -92,10 +92,6 @@ public:
 	//log.cpp
 	virtual void logPlayerActionMsg(std::string playName, int action, int setValue) =0;
 	virtual void logNewGameHandMsg(int gameID, int HandID) =0;
-
-	//chat
-	virtual void chatAppendMsg(std::string msg) =0;
-
 };
 
 #endif

src/gui/qt/guiwrapper.cpp

@@ -92,14 +92,13 @@ void GuiWrapper::meInAction() { myW->signalMeInAction(); }
 void GuiWrapper::logPlayerActionMsg(string playerName, int action, int setValue) { myLog->signalLogPlayerActionMsg(QString::fromUtf8(playerName.c_str()), action, setValue); }
 void GuiWrapper::logNewGameHandMsg(int gameID, int handID) { myLog->signalLogNewGameHandMsg(gameID, handID); }
 
-void GuiWrapper::chatAppendMsg(string msg) { myChat->receiveMessage(msg); }
-
 void GuiWrapper::SignalNetClientConnect(int actionID) { myW->signalNetClientConnect(actionID); }
 void GuiWrapper::SignalNetClientGameInfo(int actionID) { myW->signalNetClientGameInfo(actionID); }
 void GuiWrapper::SignalNetClientError(int errorID, int osErrorID) { myW->signalNetClientError(errorID, osErrorID); }
 void GuiWrapper::SignalNetClientPlayerJoined(const string &playerName) { myW->signalNetClientPlayerJoined(QString::fromUtf8(playerName.c_str())); }
 void GuiWrapper::SignalNetClientPlayerLeft(const string &playerName) { myW->signalNetClientPlayerLeft(QString::fromUtf8(playerName.c_str())); }
 void GuiWrapper::SignalNetClientGameStart(boost::shared_ptr<Game> game) { myW->signalNetClientGameStart(game); }
+void GuiWrapper::SignalNetClientChatMsg(const string &playerName, const string &msg) { myChat->signalChatMessage(QString::fromUtf8(playerName.c_str()), QString::fromUtf8(msg.c_str())); }
 
 void GuiWrapper::SignalNetServerSuccess(int actionID) { }
 void GuiWrapper::SignalNetServerError(int errorID, int osErrorID) { }

src/gui/qt/guiwrapper.h

@@ -85,13 +85,12 @@ public:
 	void logPlayerActionMsg(std::string playerName, int action, int setValue) ;
 	void logNewGameHandMsg(int gameID, int handID) ;
 
-	void chatAppendMsg(std::string msg);
-
 	void SignalNetClientConnect(int actionID);
 	void SignalNetClientGameInfo(int actionID);
 	void SignalNetClientError(int errorID, int osErrorID);
 	void SignalNetClientPlayerJoined(const std::string &playerName);
 	void SignalNetClientPlayerLeft(const std::string &playerName);
+	void SignalNetClientChatMsg(const std::string &playerName, const std::string &msg);
 
 	void SignalNetClientGameStart(boost::shared_ptr<Game> game);
 

src/gui/qt/mainwindow/chat/chat.cpp

@@ -27,7 +27,8 @@ using namespace std;
 Chat::Chat(mainWindowImpl* w, ConfigFile *c) : myW(w), myConfig(c)
 {
 	myW->setChat(this);
-	
+
+	connect(this, SIGNAL(signalChatMessage(QString, QString)), this, SLOT(receiveMessage(QString, QString)));
 }
 
 Chat::~Chat()
@@ -42,9 +43,9 @@ void Chat::sendMessage() {
 	myW->lineEdit_ChatInput->setText("");
 }
 
-void Chat::receiveMessage(std::string message) { 
+void Chat::receiveMessage(QString playerName, QString message) { 
 
-	myW->textBrowser_Chat->append(QString::fromUtf8(message.c_str())); 
+	myW->textBrowser_Chat->append(playerName + ": " + message); 
 	checkInvisible();
 }
 

src/gui/qt/mainwindow/chat/chat.h

@@ -39,10 +39,13 @@ public:
 
 	~Chat();
 
+signals:
+	void signalChatMessage(QString playerName, QString msg);
+
 public slots:
 	
 	void sendMessage();
-	void receiveMessage(std::string);
+	void receiveMessage(QString playerName, QString msg);
 	void checkInvisible();
 		
 private: