add IconRole for Attachments

3 files changed, 11 insertions, 1 deletions

diff --git a/components/package/contents/ui/MailViewer.qml b/components/package/contents/ui/MailViewer.qml
index d7581470..ecffa866 100644
--- a/components/package/contents/ui/MailViewer.qml
+++ b/components/package/contents/ui/MailViewer.qml
@@ -77,6 +77,11 @@ Item {
             width: 60
         }
         TableViewColumn {
+            role: "icon"
+            title: "Icon"
+            width: 60
+        }
+        TableViewColumn {
             role: "size"
             title: "Size"
             width: 60
diff --git a/framework/domain/attachmentmodel.cpp b/framework/domain/attachmentmodel.cpp
index 35e94e2e..e98c6fc0 100644
--- a/framework/domain/attachmentmodel.cpp
+++ b/framework/domain/attachmentmodel.cpp
@@ -20,6 +20,7 @@
 #include "messageparser.h"
 #include "mimetreeparser/interface.h"
 
+#include <QIcon>
 #include <QDebug>
 
 QString sizeHuman(const Content::Ptr &content)
@@ -36,7 +37,7 @@ QString sizeHuman(const Content::Ptr &content)
         unit = i.next();
         num /= 1024.0;
     }
-    
+
     if (unit == "Bytes") {
         return QString().setNum(num) + " " + unit;
     } else {
@@ -76,6 +77,7 @@ QHash<int, QByteArray> AttachmentModel::roleNames() const
     roles[TypeRole] = "type";
     roles[NameRole] = "name";
     roles[SizeRole] = "size";
+    roles[IconRole] = "icon";
     roles[IsEncryptedRole] = "encrypted";
     roles[IsSignedRole] = "signed";
     return roles;
@@ -111,6 +113,8 @@ QVariant AttachmentModel::data(const QModelIndex &index, int role) const
             return content->mailMime()->mimetype().name();
         case NameRole:
             return entry->mailMime()->filename();
+        case IconRole:
+            return QIcon::fromTheme(content->mailMime()->mimetype().iconName());
         case SizeRole:
             return sizeHuman(content);
         case IsEncryptedRole:
diff --git a/framework/domain/messageparser.h b/framework/domain/messageparser.h
index 203f7576..036cff7d 100644
--- a/framework/domain/messageparser.h
+++ b/framework/domain/messageparser.h
@@ -136,6 +136,7 @@ public:
 public:
     enum Roles {
         TypeRole  = Qt::UserRole + 1,
+        IconRole,
         NameRole,
         SizeRole,
         IsEncryptedRole,