summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-08-28 13:27:52 +0200
committerMontel Laurent <[email protected]>2015-08-28 13:59:36 +0200
commitf203fd458b44e17feb09e8ed9ad69e3a61244171 (patch)
treec9415b62299695d6910b8a395129dacdd7e52a74
parente534c1f0badb513e4b5505a639ca5cbefd2ff7e2 (diff)
We don't have settings for it. => activate by default
-rw-r--r--messageviewer/settings/messageviewer.kcfg.cmake9
-rw-r--r--messageviewer/viewer/viewer_p.cpp15
2 files changed, 6 insertions, 18 deletions
diff --git a/messageviewer/settings/messageviewer.kcfg.cmake b/messageviewer/settings/messageviewer.kcfg.cmake
index bd953c6..17398a7 100644
--- a/messageviewer/settings/messageviewer.kcfg.cmake
+++ b/messageviewer/settings/messageviewer.kcfg.cmake
@@ -76,10 +76,6 @@ xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/sta
<label>Show user agent in fancy headers</label>
<whatsthis>Enable this option to get the User-Agent and X-Mailer header lines displayed when using fancy headers.</whatsthis>
</entry>
- <entry name="AllowAttachmentDeletion" type="Bool">
- <default>true</default>
- <label>Allow to delete attachments of existing mails.</label>
- </entry>
<entry name="AllowAttachmentEditing" type="Bool">
<default>false</default>
<label>Allow to edit attachments of existing mails.</label>
@@ -112,11 +108,6 @@ xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/sta
</choices>
<default>Never</default>
</entry>
- <entry name="numberOfAddressesToShow" type="Int">
- <label>Number of addresses to show before collapsing</label>
- <default>4</default>
- <min>1</min>
- </entry>
<entry name="MimePaneHeight" type="Int">
<default>100</default>
</entry>
diff --git a/messageviewer/viewer/viewer_p.cpp b/messageviewer/viewer/viewer_p.cpp
index 852d341..4795c12 100644
--- a/messageviewer/viewer/viewer_p.cpp
+++ b/messageviewer/viewer/viewer_p.cpp
@@ -659,12 +659,10 @@ void ViewerPrivate::showAttachmentPopup(KMime::Content *node, const QString &nam
attachmentMapper->setMapping(action, Viewer::Edit);
action->setEnabled(canChange);
}
- if (GlobalSettings::self()->allowAttachmentDeletion()) {
- action = menu->addAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18n("Delete Attachment"));
- connect(action, SIGNAL(triggered()), attachmentMapper, SLOT(map()));
- attachmentMapper->setMapping(action, Viewer::Delete);
- action->setEnabled(canChange && !deletedAttachment);
- }
+ action = menu->addAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18n("Delete Attachment"));
+ connect(action, SIGNAL(triggered()), attachmentMapper, SLOT(map()));
+ attachmentMapper->setMapping(action, Viewer::Delete);
+ action->setEnabled(canChange && !deletedAttachment);
if (name.endsWith(QLatin1String(".xia"), Qt::CaseInsensitive)
&& Kleo::CryptoBackendFactory::instance()->protocol("Chiasmus")) {
action = menu->addAction(i18n("Decrypt With Chiasmus..."));
@@ -1951,9 +1949,8 @@ void ViewerPrivate::showContextMenu(KMime::Content *content, const QPoint &pos)
popup.addAction(QIcon::fromTheme(QStringLiteral("edit-copy")), i18n("Copy"),
this, SLOT(slotAttachmentCopy()));
#if 0 //FIXME Laurent Comment for the moment it crash see Bug 287177
- if (GlobalSettings::self()->allowAttachmentDeletion())
- popup.addAction(QIcon::fromTheme("edit-delete"), i18n("Delete Attachment"),
- this, SLOT(slotAttachmentDelete()));
+ popup.addAction(QIcon::fromTheme("edit-delete"), i18n("Delete Attachment"),
+ this, SLOT(slotAttachmentDelete()));
#endif
if (GlobalSettings::self()->allowAttachmentEditing())
popup.addAction(QIcon::fromTheme(QStringLiteral("document-properties")), i18n("Edit Attachment"),