From 153f1040fa7eebcca96319d01560b2cfe382b8eb Mon Sep 17 00:00:00 2001 From: "daniel%glazman.org" Date: Fri, 16 Feb 2007 10:24:56 +0000 Subject: [PATCH] add ul/ol buttons to Composer; b=358716, r=laurent@xulfr.org --- composer/base/content/composer/commands.js | 3 ++ .../content/composer/formatbarpalette.inc | 10 +++++ composer/base/content/composer/sets.inc | 2 + .../base/locale/en-US/composer/composer.dtd | 3 ++ .../skin/classic/composer/formatToolbar.css | 35 +++++++++++++++++- .../base/skin/classic/composer/icons/btn3.png | Bin 3268 -> 2793 bytes 6 files changed, 52 insertions(+), 1 deletion(-) diff --git a/composer/base/content/composer/commands.js b/composer/base/content/composer/commands.js index c9254f169b4..e9f25e55b22 100644 --- a/composer/base/content/composer/commands.js +++ b/composer/base/content/composer/commands.js @@ -113,6 +113,9 @@ var ComposerCommands = { case "cmd_underline": case "cmd_strong": case "cmd_em": + + case "cmd_ul": + case "cmd_ol": this.pokeStyleUI(command, params.getBooleanValue("state_all")); break; diff --git a/composer/base/content/composer/formatbarpalette.inc b/composer/base/content/composer/formatbarpalette.inc index ef640be7ded..aea63729ad9 100644 --- a/composer/base/content/composer/formatbarpalette.inc +++ b/composer/base/content/composer/formatbarpalette.inc @@ -48,4 +48,14 @@ + + + + + + + + diff --git a/composer/base/content/composer/sets.inc b/composer/base/content/composer/sets.inc index 64b72dd4f54..138beafafd7 100644 --- a/composer/base/content/composer/sets.inc +++ b/composer/base/content/composer/sets.inc @@ -32,6 +32,8 @@ + + + + + diff --git a/composer/base/skin/classic/composer/formatToolbar.css b/composer/base/skin/classic/composer/formatToolbar.css index a18978d3048..4d77a68c1c8 100644 --- a/composer/base/skin/classic/composer/formatToolbar.css +++ b/composer/base/skin/classic/composer/formatToolbar.css @@ -45,7 +45,8 @@ } #boldButton, #italicButton, #underlineButton, -#strongButton, #emButton { +#strongButton, #emButton, +#ulButton, #olButton { list-style-image: url("chrome://composer/skin/icons/btn3.png"); } @@ -128,3 +129,35 @@ #underlineButton[disabled="true"] { -moz-image-region: rect(64px 64px 80px 48px); } + +#ulButton{ + -moz-image-region: rect(80px 16px 96px 0); +} +#ulButton:hover { + -moz-image-region: rect(80px 32px 96px 16px); +} +#ulButton:hover:active { + -moz-image-region: rect(80px 48px 96px 32px); +} +#ulButton[checked="true"] { + -moz-image-region: rect(80px 16px 96px 0); +} +#ulButton[disabled="true"] { + -moz-image-region: rect(80px 64px 96px 48px); +} + +#olButton{ + -moz-image-region: rect(96px 16px 112px 0); +} +#olButton:hover { + -moz-image-region: rect(96px 32px 112px 16px); +} +#olButton:hover:active { + -moz-image-region: rect(96px 48px 112px 32px); +} +#olButton[checked="true"] { + -moz-image-region: rect(96px 16px 112px 0); +} +#olButton[disabled="true"] { + -moz-image-region: rect(96px 64px 112px 48px); +} diff --git a/composer/base/skin/classic/composer/icons/btn3.png b/composer/base/skin/classic/composer/icons/btn3.png index 4d62bc04e95eccceb018840a09ecece5f516486c..e7e8133e4d16588601d2b461c3f031081e022866 100644 GIT binary patch literal 2793 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