Added irc support for lobby dialog. Takes some time to connect before messages can be sent/received. No special stuff yet, no user list, no connection notifications. Still work in progress.

src/gui/generic/serverguiwrapper.cpp

@@ -24,8 +24,8 @@
 using namespace std;
 
 
-ServerGuiWrapper::ServerGuiWrapper(ConfigFile *config, ClientCallback *clientcb, ServerCallback *servercb)
-: myConfig(config), myClientcb(clientcb), myServercb(servercb)
+ServerGuiWrapper::ServerGuiWrapper(ConfigFile *config, ClientCallback *clientcb, ServerCallback *servercb, IrcCallback *irccb)
+: myConfig(config), myClientcb(clientcb), myServercb(servercb), myIrccb(irccb)
 {
 }
 
@@ -125,3 +125,4 @@ void ServerGuiWrapper::SignalNetClientWaitDialog() { if (myClientcb) myClientcb-
 void ServerGuiWrapper::SignalNetServerSuccess(int actionID) { if (myServercb) myServercb->SignalNetServerSuccess(actionID); }
 void ServerGuiWrapper::SignalNetServerError(int errorID, int osErrorID) { if (myServercb) myServercb->SignalNetServerError(errorID, osErrorID); }
 
+void ServerGuiWrapper::SignalIrcChatMsg(const string &nickName, const string &msg) { if (myIrccb) myIrccb->SignalIrcChatMsg(nickName, msg); }

src/gui/generic/serverguiwrapper.h

@@ -27,7 +27,7 @@ class Session;
 class ServerGuiWrapper : public GuiInterface
 {
 public:
-	ServerGuiWrapper(ConfigFile *config, ClientCallback *clientcb, ServerCallback *servercb);
+	ServerGuiWrapper(ConfigFile *config, ClientCallback *clientcb, ServerCallback *servercb, IrcCallback *irccb);
 	~ServerGuiWrapper();
 
 	void initGui(int speed);
@@ -110,6 +110,8 @@ public:
 	void SignalNetServerSuccess(int actionID);
 	void SignalNetServerError(int errorID, int osErrorID);
 
+	void SignalIrcChatMsg(const std::string &nickName, const std::string &msg);
+
 private:
 
 	boost::shared_ptr<Session> mySession;
@@ -117,6 +119,7 @@ private:
 
 	ClientCallback *myClientcb;
 	ServerCallback *myServercb;
+	IrcCallback *myIrccb;
 };
 
 #endif

src/gui/guiinterface.h

@@ -22,6 +22,7 @@
 
 #include <net/clientcallback.h>
 #include <net/servercallback.h>
+#include <net/irccallback.h>
 #include <game_defs.h>
 #include <string>
 #include <boost/shared_ptr.hpp>
@@ -30,7 +31,7 @@
 class Session;
 
 
-class GuiInterface : public ClientCallback, public ServerCallback {
+class GuiInterface : public ClientCallback, public ServerCallback, public IrcCallback {
 public:
 	virtual ~GuiInterface();
 

src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp

@@ -38,7 +38,11 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(QWidget *parent, ConfigFile *c)
 
 void gameLobbyDialogImpl::exec()
 {
+	assert(mySession);
+	mySession->terminateIrcClient();
+	mySession->startIrcClient();
 	QDialog::exec();
+	mySession->terminateIrcClient();
 	clearDialog();
 }
 
@@ -384,9 +388,10 @@ void gameLobbyDialogImpl::kickPlayer() {
 }
 
 void gameLobbyDialogImpl::sendChatMessage() { myChat->sendMessage(); }
+void gameLobbyDialogImpl::displayChatMessage(QString nickName, QString msg) { myChat->receiveMessage(nickName, msg); }
 void gameLobbyDialogImpl::checkChatInputLength(QString string) { myChat->checkInputLength(string); }
 
 void gameLobbyDialogImpl::keyPressEvent ( QKeyEvent * event ) {
 
-	if (event->key() == Qt::Key_Enter) {}
-}
+	if (event->key() == Qt::Key_Enter) { sendChatMessage(); }
+}

src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h

@@ -79,6 +79,7 @@ public slots:
 	void clearDialog();
 
 	void sendChatMessage();
+	void displayChatMessage(QString nickName, QString msg);
 	void checkChatInputLength(QString string);
 	
 	void keyPressEvent(QKeyEvent * event); 

src/gui/qt/gamelobbydialog/lobbychat/lobbychat.cpp

@@ -38,8 +38,12 @@ LobbyChat::~LobbyChat()
 
 void LobbyChat::sendMessage() {
 
-	myLobby->getSession().sendChatMessage(myLobby->lineEdit_ChatInput->text().toUtf8().constData());
+	QString tmpMsg(myLobby->lineEdit_ChatInput->text());
+	myLobby->getSession().sendIrcChatMessage(tmpMsg.toUtf8().constData());
 	myLobby->lineEdit_ChatInput->setText("");
+
+	// TODO: just temporary instead of callback
+	receiveMessage("(me)", tmpMsg);
 }
 
 void LobbyChat::receiveMessage(QString playerName, QString message) { 

src/gui/qt/guiwrapper.cpp

@@ -139,3 +139,5 @@ void GuiWrapper::SignalNetClientWaitDialog() { myW->signalShowNetworkStartDialog
 void GuiWrapper::SignalNetServerSuccess(int actionID) { }
 void GuiWrapper::SignalNetServerError(int errorID, int osErrorID) { myW->signalNetServerError(errorID, osErrorID); }
 
+void GuiWrapper::SignalIrcChatMsg(const std::string &nickName, const std::string &msg) { myW->signalIrcChatMessage(QString::fromUtf8(nickName.c_str()), QString::fromUtf8(msg.c_str())); }
+

src/gui/qt/guiwrapper.h

@@ -118,6 +118,8 @@ public:
 	void SignalNetServerSuccess(int actionID);
 	void SignalNetServerError(int errorID, int osErrorID);
 
+	void SignalIrcChatMsg(const std::string &nickName, const std::string &msg);
+
 private:
 
 	Log *myLog;

src/gui/qt/mainwindow/mainwindowimpl.cpp

@@ -676,6 +676,8 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
 	connect(this, SIGNAL(signalNetServerError(int, int)), this, SLOT(networkError(int, int)));
 	connect(this, SIGNAL(signalNetClientGameStart(boost::shared_ptr<Game>)), this, SLOT(networkStart(boost::shared_ptr<Game>)));
 
+	connect(this, SIGNAL(signalIrcChatMessage(QString, QString)), myGameLobbyDialog, SLOT(displayChatMessage(QString, QString)));
+
 	//Sound
 	mySDLPlayer = new SDLPlayer(myConfig);
 
@@ -758,7 +760,7 @@ void mainWindowImpl::callCreateNetworkGameDialog() {
 		if (!myServerGuiInterface.get())
 		{
 			// Create pseudo Gui Wrapper for the server.
-			myServerGuiInterface.reset(new ServerGuiWrapper(myConfig, mySession->getGui(), mySession->getGui()));
+			myServerGuiInterface.reset(new ServerGuiWrapper(myConfig, mySession->getGui(), mySession->getGui(), mySession->getGui()));
 			{
 				boost::shared_ptr<Session> session(new Session(myServerGuiInterface.get(), myConfig));
 				myServerGuiInterface->setSession(session);

src/gui/qt/mainwindow/mainwindowimpl.h

@@ -138,6 +138,8 @@ signals:
 	void signalNetClientGameListPlayerLeft(unsigned gameId, unsigned playerId);
 	void signalNetClientGameStart(boost::shared_ptr<Game> game);
 
+	void signalIrcChatMessage(QString nickName, QString msg);
+
 public slots:
 
 	void initGui(int speed);