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

diff --git a/gui/channelwidget.cpp b/gui/channelwidget.cpp
index 320cef34..7ff45372 100644
--- a/gui/channelwidget.cpp
+++ b/gui/channelwidget.cpp
@@ -19,6 +19,7 @@
  ***************************************************************************/
 
 #include "channelwidget.h"
+#include "guiproxy.h"
 
 #include <QtGui>
 #include <iostream>
@@ -40,14 +41,24 @@ 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(&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& )));
-  core.start();
-  core.connectToIrc("irc.quakenet.org", 6668);
+  //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();
+}