[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 12:17:57
Message-ID: 1122725877.134422.14595.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 440417 by sngeorgaras:

adding font info for quoted text in EML

 M  +44 -27    kmhtmlarchive.cpp  


--- trunk/kdenonbeta/kio_mhtml/kmhtmlarchive.cpp #440416:440417
@@ -1520,42 +1520,60 @@
 					
 					find=end;
 				}
-				
-				// read level colors
-				
+				// read quoted text colors
 				QCString cols[3];
+				QString fonts[3];
+				QString bold[3];
+				QString italics[3];
+				QString size[3];
+				QString entrName;
 				KConfig config("kmailrc",true,false,"config");
 				config.setGroup("Reader");
-				QColor bCol=config.readColorEntry("QuotedText1");
-				QString l;
-				l.sprintf("#%2X%2X%2X", bCol.red(),bCol.green(), bCol.blue());
-				l.replace(" ","0");
-				cols[0]=l;
-				
-				bCol=config.readColorEntry("QuotedText2");
-				QString l2;
-				l.sprintf("#%2X%2X%2X", bCol.red(),bCol.green(), bCol.blue());
-				l.replace(" ","0");
-				cols[1]=l;
-				
-				bCol=config.readColorEntry("QuotedText3");
-				QString l3;
-				l.sprintf("#%2X%2X%2X", bCol.red(),bCol.green(), bCol.blue());
-				l.replace(" ","0");
-				cols[2]=l;
-				
 				for(int i=0;i<3;i++){
-					cols[i].prepend("<font color=\"");
+					entrName.sprintf("QuotedText%d",i+1);
+					QColor bCol=config.readColorEntry(entrName);
+					QString l;
+					l.sprintf("#%2X%2X%2X", bCol.red(),bCol.green(), bCol.blue());
+					l.replace(" ","0");
+					cols[i]=l;
+				}
+				// read font values
+				config.setGroup("Fonts");
+				for(int i=0;i<3;i++){
+					entrName.sprintf("quote%d-font",i+1);
+					QStringList font=config.readListEntry(entrName);
+					QStringList::iterator it;
+					int cc=0;
+					for(it=font.begin();it!=font.end();++it ){
+						if(cc==0) fonts[i]=*(it);
+						else if(cc==1) size[i]=*(it);
+						else if(cc==4) bold[i]=*(it);
+						else if(cc==5) italics[i]=*(it);
+						cc++;
+					}
+// 						kdDebug()<<"fonts["<<i<<"]="<<fonts[i]<<endl;
+// 						kdDebug()<<"size["<<i<<"]="<<size[i]<<endl;
+// 						kdDebug()<<"bold["<<i<<"]="<<bold[i]<<endl;
+// 						kdDebug()<<"italics["<<i<<"]="<<italics[i]<<endl;
+				}
+				// create part to be added
+				for(int i=0;i<3;i++){
+					QCString stTag("<font face=\"");
+					stTag.append(fonts[i]);
+					stTag.append(",San Serif,Serif\" color=\"");
+					cols[i].prepend(stTag);
 					cols[i].append("\">");
+					if(bold[i]=="75") cols[i].append("<b>");
+					if(italics[i]=="1") cols[i].append("<i>");
 				}
-				
 				// add font tags
 				for(int i=curGtEl;i>=0;i--){
-					str.insert(gtEl[i].end,"</font>");
+					QCString enTag("</font>");
+					if(italics[gtEl[i].level]=="1") enTag.append("</i>");
+					if(bold[gtEl[i].level]=="75") enTag.prepend("</b>");
+					str.insert(gtEl[i].end,enTag);
 					str.insert(gtEl[i].start,cols[gtEl[i].level]);
 				}
-				
-				
 				// insert level 0 color in lines
 				// that contain only a >
 				QCString onlyGt;
@@ -1568,7 +1586,6 @@
 					str.insert(find+2,"</font>");
 					str.insert(find+1,cols[0]);
 				}
-
 				delete gtEl;
 				
 				
[prev in list] [next in list] [prev in thread] [next in thread]