Add view tab

CMakeLists.txt

@@ -63,7 +63,7 @@ find_package(KF5Prison ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5Holidays ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5GuiAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
 
-set(MAILCOMMON_LIB_VERSION "5.15.44")
+set(MAILCOMMON_LIB_VERSION "5.15.45")
 set(GRAVATAR_LIB_VERSION "5.15.40")
 set(PIMCOMMON_LIB_VERSION "5.15.40")
 set(GRANTLEETHEME_LIB_VERSION "5.15.40")

plugins/messageviewerconfigureplugins/foldersettings/CMakeLists.txt

@@ -7,6 +7,7 @@ set(folderconfiguresettings_SRCS
     folderconfiguresettingspagewidget.cpp
     folderconfiguresettingsgeneralwidget.cpp
     folderconfiguresettingstemplatewidget.cpp
+    folderconfiguresettingsviewwidget.cpp
     )
 
 ecm_qt_declare_logging_category(folderconfiguresettings_SRCS HEADER libfolderconfiguresettings_debug.h IDENTIFIER LIBFOLDERCONFIGURESETTINGS_PLUGIN_LOG CATEGORY_NAME org.kde.pim.libfolderconfiguresettingsplugin

plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingspagewidget.cpp

@@ -7,6 +7,7 @@
 #include "folderconfiguresettingsgeneralwidget.h"
 #include "folderconfiguresettingspagewidget.h"
 #include "folderconfiguresettingstemplatewidget.h"
+#include "folderconfiguresettingsviewwidget.h"
 #include <MailCommon/CollectionExpiryWidget>
 #include <KLocalizedString>
 #include <QTabWidget>
@@ -28,6 +29,11 @@ FolderConfigureSettingsPageWidget::FolderConfigureSettingsPageWidget(QWidget *pa
     mFolderConfigureSettingsGeneralWidget->setObjectName(QStringLiteral("mFolderConfigureSettingsGeneralWidget"));
     tab->addTab(mFolderConfigureSettingsGeneralWidget, i18n("General"));
 
+    //View
+    mFolderConfigureSettingsViewWidget = new FolderConfigureSettingsViewWidget(this);
+    mFolderConfigureSettingsViewWidget->setObjectName(QStringLiteral("mFolderConfigureSettingsViewWidget"));
+    tab->addTab(mFolderConfigureSettingsViewWidget, i18n("View"));
+
     //Expiry
     mCollectionExpiryWidget = new MailCommon::CollectionExpiryWidget(this);
     mCollectionExpiryWidget->setObjectName(QStringLiteral("mCollectionExpiryWidget"));
@@ -49,5 +55,6 @@ void FolderConfigureSettingsPageWidget::save()
     //TODO
     mFolderConfigureSettingsGeneralWidget->save();
     //mCollectionExpiryWidget->save();
+    mFolderConfigureSettingsViewWidget->save();
     mCollectionTemplateWidget->save();
 }

plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingspagewidget.h

@@ -16,6 +16,7 @@ class CollectionExpiryWidget;
 }
 class FolderConfigureSettingsGeneralWidget;
 class FolderConfigureSettingsTemplateWidget;
+class FolderConfigureSettingsViewWidget;
 class LIBFOLDERCONFIGURESETTINGS_TESTS_EXPORT FolderConfigureSettingsPageWidget : public QWidget
 {
     Q_OBJECT
@@ -28,6 +29,7 @@ private:
     MailCommon::CollectionExpiryWidget *mCollectionExpiryWidget = nullptr;
     FolderConfigureSettingsGeneralWidget *mFolderConfigureSettingsGeneralWidget = nullptr;
     FolderConfigureSettingsTemplateWidget *mCollectionTemplateWidget = nullptr;
+    FolderConfigureSettingsViewWidget *mFolderConfigureSettingsViewWidget = nullptr;
 };
 
 #endif // FOLDERCONFIGURESETTINGSPAGEWIDGET_H

plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingsviewwidget.cpp

+/*
+   SPDX-FileCopyrightText: 2020 Laurent Montel <montel@kde.org>
+
+   SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
+#include "folderconfiguresettingsviewwidget.h"
+#include <MailCommon/CollectionViewWidget>
+#include <QVBoxLayout>
+
+FolderConfigureSettingsViewWidget::FolderConfigureSettingsViewWidget(QWidget *parent)
+    : QWidget(parent)
+{
+    QVBoxLayout *mainLayout = new QVBoxLayout(this);
+    mainLayout->setObjectName(QStringLiteral("mainLayout"));
+    mCollectionViewWidget = new MailCommon::CollectionViewWidget(this);
+    mCollectionViewWidget->setObjectName(QStringLiteral("mCollectionTemplateWidget"));
+    mainLayout->addWidget(mCollectionViewWidget);
+}
+
+FolderConfigureSettingsViewWidget::~FolderConfigureSettingsViewWidget()
+{
+
+}
+
+void FolderConfigureSettingsViewWidget::save()
+{
+
+}

plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingsviewwidget.h

+/*
+   SPDX-FileCopyrightText: 2020 Laurent Montel <montel@kde.org>
+
+   SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
+#ifndef FOLDERCONFIGURESETTINGSVIEWWIDGET_H
+#define FOLDERCONFIGURESETTINGSVIEWWIDGET_H
+
+#include <QWidget>
+namespace MailCommon {
+class CollectionViewWidget;
+}
+class FolderConfigureSettingsViewWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit FolderConfigureSettingsViewWidget(QWidget *parent = nullptr);
+    ~FolderConfigureSettingsViewWidget();
+    void save();
+private:
+    MailCommon::CollectionViewWidget *mCollectionViewWidget = nullptr;
+};
+
+#endif // FOLDERCONFIGURESETTINGSVIEWWIDGET_H