[prev in list] [next in list] [prev in thread] [next in thread]
List: kmail-devel
Subject: HTML cleanup
From: Daniel Naber <dnaber () mini ! gt ! owl ! de>
Date: 2000-04-24 13:50:50
[Download RAW message or body]
Hi,
patch to clean up some HTML. Most of it isn't really necessary, but who knows,
maybe someday we want to feed XHTML to KHTML? :-) So the tags are now all
written with small letters. There have also been syntax errors which might
have been the cause for KHTML::find() still not working (they were not, but I
fixed them anyway).
Regards
Daniel
["html-fixes.diff" (text/plain)]
--- 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("<font color=\"%1\">").arg( color.name() );
+ QString str = QString("<font color=%1>").arg( color.name() );
if( font.italic() ) { str += "<i>"; }
if( font.bold() ) { str += "<b>"; }
return( str );
@@ -364,12 +364,12 @@
else
{
mViewer->begin( KURL( "file:/" ) );
- mViewer->write("<html><body" +
- QString(" bgcolor=\"#%1\"").arg(colorToString(c4)));
+ mViewer->write("<HTML><BODY" +
+ QString(" BGCOLOR=#%1").arg(colorToString(c4)));
if (mBackingPixmapOn)
mViewer->write(" background=\"file://" + mBackingPixmapStr + "\"");
- mViewer->write("></body></html>");
+ mViewer->write("></BODY></HTML>");
mViewer->end();
}
@@ -391,19 +391,16 @@
return;
mViewer->begin( KURL( "file:/" ) );
- mViewer->write("<html><head><style type=\"text/css\">" +
- QString("a { color: #%1;").arg(colorToString(c2)) +
+ mViewer->write("<HTML><HEAD><STYLE>" +
+ QString("a[href] { color: #%1;").arg(colorToString(c2)) +
"text-decoration: none; }" + // just playing
- "</style></head><body " +
- // TODO: move these to stylesheet, too:
- QString(" text=\"#%1\"").arg(colorToString(c1)) +
- QString(" bgcolor=\"#%1\"").arg(colorToString(c4)));
+ "</STYLE><BODY " +
+ QString(" TEXT=#%1").arg(colorToString(c1)) +
+ QString(" BGCOLOR=#%1").arg(colorToString(c4)));
if (mBackingPixmapOn)
mViewer->write(" background=\"file://" + mBackingPixmapStr + "\"");
-
- // TODO: move this to stylesheet, too:
- mViewer->write("><font face=\"" + mBodyFont +"\">");
+ mViewer->write("><FONT FACE=\"" + mBodyFont +"\">");
#if defined CHARSETS
printf("Setting viewer charset to %s\n",(const char *)mMsg->charset());
@@ -412,7 +409,7 @@
parseMsg(mMsg);
- mViewer->write("</font></body></html>");
+ mViewer->write("</FONT></BODY></HTML>");
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("<br><hr><br>");
+ if (i>0) mViewer->write("<BR><HR><BR>");
if (stricmp(subtype, "html")==0)
{
@@ -544,92 +541,92 @@
switch (mHeaderStyle)
{
case HdrBrief:
- mViewer->write("<font size=\"+1\"><b>" + strToHtml(mMsg->subject()) +
- "</b></font> (" +
+ mViewer->write("<FONT SIZE=+1><B>" + strToHtml(mMsg->subject()) +
+ "</B></FONT> (" +
KMMessage::emailAddrAsAnchor(mMsg->from(),TRUE) + ", ");
if (!mMsg->cc().isEmpty())
mViewer->write(i18n("Cc: ")+
KMMessage::emailAddrAsAnchor(mMsg->cc(),TRUE) + ", ");
- mViewer->write(strToHtml(mMsg->dateShortStr()) + ")<br>\n");
+ mViewer->write(strToHtml(mMsg->dateShortStr()) + ")<BR>\n");
break;
case HdrStandard:
- mViewer->write("<font size=\"+1\"><b>" +
- strToHtml(mMsg->subject()) + "</b></font><br>\n");
+ mViewer->write("<FONT SIZE=+1><B>" +
+ strToHtml(mMsg->subject()) + "</B></FONT><BR>\n");
mViewer->write(i18n("From: ") +
- KMMessage::emailAddrAsAnchor(mMsg->from(),FALSE) + "<br>\n");
+ KMMessage::emailAddrAsAnchor(mMsg->from(),FALSE) + "<BR>\n");
mViewer->write(i18n("To: ") +
- KMMessage::emailAddrAsAnchor(mMsg->to(),FALSE) + "<br>\n");
+ KMMessage::emailAddrAsAnchor(mMsg->to(),FALSE) + "<BR>\n");
if (!mMsg->cc().isEmpty())
mViewer->write(i18n("Cc: ")+
- KMMessage::emailAddrAsAnchor(mMsg->cc(),FALSE) + "<br>\n");
+ KMMessage::emailAddrAsAnchor(mMsg->cc(),FALSE) + "<BR>\n");
#ifdef KRN
if (!mMsg->references().isEmpty())
mViewer->write(i18n("References: ") +
- KMMessage::refsAsAnchor(mMsg->references()) + "<br>");
+ KMMessage::refsAsAnchor(mMsg->references()) + "<BR>");
#endif
- mViewer->write("<br>");
+ mViewer->write("<BR>");
break;
case HdrFancy:
- mViewer->write(QString("<table><tr><td><img src=") +
+ mViewer->write(QString("<TABLE><TR><TD><IMG SRC=") +
locate("data", "kmail/pics/kdelogo.xpm") +
- "></td><td hspace=\"50\"><b><font size=\"+2\">");
- mViewer->write(strToHtml(mMsg->subject()) + "</font></b><br>");
+ "></TD><TD HSPACE=50><B><FONT SIZE=+2>");
+ mViewer->write(strToHtml(mMsg->subject()) + "</FONT></B><BR>");
mViewer->write(i18n("From: ")+
- KMMessage::emailAddrAsAnchor(mMsg->from(),FALSE) + "<br>\n");
+ KMMessage::emailAddrAsAnchor(mMsg->from(),FALSE) + "<BR>\n");
mViewer->write(i18n("To: ")+
- KMMessage::emailAddrAsAnchor(mMsg->to(),FALSE) + "<br>\n");
+ KMMessage::emailAddrAsAnchor(mMsg->to(),FALSE) + "<BR>\n");
if (!mMsg->cc().isEmpty())
mViewer->write(i18n("Cc: ")+
- KMMessage::emailAddrAsAnchor(mMsg->cc(),FALSE) + "<br>\n");
+ KMMessage::emailAddrAsAnchor(mMsg->cc(),FALSE) + "<BR>\n");
mViewer->write(i18n("Date: ")+
- strToHtml(mMsg->dateStr()) + "<br>\n");
+ strToHtml(mMsg->dateStr()) + "<BR>\n");
#ifdef KRN
if (!mMsg->references().isEmpty())
mViewer->write(i18n("References: ") +
- KMMessage::refsAsAnchor(mMsg->references()) + "<br><br>\n");
+ KMMessage::refsAsAnchor(mMsg->references()) + "<BR><BR>\n");
#endif
- mViewer->write("</b></td></tr></table><br>\n");
+ mViewer->write("</B></TD></TR></TABLE><BR>\n");
break;
case HdrLong:
- mViewer->write("<font size=\"+1\"><b>" +
- strToHtml(mMsg->subject()) + "</B></font><br>");
- mViewer->write(i18n("Date: ")+strToHtml(mMsg->dateStr())+"<br>");
+ mViewer->write("<FONT SIZE=+1><B>" +
+ strToHtml(mMsg->subject()) + "</B></FONT><BR>");
+ mViewer->write(i18n("Date: ")+strToHtml(mMsg->dateStr())+"<BR>");
mViewer->write(i18n("From: ")+
- KMMessage::emailAddrAsAnchor(mMsg->from(),FALSE) + "<br>");
+ KMMessage::emailAddrAsAnchor(mMsg->from(),FALSE) + "<BR>");
mViewer->write(i18n("To: ")+
- KMMessage::emailAddrAsAnchor(mMsg->to(),FALSE) + "<br>");
+ KMMessage::emailAddrAsAnchor(mMsg->to(),FALSE) + "<BR>");
if (!mMsg->cc().isEmpty())
mViewer->write(i18n("Cc: ")+
- KMMessage::emailAddrAsAnchor(mMsg->cc(),FALSE) + "<br>");
+ KMMessage::emailAddrAsAnchor(mMsg->cc(),FALSE) + "<BR>");
if (!mMsg->bcc().isEmpty())
mViewer->write(i18n("Bcc: ")+
- KMMessage::emailAddrAsAnchor(mMsg->bcc(),FALSE) + "<br>");
+ KMMessage::emailAddrAsAnchor(mMsg->bcc(),FALSE) + "<BR>");
if (!mMsg->replyTo().isEmpty())
mViewer->write(i18n("Reply to: ")+
- KMMessage::emailAddrAsAnchor(mMsg->replyTo(),FALSE) + "<br>");
+ KMMessage::emailAddrAsAnchor(mMsg->replyTo(),FALSE) + "<BR>");
#ifdef KRN
if (!mMsg->references().isEmpty())
mViewer->write(i18n("References: ")+
- KMMessage::refsAsAnchor(mMsg->references()) + "<br>\n");
+ KMMessage::refsAsAnchor(mMsg->references()) + "<BR>\n");
if (!mMsg->groups().isEmpty())
- mViewer->write(i18n("Groups: ") + mMsg->groups()+"<br>\n");
+ mViewer->write(i18n("Groups: ") + mMsg->groups()+"<BR>\n");
#endif
- mViewer->write("<br>\n");
+ mViewer->write("<BR>\n");
break;
case HdrAll:
str = strToHtml(mMsg->headerAsString());
mViewer->write(str);
- mViewer->write("\n<br>\n");
+ mViewer->write("\n<BR>\n");
break;
default:
warning("Unsupported header style %d", mHeaderStyle);
}
- mViewer->write("<br>\n");
+ mViewer->write("<BR>\n");
}
@@ -646,17 +643,17 @@
{
QString str = pgp->frontmatter();
if(!str.isEmpty()) htmlStr += quotedHTML(str);
- htmlStr += "<br>";
+ htmlStr += "<BR>";
if (pgp->isEncrypted())
{
pgpMessage = true;
if(pgp->decrypt())
{
- htmlStr += QString("<b>%1</b><br>").arg(i18n("Encrypted message"));
+ htmlStr += QString("<B>%1</B><BR>").arg(i18n("Encrypted message"));
}
else
{
- htmlStr += QString("<b>%1</b><br>%2<br><br>")
+ htmlStr += QString("<B>%1</B><BR>%2<BR><BR>")
.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("<b>%1 %2</b><br>").arg(sig).arg(sdata);
+ htmlStr += QString("<B>%1 %2</B><BR>").arg(sig).arg(sdata);
}
else {
- htmlStr += QString("<b>%1 <a href=\"mailto:%2\">%3</a></b><br>")
+ htmlStr += QString("<B>%1 <A HREF=\"mailto:%2\">%3</A></B><BR>")
.arg(sig).arg(sdata).arg(sdata);
}
}
htmlStr += quotedHTML(pgp->message());
- if(pgpMessage) htmlStr += "<br><b>End pgp message</b><br><br>";
+ if(pgpMessage) htmlStr += "<BR><B>End pgp message</B><BR><BR>";
str = pgp->backmatter();
if(!str.isEmpty()) htmlStr += quotedHTML(str);
}
@@ -740,11 +737,11 @@
}
else if( prevQuoteLevel >= 0 )
{
- line.prepend( "</font><br>\n" ); // Added extra BR to work around bug
+ line.prepend( "</font><BR>\n" ); // Added extra BR to work around bug
prevQuoteLevel = -1;
}
- tmpStr += line + "<br>\n";
+ tmpStr += line + "<BR>\n";
if( (newlineCount % 100) == 0 )
{
htmlStr += tmpStr;
@@ -849,9 +846,9 @@
aMsgPart->magicSetType();
iconName = aMsgPart->iconName();
}
- mViewer->write("<table><tr><td><a href=\"" + href + "\"><img src=\"" +
- iconName + "\" border=\"0\">" + label +
- "</a></td></tr></table>" + comment + "<br>");
+ mViewer->write("<TABLE><TR><TD><A HREF=\"" + href + "\"><IMG SRC=\"" +
+ iconName + "\" BORDER=0>" + label +
+ "</A></TD></TR></TABLE>" + comment + "<BR>");
}
@@ -909,7 +906,7 @@
}
if (ch=='<') HTML_ADD("<", 4);
else if (ch=='>') HTML_ADD(">", 4);
- else if (ch=='\n') HTML_ADD("<br>", 4);
+ else if (ch=='\n') HTML_ADD("<BR>", 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("<a href=\"", 9);
+ HTML_ADD("<A HREF=\"", 9);
HTML_ADD(str, strlen(str));
HTML_ADD("\">", 2);
HTML_ADD(str, strlen(str));
- HTML_ADD("</a>", 4);
+ HTML_ADD("</A>", 4);
}
else if (ch=='@')
{
@@ -960,7 +957,7 @@
htmlPos -= (i1 - 1);
if (iStr.length()>3)
- iStr = "<a href=\"mailto:" + iStr + "\">" + iStr + "</a>";
+ iStr = "<A HREF=\"mailto:" + iStr + "\">" + iStr + "</A>";
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("<html><body>");
+ win->mViewer->write("<HTML><BODY>");
QString str = msgPart.bodyDecoded();
if (stricmp(msgPart.subtypeStr(), "html")==0)
win->mViewer->write(str);
else //plain text
win->writeBodyStr(str);
- win->mViewer->write("</body></html>");
+ win->mViewer->write("</BODY></HTML>");
win->mViewer->end();
win->setCaption(i18n("View Attachment: ") + pname);
win->show();
@@ -1154,9 +1151,9 @@
QString linkName = QString("<img src=\"file:%1/part%2/%3\" border=0>")
.arg(mAttachDir).arg(mAtmCurrent+1).arg(pname);
win->mViewer->begin( KURL( "file:/" ) );
- win->mViewer->write("<html><body>");
+ win->mViewer->write("<HTML><BODY>");
win->mViewer->write(linkName.data());
- win->mViewer->write("</body></html>");
+ win->mViewer->write("</BODY></HTML>");
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 = "<A HREF=\"mailto:";
+ result = "<a href=\"mailto:";
for (pos=email.data(); *pos; pos++)
{
ch = *pos;
@@ -1708,10 +1708,10 @@
result += "\">";
if (stripped) result += KMMessage::stripEmailAddr(aEmail);
else result += addr;
- result += "</A>";
+ result += "</a>";
if (ch == ',')
{
- result += ", <A HREF=\"mailto:";
+ result += ", <a href=\"mailto:";
while (pos[1]==' ') pos++;
}
addr = "";
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic