X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=gui%2Fchannelwidget.cpp;h=d713ec42df1a85d83cf6c53f2c6098ad07ebde7a;hp=7ff453728c1445ae0f3a5b264f617d45d6072a7a;hb=6a833bb8878eff0adaa1b02feb1bb533f53843ed;hpb=31d998779868a1b572972168b2e813893d70ab90
diff --git a/gui/channelwidget.cpp b/gui/channelwidget.cpp
index 7ff45372..d713ec42 100644
--- a/gui/channelwidget.cpp
+++ b/gui/channelwidget.cpp
@@ -26,7 +26,8 @@
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] --> Dante has joined #quassel (~hurz@p1af2242.dip.t-dialin.net)
"
@@ -42,7 +43,7 @@ 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& )), this, SLOT(lineReceived(const QString &)));
- connect(ui.lineEdit, SIGNAL(returnPressed()), this, SLOT(enterPressed()));
+ 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)));
@@ -50,15 +51,17 @@ ChannelWidget::ChannelWidget(QWidget *parent) : QWidget(parent) {
connect(guiProxy, SIGNAL(csCoreMessage(QString)), this, SLOT(lineReceived(QString)));
//emit requestConnect("irc.scortum.moep.net", 6668);
- emit requestConnect("irc.quakenet.org", 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.textBrowser->insertPlainText(s + "\n");
- ui.textBrowser->ensureCursorVisible();
+ ui.chatWidget->insertPlainText(s + "\n");
+ ui.chatWidget->ensureCursorVisible();
}