X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fmultilineedit.cpp;h=14eecf23b0f822c42ae95f3bf26381adb03f870b;hp=53341f7a7c15655ca035f2cc3771177b76e1ca20;hb=dfcf836c5f1f57cadcdbea5c5a7a7034d21ce332;hpb=580662426b8b734566b37de61deccf5b89970c6e

diff --git a/src/uisupport/multilineedit.cpp b/src/uisupport/multilineedit.cpp
index 53341f7a..14eecf23 100644
--- a/src/uisupport/multilineedit.cpp
+++ b/src/uisupport/multilineedit.cpp
@@ -37,12 +37,13 @@ MultiLineEdit::MultiLineEdit(QWidget *parent)
 #else
     QTextEdit(parent),
 #endif
-    idx(0),
+    _idx(0),
     _mode(SingleLine),
     _singleLine(true),
     _minHeight(1),
     _maxHeight(5),
     _scrollBarsEnabled(true),
+    _pasteProtectionEnabled(true),
     _lastDocumentHeight(-1)
 {
 #if QT_VERSION >= 0x040500
@@ -189,25 +190,25 @@ void MultiLineEdit::setPasteProtectionEnabled(bool enable, QWidget *) {
 }
 
 void MultiLineEdit::historyMoveBack() {
-  addToHistory(convertHtmlToMircCodes(html()), true);
+  addToHistory(convertRichtextToMircCodes(), true);
 
-  if(idx > 0) {
-    idx--;
+  if(_idx > 0) {
+    _idx--;
     showHistoryEntry();
   }
 }
 
 void MultiLineEdit::historyMoveForward() {
-  addToHistory(convertHtmlToMircCodes(html()), true);
+  addToHistory(convertRichtextToMircCodes(), true);
 
-  if(idx < history.count()) {
-    idx++;
-    if(idx < history.count() || tempHistory.contains(idx)) // tempHistory might have an entry for idx == history.count() + 1
+  if(_idx < _history.count()) {
+    _idx++;
+    if(_idx < _history.count() || _tempHistory.contains(_idx)) // tempHistory might have an entry for idx == history.count() + 1
       showHistoryEntry();
     else
       reset();              // equals clear() in this case
   } else {
-    addToHistory(convertHtmlToMircCodes(html()));
+    addToHistory(convertRichtextToMircCodes());
     reset();
   }
 }
@@ -216,20 +217,20 @@ bool MultiLineEdit::addToHistory(const QString &text, bool temporary) {
   if(text.isEmpty())
     return false;
 
-  Q_ASSERT(0 <= idx && idx <= history.count());
+  Q_ASSERT(0 <= _idx && _idx <= _history.count());
 
   if(temporary) {
     // if an entry of the history is changed, we remember it and show it again at this
     // position until a line was actually sent
     // sent lines get appended to the history
-    if(history.isEmpty() || text != history[idx - (int)(idx == history.count())]) {
-      tempHistory[idx] = text;
+    if(_history.isEmpty() || text != _history[_idx - (int)(_idx == _history.count())]) {
+      _tempHistory[_idx] = text;
       return true;
     }
   } else {
-    if(history.isEmpty() || text != history.last()) {
-      history << text;
-      tempHistory.clear();
+    if(_history.isEmpty() || text != _history.last()) {
+      _history << text;
+      _tempHistory.clear();
       return true;
     }
   }
@@ -317,94 +318,125 @@ void MultiLineEdit::keyPressEvent(QKeyEvent *event) {
 #endif
 }
 
-QString MultiLineEdit::convertHtmlToMircCodes(const QString &text) {
-  QRegExp regexHtmlContent = QRegExp("<p.*>(.*)</p>", Qt::CaseInsensitive);
-  regexHtmlContent.setMinimal(true);
+QString MultiLineEdit::convertRichtextToMircCodes() {
+  bool underline, bold, italic, color;
+  QString mircText, mircFgColor, mircBgColor;
+  QTextCursor cursor = textCursor();
+  QTextCursor peekcursor = textCursor();
+  cursor.movePosition(QTextCursor::Start);
+
+  underline = bold = italic = color = false;
 
-  QRegExp regexLines = QRegExp("(.*)(?:<br />)?", Qt::CaseInsensitive);
-  regexLines.setMinimal(true);
+  while (cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor)) {
 
-  QRegExp regexStyles = QRegExp("(?:((<span.*>)(.*)</span>))", Qt::CaseInsensitive);
-  regexStyles.setMinimal(true);
+    if (cursor.selectedText() == QString(QChar(QChar::LineSeparator))
+      || cursor.selectedText() == QString(QChar(QChar::ParagraphSeparator))) {
+      if (color) {
+        color = false;
+        mircText.append('\x03');
+      }
+      if (underline) {
+        underline = false;
+        mircText.append('\x1f');
+      }
+      if (italic) {
+        italic = false;
+        mircText.append('\x1d');
+      }
+      if (bold) {
+        bold = false;
+        mircText.append('\x02');
+      }
+      mircText.append('\n');
+    }
+    else {
+      if (!bold && cursor.charFormat().font().bold()) {
+        bold = true;
+        mircText.append('\x02');
+      }
+      if (!italic && cursor.charFormat().fontItalic()) {
+        italic = true;
+        mircText.append('\x1d');
+      }
+      if (!underline && cursor.charFormat().fontUnderline()) {
+        underline = true;
+        mircText.append('\x1f');
+      }
+      if (!color && (cursor.charFormat().foreground().isOpaque() || cursor.charFormat().background().isOpaque())) {
+        color = true;
+        mircText.append('\x03');
+        mircFgColor = _mircColorMap.key(cursor.charFormat().foreground().color().name());
+        mircBgColor = _mircColorMap.key(cursor.charFormat().background().color().name());
+
+        if (mircFgColor.isEmpty()) {
+            mircFgColor = "01"; //use black if the current foreground color can't be converted
+        }
 
-  QRegExp regexColors = QRegExp("((?:background-)?color):(#[0-9a-f]{6})", Qt::CaseInsensitive);
-  regexStyles.setMinimal(true);
+        mircText.append(mircFgColor);
+        if (cursor.charFormat().background().isOpaque())
+          mircText.append("," + mircBgColor);
+      }
 
-  QStringList result;
-  QString htmlContent, line, line2, styleText, style, content;
+      mircText.append(cursor.selectedText());
 
-  if (regexHtmlContent.indexIn((text)) > -1) {
-    htmlContent = regexHtmlContent.cap(1);
-    QStringList lines = htmlContent.split("<br />");
-    for (int i=0; i < lines.count(); i++) {
-      line = line2 = lines[i];
-      int posStyles = 0;
-      while ((posStyles = regexStyles.indexIn(line2, posStyles)) != -1) {
-        styleText = regexStyles.cap(1);
-        style = regexStyles.cap(2);
-        content = regexStyles.cap(3);
+      peekcursor.setPosition(cursor.position());
+      peekcursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor);
 
-        if (style.contains("font-weight:600;")) {
-          content.prepend('\x02');
-          content.append('\x02');
+      if (mircCodesChanged(cursor, peekcursor)) {
+        if (color) {
+          color = false;
+          mircText.append('\x03');
         }
-        if (style.contains("font-style:italic;")) {
-          content.prepend('\x1d');
-          content.append('\x1d');
+        if (underline) {
+          underline = false;
+          mircText.append('\x1f');
         }
-        if (style.contains("text-decoration: underline;")) {
-          content.prepend('\x1f');
-          content.append('\x1f');
+        if (italic) {
+          italic = false;
+          mircText.append('\x1d');
         }
-        if (style.contains("color:#")) { // we have either foreground or background color or both
-          int posColors = 0;
-          QString mircFgColor, mircBgColor;
-          while ((posColors = regexColors.indexIn(style, posColors)) != -1) {
-            QString colorType = regexColors.cap(1);
-            QString color = regexColors.cap(2);
-
-            if (colorType == "color")
-              mircFgColor = _mircColorMap.key(color);
-
-            if (colorType == "background-color")
-              mircBgColor = _mircColorMap.key(color);
-
-            posColors += regexColors.matchedLength();
-          }
-          if (!mircBgColor.isEmpty())
-            content.prepend("," + mircBgColor);
-
-          // we need a fg color to be able to use a bg color
-          if (mircFgColor.isEmpty()) {
-            //FIXME try to use the current forecolor
-            mircFgColor = _mircColorMap.key(textColor().name());
-            if (mircFgColor.isEmpty())
-              mircFgColor = "01"; //use black if the current foreground color can't be converted
-          }
-
-          content.prepend(mircFgColor);
-          content.prepend('\x03');
-          content.append('\x03');
+        if (bold) {
+          bold = false;
+          mircText.append('\x02');
         }
-
-        line.replace(styleText, content);
-        posStyles += regexStyles.matchedLength();
       }
+    }
 
-      // get rid of all remaining html tags
-      QRegExp regexTags = QRegExp("<.*>",Qt::CaseInsensitive);
-      regexTags.setMinimal(true);
-      line.replace(regexTags, "");
+    cursor.clearSelection();
+  }
+  if (color) {
+    color = false;
+    mircText.append('\x03');
+  }
+  if (underline) {
+    underline = false;
+    mircText.append('\x1f');
+  }
+  if (italic) {
+    italic = false;
+    mircText.append('\x1d');
+  }
+  if (bold) {
+    bold = false;
+    mircText.append('\x02');
+  }
 
-      line.replace("&amp;","&");
-      line.replace("&lt;","<");
-      line.replace("&gt;",">");
-      line.replace("&quot;","\"");
+  return mircText;
+}
 
-      result << line;
-    }
-  }
-  return result.join("\n");
+bool MultiLineEdit::mircCodesChanged(QTextCursor &cursor, QTextCursor &peekcursor) {
+  bool changed = false;
+  if (cursor.charFormat().font().bold() != peekcursor.charFormat().font().bold())
+    changed = true;
+  if (cursor.charFormat().fontItalic() != peekcursor.charFormat().fontItalic())
+    changed = true;
+  if (cursor.charFormat().fontUnderline() != peekcursor.charFormat().fontUnderline())
+    changed = true;
+  if (cursor.charFormat().foreground().color() != peekcursor.charFormat().foreground().color())
+    changed = true;
+  if (cursor.charFormat().background().color() != peekcursor.charFormat().background().color())
+    changed = true;
+  return changed;
 }
 
 QString MultiLineEdit::convertMircCodesToHtml(const QString &text) {
@@ -478,11 +510,11 @@ QString MultiLineEdit::convertMircCodesToHtml(const QString &text) {
         words[i] = "<span style=\"" + style + "\">" + words[i] + "</span>";
       }
   }
-  return words.join("");
+  return words.join("").replace("\n","<br />");
 }
 
 void MultiLineEdit::on_returnPressed() {
-  on_returnPressed(convertHtmlToMircCodes(html()));
+  on_returnPressed(convertRichtextToMircCodes());
 }
 
 void MultiLineEdit::on_returnPressed(const QString & text) {
@@ -494,7 +526,7 @@ void MultiLineEdit::on_returnPressed(const QString & text) {
       emit textEntered(line);
     }
     reset();
-    tempHistory.clear();
+    _tempHistory.clear();
   } else {
     emit noTextEntered();
   }
@@ -554,7 +586,7 @@ void MultiLineEdit::on_documentHeightChanged(qreal) {
 
 void MultiLineEdit::reset() {
   // every time the MultiLineEdit is cleared we also reset history index
-  idx = history.count();
+  _idx = _history.count();
   clear();
   QTextBlockFormat format = textCursor().blockFormat();
   format.setLeftMargin(leftMargin); // we want a little space between the frame and the contents
@@ -564,8 +596,7 @@ void MultiLineEdit::reset() {
 
 void MultiLineEdit::showHistoryEntry() {
   // if the user changed the history, display the changed line
-  setHtml(convertMircCodesToHtml(tempHistory.contains(idx) ? tempHistory[idx] : history[idx]));
-  //setPlainText(tempHistory.contains(idx) ? tempHistory[idx] : history[idx]);
+  setHtml(convertMircCodesToHtml(_tempHistory.contains(_idx) ? _tempHistory[_idx] : _history[_idx]));
   QTextCursor cursor = textCursor();
   QTextBlockFormat format = cursor.blockFormat();
   format.setLeftMargin(leftMargin); // we want a little space between the frame and the contents