[evolution] EHTMLEditor: Prefer emoji over emoticon
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] EHTMLEditor: Prefer emoji over emoticon
- Date: Wed, 8 Apr 2020 07:05:32 +0000 (UTC)
commit 00a0e61c1eead671e092d034342531ecbba09de2
Author: Milan Crha <mcrha redhat com>
Date: Wed Apr 8 09:07:31 2020 +0200
EHTMLEditor: Prefer emoji over emoticon
This changes the Insert Emoticon on the toolbar to Insert Emoji
and adds Insert Emoji to the context menu.
src/e-util/e-html-editor-actions.c | 7 +++++++
src/e-util/e-html-editor-manager.ui | 4 +++-
2 files changed, 10 insertions(+), 1 deletion(-)
---
diff --git a/src/e-util/e-html-editor-actions.c b/src/e-util/e-html-editor-actions.c
index 5abc9a4c91..932ba9479c 100644
--- a/src/e-util/e-html-editor-actions.c
+++ b/src/e-util/e-html-editor-actions.c
@@ -1081,6 +1081,13 @@ static GtkActionEntry core_editor_entries[] = {
N_("Insert Emoji"),
G_CALLBACK (action_insert_emoji_cb) },
+ { "insert-emoji-toolbar",
+ "face-smile",
+ N_("Insert E_moji"),
+ NULL,
+ N_("Insert Emoji"),
+ G_CALLBACK (action_insert_emoji_cb) },
+
{ "insert-html-file",
NULL,
N_("_HTML Fileā¦"),
diff --git a/src/e-util/e-html-editor-manager.ui b/src/e-util/e-html-editor-manager.ui
index e6af175d34..b097027a54 100644
--- a/src/e-util/e-html-editor-manager.ui
+++ b/src/e-util/e-html-editor-manager.ui
@@ -121,7 +121,7 @@
<toolitem action='unindent'/>
<toolitem action='indent'/>
<separator/>
- <toolitem action='insert-emoticon'/>
+ <toolitem action='insert-emoji-toolbar'/>
</toolbar>
<toolbar name='html-toolbar'>
<separator/>
@@ -180,5 +180,7 @@
<menuitem action='context-delete-column'/>
<menuitem action='context-delete-cell'/>
</menu>
+ <separator/>
+ <menuitem action='insert-emoji-toolbar'/>
</popup>
</ui>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]