Commit af0ff8df authored by Laurent Montel's avatar Laurent Montel 😁

Move settings in messageviewer

parent 2223d17e
......@@ -847,7 +847,7 @@ AppearancePageReaderTab::AppearancePageReaderTab(QWidget *parent)
// "Close message window after replying or forwarding" check box:
populateCheckBox(mCloseAfterReplyOrForwardCheck = new QCheckBox(this),
KMailSettings::self()->closeAfterReplyOrForwardItem());
MessageViewer::MessageViewerSettings::self()->closeAfterReplyOrForwardItem());
mCloseAfterReplyOrForwardCheck->setToolTip(
i18n("Close the standalone message window after replying or forwarding the message"));
topLayout->addWidget(mCloseAfterReplyOrForwardCheck);
......@@ -872,14 +872,14 @@ void AppearancePage::ReaderTab::doResetToDefaultsOther()
void AppearancePage::ReaderTab::doLoadOther()
{
loadWidget(mCloseAfterReplyOrForwardCheck, KMailSettings::self()->closeAfterReplyOrForwardItem());
loadWidget(mCloseAfterReplyOrForwardCheck, MessageViewer::MessageViewerSettings::self()->closeAfterReplyOrForwardItem());
mViewerSettings->readConfig();
mGravatarConfigWidget->doLoadFromGlobalSettings();
}
void AppearancePage::ReaderTab::save()
{
saveCheckBox(mCloseAfterReplyOrForwardCheck, KMailSettings::self()->closeAfterReplyOrForwardItem());
saveCheckBox(mCloseAfterReplyOrForwardCheck, MessageViewer::MessageViewerSettings::self()->closeAfterReplyOrForwardItem());
mViewerSettings->writeConfig();
mGravatarConfigWidget->save();
}
......
......@@ -51,6 +51,7 @@
#include <MailCommon/FolderSettings>
#include "messageviewer/headerstyleplugin.h"
#include "messageviewer/headerstyle.h"
#include <MessageViewer/MessageViewerSettings>
#include <KActionCollection>
#include <Akonadi/Contact/ContactSearchJob>
......@@ -190,7 +191,7 @@ void KMReaderMainWin::showMessage(const QString &encoding, const KMime::Message:
void KMReaderMainWin::slotReplyOrForwardFinished()
{
if (KMailSettings::self()->closeAfterReplyOrForward()) {
if (MessageViewer::MessageViewerSettings::self()->closeAfterReplyOrForward()) {
close();
}
}
......
......@@ -335,13 +335,6 @@
</entry>
</group>
<group name="Reader">
<entry name="CloseAfterReplyOrForward" type="Bool">
<label>Close message window after replying or forwarding</label>
<default>false</default>
</entry>
</group>
<group name="GlobalTemplates">
<entry name="TemplateNewMessage" type="String" key="TemplateNewMessage">
<label>Message template for new message</label>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment