Merge remote-tracking branch 'origin/Applications/19.08'

kmail-refresh-settings/refreshsettingsassistant.cpp

@@ -61,4 +61,6 @@ void RefreshSettingsAssistant::initializePages()
     mFinishPage = new RefreshSettringsFinishPage(this);
     mFinishPageItem = new KPageWidgetItem(mFinishPage, i18n("Finish"));
     addPage(mFinishPageItem);
+
+    connect(mCleanUpPage, &RefreshSettingsCleanupPage::cleanDoneInfo, mFinishPage, &RefreshSettringsFinishPage::cleanDoneInfo);
 }

kmail-refresh-settings/refreshsettingscleanuppage.cpp

@@ -46,7 +46,7 @@ void RefreshSettingsCleanupPage::cleanSettings()
 {
     initCleanupFolderSettings(QStringLiteral("kmail2rc"));
     initCleanupFolderSettings(QStringLiteral("kontactrc"));
-    Q_EMIT cleanDone(i18n("Clean Folder Settings Done"));
+    Q_EMIT cleanDoneInfo(i18n("Clean Folder Settings Done"));
 }
 
 void RefreshSettingsCleanupPage::initCleanupFolderSettings(const QString &configName)

kmail-refresh-settings/refreshsettingscleanuppage.h

@@ -31,7 +31,7 @@ public:
     ~RefreshSettingsCleanupPage();
 
 Q_SIGNALS:
-    void cleanDone(const QString &msg);
+    void cleanDoneInfo(const QString &msg);
 
 private:
     void cleanSettings();

kmail-refresh-settings/refreshsettringsfinishpage.cpp

@@ -20,6 +20,7 @@
 #include "refreshsettringsfinishpage.h"
 #include <QHBoxLayout>
 #include <KLocalizedString>
+#include <QPlainTextEdit>
 
 RefreshSettringsFinishPage::RefreshSettringsFinishPage(QWidget *parent)
     : QWidget(parent)
@@ -27,8 +28,19 @@ RefreshSettringsFinishPage::RefreshSettringsFinishPage(QWidget *parent)
     QHBoxLayout *mainLayout = new QHBoxLayout(this);
     mainLayout->setObjectName(QStringLiteral("mainLayout"));
     mainLayout->setContentsMargins(0, 0, 0, 0);
+
+    mTextEdit = new QPlainTextEdit(this);
+    mTextEdit->setObjectName(QStringLiteral("textedit"));
+    mTextEdit->setReadOnly(true);
+    mainLayout->addWidget(mTextEdit);
+    connect(this, &RefreshSettringsFinishPage::cleanDoneInfo, this, &RefreshSettringsFinishPage::slotCleanDoneInfo);
 }
 
 RefreshSettringsFinishPage::~RefreshSettringsFinishPage()
 {
 }
+
+void RefreshSettringsFinishPage::slotCleanDoneInfo(const QString &str)
+{
+   mTextEdit->insertPlainText(str + QLatin1Char('\n'));
+}

kmail-refresh-settings/refreshsettringsfinishpage.h

@@ -21,13 +21,20 @@
 #define REFRESHSETTRINGSFINISHPAGE_H
 
 #include <QWidget>
-
+class QPlainTextEdit;
 class RefreshSettringsFinishPage : public QWidget
 {
     Q_OBJECT
 public:
     explicit RefreshSettringsFinishPage(QWidget *parent = nullptr);
     ~RefreshSettringsFinishPage();
+
+Q_SIGNALS:
+    void cleanDoneInfo(const QString &info);
+
+private:
+    void slotCleanDoneInfo(const QString &info);
+    QPlainTextEdit *mTextEdit = nullptr;
 };
 
 #endif // REFRESHSETTRINGSFINISHPAGE_H