From f1b84326bdf7cd373c5f034243132703c46f8d5f Mon Sep 17 00:00:00 2001 From: "chuang%netscape.com" Date: Wed, 24 Mar 1999 08:27:57 +0000 Subject: [PATCH] Add new icon files and create mailnews resources directory under res git-svn-id: svn://10.0.0.236/trunk@24982 18797224-902f-48f8-a5cc-f745e15eee43 --- .../mailnews/ui/compose/resources/Makefile.in | 41 +++------- .../ui/compose/resources/Makefile.win | 74 +++++------------- .../mailnews/ui/compose/resources/address.gif | Bin 0 -> 913 bytes .../mailnews/ui/compose/resources/attach.gif | Bin 0 -> 895 bytes .../mailnews/ui/compose/resources/compose.xul | 22 +++--- .../mailnews/ui/compose/resources/quote.gif | Bin 0 -> 906 bytes .../mailnews/ui/compose/resources/save.gif | Bin 0 -> 906 bytes .../mailnews/ui/compose/resources/send.gif | Bin 0 -> 889 bytes .../ui/compose/resources/spelling.gif | Bin 0 -> 911 bytes .../mailnews/ui/compose/resources/stop.gif | Bin 0 -> 902 bytes .../ui/messenger/resources/Makefile.in | 8 +- .../ui/messenger/resources/commandglue.js | 2 +- .../ui/messenger/resources/folderPane.css | 10 +-- .../ui/messenger/resources/folderPane.xul | 2 +- .../ui/messenger/resources/forward.gif | Bin 0 -> 905 bytes .../ui/messenger/resources/getmsg.gif | Bin 1045 -> 911 bytes .../ui/messenger/resources/mailshell.xul | 18 ++--- .../ui/messenger/resources/makefile.win | 72 +++++++++-------- .../ui/messenger/resources/messagePane.xul | 2 +- .../ui/messenger/resources/msgbar.xul | 12 +-- .../ui/messenger/resources/newmsg.gif | Bin 1031 -> 904 bytes .../mailnews/ui/messenger/resources/reply.gif | Bin 0 -> 900 bytes .../ui/messenger/resources/threadPane.css | 2 +- .../mailnews/ui/messenger/resources/trash.gif | Bin 0 -> 910 bytes 24 files changed, 108 insertions(+), 157 deletions(-) create mode 100644 mozilla/mailnews/ui/compose/resources/address.gif create mode 100644 mozilla/mailnews/ui/compose/resources/attach.gif create mode 100644 mozilla/mailnews/ui/compose/resources/quote.gif create mode 100644 mozilla/mailnews/ui/compose/resources/save.gif create mode 100644 mozilla/mailnews/ui/compose/resources/send.gif create mode 100644 mozilla/mailnews/ui/compose/resources/spelling.gif create mode 100644 mozilla/mailnews/ui/compose/resources/stop.gif create mode 100644 mozilla/mailnews/ui/messenger/resources/forward.gif create mode 100644 mozilla/mailnews/ui/messenger/resources/reply.gif create mode 100644 mozilla/mailnews/ui/messenger/resources/trash.gif 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 0000000000000000000000000000000000000000..3de9063473c702163b58310b91c0537a402e125b GIT binary patch literal 913 zcmc(e&x?<75XawJ%1XFUE5BK#P--0fJgD{k?j9Vr+(@m%92{IYxT55;7uv%(h!WWg zyGf30l*8Qp2YaTJNR8J#|AfzNnwj^!<~`3do*SJyy|7a|^h>IKSrt`YWmW1Zvob2Z z(kj)-$cm`&3ae1pdX`7Ims`2I)v_$gyv)jkQYlMO@{*MZ&_)_9nyFUL=@*%vX_@M= zL=hRDVHs))k{;=vZs}?$YAw<{&C&!Tt*JoR=>!W72BVF% z`b1q#nwTdphLP;YSRzw@9PR6H?@kUUY@3IxbnRetyFPf=t%DtXgki&08ld|o14j!F z(tHkF3G>*AQUB{5_`P95I<8|4(Eo%cZ|chA?%B7`KHZ%RAzo`3%F z!RC#llOKL8d|sT|b?x1ql`rGRdoMkj*|d6SW@-QY>d&cL>$6V|?sx) q)35FD_~C`|pTBYW<;>FP=$Z3>w%=G=zWC<)mRMQ-_G)56Xa50sBzD^X literal 0 HcmV?d00001 diff --git a/mozilla/mailnews/ui/compose/resources/attach.gif b/mozilla/mailnews/ui/compose/resources/attach.gif new file mode 100644 index 0000000000000000000000000000000000000000..15408e0f2475a4353ed3bba9e0784713694e32b6 GIT binary patch literal 895 zcmc(eJ!_R=42JIm3Uw0v7%CNUDN+Q7fV7H^r^hNPvofJn%2JfPWF-Q$kw%MVs?~G)MW$z3rg|(< zM22TrhMIz;N4lq5x*CdFi!@KOG{Hz~DpH=Z6jPx_3}`69BFA8~kw%MV^+Fx z`!SZtJ>0_8>q0@&Jj}wx_CQe^@{omC4?n=98#~w^2sVToF`%KO6b=TXjWk+n=Q>Ty zGk3L-?8jIlGdJNY>q0@&WiEWgX$*jia*SqMti%s6>BbJ2SeOl=Mhs{=!GeRqXd|sY zQCE{D=8218B>ORz$kZQ4`#SF3$#KHAd0eGyhtci&@UB~j9esqcVJi*jzRBQd;UUfE zz?CqMof!4M-s!&wCemS@ZGiqKw6LjD3rn-NFFxH}IJ&aAzx(s~y+bE2%x8OBpC2AO zc>VT+$G@gKON*C3tnR& U=KG`RrH%aZ{>_g&lZh_=15*!h2><{9 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e2393e661a16b2c6ff393c3f903ec3616c34e75f GIT binary patch literal 906 zcmc(e&x_A-5XK+c);B39=^N44#TG8c!LPPx?UM3iOR~ARj4P$~Mz|2tikO3}lPgY= z3n>nhl>flR#a&M0HJ^XN`!>zYGp~8(^I14CzyH9cu{PMRG+H#P7wVYj5f-7| zkFiAV;TEo57YdT*VHPH~2a4K|hb+W;_yH!}*unllup!il0SzUka4;Bcq|s74*J)y& zxvPz2KgJT7xd~rc7YdRtbKxUSV*p%~V>H`hC4PWOH+I0p!fXgNVnEXg790#l8)@~4 zx|%dGPh1Qm*^jYArv5nE*Wuos98TCa4_E2h!RU5<@UB}2JNgL2hOIO}_e}*E5q(w{C2ky)yIW=jVIV zo0sn2Sy`Qbux`uIYoo;-UvBO^IeYl--j@q2d(JQYe)o2A?CI#jw+->#=bnsrUH>rt h@$2-XxvT4+KYQ$_9v)dfc<%kaS7%==E>BPC&_B!WaXbJ3 literal 0 HcmV?d00001 diff --git a/mozilla/mailnews/ui/compose/resources/save.gif b/mozilla/mailnews/ui/compose/resources/save.gif new file mode 100644 index 0000000000000000000000000000000000000000..87f95e10d5b16ba87b4a7503156529f4bfb4dc0e GIT binary patch literal 906 zcmc(ePm9lS5XaxNu_ZPehuuUj+Wob+S!HwZuU&r*9OSU&!eMYDId3+F+9>5P7cI%2 z6i+}&Ax(<%0600iNvZLg@00MkO*8YJ*SzQZJ$ZWR(88rD?bdIp`ejvAd6iYEqs+>v z^h&E#CnGDO!YiyoUF%sMQ>9LDDyHa6H28lMafH6B0w8yv}mSUJ*Qt}dZuNn z#}Y+kc!p)DDM)&xd%C5op{TV;^E68njI^dA7wQh7v4t3`QGiv}jf@)G^N^ zEJD2>V~O0uEnK}W6eP{VEKF<<6ty7_S%~%U15CQHgZ+VEL#Po08cIsxU@+Q9qosDP z)5JV;R~yNGj3qL26TY%86eL~d!bhCO0Jtc}Xtu>l`~Z_~?0|`d*$`^PfTj~HI2epJ z(&`g+HECj=xEMyVA7hD3{c*If!@WB>oUm;kuF|!G(e3)+UAGQ)^bv*)TWNsqn+zN+ zJV^67a3#!RCr16RxBt)BCTT)*4bcCD#;<7K_?}a**59tKOpY#oyuN;Xb!Er&+RU$~ z@3!umSjwxfpMAK$ck003dpo}`u5CN_Xny&|^D}q1FTa_aJ%9Pr+W6v+J2PKiynk}! m*yfiDH-CP9eB#>V!Rh(guNy}nj&6-EY-h}TKlAJs_`M%Ao8|xSEE$O)aNYyW^qROkRN*!fZMx|F; zr8*f|5fxrx73x~g@+kLmD_6H#mPMJDS(#8OWhqKtvJwH>NTWqF)#^F@BGWT1Q$3a_ zBEvH*Lrp=_Bi++2T@6L8MVhBsnqZ_g6)8_yim6Z|1~imlkz+90NTWrwdZCVa9$^vc z{TNH+9&X|4b)g_>9%f-;d!VQddB{SnhaX_ljUDU{1RFw)7|>8s3I~JHMj9=(bDbvU znY-FZ_G2uOnVayHb)g{XG8aDLGzP#$IYzTBR^kVkbYllhEX;;bBL*~`V8Ov)w2@Yy zsH;g6^Tfq4lKmJc-O7Njy}TJu$2aM-(+yK@Q~(n z;7XXsPK^3rZ}sn?1JZ)dH9-Fpn%vaNz7eBvV{Sk|2pUpqI P@oDycx_x1OqD%h(Ge>Cr literal 0 HcmV?d00001 diff --git a/mozilla/mailnews/ui/compose/resources/spelling.gif b/mozilla/mailnews/ui/compose/resources/spelling.gif new file mode 100644 index 0000000000000000000000000000000000000000..d685561d8fc3ec350e7408aad570acce1d695b1d GIT binary patch literal 911 zcmc(eziL)-42EC-ARPp8aF9x+7332H(JU2FXoXg{59y+~bO}^M6h$Xdw1a|6tAhat zanL~r1#h6GL%}Td7F@glL3D{v&Q18+LXtO6-kh^|d13bK@?jm)Z>joaRaAMERjH%Q z%Bb{8t5hc=E26?HtU_JuSsvwHZsqD$%d#l*GAk2Gr7T6sOI9L48)>v?rdmCxUu1fw zWva&#MPzt}WvD4gdZc^0rK_Q+wMg?cOB0N=rXuAjOEDE{#DInpEOHD+8)>v?Rxi{s z&m$~Cy&q$V+`}zgy)G0a&BH8AY!4K*ArD!I_3#5sy0L@(fnY^`ruu+4tDerh7DV3fbN?N z94$OZ^Eq%O%ws1;{jWFuXYVfQfKE0*{}Y&@%6nYp!nr|<87zVl=A<@EV$t1&+QEoK+zzi#jN{HxJ} p^-m|xjB@?r%FNQrm7m{Z;qLp@zrU83K1@#DczE^8$BoB2_YYeAcKrYV literal 0 HcmV?d00001 diff --git a/mozilla/mailnews/ui/compose/resources/stop.gif b/mozilla/mailnews/ui/compose/resources/stop.gif new file mode 100644 index 0000000000000000000000000000000000000000..d3ffd4730579ca3ca3615e0fcf4f0f6ebdf31977 GIT binary patch literal 902 zcmc(ePm9lS5XaxPjUP^%q^-T!mild!pGnzl4iwAP9ym%(c@9KTFTWZ>z7phvMQ>)%Bs{+W@S`* zrB$kvkrh$l6;`3H^(>EaFSl}at7Tb~d6|_7rBarnDs~Qc75=!TL(M(2*ZZ0G(h)F296dU zr1>1U66UcJqyE=B_-A^DG}4g<=zl_^YnmC&t-M{|yffOjIQRR_%d_|P?mqqe%dz>X z`#UFxKVSaw^}~Z*&)8ncyj3Clc_7m@6JAcollQm|F*hxY5UXKiJO0K fY)!U5K0EN}=j!;~!uwZyUMy~`Y<%CmtyBL1t#@(K literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..eea16746d8380b59ec782cbb9ac7c1d97be54c15 GIT binary patch literal 905 zcmc(eKWkQT426$>D6d0Bp+$-n>Eh&4vQz{MD)oJ#i@FHnP^6h$T-+Q)3!;PQWQtI! z;wb$Bf`WsTETW5B7k8c1#rWiY34dEia`NQl-b<5}r88@Dn$<6<`ejvAd6iYEqs+>v z^h&E#CnGDO!YiyoUF%sMQ>9LDDyHa6H28lMafH6B0w8yv}mSUJ*Qt}dZuNn z#}Y+kc!p)DDM)&xd%C5op{TV;^E68njI^dA7wQh7v4t3`QGiv}jf@)G^N^ zEJD2>V~O0uEnK}W6eP{VEKF<<6ty7_S%~%U15CQHgZ+VEL#Po08cIsxU@+Q9qosDP z)5JV;R~yNGj3qL26TY%86eL~d!bhCO0Jtc}Xtu>l`~Z_~?0|`d*$`^PfTj~HI2epJ z(&`g+HECj=xEMyVA7hD3{c*If!@WB>oUm;kuF|!G(e3)+UAGQ)^bv*)TWNsqn+zN+ zJV^67a3#!RCr16RxA5oSK53-W4bcCDMy{iy`SH%n5BEoh{!Tva>}_pKpE&noX>t4g z#*Cf6_4~-Zl}A&{cV@m_UYI;NdEwc|=Rfy$pU&QRJAduUoAJi6>)Weyw_jb{94$`0 i8-HE<{NVWAQ{Nwcxq0>V^48(?-5=|#kEajp*V%uP(Q*3# literal 0 HcmV?d00001 diff --git a/mozilla/mailnews/ui/messenger/resources/getmsg.gif b/mozilla/mailnews/ui/messenger/resources/getmsg.gif index 0a4496d31b5480ca98b2e57587b3a089195b2b23..6e5140a7f5d046d826ad7ebc50de7da399a0bd39 100644 GIT binary patch literal 911 zcmc(eze|^K5Xaw%kbw;iQlg8Sf{Wgg1VtqE6&xz0K{BY}hUkw7goucuB=8(0hngdz zJ*cLm)*7QJnu4Go%k{eFpXjq4clW;6z3+K0tero(a(!A;`XyDrtcohHvMP0ySs9gH zX_e|^WJOeXg;l6)JNcCWhtgYjTq2Sf<=zOXd{gl&FY0Z=6Qrg zsP|(mk$bp>tJj5sq zeWI==P0SM)!$|gHERm@{j`nr9cPEDvw#~y;x^^(ST_3#b*1?WG!mwd04bXj)fun^7 zX+8(8gn8`5sQ>lm{)``zCbZZ9{ZDA(mX1x#j$S-{vprt(SAQQqI5$3d{PgOHOJCk@ zPt9Cg-2HLm{lm$lH)lUB9gH4Kt?aMwK7O`(ckJw)jU)Da{r=L{>sOyIejV-G+UC!N n<@pbLD|4G0f0w^~d~{}EZ0p|3h08lLJ6E1eFMWS^Tc`d3w?%V- literal 1045 zcmW+#T}V`65S@ao2d(wNY%wT&*yzim5=vQP5y~If+6ul0Ga@6UUNlUMMEx%PNP?PS zR6?W=ZrBK-_7ahpJd zQHGTfOA5WL6&uB@SiljZO0*KAgq2_`SOW~C!4kAk!(w0q8dw+>E6C;uqcv+SRv*?P zGe#TMMyy=0K#`4R)+|sDQs~uUw6GS)gCC%YY1je%AOVG74KR=fOSFOq76Tj5z!K}6 zEh9&;F=CB`KCDH?Y*^qc;NYShC;9g7)WCh zw7>(4femP}C$ilrBS#1>1|y*lYmu>tJ)n1f%fh>;y{C61OUm=zp4YR|a`fD>*Y*Tk z%AN*$e2&HY zdHb@Sjn$2`B&Ic8zBC>;Qa^L!!PWfH!JMjKQd9PF%lXV|H+3TAX5`{P$NEU+t&BvK zSG9Pubo+}dKR$IYE<_W8ae-LZ=3wR9+@+tPl*Q85#dj*Y`+Jbfebt;m0P?q%!Lg^!1h wZn@v@Yik@Y+IzP*+t)T+J8=BTWVm|i&s3~z_Idul%$(_sy=SIR9NbC4|77^dWB>pF 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 a784351e8d77ae2a78b7e7cc40438dd825bc7384..f1c674ac6df1e759d4dfa81042a4a73cdc38cf98 100644 GIT binary patch literal 904 zcmc(eJ8PC<42JJQhi?$2SiuwG;ajXO5{1@+f{MpQ2N9fV!Ayc8xVVZ15wwV)fesy< zoa*i(h%S)|{Sg&^fVNY-^8N{*EhM>f<<9$FxpsMW?%qD_(O;?hWmQypl~t*u%*v?r zN~=^SBP*i9E386Y>scP;R?D&|^D-+FN~J7C$xBuuKpSbaXr@{{r(a}xre&(f z5=CTqhGnQJNP47ux}~e3sI^G*G)ohVw5B5EDN8XGYQ%ts5-f5IMjL6gXjU)OG0!6` zLcJejiQL02T)i$7B+bJtOl%JnwIL5#i1qLTOuDgy{efUZs1XAiN=o5iFxp6?rFO2< z#5{9X8_9l*B{FjpzOpV9BwgmhN1Vn0xG2YHw#7>P0F!R)fQg0K5NgDLrV}hU7>qX3 z>JxP}X=0wZ7)G)mV~I@takQ_)y*oLaux%c$(zS!p?fT$dw+?pn5rz$0X@KsV3>+;y zNb@;xCCpo5`0d_}g&(g^?^=BD;^yM|%Go=A i#-okR@2mSC9(uC<=GV^;=U-kw^ZV1s+mjO$n*Rr<8gUr_ literal 1031 zcmW+#ZAev75L_`+LDGz@S12Lqk3&={sUWHSNhG1rPN4=Bfe}=Y1c8!!#UL$7NRcE` z3k}(_z@o4(Ul~DRMX`~YWR#|mkyqht)w|};rTz$ ze|X3|FNhcpUVAx(3XvhQL`)<^>M~={SREzq`?xjP{U$i0~%NuRwu~i2)0(NRi_VYkuh5q%j)EU z1&YE}#EL>aNTJs%TNSI22R}d))35{jK>`ZF8ekv|mS_bJECx29fu+tlS4NHyW_3nF zAJ!rhVNv)BxnO}JtFXdHI1K~93+*r(YGEb(08LE84se2CC}znx_h~r= z{w6@cfP6ciK}7nhZlm6w;pp!)jymX?;z&d#2m zp1!`mfq{X+!NIYyv6-2f#rdiB_72bU7V$1G(xU&s6aNtF-5c({1&WxYXnYK}+Md)b zOvLZ%in&rcU%|VZ5kA)<)q#wx-O$eVzTDPL>(f!!tYc}oQ7%aWL?|t%(h!erb zr^3H{@5oqsY3O$D$FEu5j+xbK4-O_iJ9%z&bl~!~KI(&mcw4pkz@5L5oKP5u}S^m!lALaFBwyIn<>fSP=>V z1qTOp>IJyyR528K2Rex04TvuB$$t}mTS)Te$(#Sbe06r_?0l?6{g$dL)cY}($UWS`)$2k*(mc$<#P&c@8}g8aSPwtIq#HZf9|$&t8Zn@uq!bPYqm49L zYUesl%rkejk?hACa2 z!Du6`K2cYbCgzEYVI=!8mdMl}NBcV5yOYBS+vedaT{{@vt`FXI>tIJ8Vc4*h2I#)Y zz|q2kG@k=k!aR0j)c<(J=PmF+j5*7w)a>dyA}&+AVXCeQAj znq1l#O)nmP{P6DV`OyoHUfq20ZRhEUl@HT*n?IJf7H{8K{jxV--W)&p_3_r)&#xQj f$GZpru1xk`F0AifTUvX6 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 0000000000000000000000000000000000000000..7a31edd4966959ae227c3470cd824458e923f978 GIT binary patch literal 910 zcmc(eKWkQT426%-;T?UE4oVT76e$P>r0QS=wHB=4QYbD85(IIubkWg2i-^!-kvMg* zmTnbv5f^o^NF3dD^b?36#3%Pl_}fB~lP4$l&dpz(Idx;dCiPpYepwY&US(D4D6=vu zz0xYx$;gVR@CvI?*Ls#mxtCkHy4A8Q%Dl|VgiQSy?N2+&3vEt;uT&*>MLo@trt zu|yFWo?#hk3X&e_o^I)CC~7UzJk8PsBdw`OdCF2ug&HxSp#+N@gV9DBEt=H}b!SR(gu3sqX3XsMm+ zG%?TI)kd-(V~Nb%gs-d%1xc5=@DZmm04~Zgnr*QXKft6LJ78jAHiQ~6py>n)4hEx* zwE9F{O`4b|E{2ip$5A0Lj!f0uT5etvp1QM1oSS2xZ- z8BZ?0-MxG0!qf5D(^K1TetcOQ9lw9`*6QZD^&|TpO#fPbJ^%9H!n2j_y{{J558Uw& m_m;OlznFP^<%{%68HK literal 0 HcmV?d00001