summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2017-05-24 07:03:39 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2017-05-24 07:03:39 +0200
commitb252cffc8808153377d7536ece006f5df17577be (patch)
tree8ec8f83b7f653a47fd8a5ed155cc247060d165d2
parent9ccf589a411591602c55c274035b0ba2b02c20bd (diff)
downloadkube-b252cffc8808153377d7536ece006f5df17577be.tar.gz
kube-b252cffc8808153377d7536ece006f5df17577be.zip
Show attachment icon
-rw-r--r--framework/qml/MailViewer.qml2
-rw-r--r--framework/src/domain/mime/attachmentmodel.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/framework/qml/MailViewer.qml b/framework/qml/MailViewer.qml
index aae43994..73dcc291 100644
--- a/framework/qml/MailViewer.qml
+++ b/framework/qml/MailViewer.qml
@@ -283,7 +283,7 @@ Rectangle {
283 283
284 delegate: AttachmentDelegate { 284 delegate: AttachmentDelegate {
285 name: model.name 285 name: model.name
286 icon: "mail-attachment" 286 icon: model.iconName
287 287
288 clip: true 288 clip: true
289 289
diff --git a/framework/src/domain/mime/attachmentmodel.cpp b/framework/src/domain/mime/attachmentmodel.cpp
index e98c6fc0..2871579c 100644
--- a/framework/src/domain/mime/attachmentmodel.cpp
+++ b/framework/src/domain/mime/attachmentmodel.cpp
@@ -77,7 +77,7 @@ QHash<int, QByteArray> AttachmentModel::roleNames() const
77 roles[TypeRole] = "type"; 77 roles[TypeRole] = "type";
78 roles[NameRole] = "name"; 78 roles[NameRole] = "name";
79 roles[SizeRole] = "size"; 79 roles[SizeRole] = "size";
80 roles[IconRole] = "icon"; 80 roles[IconRole] = "iconName";
81 roles[IsEncryptedRole] = "encrypted"; 81 roles[IsEncryptedRole] = "encrypted";
82 roles[IsSignedRole] = "signed"; 82 roles[IsSignedRole] = "signed";
83 return roles; 83 return roles;
@@ -114,7 +114,7 @@ QVariant AttachmentModel::data(const QModelIndex &index, int role) const
114 case NameRole: 114 case NameRole:
115 return entry->mailMime()->filename(); 115 return entry->mailMime()->filename();
116 case IconRole: 116 case IconRole:
117 return QIcon::fromTheme(content->mailMime()->mimetype().iconName()); 117 return content->mailMime()->mimetype().iconName();
118 case SizeRole: 118 case SizeRole:
119 return sizeHuman(content); 119 return sizeHuman(content);
120 case IsEncryptedRole: 120 case IsEncryptedRole: