Part of new mailnews resources hierarchy.

This commit is contained in:
putterman%netscape.com 1999-05-28 22:38:07 +00:00
parent 5e2e56e50f
commit 15c9d1ecfa
26 changed files with 55 additions and 82 deletions

View File

@ -37,7 +37,7 @@ include $(DEPTH)/config/autoconf.mk
# Question: how come this works on windows?
# From makefile.win:
# DIRS = public base db local news compose mime ui
DIRS = idl public base/util base/public db news base local compose mime imap ui addrbook
DIRS = idl public base/util base/public db news base local compose mime imap addrbook
include $(topsrcdir)/config/config.mk

View File

@ -22,7 +22,7 @@ srcdir = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = public src build
DIRS = public src prefs build resources
include $(topsrcdir)/config/config.mk

View File

@ -17,6 +17,6 @@
DEPTH=..\..
DIRS=public src build
DIRS=public src prefs build resources
include <$(DEPTH)\config\rules.mak>

View File

@ -22,7 +22,7 @@ srcdir = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = public src util build
DIRS = public src util prefs build resources
ifdef ENABLE_TESTS
DIRS += tests

View File

@ -17,6 +17,6 @@
DEPTH=..\..
DIRS=public src util build tests
DIRS=public src util prefs build resources tests
include <$(DEPTH)\config\rules.mak>

View File

@ -37,9 +37,6 @@ EXPORT_RESOURCE_SAMPLES = \
$(srcdir)/am-server.xul \
$(srcdir)/am-server-top.xul \
$(srcdir)/am-server-pop3.xul \
$(srcdir)/am-server-imap.xul \
$(srcdir)/am-server-news.xul \
$(srcdir)/am-server-webmail.xul \
$(srcdir)/am-copies.xul \
$(srcdir)/am-advanced.xul \
$(srcdir)/pref-mailnews.html \

View File

@ -19,7 +19,7 @@
messenger.css
folderPane.css
threadPane.css
subscribe
subscribe.css
closedMailFolder.gif
openMailFolder.gif
mailMessage.gif

View File

@ -26,7 +26,7 @@ include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
SAMPLES_DIR = $(DIST)/bin/chrome/skin/default
SAMPLES_DIR = $(DIST)/bin/chrome/messenger/skin/default
EXPORT_RESOURCE_SAMPLES = \
$(srcdir)/messenger.css \

View File

@ -22,7 +22,7 @@ srcdir = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = public src
DIRS = public src resources
ifdef ENABLE_TESTS
DIRS += tests

View File

@ -19,6 +19,6 @@ DEPTH=..\..\..
#tests no tests yet
DIRS=public src
DIRS=public src resources
include <$(DEPTH)\config\rules.mak>

View File

@ -882,7 +882,7 @@ nsMsgAppCore::AccountManager(nsIDOMWindow *parent)
nsCOMPtr<nsIURL> url;
rv = NS_NewURL(getter_AddRefs(url),
"resource:/res/mailnews/messenger/AccountManager.xul");
"chrome://messenger/content/AccountManager.xul");
if (NS_FAILED(rv)) return rv;
nsIXULWindowCallbacks *cb = nsnull;

View File

@ -22,7 +22,7 @@ srcdir = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = public src build
DIRS = public src prefs build resources
ifdef ENABLE_TESTS
DIRS += tests

View File

@ -17,6 +17,6 @@
DEPTH=..\..
DIRS=public src build tests
DIRS=public src prefs build resources tests
include <$(DEPTH)\config\rules.mak>

View File

@ -22,7 +22,7 @@ srcdir = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = public src build
DIRS = public src build resources
ifdef ENABLE_TESTS
DIRS += tests

View File

@ -17,6 +17,6 @@
DEPTH=..\..
DIRS=public src build tests
DIRS=public src build resources tests
include <$(DEPTH)\config\rules.mak>

View File

@ -17,6 +17,6 @@
DEPTH=..
DIRS=public base db local news imap compose mime ui addrbook
DIRS=public base db local news imap compose mime addrbook
include <$(DEPTH)\config\rules.mak>

View File

