X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=d3a7f74df1b89904ebef361339990141cec7e864;hp=cd576273bf3df58e17be1ea1ecee32bd2ac49f85;hb=d8d9cc49774faf66170790ea687c37584e5e7a51;hpb=5d8eb55a0e2a1ebd08bb2d173508b681a6245f6d

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index cd576273..d3a7f74d 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -26,7 +26,6 @@
 #include "client.h"
 #include "iconloader.h"
 #include "ircuser.h"
-#include "jumpkeyhandler.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.inputEdit->installEventFilter(new JumpKeyHandler(this));
   ui.inputEdit->installEventFilter(this);
 
   ui.inputEdit->setMinHeight(1);
@@ -106,6 +104,9 @@ InputWidget::InputWidget(QWidget *parent)
   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));
 
@@ -129,7 +130,7 @@ InputWidget::InputWidget(QWidget *parent)
   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(currentCharFormatChanged(QTextCharFormat)), this, SLOT(currentCharFormatChanged(QTextCharFormat)));
 }
@@ -161,6 +162,10 @@ void InputWidget::setEnableSpellCheck(const QVariant &v) {
   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());
 }