X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=33fe3a4e306a983abdc9007958f5f40723003341;hb=dd8d82a90c136fa1e56d7f72781881cd5099574f;hp=f05311a7737761e5f7a4a0c97d6a1fb7911ed214;hpb=f84e68f556579cbe861f50b94b19ae83704fc17f;p=quassel.git

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index f05311a7..33fe3a4e 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   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  *
@@ -26,13 +26,14 @@
 #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)
@@ -52,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);
@@ -104,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));
 
@@ -111,7 +114,7 @@ InputWidget::InputWidget(QWidget *parent)
   setShowStyleButtons(s.value("ShowStyleButtons", true));
 
   s.notify("EnablePerChatHistory", this, SLOT(setEnablePerChatHistory(QVariant)));
-  setEnablePerChatHistory(s.value("EnablePerChatHistory", true));
+  setEnablePerChatHistory(s.value("EnablePerChatHistory", false));
 
   s.notify("MaxNumLines", this, SLOT(setMaxLines(QVariant)));
   setMaxLines(s.value("MaxNumLines", 5));
@@ -127,8 +130,9 @@ 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(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)));
 }
 
@@ -147,6 +151,11 @@ void InputWidget::setCustomFont(const QVariant &v) {
   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);
 }
 
@@ -154,6 +163,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());
 }
@@ -226,6 +239,11 @@ void InputWidget::currentChanged(const QModelIndex &current, const QModelIndex &
     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>();
@@ -260,7 +278,12 @@ void InputWidget::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int
   }
 }
 
+
 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);
@@ -271,7 +294,9 @@ void InputWidget::updateEnabledState() {
     // ... if we're not connected to the network at all
     enabled &= net->isConnected();
   }
+
   ui.inputEdit->setEnabled(enabled);
+#endif
 }
 
 const Network *InputWidget::currentNetwork() const {
@@ -389,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);