[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 17:27:46
Message-ID: 1122744466.611762.21250.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 440493 by sngeorgaras:
fixing bugs...
M +40 -19 kmhtmlarchive.cpp
--- trunk/kdenonbeta/kio_mhtml/kmhtmlarchive.cpp #440492:440493
@@ -1555,13 +1555,18 @@
// kdDebug()<<"italics["<<i<<"]="<<italics[i]<<endl;
}
// create part to be added
- for(int i=0;i<4;i++){
- QCString stTag("<font face=\"");
- if(!fonts[i].isEmpty()){
+ for(int i=0;i<3;i++){
+ QCString stTag("<font ");
+ //face=\"
+ if(fonts[i]!=fonts[4] || fonts[i].isEmpty()){
+ stTag.append("color=\"");
+
+ }else{
+ stTag.append("face=\"");
stTag.append(fonts[i]);
- stTag.append(",");
+ stTag.append("\" color=\"");
}
- stTag.append("San Serif,Serif\" color=\"");
+
cols[i].prepend(stTag);
cols[i].append("\">");
if(bold[i]=="75") cols[i].append("<b>");
@@ -1570,8 +1575,9 @@
// add font tags
for(int i=curGtEl;i>=0;i--){
QCString enTag("</font>");
+ //if(fonts[gtEl[i].level]==fonts[4] && !fonts[4].isEmpty()) enTag="";
if(italics[gtEl[i].level]=="1") enTag.append("</i>");
- if(bold[gtEl[i].level]=="75") enTag.prepend("</b>");
+ if(bold[gtEl[i].level]=="75") enTag.append("</b>");
str.insert(gtEl[i].end,enTag);
str.insert(gtEl[i].start,cols[gtEl[i].level]);
}
@@ -1593,19 +1599,32 @@
// 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++;
+ //kdDebug()<<"find="<<find<<endl;
+ if(find!=-1 && !fonts[3].isEmpty()){
+ find+=6;
+ QCString body="style=\"font-family : ";
+ body.append(fonts[3]);
+ if(!size[3].isEmpty()){
+ body.append("; font-size : ");
+ body.append(size[3]);
+ body.append("pt;\" ");
+ }else{
+ body.append(";\" ");
+ }
+ str.insert(find,body);
}
+// 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++;
+// }
@@ -1689,13 +1708,15 @@
en++;
ff=str.mid(en,1);
}
+ //kdDebug()<<"en="<<en<<endl;
//kdDebug()<<"\""<<str.mid(st,en-st)<<"\""<<endl;
QCString temp=str.mid(st,en-st);
temp.insert(0,"<a href=\"mailto:");
temp.append("\">");
str.insert(en,"</a>");
str.insert(st,temp);
- find=find+en+20;
+ //find=find+en+20;
+ find=en+2+temp.length();
}else find++;
}
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic