[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdenonbeta/kio_mhtml
From: Spiros Georgaras <sngeorgaras () otenet ! gr>
Date: 2005-07-30 14:46:16
Message-ID: 1122734776.550228.16958.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 440444 by sngeorgaras:
adding font info for normal text in EML
M +36 -16 kmhtmlarchive.cpp
--- trunk/kdenonbeta/kio_mhtml/kmhtmlarchive.cpp #440443:440444
@@ -1501,9 +1501,6 @@
gtEl[curGtEl].end=end;
// calculate level
-
-
-
int tmp=0;
int oldTmp=0;
gtEl[curGtEl].level=-1;
@@ -1517,20 +1514,20 @@
gtEl[curGtEl].level=gtEl[curGtEl].level%3;
//kdDebug()<<oneLine<<endl;
//kdDebug()<<"gtEl["<<curGtEl<<"].level="<<gtEl[curGtEl].level<<endl;
-
find=end;
}
// read quoted text colors
- QCString cols[3];
- QString fonts[3];
- QString bold[3];
- QString italics[3];
- QString size[3];
+ QCString cols[4];
+ QString fonts[4];
+ QString bold[4];
+ QString italics[4];
+ QString size[4];
QString entrName;
KConfig config("kmailrc",true,false,"config");
config.setGroup("Reader");
- for(int i=0;i<3;i++){
- entrName.sprintf("QuotedText%d",i+1);
+ for(int i=0;i<4;i++){
+ if(i<3) entrName.sprintf("QuotedText%d",i+1);
+ else entrName="ForegroundColor";
QColor bCol=config.readColorEntry(entrName);
QString l;
l.sprintf("#%2X%2X%2X", bCol.red(),bCol.green(), bCol.blue());
@@ -1539,8 +1536,9 @@
}
// read font values
config.setGroup("Fonts");
- for(int i=0;i<3;i++){
- entrName.sprintf("quote%d-font",i+1);
+ for(int i=0;i<4;i++){
+ if(i<3) entrName.sprintf("quote%d-font",i+1);
+ else entrName="body-font";
QStringList font=config.readListEntry(entrName);
QStringList::iterator it;
int cc=0;
@@ -1557,10 +1555,13 @@
// kdDebug()<<"italics["<<i<<"]="<<italics[i]<<endl;
}
// create part to be added
- for(int i=0;i<3;i++){
+ for(int i=0;i<4;i++){
QCString stTag("<font face=\"");
- stTag.append(fonts[i]);
- stTag.append(",San Serif,Serif\" color=\"");
+ if(!fonts[i].isEmpty()){
+ stTag.append(fonts[i]);
+ stTag.append(",");
+ }
+ stTag.append("San Serif,Serif\" color=\"");
cols[i].prepend(stTag);
cols[i].append("\">");
if(bold[i]=="75") cols[i].append("<b>");
@@ -1590,6 +1591,25 @@
+ // fix body font
+ find=str.find("<body ",0);
+ kdDebug()<<"find="<<find<<endl;
+ while((find=str.find("\n",find))!=-1){
+// kdDebug()<<"find="<<find<<endl;
+// kdDebug()<<str.mid(find+1,6)<<endl;
+ if(str.mid(find+1,6)!="<font "){
+ str.insert(find+1,cols[3]);
+ find+=cols[3].length();
+ int closeFont=str.find("\n",find+1);
+ kdDebug()<<"closeFont="<<closeFont<<endl;
+ kdDebug()<<str.mid(closeFont+1,6)<<endl;
+ if(closeFont!=-1) str.insert(closeFont,"</font>");
+ }else find++;
+ }
+
+
+
+
// convert links to html
#define LINKS 3
char s[LINKS][15]={
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic