Branch 'feature/notes_on_emails' - 2 commits - messagelist/core

[Aaron Seigo]

 messagelist/core/messageitem.cpp |    2 --
 messagelist/core/view.cpp        |    9 ---------
 2 files changed, 11 deletions(-)

New commits:
commit 5c604c53b556c36d651d9d8d4e84c9cd3804672b
Author: Aaron Seigo <aseigo at kde.org>
Date:   Fri Oct 10 16:50:50 2014 +0200

    these are not fixmes at this point

diff --git a/messagelist/core/messageitem.cpp b/messagelist/core/messageitem.cpp
index 2e981f8..e4a9b02 100644
--- a/messagelist/core/messageitem.cpp
+++ b/messagelist/core/messageitem.cpp
@@ -168,7 +168,6 @@ void MessageItemPrivate::invalidateTagCache()
 
 void MessageItemPrivate::invalidateAnnotationCache()
 {
-  //FIXME NOTES_ON_EMAIL
 }
 
 const MessageItem::Tag* MessageItemPrivate::bestTag() const
@@ -321,7 +320,6 @@ void MessageItem::invalidateTagCache()
 void MessageItem::invalidateAnnotationCache()
 {
     Q_D( MessageItem );
-    //FIXME: NOTES_ON_EMAIL
     d->invalidateAnnotationCache();
 }
 


commit f1b0e422a2cbaccb6f3bcaeaf2fd8e512c8b4165
Author: Aaron Seigo <aseigo at kde.org>
Date:   Fri Oct 10 16:50:04 2014 +0200

    don't show the note in the tooltip
    
    loading it requires roundtrips (async, less performance) and the
    note may be arbitrarily large?

diff --git a/messagelist/core/view.cpp b/messagelist/core/view.cpp
index 9fb557e..05c58e6 100644
--- a/messagelist/core/view.cpp
+++ b/messagelist/core/view.cpp
@@ -2427,15 +2427,6 @@ bool View::event( QEvent *e )
             tip += htmlCodeForStandardRow.arg( mi->formattedSize() ).arg( i18n( "Size" ) );
         }
 
-        if ( mi->hasAnnotation() && mi->annotation().hasPayload<KMime::Message::Ptr>()) {
-            QString note = Akonadi::NoteUtils::NoteMessageWrapper( mi->annotation().payload<KMime::Message::Ptr>() ).text();
-            if ( textIsLeftToRight ) {
-                tip += htmlCodeForStandardRow.arg( i18n( "Note" ) ).arg( note.replace( QLatin1Char( '\n' ), QLatin1String( "<br>" ) ) );
-            } else {
-                tip += htmlCodeForStandardRow.arg( note.replace( QLatin1Char( '\n' ), QLatin1String( "<br>" ) ) ).arg( i18n( "Note" ) );
-            }
-        }
-
         QString content = MessageList::Util::contentSummary( mi->akonadiItem() );
         if ( !content.trimmed().isEmpty() ) {
             if ( textIsLeftToRight ) {