X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fmultilineedit.cpp;h=02e9df2e23b5d80565dbcdd092cb05ab78cd593f;hp=7b26e7ec7bc11aad679c560ef19665c8a40be7ee;hb=d37d8399f02fcdd9093d17f728c71af445ca56df;hpb=27921f7bb1ae86aabc13a5a279624a2d61cc3f2a

diff --git a/src/uisupport/multilineedit.cpp b/src/uisupport/multilineedit.cpp
index 7b26e7ec..02e9df2e 100644
--- 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  *
@@ -189,7 +189,7 @@ void MultiLineEdit::setPasteProtectionEnabled(bool enable, QWidget *) {
 }
 
 void MultiLineEdit::historyMoveBack() {
-  addToHistory(convertHtmlToMircCodes(html()), true);
+  addToHistory(convertRichtextToMircCodes(), true);
 
   if(idx > 0) {
     idx--;
@@ -198,7 +198,7 @@ void MultiLineEdit::historyMoveBack() {
 }
 
 void MultiLineEdit::historyMoveForward() {
-  addToHistory(convertHtmlToMircCodes(html()), true);
+  addToHistory(convertRichtextToMircCodes(), true);
 
   if(idx < history.count()) {
     idx++;
@@ -207,7 +207,7 @@ void MultiLineEdit::historyMoveForward() {
     else
       reset();              // equals clear() in this case
   } else {
-    addToHistory(convertHtmlToMircCodes(html()));
+    addToHistory(convertRichtextToMircCodes());
     reset();
   }
 }
@@ -317,89 +317,124 @@ void MultiLineEdit::keyPressEvent(QKeyEvent *event) {
 #endif
 }
 
-QString MultiLineEdit::convertHtmlToMircCodes(const QString &text) {
-  QRegExp regexLines = QRegExp("(?:<p.*>(.*)</p>\\n?)+", Qt::CaseInsensitive);
-  regexLines.setMinimal(true);
-
-  QRegExp regexStyles = QRegExp("(?:((<span.*>)(.*)</span>))", Qt::CaseInsensitive);
-  regexStyles.setMinimal(true);
-
-  QRegExp regexColors = QRegExp("((?:background-)?color):(#[0-9a-f]{6})", Qt::CaseInsensitive);
-  regexStyles.setMinimal(true);
+QString MultiLineEdit::convertRichtextToMircCodes() {
+  bool underline, bold, italic, color;
+  QString mircText, mircFgColor, mircBgColor;
+  QTextCursor cursor = textCursor();
+  QTextCursor peekcursor = textCursor();
+  cursor.movePosition(QTextCursor::Start);
 
-  QStringList result;
-  int posLines = 0;
-  QString line, line2, styleText, style, content;
+  underline = bold = italic = color = false;
 
-  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);
+  while (cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor)) {
 
-      if (style.contains("font-weight:600;")) {
-        content.prepend('\x02');
-        content.append('\x02');
+    if (cursor.selectedText() == QString(QChar(QChar::LineSeparator))) {
+      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);
+      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());
 
-        // 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');
+        mircText.append(mircFgColor);
+        if (cursor.charFormat().background().isOpaque())
+          mircText.append("," + mircBgColor);
       }
 
-      line.replace(styleText, content);
-      posStyles += regexStyles.matchedLength();
-    }
+      mircText.append(cursor.selectedText());
 
-    // get rid of all remaining html tags
-    QRegExp regexTags = QRegExp("<.*>",Qt::CaseInsensitive);
-    regexTags.setMinimal(true);
-    line.replace(regexTags, "");
+      peekcursor.setPosition(cursor.position());
+      peekcursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor);
 
-    line.replace("&amp;","&");
-    line.replace("&lt;","<");
-    line.replace("&gt;",">");
+      if (mircCodesChanged(cursor, peekcursor)) {
+        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');
+        }
+      }
+    }
 
-    result << line;
-    posLines += regexLines.matchedLength();
+    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');
+  }
+
+  return mircText;
+}
 
-  return result.join("\n").replace("<br />", "\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) {
@@ -465,6 +500,7 @@ QString MultiLineEdit::convertMircCodesToHtml(const QString &text) {
       words[i].replace("&","&amp;");
       words[i].replace("<", "&lt;");
       words[i].replace(">", "&gt;");
+      words[i].replace("\"", "&quot;");
       if (style.isEmpty()) {
         words[i] = "<span>" + words[i] + "</span>";
       }
@@ -472,11 +508,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) {
@@ -559,7 +595,6 @@ 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]);
   QTextCursor cursor = textCursor();
   QTextBlockFormat format = cursor.blockFormat();
   format.setLeftMargin(leftMargin); // we want a little space between the frame and the contents