Don't exit Quassel when closing the serverlist. That was just for debugging purposes.

[quassel.git] / gui / channelwidget.cpp

diff --git a/gui/channelwidget.cpp b/gui/channelwidget.cpp
index bde11c7..70066dc 100644 (file)
--- a/gui/channelwidget.cpp
+++ b/gui/channelwidget.cpp
@@ -19,13 +19,14 @@
  ***************************************************************************/
 
 #include "channelwidget.h"
+#include "guiproxy.h"
 
 #include <QtGui>
 #include <iostream>
 
 ChannelWidget::ChannelWidget(QWidget *parent) : QWidget(parent) {
   ui.setupUi(this);
-  //ui.lineEdit->setText("foobar");
+  //ui.inputEdit->grabKeyboard();
 
 /*  //ui.splitter->
   ui.textBrowser->setHtml("[17:21] <em>--> Dante has joined #quassel (~hurz@p1af2242.dip.t-dialin.net)</em><br>"
@@ -40,16 +41,26 @@ ChannelWidget::ChannelWidget(QWidget *parent) : QWidget(parent) {
   */
   //connect(&core, SIGNAL(outputLine( const QString& )), ui.textBrowser, SLOT(insertPlainText(const QString &)));
   //connect(ui.lineEdit, SIGNAL(
-  connect(&core, SIGNAL(outputLine( const QString& )), ui.textBrowser, SLOT(insertPlainText(const QString &)));
-  connect(ui.lineEdit, SIGNAL(returnPressed()), this, SLOT(enterPressed()));
-  connect(this, SIGNAL(inputLine( const QString& )), &core, SLOT(inputLine( const QString& )));
-  core.start();
-  core.connectToIrc("irc.quakenet.org");
+  //connect(&core, SIGNAL(outputLine( const QString& )), this, SLOT(lineReceived(const QString &)));
+  connect(ui.inputEdit, SIGNAL(returnPressed()), this, SLOT(enterPressed()));
+  //connect(this, SIGNAL(inputLine( const QString& )), &core, SLOT(inputLine( const QString& )));
+
+  connect(this, SIGNAL(inputLine(QString)), guiProxy, SLOT(gsUserInput(QString)));
+  connect(guiProxy, SIGNAL(csSendMessage(QString, QString, QString)), this, SLOT(msgReceived(QString, QString, QString)));
+  connect(guiProxy, SIGNAL(csSendStatusMsg(QString, QString)), this, SLOT(statusMsgReceived(QString, QString)));
+  ui.inputEdit->setFocus();
 }
 
 void ChannelWidget::enterPressed() {
-  emit inputLine(ui.lineEdit->text());
-  ui.lineEdit->clear();
+  emit inputLine(ui.inputEdit->text());
+  ui.inputEdit->clear();
+}
+
+void ChannelWidget::msgReceived(QString net, QString chan, QString msg) {
+  ui.chatWidget->insertPlainText(QString("[%1:%2] %3\n").arg(net).arg(chan).arg(msg));
+  ui.chatWidget->ensureCursorVisible();
 }
 
-  
\ No newline at end of file
+void ChannelWidget::statusMsgReceived(QString net, QString msg) {
+  msgReceived(net, "STATUS", msg);
+}