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

List:       kde-commits
Subject:    playground/pim/mailody
From:       Tom Albers <tomalbers () kde ! nl>
Date:       2007-01-31 20:05:45
Message-ID: 1170273945.702248.29444.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 628883 by toma:

If the resent to header is empty, use the normal to header, this is the best we can \
do during string freeze.


 M  +0 -1      TODO  
 M  +13 -7     src/messageview.cpp  


--- trunk/playground/pim/mailody/TODO #628882:628883
@@ -2,7 +2,6 @@
   draw error when opening a fresh mailbox - headers not parsed in time.
   check if newly addressess in the addressbook are directly usable in the composer.
   tooltip does not dissapear when app is no longer in focus
-  resend by ... to ... -> check if there is a to first...
   fill pulldowns to/forward with current addressess when there are no addresses yet.
   allow new mail when no mailbox is selected. Just store it in Inbox.
 
--- trunk/playground/pim/mailody/src/messageview.cpp #628882:628883
@@ -299,22 +299,22 @@
         text.append("<td valign=top width=100%>" + t + "</td></tr>");
 
     QStringList* to = m_currentMessage->to_list();
+    QString toList;
     if ((*to).count()>0)
     {
-        QString t;
         QStringList::Iterator it=to->begin();
         for(; it!=to->end(); ++it)
         {
-            if (!t.isEmpty())
-                t.append(", ");
-                t.append("<a href=\"email:"
+            if (!toList.isEmpty())
+                toList.append(", ");
+                toList.append("<a href=\"email:"
                     + LinkLocator::convertToHtml((*it).stripWhiteSpace(), flags)
                     + "\">"
                     + LinkLocator::convertToHtml((*it).stripWhiteSpace(), flags)
                     + "</a>");
         }
         text.append("<tr><td align=right valign=top>" + i18n("To") + ": </td>");
-        text.append("<td valign=top>" + t + "</td></tr>");
+        text.append("<td valign=top>" + toList + "</td></tr>");
     }
 
     QStringList* cc = m_currentMessage->cc_list();
@@ -341,13 +341,19 @@
     QString resentFrom = m_currentMessage->resentFrom().stripWhiteSpace();
     if (!resentFrom.isEmpty())
     {
-        QString resentTo = m_currentMessage->resentTo().stripWhiteSpace();
         QString t = "<a href=\"email:"
                 + LinkLocator::convertToHtml(resentFrom, flags) +"\">"
                 + LinkLocator::convertToHtml(resentFrom, flags) + "</a>";
-        QString t2 = "<a href=\"email:"
+
+        QString t2;
+        QString resentTo = m_currentMessage->resentTo().stripWhiteSpace();
+        if (resentTo.isEmpty())
+            t2 = toList;
+        else
+            t2 = "<a href=\"email:"
                 + LinkLocator::convertToHtml(resentTo, flags) +"\">"
                 + LinkLocator::convertToHtml(resentTo, flags) + "</a>";
+
         text.append("<tr><td valign=top align=right><nobr>" +
                 i18n("Resent")+": </nobr></td>");
         text.append("<td valign=top>"


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