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

List:       kde-commits
Subject:    [kdepim/vendor/eyeos] messageviewer/viewer: Return attachment by default
From:       Montel Laurent <laurent.montel () kdab ! com>
Date:       2016-02-05 13:38:14
Message-ID: E1aRgaU-0000My-UF () scm ! kde ! org
[Download RAW message or body]

Git commit ca3375f5662f41285259e5c8a2b0dd3f6f8c7ae8 by Montel Laurent.
Committed on 05/02/2016 at 13:37.
Pushed by mlaurent into branch 'vendor/eyeos'.

Return attachment by default

M  +1    -0    messageviewer/viewer/nodehelper.cpp
M  +2    -2    messageviewer/viewer/objecttreeparser.cpp

http://commits.kde.org/kdepim/ca3375f5662f41285259e5c8a2b0dd3f6f8c7ae8

diff --git a/messageviewer/viewer/nodehelper.cpp \
b/messageviewer/viewer/nodehelper.cpp index 746a2f0..52ebcf5 100644
--- a/messageviewer/viewer/nodehelper.cpp
+++ b/messageviewer/viewer/nodehelper.cpp
@@ -470,6 +470,7 @@ KMMsgSignatureState NodeHelper::overallSignatureState( \
KMime::Content* node ) co  
 QString NodeHelper::iconName( KMime::Content *node, int size )
 {
+    return IconNameCache::instance()->iconPath( \
QString::fromLatin1("mail-attachment"), size );  if ( !node )
     return QString();
 
diff --git a/messageviewer/viewer/objecttreeparser.cpp \
b/messageviewer/viewer/objecttreeparser.cpp index c6186be..30b11b8 100644
--- a/messageviewer/viewer/objecttreeparser.cpp
+++ b/messageviewer/viewer/objecttreeparser.cpp
@@ -2231,8 +2231,8 @@ void ObjectTreeParser::writePartIcon( KMime::Content * msgPart, \
bool inlineImage  mNodeHelper->magicSetType( msgPart );
             //iconName = mNodeHelper->iconName( msgPart );
         }
-        htmlWriter()->queue( QLatin1String("<hr><div><a href=\"") + href + \
                QLatin1String("\"><img align=\"center\" src=\"file:///") +
-                             iconName + QLatin1String("\" border=\"0\" \
style=\"max-width: 100%\" alt=\"\"/>") + label + +        htmlWriter()->queue( \
QLatin1String("<hr><div><a href=\"") + href + QString::fromLatin1("\"><img \
align=\"center\" height=\"22\" width=\"22\" src=\"file:///") + +                      \
iconName + QLatin1String("\" border=\"0\" style=\"max-width: 100%\" alt=\"\"/> ") + \
label +  QLatin1String("</a></div>"
                                            "<div>") + comment +QLatin1String( \
"</div>") );  }


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