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
43f98283
Commit
43f98283
authored
Sep 16, 2020
by
Laurent Montel
😁
Browse files
Continue to fix 424184
CCBUG: 424184
parent
e5fd88a2
Pipeline
#34466
passed with stage
in 89 minutes and 24 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/kmreadermainwin.cpp
View file @
43f98283
...
...
@@ -438,11 +438,24 @@ void KMReaderMainWin::initializeAkonadiStandardAction()
};
for
(
Akonadi
::
StandardMailActionManager
::
Type
mailAction
:
mailActions
)
{
mAkonadiStandardActionManager
->
createAction
(
mailAction
);
QAction
*
act
=
mAkonadiStandardActionManager
->
createAction
(
mailAction
);
mAkonadiStandardActionManager
->
interceptAction
(
mailAction
);
connect
(
act
,
&
QAction
::
triggered
,
this
,
&
KMReaderMainWin
::
slotMarkMailAs
);
}
}
void
KMReaderMainWin
::
slotMarkMailAs
()
{
const
QAction
*
action
=
qobject_cast
<
QAction
*>
(
sender
());
Q_ASSERT
(
action
);
const
QByteArray
typeStr
=
action
->
data
().
toByteArray
();
mAkonadiStandardActionManager
->
markItemsAs
(
typeStr
,
{
mMsgActions
->
currentItem
()},
false
);
}
void
KMReaderMainWin
::
setupAccel
()
{
if
(
!
kmkernel
->
xmlGuiInstanceName
().
isEmpty
())
{
...
...
src/kmreadermainwin.h
View file @
43f98283
...
...
@@ -106,6 +106,7 @@ private:
void
updateButtons
();
void
slotToggleMenubar
(
bool
dontShowWarning
);
void
initializeAkonadiStandardAction
();
void
slotMarkMailAs
();
QVector
<
KMime
::
Message
::
Ptr
>
mListMessage
;
int
mCurrentMessageIndex
=
0
;
...
...
src/messageactions.cpp
View file @
43f98283
...
...
@@ -775,6 +775,11 @@ void MessageActions::slotExportToPdf()
}
}
Akonadi
::
Item
MessageActions
::
currentItem
()
const
{
return
mCurrentItem
;
}
QAction
*
MessageActions
::
exportToPdfAction
()
const
{
return
mExportToPdfAction
;
...
...
src/messageactions.h
View file @
43f98283
...
...
@@ -92,6 +92,8 @@ public:
void
setExportToPdfAction
(
QAction
*
exportToPdfAction
);
void
fillAkonadiStandardAction
(
Akonadi
::
StandardMailActionManager
*
akonadiStandardActionManager
);
Q_REQUIRED_RESULT
Akonadi
::
Item
currentItem
()
const
;
Q_SIGNALS:
// This signal is emitted when a reply is triggered and the
// action has finished.
...
...
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