From 72e6f08c692c0625db5ce377fb478a99660adb0d Mon Sep 17 00:00:00 2001 From: Akshay Deep Date: Mon, 27 Jun 2016 16:15:23 +0530 Subject: GSoC Emoji Control Tab Window Add emoji.json to installation directory Read the JSON data from code Filter emojis according to categories Insert Emoji at cursor position Toolbar control Change-Id: Ia5a577ce41398132872914ebfa499e4d4077d57e Reviewed-on: https://gerrit.libreoffice.org/26700 Tested-by: Jenkins Reviewed-by: Akshay Deep Reviewed-by: Samuel Mehrbrodt --- sc/sdi/cellsh.sdi | 1 + sc/sdi/drtxtob.sdi | 1 + sc/sdi/editsh.sdi | 1 + sc/source/ui/app/scdll.cxx | 3 +++ sc/uiconfig/scalc/toolbar/standardbar.xml | 1 + 5 files changed, 7 insertions(+) (limited to 'sc') diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi index cf94574c44fc..2cb1a679d7b8 100644 --- a/sc/sdi/cellsh.sdi +++ b/sc/sdi/cellsh.sdi @@ -188,6 +188,7 @@ interface CellSelection FID_INPUTLINE_BLOCK [ ExecMethod = Execute; StateMethod = GetState; ] FID_INPUTLINE_MATRIX [ ExecMethod = Execute; StateMethod = GetState; ] SID_CHARMAP [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ] + SID_EMOJI_CONTROL [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ] SID_INSERT_POSTIT [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ] SID_EDIT_POSTIT [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ] diff --git a/sc/sdi/drtxtob.sdi b/sc/sdi/drtxtob.sdi index 928ffd61bdfa..d989a59a034d 100644 --- a/sc/sdi/drtxtob.sdi +++ b/sc/sdi/drtxtob.sdi @@ -55,6 +55,7 @@ interface TableDrawText SID_CLIPBOARD_FORMAT_ITEMS [ ExecMethod = Execute; StateMethod = GetClipState; Export = FALSE; ] SID_SELECTALL [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SID_CHARMAP [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_EMOJI_CONTROL [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SID_THES [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SID_THESAURUS [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] // Attribute: -------------------------------------------------- diff --git a/sc/sdi/editsh.sdi b/sc/sdi/editsh.sdi index 7b0bbff9dc50..8167973b1e4b 100644 --- a/sc/sdi/editsh.sdi +++ b/sc/sdi/editsh.sdi @@ -35,6 +35,7 @@ interface TableText SID_CLIPBOARD_FORMAT_ITEMS [ ExecMethod = Execute; StateMethod = GetClipState; Export = FALSE; ] SID_SELECTALL [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SID_CHARMAP [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] + SID_EMOJI_CONTROL [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] FID_INSERT_NAME [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SID_THES [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 2e3ba3a9474a..355552dfe9b9 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -85,6 +85,7 @@ #include #include "tbzoomsliderctrl.hxx" #include +#include #include // Child windows @@ -194,6 +195,8 @@ void ScDLL::Init() SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_LEFT_TO_RIGHT, pMod); SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_RIGHT_TO_LEFT, pMod); + EmojiPopup::RegisterControl(SID_EMOJI_CONTROL, pMod ); + // Media Controller ::avmedia::MediaToolBoxControl::RegisterControl( SID_AVMEDIA_TOOLBOX, pMod ); diff --git a/sc/uiconfig/scalc/toolbar/standardbar.xml b/sc/uiconfig/scalc/toolbar/standardbar.xml index bbd8f42aebbd..9416e6da8a18 100644 --- a/sc/uiconfig/scalc/toolbar/standardbar.xml +++ b/sc/uiconfig/scalc/toolbar/standardbar.xml @@ -63,6 +63,7 @@ + -- cgit