Commit 8a7a8906 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix Bug 192825 - Smiley selector in composer

FIXED-IN: 4.9
BUG: 192825
parent 8f9295d6
......@@ -131,7 +131,7 @@ include(KDE4Defaults)
include(MacroLibrary)
include(CheckIncludeFiles)
include(MacroBoolTo01)
find_package(KdepimLibs 4.8.40 REQUIRED)
find_package(KdepimLibs 4.8.42 REQUIRED)
############### Load the CTest options ###############
......
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd" >
<kpartgui version="411" name="kmcomposer" >
<kpartgui version="412" name="kmcomposer" >
<MenuBar>
<Menu noMerge="1" name="file" >
<text>&amp;Message</text>
......@@ -99,6 +99,8 @@
<Separator/>
<Action name="sign_message" />
<Action name="encrypt_message" />
<Separator/>
<Action name="add_emoticon" />
</ToolBar>
<ToolBar noMerge="1" newline="true" hidden="true" enable="0" name="htmlToolBar" iconText="icononly" >
<text>HTML Toolbar</text>
......
......@@ -1163,6 +1163,7 @@ void Message::ComposerViewBase::setEditor ( Message::KMeditor* editor )
KRichTextWidget::SupportRuleLine |
KRichTextWidget::SupportHyperlinks );
m_editor->enableImageActions();
m_editor->enableEmoticonActions();
m_editor->document()->setModified( false );
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment