X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=gui%2Fchannelwidget.cpp;h=7ff453728c1445ae0f3a5b264f617d45d6072a7a;hb=8b92ff902cfab128ad3fd1232c42fde629ae30a3;hp=d9851cd25869836b2679874b2474c0472a2fc9cb;hpb=925b072e5c7bc38949995902cf7af6e4644c2c55;p=quassel.git

diff --git a/gui/channelwidget.cpp b/gui/channelwidget.cpp
index d9851cd2..7ff45372 100644
--- a/gui/channelwidget.cpp
+++ b/gui/channelwidget.cpp
@@ -19,15 +19,16 @@
  ***************************************************************************/
 
 #include "channelwidget.h"
+#include "guiproxy.h"
 
 #include <QtGui>
 #include <iostream>
 
 ChannelWidget::ChannelWidget(QWidget *parent) : QWidget(parent) {
   ui.setupUi(this);
-  ui.lineEdit->setText("foobar");
+  //ui.lineEdit->setText("foobar");
 
-  //ui.splitter->
+/*  //ui.splitter->
   ui.textBrowser->setHtml("[17:21] <em>--> Dante has joined #quassel (~hurz@p1af2242.dip.t-dialin.net)</em><br>"
                           "[17:21] <em>--> Sput has joined #quassel (~Sput42@vincent.mindpool.net)</em><br>"
                           "[17:23] &lt;<b>Dante</b>&gt; Das sieht ja soweit schonmal Klasse aus!<br>"
@@ -37,4 +38,27 @@ ChannelWidget::ChannelWidget(QWidget *parent) : QWidget(parent) {
                           );
  ui.listWidget->addItem("@Dante");
  ui.listWidget->addItem("@Sput");
+  */
+  //connect(&core, SIGNAL(outputLine( const QString& )), ui.textBrowser, SLOT(insertPlainText(const QString &)));
+  //connect(ui.lineEdit, SIGNAL(
+  //connect(&core, SIGNAL(outputLine( const QString& )), this, SLOT(lineReceived(const QString &)));
+  connect(ui.lineEdit, 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(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);
+}
+
+void ChannelWidget::enterPressed() {
+  emit inputLine(ui.lineEdit->text());
+  ui.lineEdit->clear();
+}
+
+void ChannelWidget::lineReceived(QString s) {
+  ui.textBrowser->insertPlainText(s + "\n");
+  ui.textBrowser->ensureCursorVisible();
 }