Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KMail
Commits
e5775849
Commit
e5775849
authored
Feb 22, 2021
by
Laurent Montel
😁
Browse files
We need to add composer type for mailmerge support. We need to be able
to use variable in composer.
parent
645f7327
Pipeline
#51833
passed with stage
in 25 minutes and 50 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/editor/kmcomposerwin.cpp
View file @
e5775849
...
...
@@ -526,6 +526,16 @@ void KMComposerWin::slotRecipientEditorLineFocused()
mPluginEditorManagerInterface
->
setStatusBarWidgetEnabled
(
MessageComposer
::
PluginEditorInterface
::
ApplyOnFieldType
::
EmailFields
);
}
KMComposerWin
::
ModeType
KMComposerWin
::
modeType
()
const
{
return
mModeType
;
}
void
KMComposerWin
::
setModeType
(
const
ModeType
&
modeType
)
{
mModeType
=
modeType
;
}
bool
KMComposerWin
::
eventFilter
(
QObject
*
obj
,
QEvent
*
event
)
{
if
(
event
->
type
()
==
QEvent
::
FocusIn
)
{
...
...
src/editor/kmcomposerwin.h
View file @
e5775849
...
...
@@ -127,6 +127,9 @@ private: // mailserviceimpl, kmkernel, kmcommands, callback, kmmainwidget
~
KMComposerWin
()
override
;
public:
enum
ModeType
{
ComposerType
=
0
,
TemplateType
};
Q_ENUMS
(
ModeType
)
static
Composer
*
create
(
const
KMime
::
Message
::
Ptr
&
msg
,
bool
lastSignState
,
bool
lastEncryptState
,
...
...
@@ -431,6 +434,9 @@ public: // kmcommand
QList
<
KToggleAction
*>
customToolsList
()
const
;
QList
<
QAction
*>
pluginToolsActionListForPopupMenu
()
const
;
Q_REQUIRED_RESULT
ModeType
modeType
()
const
;
void
setModeType
(
const
ModeType
&
modeType
);
protected:
bool
eventFilter
(
QObject
*
obj
,
QEvent
*
event
)
override
;
...
...
@@ -683,6 +689,8 @@ private:
KMailPluginGrammarEditorManagerInterface
*
mPluginEditorGrammarManagerInterface
=
nullptr
;
AttachmentAddedFromExternalWarning
*
mAttachmentFromExternalMissing
=
nullptr
;
ModeType
mModeType
=
ModeType
::
ComposerType
;
};
#endif
Write
Preview
Supports
Markdown
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