X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fmultilineedit.cpp;h=53341f7a7c15655ca035f2cc3771177b76e1ca20;hb=e4972a0ebce0d555d752ab2f34ffd6a6dcdef1dd;hp=858304b24d8ee3ab424af6c3cf76ed75dc8391b8;hpb=12dae37500622bffce9a903cce2a1ccba16cb2f4;p=quassel.git
diff --git a/src/uisupport/multilineedit.cpp b/src/uisupport/multilineedit.cpp
index 858304b2..53341f7a 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 *
@@ -318,7 +318,10 @@ void MultiLineEdit::keyPressEvent(QKeyEvent *event) {
}
QString MultiLineEdit::convertHtmlToMircCodes(const QString &text) {
- QRegExp regexLines = QRegExp("(?:
(.*)\\n?)+", Qt::CaseInsensitive);
+ QRegExp regexHtmlContent = QRegExp("(.*)", Qt::CaseInsensitive);
+ regexHtmlContent.setMinimal(true);
+
+ QRegExp regexLines = QRegExp("(.*)(?:
)?", Qt::CaseInsensitive);
regexLines.setMinimal(true);
QRegExp regexStyles = QRegExp("(?:(()(.*)))", Qt::CaseInsensitive);
@@ -328,79 +331,80 @@ QString MultiLineEdit::convertHtmlToMircCodes(const QString &text) {
regexStyles.setMinimal(true);
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);
-
- if (colorType == "color")
- mircFgColor = _mircColorMap.key(color);
-
- if (colorType == "background-color")
- mircBgColor = _mircColorMap.key(color);
-
- posColors += regexColors.matchedLength();
+ QString htmlContent, line, line2, styleText, style, content;
+
+ if (regexHtmlContent.indexIn((text)) > -1) {
+ htmlContent = regexHtmlContent.cap(1);
+ QStringList lines = htmlContent.split("
");
+ 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 (!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
+ 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');
}
- content.prepend(mircFgColor);
- content.prepend('\x03');
- content.append('\x03');
+ line.replace(styleText, content);
+ posStyles += regexStyles.matchedLength();
}
- 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, "");
+ // get rid of all remaining html tags
+ QRegExp regexTags = QRegExp("<.*>",Qt::CaseInsensitive);
+ regexTags.setMinimal(true);
+ line.replace(regexTags, "");
- line.replace("&","&");
- line.replace("<","<");
- line.replace(">",">");
- line.replace(""","\"");
+ line.replace("&","&");
+ line.replace("<","<");
+ line.replace(">",">");
+ line.replace(""","\"");
- result << line;
- posLines += regexLines.matchedLength();
+ result << line;
+ }
}
-
- return result.join("\n").replace("
", "\n");
+ return result.join("\n");
}
QString MultiLineEdit::convertMircCodesToHtml(const QString &text) {