X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=gui%2Fchannelwidget.cpp;h=d713ec42df1a85d83cf6c53f2c6098ad07ebde7a;hp=bde11c728143e3f19bac23a041339d9086c8f701;hb=6a833bb8878eff0adaa1b02feb1bb533f53843ed;hpb=8b192b08f3df4ce0e7cc4a08564645c76efa688d

diff --git a/gui/channelwidget.cpp b/gui/channelwidget.cpp
index bde11c72..d713ec42 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,16 +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");
+  //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();
 }
 
-  
\ No newline at end of file
+void ChannelWidget::lineReceived(QString s) {
+  ui.chatWidget->insertPlainText(s + "\n");
+  ui.chatWidget->ensureCursorVisible();
+}