Don't let the inputline eat application shortcuts

[quassel.git] / src / uisupport / multilineedit.cpp

diff --git a/src/uisupport/multilineedit.cpp b/src/uisupport/multilineedit.cpp
index 2440c42..a0e0e8c 100644 (file)
--- a/src/uisupport/multilineedit.cpp
+++ b/src/uisupport/multilineedit.cpp
@@ -23,6 +23,7 @@
 #include <QMessageBox>
 #include <QScrollBar>
 
+#include "actioncollection.h"
 #include "bufferview.h"
 #include "graphicalui.h"
 #include "multilineedit.h"
@@ -31,18 +32,14 @@
 const int leftMargin = 3;
 
 MultiLineEdit::MultiLineEdit(QWidget *parent)
-  :
-#ifdef HAVE_KDE
-    KTextEdit(parent),
-#else
-    QTextEdit(parent),
-#endif
+  : MultiLineEditParent(parent),
     _idx(0),
     _mode(SingleLine),
     _singleLine(true),
     _minHeight(1),
     _maxHeight(5),
     _scrollBarsEnabled(true),
+    _pasteProtectionEnabled(true),
     _lastDocumentHeight(-1)
 {
 #if QT_VERSION >= 0x040500
@@ -236,6 +233,22 @@ bool MultiLineEdit::addToHistory(const QString &text, bool temporary) {
   return false;
 }
 
+bool MultiLineEdit::event(QEvent *e) {
+  // We need to make sure that global shortcuts aren't eaten
+  if(e->type() == QEvent::ShortcutOverride) {
+    QKeyEvent* event = static_cast<QKeyEvent *>(e);
+    QKeySequence key = QKeySequence(event->key() | event->modifiers());
+    foreach(QAction *action, GraphicalUi::actionCollection()->actions()) {
+      if(action->shortcuts().contains(key)) {
+        e->ignore();
+        return false;
+      }
+    }
+  }
+
+  return MultiLineEditParent::event(e);
+}
+
 void MultiLineEdit::keyPressEvent(QKeyEvent *event) {
   // Workaround the fact that Qt < 4.5 doesn't know InsertLineSeparator yet
 #if QT_VERSION >= 0x040500
@@ -254,11 +267,7 @@ void MultiLineEdit::keyPressEvent(QKeyEvent *event) {
       on_returnPressed();
       return;
     }
-#ifdef HAVE_KDE
-    KTextEdit::keyPressEvent(event);
-#else
-    QTextEdit::keyPressEvent(event);
-#endif
+    MultiLineEditParent::keyPressEvent(event);
     return;
   }
 
@@ -328,7 +337,8 @@ QString MultiLineEdit::convertRichtextToMircCodes() {
 
   while (cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor)) {
 
-    if (cursor.selectedText() == QString(QChar(QChar::LineSeparator))) {
+    if (cursor.selectedText() == QString(QChar(QChar::LineSeparator))
+      || cursor.selectedText() == QString(QChar(QChar::ParagraphSeparator))) {
       if (color) {
         color = false;
         mircText.append('\x03');