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

List:       kde-commits
Subject:    trunk/KDE/kdepim/kmail
From:       Mario Teijeiro Otero <emeteo () escomposlinux ! org>
Date:       2005-05-04 13:04:11
Message-ID: 1115211851.078105.23961.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 409250 by mteijeiro:

* Fix color of quoting when  "Show expand/collapse quote marks" is disabled.



 M  +14 -14    trunk/KDE/kdepim/kmail/objecttreeparser.cpp  


--- trunk/KDE/kdepim/kmail/objecttreeparser.cpp #409249:409250
@@ -2497,10 +2497,10 @@
 
     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 @@
       {
         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 @@
               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];
       }
[prev in list] [next in list] [prev in thread] [next in thread]