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
KDE PIM Add-ons
Commits
a7a14f6f
Commit
a7a14f6f
authored
Nov 19, 2021
by
Laurent Montel
😁
Browse files
Add support for bcc
parent
b32ff425
Pipeline
#98995
passed with stage
in 53 minutes and 37 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
kmail/checkbeforedeletemailplugins/confirmbeforedeleting/confirmbeforedeletingcreaterulewidget.cpp
View file @
a7a14f6f
...
...
@@ -63,6 +63,7 @@ void ConfirmBeforeDeletingCreateRuleWidget::fillComboBox()
mRuleTypeComboBox
->
addItem
(
i18n
(
"Subject"
),
ConfirmBeforeDeletingRule
::
ruleTypeToString
(
ConfirmBeforeDeletingRule
::
Subject
));
mRuleTypeComboBox
->
addItem
(
i18n
(
"To"
),
ConfirmBeforeDeletingRule
::
ruleTypeToString
(
ConfirmBeforeDeletingRule
::
To
));
mRuleTypeComboBox
->
addItem
(
i18n
(
"Cc"
),
ConfirmBeforeDeletingRule
::
ruleTypeToString
(
ConfirmBeforeDeletingRule
::
Cc
));
mRuleTypeComboBox
->
addItem
(
i18n
(
"Bcc"
),
ConfirmBeforeDeletingRule
::
ruleTypeToString
(
ConfirmBeforeDeletingRule
::
Bcc
));
}
bool
ConfirmBeforeDeletingCreateRuleWidget
::
ConfirmBeforeDeletingInfo
::
operator
==
(
const
ConfirmBeforeDeletingInfo
&
other
)
const
...
...
kmail/checkbeforedeletemailplugins/confirmbeforedeleting/confirmbeforedeletingrule.cpp
View file @
a7a14f6f
...
...
@@ -66,6 +66,8 @@ ConfirmBeforeDeletingRule::RuleType ConfirmBeforeDeletingRule::stringToRuleType(
return
To
;
}
else
if
(
str
==
QLatin1String
(
"cc"
))
{
return
Cc
;
}
else
if
(
str
==
QLatin1String
(
"bcc"
))
{
return
Bcc
;
}
return
Unknown
;
}
...
...
@@ -93,6 +95,9 @@ QString ConfirmBeforeDeletingRule::ruleTypeToString(ConfirmBeforeDeletingRule::R
case
Cc
:
tmp
=
QStringLiteral
(
"cc"
);
break
;
case
Bcc
:
tmp
=
QStringLiteral
(
"bcc"
);
break
;
}
return
tmp
;
}
...
...
@@ -141,6 +146,16 @@ bool ConfirmBeforeDeletingRule::deletingNeedToConfirm(const Akonadi::Item &item,
}
break
;
}
case
Bcc
:
{
if
(
auto
bcc
=
msg
->
bcc
(
false
))
{
const
QString
bccStr
=
bcc
->
asUnicodeString
();
if
(
bccStr
.
contains
(
pattern
()))
{
needToConfirm
=
true
;
generateConfirmMessageInfo
(
msg
,
checkFoundInfo
);
}
}
break
;
}
case
Unknown
:
qCWarning
(
KMAIL_CONFIRMBEFOREDELETING_PLUGIN_LOG
)
<<
"Invalid rules!"
;
break
;
...
...
kmail/checkbeforedeletemailplugins/confirmbeforedeleting/confirmbeforedeletingrule.h
View file @
a7a14f6f
...
...
@@ -21,6 +21,7 @@ public:
Subject
,
To
,
Cc
,
Bcc
,
};
Q_ENUM
(
RuleType
)
...
...
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