Commit ec9a52ce authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

improve foldersettings plugins

parent b5637981
Pipeline #35096 failed with stage
in 117 minutes and 49 seconds
...@@ -63,7 +63,7 @@ find_package(KF5Prison ${KF5_MIN_VERSION} CONFIG REQUIRED) ...@@ -63,7 +63,7 @@ find_package(KF5Prison ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5Holidays ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Holidays ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5GuiAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5GuiAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
set(MAILCOMMON_LIB_VERSION "5.15.43") set(MAILCOMMON_LIB_VERSION "5.15.44")
set(GRAVATAR_LIB_VERSION "5.15.40") set(GRAVATAR_LIB_VERSION "5.15.40")
set(PIMCOMMON_LIB_VERSION "5.15.40") set(PIMCOMMON_LIB_VERSION "5.15.40")
set(GRANTLEETHEME_LIB_VERSION "5.15.40") set(GRANTLEETHEME_LIB_VERSION "5.15.40")
......
...@@ -20,3 +20,8 @@ FolderConfigureSettingsGeneralWidget::~FolderConfigureSettingsGeneralWidget() ...@@ -20,3 +20,8 @@ FolderConfigureSettingsGeneralWidget::~FolderConfigureSettingsGeneralWidget()
{ {
} }
void FolderConfigureSettingsGeneralWidget::save()
{
}
...@@ -16,6 +16,7 @@ class LIBFOLDERCONFIGURESETTINGS_TESTS_EXPORT FolderConfigureSettingsGeneralWidg ...@@ -16,6 +16,7 @@ class LIBFOLDERCONFIGURESETTINGS_TESTS_EXPORT FolderConfigureSettingsGeneralWidg
public: public:
explicit FolderConfigureSettingsGeneralWidget(QWidget *parent = nullptr); explicit FolderConfigureSettingsGeneralWidget(QWidget *parent = nullptr);
~FolderConfigureSettingsGeneralWidget(); ~FolderConfigureSettingsGeneralWidget();
void save();
}; };
#endif // FOLDERCONFIGURESETTINGSGENERALWIDGET_H #endif // FOLDERCONFIGURESETTINGSGENERALWIDGET_H
...@@ -46,5 +46,8 @@ FolderConfigureSettingsPageWidget::~FolderConfigureSettingsPageWidget() ...@@ -46,5 +46,8 @@ FolderConfigureSettingsPageWidget::~FolderConfigureSettingsPageWidget()
void FolderConfigureSettingsPageWidget::save() void FolderConfigureSettingsPageWidget::save()
{ {
//TODO
mFolderConfigureSettingsGeneralWidget->save();
//mCollectionExpiryWidget->save();
mCollectionTemplateWidget->save();
} }
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
*/ */
#include "folderconfiguresettingstemplatewidget.h" #include "folderconfiguresettingstemplatewidget.h"
#include <MailCommon/CollectionTemplatesWidget>
#include <QVBoxLayout> #include <QVBoxLayout>
FolderConfigureSettingsTemplateWidget::FolderConfigureSettingsTemplateWidget(QWidget *parent) FolderConfigureSettingsTemplateWidget::FolderConfigureSettingsTemplateWidget(QWidget *parent)
...@@ -13,9 +14,17 @@ FolderConfigureSettingsTemplateWidget::FolderConfigureSettingsTemplateWidget(QWi ...@@ -13,9 +14,17 @@ FolderConfigureSettingsTemplateWidget::FolderConfigureSettingsTemplateWidget(QWi
QVBoxLayout *mainLayout = new QVBoxLayout(this); QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->setObjectName(QStringLiteral("mainLayout")); mainLayout->setObjectName(QStringLiteral("mainLayout"));
mainLayout->setContentsMargins(0, 0, 0, 0); mainLayout->setContentsMargins(0, 0, 0, 0);
mCollectionTemplateWidget = new MailCommon::CollectionTemplatesWidget(this);
mCollectionTemplateWidget->setObjectName(QStringLiteral("mCollectionTemplateWidget"));
mainLayout->addWidget(mCollectionTemplateWidget);
} }
FolderConfigureSettingsTemplateWidget::~FolderConfigureSettingsTemplateWidget() FolderConfigureSettingsTemplateWidget::~FolderConfigureSettingsTemplateWidget()
{ {
} }
void FolderConfigureSettingsTemplateWidget::save()
{
}
...@@ -8,13 +8,18 @@ ...@@ -8,13 +8,18 @@
#define FOLDERCONFIGURESETTINGSTEMPLATEWIDGET_H #define FOLDERCONFIGURESETTINGSTEMPLATEWIDGET_H
#include <QWidget> #include <QWidget>
namespace MailCommon {
class CollectionTemplatesWidget;
}
class FolderConfigureSettingsTemplateWidget : public QWidget class FolderConfigureSettingsTemplateWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit FolderConfigureSettingsTemplateWidget(QWidget *parent = nullptr); explicit FolderConfigureSettingsTemplateWidget(QWidget *parent = nullptr);
~FolderConfigureSettingsTemplateWidget(); ~FolderConfigureSettingsTemplateWidget();
void save();
private:
MailCommon::CollectionTemplatesWidget *mCollectionTemplateWidget = nullptr;
}; };
#endif // FOLDERCONFIGURESETTINGSTEMPLATEWIDGET_H #endif // FOLDERCONFIGURESETTINGSTEMPLATEWIDGET_H
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