diff --git a/editor/jar.mn b/editor/jar.mn index ab52c48edb1..1f800acfe4e 100644 --- a/editor/jar.mn +++ b/editor/jar.mn @@ -136,6 +136,13 @@ comm.jar: content/editor/images/sick.gif (ui/composer/content/images/sick.gif) content/editor/images/s_frown.gif (ui/composer/content/images/s_frown.gif) content/editor/images/s_wink.gif (ui/composer/content/images/s_wink.gif) + content/editor/images/smile_n.gif (ui/composer/content/images/smile_n.gif) + content/editor/images/frown_n.gif (ui/composer/content/images/frown_n.gif) + content/editor/images/wink_n.gif (ui/composer/content/images/wink_n.gif) + content/editor/images/tongue_n.gif (ui/composer/content/images/tongue_n.gif) + content/editor/images/laughing_n.gif (ui/composer/content/images/laughing_n.gif) + content/editor/images/embarrassed_n.gif (ui/composer/content/images/embarrassed_n.gif) + content/editor/images/undecided_n.gif (ui/composer/content/images/undecided_n.gif) content/editor/EdDialogCommon.js (ui/dialogs/content/EdDialogCommon.js) content/editor/EdLinkProps.xul (ui/dialogs/content/EdLinkProps.xul) content/editor/EdLinkProps.js (ui/dialogs/content/EdLinkProps.js) diff --git a/editor/ui/composer/content/ComposerCommands.js b/editor/ui/composer/content/ComposerCommands.js index cfa0ababbce..5beca3cd74f 100644 --- a/editor/ui/composer/content/ComposerCommands.js +++ b/editor/ui/composer/content/ComposerCommands.js @@ -897,13 +897,13 @@ var nsSetSmiley = break; case ";-)": strSml="s3"; break; - case ";-P": strSml="s4"; + case ":-P": strSml="s4"; break; - case ":)": strSml="s5"; + case ":-D": strSml="s5"; break; - case ":(": strSml="s6"; + case ":-[": strSml="s6"; break; - case ";)": strSml="s7"; + case ":-\\": strSml="s7"; break; default: strSml=""; break; diff --git a/editor/ui/composer/content/EditorContent.css b/editor/ui/composer/content/EditorContent.css index 75bf757796d..3791089aad2 100644 --- a/editor/ui/composer/content/EditorContent.css +++ b/editor/ui/composer/content/EditorContent.css @@ -70,34 +70,34 @@ span[-moz-smiley] > span { span[-moz-smiley="s1"] { - background-image: url(chrome://editor/content/images/smile.gif); + background-image: url(chrome://editor/content/images/smile_n.gif); } span[-moz-smiley="s2"] { - background-image: url(chrome://editor/content/images/frown.gif); + background-image: url(chrome://editor/content/images/frown_n.gif); } span[-moz-smiley="s3"] { - background-image: url(chrome://editor/content/images/wink.gif); + background-image: url(chrome://editor/content/images/wink_n.gif); } span[-moz-smiley="s4"] { - background-image: url(chrome://editor/content/images/sick.gif); + background-image: url(chrome://editor/content/images/tongue_n.gif); } span[-moz-smiley="s5"] { - background-image: url(chrome://editor/content/images/s_smile.gif); + background-image: url(chrome://editor/content/images/laughing_n.gif); } span[-moz-smiley="s6"] { - background-image: url(chrome://editor/content/images/s_frown.gif); + background-image: url(chrome://editor/content/images/embarrassed_n.gif); } span[-moz-smiley="s7"] { - background-image: url(chrome://editor/content/images/s_wink.gif); + background-image: url(chrome://editor/content/images/undecided_n.gif); } diff --git a/editor/ui/composer/content/editorOverlay.xul b/editor/ui/composer/content/editorOverlay.xul index 1673829c82c..f3d2d1d1ebc 100644 --- a/editor/ui/composer/content/editorOverlay.xul +++ b/editor/ui/composer/content/editorOverlay.xul @@ -107,7 +107,7 @@ - + @@ -553,34 +553,26 @@ - - - - - + + - - - - - - - + + + + + + + + diff --git a/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp b/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp index daad86022b8..95fb35f7abc 100644 --- a/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp +++ b/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp @@ -681,13 +681,14 @@ mozTXTToHTMLConv::GlyphHit(const PRUnichar * aInString, PRInt32 aInLength, PRBoo ) && ( - SmilyHit(aInString, aInLength, col0, ":-)", 3, "\":-)\"", outputHTML, glyphTextLen) || - SmilyHit(aInString, aInLength, col0, ":)", 2, "\":)\"", outputHTML, glyphTextLen) || - SmilyHit(aInString, aInLength, col0, ":-(", 3, "\":-(\"", outputHTML, glyphTextLen) || - SmilyHit(aInString, aInLength, col0, ":(", 2, "\":(\"", outputHTML, glyphTextLen) || - SmilyHit(aInString, aInLength, col0, ";-)", 3, "\";-)\"", outputHTML, glyphTextLen) || - SmilyHit(aInString, aInLength, col0, ";)", 2, "\";)\"", outputHTML, glyphTextLen) || - SmilyHit(aInString, aInLength, col0, ":-P", 3, "\":-P\"", outputHTML, glyphTextLen) + SmilyHit(aInString, aInLength, col0, ":-)", 3, "\":-)\"", outputHTML, glyphTextLen) || + SmilyHit(aInString, aInLength, col0, ":-D", 3, "\":-D\"", outputHTML, glyphTextLen) || + SmilyHit(aInString, aInLength, col0, ":-(", 3, "\":-(\"", outputHTML, glyphTextLen) || + SmilyHit(aInString, aInLength, col0, ":-[", 3, "\":-[\"", outputHTML, glyphTextLen) || + SmilyHit(aInString, aInLength, col0, ";-)", 3, "\";-)\"", outputHTML, glyphTextLen) || + SmilyHit(aInString, aInLength, col0, ":-\\", 3, "\":-\\\"", outputHTML, glyphTextLen) || + SmilyHit(aInString, aInLength, col0, ":-P", 3, "\":-P\"", outputHTML, glyphTextLen) + ) ) { @@ -707,13 +708,14 @@ mozTXTToHTMLConv::GlyphHit(const PRUnichar * aInString, PRInt32 aInLength, PRBoo ) && ( - SmilyHit(aInString, aInLength, PR_FALSE, ":-)", 3, "\":-)\"", outputHTML, glyphTextLen) || - SmilyHit(aInString, aInLength, PR_FALSE, ":)", 2, "\":)\"", outputHTML, glyphTextLen) || - SmilyHit(aInString, aInLength, PR_FALSE, ":-(", 3, "\":-(\"", outputHTML, glyphTextLen) || - SmilyHit(aInString, aInLength, PR_FALSE, ":(", 2, "\":(\"", outputHTML, glyphTextLen) || - SmilyHit(aInString, aInLength, PR_FALSE, ";-)", 3, "\";-)\"", outputHTML, glyphTextLen) || - SmilyHit(aInString, aInLength, PR_FALSE, ";)", 2, "\";)\"", outputHTML, glyphTextLen) || - SmilyHit(aInString, aInLength, PR_FALSE, ":-P", 3, "\":-P\"", outputHTML, glyphTextLen) + SmilyHit(aInString, aInLength, PR_FALSE, ":-)", 3, "\":-)\"", outputHTML, glyphTextLen) || + SmilyHit(aInString, aInLength, PR_FALSE, ":-D", 3, "\":-D\"", outputHTML, glyphTextLen) || + SmilyHit(aInString, aInLength, PR_FALSE, ":-(", 3, "\":-(\"", outputHTML, glyphTextLen) || + SmilyHit(aInString, aInLength, PR_FALSE, ":-[", 3, "\":-[\"", outputHTML, glyphTextLen) || + SmilyHit(aInString, aInLength, PR_FALSE, ";-)", 3, "\";-)\"", outputHTML, glyphTextLen) || + SmilyHit(aInString, aInLength, PR_FALSE, ":-\\", 3, "\":-\\\"", outputHTML, glyphTextLen) || + SmilyHit(aInString, aInLength, PR_FALSE, ":-P", 3, "\":-P\"", outputHTML, glyphTextLen) + ) ) { diff --git a/themes/classic/editor/EditorToolbars.css b/themes/classic/editor/EditorToolbars.css index a1ffc16f450..f1e178a7709 100644 --- a/themes/classic/editor/EditorToolbars.css +++ b/themes/classic/editor/EditorToolbars.css @@ -139,57 +139,59 @@ button.edit-mode[selected="1"]:hover:active list-style-image : url("chrome://editor/skin/images/bold-hover-active.gif"); } -#smilyPopup{ - width : 130px; -} -#smileButton { +#smileButtonMenu { list-style-image:url("chrome://editor/skin/images/smile.gif"); } -menu:hover > #smileButton, -menu:hover:active > #smileButton[toggled="true"] { +#smileButtonMenu:hover { list-style-image:url("chrome://editor/skin/images/smile_hover.gif"); } -menu:hover:active > #smileButton, -menu:hover > #smileButton[toggled="true"] { +#smileButtonMenu:hover:active, +#smileButtonMenu[open="true"] { list-style-image:url("chrome://editor/skin/images/smile_active.gif"); } -#smileButton[disabled="true"], -menu:hover > #smileButton[disabled="true"], -menu:hover:active > #smileButton[disabled="true"] { +#smileButtonMenu[disabled="true"], +#smileButtonMenu[disabled="true"]:hover, +#smileButtonMenu[disabled="true"]:hover:active { list-style-image:url("chrome://editor/skin/images/smile_disabled.gif"); } -#insert-smile { - list-style-image:url(chrome://editor/skin/images/smile.gif); +.insert-smile > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/smile_n.gif); } -#insert-sick { - list-style-image:url(chrome://editor/skin/images/sick.gif); +.insert-tongue > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/tongue_n.gif); } -#insert-frown { - list-style-image:url(chrome://editor/skin/images/frown.gif); +.insert-frown > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/frown_n.gif); + } + +.insert-wink > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/wink_n.gif); + } + +.insert-laughing > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/laughing_n.gif); + } + +.insert-embarrassed > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/embarrassed_n.gif); + } + + +.insert-undecided > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/undecided_n.gif); } -#insert-wink { - list-style-image:url(chrome://editor/skin/images/wink.gif); -} +.smiley > .menu-iconic-left { -#insert-smile5 { - list-style-image:url(chrome://editor/skin/images/s_smile.gif); -} - -#insert-smile6 { - list-style-image:url(chrome://editor/skin/images/s_frown.gif); -} - -#insert-smile7 { - list-style-image:url(chrome://editor/skin/images/s_wink.gif); + margin-right: 15px; } diff --git a/themes/classic/editor/mac/EditorToolbars.css b/themes/classic/editor/mac/EditorToolbars.css index be1de6fc29a..3668f4fe8e4 100644 --- a/themes/classic/editor/mac/EditorToolbars.css +++ b/themes/classic/editor/mac/EditorToolbars.css @@ -141,58 +141,59 @@ button.edit-mode[selected="1"]:hover:active list-style-image : url("chrome://editor/skin/images/bold-hover-active.gif"); } -#smilyPopup{ - - width : 130px; -} - -#smileButton { +#smileButtonMenu { list-style-image:url("chrome://editor/skin/images/smile.gif"); } -menu:hover > #smileButton, -menu:hover:active > #smileButton[toggled="true"] { +#smileButtonMenu:hover { list-style-image:url("chrome://editor/skin/images/smile_hover.gif"); } -menu:hover:active > #smileButton, -menu:hover > #smileButton[toggled="true"] { +#smileButtonMenu:hover:active, +#smileButtonMenu[open="true"] { list-style-image:url("chrome://editor/skin/images/smile_active.gif"); } -#smileButton[disabled="true"], -menu:hover > #smileButton[disabled="true"], -menu:hover:active > #smileButton[disabled="true"] { +#smileButtonMenu[disabled="true"], +#smileButtonMenu[disabled="true"]:hover, +#smileButtonMenu[disabled="true"]:hover:active { list-style-image:url("chrome://editor/skin/images/smile_disabled.gif"); } -#insert-smile { - list-style-image:url(chrome://editor/skin/images/smile.gif); +.insert-smile > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/smile_n.gif); } -#insert-sick { - list-style-image:url(chrome://editor/skin/images/sick.gif); +.insert-tongue > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/tongue_n.gif); } -#insert-frown { - list-style-image:url(chrome://editor/skin/images/frown.gif); +.insert-frown > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/frown_n.gif); + } + +.insert-wink > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/wink_n.gif); + } + +.insert-laughing > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/laughing_n.gif); + } + +.insert-embarrassed > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/embarrassed_n.gif); + } + + +.insert-undecided > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/undecided_n.gif); } -#insert-wink { - list-style-image:url(chrome://editor/skin/images/wink.gif); +.smiley > .menu-iconic-left { + + margin-right: 15px; } -#insert-smile5 { - list-style-image:url(chrome://editor/skin/images/s_smile.gif); -} - -#insert-smile6 { - list-style-image:url(chrome://editor/skin/images/s_frown.gif); -} - -#insert-smile7 { - list-style-image:url(chrome://editor/skin/images/s_wink.gif); -} #italicButton diff --git a/themes/classic/editor/win/EditorToolbars.css b/themes/classic/editor/win/EditorToolbars.css index fc01dde2a4b..224b6117b65 100644 --- a/themes/classic/editor/win/EditorToolbars.css +++ b/themes/classic/editor/win/EditorToolbars.css @@ -139,58 +139,59 @@ button.edit-mode[selected="1"]:hover:active list-style-image : url("chrome://editor/skin/images/bold-hover-active.gif"); } -#smilyPopup{ - - width : 130px; -} - -#smileButton { +#smileButtonMenu { list-style-image:url("chrome://editor/skin/images/smile.gif"); } -menu:hover > #smileButton, -menu:hover:active > #smileButton[toggled="true"] { +#smileButtonMenu:hover { list-style-image:url("chrome://editor/skin/images/smile_hover.gif"); } -menu:hover:active > #smileButton, -menu:hover > #smileButton[toggled="true"] { +#smileButtonMenu:hover:active, +#smileButtonMenu[open="true"] { list-style-image:url("chrome://editor/skin/images/smile_active.gif"); } -#smileButton[disabled="true"], -menu:hover > #smileButton[disabled="true"], -menu:hover:active > #smileButton[disabled="true"] { +#smileButtonMenu[disabled="true"], +#smileButtonMenu[disabled="true"]:hover, +#smileButtonMenu[disabled="true"]:hover:active { list-style-image:url("chrome://editor/skin/images/smile_disabled.gif"); } -#insert-smile { - list-style-image:url(chrome://editor/skin/images/smile.gif); +.insert-smile > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/smile_n.gif); } -#insert-sick { - list-style-image:url(chrome://editor/skin/images/sick.gif); +.insert-tongue > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/tongue_n.gif); } -#insert-frown { - list-style-image:url(chrome://editor/skin/images/frown.gif); +.insert-frown > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/frown_n.gif); + } + +.insert-wink > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/wink_n.gif); + } + +.insert-laughing > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/laughing_n.gif); + } + +.insert-embarrassed > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/embarrassed_n.gif); + } + + +.insert-undecided > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/undecided_n.gif); } -#insert-wink { - list-style-image:url(chrome://editor/skin/images/wink.gif); +.smiley > .menu-iconic-left { + + margin-right: 15px; } -#insert-smile5 { - list-style-image:url(chrome://editor/skin/images/s_smile.gif); -} - -#insert-smile6 { - list-style-image:url(chrome://editor/skin/images/s_frown.gif); -} - -#insert-smile7 { - list-style-image:url(chrome://editor/skin/images/s_wink.gif); -} #italicButton diff --git a/themes/classic/jar.mn b/themes/classic/jar.mn index 46a17bd112c..38efeb8adec 100644 --- a/themes/classic/jar.mn +++ b/themes/classic/jar.mn @@ -214,6 +214,13 @@ classic.jar: skin/classic/editor/images/wink.gif (editor/images/wink.gif) skin/classic/editor/images/s_wink.gif (editor/images/s_wink.gif) skin/classic/editor/images/sick.gif (editor/images/sick.gif) + skin/classic/editor/images/smile_n.gif (editor/images/smile_n.gif) + skin/classic/editor/images/frown_n.gif (editor/images/frown_n.gif) + skin/classic/editor/images/wink_n.gif (editor/images/wink_n.gif) + skin/classic/editor/images/tongue_n.gif (editor/images/tongue_n.gif) + skin/classic/editor/images/laughing_n.gif (editor/images/laughing_n.gif) + skin/classic/editor/images/embarrassed_n.gif (editor/images/embarrassed_n.gif) + skin/classic/editor/images/undecided_n.gif (editor/images/undecided_n.gif) skin/classic/editor/images/smile_active.gif (editor/images/smile_active.gif) skin/classic/editor/images/smile_disabled.gif (editor/images/smile_disabled.gif) skin/classic/editor/images/smile_hover.gif (editor/images/smile_hover.gif) diff --git a/themes/modern/editor/EditorToolbars.css b/themes/modern/editor/EditorToolbars.css index b4d23c90dd0..d592591f55e 100644 --- a/themes/modern/editor/EditorToolbars.css +++ b/themes/modern/editor/EditorToolbars.css @@ -625,52 +625,61 @@ list-style-image: url("chrome://editor/skin/btn2/justify-dis.gif"); } + + #smileButtonMenu { list-style-image: url("chrome://editor/skin/btn2/smiley.gif"); } -#smileButtonMenu:hover > #smileButton { +#smileButtonMenu:hover { list-style-image: url("chrome://editor/skin/btn2/smiley-hov.gif"); } -#smileButtonMenu:hover:active > #smileButton { +#smileButtonMenu:hover:active, +#smileButtonMenu[open="true"] { list-style-image: url("chrome://editor/skin/btn2/smiley-act.gif"); } -#smileButton[disabled="true"], -#smileButtonMenu:hover:active > #smileButton[disabled="true"] { +#smileButtonMenu[disabled="true"], +#smileButtonMenu[disabled="true"]:hover, +#smileButtonMenu[disabled="true"]:hover:active { list-style-image: url("chrome://editor/skin/btn2/smiley-dis.gif"); } -/* ::::: smiley icons ::::: */ - -#insert-smile { - list-style-image: url("chrome://editor/skin/icons/smiley/smile.gif"); +.insert-smile > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/smile_n.gif); } -#insert-sick { - list-style-image: url("chrome://editor/skin/icons/smiley/sick.gif"); +.insert-tongue > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/tongue_n.gif); } -#insert-frown { - list-style-image: url("chrome://editor/skin/icons/smiley/frown.gif"); +.insert-frown > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/frown_n.gif); + } + +.insert-wink > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/wink_n.gif); + } + +.insert-laughing > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/laughing_n.gif); + } + +.insert-embarrassed > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/embarrassed_n.gif); + } + + +.insert-undecided > .menu-iconic-left { + list-style-image:url(chrome://editor/skin/images/undecided_n.gif); } -#insert-wink { - list-style-image: url("chrome://editor/skin/icons/smiley/wink.gif"); +.smiley > .menu-iconic-left { + + margin-right: 15px; } -#insert-smile5 { - list-style-image: url("chrome://editor/skin/icons/smiley/smile.gif"); -} - -#insert-smile6 { - list-style-image: url("chrome://editor/skin/icons/smiley/frown.gif"); -} - -#insert-smile7 { - list-style-image: url("chrome://editor/skin/icons/smiley/wink.gif"); -} /* ::::: fg/bg color picker ::::: */ diff --git a/themes/modern/jar.mn b/themes/modern/jar.mn index 544b07f3973..2b1b4ed09ab 100644 --- a/themes/modern/jar.mn +++ b/themes/modern/jar.mn @@ -274,6 +274,13 @@ modern.jar: skin/modern/editor/icons/smiley/sick.gif (editor/icons/smiley/sick.gif) skin/modern/editor/icons/smiley/smile.gif (editor/icons/smiley/smile.gif) skin/modern/editor/icons/smiley/wink.gif (editor/icons/smiley/wink.gif) + skin/modern/editor/icons/smiley/smile_n.gif (editor/icons/smiley/smile_n.gif) + skin/modern/editor/icons/smiley/frown_n.gif (editor/icons/smiley/frown_n.gif) + skin/modern/editor/icons/smiley/wink_n.gif (editor/icons/smiley/wink_n.gif) + skin/modern/editor/icons/smiley/tongue_n.gif (editor/icons/smiley/tongue_n.gif) + skin/modern/editor/icons/smiley/laughing_n.gif (editor/icons/smiley/laughing_n.gif) + skin/modern/editor/icons/smiley/embarrassed_n.gif (editor/icons/smiley/embarrassed_n.gif) + skin/modern/editor/icons/smiley/undecided_n.gif (editor/icons/smiley/undecided_n.gif) skin/modern/global/box.css (global/box.css) skin/modern/global/button.css (global/button.css) skin/modern/global/checkbox.css (global/checkbox.css)