/***************************************************************************
- * Copyright (C) 2005-2010 by the Quassel Project *
+ * Copyright (C) 2005-2012 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "client.h"
#include "iconloader.h"
#include "ircuser.h"
-#include "jumpkeyhandler.h"
#include "networkmodel.h"
#include "qtui.h"
#include "qtuisettings.h"
#include "tabcompleter.h"
#include <QPainter>
+const int leftMargin = 3;
+
InputWidget::InputWidget(QWidget *parent)
: AbstractItemView(parent),
_networkId(0)
ui.ownNick->setSizeAdjustPolicy(QComboBox::AdjustToContents);
ui.ownNick->installEventFilter(new MouseWheelFilter(this));
- ui.inputEdit->installEventFilter(new JumpKeyHandler(this));
ui.inputEdit->installEventFilter(this);
ui.inputEdit->setMinHeight(1);
setEnableSpellCheck(s.value("EnableSpellCheck", false));
#endif
+ s.notify("EnableEmacsMode", this, SLOT(setEnableEmacsMode(QVariant)));
+ setEnableEmacsMode(s.value("EnableEmacsMode", false));
+
s.notify("ShowNickSelector", this, SLOT(setShowNickSelector(QVariant)));
setShowNickSelector(s.value("ShowNickSelector", true));
s.notify("ShowStyleButtons", this, SLOT(setShowStyleButtons(QVariant)));
setShowStyleButtons(s.value("ShowStyleButtons", true));
+ s.notify("EnablePerChatHistory", this, SLOT(setEnablePerChatHistory(QVariant)));
+ setEnablePerChatHistory(s.value("EnablePerChatHistory", false));
+
s.notify("MaxNumLines", this, SLOT(setMaxLines(QVariant)));
setMaxLines(s.value("MaxNumLines", 5));
Action *activateInputline = coll->add<Action>("FocusInputLine");
connect(activateInputline, SIGNAL(triggered()), SLOT(setFocus()));
activateInputline->setText(tr("Focus Input Line"));
- activateInputline->setShortcut(tr("Ctrl+L"));
+ 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)));
}
QFont font = v.value<QFont>();
if(font.family().isEmpty())
font = QApplication::font();
+ // we don't want font styles as this conflics with mirc code richtext editing
+ font.setBold(false);
+ font.setItalic(false);
+ font.setUnderline(false);
+ font.setStrikeOut(false);
ui.inputEdit->setCustomFont(font);
}
ui.inputEdit->setSpellCheckEnabled(v.toBool());
}
+void InputWidget::setEnableEmacsMode(const QVariant &v) {
+ ui.inputEdit->setEmacsMode(v.toBool());
+}
+
void InputWidget::setShowNickSelector(const QVariant &v) {
ui.ownNick->setVisible(v.toBool());
}
ui.showStyleButton->setVisible(v.toBool());
}
+void InputWidget::setEnablePerChatHistory(const QVariant &v) {
+ _perChatHistory = v.toBool();
+}
+
void InputWidget::setMaxLines(const QVariant &v) {
ui.inputEdit->setMaxHeight(v.toInt());
}
}
void InputWidget::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) {
- Q_UNUSED(previous)
+ BufferId currentBufferId = current.data(NetworkModel::BufferIdRole).value<BufferId>();
+ BufferId previousBufferId = previous.data(NetworkModel::BufferIdRole).value<BufferId>();
+
+ if (_perChatHistory) {
+ //backup
+ historyMap[previousBufferId].history = inputLine()->history();
+ historyMap[previousBufferId].tempHistory = inputLine()->tempHistory();
+ historyMap[previousBufferId].idx = inputLine()->idx();
+ historyMap[previousBufferId].inputLine = inputLine()->html();
+
+ //restore
+ inputLine()->setHistory(historyMap[currentBufferId].history);
+ inputLine()->setTempHistory(historyMap[currentBufferId].tempHistory);
+ inputLine()->setIdx(historyMap[currentBufferId].idx);
+ inputLine()->setHtml(historyMap[currentBufferId].inputLine);
+ inputLine()->moveCursor(QTextCursor::End,QTextCursor::MoveAnchor);
+
+ // FIXME this really should be in MultiLineEdit (and the const int on top removed)
+ QTextBlockFormat format = inputLine()->textCursor().blockFormat();
+ format.setLeftMargin(leftMargin); // we want a little space between the frame and the contents
+ inputLine()->textCursor().setBlockFormat(format);
+ }
+
NetworkId networkId = current.data(NetworkModel::NetworkIdRole).value<NetworkId>();
if(networkId == _networkId)
return;
}
}
+
void InputWidget::updateEnabledState() {
+// FIXME: Find a visualization for this that does not disable the widget!
+// Disabling kills global action shortcuts, plus users sometimes need/want to enter text
+// even in inactive channels.
+#if 0
QModelIndex currentIndex = selectionModel()->currentIndex();
const Network *net = Client::networkModel()->networkByIndex(currentIndex);
// ... if we're not connected to the network at all
enabled &= net->isConnected();
}
+
ui.inputEdit->setEnabled(enabled);
+#endif
}
const Network *InputWidget::currentNetwork() 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);