Improve folder settings plugins

plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingsdialog.cpp

@@ -18,6 +18,7 @@
 */
 
 #include "folderconfiguresettingsdialog.h"
+#include "folderconfiguresettingswidget.h"
 #include <KConfigGroup>
 #include <KSharedConfig>
 #include <KLocalizedString>
@@ -33,8 +34,11 @@ FolderConfigureSettingsDialog::FolderConfigureSettingsDialog(QWidget *parent)
 {
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->setObjectName(QStringLiteral("mainLayout"));
-    setWindowTitle(i18nc("@title:window", "Configure Expiry Account Trash Folder"));
+    setWindowTitle(i18nc("@title:window", "Configure Folder Settings"));
 
+    mFolderConfigureSettingsWidget = new FolderConfigureSettingsWidget(this);
+    mFolderConfigureSettingsWidget->setObjectName(QStringLiteral("mFolderConfigureSettingsWidget"));
+    mainLayout->addWidget(mFolderConfigureSettingsWidget);
 
     QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok, this);
     buttonBox->setObjectName(QStringLiteral("buttonbox"));

plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingsdialog.h

@@ -21,7 +21,7 @@
 #define FOLDERCONFIGURESETTINGSDIALOG_H
 
 #include <QDialog>
-
+class FolderConfigureSettingsWidget;
 class FolderConfigureSettingsDialog : public QDialog
 {
     Q_OBJECT
@@ -32,6 +32,7 @@ public:
 private:
     void readConfig();
     void writeConfig();
+    FolderConfigureSettingsWidget *mFolderConfigureSettingsWidget = nullptr;
 };
 
 #endif // FOLDERCONFIGURESETTINGSDIALOG_H

plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingsplugin.cpp

@@ -18,6 +18,7 @@
 */
 
 #include "folderconfiguresettingsplugin.h"
+#include "folderconfiguresettingsdialog.h"
 #include <KPluginFactory>
 #include <QPointer>
 
@@ -34,9 +35,9 @@ FolderConfigureSettingsPlugin::~FolderConfigureSettingsPlugin()
 
 void FolderConfigureSettingsPlugin::showConfigureDialog(QWidget *parent)
 {
-//    QPointer<FolderConfigureSettingsDialog> dlg = new FolderConfigureSettingsDialog(parent);
-//    dlg->exec();
-//    delete dlg;
+    QPointer<FolderConfigureSettingsDialog> dlg = new FolderConfigureSettingsDialog(parent);
+    dlg->exec();
+    delete dlg;
 }
 
 #include "folderconfiguresettingsplugin.moc"