Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
PIM Messagelib
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PIM
PIM Messagelib
Commits
6ed0d76e
Commit
6ed0d76e
authored
Mar 01, 2017
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Keep "disable emoticon" state even if we switch message
CCMAIL: faure@kde.org
parent
652dd42d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
9 deletions
+6
-9
messageviewer/src/viewer/viewer.cpp
messageviewer/src/viewer/viewer.cpp
+1
-1
messageviewer/src/viewer/viewer.h
messageviewer/src/viewer/viewer.h
+1
-1
messageviewer/src/viewer/viewer_p.cpp
messageviewer/src/viewer/viewer_p.cpp
+3
-6
messageviewer/src/viewer/viewer_p.h
messageviewer/src/viewer/viewer_p.h
+1
-1
No files found.
messageviewer/src/viewer/viewer.cpp
View file @
6ed0d76e
...
...
@@ -601,7 +601,7 @@ QAction *Viewer::resetMessageDisplayFormatAction() const
return
d
->
mResetMessageDisplayFormat
;
}
Q
Action
*
Viewer
::
disableEmoticonAction
()
const
KToggle
Action
*
Viewer
::
disableEmoticonAction
()
const
{
Q_D
(
const
Viewer
);
return
d
->
mDisableEmoticonAction
;
...
...
messageviewer/src/viewer/viewer.h
View file @
6ed0d76e
...
...
@@ -278,7 +278,7 @@ public:
QAction
*
saveAsAction
()
const
;
QAction
*
saveMessageDisplayFormatAction
()
const
;
QAction
*
resetMessageDisplayFormatAction
()
const
;
Q
Action
*
disableEmoticonAction
()
const
;
KToggle
Action
*
disableEmoticonAction
()
const
;
KActionMenu
*
shareServiceUrlMenu
()
const
;
HeaderStylePlugin
*
headerStylePlugin
()
const
;
void
setPluginName
(
const
QString
&
pluginName
);
...
...
messageviewer/src/viewer/viewer_p.cpp
View file @
6ed0d76e
...
...
@@ -1254,7 +1254,6 @@ void ViewerPrivate::printPreviewMessage(const Akonadi::Item &message)
void
ViewerPrivate
::
resetStateForNewMessage
()
{
mForceEmoticons
=
true
;
mClickedUrl
.
clear
();
mImageUrl
.
clear
();
enableMessageDisplay
();
// just to make sure it's on
...
...
@@ -1719,7 +1718,7 @@ void ViewerPrivate::createActions()
ac
->
addAction
(
QStringLiteral
(
"shareservice_menu"
),
mShareServiceUrlMenu
);
connect
(
mShareServiceManager
,
&
PimCommon
::
ShareServiceUrlManager
::
serviceUrlSelected
,
this
,
&
ViewerPrivate
::
slotServiceUrlSelected
);
mDisableEmoticonAction
=
new
Q
Action
(
i18n
(
"Disable Emoticon"
),
this
);
mDisableEmoticonAction
=
new
KToggle
Action
(
i18n
(
"Disable Emoticon"
),
this
);
ac
->
addAction
(
QStringLiteral
(
"disable_emoticon"
),
mDisableEmoticonAction
);
connect
(
mDisableEmoticonAction
,
&
QAction
::
triggered
,
this
,
&
ViewerPrivate
::
slotDisableEmoticon
);
ac
->
setDefaultShortcut
(
mFindInMessageAction
,
KStandardShortcut
::
find
().
first
());
...
...
@@ -3140,8 +3139,6 @@ void ViewerPrivate::setPrintElementBackground(bool printElementBackground)
void
ViewerPrivate
::
slotDisableEmoticon
()
{
if
(
mForceEmoticons
)
{
mForceEmoticons
=
false
;
update
(
MimeTreeParser
::
Force
);
}
mForceEmoticons
=
!
mForceEmoticons
;
update
(
MimeTreeParser
::
Force
);
}
messageviewer/src/viewer/viewer_p.h
View file @
6ed0d76e
...
...
@@ -643,7 +643,7 @@ public:
QAction
*
mFindInMessageAction
;
QAction
*
mSaveMessageDisplayFormat
;
QAction
*
mResetMessageDisplayFormat
;
Q
Action
*
mDisableEmoticonAction
;
KToggle
Action
*
mDisableEmoticonAction
;
KToggleAction
*
mHeaderOnlyAttachmentsAction
;
KSelectAction
*
mSelectEncodingAction
;
KToggleAction
*
mToggleFixFontAction
;
...
...
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