From a0afb83e9b932a39c2a3dc42de9a51857864a108 Mon Sep 17 00:00:00 2001 From: "chuang%netscape.com" Date: Wed, 4 Aug 1999 18:29:28 +0000 Subject: [PATCH] replace html files to xul files --- .../base/prefs/resources/content/MANIFEST | 10 +++++----- .../base/prefs/resources/content/Makefile.in | 10 +++++----- .../base/prefs/resources/content/makefile.win | 20 +++++++++---------- mailnews/base/resources/content/MANIFEST | 3 +-- mailnews/base/resources/content/Makefile.in | 3 +-- .../base/resources/content/commandglue.js | 2 +- .../base/resources/content/contentframe.xul | 2 +- mailnews/base/resources/content/makefile.win | 6 ++---- mailnews/base/resources/content/widgetglue.js | 2 +- .../compose/prefs/resources/content/MANIFEST | 4 ++-- .../prefs/resources/content/Makefile.in | 4 ++-- .../prefs/resources/content/makefile.win | 8 ++++---- suite/common/pref/preftree.xul | 14 ++++++------- .../prefwindow/resources/content/preftree.xul | 14 ++++++------- 14 files changed, 49 insertions(+), 53 deletions(-) diff --git a/mailnews/base/prefs/resources/content/MANIFEST b/mailnews/base/prefs/resources/content/MANIFEST index ee38ddfd21f9..3f3dd8f8a0a0 100644 --- a/mailnews/base/prefs/resources/content/MANIFEST +++ b/mailnews/base/prefs/resources/content/MANIFEST @@ -25,11 +25,11 @@ am-server-top.xul am-server-pop3.xul am-copies.xul am-advanced.xul -pref-mailnews.html -pref-winsetting.html -pref-receipts.html -custreceipt.html -pref-diskspace.html +pref-mailnews.xul +pref-winsetting.xul +pref-receipts.xul +custreceipt.xul +pref-diskspace.xul AccountWizard.xul AccountWizard.js aw-accounttype.xul diff --git a/mailnews/base/prefs/resources/content/Makefile.in b/mailnews/base/prefs/resources/content/Makefile.in index d9c24b08c99c..8c38377cc701 100644 --- a/mailnews/base/prefs/resources/content/Makefile.in +++ b/mailnews/base/prefs/resources/content/Makefile.in @@ -38,11 +38,11 @@ EXPORT_RESOURCE_SAMPLES = \ $(srcdir)/am-server-pop3.xul \ $(srcdir)/am-copies.xul \ $(srcdir)/am-advanced.xul \ - $(srcdir)/pref-mailnews.html \ - $(srcdir)/pref-winsetting.html \ - $(srcdir)/pref-receipts.html \ - $(srcdir)/custreceipt.html \ - $(srcdir)/pref-diskspace.html \ + $(srcdir)/pref-mailnews.xul \ + $(srcdir)/pref-winsetting.xul \ + $(srcdir)/pref-receipts.xul \ + $(srcdir)/custreceipt.xul \ + $(srcdir)/pref-diskspace.xul \ $(srcdir)/AccountWizard.xul \ $(srcdir)/AccountWizard.js \ $(srcdir)/aw-accounttype.xul \ diff --git a/mailnews/base/prefs/resources/content/makefile.win b/mailnews/base/prefs/resources/content/makefile.win index 5d9504838a39..d2fa52deaee9 100644 --- a/mailnews/base/prefs/resources/content/makefile.win +++ b/mailnews/base/prefs/resources/content/makefile.win @@ -29,11 +29,11 @@ install:: $(MAKE_INSTALL) am-server-pop3.xul $(DIST)\bin\chrome\messenger\content\default $(MAKE_INSTALL) am-copies.xul $(DIST)\bin\chrome\messenger\content\default $(MAKE_INSTALL) am-advanced.xul $(DIST)\bin\chrome\messenger\content\default - $(MAKE_INSTALL) pref-mailnews.html $(DIST)\bin\chrome\messenger\content\default - $(MAKE_INSTALL) pref-winsetting.html $(DIST)\bin\chrome\messenger\content\default - $(MAKE_INSTALL) pref-receipts.html $(DIST)\bin\chrome\messenger\content\default - $(MAKE_INSTALL) custreceipt.html $(DIST)\bin\chrome\messenger\content\default - $(MAKE_INSTALL) pref-diskspace.html $(DIST)\bin\chrome\messenger\content\default + $(MAKE_INSTALL) pref-mailnews.xul $(DIST)\bin\chrome\messenger\content\default + $(MAKE_INSTALL) pref-winsetting.xul $(DIST)\bin\chrome\messenger\content\default + $(MAKE_INSTALL) pref-receipts.xul $(DIST)\bin\chrome\messenger\content\default + $(MAKE_INSTALL) custreceipt.xul $(DIST)\bin\chrome\messenger\content\default + $(MAKE_INSTALL) pref-diskspace.xul $(DIST)\bin\chrome\messenger\content\default $(MAKE_INSTALL) AccountWizard.xul $(DIST)\bin\chrome\messenger\content\default $(MAKE_INSTALL) AccountWizard.js $(DIST)\bin\chrome\messenger\content\default $(MAKE_INSTALL) aw-accounttype.xul $(DIST)\bin\chrome\messenger\content\default @@ -62,8 +62,8 @@ clobber:: rm -f $(DIST)\chrome\messenger\content\default\aw-login.xul rm -f $(DIST)\chrome\messenger\content\default\aw-accname.xul rm -f $(DIST)\chrome\messenger\content\default\aw-done.xul - rm -f $(DIST)\chrome\messenger\content\default\pref-mailnews.html - rm -f $(DIST)\chrome\messenger\content\default\pref-winsetting.html - rm -f $(DIST)\chrome\messenger\content\default\pref-receipts.html - rm -f $(DIST)\chrome\messenger\content\default\custreceipt.html - rm -f $(DIST)\chrome\messenger\content\default\pref-diskspace.html + rm -f $(DIST)\chrome\messenger\content\default\pref-mailnews.xul + rm -f $(DIST)\chrome\messenger\content\default\pref-winsetting.xul + rm -f $(DIST)\chrome\messenger\content\default\pref-receipts.xul + rm -f $(DIST)\chrome\messenger\content\default\custreceipt.xul + rm -f $(DIST)\chrome\messenger\content\default\pref-diskspace.xul diff --git a/mailnews/base/resources/content/MANIFEST b/mailnews/base/resources/content/MANIFEST index 2c14c59205f8..4e442b90b782 100644 --- a/mailnews/base/resources/content/MANIFEST +++ b/mailnews/base/resources/content/MANIFEST @@ -19,11 +19,10 @@ messenger.xul folderPane.xul threadPane.xul -message.html widgetglue.js commandglue.js shareglue.js -3panemail.html +3panemail.xul messagePane.xul subscribe.xul contentframe.xul diff --git a/mailnews/base/resources/content/Makefile.in b/mailnews/base/resources/content/Makefile.in index 3163c8705641..a72b03575626 100644 --- a/mailnews/base/resources/content/Makefile.in +++ b/mailnews/base/resources/content/Makefile.in @@ -32,11 +32,10 @@ EXPORT_RESOURCE_SAMPLES = \ $(srcdir)/messenger.xul \ $(srcdir)/folderPane.xul \ $(srcdir)/threadPane.xul \ - $(srcdir)/message.html \ $(srcdir)/widgetglue.js \ $(srcdir)/commandglue.js \ $(srcdir)/shareglue.js \ - $(srcdir)/3panemail.html \ + $(srcdir)/3panemail.xul \ $(srcdir)/messagePane.xul \ $(srcdir)/subscribe.xul \ $(srcdir)/contentframe.xul \ diff --git a/mailnews/base/resources/content/commandglue.js b/mailnews/base/resources/content/commandglue.js index 9565c2d58c46..7cbffe8d5324 100644 --- a/mailnews/base/resources/content/commandglue.js +++ b/mailnews/base/resources/content/commandglue.js @@ -246,7 +246,7 @@ function MsgPreferences() prefwindow = Components.classes['component://netscape/prefwindow'].createInstance(Components.interfaces.nsIPrefWindow); } - prefwindow.showWindow("navigator.js", window, "chrome://pref/content/pref-mailnews.html"); + prefwindow.showWindow("navigator.js", window, "chrome://pref/content/pref-mailnews.xul"); } diff --git a/mailnews/base/resources/content/contentframe.xul b/mailnews/base/resources/content/contentframe.xul index e8bbf87905f6..674a8f176a27 100644 --- a/mailnews/base/resources/content/contentframe.xul +++ b/mailnews/base/resources/content/contentframe.xul @@ -36,6 +36,6 @@ - + diff --git a/mailnews/base/resources/content/makefile.win b/mailnews/base/resources/content/makefile.win index f10d71db5de8..ddb59333cf62 100644 --- a/mailnews/base/resources/content/makefile.win +++ b/mailnews/base/resources/content/makefile.win @@ -23,11 +23,10 @@ install:: $(MAKE_INSTALL) messenger.xul $(DIST)\bin\chrome\messenger\content\default $(MAKE_INSTALL) folderPane.xul $(DIST)\bin\chrome\messenger\content\default $(MAKE_INSTALL) threadPane.xul $(DIST)\bin\chrome\messenger\content\default - $(MAKE_INSTALL) message.html $(DIST)\bin\chrome\messenger\content\default $(MAKE_INSTALL) widgetglue.js $(DIST)\bin\chrome\messenger\content\default $(MAKE_INSTALL) commandglue.js $(DIST)\bin\chrome\messenger\content\default $(MAKE_INSTALL) shareglue.js $(DIST)\bin\chrome\messenger\content\default - $(MAKE_INSTALL) 3panemail.html $(DIST)\bin\chrome\messenger\content\default + $(MAKE_INSTALL) 3panemail.xul $(DIST)\bin\chrome\messenger\content\default $(MAKE_INSTALL) messagePane.xul $(DIST)\bin\chrome\messenger\content\default $(MAKE_INSTALL) subscribe.xul $(DIST)\bin\chrome\messenger\content\default $(MAKE_INSTALL) contentframe.xul $(DIST)\bin\chrome\messenger\content\default @@ -38,11 +37,10 @@ clobber:: rm -f $(DIST)\chrome\messenger\content\default\messenger.xul rm -f $(DIST)\chrome\messenger\content\default\folderPane.xul rm -f $(DIST)\chrome\messenger\content\default\threadPane.xul - rm -f $(DIST)\chrome\messenger\content\default\message.html rm -f $(DIST)\chrome\messenger\content\default\widgetglue.js rm -f $(DIST)\chrome\messenger\content\default\commandglue.js rm -f $(DIST)\chrome\messenger\content\default\shareglue.js - rm -f $(DIST)\chrome\messenger\content\default\3panemail.html + rm -f $(DIST)\chrome\messenger\content\default\3panemail.xul rm -f $(DIST)\chrome\messenger\content\default\messagePane.xul rm -f $(DIST)\chrome\messenger\content\default\subscribe.xul rm -f $(DIST)\chrome\messenger\content\default\contentframe.xul diff --git a/mailnews/base/resources/content/widgetglue.js b/mailnews/base/resources/content/widgetglue.js index 62706da9886c..5361b6ba6721 100644 --- a/mailnews/base/resources/content/widgetglue.js +++ b/mailnews/base/resources/content/widgetglue.js @@ -305,7 +305,7 @@ function MsgFolderProperties() {} function MsgPreferences() { var prefwindow = Components.classes['component://netscape/prefwindow'].createInstance(Components.interfaces.nsIPrefWindow); - prefwindow.showWindow("widgetglue.js", window, "chrome://messenger/content/pref-mailnews.html"); + prefwindow.showWindow("widgetglue.js", window, "chrome://messenger/content/pref-mailnews.xul"); } function MsgShowMsgToolbar() {} diff --git a/mailnews/compose/prefs/resources/content/MANIFEST b/mailnews/compose/prefs/resources/content/MANIFEST index f937fef273c3..afa203b7f1c7 100644 --- a/mailnews/compose/prefs/resources/content/MANIFEST +++ b/mailnews/compose/prefs/resources/content/MANIFEST @@ -16,6 +16,6 @@ # This is a list of local files which get copied to the res\mailnews\messenger directory # -pref-messages.html +pref-messages.xul pref-copiesfolders.html -pref-formatting.html +pref-formatting.xul diff --git a/mailnews/compose/prefs/resources/content/Makefile.in b/mailnews/compose/prefs/resources/content/Makefile.in index 51d4f0e390da..3581c80eb01e 100644 --- a/mailnews/compose/prefs/resources/content/Makefile.in +++ b/mailnews/compose/prefs/resources/content/Makefile.in @@ -29,9 +29,9 @@ include $(topsrcdir)/config/rules.mk SAMPLES_DIR = $(DIST)/bin/chrome/messengercompose/content/default EXPORT_RESOURCE_SAMPLES = \ - $(srcdir)/pref-messages.html \ + $(srcdir)/pref-messages.xul \ $(srcdir)/pref-copiesfolders.html \ - $(srcdir)/pref-formatting.html \ + $(srcdir)/pref-formatting.xul \ $(NULL) EXPORT_RESOURCE_SAMPLES_TO_REMOVE := $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) diff --git a/mailnews/compose/prefs/resources/content/makefile.win b/mailnews/compose/prefs/resources/content/makefile.win index 7371de5dd331..963b854736c4 100644 --- a/mailnews/compose/prefs/resources/content/makefile.win +++ b/mailnews/compose/prefs/resources/content/makefile.win @@ -21,11 +21,11 @@ MODULE=msgcompose include <$(DEPTH)\config\rules.mak> install:: - $(MAKE_INSTALL) pref-messages.html $(DIST)\bin\chrome\messengercompose\content\default + $(MAKE_INSTALL) pref-messages.xul $(DIST)\bin\chrome\messengercompose\content\default $(MAKE_INSTALL) pref-copiesfolders.html $(DIST)\bin\chrome\messengercompose\content\default - $(MAKE_INSTALL) pref-formatting.html $(DIST)\bin\chrome\messengercompose\content\default + $(MAKE_INSTALL) pref-formatting.xul $(DIST)\bin\chrome\messengercompose\content\default clobber:: - rm -f $(DIST)\chrome\messengercompose\content\default\pref-messages.html + rm -f $(DIST)\chrome\messengercompose\content\default\pref-messages.xul rm -f $(DIST)\chrome\messengercompose\content\default\pref-copiesfolders.html - rm -f $(DIST)\chrome\messengercompose\content\default\pref-formatting.html + rm -f $(DIST)\chrome\messengercompose\content\default\pref-formatting.xul diff --git a/suite/common/pref/preftree.xul b/suite/common/pref/preftree.xul index 63e0db18c5f6..49ae7dae6b60 100644 --- a/suite/common/pref/preftree.xul +++ b/suite/common/pref/preftree.xul @@ -116,25 +116,25 @@ - &mail.label; + &mail.label; - &address.label; + &address.label; - &mess.label; + &mess.label; - &windowSet.label; + &windowSet.label; @@ -146,19 +146,19 @@ - &format.label; + &format.label; - &return.label; + &return.label; - &disk.label; + &disk.label; diff --git a/xpfe/components/prefwindow/resources/content/preftree.xul b/xpfe/components/prefwindow/resources/content/preftree.xul index 63e0db18c5f6..49ae7dae6b60 100644 --- a/xpfe/components/prefwindow/resources/content/preftree.xul +++ b/xpfe/components/prefwindow/resources/content/preftree.xul @@ -116,25 +116,25 @@ - &mail.label; + &mail.label; - &address.label; + &address.label; - &mess.label; + &mess.label; - &windowSet.label; + &windowSet.label; @@ -146,19 +146,19 @@ - &format.label; + &format.label; - &return.label; + &return.label; - &disk.label; + &disk.label;