projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change shortcut for hiding the current buffer to a standard keysequence
[quassel.git]
/
src
/
qtui
/
inputwidget.cpp
diff --git
a/src/qtui/inputwidget.cpp
b/src/qtui/inputwidget.cpp
index
814f4f4
..
d325578
100644
(file)
--- a/
src/qtui/inputwidget.cpp
+++ b/
src/qtui/inputwidget.cpp
@@
-26,7
+26,6
@@
#include "client.h"
#include "iconloader.h"
#include "ircuser.h"
#include "client.h"
#include "iconloader.h"
#include "ircuser.h"
-#include "jumpkeyhandler.h"
#include "networkmodel.h"
#include "qtui.h"
#include "qtuisettings.h"
#include "networkmodel.h"
#include "qtui.h"
#include "qtuisettings.h"
@@
-54,7
+53,6
@@
InputWidget::InputWidget(QWidget *parent)
ui.ownNick->setSizeAdjustPolicy(QComboBox::AdjustToContents);
ui.ownNick->installEventFilter(new MouseWheelFilter(this));
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);
ui.inputEdit->installEventFilter(this);
ui.inputEdit->setMinHeight(1);
@@
-106,6
+104,9
@@
InputWidget::InputWidget(QWidget *parent)
setEnableSpellCheck(s.value("EnableSpellCheck", false));
#endif
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("ShowNickSelector", this, SLOT(setShowNickSelector(QVariant)));
setShowNickSelector(s.value("ShowNickSelector", true));
@@
-131,6
+132,7
@@
InputWidget::InputWidget(QWidget *parent)
activateInputline->setText(tr("Focus Input Line"));
activateInputline->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_L));
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)));
}
connect(inputLine(), SIGNAL(currentCharFormatChanged(QTextCharFormat)), this, SLOT(currentCharFormatChanged(QTextCharFormat)));
}
@@
-161,6
+163,10
@@
void InputWidget::setEnableSpellCheck(const QVariant &v) {
ui.inputEdit->setSpellCheckEnabled(v.toBool());
}
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());
}
void InputWidget::setShowNickSelector(const QVariant &v) {
ui.ownNick->setVisible(v.toBool());
}
@@
-272,7
+278,12
@@
void InputWidget::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int
}
}
}
}
+
void InputWidget::updateEnabledState() {
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);
QModelIndex currentIndex = selectionModel()->currentIndex();
const Network *net = Client::networkModel()->networkByIndex(currentIndex);
@@
-283,7
+294,9
@@
void InputWidget::updateEnabledState() {
// ... if we're not connected to the network at all
enabled &= net->isConnected();
}
// ... if we're not connected to the network at all
enabled &= net->isConnected();
}
+
ui.inputEdit->setEnabled(enabled);
ui.inputEdit->setEnabled(enabled);
+#endif
}
const Network *InputWidget::currentNetwork() const {
}
const Network *InputWidget::currentNetwork() const {
@@
-401,7
+414,7
@@
void InputWidget::changeNick(const QString &newNick) const {
Client::userInput(BufferInfo::fakeStatusBuffer(net->networkId()), QString("/NICK %1").arg(newNick));
}
Client::userInput(BufferInfo::fakeStatusBuffer(net->networkId()), QString("/NICK %1").arg(newNick));
}
-void InputWidget::on
_inputEdit_t
extEntered(const QString &text) {
+void InputWidget::on
T
extEntered(const QString &text) {
Client::userInput(currentBufferInfo(), text);
ui.boldButton->setChecked(false);
ui.underlineButton->setChecked(false);
Client::userInput(currentBufferInfo(), text);
ui.boldButton->setChecked(false);
ui.underlineButton->setChecked(false);