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

diff --git a/gui/channelwidget.cpp b/gui/channelwidget.cpp
index 320cef34..b271ec40 100644
--- a/gui/channelwidget.cpp
+++ b/gui/channelwidget.cpp
@@ -19,13 +19,15 @@
  ***************************************************************************/
 
 #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.inputEdit->setFocus();
 
 /*  //ui.splitter->
   ui.textBrowser->setHtml("[17:21] <em>--> Dante has joined #quassel (~hurz@p1af2242.dip.t-dialin.net)</em><br>"
@@ -40,14 +42,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", 6668);
+  //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(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();
+  QString l = ui.inputEdit->text();
+  if(l == "/c") emit requestConnect("irc.quakenet.org", 6668);
+  else emit inputLine(ui.inputEdit->text());
+  ui.inputEdit->clear();
+}
+
+void ChannelWidget::lineReceived(QString s) {
+  ui.chatWidget->insertPlainText(s + "\n");
+  ui.chatWidget->ensureCursorVisible();
 }