@ -9,6 +9,12 @@ mailnews/addrbook/Makefile
mailnews/addrbook/build/Makefile
mailnews/addrbook/public/Makefile
mailnews/addrbook/src/Makefile
mailnews/addrbook/resources/Makefile
mailnews/addrbook/resources/content/Makefile
mailnews/addrbook/resources/skin/Makefile
mailnews/addrbook/prefs/Makefile
mailnews/addrbook/prefs/resources/Makefile
mailnews/addrbook/prefs/resources/content/Makefile
mailnews/base/Makefile
mailnews/base/public/Makefile
mailnews/base/src/Makefile
@ -16,6 +22,13 @@ mailnews/base/util/Makefile
mailnews/base/build/Makefile
mailnews/base/tests/Makefile
mailnews/base/tests/identity/Makefile
mailnews/base/resources/Makefile
mailnews/base/resources/content/Makefile
mailnews/base/resources/skin/Makefile
mailnews/base/prefs/Makefile
mailnews/base/prefs/resources/Makefile
mailnews/base/prefs/resources/content/Makefile
mailnews/base/prefs/resources/skin/Makefile
mailnews/db/Makefile
mailnews/db/mdb/Makefile
mailnews/db/mdb/public/Makefile
@ -29,6 +42,8 @@ mailnews/local/Makefile
mailnews/local/public/Makefile
mailnews/local/src/Makefile
mailnews/local/build/Makefile
mailnews/local/resources/Makefile
mailnews/local/resources/skin/Makefile
mailnews/local/tests/Makefile
mailnews/local/tests/pop3/Makefile
mailnews/local/tests/mailbox/Makefile
@ -42,6 +57,8 @@ mailnews/news/Makefile
mailnews/news/public/Makefile
mailnews/news/src/Makefile
mailnews/news/build/Makefile
mailnews/news/resources/Makefile
mailnews/news/resources/skin/Makefile
mailnews/news/tests/Makefile
mailnews/news/tests/nntp/Makefile
mailnews/news/tests/newsParser/Makefile
@ -56,28 +73,25 @@ mailnews/mime/emitters/src/Makefile
mailnews/mime/emitters/xml/Makefile
mailnews/mime/emitters/raw/Makefile
mailnews/mime/emitters/resources/Makefile
mailnews/mime/emitters/resources/skin/Makefile
mailnews/mime/tests/Makefile
mailnews/mime/tests/xpcomtest/Makefile
mailnews/mime/public/Makefile
mailnews/mime/src/Makefile
mailnews/mime/resources/Makefile
mailnews/mime/resources/skin/Makefile
mailnews/compose/Makefile
mailnews/compose/public/Makefile
mailnews/compose/src/Makefile
mailnews/compose/build/Makefile
mailnews/compose/resources/Makefile
mailnews/compose/resources/content/Makefile
mailnews/compose/resources/skin/Makefile
mailnews/compose/prefs/Makefile
mailnews/compose/prefs/resources/Makefile
mailnews/compose/prefs/resources/content/Makefile
mailnews/compose/tests/Makefile
mailnews/compose/tests/smtp/Makefile
mailnews/compose/tests/compose/Makefile
mailnews/ui/Makefile
mailnews/ui/messenger/Makefile
mailnews/ui/messenger/public/Makefile
mailnews/ui/messenger/src/Makefile
mailnews/ui/messenger/resources/Makefile
mailnews/ui/compose/Makefile
mailnews/ui/compose/resources/Makefile
mailnews/ui/preference/Makefile
mailnews/ui/preference/resources/Makefile
mailnews/ui/ab/Makefile
mailnews/ui/ab/resources/Makefile
mailnews/public/Makefile
mailnews/idl/Makefile

View File

@ -22,22 +22,9 @@ srcdir = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS= skin
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
MESSENGER_DIR = $(DIST)/bin/res/mailnews/messenger
EXPORT_RESOURCES = \
$(srcdir)/mailheader-micro.css \
$(srcdir)/mailheader-normal.css \
$(srcdir)/mailheader-all.css \
$(NULL)
EXPORT_RESOURCES_TO_REMOVE := $(addprefix $(MESSENGER_DIR)/, $(EXPORT_RESOURCES))
install::
$(INSTALL) $(EXPORT_RESOURCES) $(MESSENGER_DIR)
clobber::
$(RM) $(EXPORT_RESOURCES_TO_REMOVE)

View File

@ -15,19 +15,7 @@
#
DEPTH=..\..\..\..
IGNORE_MANIFEST=1
DEFINES=-DWIN32_LEAN_AND_MEAN
MODULE=xmlemitter
DIRS= skin
include <$(DEPTH)\config\rules.mak>
install::
$(MAKE_INSTALL) mailheader-micro.css $(DIST)\bin\res\mailnews\messenger
$(MAKE_INSTALL) mailheader-normal.css $(DIST)\bin\res\mailnews\messenger
$(MAKE_INSTALL) mailheader-all.css $(DIST)\bin\res\mailnews\messenger
clobber::
rm -f $(DIST)\bin\res\mailnews\messenger\mailheader-micro.css
rm -f $(DIST)\bin\res\mailnews\messenger\mailheader-normal.css
rm -f $(DIST)\bin\res\mailnews\messenger\mailheader-all.css

View File

@ -172,11 +172,11 @@ nsMimeEmitter::WriteXMLHeader(const char *msgID)
UtilityWrite("<?xml version=\"1.0\"?>");
if (mHeaderDisplayType == MicroHeaders)
UtilityWrite("<?xml-stylesheet href=\"resource:/res/mailnews/messenger/mailheader-micro.css\" type=\"text/css\"?>");
UtilityWrite("<?xml-stylesheet href=\"chrome://messenger/skin/mailheader-micro.css\" type=\"text/css\"?>");
else if (mHeaderDisplayType == NormalHeaders)
UtilityWrite("<?xml-stylesheet href=\"resource:/res/mailnews/messenger/mailheader-normal.css\" type=\"text/css\"?>");
UtilityWrite("<?xml-stylesheet href=\"chrome://messenger/skin/mailheader-normal.css\" type=\"text/css\"?>");
else /* AllHeaders */
UtilityWrite("<?xml-stylesheet href=\"resource:/res/mailnews/messenger/mailheader-all.css\" type=\"text/css\"?>");
UtilityWrite("<?xml-stylesheet href=\"chrome://messenger/skin/mailheader-all.css\" type=\"text/css\"?>");
UtilityWrite("<message id=\"");
UtilityWrite(newValue);

