--- kmreaderwin.cpp Mon Apr 24 15:31:29 2000 +++ kmreaderwin.cpp.org Mon Apr 24 14:00:20 2000 @@ -261,7 +261,7 @@ } } - QString str = QString("").arg( color.name() ); + QString str = QString("").arg( color.name() ); if( font.italic() ) { str += ""; } if( font.bold() ) { str += ""; } return( str ); @@ -364,12 +364,12 @@ else { mViewer->begin( KURL( "file:/" ) ); - mViewer->write("write("write(" background=\"file://" + mBackingPixmapStr + "\""); - mViewer->write(">"); + mViewer->write(">"); mViewer->end(); } @@ -391,19 +391,16 @@ return; mViewer->begin( KURL( "file:/" ) ); - mViewer->write("write(" background=\"file://" + mBackingPixmapStr + "\""); - - // TODO: move this to stylesheet, too: - mViewer->write(">"); + mViewer->write(">"); #if defined CHARSETS printf("Setting viewer charset to %s\n",(const char *)mMsg->charset()); @@ -412,7 +409,7 @@ parseMsg(mMsg); - mViewer->write(""); + mViewer->write(""); mViewer->end(); } @@ -489,7 +486,7 @@ if ((type == "") || (stricmp(type, "text")==0))//||stricmp(type, "message")==0) { str = QCString(msgPart.bodyDecoded()); - if (i>0) mViewer->write("

"); + if (i>0) mViewer->write("

"); if (stricmp(subtype, "html")==0) { @@ -544,92 +541,92 @@ switch (mHeaderStyle) { case HdrBrief: - mViewer->write("" + strToHtml(mMsg->subject()) + - " (" + + mViewer->write("" + strToHtml(mMsg->subject()) + + " (" + KMMessage::emailAddrAsAnchor(mMsg->from(),TRUE) + ", "); if (!mMsg->cc().isEmpty()) mViewer->write(i18n("Cc: ")+ KMMessage::emailAddrAsAnchor(mMsg->cc(),TRUE) + ", "); - mViewer->write(strToHtml(mMsg->dateShortStr()) + ")
\n"); + mViewer->write(strToHtml(mMsg->dateShortStr()) + ")
\n"); break; case HdrStandard: - mViewer->write("" + - strToHtml(mMsg->subject()) + "
\n"); + mViewer->write("" + + strToHtml(mMsg->subject()) + "
\n"); mViewer->write(i18n("From: ") + - KMMessage::emailAddrAsAnchor(mMsg->from(),FALSE) + "
\n"); + KMMessage::emailAddrAsAnchor(mMsg->from(),FALSE) + "
\n"); mViewer->write(i18n("To: ") + - KMMessage::emailAddrAsAnchor(mMsg->to(),FALSE) + "
\n"); + KMMessage::emailAddrAsAnchor(mMsg->to(),FALSE) + "
\n"); if (!mMsg->cc().isEmpty()) mViewer->write(i18n("Cc: ")+ - KMMessage::emailAddrAsAnchor(mMsg->cc(),FALSE) + "
\n"); + KMMessage::emailAddrAsAnchor(mMsg->cc(),FALSE) + "
\n"); #ifdef KRN if (!mMsg->references().isEmpty()) mViewer->write(i18n("References: ") + - KMMessage::refsAsAnchor(mMsg->references()) + "
"); + KMMessage::refsAsAnchor(mMsg->references()) + "
"); #endif - mViewer->write("
"); + mViewer->write("
"); break; case HdrFancy: - mViewer->write(QString("
"); - mViewer->write(strToHtml(mMsg->subject()) + "
"); + "> "); + mViewer->write(strToHtml(mMsg->subject()) + "
"); mViewer->write(i18n("From: ")+ - KMMessage::emailAddrAsAnchor(mMsg->from(),FALSE) + "
\n"); + KMMessage::emailAddrAsAnchor(mMsg->from(),FALSE) + "
\n"); mViewer->write(i18n("To: ")+ - KMMessage::emailAddrAsAnchor(mMsg->to(),FALSE) + "
\n"); + KMMessage::emailAddrAsAnchor(mMsg->to(),FALSE) + "
\n"); if (!mMsg->cc().isEmpty()) mViewer->write(i18n("Cc: ")+ - KMMessage::emailAddrAsAnchor(mMsg->cc(),FALSE) + "
\n"); + KMMessage::emailAddrAsAnchor(mMsg->cc(),FALSE) + "
\n"); mViewer->write(i18n("Date: ")+ - strToHtml(mMsg->dateStr()) + "
\n"); + strToHtml(mMsg->dateStr()) + "
\n"); #ifdef KRN if (!mMsg->references().isEmpty()) mViewer->write(i18n("References: ") + - KMMessage::refsAsAnchor(mMsg->references()) + "

\n"); + KMMessage::refsAsAnchor(mMsg->references()) + "

\n"); #endif - mViewer->write("

\n"); + mViewer->write("
\n"); break; case HdrLong: - mViewer->write("" + - strToHtml(mMsg->subject()) + "
"); - mViewer->write(i18n("Date: ")+strToHtml(mMsg->dateStr())+"
"); + mViewer->write("" + + strToHtml(mMsg->subject()) + "
"); + mViewer->write(i18n("Date: ")+strToHtml(mMsg->dateStr())+"
"); mViewer->write(i18n("From: ")+ - KMMessage::emailAddrAsAnchor(mMsg->from(),FALSE) + "
"); + KMMessage::emailAddrAsAnchor(mMsg->from(),FALSE) + "
"); mViewer->write(i18n("To: ")+ - KMMessage::emailAddrAsAnchor(mMsg->to(),FALSE) + "
"); + KMMessage::emailAddrAsAnchor(mMsg->to(),FALSE) + "
"); if (!mMsg->cc().isEmpty()) mViewer->write(i18n("Cc: ")+ - KMMessage::emailAddrAsAnchor(mMsg->cc(),FALSE) + "
"); + KMMessage::emailAddrAsAnchor(mMsg->cc(),FALSE) + "
"); if (!mMsg->bcc().isEmpty()) mViewer->write(i18n("Bcc: ")+ - KMMessage::emailAddrAsAnchor(mMsg->bcc(),FALSE) + "
"); + KMMessage::emailAddrAsAnchor(mMsg->bcc(),FALSE) + "
"); if (!mMsg->replyTo().isEmpty()) mViewer->write(i18n("Reply to: ")+ - KMMessage::emailAddrAsAnchor(mMsg->replyTo(),FALSE) + "
"); + KMMessage::emailAddrAsAnchor(mMsg->replyTo(),FALSE) + "
"); #ifdef KRN if (!mMsg->references().isEmpty()) mViewer->write(i18n("References: ")+ - KMMessage::refsAsAnchor(mMsg->references()) + "
\n"); + KMMessage::refsAsAnchor(mMsg->references()) + "
\n"); if (!mMsg->groups().isEmpty()) - mViewer->write(i18n("Groups: ") + mMsg->groups()+"
\n"); + mViewer->write(i18n("Groups: ") + mMsg->groups()+"
\n"); #endif - mViewer->write("
\n"); + mViewer->write("
\n"); break; case HdrAll: str = strToHtml(mMsg->headerAsString()); mViewer->write(str); - mViewer->write("\n
\n"); + mViewer->write("\n
\n"); break; default: warning("Unsupported header style %d", mHeaderStyle); } - mViewer->write("
\n"); + mViewer->write("
\n"); } @@ -646,17 +643,17 @@ { QString str = pgp->frontmatter(); if(!str.isEmpty()) htmlStr += quotedHTML(str); - htmlStr += "
"; + htmlStr += "
"; if (pgp->isEncrypted()) { pgpMessage = true; if(pgp->decrypt()) { - htmlStr += QString("%1
").arg(i18n("Encrypted message")); + htmlStr += QString("%1
").arg(i18n("Encrypted message")); } else { - htmlStr += QString("%1
%2

") + htmlStr += QString("%1
%2

") .arg(i18n("Cannot decrypt message:")) .arg(pgp->lastErrorMsg()); } @@ -679,15 +676,15 @@ if (sdata.contains(QRegExp("unknown key ID"))) { sdata.replace(QRegExp("unknown key ID"), i18n("unknown key ID")); - htmlStr += QString("%1 %2
").arg(sig).arg(sdata); + htmlStr += QString("%1 %2
").arg(sig).arg(sdata); } else { - htmlStr += QString("%1 %3
") + htmlStr += QString("%1 %3
") .arg(sig).arg(sdata).arg(sdata); } } htmlStr += quotedHTML(pgp->message()); - if(pgpMessage) htmlStr += "
End pgp message

"; + if(pgpMessage) htmlStr += "
End pgp message

"; str = pgp->backmatter(); if(!str.isEmpty()) htmlStr += quotedHTML(str); } @@ -740,11 +737,11 @@ } else if( prevQuoteLevel >= 0 ) { - line.prepend( "
\n" ); // Added extra BR to work around bug + line.prepend( "
\n" ); // Added extra BR to work around bug prevQuoteLevel = -1; } - tmpStr += line + "
\n"; + tmpStr += line + "
\n"; if( (newlineCount % 100) == 0 ) { htmlStr += tmpStr; @@ -849,9 +846,9 @@ aMsgPart->magicSetType(); iconName = aMsgPart->iconName(); } - mViewer->write("
" + label + - "
" + comment + "
"); + mViewer->write("
" + label + + "
" + comment + "
"); } @@ -909,7 +906,7 @@ } if (ch=='<') HTML_ADD("<", 4); else if (ch=='>') HTML_ADD(">", 4); - else if (ch=='\n') HTML_ADD("
", 4); + else if (ch=='\n') HTML_ADD("
", 4); else if (ch=='&') HTML_ADD("&", 5); else if ((ch=='h' && strncmp(pos,"http:", 5)==0) || (ch=='f' && strncmp(pos,"ftp:", 4)==0) || @@ -924,11 +921,11 @@ pos--; } str[i] = '\0'; - HTML_ADD("", 2); HTML_ADD(str, strlen(str)); - HTML_ADD("", 4); + HTML_ADD("", 4); } else if (ch=='@') { @@ -960,7 +957,7 @@ htmlPos -= (i1 - 1); if (iStr.length()>3) - iStr = "" + iStr + ""; + iStr = "" + iStr + ""; HTML_ADD(iStr.data(), iStr.length()); iStr = ""; } @@ -1136,13 +1133,13 @@ if (stricmp(msgPart.typeStr(), "text")==0) { win->mViewer->begin( KURL( "file:/" ) ); - win->mViewer->write(""); + win->mViewer->write(""); QString str = msgPart.bodyDecoded(); if (stricmp(msgPart.subtypeStr(), "html")==0) win->mViewer->write(str); else //plain text win->writeBodyStr(str); - win->mViewer->write(""); + win->mViewer->write(""); win->mViewer->end(); win->setCaption(i18n("View Attachment: ") + pname); win->show(); @@ -1154,9 +1151,9 @@ QString linkName = QString("") .arg(mAttachDir).arg(mAtmCurrent+1).arg(pname); win->mViewer->begin( KURL( "file:/" ) ); - win->mViewer->write(""); + win->mViewer->write(""); win->mViewer->write(linkName.data()); - win->mViewer->write(""); + win->mViewer->write(""); win->mViewer->end(); win->setCaption(i18n("View Attachment: ") + pname); win->show(); --- kmmessage.cpp_oldhtml Mon Apr 24 15:37:53 2000 +++ kmmessage.cpp Mon Apr 24 15:39:35 2000 @@ -1691,7 +1691,7 @@ if (email.isEmpty()) return email; - result = ""; if (stripped) result += KMMessage::stripEmailAddr(aEmail); else result += addr; - result += ""; + result += ""; if (ch == ',') { - result += ",


	"); - mViewer->write(strToHtml(mMsg->subject()) + " "); + ">	"); + mViewer->write(strToHtml(mMsg->subject()) + " "); mViewer->write(i18n("From: ")+ - KMMessage::emailAddrAsAnchor(mMsg->from(),FALSE) + " \n"); + KMMessage::emailAddrAsAnchor(mMsg->from(),FALSE) + " \n"); mViewer->write(i18n("To: ")+ - KMMessage::emailAddrAsAnchor(mMsg->to(),FALSE) + " \n"); + KMMessage::emailAddrAsAnchor(mMsg->to(),FALSE) + " \n"); if (!mMsg->cc().isEmpty()) mViewer->write(i18n("Cc: ")+ - KMMessage::emailAddrAsAnchor(mMsg->cc(),FALSE) + " \n"); + KMMessage::emailAddrAsAnchor(mMsg->cc(),FALSE) + " \n"); mViewer->write(i18n("Date: ")+ - strToHtml(mMsg->dateStr()) + " \n"); + strToHtml(mMsg->dateStr()) + " \n"); #ifdef KRN if (!mMsg->references().isEmpty()) mViewer->write(i18n("References: ") + - KMMessage::refsAsAnchor(mMsg->references()) + " \n"); + KMMessage::refsAsAnchor(mMsg->references()) + " \n"); #endif - mViewer->write("