[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kmail-devel
Subject:    Re: [PATCH] Hide by Level Quote on message view
From:       Mario Teijeiro Otero <emeteo () escomposlinux ! org>
Date:       2005-05-03 22:11:20
Message-ID: 200505040011.25802.emeteo () escomposlinux ! org
[Download RAW message or body]

[Attachment #2 (multipart/signed)]

[Attachment #4 (multipart/mixed)]


On Tuesday 03 May 2005 23:12, Mario Teijeiro Otero wrote:
> > Attached is an example of the all-green fonts.
> > The "Besides KDE itself.." line should be in black.
>
> I can reproduce it, with the same message. Some times works right.
> I see to this.

Attached go the fix patch. When the svn | cvs goes to write mode, i'll commit 
it.

Regards

["fix_quotelevelfont.diff" (text/x-diff)]

Index: objecttreeparser.cpp
===================================================================
RCS file: /home/kde/kdepim/kmail/objecttreeparser.cpp,v
retrieving revision 1.133
diff -u -p -r1.133 objecttreeparser.cpp
--- objecttreeparser.cpp	28 Apr 2005 20:18:43 -0000	1.133
+++ objecttreeparser.cpp	3 May 2005 22:08:08 -0000
@@ -2497,10 +2497,10 @@ QString ObjectTreeParser::quotedHTML( co
 
     bool actHidden = false;
     QString textExpand;
-    // LevelQuote:
-    // 0  don't hide anything
-    // >0 hide the level 1, 2,3,... and so on
-    if ( mReader->mLevelQuote >= 0 && mReader->mLevelQuote <= ( actQuoteLevel ) )
+
+    // This quoted line needs be hiden
+    if (GlobalSettings::showExpandQuotesMark() && mReader->mLevelQuote >= 0 
+        && mReader->mLevelQuote <= ( actQuoteLevel ) )
       actHidden = true;
 
     if ( actQuoteLevel != currQuoteLevel ) {
@@ -2517,17 +2517,8 @@ QString ObjectTreeParser::quotedHTML( co
       {
         if ( GlobalSettings::showExpandQuotesMark() ) 
         {
-          if ( !actHidden ) 
+          if (  actHidden )
           {
-            htmlStr += "<div class=\"quotelevelmark\" >" ;
-            htmlStr += QString( "<a href=\"kmail:levelquote?%1 \">"
-                "<img src=\"%2\" alt=\"\" title=\"\"/></a>" )
-              .arg(actQuoteLevel)
-              .arg( mCollapseIcon);
-            htmlStr += "</div>";
-            htmlStr += quoteFontTag[actQuoteLevel%3];
-          }
-          else
             //only show the QuoteMark when is the first line of the level hidden
             if ( !curHidden ) 
             {
@@ -2540,6 +2531,15 @@ QString ObjectTreeParser::quotedHTML( co
               htmlStr += "</div><br/>";
               htmlStr += quoteEnd;
             }
+          }else {
+            htmlStr += "<div class=\"quotelevelmark\" >" ;
+            htmlStr += QString( "<a href=\"kmail:levelquote?%1 \">"
+                "<img src=\"%2\" alt=\"\" title=\"\"/></a>" )
+              .arg(actQuoteLevel)
+              .arg( mCollapseIcon);
+            htmlStr += "</div>";
+            htmlStr += quoteFontTag[actQuoteLevel%3];
+          }
         } else 
           htmlStr += quoteFontTag[actQuoteLevel%3];
       }

[Attachment #8 (application/pgp-signature)]

_______________________________________________
KMail developers mailing list
KMail-devel@kde.org
https://mail.kde.org/mailman/listinfo/kmail-devel


[prev in list] [next in list] [prev in thread] [next in thread]