fixed multiline history

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

diff --git a/src/uisupport/multilineedit.cpp b/src/uisupport/multilineedit.cpp
index 858304b..582521d 100644 (file)
--- a/src/uisupport/multilineedit.cpp
+++ b/src/uisupport/multilineedit.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005/06 by the Quassel Project                          *
+ *   Copyright (C) 2005-2010 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -318,7 +318,9 @@ void MultiLineEdit::keyPressEvent(QKeyEvent *event) {
 }
 
 QString MultiLineEdit::convertHtmlToMircCodes(const QString &text) {
-  QRegExp regexLines = QRegExp("(?:<p.*>(.*)</p>\\n?)+", Qt::CaseInsensitive);
+  QRegExp regexHtmlContent = QRegExp("<p.*>(.*)</p>", Qt::CaseInsensitive);
+
+  QRegExp regexLines = QRegExp("(?:<p.*>(.*)</p>\\n?)", Qt::CaseInsensitive);
   regexLines.setMinimal(true);
 
   QRegExp regexStyles = QRegExp("(?:((<span.*>)(.*)</span>))", Qt::CaseInsensitive);
@@ -329,78 +331,84 @@ QString MultiLineEdit::convertHtmlToMircCodes(const QString &text) {
 
   QStringList result;
   int posLines = 0;
-  QString line, line2, styleText, style, content;
-
-  while ((posLines = regexLines.indexIn(text, posLines)) != -1) {
-    line = line2 = regexLines.cap(1);
-    int posStyles = 0;
-    while ((posStyles = regexStyles.indexIn(line2, posStyles)) != -1) {
-      styleText = regexStyles.cap(1);
-      style = regexStyles.cap(2);
-      content = regexStyles.cap(3);
-
-      if (style.contains("font-weight:600;")) {
-        content.prepend('\x02');
-        content.append('\x02');
-      }
-      if (style.contains("font-style:italic;")) {
-        content.prepend('\x1d');
-        content.append('\x1d');
-      }
-      if (style.contains("text-decoration: underline;")) {
-        content.prepend('\x1f');
-        content.append('\x1f');
-      }
-      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);
+  QString htmlContent, pLine, line, line2, styleText, style, content;
+
+  if (regexHtmlContent.indexIn((text)) > -1) {
+    htmlContent = regexHtmlContent.cap();
+    while ((posLines = regexLines.indexIn(htmlContent, posLines)) != -1) {
+      pLine = regexLines.cap(1);
+      QStringList lines = pLine.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);
+
+          if (style.contains("font-weight:600;")) {
+            content.prepend('\x02');
+            content.append('\x02');
+          }
+          if (style.contains("font-style:italic;")) {
+            content.prepend('\x1d');
+            content.append('\x1d');
+          }
+          if (style.contains("text-decoration: underline;")) {
+            content.prepend('\x1f');
+            content.append('\x1f');
+          }
+          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');
+          }
+
+          line.replace(styleText, content);
+          posStyles += regexStyles.matchedLength();
+        }
 
-          if (colorType == "color")
-            mircFgColor = _mircColorMap.key(color);
+        // get rid of all remaining html tags
+        QRegExp regexTags = QRegExp("<.*>",Qt::CaseInsensitive);
+        regexTags.setMinimal(true);
+        line.replace(regexTags, "");
 
-          if (colorType == "background-color")
-            mircBgColor = _mircColorMap.key(color);
+        line.replace("&amp;","&");
+        line.replace("&lt;","<");
+        line.replace("&gt;",">");
+        line.replace("&quot;","\"");
 
-          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');
+        result << line;
       }
-
-      line.replace(styleText, content);
-      posStyles += regexStyles.matchedLength();
+      posLines += regexLines.matchedLength();
     }
-
-    // get rid of all remaining html tags
-    QRegExp regexTags = QRegExp("<.*>",Qt::CaseInsensitive);
-    regexTags.setMinimal(true);
-    line.replace(regexTags, "");
-
-    line.replace("&amp;","&");
-    line.replace("&lt;","<");
-    line.replace("&gt;",">");
-    line.replace("&quot;","\"");
-
-    result << line;
-    posLines += regexLines.matchedLength();
   }
-
-  return result.join("\n").replace("<br />", "\n");
+  return result.join("\n");
 }
 
 QString MultiLineEdit::convertMircCodesToHtml(const QString &text) {
@@ -474,7 +482,7 @@ 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() {