Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
PIM
KDE PIM Add-ons
Commits
6d41df37
Commit
6d41df37
authored
Sep 27, 2020
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use new folderconfiguresettingspagebase
parent
60c2a151
Pipeline
#35733
failed with stage
in 99 minutes and 43 seconds
Changes
7
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
25 additions
and
21 deletions
+25
-21
plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingsgeneralwidget.cpp
...s/foldersettings/folderconfiguresettingsgeneralwidget.cpp
+6
-7
plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingsgeneralwidget.h
...ins/foldersettings/folderconfiguresettingsgeneralwidget.h
+2
-1
plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingspagebase.cpp
...lugins/foldersettings/folderconfiguresettingspagebase.cpp
+1
-0
plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingstemplatewidget.cpp
.../foldersettings/folderconfiguresettingstemplatewidget.cpp
+5
-6
plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingstemplatewidget.h
...ns/foldersettings/folderconfiguresettingstemplatewidget.h
+3
-1
plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingsviewwidget.cpp
...gins/foldersettings/folderconfiguresettingsviewwidget.cpp
+5
-5
plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingsviewwidget.h
...lugins/foldersettings/folderconfiguresettingsviewwidget.h
+3
-1
No files found.
plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingsgeneralwidget.cpp
View file @
6d41df37
...
...
@@ -9,15 +9,12 @@
#include <QVBoxLayout>
FolderConfigureSettingsGeneralWidget
::
FolderConfigureSettingsGeneralWidget
(
QWidget
*
parent
)
:
QWidget
(
parent
)
:
FolderConfigureSettingsPageBase
(
parent
)
{
QVBoxLayout
*
mainLayout
=
new
QVBoxLayout
(
this
);
mainLayout
->
setObjectName
(
QStringLiteral
(
"mainLayout"
));
mCollectionGeneralWidget
=
new
MailCommon
::
CollectionGeneralWidget
(
this
);
mCollectionGeneralWidget
->
setObjectName
(
QStringLiteral
(
"mCollectionGeneralWidget"
));
mainLayout
->
add
Widget
(
mCollectionGeneralWidget
);
mainLayout
->
addStretch
();
addMain
Widget
(
mCollectionGeneralWidget
);
m
M
ainLayout
->
addStretch
();
}
FolderConfigureSettingsGeneralWidget
::~
FolderConfigureSettingsGeneralWidget
()
...
...
@@ -26,5 +23,7 @@ FolderConfigureSettingsGeneralWidget::~FolderConfigureSettingsGeneralWidget()
void
FolderConfigureSettingsGeneralWidget
::
save
(
Akonadi
::
Collection
&
col
)
{
mCollectionGeneralWidget
->
save
(
col
);
if
(
wasModified
())
{
mCollectionGeneralWidget
->
save
(
col
);
}
}
plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingsgeneralwidget.h
View file @
6d41df37
...
...
@@ -9,11 +9,12 @@
#include <QWidget>
#include "folderconfiguresettings_private_export.h"
#include "folderconfiguresettingspagebase.h"
#include <AkonadiCore/Collection>
namespace
MailCommon
{
class
CollectionGeneralWidget
;
}
class
LIBFOLDERCONFIGURESETTINGS_TESTS_EXPORT
FolderConfigureSettingsGeneralWidget
:
public
QWidget
class
LIBFOLDERCONFIGURESETTINGS_TESTS_EXPORT
FolderConfigureSettingsGeneralWidget
:
public
FolderConfigureSettingsPageBase
{
Q_OBJECT
public:
...
...
plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingspagebase.cpp
View file @
6d41df37
...
...
@@ -19,6 +19,7 @@ FolderConfigureSettingsPageBase::FolderConfigureSettingsPageBase(QWidget *parent
mModifyCheckBox
=
new
QCheckBox
(
i18n
(
"Modify Settings"
),
this
);
mModifyCheckBox
->
setObjectName
(
QStringLiteral
(
"mModifiedCheckBox"
));
mModifyCheckBox
->
setChecked
(
false
);
mMainLayout
->
addWidget
(
mModifyCheckBox
);
connect
(
mModifyCheckBox
,
&
QCheckBox
::
clicked
,
this
,
&
FolderConfigureSettingsPageBase
::
slotModifyClicked
);
}
...
...
plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingstemplatewidget.cpp
View file @
6d41df37
...
...
@@ -9,14 +9,11 @@
#include <QVBoxLayout>
FolderConfigureSettingsTemplateWidget
::
FolderConfigureSettingsTemplateWidget
(
QWidget
*
parent
)
:
QWidget
(
parent
)
:
FolderConfigureSettingsPageBase
(
parent
)
{
QVBoxLayout
*
mainLayout
=
new
QVBoxLayout
(
this
);
mainLayout
->
setObjectName
(
QStringLiteral
(
"mainLayout"
));
mainLayout
->
setContentsMargins
(
0
,
0
,
0
,
0
);
mCollectionTemplateWidget
=
new
MailCommon
::
CollectionTemplatesWidget
(
this
);
mCollectionTemplateWidget
->
setObjectName
(
QStringLiteral
(
"mCollectionTemplateWidget"
));
mainLayout
->
add
Widget
(
mCollectionTemplateWidget
);
addMain
Widget
(
mCollectionTemplateWidget
);
}
FolderConfigureSettingsTemplateWidget
::~
FolderConfigureSettingsTemplateWidget
()
...
...
@@ -25,5 +22,7 @@ FolderConfigureSettingsTemplateWidget::~FolderConfigureSettingsTemplateWidget()
void
FolderConfigureSettingsTemplateWidget
::
save
(
Akonadi
::
Collection
&
col
)
{
mCollectionTemplateWidget
->
save
(
col
);
if
(
wasModified
())
{
mCollectionTemplateWidget
->
save
(
col
);
}
}
plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingstemplatewidget.h
View file @
6d41df37
...
...
@@ -7,12 +7,14 @@
#ifndef FOLDERCONFIGURESETTINGSTEMPLATEWIDGET_H
#define FOLDERCONFIGURESETTINGSTEMPLATEWIDGET_H
#include "folderconfiguresettingspagebase.h"
#include <QWidget>
#include <AkonadiCore/Collection>
namespace
MailCommon
{
class
CollectionTemplatesWidget
;
}
class
FolderConfigureSettingsTemplateWidget
:
public
QWidget
class
FolderConfigureSettingsTemplateWidget
:
public
FolderConfigureSettingsPageBase
{
Q_OBJECT
public:
...
...
plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingsviewwidget.cpp
View file @
6d41df37
...
...
@@ -9,13 +9,11 @@
#include <QVBoxLayout>
FolderConfigureSettingsViewWidget
::
FolderConfigureSettingsViewWidget
(
QWidget
*
parent
)
:
QWidget
(
parent
)
:
FolderConfigureSettingsPageBase
(
parent
)
{
QVBoxLayout
*
mainLayout
=
new
QVBoxLayout
(
this
);
mainLayout
->
setObjectName
(
QStringLiteral
(
"mainLayout"
));
mCollectionViewWidget
=
new
MailCommon
::
CollectionViewWidget
(
this
);
mCollectionViewWidget
->
setObjectName
(
QStringLiteral
(
"mCollectionTemplateWidget"
));
mainLayout
->
add
Widget
(
mCollectionViewWidget
);
addMain
Widget
(
mCollectionViewWidget
);
}
FolderConfigureSettingsViewWidget
::~
FolderConfigureSettingsViewWidget
()
...
...
@@ -24,5 +22,7 @@ FolderConfigureSettingsViewWidget::~FolderConfigureSettingsViewWidget()
void
FolderConfigureSettingsViewWidget
::
save
(
Akonadi
::
Collection
&
col
)
{
mCollectionViewWidget
->
save
(
col
);
if
(
wasModified
())
{
mCollectionViewWidget
->
save
(
col
);
}
}
plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingsviewwidget.h
View file @
6d41df37
...
...
@@ -7,12 +7,14 @@
#ifndef FOLDERCONFIGURESETTINGSVIEWWIDGET_H
#define FOLDERCONFIGURESETTINGSVIEWWIDGET_H
#include "folderconfiguresettingspagebase.h"
#include <QWidget>
#include <AkonadiCore/Collection>
namespace
MailCommon
{
class
CollectionViewWidget
;
}
class
FolderConfigureSettingsViewWidget
:
public
QWidget
class
FolderConfigureSettingsViewWidget
:
public
FolderConfigureSettingsPageBase
{
Q_OBJECT
public:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment