update EarlyBlue for customizable compose window, move smime and editor icons into...

diff --git a/EarlyBlue/editor/editorPrimaryToolbar.css b/EarlyBlue/editor/editorPrimaryToolbar.css
index 33c63e8193446559aa0872f89390b84ae89d91bf..1f0f64993c06f4270848c9eed96e2d381b9bbde9 100644 (file)
--- a/EarlyBlue/editor/editorPrimaryToolbar.css
+++ b/EarlyBlue/editor/editorPrimaryToolbar.css
@@ -40,147 +40,145 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #newButton {
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #newButton {

-  list-style-image: url("chrome://editor/skin/icons/newfile.gif");
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(84px 25px 105px 0px);

 }
 
 #newButton[disabled="true"]  {
 }
 
 #newButton[disabled="true"]  {

-  list-style-image: url("chrome://editor/skin/icons/newfile-disabled.gif") !important;
+  -moz-image-region: rect(84px 50px 105px 25px);

 } 
 
 #openButton {
 } 
 
 #openButton {

-  list-style-image: url("chrome://editor/skin/icons/openfile.gif");
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(105px 25px 126px 0px);

 } 
 
 #openButton[disabled="true"] {
 } 
 
 #openButton[disabled="true"] {

-  list-style-image: url("chrome://editor/skin/icons/openfile-disabled.gif") !important;
+  -moz-image-region: rect(105px 50px 126px 25px);

 } 
 
 #saveButton {
 } 
 
 #saveButton {

-  list-style-image: url("chrome://editor/skin/icons/savefile.gif");
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(147px 25px 168px 0px);

 } 
 
 #saveButton[disabled="true"] {
 } 
 
 #saveButton[disabled="true"] {

-  list-style-image: url("chrome://editor/skin/icons/savefile-disabled.gif") !important;
-} 
-
-#saveButton[dirty="true"] {
-  list-style-image: url("chrome://editor/skin/icons/savefile-dirty.gif");
-} 
-
-#saveButton[dirty="true"][disabled="true"] {
-  list-style-image: url("chrome://editor/skin/icons/savefile-disabled.gif") !important;
+  -moz-image-region: rect(147px 50px 168px 25px);

 } 
 
 #publishButton {
 } 
 
 #publishButton {

-  list-style-image: url("chrome://editor/skin/icons/publish.gif");
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(210px 25px 231px 0px);

 } 
 
 #publishButton[disabled="true"] {
 } 
 
 #publishButton[disabled="true"] {

-  list-style-image: url("chrome://editor/skin/icons/publish-disabled.gif") !important;
+  -moz-image-region: rect(210px 50px 231px 25px);

 }
 
 #previewButton {
 }
 
 #previewButton {

-  list-style-image: url("chrome://editor/skin/icons/preview.gif");
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(126px 25px 147px 0px);

 } 
 
 #previewButton[disabled="true"] {
 } 
 
 #previewButton[disabled="true"] {

-  list-style-image: url("chrome://editor/skin/icons/preview-disabled.gif") !important;
+  -moz-image-region: rect(126px 50px 147px 25px);

 } 
 
 #printButton {
 } 
 
 #printButton {

-  list-style-image: url("chrome://global/skin/icons/print.gif");
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(0px 25px 21px 0px);

 } 
 
 #printButton[disabled="true"] {
 } 
 
 #printButton[disabled="true"] {

-  list-style-image: url("chrome://global/skin/icons/print-disabled.gif") !important;
+  -moz-image-region: rect(0px 50px 21px 25px);

 } 
 
 } 
 

-/*

 #findButton {
 #findButton {

-  list-style-image: url("chrome://editor/skin/icons/find.gif");
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(294px 25px 315px 0px);

 } 
 
 #findButton[disabled="true"] {
 } 
 
 #findButton[disabled="true"] {

-  list-style-image: url("chrome://editor/skin/icons/find-disabled.gif") !important;
+  -moz-image-region: rect(294px 50px 315px 25px);

 }
 }

-*/

 
 #linkButton {
 
 #linkButton {

-  list-style-image: url("chrome://editor/skin/icons/link.gif");
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(63px 25px 84px 0px);

 } 
 
 #linkButton[disabled="true"] {
 } 
 
 #linkButton[disabled="true"] {

-  list-style-image: url("chrome://editor/skin/icons/link-disabled.gif") !important;
+  -moz-image-region: rect(63px 50px 84px 25px);

 } 
 
 #imageButton {
 } 
 
 #imageButton {

-  list-style-image: url("chrome://editor/skin/icons/image.gif");
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(42px 25px 63px 0px);

 } 
 
 #imageButton[disabled="true"] {
 } 
 
 #imageButton[disabled="true"] {

-  list-style-image: url("chrome://editor/skin/icons/image-disabled.gif") !important;
+  -moz-image-region: rect(42px 50px 63px 25px);

 } 
 
 #namedAnchorButton {
 } 
 
 #namedAnchorButton {

-  list-style-image: url("chrome://editor/skin/icons/anchor.gif");
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(0px 25px 21px 0px);

 } 
 
 #namedAnchorButton[disabled="true"] {
 } 
 
 #namedAnchorButton[disabled="true"] {

-  list-style-image: url("chrome://editor/skin/icons/anchor-disabled.gif") !important;
+  -moz-image-region: rect(0px 50px 21px 25px);

 } 
 
 #hlineButton {
 } 
 
 #hlineButton {

-  list-style-image: url("chrome://editor/skin/icons/hline.gif");
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(21px 25px 42px 0px);

 } 
 
 #hlineButton[disabled="true"] {
 } 
 
 #hlineButton[disabled="true"] {

-  list-style-image: url("chrome://editor/skin/icons/hline-disabled.gif") !important;
+  -moz-image-region: rect(21px 50px 42px 25px);

 } 
 
 #tableButton {
 } 
 
 #tableButton {

-  list-style-image: url("chrome://editor/skin/icons/table.gif");
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(189px 25px 210px 0px);

 } 
 
 #tableButton[disabled="true"] {
 } 
 
 #tableButton[disabled="true"] {

-  list-style-image: url("chrome://editor/skin/icons/table-disabled.gif") !important;
+  -moz-image-region: rect(189px 50px 210px 25px);

 } 
 
 #spellingButton {
 } 
 
 #spellingButton {

-  list-style-image: url("chrome://editor/skin/icons/spell.gif");
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(168px 25px 189px 0px);

 }
 
 #spellingButton[disabled="true"] {
 }
 
 #spellingButton[disabled="true"] {

-  list-style-image: url("chrome://editor/skin/icons/spell-disabled.gif") !important;
+  -moz-image-region: rect(168px 50px 189px 25px);

 }
 
 #cutButton {
 }
 
 #cutButton {

-  list-style-image: url("chrome://editor/skin/icons/cut.gif");
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(231px 25px 252px 0px);

 }
 
 #cutButton[disabled="true"] {
 }
 
 #cutButton[disabled="true"] {

-  list-style-image: url("chrome://editor/skin/icons/cut-disabled.gif") !important;
+  -moz-image-region: rect(231px 50px 252px 25px);

 }
 
 #copyButton {
 }
 
 #copyButton {

-  list-style-image: url("chrome://editor/skin/icons/copy.gif");
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(252px 25px 273px 0px);

 }
 
 #copyButton[disabled="true"] {
 }
 
 #copyButton[disabled="true"] {

-  list-style-image: url("chrome://editor/skin/icons/copy-disabled.gif") !important;
+  -moz-image-region: rect(252px 50px 273px 25px);

 }
 
 #pasteButton {
 }
 
 #pasteButton {

-  list-style-image: url("chrome://editor/skin/icons/paste.gif");
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(273px 25px 294px 0px);

 }
 
 #pasteButton[disabled="true"] {
 }
 
 #pasteButton[disabled="true"] {

-  list-style-image: url("chrome://editor/skin/icons/paste-disabled.gif") !important;
-}
-
-#findButton {
-  list-style-image: url("chrome://editor/skin/icons/find.gif");
-}
-
-#findButton[disabled="true"] {
-  list-style-image: url("chrome://editor/skin/icons/find-disabled.gif") !important;
+  -moz-image-region: rect(273px 50px 294px 25px);

 }
 }

diff --git a/EarlyBlue/editor/icons/anchor-disabled.gif b/EarlyBlue/editor/icons/anchor-disabled.gif
deleted file mode 100755 (executable)
index bf55b96..0000000
Binary files a/EarlyBlue/editor/icons/anchor-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/anchor.gif b/EarlyBlue/editor/icons/anchor.gif
deleted file mode 100755 (executable)
index 07d5859..0000000
Binary files a/EarlyBlue/editor/icons/anchor.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/copy-disabled.gif b/EarlyBlue/editor/icons/copy-disabled.gif
deleted file mode 100644 (file)
index 50f9439..0000000
Binary files a/EarlyBlue/editor/icons/copy-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/copy.gif b/EarlyBlue/editor/icons/copy.gif
deleted file mode 100644 (file)
index 1aa2b03..0000000
Binary files a/EarlyBlue/editor/icons/copy.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/cut-disabled.gif b/EarlyBlue/editor/icons/cut-disabled.gif
deleted file mode 100644 (file)
index 54a46e3..0000000
Binary files a/EarlyBlue/editor/icons/cut-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/cut.gif b/EarlyBlue/editor/icons/cut.gif
deleted file mode 100644 (file)
index d4fcc8a..0000000
Binary files a/EarlyBlue/editor/icons/cut.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/editoricons-small.png b/EarlyBlue/editor/icons/editoricons-small.png
new file mode 100644 (file)
index 0000000..c857acc
Binary files /dev/null and b/EarlyBlue/editor/icons/editoricons-small.png differ

diff --git a/EarlyBlue/editor/icons/editoricons.png b/EarlyBlue/editor/icons/editoricons.png
new file mode 100644 (file)
index 0000000..41a07a7
Binary files /dev/null and b/EarlyBlue/editor/icons/editoricons.png differ

diff --git a/EarlyBlue/editor/icons/find-disabled.gif b/EarlyBlue/editor/icons/find-disabled.gif
deleted file mode 100755 (executable)
index 41dce71..0000000
Binary files a/EarlyBlue/editor/icons/find-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/find.gif b/EarlyBlue/editor/icons/find.gif
deleted file mode 100755 (executable)
index f71ae98..0000000
Binary files a/EarlyBlue/editor/icons/find.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/hline-disabled.gif b/EarlyBlue/editor/icons/hline-disabled.gif
deleted file mode 100755 (executable)
index bd485c3..0000000
Binary files a/EarlyBlue/editor/icons/hline-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/hline.gif b/EarlyBlue/editor/icons/hline.gif
deleted file mode 100755 (executable)
index e7ece18..0000000
Binary files a/EarlyBlue/editor/icons/hline.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/image-disabled.gif b/EarlyBlue/editor/icons/image-disabled.gif
deleted file mode 100755 (executable)
index 4b50447..0000000
Binary files a/EarlyBlue/editor/icons/image-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/image.gif b/EarlyBlue/editor/icons/image.gif
deleted file mode 100755 (executable)
index 701e819..0000000
Binary files a/EarlyBlue/editor/icons/image.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/link-disabled.gif b/EarlyBlue/editor/icons/link-disabled.gif
deleted file mode 100755 (executable)
index 8da0327..0000000
Binary files a/EarlyBlue/editor/icons/link-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/link.gif b/EarlyBlue/editor/icons/link.gif
deleted file mode 100755 (executable)
index b62d1eb..0000000
Binary files a/EarlyBlue/editor/icons/link.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/newfile-disabled.gif b/EarlyBlue/editor/icons/newfile-disabled.gif
deleted file mode 100755 (executable)
index 1a414eb..0000000
Binary files a/EarlyBlue/editor/icons/newfile-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/newfile.gif b/EarlyBlue/editor/icons/newfile.gif
deleted file mode 100755 (executable)
index 8235c57..0000000
Binary files a/EarlyBlue/editor/icons/newfile.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/openfile-disabled.gif b/EarlyBlue/editor/icons/openfile-disabled.gif
deleted file mode 100755 (executable)
index 08fe7fc..0000000
Binary files a/EarlyBlue/editor/icons/openfile-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/openfile.gif b/EarlyBlue/editor/icons/openfile.gif
deleted file mode 100755 (executable)
index bb474f1..0000000
Binary files a/EarlyBlue/editor/icons/openfile.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/paste-disabled.gif b/EarlyBlue/editor/icons/paste-disabled.gif
deleted file mode 100644 (file)
index 6db0f5e..0000000
Binary files a/EarlyBlue/editor/icons/paste-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/paste.gif b/EarlyBlue/editor/icons/paste.gif
deleted file mode 100644 (file)
index a898ce8..0000000
Binary files a/EarlyBlue/editor/icons/paste.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/preview-disabled.gif b/EarlyBlue/editor/icons/preview-disabled.gif
deleted file mode 100755 (executable)
index 9a5d3ea..0000000
Binary files a/EarlyBlue/editor/icons/preview-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/preview.gif b/EarlyBlue/editor/icons/preview.gif
deleted file mode 100755 (executable)
index 1efbb67..0000000
Binary files a/EarlyBlue/editor/icons/preview.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/publish-disabled.gif b/EarlyBlue/editor/icons/publish-disabled.gif
deleted file mode 100644 (file)
index 25b940a..0000000
Binary files a/EarlyBlue/editor/icons/publish-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/publish.gif b/EarlyBlue/editor/icons/publish.gif
deleted file mode 100755 (executable)
index b96b220..0000000
Binary files a/EarlyBlue/editor/icons/publish.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/savefile-dirty.gif b/EarlyBlue/editor/icons/savefile-dirty.gif
deleted file mode 100755 (executable)
index e64dc65..0000000
Binary files a/EarlyBlue/editor/icons/savefile-dirty.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/savefile-disabled.gif b/EarlyBlue/editor/icons/savefile-disabled.gif
deleted file mode 100755 (executable)
index 30eebc6..0000000
Binary files a/EarlyBlue/editor/icons/savefile-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/savefile.gif b/EarlyBlue/editor/icons/savefile.gif
deleted file mode 100755 (executable)
index 599905e..0000000
Binary files a/EarlyBlue/editor/icons/savefile.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/spell-disabled.gif b/EarlyBlue/editor/icons/spell-disabled.gif
deleted file mode 100755 (executable)
index ae73f0d..0000000
Binary files a/EarlyBlue/editor/icons/spell-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/spell.gif b/EarlyBlue/editor/icons/spell.gif
deleted file mode 100755 (executable)
index 9b91276..0000000
Binary files a/EarlyBlue/editor/icons/spell.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/table-disabled.gif b/EarlyBlue/editor/icons/table-disabled.gif
deleted file mode 100755 (executable)
index c4e1072..0000000
Binary files a/EarlyBlue/editor/icons/table-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/table.gif b/EarlyBlue/editor/icons/table.gif
deleted file mode 100755 (executable)
index a1618db..0000000
Binary files a/EarlyBlue/editor/icons/table.gif and /dev/null differ

diff --git a/EarlyBlue/global/icons/print-disabled.gif b/EarlyBlue/global/icons/print-disabled.gif
deleted file mode 100755 (executable)
index e0e01fb..0000000
Binary files a/EarlyBlue/global/icons/print-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/global/icons/print.gif b/EarlyBlue/global/icons/print.gif
deleted file mode 100755 (executable)
index 95ffbc9..0000000
Binary files a/EarlyBlue/global/icons/print.gif and /dev/null differ

diff --git a/EarlyBlue/global/icons/stop-disabled.gif b/EarlyBlue/global/icons/stop-disabled.gif
deleted file mode 100755 (executable)
index 54d7c41..0000000
Binary files a/EarlyBlue/global/icons/stop-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/global/icons/stop.gif b/EarlyBlue/global/icons/stop.gif
deleted file mode 100755 (executable)
index e489f98..0000000
Binary files a/EarlyBlue/global/icons/stop.gif and /dev/null differ

diff --git a/EarlyBlue/global/icons/trash-disabled.gif b/EarlyBlue/global/icons/trash-disabled.gif
deleted file mode 100755 (executable)
index 0b73030..0000000
Binary files a/EarlyBlue/global/icons/trash-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/global/icons/trash.gif b/EarlyBlue/global/icons/trash.gif
deleted file mode 100755 (executable)
index c5cb646..0000000
Binary files a/EarlyBlue/global/icons/trash.gif and /dev/null differ

diff --git a/EarlyBlue/messenger/messengercompose/messengercompose.css b/EarlyBlue/messenger/messengercompose/messengercompose.css
index d08a3cf94f82227501514e52bc5de2bd3d9a9291..1ece84547753c0f0b3b88482af65c3107e4ca41d 100644 (file)
--- a/EarlyBlue/messenger/messengercompose/messengercompose.css
+++ b/EarlyBlue/messenger/messengercompose/messengercompose.css
@@ -82,11 +82,12 @@
 }
 
 #spellingButton {
 }
 
 #spellingButton {

-  list-style-image: url("chrome://editor/skin/icons/spell.gif");
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(168px 25px 189px 0px);

 }
 
 #spellingButton[disabled="true"] {
 }
 
 #spellingButton[disabled="true"] {

-  list-style-image: url("chrome://editor/skin/icons/spell-disabled.gif");
+  -moz-image-region: rect(168px 50px 189px 25px);

 }
 
 #button-save {
 }
 
 #button-save {


@@ -100,57 +101,64 @@
 
 /* ::::: small primary toolbar buttons ::::: */
 
 
 /* ::::: small primary toolbar buttons ::::: */
 

-/* TODO: correct coords!

 toolbar[iconsize="small"] > #button-send,
 toolbar[iconsize="small"] > toolbarpaletteitem > #button-send {
   list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
 toolbar[iconsize="small"] > #button-send,
 toolbar[iconsize="small"] > toolbarpaletteitem > #button-send {
   list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");

-  -moz-image-region: rect(220px 19px 239px 0);
+  -moz-image-region: rect(176px 16px 192px 0);

 }
 
 toolbar[iconsize="small"] > #button-send[disabled="true"] {
 }
 
 toolbar[iconsize="small"] > #button-send[disabled="true"] {

-  -moz-image-region: rect(220px 79px 239px 60px) !important;
+  -moz-image-region: rect(176px 32px 192px 16px);
+}
+
+toolbar[iconsize="small"] > #button-send[offline="true"] {
+  -moz-image-region: rect(208px 16px 224px 0);
+}
+
+toolbar[iconsize="small"] > #button-send[offline="true"][disabled="true"] {
+  -moz-image-region: rect(208px 32px 224px 16px);

 }
 
 toolbar[iconsize="small"] > #button-address,
 toolbar[iconsize="small"] > toolbarpaletteitem > #button-address {
   list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
 }
 
 toolbar[iconsize="small"] > #button-address,
 toolbar[iconsize="small"] > toolbarpaletteitem > #button-address {
   list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");

-  -moz-image-region: rect(180px 19px 199px 0);
+  -moz-image-region: rect(144px 16px 160px 0);

 }
 
 toolbar[iconsize="small"] > #button-address[disabled="true"] {
 }
 
 toolbar[iconsize="small"] > #button-address[disabled="true"] {

-  -moz-image-region: rect(180px 79px 199px 60px) !important;
+  -moz-image-region: rect(144px 32px 160px 16px);

 }
 
 toolbar[iconsize="small"] > #button-attach,
 toolbar[iconsize="small"] > toolbarpaletteitem > #button-attach {
   list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
 }
 
 toolbar[iconsize="small"] > #button-attach,
 toolbar[iconsize="small"] > toolbarpaletteitem > #button-attach {
   list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");

-  -moz-image-region: rect(200px 19px 219px 0);
+  -moz-image-region: rect(160px 16px 176px 0);

 }
 
 toolbar[iconsize="small"] > #button-attach[disabled="true"] {
 }
 
 toolbar[iconsize="small"] > #button-attach[disabled="true"] {

-  -moz-image-region: rect(200px 79px 219px 60px) !important;
+  -moz-image-region: rect(160px 32px 176px 16px);

 }
 
 toolbar[iconsize="small"] > #spellingButton,
 toolbar[iconsize="small"] > toolbarpaletteitem > #spellingButton {
   list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
 }
 
 toolbar[iconsize="small"] > #spellingButton,
 toolbar[iconsize="small"] > toolbarpaletteitem > #spellingButton {
   list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");

-  -moz-image-region: rect(160px 19px 179px 0);
+  -moz-image-region: rect(128px 16px 144px 0);

 }
 
 toolbar[iconsize="small"] > #spellingButton[disabled="true"] {
 }
 
 toolbar[iconsize="small"] > #spellingButton[disabled="true"] {

-  -moz-image-region: rect(160px 79px 179px 60px) !important;
+  -moz-image-region: rect(128px 32px 144px 16px);

 }
 
 toolbar[iconsize="small"] > #button-save,
 toolbar[iconsize="small"] > toolbarpaletteitem > #button-save {
 }
 
 toolbar[iconsize="small"] > #button-save,
 toolbar[iconsize="small"] > toolbarpaletteitem > #button-save {

-  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
-  -moz-image-region: rect(140px 19px 159px 0);
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(224px 16px 240px 0);

 }
 
 toolbar[iconsize="small"] > #button-save[disabled="true"] {
 }
 
 toolbar[iconsize="small"] > #button-save[disabled="true"] {

-  -moz-image-region: rect(140px 79px 159px 60px) !important;
+  -moz-image-region: rect(224px 32px 140px 16px);

 }
 }

-*/
+

 #MsgHeadersToolbar {
   min-height: 0px; /* this undoes the min-height in toolbar.css */
 }
 #MsgHeadersToolbar {
   min-height: 0px; /* this undoes the min-height in toolbar.css */
 }

diff --git a/EarlyBlue/messenger/smime/icons/key-broken-disabled.gif b/EarlyBlue/messenger/smime/icons/key-broken-disabled.gif
deleted file mode 100644 (file)
index edbe569..0000000
Binary files a/EarlyBlue/messenger/smime/icons/key-broken-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/messenger/smime/icons/key-broken.gif b/EarlyBlue/messenger/smime/icons/key-broken.gif
deleted file mode 100644 (file)
index a407cc4..0000000
Binary files a/EarlyBlue/messenger/smime/icons/key-broken.gif and /dev/null differ

diff --git a/EarlyBlue/messenger/smime/icons/key-disabled.gif b/EarlyBlue/messenger/smime/icons/key-disabled.gif
deleted file mode 100644 (file)
index 86b4796..0000000
Binary files a/EarlyBlue/messenger/smime/icons/key-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/messenger/smime/icons/key.gif b/EarlyBlue/messenger/smime/icons/key.gif
deleted file mode 100644 (file)
index a8d1010..0000000
Binary files a/EarlyBlue/messenger/smime/icons/key.gif and /dev/null differ

