diff --git a/mozilla/mailnews/ui/compose/resources/Makefile.in b/mozilla/mailnews/ui/compose/resources/Makefile.in index ef62b15ad19..719a925f1a2 100644 --- a/mozilla/mailnews/ui/compose/resources/Makefile.in +++ b/mozilla/mailnews/ui/compose/resources/Makefile.in @@ -26,49 +26,26 @@ include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk -SAMPLES_DIR = $(DIST)/bin/res/samples -TOOLBAR_DIR = $(DIST)/bin/res/toolbar +SAMPLES_DIR = $(DIST)/bin/res/mailnews/compose EXPORT_RESOURCE_SAMPLES = \ ./Compose.xul \ ./ComposeBody.html \ ./ComposeFrame.html \ + ./send.gif \ + ./quote.gif \ + ./address.gif \ + ./attach.gif \ + ./spelling.gif \ + ./save.gif \ + ./stop.gif \ $(NULL) EXPORT_RESOURCE_SAMPLES_TO_REMOVE := $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) -EXPORT_RESOURCE_TOOLBAR = \ - ./mail_options.gif \ - ./mail_options_mo.gif \ - ./mail_options_dis.gif \ - ./mail_options_dep.gif \ - ./mail_quotemsg.gif \ - ./mail_quotemsg_mo.gif \ - ./mail_quotemsg_dis.gif \ - ./mail_quotemsg_dep.gif \ - ./mail_selectaddress.gif \ - ./mail_selectaddress_mo.gif \ - ./mail_selectaddress_dis.gif \ - ./mail_selectaddress_dep.gif \ - ./mail_attach.gif \ - ./mail_attach_mo.gif \ - ./mail_attach_dis.gif \ - ./mail_attach_dep.gif \ - ./mail_spelling.gif \ - ./mail_spelling_mo.gif \ - ./mail_spelling_dis.gif \ - ./mail_spelling_dep.gif \ - ./mail_save.gif \ - ./mail_save_mo.gif \ - ./mail_save_dis.gif \ - ./mail_save_dep.gif \ - $(NULL) - -EXPORT_RESOURCE_TOOLBAR_TO_REMOVE := $(addprefix $(TOOLBAR_DIR)/, $(EXPORT_RESOURCE_TOOLBAR)) install:: $(INSTALL) $(EXPORT_RESOURCE_SAMPLES) $(SAMPLES_DIR) - $(INSTALL) $(EXPORT_RESOURCE_TOOLBAR) $(TOOLBAR_DIR) clobber:: - $(RM) $(EXPORT_RESOURCE_SAMPLES_TO_REMOVE) $(EXPORT_RESOURCE_TOOLBAR_TO_REMOVE) + $(RM) $(EXPORT_RESOURCE_SAMPLES_TO_REMOVE) diff --git a/mozilla/mailnews/ui/compose/resources/Makefile.win b/mozilla/mailnews/ui/compose/resources/Makefile.win index bcb5d77a278..5ebea9c2001 100644 --- a/mozilla/mailnews/ui/compose/resources/Makefile.win +++ b/mozilla/mailnews/ui/compose/resources/Makefile.win @@ -22,60 +22,26 @@ IGNORE_MANIFEST=1 include <$(DEPTH)\config\rules.mak> install:: $(DLL) - $(MAKE_INSTALL) Compose.xul $(DIST)\bin\res\samples - $(MAKE_INSTALL) ComposeBody.html $(DIST)\bin\res\samples - $(MAKE_INSTALL) ComposeFrame.html $(DIST)\bin\res\samples - $(MAKE_INSTALL) mail_options.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) mail_options_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) mail_options_dis.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) mail_options_dep.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) mail_quotemsg.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) mail_quotemsg_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) mail_quotemsg_dis.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) mail_quotemsg_dep.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) mail_selectaddress.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) mail_selectaddress_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) mail_selectaddress_dis.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) mail_selectaddress_dep.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) mail_attach.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) mail_attach_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) mail_attach_dis.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) mail_attach_dep.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) mail_spelling.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) mail_spelling_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) mail_spelling_dis.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) mail_spelling_dep.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) mail_save.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) mail_save_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) mail_save_dis.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) mail_save_dep.gif $(DIST)\bin\res\toolbar + $(MAKE_INSTALL) Compose.xul $(DIST)\bin\res\mailnews\compose + $(MAKE_INSTALL) ComposeBody.html $(DIST)\bin\res\mailnews\compose + $(MAKE_INSTALL) ComposeFrame.html $(DIST)\bin\res\mailnews\compose + $(MAKE_INSTALL) send.gif $(DIST)\bin\res\mailnews\compose + $(MAKE_INSTALL) quote.gif $(DIST)\bin\res\mailnews\compose + $(MAKE_INSTALL) address.gif $(DIST)\bin\res\mailnews\compose + $(MAKE_INSTALL) attach.gif $(DIST)\bin\res\mailnews\compose + $(MAKE_INSTALL) spelling.gif $(DIST)\bin\res\mailnews\compose + $(MAKE_INSTALL) save.gif $(DIST)\bin\res\mailnews\compose + $(MAKE_INSTALL) stop.gif $(DIST)\bin\res\mailnews\compose clobber:: - rm -f $(DIST)\bin\res\samples\Compose.xul - rm -f $(DIST)\bin\res\samples\ComposeBody.html - rm -f $(DIST)\bin\res\samples\ComposeFrame.html - rm -f $(DIST)\bin\res\toolbar\mail_options.gif - rm -f $(DIST)\bin\res\toolbar\mail_options_mo.gif - rm -f $(DIST)\bin\res\toolbar\mail_options_dis.gif - rm -f $(DIST)\bin\res\toolbar\mail_options_dep.gif - rm -f $(DIST)\bin\res\toolbar\mail_quotemsg.gif - rm -f $(DIST)\bin\res\toolbar\mail_quotemsg_mo.gif - rm -f $(DIST)\bin\res\toolbar\mail_quotemsg_dis.gif - rm -f $(DIST)\bin\res\toolbar\mail_quotemsg_dep.gif - rm -f $(DIST)\bin\res\toolbar\mail_selectaddress.gif - rm -f $(DIST)\bin\res\toolbar\mail_selectaddress_mo.gif - rm -f $(DIST)\bin\res\toolbar\mail_selectaddress_dis.gif - rm -f $(DIST)\bin\res\toolbar\mail_selectaddress_dep.gif - rm -f $(DIST)\bin\res\toolbar\mail_attach.gif - rm -f $(DIST)\bin\res\toolbar\mail_attach_mo.gif - rm -f $(DIST)\bin\res\toolbar\mail_attach_dis.gif - rm -f $(DIST)\bin\res\toolbar\mail_attach_dep.gif - rm -f $(DIST)\bin\res\toolbar\mail_spelling.gif - rm -f $(DIST)\bin\res\toolbar\mail_spelling_mo.gif - rm -f $(DIST)\bin\res\toolbar\mail_spelling_dis.gif - rm -f $(DIST)\bin\res\toolbar\mail_spelling_dep.gif - rm -f $(DIST)\bin\res\toolbar\mail_save.gif - rm -f $(DIST)\bin\res\toolbar\mail_save_mo.gif - rm -f $(DIST)\bin\res\toolbar\mail_save_dis.gif - rm -f $(DIST)\bin\res\toolbar\mail_save_dep.gif + rm -f $(DIST)\bin\res\mailnews\compose\Compose.xul + rm -f $(DIST)\bin\res\mailnews\compose\ComposeBody.html + rm -f $(DIST)\bin\res\mailnews\compose\ComposeFrame.html + rm -f $(DIST)\bin\res\mailnews\compose\send.gif + rm -f $(DIST)\bin\res\mailnews\compose\quote.gif + rm -f $(DIST)\bin\res\mailnews\compose\address.gif + rm -f $(DIST)\bin\res\mailnews\compose\attach.gif + rm -f $(DIST)\bin\res\mailnews\compose\spelling.gif + rm -f $(DIST)\bin\res\mailnews\compose\save.gif + rm -f $(DIST)\bin\res\mailnews\compose\stop.gif diff --git a/mozilla/mailnews/ui/compose/resources/address.gif b/mozilla/mailnews/ui/compose/resources/address.gif new file mode 100644 index 00000000000..3de9063473c Binary files /dev/null and b/mozilla/mailnews/ui/compose/resources/address.gif differ diff --git a/mozilla/mailnews/ui/compose/resources/attach.gif b/mozilla/mailnews/ui/compose/resources/attach.gif new file mode 100644 index 00000000000..15408e0f247 Binary files /dev/null and b/mozilla/mailnews/ui/compose/resources/attach.gif differ diff --git a/mozilla/mailnews/ui/compose/resources/compose.xul b/mozilla/mailnews/ui/compose/resources/compose.xul index 7095215b607..49697ae0fc9 100644 --- a/mozilla/mailnews/ui/compose/resources/compose.xul +++ b/mozilla/mailnews/ui/compose/resources/compose.xul @@ -1,5 +1,5 @@ - + @@ -160,7 +160,6 @@ - @@ -174,28 +173,25 @@ - + - + - + - + - + - + - - - - + @@ -220,7 +216,7 @@ - + diff --git a/mozilla/mailnews/ui/compose/resources/quote.gif b/mozilla/mailnews/ui/compose/resources/quote.gif new file mode 100644 index 00000000000..e2393e661a1 Binary files /dev/null and b/mozilla/mailnews/ui/compose/resources/quote.gif differ diff --git a/mozilla/mailnews/ui/compose/resources/save.gif b/mozilla/mailnews/ui/compose/resources/save.gif new file mode 100644 index 00000000000..87f95e10d5b Binary files /dev/null and b/mozilla/mailnews/ui/compose/resources/save.gif differ diff --git a/mozilla/mailnews/ui/compose/resources/send.gif b/mozilla/mailnews/ui/compose/resources/send.gif new file mode 100644 index 00000000000..e9b1d626504 Binary files /dev/null and b/mozilla/mailnews/ui/compose/resources/send.gif differ diff --git a/mozilla/mailnews/ui/compose/resources/spelling.gif b/mozilla/mailnews/ui/compose/resources/spelling.gif new file mode 100644 index 00000000000..d685561d8fc Binary files /dev/null and b/mozilla/mailnews/ui/compose/resources/spelling.gif differ diff --git a/mozilla/mailnews/ui/compose/resources/stop.gif b/mozilla/mailnews/ui/compose/resources/stop.gif new file mode 100644 index 00000000000..d3ffd473057 Binary files /dev/null and b/mozilla/mailnews/ui/compose/resources/stop.gif differ diff --git a/mozilla/mailnews/ui/messenger/resources/Makefile.in b/mozilla/mailnews/ui/messenger/resources/Makefile.in index 19994aaeb7e..db72a141bda 100644 --- a/mozilla/mailnews/ui/messenger/resources/Makefile.in +++ b/mozilla/mailnews/ui/messenger/resources/Makefile.in @@ -26,7 +26,7 @@ include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk -SAMPLES_DIR = $(DIST)/bin/res/samples +SAMPLES_DIR = $(DIST)/bin/res/mailnews/messenger EXPORT_RESOURCE_SAMPLES = \ ./mailshell.xul \ @@ -36,7 +36,6 @@ EXPORT_RESOURCE_SAMPLES = \ ./threadPane.xul \ ./threadPane.css \ ./message.html \ - ./delmsg.gif \ ./widgetglue.js \ ./commandglue.js \ ./shareglue.js \ @@ -49,6 +48,11 @@ EXPORT_RESOURCE_SAMPLES = \ ./closedInbox.gif \ ./closedTrash.gif \ ./closedOutbox.gif \ + ./getmsg.gif \ + ./newmsg.gif \ + ./reply.gif \ + ./forward.gif \ + ./trash.gif \ $(NULL) EXPORT_RESOURCE_SAMPLES_TO_REMOVE := $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) diff --git a/mozilla/mailnews/ui/messenger/resources/commandglue.js b/mozilla/mailnews/ui/messenger/resources/commandglue.js index 7f1d0d97080..2296d14be19 100644 --- a/mozilla/mailnews/ui/messenger/resources/commandglue.js +++ b/mozilla/mailnews/ui/messenger/resources/commandglue.js @@ -40,7 +40,7 @@ function ComposeMessage(tree, nodeList, msgAppCore, type) var appCore = FindComposeAppCore(); if (appCore != null) { appCore.SetWindow(window); - appCore.NewMessage("resource:/res/samples/compose.xul", tree, + appCore.NewMessage("resource:/res/mailnews/compose/compose.xul", tree, nodeList, msgAppCore, type); } } diff --git a/mozilla/mailnews/ui/messenger/resources/folderPane.css b/mozilla/mailnews/ui/messenger/resources/folderPane.css index d822ec907d3..7c5756c6732 100644 --- a/mozilla/mailnews/ui/messenger/resources/folderPane.css +++ b/mozilla/mailnews/ui/messenger/resources/folderPane.css @@ -43,24 +43,24 @@ treehead treeitem treecell { } treeitem > treecell > titledbutton { - list-style-image: url("resource:/res/samples/closedMailFolder.gif"); + list-style-image: url("resource:/res/mailnews/messenger/closedMailFolder.gif"); } treeitem[open="true"] > treecell > titledbutton { - list-style-image: url("resource:/res/samples/openMailFolder.gif"); + list-style-image: url("resource:/res/mailnews/messenger/openMailFolder.gif"); } treeitem[SpecialFolder="Inbox"] > treecell > titledbutton { vertical-align: bottom; - list-style-image: url("resource:/res/samples/closedInbox.gif"); + list-style-image: url("resource:/res/mailnews/messenger/closedInbox.gif"); } treeitem[SpecialFolder="Trash"] > treecell > titledbutton { vertical-align: bottom; - list-style-image: url("resource:/res/samples/closedTrash.gif"); + list-style-image: url("resource:/res/mailnews/messenger/closedTrash.gif"); } treeitem[SpecialFolder="Unsent Messages"] > treecell > titledbutton { vertical-align: bottom; - list-style-image: url("resource:/res/samples/closedOutbox.gif"); + list-style-image: url("resource:/res/mailnews/messenger/closedOutbox.gif"); } diff --git a/mozilla/mailnews/ui/messenger/resources/folderPane.xul b/mozilla/mailnews/ui/messenger/resources/folderPane.xul index 16dcc49b5f8..d5e37268e38 100644 --- a/mozilla/mailnews/ui/messenger/resources/folderPane.xul +++ b/mozilla/mailnews/ui/messenger/resources/folderPane.xul @@ -21,7 +21,7 @@ - Local Mail + Local Mail diff --git a/mozilla/mailnews/ui/messenger/resources/forward.gif b/mozilla/mailnews/ui/messenger/resources/forward.gif new file mode 100644 index 00000000000..eea16746d83 Binary files /dev/null and b/mozilla/mailnews/ui/messenger/resources/forward.gif differ diff --git a/mozilla/mailnews/ui/messenger/resources/getmsg.gif b/mozilla/mailnews/ui/messenger/resources/getmsg.gif index 0a4496d31b5..6e5140a7f5d 100644 Binary files a/mozilla/mailnews/ui/messenger/resources/getmsg.gif and b/mozilla/mailnews/ui/messenger/resources/getmsg.gif differ diff --git a/mozilla/mailnews/ui/messenger/resources/mailshell.xul b/mozilla/mailnews/ui/messenger/resources/mailshell.xul index d2143ed422e..7a9f8be9ea1 100644 --- a/mozilla/mailnews/ui/messenger/resources/mailshell.xul +++ b/mozilla/mailnews/ui/messenger/resources/mailshell.xul @@ -1,5 +1,5 @@ - + @@ -273,28 +273,28 @@ - + - + - + - + - + - + - + @@ -306,7 +306,7 @@ - + diff --git a/mozilla/mailnews/ui/messenger/resources/makefile.win b/mozilla/mailnews/ui/messenger/resources/makefile.win index 78583dab798..937ceeb997b 100644 --- a/mozilla/mailnews/ui/messenger/resources/makefile.win +++ b/mozilla/mailnews/ui/messenger/resources/makefile.win @@ -24,37 +24,45 @@ MODULE=mailnews include <$(DEPTH)\config\rules.mak> install:: - $(MAKE_INSTALL) mailshell.xul $(DIST)\bin\res\samples - $(MAKE_INSTALL) msgBar.xul $(DIST)\bin\res\samples - $(MAKE_INSTALL) folderPane.xul $(DIST)\bin\res\samples - $(MAKE_INSTALL) folderPane.css $(DIST)\bin\res\samples - $(MAKE_INSTALL) threadPane.xul $(DIST)\bin\res\samples - $(MAKE_INSTALL) threadPane.css $(DIST)\bin\res\samples - $(MAKE_INSTALL) message.html $(DIST)\bin\res\samples - $(MAKE_INSTALL) delmsg.gif $(DIST)\bin\res\samples - $(MAKE_INSTALL) widgetglue.js $(DIST)\bin\res\samples - $(MAKE_INSTALL) commandglue.js $(DIST)\bin\res\samples - $(MAKE_INSTALL) shareglue.js $(DIST)\bin\res\samples - $(MAKE_INSTALL) 3panemail.html $(DIST)\bin\res\samples - $(MAKE_INSTALL) messagePane.xul $(DIST)\bin\res\samples - $(MAKE_INSTALL) closedMailFolder.gif $(DIST)\bin\res\samples - $(MAKE_INSTALL) openMailFolder.gif $(DIST)\bin\res\samples - $(MAKE_INSTALL) localMailHost.gif $(DIST)\bin\res\samples - $(MAKE_INSTALL) mailMessage.gif $(DIST)\bin\res\samples - $(MAKE_INSTALL) closedInbox.gif $(DIST)\bin\res\samples - $(MAKE_INSTALL) closedTrash.gif $(DIST)\bin\res\samples - $(MAKE_INSTALL) closedOutbox.gif $(DIST)\bin\res\samples + $(MAKE_INSTALL) mailshell.xul $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) msgBar.xul $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) folderPane.xul $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) folderPane.css $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) threadPane.xul $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) threadPane.css $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) message.html $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) widgetglue.js $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) commandglue.js $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) shareglue.js $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) 3panemail.html $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) messagePane.xul $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) closedMailFolder.gif $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) openMailFolder.gif $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) localMailHost.gif $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) mailMessage.gif $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) closedInbox.gif $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) closedTrash.gif $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) closedOutbox.gif $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) getmsg.gif $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) newmsg.gif $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) reply.gif $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) forward.gif $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) trash.gif $(DIST)\bin\res\mailnews\messenger clobber:: - rm -f $(DIST)\res\samples\mailshell.xul - rm -f $(DIST)\res\samples\msgBar.xul - rm -f $(DIST)\res\samples\folderPane.xul - rm -f $(DIST)\res\samples\folderPane.css - rm -f $(DIST)\res\samples\threadPane.xul - rm -f $(DIST)\res\samples\message.html - rm -f $(DIST)\res\samples\delmsg.gif - rm -f $(DIST)\res\samples\widgetglue.js - rm -f $(DIST)\res\samples\commandglue.js - rm -f $(DIST)\res\samples\shareglue.js - rm -f $(DIST)\res\samples\3panemail.html - rm -f $(DIST)\res\samples\messagePane.xul + rm -f $(DIST)\res\mailnews\messenger\mailshell.xul + rm -f $(DIST)\res\mailnews\messenger\msgBar.xul + rm -f $(DIST)\res\mailnews\messenger\folderPane.xul + rm -f $(DIST)\res\mailnews\messenger\folderPane.css + rm -f $(DIST)\res\mailnews\messenger\threadPane.xul + rm -f $(DIST)\res\mailnews\messenger\message.html + rm -f $(DIST)\res\mailnews\messenger\widgetglue.js + rm -f $(DIST)\res\mailnews\messenger\commandglue.js + rm -f $(DIST)\res\mailnews\messenger\shareglue.js + rm -f $(DIST)\res\mailnews\messenger\3panemail.html + rm -f $(DIST)\res\mailnews\messenger\messagePane.xul + rm -f $(DIST)\res\mailnews\messenger\getmsg.gif + rm -f $(DIST)\res\mailnews\messenger\newmsg.gif + rm -f $(DIST)\res\mailnews\messenger\reply.gif + rm -f $(DIST)\res\mailnews\messenger\forward.gif + rm -f $(DIST)\res\mailnews\messenger\trash.gif diff --git a/mozilla/mailnews/ui/messenger/resources/messagePane.xul b/mozilla/mailnews/ui/messenger/resources/messagePane.xul index 082eefc7992..7d06f9e39cc 100644 --- a/mozilla/mailnews/ui/messenger/resources/messagePane.xul +++ b/mozilla/mailnews/ui/messenger/resources/messagePane.xul @@ -1,5 +1,5 @@ - + diff --git a/mozilla/mailnews/ui/messenger/resources/msgbar.xul b/mozilla/mailnews/ui/messenger/resources/msgbar.xul index 79ba0c8f000..2c66390eee2 100644 --- a/mozilla/mailnews/ui/messenger/resources/msgbar.xul +++ b/mozilla/mailnews/ui/messenger/resources/msgbar.xul @@ -239,22 +239,22 @@ - + - + - + - + - + - + diff --git a/mozilla/mailnews/ui/messenger/resources/newmsg.gif b/mozilla/mailnews/ui/messenger/resources/newmsg.gif index a784351e8d7..f1c674ac6df 100644 Binary files a/mozilla/mailnews/ui/messenger/resources/newmsg.gif and b/mozilla/mailnews/ui/messenger/resources/newmsg.gif differ diff --git a/mozilla/mailnews/ui/messenger/resources/reply.gif b/mozilla/mailnews/ui/messenger/resources/reply.gif new file mode 100644 index 00000000000..e19dc11f8e1 Binary files /dev/null and b/mozilla/mailnews/ui/messenger/resources/reply.gif differ diff --git a/mozilla/mailnews/ui/messenger/resources/threadPane.css b/mozilla/mailnews/ui/messenger/resources/threadPane.css index e9d323db869..18e1b26abbc 100644 --- a/mozilla/mailnews/ui/messenger/resources/threadPane.css +++ b/mozilla/mailnews/ui/messenger/resources/threadPane.css @@ -53,5 +53,5 @@ icon { treeitem > treecell > titledbutton { vertical-align: bottom; - list-style-image: url("resource:/res/samples/mailMessage.gif"); + list-style-image: url("resource:/res/mailnews/messenger/mailMessage.gif"); } diff --git a/mozilla/mailnews/ui/messenger/resources/trash.gif b/mozilla/mailnews/ui/messenger/resources/trash.gif new file mode 100644 index 00000000000..7a31edd4966 Binary files /dev/null and b/mozilla/mailnews/ui/messenger/resources/trash.gif differ