From f3a5579b61ffc538620a2457b492a5a2c9e6df12 Mon Sep 17 00:00:00 2001 From: doitux Date: Sat, 13 Oct 2007 13:06:12 +0000 Subject: [PATCH] finished chat-implementing in startnetworkgamedialog --- src/gui/qt/chattools/chattools.cpp | 8 ++++++-- src/gui/qt/chattools/chattools.h | 10 +++++++--- src/gui/qt/mainwindow/mainwindowimpl.cpp | 1 + .../startnetworkgamedialogimpl.cpp | 1 + 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/gui/qt/chattools/chattools.cpp b/src/gui/qt/chattools/chattools.cpp index afc680e6..be3d5e3a 100644 --- a/src/gui/qt/chattools/chattools.cpp +++ b/src/gui/qt/chattools/chattools.cpp @@ -18,6 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include "chattools.h" +#include "session.h" #include using namespace std; @@ -36,8 +37,11 @@ ChatTools::~ChatTools() void ChatTools::sendMessage() { fillChatLinesHistory(myLineEdit->text()); -// myW->getSession().sendChatMessage(myW->lineEdit_ChatInput->text().toUtf8().constData()); - myLineEdit->setText(""); + if(mySession) { + mySession->sendChatMessage(myLineEdit->text().toUtf8().constData()); + myLineEdit->setText(""); + } + else { cout << "Session is not valid" << endl;} } void ChatTools::receiveMessage(QString playerName, QString message) { diff --git a/src/gui/qt/chattools/chattools.h b/src/gui/qt/chattools/chattools.h index ce93f615..c2edf8d0 100644 --- a/src/gui/qt/chattools/chattools.h +++ b/src/gui/qt/chattools/chattools.h @@ -24,6 +24,8 @@ #include #include +class Session; + class ChatTools : public QObject { Q_OBJECT @@ -33,6 +35,8 @@ public: ~ChatTools(); + void setSession(Session *session) { mySession = session; } + public slots: void sendMessage(); @@ -55,11 +59,11 @@ private: QStringList lastMatchStringList; int nickAutoCompletitionCounter; - QLineEdit* myLineEdit; + QLineEdit *myLineEdit; QTreeWidget *myNickTreeWidget; QStringList myNickStringList; - QTextBrowser* myTextBrowser; - + QTextBrowser *myTextBrowser; + Session *mySession; // friend class GuiWrapper; }; diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index b8f8892d..82836800 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -688,6 +688,7 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) //Chat Messages connect(this, SIGNAL(signalNetClientChatMsg(QString, QString)), myChat, SLOT(receiveMessage(QString, QString))); + connect(this, SIGNAL(signalNetClientChatMsg(QString, QString)), myStartNetworkGameDialog, SLOT(receiveChatMsg(QString, QString))); connect(this, SIGNAL(signalIrcConnect(QString)), myGameLobbyDialog->getLobbyChat(), SLOT(connected(QString))); connect(this, SIGNAL(signalIrcSelfJoined(QString, QString)), myGameLobbyDialog->getLobbyChat(), SLOT(selfJoined(QString, QString))); diff --git a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp index dd1b630b..87b90a72 100644 --- a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp +++ b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp @@ -190,6 +190,7 @@ void startNetworkGameDialogImpl::clearDialog() void startNetworkGameDialogImpl::setSession(Session *session) { mySession = session; + myChat->setSession(mySession); } void startNetworkGameDialogImpl::keyPressEvent ( QKeyEvent * event ) {