diff --git a/EarlyBlue/messenger/smime/icons/lock-cert-disabled.gif b/EarlyBlue/messenger/smime/icons/lock-cert-disabled.gif
deleted file mode 100644 (file)
index 81663c4..0000000
Binary files a/EarlyBlue/messenger/smime/icons/lock-cert-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/messenger/smime/icons/lock-cert.gif b/EarlyBlue/messenger/smime/icons/lock-cert.gif
deleted file mode 100644 (file)
index d970a8f..0000000
Binary files a/EarlyBlue/messenger/smime/icons/lock-cert.gif and /dev/null differ

diff --git a/EarlyBlue/messenger/smime/icons/lock-disabled.gif b/EarlyBlue/messenger/smime/icons/lock-disabled.gif
deleted file mode 100644 (file)
index 478bdd9..0000000
Binary files a/EarlyBlue/messenger/smime/icons/lock-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/messenger/smime/icons/lock-no-cert-disabled.gif b/EarlyBlue/messenger/smime/icons/lock-no-cert-disabled.gif
deleted file mode 100644 (file)
index 0ad1e8a..0000000
Binary files a/EarlyBlue/messenger/smime/icons/lock-no-cert-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/messenger/smime/icons/lock-no-cert.gif b/EarlyBlue/messenger/smime/icons/lock-no-cert.gif
deleted file mode 100644 (file)
index f8310f8..0000000
Binary files a/EarlyBlue/messenger/smime/icons/lock-no-cert.gif and /dev/null differ

diff --git a/EarlyBlue/messenger/smime/icons/lock.gif b/EarlyBlue/messenger/smime/icons/lock.gif
deleted file mode 100644 (file)
index 2137328..0000000
Binary files a/EarlyBlue/messenger/smime/icons/lock.gif and /dev/null differ

diff --git a/EarlyBlue/messenger/smime/icons/smimeicons-small.png b/EarlyBlue/messenger/smime/icons/smimeicons-small.png
new file mode 100644 (file)
index 0000000..8a6258a
Binary files /dev/null and b/EarlyBlue/messenger/smime/icons/smimeicons-small.png differ

diff --git a/EarlyBlue/messenger/smime/icons/smimeicons.png b/EarlyBlue/messenger/smime/icons/smimeicons.png
new file mode 100644 (file)
index 0000000..8dc3bd6
Binary files /dev/null and b/EarlyBlue/messenger/smime/icons/smimeicons.png differ

diff --git a/EarlyBlue/messenger/smime/msgCompSMIMEOverlay.css b/EarlyBlue/messenger/smime/msgCompSMIMEOverlay.css
index 093ec78f62279299abbd8f4be36fd4ef275cadc2..fc38c808bf5f921496b2b8a40f8d979f3c25cd1b 100644 (file)
--- a/EarlyBlue/messenger/smime/msgCompSMIMEOverlay.css
+++ b/EarlyBlue/messenger/smime/msgCompSMIMEOverlay.css
@@ -42,13 +42,23 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #button-security {
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #button-security {

-  list-style-image: url("chrome://messenger/skin/smime/icons/lock.gif");
+  list-style-image: url("chrome://messenger/skin/smime/icons/smimeicons.png");
+  -moz-image-region: rect(0px 25px 21px 0px);

 }
 
 #button-security[disabled] {
 }
 
 #button-security[disabled] {

-  list-style-image: url("chrome://messenger/skin/smime/icons/lock-disabled.gif");
+  -moz-image-region: rect(0px 50px 21px 25px);

 }
 
 }
 

+toolbar[iconsize="small"] > #button-security,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-security {
+  list-style-image: url("chrome://messenger/skin/smime/icons/smimeicons-small.png");
+  -moz-image-region: rect(0 16px 16px 0px);
+}
+
+toolbar[iconsize="small"] > #button-security[disabled] {
+  -moz-image-region: rect(0 32px 16px 16px);
+}

 
 #msgcomposeWindow #signing-status {
   list-style-image: none;
 
 #msgcomposeWindow #signing-status {
   list-style-image: none;