X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=gui%2Fchannelwidget.cpp;h=70066dc87a9bf7590012e0c9d2c785905e0ba287;hb=855fa19ba139d5dbdbf26bb660251ff8fe620e12;hp=9cc05763426bdd75e4ec611474721be185f92045;hpb=a7afccdbf779b959a4ce3fe88ec42590e3df6cfe;p=quassel.git

diff --git a/gui/channelwidget.cpp b/gui/channelwidget.cpp
index 9cc05763..70066dc8 100644
--- a/gui/channelwidget.cpp
+++ b/gui/channelwidget.cpp
@@ -26,7 +26,7 @@
 
 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>"
@@ -46,11 +46,9 @@ ChannelWidget::ChannelWidget(QWidget *parent) : QWidget(parent) {
   //connect(this, SIGNAL(inputLine( const QString& )), &core, SLOT(inputLine( const QString& )));
 
   connect(this, SIGNAL(inputLine(QString)), guiProxy, SLOT(gsUserInput(QString)));
-  connect(this, SIGNAL(requestConnect(QString, quint16)), guiProxy, SLOT(gsRequestConnect(QString, quint16)));
-  connect(guiProxy, SIGNAL(csCoreMessage(QString)), this, SLOT(lineReceived(QString)));
-
-  //emit requestConnect("irc.scortum.moep.net", 6668);
-  emit requestConnect("irc.quakenet.org", 6668);
+  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() {
@@ -58,7 +56,11 @@ void ChannelWidget::enterPressed() {
   ui.inputEdit->clear();
 }
 
-void ChannelWidget::lineReceived(QString s) {
-  ui.chatWidget->insertPlainText(s + "\n");
+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();
 }
+
+void ChannelWidget::statusMsgReceived(QString net, QString msg) {
+  msgReceived(net, "STATUS", msg);
+}