X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fmultilineedit.cpp;h=9029f02f4f87c2d2c883ab0348fde5e7f44bbb2f;hp=96fd43f5b1d821a611fa6e043d8fe2714425354f;hb=d316067d1daf6c7ea790ca9ac5e1ff947fe011ce;hpb=4ce4f3a6b08bba1a846abf135f5bbcbe15fb060a

diff --git a/src/uisupport/multilineedit.cpp b/src/uisupport/multilineedit.cpp
index 96fd43f5..9029f02f 100644
--- a/src/uisupport/multilineedit.cpp
+++ b/src/uisupport/multilineedit.cpp
@@ -166,6 +166,10 @@ void MultiLineEdit::setWordWrapEnabled(bool enable) {
   updateSizeHint();
 }
 
+void MultiLineEdit::setPasteProtectionEnabled(bool enable, QWidget *) {
+  _pasteProtectionEnabled = enable;
+}
+
 void MultiLineEdit::historyMoveBack() {
   addToHistory(text(), true);
 
@@ -227,8 +231,11 @@ void MultiLineEdit::keyPressEvent(QKeyEvent *event) {
 # endif
 #endif
 
-    if(_mode == SingleLine)
+    if(_mode == SingleLine) {
+      event->accept();
+      on_returnPressed();
       return;
+    }
 #ifdef HAVE_KDE
     KTextEdit::keyPressEvent(event);
 #else
@@ -293,8 +300,12 @@ void MultiLineEdit::keyPressEvent(QKeyEvent *event) {
 }
 
 void MultiLineEdit::on_returnPressed() {
-  if(!text().isEmpty()) {
-    foreach(const QString &line, text().split('\n', QString::SkipEmptyParts)) {
+  on_returnPressed(text());
+}
+
+void MultiLineEdit::on_returnPressed(const QString & text) {
+  if(!text.isEmpty()) {
+    foreach(const QString &line, text.split('\n', QString::SkipEmptyParts)) {
       if(line.isEmpty())
         continue;
       addToHistory(line);
@@ -302,6 +313,8 @@ void MultiLineEdit::on_returnPressed() {
     }
     reset();
     tempHistory.clear();
+  } else {
+    emit noTextEntered();
   }
 }
 
@@ -309,8 +322,39 @@ void MultiLineEdit::on_textChanged() {
   QString newText = text();
   newText.replace("\r\n", "\n");
   newText.replace('\r', '\n');
-  if(_mode == SingleLine)
-    newText.replace('\n', ' ');
+  if(_mode == SingleLine) {
+    if(!pasteProtectionEnabled())
+      newText.replace('\n', ' ');
+    else if(newText.contains('\n')) {
+      QStringList lines = newText.split('\n', QString::SkipEmptyParts);
+      clear();
+
+      if(lines.count() >= 4) {
+        QString msg = tr("Do you really want to paste %n lines?", "", lines.count());
+        msg += "<p>";
+        for(int i = 0; i < 4; i++) {
+          msg += Qt::escape(lines[i].left(40));
+          if(lines[i].count() > 40)
+            msg += "...";
+          msg += "<br />";
+        }
+        msg += "...</p>";
+        QMessageBox question(QMessageBox::NoIcon, tr("Paste Protection"), msg, QMessageBox::Yes|QMessageBox::No);
+        question.setDefaultButton(QMessageBox::No);
+#ifdef Q_WS_MAC
+        question.setWindowFlags(question.windowFlags() | Qt::Sheet);
+#endif
+        if(question.exec() != QMessageBox::Yes)
+          return;
+      }
+
+      foreach(QString line, lines) {
+        clear();
+        insert(line);
+        on_returnPressed();
+      }
+    }
+  }
 
   _singleLine = (newText.indexOf('\n') < 0);
 
@@ -319,6 +363,7 @@ void MultiLineEdit::on_textChanged() {
     on_documentHeightChanged(_lastDocumentHeight);
   }
   updateSizeHint();
+  ensureCursorVisible();
 }
 
 void MultiLineEdit::on_documentHeightChanged(qreal) {