View File

@ -16,8 +16,4 @@
# This is a list of local files which get copied to the res\mailnews\messenger directory
#
frown.gif
smile.gif
wink.gif
sick.gif
mime_en.properties

View File

@ -28,11 +28,9 @@ include $(topsrcdir)/config/rules.mk
MESSENGER_DIR = $(DIST)/bin/res/mailnews/messenger
DIRS= skin
EXPORT_RESOURCES = \
$(srcdir)/smile.gif \
$(srcdir)/frown.gif \
$(srcdir)/wink.gif \
$(srcdir)/sick.gif \
$(srcdir)/mime_en.properties \
$(NULL)

View File

@ -19,19 +19,12 @@ IGNORE_MANIFEST=1
DEFINES=-DWIN32_LEAN_AND_MEAN
MODULE=mime
DIRS= skin
include <$(DEPTH)\config\rules.mak>
install::
$(MAKE_INSTALL) frown.gif $(DIST)\bin\res\mailnews\messenger
$(MAKE_INSTALL) smile.gif $(DIST)\bin\res\mailnews\messenger
$(MAKE_INSTALL) wink.gif $(DIST)\bin\res\mailnews\messenger
$(MAKE_INSTALL) sick.gif $(DIST)\bin\res\mailnews\messenger
$(MAKE_INSTALL) mime_en.properties $(DIST)\bin\res\mailnews\messenger
clobber::
rm -f $(DIST)\bin\res\mailnews\messenger\frown.gif
rm -f $(DIST)\bin\res\mailnews\messenger\smile.gif
rm -f $(DIST)\bin\res\mailnews\messenger\wink.gif
rm -f $(DIST)\bin\res\mailnews\messenger\sick.gif
rm -f $(DIST)\bin\res\mailnews\messenger\mime_en.properties

View File

@ -373,7 +373,7 @@ GlyphHit(const char *line, PRInt32 line_size, char **outputHTML, PRInt32 *glyphT
if ( ItMatches(line, line_size, ":-)") || ItMatches(line, line_size, ":)") )
{
*outputHTML = PL_strdup("<img SRC=\"resource:/res/mailnews/messenger/smile.gif\" height=17 width=17 align=ABSCENTER>");
*outputHTML = PL_strdup("<img SRC=\"chrome://messenger/skin/smile.gif\" height=17 width=17 align=ABSCENTER>");
if (!(*outputHTML))
return PR_FALSE;
*glyphTextLen = 3;
@ -381,7 +381,7 @@ GlyphHit(const char *line, PRInt32 line_size, char **outputHTML, PRInt32 *glyphT
}
else if ( ItMatches(line, line_size, ":-(") || ItMatches(line, line_size, ":(") )
{
*outputHTML = PL_strdup("<img SRC=\"resource:/res/mailnews/messenger/frown.gif\" height=17 width=17 align=ABSCENTER>");
*outputHTML = PL_strdup("<img SRC=\"chrome://messenger/skin/frown.gif\" height=17 width=17 align=ABSCENTER>");
if (!(*outputHTML))
return PR_FALSE;
*glyphTextLen = 3;
@ -389,7 +389,7 @@ GlyphHit(const char *line, PRInt32 line_size, char **outputHTML, PRInt32 *glyphT
}
else if (ItMatches(line, line_size, ";-)"))
{
*outputHTML = PL_strdup("<img SRC=\"resource:/res/mailnews/messenger/wink.gif\" height=17 width=17 align=ABSCENTER>");
*outputHTML = PL_strdup("<img SRC=\"chrome://messenger/skin/wink.gif\" height=17 width=17 align=ABSCENTER>");
if (!(*outputHTML))
return PR_FALSE;
*glyphTextLen = 3;
@ -397,7 +397,7 @@ GlyphHit(const char *line, PRInt32 line_size, char **outputHTML, PRInt32 *glyphT
}
else if (ItMatches(line, line_size, ";-P"))
{
*outputHTML = PL_strdup("<img SRC=\"resource:/res/mailnews/messenger/sick.gif\" height=17 width=17 align=ABSCENTER>");
*outputHTML = PL_strdup("<img SRC=\"chrome://messenger/skin/sick.gif\" height=17 width=17 align=ABSCENTER>");
if (!(*outputHTML))
return PR_FALSE;
*glyphTextLen = 3;

View File

@ -22,7 +22,7 @@ srcdir = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = public src build
DIRS = public src build resources
ifdef ENABLE_TESTS
DIRS += tests
endif

View File

@ -17,6 +17,6 @@
DEPTH=..\..
DIRS=public src tests build
DIRS=public src tests build resources
include <$(DEPTH)\config\rules.mak>