X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fmultilineedit.cpp;h=1f9515e5a14589464c3bc2a97c481d1af98786a8;hp=934c7462e7ef72ce6210ed37bdc54b010ca5877d;hb=72cf394e3d73d9885eabf09c958ea106da72a8c2;hpb=65c5a05ece190678187f8244b9752db76f45bf00

diff --git a/src/uisupport/multilineedit.cpp b/src/uisupport/multilineedit.cpp
index 934c7462..1f9515e5 100644
--- a/src/uisupport/multilineedit.cpp
+++ b/src/uisupport/multilineedit.cpp
@@ -54,7 +54,8 @@ MultiLineEdit::MultiLineEdit(QWidget *parent)
   enableFindReplace(false);
 #endif
 
-  setMode(SingleLine); setLineWrapMode(WidgetWidth);
+  setMode(SingleLine);
+  setWordWrapEnabled(false);
   reset();
 
   connect(this, SIGNAL(textChanged()), this, SLOT(on_textChanged()));
@@ -65,7 +66,7 @@ MultiLineEdit::~MultiLineEdit() {
 
 void MultiLineEdit::setCustomFont(const QFont &font) {
   setFont(font);
-  computeSizeHint();
+  updateSizeHint();
 }
 
 void MultiLineEdit::setMode(Mode mode) {
@@ -80,7 +81,7 @@ void MultiLineEdit::setMinHeight(int lines) {
     return;
 
   _minHeight = lines;
-  computeSizeHint();
+  updateSizeHint();
 }
 
 void MultiLineEdit::setMaxHeight(int lines) {
@@ -88,7 +89,7 @@ void MultiLineEdit::setMaxHeight(int lines) {
     return;
 
   _maxHeight = lines;
-  computeSizeHint();
+  updateSizeHint();
 }
 
 void MultiLineEdit::setScrollBarsEnabled(bool enable) {
@@ -114,11 +115,12 @@ void MultiLineEdit::updateScrollBars() {
 }
 
 void MultiLineEdit::resizeEvent(QResizeEvent *event) {
-  updateScrollBars();
   QTextEdit::resizeEvent(event);
+  updateSizeHint();
+  updateScrollBars();
 }
 
-void MultiLineEdit::computeSizeHint() {
+void MultiLineEdit::updateSizeHint() {
   QFontMetrics fm(font());
   int minPixelHeight = fm.lineSpacing() * _minHeight;
   int maxPixelHeight = fm.lineSpacing() * _maxHeight;
@@ -142,7 +144,7 @@ void MultiLineEdit::computeSizeHint() {
 QSize MultiLineEdit::sizeHint() const {
   if(!_sizeHint.isValid()) {
     MultiLineEdit *that = const_cast<MultiLineEdit *>(this);
-    that->computeSizeHint();
+    that->updateSizeHint();
   }
   return _sizeHint;
 }
@@ -161,6 +163,11 @@ void MultiLineEdit::setSpellCheckEnabled(bool enable) {
 
 void MultiLineEdit::setWordWrapEnabled(bool enable) {
   setLineWrapMode(enable? WidgetWidth : NoWrap);
+  updateSizeHint();
+}
+
+void MultiLineEdit::setPasteProtectionEnabled(bool enable, QWidget *) {
+  _pasteProtectionEnabled = enable;
 }
 
 void MultiLineEdit::historyMoveBack() {
@@ -290,8 +297,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);
@@ -306,8 +317,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);
 
@@ -315,7 +357,8 @@ void MultiLineEdit::on_textChanged() {
     _lastDocumentHeight = document()->size().height();
     on_documentHeightChanged(_lastDocumentHeight);
   }
-  computeSizeHint();
+  updateSizeHint();
+  ensureCursorVisible();
 }
 
 void MultiLineEdit::on_documentHeightChanged(qreal) {