From 2ed35d8a6322e49ab604472a7af59592cf36ae12 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Sun, 22 Jan 2012 21:12:13 +0100 Subject: [PATCH] Fix #984 without breaking topic input Queued connection ensures that the textEdit is already reset() when InputWidget does its thing, thus solving the history issues. Approved by Tucos reading it 10 times. :> --- src/qtui/inputwidget.cpp | 3 ++- src/qtui/inputwidget.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp index 340f9e59..d325578a 100644 --- a/src/qtui/inputwidget.cpp +++ b/src/qtui/inputwidget.cpp @@ -132,6 +132,7 @@ InputWidget::InputWidget(QWidget *parent) activateInputline->setText(tr("Focus Input Line")); activateInputline->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_L)); + connect(inputLine(), SIGNAL(textEntered(QString)), SLOT(onTextEntered(QString)), Qt::QueuedConnection); // make sure the line is already reset, bug #984 connect(inputLine(), SIGNAL(currentCharFormatChanged(QTextCharFormat)), this, SLOT(currentCharFormatChanged(QTextCharFormat))); } @@ -413,7 +414,7 @@ void InputWidget::changeNick(const QString &newNick) const { Client::userInput(BufferInfo::fakeStatusBuffer(net->networkId()), QString("/NICK %1").arg(newNick)); } -void InputWidget::on_inputEdit_textEntered(const QString &text) { +void InputWidget::onTextEntered(const QString &text) { Client::userInput(currentBufferInfo(), text); ui.boldButton->setChecked(false); ui.underlineButton->setChecked(false); diff --git a/src/qtui/inputwidget.h b/src/qtui/inputwidget.h index b5770355..38981fd6 100644 --- a/src/qtui/inputwidget.h +++ b/src/qtui/inputwidget.h @@ -62,7 +62,7 @@ private slots: void setMaxLines(const QVariant &); void setMultiLineEnabled(const QVariant &); void setScrollBarsEnabled(const QVariant &); - void on_inputEdit_textEntered(const QString &text); + void onTextEntered(const QString &text); void changeNick(const QString &newNick) const; void setNetwork(NetworkId networkId); -- 2.20.1