X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fuisupport%2Finputline.cpp;h=eaed70fe5c5ebe1fa039a0a8b22f9b12b5a033d4;hb=5cfbc4c3d77118661d2be0fb79dc138af81310a3;hp=745a3e332ee57d0d30a6627c9f1eb0feacf9aab4;hpb=dc9de5af386f61e6dc5537d04ccc8aceb8126b21;p=quassel.git

diff --git a/src/uisupport/inputline.cpp b/src/uisupport/inputline.cpp
index 745a3e33..eaed70fe 100644
--- a/src/uisupport/inputline.cpp
+++ b/src/uisupport/inputline.cpp
@@ -19,6 +19,7 @@
  ***************************************************************************/
 
 #include "bufferview.h"
+
 #include "inputline.h"
 #include "tabcompleter.h"
 
@@ -42,7 +43,7 @@ bool InputLine::eventFilter(QObject *watched, QEvent *event) {
   BufferView *view = qobject_cast<BufferView *>(watched);
   if(view) {
     QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
-    if(keyEvent->text().length() == 1) { // normal key press
+    if(keyEvent->text().length() == 1 && !(keyEvent->modifiers() & (Qt::ControlModifier ^ Qt::AltModifier)) ) { // normal key press
       QChar c = keyEvent->text().at(0);
       if(c.isLetterOrNumber() || c.isSpace() || c.isPunct() || c.isSymbol()) {
         setFocus();
@@ -140,14 +141,41 @@ void InputLine::on_textChanged(QString newText) {
   if(lineSep.isEmpty())
     return;
 
-  if(newText.contains(lineSep)) {
+  QStringList lines = newText.split(lineSep);
+  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 < 3; i++) {
+      msg += 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::No)
+      return;
+  }
+
+  foreach(QString line, lines) {
     clear();
-    QString line = newText.section(lineSep, 0, 0);
-    QString remainder = newText.section(lineSep, 1);
     insert(line);
     emit returnPressed();
-    insert(remainder);
   }
+//   if(newText.contains(lineSep)) {
+//     clear();
+//     QString line = newText.section(lineSep, 0, 0);
+//     QString remainder = newText.section(lineSep, 1);
+//     insert(line);
+//     emit returnPressed();
+//     insert(remainder);
+//   }
 }
 
 void InputLine::resetLine() {