diff --git a/mozilla/caps/src/Makefile.in b/mozilla/caps/src/Makefile.in index a0c6b423c53..69387b0eb4f 100644 --- a/mozilla/caps/src/Makefile.in +++ b/mozilla/caps/src/Makefile.in @@ -58,5 +58,5 @@ include $(topsrcdir)/config/rules.mk INCLUDES += -I$(topsrcdir)/include -I$(srcdir)/../include install:: - $(INSTALL) $(CHROME_FILES) $(DIST)/bin/chrome/security/locale/en-US + $(INSTALL) $(CHROME_FILES) $(DIST)/bin/chrome/communicator/locale/security diff --git a/mozilla/caps/src/makefile.win b/mozilla/caps/src/makefile.win index 78751fca7e5..861f850e0c4 100755 --- a/mozilla/caps/src/makefile.win +++ b/mozilla/caps/src/makefile.win @@ -116,10 +116,10 @@ include <$(DEPTH)/config/rules.mak> install:: $(DLL) $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib - $(MAKE_INSTALL) security.properties $(DIST)\bin\chrome\security\locale\en-US + $(MAKE_INSTALL) security.properties $(DIST)\bin\chrome\communicator\locale\security clobber:: rm -f $(DIST)\lib\$(DLLNAME).lib rm -f $(DIST)\bin\components\$(DLLNAME).dll - rm -f $(DIST)\bin\chrome\security\locale\en-US\security.properties + rm -f $(DIST)\bin\chrome\communicator\locale\security\security.properties diff --git a/mozilla/caps/src/nsScriptSecurityManager.cpp b/mozilla/caps/src/nsScriptSecurityManager.cpp index a97ede3539f..04f8e2107a2 100644 --- a/mozilla/caps/src/nsScriptSecurityManager.cpp +++ b/mozilla/caps/src/nsScriptSecurityManager.cpp @@ -790,7 +790,7 @@ nsScriptSecurityManager::IsCapabilityEnabled(const char *capability, return NS_OK; } -#define PROPERTIES_URL "chrome://security/locale/security.properties" +#define PROPERTIES_URL "chrome://communicator/locale/security/security.properties" nsresult Localize(char *genericString, nsString &result) diff --git a/mozilla/chrome/src/nsChromeProtocolHandler.cpp b/mozilla/chrome/src/nsChromeProtocolHandler.cpp index 124b2ddca4c..77b5f7574c5 100644 --- a/mozilla/chrome/src/nsChromeProtocolHandler.cpp +++ b/mozilla/chrome/src/nsChromeProtocolHandler.cpp @@ -652,7 +652,7 @@ nsChromeProtocolHandler::NewChannel(nsIURI* aURI, nsCOMPtr result; // Canonify the "chrome:" URL; e.g., so that we collapse - // "chrome://navigator/content/" and "chrome://navigator/content" + // "chrome://navigator/content/navigator.xul" and "chrome://navigator/content" // and "chrome://navigator/content/navigator.xul". NS_WITH_SERVICE(nsIChromeRegistry, reg, kChromeRegistryCID, &rv); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/chrome/src/nsChromeRegistry.cpp b/mozilla/chrome/src/nsChromeRegistry.cpp index 41acdb4488e..928ca1dc43c 100644 --- a/mozilla/chrome/src/nsChromeRegistry.cpp +++ b/mozilla/chrome/src/nsChromeRegistry.cpp @@ -397,28 +397,14 @@ nsChromeRegistry::ConvertChromeURL(nsIURI* aChromeURL) nsCAutoString finalURL; GetBaseURL(package, provider, finalURL); - if (finalURL.IsEmpty()) { + if (finalURL.IsEmpty()) finalURL = "resource:/chrome/"; - finalURL += package; - finalURL += "/"; - finalURL += provider; - finalURL += "/"; - // XXX Remove hack when our directory structure gets fixed. - if (provider.Equals(nsCAutoString("locale"))) - finalURL += "en-US"; - else finalURL += "default"; - finalURL += "/"; - - finalURL += remaining; - } - else { - finalURL += package; - finalURL += "/"; - finalURL += provider; - finalURL += "/"; - finalURL += remaining; - } + finalURL += package; + finalURL += "/"; + finalURL += provider; + finalURL += "/"; + finalURL += remaining; aChromeURL->SetSpec(finalURL); return NS_OK; diff --git a/mozilla/docshell/base/Makefile.in b/mozilla/docshell/base/Makefile.in index 80ea695d48a..89296154274 100644 --- a/mozilla/docshell/base/Makefile.in +++ b/mozilla/docshell/base/Makefile.in @@ -56,4 +56,4 @@ override NO_STATIC_LIB= include $(topsrcdir)/config/rules.mk install:: - $(INSTALL) $(srcdir)/appstrings.properties $(DIST)/bin/chrome/global/locale/en-US + $(INSTALL) $(srcdir)/appstrings.properties $(DIST)/bin/chrome/global/locale diff --git a/mozilla/docshell/base/makefile.win b/mozilla/docshell/base/makefile.win index 0bd41f530ad..5e8250a2a2a 100644 --- a/mozilla/docshell/base/makefile.win +++ b/mozilla/docshell/base/makefile.win @@ -51,4 +51,4 @@ include <$(DEPTH)\config\config.mak> install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib - $(MAKE_INSTALL) appstrings.properties $(DIST)\bin\chrome\global\locale\en-US + $(MAKE_INSTALL) appstrings.properties $(DIST)\bin\chrome\global\locale diff --git a/mozilla/editor/base/nsEditorService.cpp b/mozilla/editor/base/nsEditorService.cpp index 071bae495ca..eafeb1cc53e 100644 --- a/mozilla/editor/base/nsEditorService.cpp +++ b/mozilla/editor/base/nsEditorService.cpp @@ -38,4 +38,4 @@ NS_IMPL_QUERY_INTERFACE2(nsEditorService, nsIEditorService, nsICmdLineHandler) -CMDLINEHANDLER_IMPL(nsEditorService,"-edit","general.startup.editor","chrome://editor/content/","Start with editor.","component://netscape/commandlinehandler/general-startup-editor","Editor Startup Handler", PR_TRUE,"about:blank", PR_TRUE) +CMDLINEHANDLER_IMPL(nsEditorService,"-edit","general.startup.editor","chrome://editor/content/editor.xul","Start with editor.","component://netscape/commandlinehandler/general-startup-editor","Editor Startup Handler", PR_TRUE,"about:blank", PR_TRUE) diff --git a/mozilla/editor/libeditor/base/nsEditorService.cpp b/mozilla/editor/libeditor/base/nsEditorService.cpp index 071bae495ca..eafeb1cc53e 100644 --- a/mozilla/editor/libeditor/base/nsEditorService.cpp +++ b/mozilla/editor/libeditor/base/nsEditorService.cpp @@ -38,4 +38,4 @@ NS_IMPL_QUERY_INTERFACE2(nsEditorService, nsIEditorService, nsICmdLineHandler) -CMDLINEHANDLER_IMPL(nsEditorService,"-edit","general.startup.editor","chrome://editor/content/","Start with editor.","component://netscape/commandlinehandler/general-startup-editor","Editor Startup Handler", PR_TRUE,"about:blank", PR_TRUE) +CMDLINEHANDLER_IMPL(nsEditorService,"-edit","general.startup.editor","chrome://editor/content/editor.xul","Start with editor.","component://netscape/commandlinehandler/general-startup-editor","Editor Startup Handler", PR_TRUE,"about:blank", PR_TRUE) diff --git a/mozilla/editor/ui/composer/content/Makefile.in b/mozilla/editor/ui/composer/content/Makefile.in index de42dad9069..d9703737175 100644 --- a/mozilla/editor/ui/composer/content/Makefile.in +++ b/mozilla/editor/ui/composer/content/Makefile.in @@ -54,5 +54,5 @@ EXPORT_RESOURCE_CONTENT = \ include $(topsrcdir)/config/rules.mk install:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/editor/content/default + $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/editor/content diff --git a/mozilla/editor/ui/composer/content/TextEditorAppShell.xul b/mozilla/editor/ui/composer/content/TextEditorAppShell.xul index 19c73c01a90..46322c0b3a6 100644 --- a/mozilla/editor/ui/composer/content/TextEditorAppShell.xul +++ b/mozilla/editor/ui/composer/content/TextEditorAppShell.xul @@ -22,7 +22,7 @@ - Contributor(s): --> - + diff --git a/mozilla/editor/ui/composer/content/editor.xul b/mozilla/editor/ui/composer/content/editor.xul index e8d71aeb665..7b10230c562 100644 --- a/mozilla/editor/ui/composer/content/editor.xul +++ b/mozilla/editor/ui/composer/content/editor.xul @@ -25,11 +25,11 @@ - Sammy Ford --> - + - + diff --git a/mozilla/editor/ui/composer/content/editorOverlay.xul b/mozilla/editor/ui/composer/content/editorOverlay.xul index 9368a432e86..7c8f3534de2 100644 --- a/mozilla/editor/ui/composer/content/editorOverlay.xul +++ b/mozilla/editor/ui/composer/content/editorOverlay.xul @@ -203,7 +203,7 @@ - + diff --git a/mozilla/editor/ui/composer/content/makefile.win b/mozilla/editor/ui/composer/content/makefile.win index b06f1ef6326..6375b8e6d10 100644 --- a/mozilla/editor/ui/composer/content/makefile.win +++ b/mozilla/editor/ui/composer/content/makefile.win @@ -24,45 +24,45 @@ DEPTH=..\..\..\.. include <$(DEPTH)\config\rules.mak> install:: - $(MAKE_INSTALL) editor.xul $(DIST)\bin\chrome\editor\content\default - $(MAKE_INSTALL) TextEditorAppShell.xul $(DIST)\bin\chrome\editor\content\default - $(MAKE_INSTALL) EditorCommands.js $(DIST)\bin\chrome\editor\content\default - $(MAKE_INSTALL) EditorCommandsDebug.js $(DIST)\bin\chrome\editor\content\default - $(MAKE_INSTALL) EditorInitPage.html $(DIST)\bin\chrome\editor\content\default - $(MAKE_INSTALL) EditorInitPagePlain.html $(DIST)\bin\chrome\editor\content\default - $(MAKE_INSTALL) EditorContent.css $(DIST)\bin\chrome\editor\content\default - $(MAKE_INSTALL) EditorAllTags.css $(DIST)\bin\chrome\editor\content\default - $(MAKE_INSTALL) EditorOverride.css $(DIST)\bin\chrome\editor\content\default - $(MAKE_INSTALL) EditorParagraphMarks.css $(DIST)\bin\chrome\editor\content\default - $(MAKE_INSTALL) sidebar-editor.rdf $(DIST)\bin\chrome\editor\content\default - $(MAKE_INSTALL) sidebar-editor.xul $(DIST)\bin\chrome\editor\content\default - $(MAKE_INSTALL) sb-bookmarks-panel.xul $(DIST)\bin\chrome\editor\content\default - $(MAKE_INSTALL) sb-bookmarks.js $(DIST)\bin\chrome\editor\content\default - $(MAKE_INSTALL) sb-file-contextMenu.js $(DIST)\bin\chrome\editor\content\default - $(MAKE_INSTALL) sb-file-panel.js $(DIST)\bin\chrome\editor\content\default - $(MAKE_INSTALL) sb-file-panel.xul $(DIST)\bin\chrome\editor\content\default - $(MAKE_INSTALL) sb-FileWidgetFileHandler.js $(DIST)\bin\chrome\editor\content\default - $(MAKE_INSTALL) editorOverlay.xul $(DIST)\bin\chrome\editor\content\default - $(MAKE_INSTALL) editorOverlay.js $(DIST)\bin\chrome\editor\content\default + $(MAKE_INSTALL) editor.xul $(DIST)\bin\chrome\editor\content + $(MAKE_INSTALL) TextEditorAppShell.xul $(DIST)\bin\chrome\editor\content + $(MAKE_INSTALL) EditorCommands.js $(DIST)\bin\chrome\editor\content + $(MAKE_INSTALL) EditorCommandsDebug.js $(DIST)\bin\chrome\editor\content + $(MAKE_INSTALL) EditorInitPage.html $(DIST)\bin\chrome\editor\content + $(MAKE_INSTALL) EditorInitPagePlain.html $(DIST)\bin\chrome\editor\content + $(MAKE_INSTALL) EditorContent.css $(DIST)\bin\chrome\editor\content + $(MAKE_INSTALL) EditorAllTags.css $(DIST)\bin\chrome\editor\content + $(MAKE_INSTALL) EditorOverride.css $(DIST)\bin\chrome\editor\content + $(MAKE_INSTALL) EditorParagraphMarks.css $(DIST)\bin\chrome\editor\content + $(MAKE_INSTALL) sidebar-editor.rdf $(DIST)\bin\chrome\editor\content + $(MAKE_INSTALL) sidebar-editor.xul $(DIST)\bin\chrome\editor\content + $(MAKE_INSTALL) sb-bookmarks-panel.xul $(DIST)\bin\chrome\editor\content + $(MAKE_INSTALL) sb-bookmarks.js $(DIST)\bin\chrome\editor\content + $(MAKE_INSTALL) sb-file-contextMenu.js $(DIST)\bin\chrome\editor\content + $(MAKE_INSTALL) sb-file-panel.js $(DIST)\bin\chrome\editor\content + $(MAKE_INSTALL) sb-file-panel.xul $(DIST)\bin\chrome\editor\content + $(MAKE_INSTALL) sb-FileWidgetFileHandler.js $(DIST)\bin\chrome\editor\content + $(MAKE_INSTALL) editorOverlay.xul $(DIST)\bin\chrome\editor\content + $(MAKE_INSTALL) editorOverlay.js $(DIST)\bin\chrome\editor\content clobber:: - rm -f $(DIST)\bin\chrome\editor\content\default\editor.xul - rm -f $(DIST)\bin\chrome\editor\content\default\TextEditorAppShell.xul - rm -f $(DIST)\bin\chrome\editor\content\default\EditorCommands.js - rm -f $(DIST)\bin\chrome\editor\content\default\EditorCommandsDebug.js - rm -f $(DIST)\bin\chrome\editor\content\default\EditorInitPage.html - rm -f $(DIST)\bin\chrome\editor\content\default\EditorInitPagePlain.html - rm -f $(DIST)\bin\chrome\editor\content\default\EditorContent.css - rm -f $(DIST)\bin\chrome\editor\content\default\EditorAllTags.css - rm -f $(DIST)\bin\chrome\editor\content\default\EditorOverride.css - rm -f $(DIST)\bin\chrome\editor\content\default\EditorParagraphMarks.css - rm -f $(DIST)\bin\chrome\editor\content\default\sidebar-editor.rdf - rm -f $(DIST)\bin\chrome\editor\content\default\sidebar-editor.xul - rm -f $(DIST)\bin\chrome\editor\content\default\sb-bookmarks-panel.xul - rm -f $(DIST)\bin\chrome\editor\content\default\sb-bookmarks.js - rm -f $(DIST)\bin\chrome\editor\content\default\sb-file-contextMenu.js - rm -f $(DIST)\bin\chrome\editor\content\default\sb-file-panel.js - rm -f $(DIST)\bin\chrome\editor\content\default\sb-file-panel.xul - rm -f $(DIST)\bin\chrome\editor\content\default\sb-FileWidgetFileHandler.js - rm -f $(DIST)\bin\chrome\editor\content\default\editorOverlay.xul - rm -f $(DIST)\bin\chrome\editor\content\default\editorOverlay.js + rm -f $(DIST)\bin\chrome\editor\content\editor.xul + rm -f $(DIST)\bin\chrome\editor\content\TextEditorAppShell.xul + rm -f $(DIST)\bin\chrome\editor\content\EditorCommands.js + rm -f $(DIST)\bin\chrome\editor\content\EditorCommandsDebug.js + rm -f $(DIST)\bin\chrome\editor\content\EditorInitPage.html + rm -f $(DIST)\bin\chrome\editor\content\EditorInitPagePlain.html + rm -f $(DIST)\bin\chrome\editor\content\EditorContent.css + rm -f $(DIST)\bin\chrome\editor\content\EditorAllTags.css + rm -f $(DIST)\bin\chrome\editor\content\EditorOverride.css + rm -f $(DIST)\bin\chrome\editor\content\EditorParagraphMarks.css + rm -f $(DIST)\bin\chrome\editor\content\sidebar-editor.rdf + rm -f $(DIST)\bin\chrome\editor\content\sidebar-editor.xul + rm -f $(DIST)\bin\chrome\editor\content\sb-bookmarks-panel.xul + rm -f $(DIST)\bin\chrome\editor\content\sb-bookmarks.js + rm -f $(DIST)\bin\chrome\editor\content\sb-file-contextMenu.js + rm -f $(DIST)\bin\chrome\editor\content\sb-file-panel.js + rm -f $(DIST)\bin\chrome\editor\content\sb-file-panel.xul + rm -f $(DIST)\bin\chrome\editor\content\sb-FileWidgetFileHandler.js + rm -f $(DIST)\bin\chrome\editor\content\editorOverlay.xul + rm -f $(DIST)\bin\chrome\editor\content\editorOverlay.js diff --git a/mozilla/editor/ui/composer/content/sb-bookmarks-panel.xul b/mozilla/editor/ui/composer/content/sb-bookmarks-panel.xul index 3fc3e76a73e..0d9079faed3 100644 --- a/mozilla/editor/ui/composer/content/sb-bookmarks-panel.xul +++ b/mozilla/editor/ui/composer/content/sb-bookmarks-panel.xul @@ -23,8 +23,8 @@ - Ben Goodger --> - - + + - - + + &sidebar.flash.label; - chrome://sidebar/content/flash.xul + chrome://communicator/content/sidebar/flash.xul 5em diff --git a/mozilla/editor/ui/composer/content/sidebar-editor.xul b/mozilla/editor/ui/composer/content/sidebar-editor.xul index 31ef09841b9..76b3f93fdc7 100644 --- a/mozilla/editor/ui/composer/content/sidebar-editor.xul +++ b/mozilla/editor/ui/composer/content/sidebar-editor.xul @@ -24,8 +24,8 @@ --> - - + + - diff --git a/mozilla/xpfe/components/prefwindow/resources/content/preftree.xul b/mozilla/xpfe/components/prefwindow/resources/content/preftree.xul index 2b8ea64fe08..5ba7711ba3c 100644 --- a/mozilla/xpfe/components/prefwindow/resources/content/preftree.xul +++ b/mozilla/xpfe/components/prefwindow/resources/content/preftree.xul @@ -23,7 +23,7 @@ --> - + @@ -38,26 +38,26 @@ - + - + @@ -66,30 +66,30 @@ - + - + - + @@ -103,13 +103,13 @@ - + - + @@ -121,7 +121,7 @@ - + @@ -141,20 +141,20 @@ - + - + @@ -163,19 +163,19 @@ - + - + - + +install:: + $(MAKE_INSTALL) .\locale\en-US\related-panel.dtd $(DIST)\bin\chrome\communicator\locale\related + +clobber:: + rm -f $(DIST)\bin\chrome\communicator\locale\related\related-panel.dtd diff --git a/mozilla/xpfe/components/related/resources/related-panel.xul b/mozilla/xpfe/components/related/resources/related-panel.xul index c87283c3bb6..65cce70006a 100644 --- a/mozilla/xpfe/components/related/resources/related-panel.xul +++ b/mozilla/xpfe/components/related/resources/related-panel.xul @@ -22,9 +22,9 @@ --> - + - + - + - - + + - + - + diff --git a/mozilla/xpfe/components/search/resources/search-panel.js b/mozilla/xpfe/components/search/resources/search-panel.js index 8de9bcc0bdf..7e0f5ab1d7b 100644 --- a/mozilla/xpfe/components/search/resources/search-panel.js +++ b/mozilla/xpfe/components/search/resources/search-panel.js @@ -99,7 +99,7 @@ function rememberSearchText(target) // 3) initialise the checked state of said engines. function SearchPanelStartup() { - bundle = srGetStrBundle( "chrome://search/locale/search-panel.properties" ); + bundle = srGetStrBundle( "chrome://communicator/locale/search/search-panel.properties" ); var tree = document.getElementById("Tree"); if (tree) @@ -818,7 +818,7 @@ function OpenSearch( tabName, forceDialogFlag, aSearchStr, engineURIs ) searchWindow.loadPage( tabName, searchStr ); } else - top.openDialog("chrome://search/content/search.xul", "SearchWindow", "dialog=no,close,chrome,resizable", tabName, searchStr); + top.openDialog("chrome://communicator/content/search/search.xul", "SearchWindow", "dialog=no,close,chrome,resizable", tabName, searchStr); } else { @@ -870,7 +870,7 @@ function OpenSearch( tabName, forceDialogFlag, aSearchStr, engineURIs ) gURL = searchURL; - top.content.location.href = "chrome://search/content/internetresults.xul"; + top.content.location.href = "chrome://communicator/content/search/internetresults.xul"; } } catch(ex) @@ -993,5 +993,5 @@ function saveSearch() function doCustomize() { - window.openDialog("chrome://search/content/search-editor.xul", "_blank", "centerscreen,chrome,resizable"); + window.openDialog("chrome://communicator/content/search/search-editor.xul", "_blank", "centerscreen,chrome,resizable"); } diff --git a/mozilla/xpfe/components/search/resources/search-panel.xul b/mozilla/xpfe/components/search/resources/search-panel.xul index 658a351dd79..d6b81da9f5e 100644 --- a/mozilla/xpfe/components/search/resources/search-panel.xul +++ b/mozilla/xpfe/components/search/resources/search-panel.xul @@ -22,9 +22,9 @@ --> - + - + - - + + diff --git a/mozilla/xpfe/components/search/resources/search.js b/mozilla/xpfe/components/search/resources/search.js index 487006ef711..a1b6cedf38f 100644 --- a/mozilla/xpfe/components/search/resources/search.js +++ b/mozilla/xpfe/components/search/resources/search.js @@ -12,14 +12,14 @@ function loadPage(thePage, searchStr) if (thePage == "find") { tabName="findTab"; - content="chrome://search/content/find.xul"; - results="chrome://search/content/findresults.xul"; + content="chrome://communicator/content/search/find.xul"; + results="chrome://communicator/content/search/findresults.xul"; } else if (thePage == "internet") { tabName="internetTab"; - content="chrome://search/content/internet.xul"; - results="chrome://search/content/internetresults.xul"; + content="chrome://communicator/content/search/internet.xul"; + results="chrome://communicator/content/search/internetresults.xul"; if ((searchStr) && (searchStr != null)) { diff --git a/mozilla/xpfe/components/search/resources/search.xul b/mozilla/xpfe/components/search/resources/search.xul index a0f3022faf0..ef53aa696a1 100644 --- a/mozilla/xpfe/components/search/resources/search.xul +++ b/mozilla/xpfe/components/search/resources/search.xul @@ -1,7 +1,7 @@ - + - + - + diff --git a/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp b/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp index 54a4ee41e1c..4ae33169ec6 100755 --- a/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp +++ b/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp @@ -4557,9 +4557,9 @@ InternetSearchDataSource::ParseHTML(nsIURI *aURL, nsIRDFResource *mParent, nsIRD nsAutoString iconChromeDefault; if (browserResultTypeStr.EqualsIgnoreCase("category")) - iconChromeDefault.AssignWithConversion("chrome://search/skin/category.gif"); + iconChromeDefault.AssignWithConversion("chrome://communicator/skin/search/category.gif"); else if ((browserResultTypeStr.EqualsIgnoreCase("result")) && (!engineIconNode)) - iconChromeDefault.AssignWithConversion("chrome://search/skin/result.gif"); + iconChromeDefault.AssignWithConversion("chrome://communicator/skin/search/result.gif"); if (iconChromeDefault.Length() > 0) { diff --git a/mozilla/xpfe/components/sidebar/resources/Makefile.in b/mozilla/xpfe/components/sidebar/resources/Makefile.in index fc7435de988..038ca0ad6b3 100644 --- a/mozilla/xpfe/components/sidebar/resources/Makefile.in +++ b/mozilla/xpfe/components/sidebar/resources/Makefile.in @@ -26,7 +26,10 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CHROME_DIR = sidebar +CHROME_DIR = communicator +CHROME_CONTENT_DIR = content/sidebar +CHROME_L10N_DIR = locale/sidebar +CHROME_SKIN_DIR = skin/sidebar CHROME_CONTENT = \ customize-panel.js \ @@ -54,7 +57,7 @@ CHROME_SKIN = \ sidebar-topright-cap.gif \ $(NULL) -CHROME_L10N = \ +EXPORT_RESOURCE_LOCALE = \ locale/en-US/customize.dtd \ locale/en-US/preview.dtd \ locale/en-US/local-panels.dtd \ @@ -63,3 +66,6 @@ CHROME_L10N = \ include $(topsrcdir)/config/rules.mk +install:: + $(INSTALL) $(EXPORT_RESOURCE_LOCALE) $(DIST)/bin/chrome/communicator/locale/sidebar + diff --git a/mozilla/xpfe/components/sidebar/resources/customize-panel.xul b/mozilla/xpfe/components/sidebar/resources/customize-panel.xul index b3a0c206bb8..3190224a4ef 100644 --- a/mozilla/xpfe/components/sidebar/resources/customize-panel.xul +++ b/mozilla/xpfe/components/sidebar/resources/customize-panel.xul @@ -17,7 +17,7 @@ Reserved. --> - + @@ -27,7 +27,7 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="Init();"> - + diff --git a/mozilla/xpfe/components/sidebar/resources/customize.css b/mozilla/xpfe/components/sidebar/resources/customize.css index 7e51073f0ba..4c2eb58cb20 100644 --- a/mozilla/xpfe/components/sidebar/resources/customize.css +++ b/mozilla/xpfe/components/sidebar/resources/customize.css @@ -47,27 +47,27 @@ treeitem > treerow > treecell > .tree-button { - list-style-image: url("chrome://bookmarks/skin/bookmark-item.gif"); + list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); } treeitem[haslink="true"] > treerow > treecell > .tree-button, treeitem[container="true"] > treerow > treecell > .tree-button { - list-style-image: url("chrome://bookmarks/skin/bookmark-folder-closed.gif"); + list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif"); } treeitem[selected="true"][haslink="true"] > treerow > treecell > .tree-button, treeitem[selected="true"][container="true"] > treerow > treecell > .tree-button { - list-style-image: url("chrome://bookmarks/skin/bookmark-folder-closed-sel.gif"); + list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed-sel.gif"); } treeitem[container="true"][open="true"] > treerow > treecell > .tree-button { - list-style-image: url("chrome://bookmarks/skin/bookmark-folder-open.gif"); + list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif"); } treeitem[selected="true"][container="true"][open="true"] > treerow > treecell > .tree-button { - list-style-image: url("chrome://bookmarks/skin/bookmark-folder-open-sel.gif"); + list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open-sel.gif"); } treeitem > treerow > treecell > .tree-icon > .twisty{ @@ -75,7 +75,7 @@ treeitem > treerow > treecell > .tree-icon > .twisty{ } box#header { - list-style-image: url("chrome://sidebar/skin/sidebar-icon.gif"); + list-style-image: url("chrome://communicator/skin/sidebar/sidebar-icon.gif"); } box#header > toolbar > .circle { diff --git a/mozilla/xpfe/components/sidebar/resources/customize.js b/mozilla/xpfe/components/sidebar/resources/customize.js index c3b03e60931..ee382fb1fa4 100644 --- a/mozilla/xpfe/components/sidebar/resources/customize.js +++ b/mozilla/xpfe/components/sidebar/resources/customize.js @@ -210,7 +210,7 @@ function PreviewPanel() var preview_URL = get_attr(database, rdfNode, 'content'); if (!preview_URL || !preview_name) break; - var preview = window.open("chrome://sidebar/content/preview.xul", + var preview = window.open("chrome://communicator/content/sidebar/preview.xul", "_blank", "chrome,resizable"); preview.panel_name = preview_name; preview.panel_URL = preview_URL; @@ -333,7 +333,7 @@ function CustomizePanel() if (!customize_url) return; - window.openDialog('chrome://sidebar/content/customize-panel.xul', + window.openDialog('chrome://communicator/content/sidebar/customize-panel.xul', '_blank','chrome,resizable,width=690,height=600', customize_url); } diff --git a/mozilla/xpfe/components/sidebar/resources/customize.xul b/mozilla/xpfe/components/sidebar/resources/customize.xul index 77e7489804c..9d8381560b6 100644 --- a/mozilla/xpfe/components/sidebar/resources/customize.xul +++ b/mozilla/xpfe/components/sidebar/resources/customize.xul @@ -18,11 +18,11 @@ --> - - + + - + - + diff --git a/mozilla/xpfe/components/sidebar/resources/local-panels.rdf b/mozilla/xpfe/components/sidebar/resources/local-panels.rdf index aa130abe19e..966dae75892 100644 --- a/mozilla/xpfe/components/sidebar/resources/local-panels.rdf +++ b/mozilla/xpfe/components/sidebar/resources/local-panels.rdf @@ -21,7 +21,7 @@ - Chris Waterson --> - + @@ -29,19 +29,19 @@ &sidebar.whats-related.label; - chrome://related/content/related-panel.xul + chrome://communicator/content/related/related-panel.xul &sidebar.search.label; - chrome://search/content/search-panel.xul + chrome://communicator/content/search/search-panel.xul &sidebar.bookmarks.label; - chrome://bookmarks/content/bm-panel.xul + chrome://communicator/content/bookmarks/bm-panel.xul diff --git a/mozilla/xpfe/components/sidebar/resources/makefile.win b/mozilla/xpfe/components/sidebar/resources/makefile.win index dcc6334b6e9..48670352596 100644 --- a/mozilla/xpfe/components/sidebar/resources/makefile.win +++ b/mozilla/xpfe/components/sidebar/resources/makefile.win @@ -21,9 +21,10 @@ DEPTH=..\..\..\.. -CHROME_DIR = sidebar -CHROME_CONTENT_DIR = content\default -CHROME_SKIN_DIR = skin\default +CHROME_DIR = communicator +CHROME_CONTENT_DIR = content\sidebar +CHROME_L10N_DIR = locale\sidebar +CHROME_SKIN_DIR = skin\sidebar CHROME_CONTENT = \ .\customize-panel.js \ @@ -51,12 +52,16 @@ CHROME_SKIN = \ .\sidebar-topright-cap.gif \ $(NULL) -CHROME_L10N = \ - .\locale\en-US\customize.dtd \ - .\locale\en-US\preview.dtd \ - .\locale\en-US\local-panels.dtd \ - .\locale\en-US\sidebarOverlay.dtd \ - $(NULL) - include <$(DEPTH)\config\rules.mak> +install:: + $(MAKE_INSTALL) .\locale\en-US\customize.dtd $(DIST)\bin\chrome\communicator\locale\sidebar + $(MAKE_INSTALL) .\locale\en-US\preview.dtd $(DIST)\bin\chrome\communicator\locale\sidebar + $(MAKE_INSTALL) .\locale\en-US\local-panels.dtd $(DIST)\bin\chrome\communicator\locale\sidebar + $(MAKE_INSTALL) .\locale\en-US\sidebarOverlay.dtd $(DIST)\bin\chrome\communicator\locale\sidebar + +clobber:: + rm -f $(DIST)\bin\chrome\communicator\locale\sidebar\customize.dtd + rm -f $(DIST)\bin\chrome\communicator\locale\sidebar\preview.dtd + rm -f $(DIST)\bin\chrome\communicator\locale\sidebar\local-panels.dtd + rm -f $(DIST)\bin\chrome\communicator\locale\sidebar\sidebarOverlay.dtd diff --git a/mozilla/xpfe/components/sidebar/resources/preview.xul b/mozilla/xpfe/components/sidebar/resources/preview.xul index fc631f91071..c8217d4158d 100644 --- a/mozilla/xpfe/components/sidebar/resources/preview.xul +++ b/mozilla/xpfe/components/sidebar/resources/preview.xul @@ -18,10 +18,10 @@ --> - - + + - + - + &sidebar.preview.title.label; diff --git a/mozilla/xpfe/components/sidebar/resources/sidebar.css b/mozilla/xpfe/components/sidebar/resources/sidebar.css index 13d577eefaf..5856a8375ee 100644 --- a/mozilla/xpfe/components/sidebar/resources/sidebar.css +++ b/mozilla/xpfe/components/sidebar/resources/sidebar.css @@ -1 +1 @@ -@import url(chrome://global/skin/); +@import url(chrome://global/skin/global.css); diff --git a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.css b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.css index 476225d6007..12e981372f6 100644 --- a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.css +++ b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.css @@ -19,7 +19,7 @@ * Contributor(s): Stephen Lamm */ -@import url(chrome://global/skin/); +@import url(chrome://global/skin/global.css); splitter#sidebar-splitter { margin-right: 2px; @@ -31,14 +31,14 @@ splitter#sidebar-splitter { splitter#sidebar-splitter #bottomright-cap { min-height: 8px; - background-image: url("chrome://sidebar/skin/sidebar-bottomright-cap.gif"); + background-image: url("chrome://communicator/skin/sidebar/sidebar-bottomright-cap.gif"); background-repeat: no-repeat; background-position: 100% 100%; } splitter#sidebar-splitter #topright-cap { min-height: 8px; - background-image: url("chrome://sidebar/skin/sidebar-topright-cap.gif"); + background-image: url("chrome://communicator/skin/sidebar/sidebar-topright-cap.gif"); background-repeat: no-repeat; background-position: 100% 0%; } diff --git a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.js b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.js index eba6108024e..a6e2b87c4e8 100644 --- a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.js +++ b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.js @@ -90,7 +90,7 @@ function sidebar_overlay_init() { sidebarObj.resource = 'urn:sidebar:current-panel-list'; sidebarObj.master_datasources = get_remote_datasource_url(); - sidebarObj.master_datasources += " chrome://sidebar/content/local-panels.rdf"; + sidebarObj.master_datasources += " chrome://communicator/content/sidebar/local-panels.rdf"; sidebarObj.master_resource = 'urn:sidebar:master-panel-list'; sidebarObj.component = document.location.href; @@ -354,7 +354,7 @@ function SidebarCustomize() { var panels = document.getElementById('sidebar-panels'); customizeWindow = window.openDialog( - 'chrome://sidebar/content/customize.xul', + 'chrome://communicator/content/sidebar/customize.xul', '_blank','chrome,resizable', sidebarObj.master_datasources, sidebarObj.master_resource, diff --git a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.xul b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.xul index 67772af5633..1b06912b0f6 100644 --- a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.xul +++ b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.xul @@ -18,9 +18,9 @@ --> - + - + + src="chrome://communicator/content/sidebar/sidebarOverlay.js"/> diff --git a/mozilla/xpfe/components/timebomb/nsTimeBomb.cpp b/mozilla/xpfe/components/timebomb/nsTimeBomb.cpp index c1bfc1a1ac2..2614977c84b 100644 --- a/mozilla/xpfe/components/timebomb/nsTimeBomb.cpp +++ b/mozilla/xpfe/components/timebomb/nsTimeBomb.cpp @@ -149,7 +149,7 @@ nsTimeBomb::CheckWithUI(PRBool *expired) #ifdef DEBUG printf("******** Expired version ********\n"); #endif - DisplayURI("chrome://timebomb/content/expireText.xul", PR_FALSE); + DisplayURI("chrome://communicator/content/timebomb/expireText.xul", PR_FALSE); *expired = PR_TRUE; return NS_OK; } @@ -161,7 +161,7 @@ nsTimeBomb::CheckWithUI(PRBool *expired) #ifdef DEBUG printf("******** ABOUT TO EXPIRE ********\n"); #endif - DisplayURI("chrome://timebomb/content/warnText.xul", PR_FALSE); + DisplayURI("chrome://communicator/content/timebomb/warnText.xul", PR_FALSE); } return NS_OK; diff --git a/mozilla/xpfe/components/timebomb/resources/content/Makefile.in b/mozilla/xpfe/components/timebomb/resources/content/Makefile.in index b370ef66bc2..c6155ec05e3 100644 --- a/mozilla/xpfe/components/timebomb/resources/content/Makefile.in +++ b/mozilla/xpfe/components/timebomb/resources/content/Makefile.in @@ -34,5 +34,5 @@ EXPORT_RESOURCE_CONTENT = \ include $(topsrcdir)/config/rules.mk install:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/timebomb/content/default + $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/communicator/content/timebomb diff --git a/mozilla/xpfe/components/timebomb/resources/content/expireText.xul b/mozilla/xpfe/components/timebomb/resources/content/expireText.xul index 011ce1e60d3..0101b232569 100644 --- a/mozilla/xpfe/components/timebomb/resources/content/expireText.xul +++ b/mozilla/xpfe/components/timebomb/resources/content/expireText.xul @@ -23,7 +23,7 @@ Contributor(s): - + install:: - $(MAKE_INSTALL) warn.xul $(DIST)\bin\chrome\timebomb\content\default - $(MAKE_INSTALL) expireText.xul $(DIST)\bin\chrome\timebomb\content\default + $(MAKE_INSTALL) warn.xul $(DIST)\bin\chrome\communicator\content\timebomb + $(MAKE_INSTALL) expireText.xul $(DIST)\bin\chrome\communicator\content\timebomb clobber:: - rm -f $(DIST)\bin\chrome\timebomb\content\default\*.* + rm -f $(DIST)\bin\chrome\communicator\content\timebomb\*.* diff --git a/mozilla/xpfe/components/timebomb/resources/content/warn.xul b/mozilla/xpfe/components/timebomb/resources/content/warn.xul index a406536e6ec..6aff5596efb 100644 --- a/mozilla/xpfe/components/timebomb/resources/content/warn.xul +++ b/mozilla/xpfe/components/timebomb/resources/content/warn.xul @@ -23,7 +23,7 @@ Contributor(s): - + install:: - $(MAKE_INSTALL) timebomb.dtd $(DIST)\bin\chrome\timebomb\locale\en-US + $(MAKE_INSTALL) timebomb.dtd $(DIST)\bin\chrome\communicator\locale\timebomb clobber:: - rm -f $(DIST)\bin\chrome\timebomb\locale\en-US\*.* + rm -f $(DIST)\bin\chrome\communicator\locale\timebomb\*.* diff --git a/mozilla/xpfe/components/ucth/resources/Makefile.in b/mozilla/xpfe/components/ucth/resources/Makefile.in index e66bfeb26bf..5000b17b51a 100644 --- a/mozilla/xpfe/components/ucth/resources/Makefile.in +++ b/mozilla/xpfe/components/ucth/resources/Makefile.in @@ -27,16 +27,22 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk CHROME_DIR = global +CHROME_CONTENT_DIR = content +CHROME_L10N_DIR = locale +CHROME_SKIN_DIR = skin CHROME_CONTENT = \ unknownContent.xul \ unknownContent.js \ $(NULL) -CHROME_L10N = \ +EXPORT_RESOURCE_LOCALE = \ locale/en-US/unknownContent.dtd \ locale/en-US/unknownContent.properties \ $(NULL) include $(topsrcdir)/config/rules.mk +install:: + $(INSTALL) $(EXPORT_RESOURCE_LOCALE) $(DIST)/bin/chrome/global/locale + diff --git a/mozilla/xpfe/components/ucth/resources/makefile.win b/mozilla/xpfe/components/ucth/resources/makefile.win index b24d9e05878..e40857dba22 100644 --- a/mozilla/xpfe/components/ucth/resources/makefile.win +++ b/mozilla/xpfe/components/ucth/resources/makefile.win @@ -26,8 +26,10 @@ DEPTH=..\..\..\.. DIRS=locale CHROME_DIR = global +CHROME_CONTENT_DIR = content +CHROME_L10N_DIR = locale +CHROME_SKIN_DIR = skin -CHROME_CONTENT_DIR = content\default CHROME_CONTENT=\ .\unknownContent.xul \ @@ -36,9 +38,12 @@ CHROME_CONTENT=\ CHROME_SKIN= -CHROME_L10N=\ - .\locale\en-US\unknownContent.dtd \ - .\locale\en-US\unknownContent.properties \ - $(NULL) - include <$(DEPTH)\config\rules.mak> + +install:: + $(MAKE_INSTALL) .\locale\en-US\unknownContent.dtd $(DIST)\bin\chrome\global\locale + $(MAKE_INSTALL) .\locale\en-US\unknownContent.properties $(DIST)\bin\chrome\global\locale + +clobber:: + rm -f $(DIST)\bin\chrome\global\locale\unknownContent.dtd + rm -f $(DIST)\bin\chrome\global\locale\unknownContent.properties diff --git a/mozilla/xpfe/components/ucth/resources/unknownContent.xul b/mozilla/xpfe/components/ucth/resources/unknownContent.xul index d6064f80f7a..c92a3a5b830 100644 --- a/mozilla/xpfe/components/ucth/resources/unknownContent.xul +++ b/mozilla/xpfe/components/ucth/resources/unknownContent.xul @@ -2,7 +2,7 @@ - + - + diff --git a/mozilla/xpfe/components/xfer/resources/makefile.win b/mozilla/xpfe/components/xfer/resources/makefile.win index 1b947640135..10e35046aaf 100644 --- a/mozilla/xpfe/components/xfer/resources/makefile.win +++ b/mozilla/xpfe/components/xfer/resources/makefile.win @@ -25,8 +25,10 @@ DEPTH=..\..\..\.. DIRS=locale CHROME_DIR = global +CHROME_CONTENT_DIR = content +CHROME_L10N_DIR = locale +CHROME_SKIN_DIR = skin -CHROME_CONTENT_DIR = content\default CHROME_CONTENT=\ .\downloadProgress.xul \ @@ -35,9 +37,12 @@ CHROME_CONTENT=\ CHROME_SKIN= -CHROME_L10N=\ - .\locale\en-US\downloadProgress.dtd \ - .\locale\en-US\downloadProgress.properties \ - $(NULL) - include <$(DEPTH)\config\rules.mak> + +install:: + $(MAKE_INSTALL) .\locale\en-US\downloadProgress.dtd $(DIST)\bin\chrome\global\locale + $(MAKE_INSTALL) .\locale\en-US\downloadProgress.properties $(DIST)\bin\chrome\global\locale + +clobber:: + rm -f $(DIST)\bin\chrome\global\locale\downloadProgress.dtd + rm -f $(DIST)\bin\chrome\global\locale\downloadProgress.properties diff --git a/mozilla/xpfe/global/resources/content/Makefile.in b/mozilla/xpfe/global/resources/content/Makefile.in index 1966b3dc146..6ef74f7d012 100644 --- a/mozilla/xpfe/global/resources/content/Makefile.in +++ b/mozilla/xpfe/global/resources/content/Makefile.in @@ -68,5 +68,5 @@ EXPORT_RESOURCE_CONTENT = \ include $(topsrcdir)/config/rules.mk install:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/global/content/default + $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/global/content diff --git a/mozilla/xpfe/global/resources/content/about.xul b/mozilla/xpfe/global/resources/content/about.xul index e4afa52d9ba..34fff367a7d 100644 --- a/mozilla/xpfe/global/resources/content/about.xul +++ b/mozilla/xpfe/global/resources/content/about.xul @@ -20,7 +20,7 @@ Rights Reserved. Contributor(s): Michael Lowe --> - + @@ -52,4 +52,4 @@ Contributor(s): Michael Lowe --> - \ No newline at end of file + diff --git a/mozilla/xpfe/global/resources/content/charsetOverlay.xul b/mozilla/xpfe/global/resources/content/charsetOverlay.xul index efe03e09ad7..e53eefded79 100644 --- a/mozilla/xpfe/global/resources/content/charsetOverlay.xul +++ b/mozilla/xpfe/global/resources/content/charsetOverlay.xul @@ -112,7 +112,7 @@ - + diff --git a/mozilla/xpfe/global/resources/content/commonDialog.xul b/mozilla/xpfe/global/resources/content/commonDialog.xul index 857e49bec04..7b6810ecf04 100644 --- a/mozilla/xpfe/global/resources/content/commonDialog.xul +++ b/mozilla/xpfe/global/resources/content/commonDialog.xul @@ -1,5 +1,5 @@ - + diff --git a/mozilla/xpfe/global/resources/content/globalOverlay.js b/mozilla/xpfe/global/resources/content/globalOverlay.js index fd7a1e56a78..477bcaf2832 100644 --- a/mozilla/xpfe/global/resources/content/globalOverlay.js +++ b/mozilla/xpfe/global/resources/content/globalOverlay.js @@ -51,7 +51,7 @@ function goOpenNewMessage() function goNewCardDialog(selectedAB) { - window.openDialog("chrome://addressbook/content/abNewCardDialog.xul", + window.openDialog("chrome://messenger/content/addressbook/abNewCardDialog.xul", "", "chrome,resizeable=no,modal", {selectedAB:selectedAB}); @@ -60,7 +60,7 @@ function goNewCardDialog(selectedAB) function goEditCardDialog(abURI, card, okCallback) { - window.openDialog("chrome://addressbook/content/abEditCardDialog.xul", + window.openDialog("chrome://messenger/content/addressbook/abEditCardDialog.xul", "", "chrome,resizeable=no,modal", {abURI:abURI, card:card, okCallback:okCallback}); @@ -82,7 +82,7 @@ function goPreferences(id, pane) } var modality = prefWindowModalityPref ? "yes" : "no"; - var prefWindow = window.openDialog("chrome://pref/content/pref.xul","PrefWindow", "chrome,modal=" + modality + ",resizable=yes", pane); + var prefWindow = window.openDialog("chrome://communicator/content/pref/pref.xul","PrefWindow", "chrome,modal=" + modality + ",resizable=yes", pane); } @@ -331,7 +331,7 @@ function SendPage() { var pageUrl = window.content.location.href; var pageTitle = window.content.document.title; - window.openDialog( "chrome://messengercompose/content/", "_blank", + window.openDialog( "chrome://messenger/content/messengercompose/messengercompose.xul", "_blank", "chrome,all,dialog=no", "attachment='" + pageUrl + "',body='" + pageUrl + "',subject='" + pageTitle + "',bodyislink=true"); diff --git a/mozilla/xpfe/global/resources/content/makefile.win b/mozilla/xpfe/global/resources/content/makefile.win index 050438f8e98..65117ebfe0e 100644 --- a/mozilla/xpfe/global/resources/content/makefile.win +++ b/mozilla/xpfe/global/resources/content/makefile.win @@ -26,7 +26,7 @@ DIRS=win include <$(DEPTH)\config\rules.mak> -DISTBROWSER=$(DIST)\bin\chrome\global\content\default +DISTBROWSER=$(DIST)\bin\chrome\global\content install:: $(MAKE_INSTALL) browserBindings.xul $(DISTBROWSER) @@ -65,4 +65,4 @@ install:: $(MAKE_INSTALL) treePopups.js $(DISTBROWSER) clobber:: - rm -f $(DIST)\bin\chrome\global\content\default\*.* + rm -f $(DIST)\bin\chrome\global\content\*.* diff --git a/mozilla/xpfe/global/resources/content/selectDialog.xul b/mozilla/xpfe/global/resources/content/selectDialog.xul index 193d4ac1573..1b9e78c97dc 100644 --- a/mozilla/xpfe/global/resources/content/selectDialog.xul +++ b/mozilla/xpfe/global/resources/content/selectDialog.xul @@ -1,5 +1,5 @@ - + diff --git a/mozilla/xpfe/global/resources/content/tasksOverlay.js b/mozilla/xpfe/global/resources/content/tasksOverlay.js index ebdb7dd48d0..bc073ac42f1 100644 --- a/mozilla/xpfe/global/resources/content/tasksOverlay.js +++ b/mozilla/xpfe/global/resources/content/tasksOverlay.js @@ -1,7 +1,7 @@ function toNavigator() { - CycleWindow('navigator:browser', 'chrome://navigator/content/'); + CycleWindow('navigator:browser', 'chrome://navigator/content/navigator.xul'); } function toMessengerWindow() @@ -10,20 +10,20 @@ function toMessengerWindow() var layoutType = pref.GetIntPref("mail.pane_config"); if(layoutType == 0) - toOpenWindowByType("mail:3pane", "chrome://messenger/content/"); + toOpenWindowByType("mail:3pane", "chrome://messenger/content/messenger.xul"); else toOpenWindowByType("mail:3pane", "chrome://messenger/content/mail3PaneWindowVertLayout.xul"); } catch(ex) { - toOpenWindowByType("mail:3pane", "chrome://messenger/content/"); + toOpenWindowByType("mail:3pane", "chrome://messenger/content/messenger.xul"); } } function toAddressBook() { - toOpenWindowByType("mail:addressbook", "chrome://addressbook/content/addressbook.xul"); + toOpenWindowByType("mail:addressbook", "chrome://messenger/content/addressbook/addressbook.xul"); } function toNewsgroups() @@ -62,7 +62,7 @@ function toHistory() } gDisableHistory = true; - window.open( "chrome://history/content/", "_blank", "chrome,menubar,resizable,scrollbars" ); + window.open( "chrome://communicator/content/history/history.xul", "_blank", "chrome,menubar,resizable,scrollbars" ); setTimeout(enableHistory, 2000); } @@ -193,7 +193,7 @@ function CycleWindow( inType, inChromeURL ) function toEditor() { - CycleWindow('composer:html', 'chrome://editor/content/'); + CycleWindow('composer:html', 'chrome://editor/content/editor.xul'); } function ShowWindowFromResource( node ) @@ -347,15 +347,15 @@ function WalletDialog( which ) { switch( which ) { case "signon": - window.openDialog("chrome://wallet/content/SignonViewer.xul","SSViewer","modal,chrome,height=504,width=436"); + window.openDialog("chrome://communicator/content/wallet/SignonViewer.xul","SSViewer","modal,chrome,height=504,width=436"); break; case "cookie": this.pref.SetBoolPref("cookieviewer.cookieTab", true); - window.openDialog("chrome://wallet/content/CookieViewer.xul","CookieViewer","modal,chrome,height=504,width=436"); + window.openDialog("chrome://communicator/content/wallet/CookieViewer.xul","CookieViewer","modal,chrome,height=504,width=436"); break; case "image": this.pref.SetBoolPref("cookieviewer.cookieTab", false); - window.openDialog("chrome://wallet/content/CookieViewer.xul","CookieViewer","modal,chrome,height=504,width=436"); + window.openDialog("chrome://communicator/content/wallet/CookieViewer.xul","CookieViewer","modal,chrome,height=504,width=436"); break; case "samples": window.content.location.href= 'http://www.mozilla.org/wallet/samples/'; @@ -365,7 +365,7 @@ function WalletDialog( which ) break; case "wallet": default: - window.openDialog("chrome://wallet/content/WalletEditor.xul","walletEditor","modal,chrome,height=504,width=436"); + window.openDialog("chrome://communicator/content/wallet/WalletEditor.xul","walletEditor","modal,chrome,height=504,width=436"); break; } } diff --git a/mozilla/xpfe/global/resources/content/unix/Makefile.in b/mozilla/xpfe/global/resources/content/unix/Makefile.in index c778b498444..7e43aa5f390 100644 --- a/mozilla/xpfe/global/resources/content/unix/Makefile.in +++ b/mozilla/xpfe/global/resources/content/unix/Makefile.in @@ -39,5 +39,5 @@ EXPORT_RESOURCE_CONTENT = \ include $(topsrcdir)/config/rules.mk install:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/global/content/default + $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/global/content diff --git a/mozilla/xpfe/global/resources/content/win/makefile.win b/mozilla/xpfe/global/resources/content/win/makefile.win index 9995625d85d..54df1b06801 100644 --- a/mozilla/xpfe/global/resources/content/win/makefile.win +++ b/mozilla/xpfe/global/resources/content/win/makefile.win @@ -23,7 +23,7 @@ DEPTH=..\..\..\..\.. include <$(DEPTH)\config\rules.mak> -DISTBROWSER=$(DIST)\bin\chrome\global\content\default +DISTBROWSER=$(DIST)\bin\chrome\global\content install:: @@ -35,4 +35,4 @@ install:: $(MAKE_INSTALL) platformEditorBindings.xul $(DISTBROWSER) clobber:: - rm -f $(DIST)\bin\chrome\global\content\default\*.* + rm -f $(DIST)\bin\chrome\global\content\*.* diff --git a/mozilla/xpfe/global/resources/locale/en-US/Makefile.in b/mozilla/xpfe/global/resources/locale/en-US/Makefile.in index 08459bbfe7d..ae163171523 100644 --- a/mozilla/xpfe/global/resources/locale/en-US/Makefile.in +++ b/mozilla/xpfe/global/resources/locale/en-US/Makefile.in @@ -46,5 +46,5 @@ EXPORT_RESOURCE_CONTENT = \ include $(topsrcdir)/config/rules.mk install:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/global/locale/en-US + $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/global/locale diff --git a/mozilla/xpfe/global/resources/locale/en-US/makefile.win b/mozilla/xpfe/global/resources/locale/en-US/makefile.win index ce04ee58ef0..22484a55910 100644 --- a/mozilla/xpfe/global/resources/locale/en-US/makefile.win +++ b/mozilla/xpfe/global/resources/locale/en-US/makefile.win @@ -25,7 +25,7 @@ DIRS=win include <$(DEPTH)\config\rules.mak> -DISTBROWSER=$(DIST)\bin\chrome\global\locale\en-US +DISTBROWSER=$(DIST)\bin\chrome\global\locale install:: @@ -43,4 +43,4 @@ install:: $(MAKE_INSTALL) about.dtd $(DISTBROWSER) clobber:: - rm -f $(DIST)\bin\chrome\global\locale\en-US\*.* + rm -f $(DIST)\bin\chrome\global\locale\*.* diff --git a/mozilla/xpfe/global/resources/locale/en-US/unix/Makefile.in b/mozilla/xpfe/global/resources/locale/en-US/unix/Makefile.in index 4fd30a5f8c4..4fd0839d0b0 100644 --- a/mozilla/xpfe/global/resources/locale/en-US/unix/Makefile.in +++ b/mozilla/xpfe/global/resources/locale/en-US/unix/Makefile.in @@ -34,5 +34,5 @@ EXPORT_RESOURCE_CONTENT = \ include $(topsrcdir)/config/rules.mk install:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/global/locale/en-US + $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/global/locale diff --git a/mozilla/xpfe/global/resources/locale/en-US/win/makefile.win b/mozilla/xpfe/global/resources/locale/en-US/win/makefile.win index d70b4660975..4efb140548f 100644 --- a/mozilla/xpfe/global/resources/locale/en-US/win/makefile.win +++ b/mozilla/xpfe/global/resources/locale/en-US/win/makefile.win @@ -23,7 +23,7 @@ DEPTH=..\..\..\..\..\.. include <$(DEPTH)\config\rules.mak> -DISTBROWSER=$(DIST)\bin\chrome\global\locale\en-US +DISTBROWSER=$(DIST)\bin\chrome\global\locale install:: @@ -31,4 +31,4 @@ install:: $(MAKE_INSTALL) platformDialogOverlay.dtd $(DISTBROWSER) clobber:: - rm -f $(DIST)\bin\chrome\global\locale\en-US\*.* + rm -f $(DIST)\bin\chrome\global\locale\*.* diff --git a/mozilla/xpfe/global/resources/skin/Makefile.in b/mozilla/xpfe/global/resources/skin/Makefile.in index 47713ad7a8f..dfe4e11d845 100644 --- a/mozilla/xpfe/global/resources/skin/Makefile.in +++ b/mozilla/xpfe/global/resources/skin/Makefile.in @@ -146,5 +146,5 @@ EXPORT_CHROME = $(srcdir)/xul.css \ include $(topsrcdir)/config/rules.mk install:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/global/skin/default + $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/global/skin $(INSTALL) $(EXPORT_CHROME) $(DIST)/bin/chrome diff --git a/mozilla/xpfe/global/resources/skin/global.css b/mozilla/xpfe/global/resources/skin/global.css index ef357b05372..5a10cf7e08a 100644 --- a/mozilla/xpfe/global/resources/skin/global.css +++ b/mozilla/xpfe/global/resources/skin/global.css @@ -1016,7 +1016,7 @@ menulist[editable="true"][open="true"] > .menu-dropmarker { } menulist[editable="true"] > .menu-icon { - list-style-image: url("chrome://bookmarks/skin/bookmark-item.gif"); + list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); background-color: white; padding: 1px; border-left: 1px inset #CCCCCC; diff --git a/mozilla/xpfe/global/resources/skin/makefile.win b/mozilla/xpfe/global/resources/skin/makefile.win index 9ad276689c1..2ba92cc2fbc 100644 --- a/mozilla/xpfe/global/resources/skin/makefile.win +++ b/mozilla/xpfe/global/resources/skin/makefile.win @@ -25,7 +25,7 @@ DIRS=win include <$(DEPTH)\config\rules.mak> -DISTBROWSER=$(DIST)\bin\chrome\global\skin\default +DISTBROWSER=$(DIST)\bin\chrome\global\skin DISTXUL=$(DIST)\bin\chrome install:: @@ -143,4 +143,4 @@ install:: $(MAKE_INSTALL) check-radio-disabled.gif $(DISTBROWSER) clobber:: - rm -f $(DIST)\bin\chrome\global\skin\default\*.* + rm -f $(DIST)\bin\chrome\global\skin\*.* diff --git a/mozilla/xpfe/global/resources/skin/menulist.css b/mozilla/xpfe/global/resources/skin/menulist.css index 78c2944d320..28d5d4d5362 100644 --- a/mozilla/xpfe/global/resources/skin/menulist.css +++ b/mozilla/xpfe/global/resources/skin/menulist.css @@ -98,7 +98,7 @@ /* icon display frame */ menulist[editable="true"] > .menu-icon { - list-style-image : url("chrome://bookmarks/skin/bookmark-item.gif"); + list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); background-color : white; padding : 1px; border-left : 1px inset #CCCCCC; @@ -170,4 +170,4 @@ menulist > menupopup > menuitem[menuactive="true"][selected="true"] > .menu-left { list-style-image : url(chrome://global/skin/menu-check-hover.gif); - } \ No newline at end of file + } diff --git a/mozilla/xpfe/global/resources/skin/win/makefile.win b/mozilla/xpfe/global/resources/skin/win/makefile.win index 07f79f7ce88..f2471b600d1 100644 --- a/mozilla/xpfe/global/resources/skin/win/makefile.win +++ b/mozilla/xpfe/global/resources/skin/win/makefile.win @@ -29,4 +29,4 @@ install:: $(MAKE_INSTALL) platformHTMLBindings.xml $(DISTBROWSER) clobber:: - rm -f $(DIST)\bin\chrome\global\content\default\*.* + rm -f $(DIST)\bin\chrome\global\content\*.* diff --git a/mozilla/xpfe/makefile.win b/mozilla/xpfe/makefile.win index 00dc370c090..8d007f2f738 100644 --- a/mozilla/xpfe/makefile.win +++ b/mozilla/xpfe/makefile.win @@ -25,18 +25,3 @@ DIRS=appshell bootstrap browser components global include <$(DEPTH)\config\rules.mak> -CHROME_DIRS=\ - $(DIST)\bin\chrome\content \ - $(DIST)\bin\chrome\skin\mozilla \ - $(DIST)\bin\chrome\locale\en \ - $(DIST)\bin\chrome\platform\mac \ - $(DIST)\bin\chrome\platform\windows \ - $(DIST)\bin\chrome\platform\unix \ - $(NULL) - -$(CHROME_DIRS): - mkdir $@ - -export:: $(CHROME_DIRS) - - diff --git a/mozilla/xpinstall/packager/packages-mac b/mozilla/xpinstall/packager/packages-mac index b281d0e2545..c45cd86765b 100644 --- a/mozilla/xpinstall/packager/packages-mac +++ b/mozilla/xpinstall/packager/packages-mac @@ -161,37 +161,26 @@ viewer:Components:XPConnect.shlb viewer:Components:xpconnect.xpt viewer:Components:xpinstall.xpt -viewer:chrome:bookmarks:* viewer:chrome:editor:* -viewer:chrome:security:* --viewer:chrome:editor:content:default:EditorInitPage.html --viewer:chrome:editor:content:default:EditorInitPagePlain.html +-viewer:chrome:editor:content:EditorInitPage.html +-viewer:chrome:editor:content:EditorInitPagePlain.html ;Include this for "debug" testing - remove for actual beta release: -;-viewer:chrome:editor:content:default:TextEditorAppShell.xul --viewer:chrome:editor:content:default:sb-bookmarks-panel.xul --viewer:chrome:editor:content:default:sb-bookmarks.js --viewer:chrome:editor:content:default:sb-file-contextMenu.js --viewer:chrome:editor:content:default:sb-file-panel.js --viewer:chrome:editor:content:default:sb-file-panel.xul --viewer:chrome:editor:content:default:sb-FileWidgetFileHandler.js -viewer:chrome:directory:* +;-viewer:chrome:editor:content:TextEditorAppShell.xul +-viewer:chrome:editor:content:sb-bookmarks-panel.xul +-viewer:chrome:editor:content:sb-bookmarks.js +-viewer:chrome:editor:content:sb-file-contextMenu.js +-viewer:chrome:editor:content:sb-file-panel.js +-viewer:chrome:editor:content:sb-file-panel.xul +-viewer:chrome:editor:content:sb-FileWidgetFileHandler.js +viewer:chrome:communicator:* +-viewer:chrome:communicator:content:domviewer viewer:chrome:global:* -viewer:chrome:history:* -viewer:chrome:htmlBindings.xml viewer:chrome:navigator:* -viewer:chrome:layout:* +viewer:chrome:htmlBindings.xml viewer:chrome:platformHTMLBindings.xml -viewer:chrome:pref:* -viewer:chrome:profile:* -viewer:chrome:related:* -viewer:chrome:RegViewer:* -viewer:chrome:Search:* -viewer:chrome:sidebar:* -viewer:chrome:timebomb:* -viewer:chrome:wallet:* -viewer:chrome:xpinstall:* viewer:chrome:xul.css viewer:chrome:xulBindings.xml + viewer:defaults:pref:all.js viewer:defaults:pref:mailnews.js viewer:defaults:pref:config.js @@ -276,7 +265,5 @@ viewer:Components:msgImport.shlb viewer:Components:msgImport.xpt viewer:Components:msgImportText.shlb viewer:Components:msgImportEudora.shlb -viewer:chrome:addressbook:* viewer:chrome:messenger:* -viewer:chrome:messengercompose:* viewer:res:Mailnews:* diff --git a/mozilla/xpinstall/packager/packages-unix b/mozilla/xpinstall/packager/packages-unix index 64631ee31fb..e858f5b1d51 100644 --- a/mozilla/xpinstall/packager/packages-unix +++ b/mozilla/xpinstall/packager/packages-unix @@ -184,39 +184,28 @@ bin/components/util.xpt bin/components/xpcom_components.xpt bin/components/xpcom_threads.xpt -bin/chrome/bookmarks/* -bin/chrome/directory/* bin/chrome/editor/* -bin/chrome/security/* --bin/chrome/editor/content/default/EditorInitPage.html --bin/chrome/editor/content/default/EditorInitPagePlain.html +-bin/chrome/editor/content/EditorInitPage.html +-bin/chrome/editor/content/EditorInitPagePlain.html ;Include this for "debug" testing - remove for actual beta release: -;-bin/chrome/editor/content/default/TextEditorAppShell.xul --bin/chrome/editor/content/default/sb-bookmarks-panel.xul --bin/chrome/editor/content/default/sb-bookmarks.js --bin/chrome/editor/content/default/sb-file-contextMenu.js --bin/chrome/editor/content/default/sb-file-panel.js --bin/chrome/editor/content/default/sb-file-panel.xul --bin/chrome/editor/content/default/sb-FileWidgetFileHandler.js --bin/chrome/editor/content/default/viewsource.js --bin/chrome/editor/content/default/viewsource.xul +;-bin/chrome/editor/content/TextEditorAppShell.xul +-bin/chrome/editor/content/sb-bookmarks-panel.xul +-bin/chrome/editor/content/sb-bookmarks.js +-bin/chrome/editor/content/sb-file-contextMenu.js +-bin/chrome/editor/content/sb-file-panel.js +-bin/chrome/editor/content/sb-file-panel.xul +-bin/chrome/editor/content/sb-FileWidgetFileHandler.js +-bin/chrome/editor/content/viewsource.js +-bin/chrome/editor/content/viewsource.xul +bin/chrome/communicator/* +-bin/chrome/communicator/content/domviewer bin/chrome/global/* -bin/chrome/history/* bin/chrome/navigator/* -bin/chrome/pref/* -bin/chrome/profile/* -bin/chrome/regviewer/* -bin/chrome/related/* -bin/chrome/search/* -bin/chrome/sidebar/* -bin/chrome/timebomb/* -bin/chrome/wallet/* -bin/chrome/xpinstall/* -bin/chrome/layout/* -bin/chrome/xul.css -bin/chrome/xulBindings.xml bin/chrome/htmlBindings.xml bin/chrome/platformHTMLBindings.xml +bin/chrome/xul.css +bin/chrome/xulBindings.xml + bin/defaults/pref/editor.js bin/defaults/pref/all.js bin/defaults/pref/mailnews.js @@ -257,9 +246,9 @@ bin/res/samples/* ;[editor] ; these are redundant because bin/chrome/editor/* is listed above -blizzard -; bin/chrome/editor/content/default/* -; bin/chrome/editor/locale/en-US/* -; bin/chrome/editor/skin/default/* +; bin/chrome/editor/content/* +; bin/chrome/editor/locale/* +; bin/chrome/editor/skin/* [mail] bin/components/addrbook.xpt @@ -290,8 +279,6 @@ bin/components/msgsearch.xpt bin/components/txmgr.xpt bin/components/import.xpt -bin/chrome/addressbook/* bin/chrome/messenger/* -bin/chrome/messengercompose/* ; this doesn't seem to be in the tree. -blizzard ;bin/help/mailhelp/* diff --git a/mozilla/xpinstall/packager/packages-win b/mozilla/xpinstall/packager/packages-win index 44362a61fc8..0a8f11d92f4 100644 --- a/mozilla/xpinstall/packager/packages-win +++ b/mozilla/xpinstall/packager/packages-win @@ -167,38 +167,27 @@ bin\components\xpconnect.xpt bin\components\xpiflash.dll bin\components\xpinstall.xpt bin\components\xppref32.dll -bin\chrome\bookmarks\* -bin\chrome\directory\* bin\chrome\editor\* -bin\chrome\security\* --bin\chrome\editor\content\default\EditorInitPage.html --bin\chrome\editor\content\default\EditorInitPagePlain.html +-bin\chrome\editor\content\EditorInitPage.html +-bin\chrome\editor\content\EditorInitPagePlain.html ;Include this for "debug" testing - remove for actual beta release: -;-bin\chrome\editor\content\default\TextEditorAppShell.xul --bin\chrome\editor\content\default\sb-bookmarks-panel.xul --bin\chrome\editor\content\default\sb-bookmarks.js --bin\chrome\editor\content\default\sb-file-contextMenu.js --bin\chrome\editor\content\default\sb-file-panel.js --bin\chrome\editor\content\default\sb-file-panel.xul --bin\chrome\editor\content\default\sb-FileWidgetFileHandler.js --bin\chrome\editor\content\default\viewsource.js --bin\chrome\editor\content\default\viewsource.xul +;-bin\chrome\editor\content\TextEditorAppShell.xul +-bin\chrome\editor\content\sb-bookmarks-panel.xul +-bin\chrome\editor\content\sb-bookmarks.js +-bin\chrome\editor\content\sb-file-contextMenu.js +-bin\chrome\editor\content\sb-file-panel.js +-bin\chrome\editor\content\sb-file-panel.xul +-bin\chrome\editor\content\sb-FileWidgetFileHandler.js +-bin\chrome\editor\content\viewsource.js +-bin\chrome\editor\content\viewsource.xul +bin\chrome\communicator\* +-bin\chrome\communicator\content\domviewer bin\chrome\global\* -bin\chrome\history\* bin\chrome\navigator\* -bin\chrome\pref\* -bin\chrome\profile\* -bin\chrome\related\* -bin\chrome\sidebar\* -bin\chrome\timebomb\* -bin\chrome\wallet\* -bin\chrome\xpinstall\* -bin\chrome\layout\* -bin\chrome\xul.css -bin\chrome\xulBindings.xml bin\chrome\htmlBindings.xml bin\chrome\platformHTMLBindings.xml -bin\chrome\search\* +bin\chrome\xul.css +bin\chrome\xulBindings.xml bin\defaults\pref\all.js bin\defaults\pref\mailnews.js bin\defaults\pref\config.js @@ -261,7 +250,5 @@ bin\components\importOE.dll bin\components\impOutlk.dll bin\components\impEudra.dll bin\components\impText.dll -bin\chrome\addressbook\* bin\chrome\messenger\* -bin\chrome\messengercompose\* bin\help\mailhelp\* diff --git a/mozilla/xpinstall/res/content/Makefile.in b/mozilla/xpinstall/res/content/Makefile.in index 5e75af82199..374e1927085 100644 --- a/mozilla/xpinstall/res/content/Makefile.in +++ b/mozilla/xpinstall/res/content/Makefile.in @@ -36,5 +36,5 @@ EXPORT_RESOURCE_XPINSTALL = \ include $(topsrcdir)/config/rules.mk install:: - $(INSTALL) $(EXPORT_RESOURCE_XPINSTALL) $(DIST)/bin/chrome/xpinstall/content/default + $(INSTALL) $(EXPORT_RESOURCE_XPINSTALL) $(DIST)/bin/chrome/communicator/content/xpinstall diff --git a/mozilla/xpinstall/res/content/SoftwareUpdates.rdf b/mozilla/xpinstall/res/content/SoftwareUpdates.rdf index ae912abd128..86e22c97aea 100644 --- a/mozilla/xpinstall/res/content/SoftwareUpdates.rdf +++ b/mozilla/xpinstall/res/content/SoftwareUpdates.rdf @@ -25,6 +25,6 @@ xmlns:NC="http://home.netscape.com/NC-rdf#"> - + diff --git a/mozilla/xpinstall/res/content/institems.xul b/mozilla/xpinstall/res/content/institems.xul index f09543a2e13..b51fb84a08b 100644 --- a/mozilla/xpinstall/res/content/institems.xul +++ b/mozilla/xpinstall/res/content/institems.xul @@ -21,10 +21,10 @@ Contributor(s): Don Bragg (dbragg@netscape.com) --> - - + + - + - + diff --git a/mozilla/xpinstall/res/content/makefile.win b/mozilla/xpinstall/res/content/makefile.win index e4bebc36bb8..ab60a08d8b9 100644 --- a/mozilla/xpinstall/res/content/makefile.win +++ b/mozilla/xpinstall/res/content/makefile.win @@ -25,21 +25,21 @@ DEPTH=..\..\.. include <$(DEPTH)\config\rules.mak> install:: $(DLL) - $(MAKE_INSTALL) xpistatus.xul $(DIST)\bin\chrome\xpinstall\content\default - $(MAKE_INSTALL) xpistatus.js $(DIST)\bin\chrome\xpinstall\content\default - $(MAKE_INSTALL) institems.xul $(DIST)\bin\chrome\xpinstall\content\default - $(MAKE_INSTALL) institems.js $(DIST)\bin\chrome\xpinstall\content\default -# $(MAKE_INSTALL) updateNotification.xul $(DIST)\bin\chrome\xpinstall\content\default -# $(MAKE_INSTALL) SoftwareUpdate-Source-1.rdf $(DIST)\bin\chrome\xpinstall\content\default -# $(MAKE_INSTALL) SoftwareUpdates.rdf $(DIST)\bin\chrome\xpinstall\content\default + $(MAKE_INSTALL) xpistatus.xul $(DIST)\bin\chrome\communicator\content\xpinstall + $(MAKE_INSTALL) xpistatus.js $(DIST)\bin\chrome\communicator\content\xpinstall + $(MAKE_INSTALL) institems.xul $(DIST)\bin\chrome\communicator\content\xpinstall + $(MAKE_INSTALL) institems.js $(DIST)\bin\chrome\communicator\content\xpinstall +# $(MAKE_INSTALL) updateNotification.xul $(DIST)\bin\chrome\communicator\content\xpinstall +# $(MAKE_INSTALL) SoftwareUpdate-Source-1.rdf $(DIST)\bin\chrome\communicator\content\xpinstall +# $(MAKE_INSTALL) SoftwareUpdates.rdf $(DIST)\bin\chrome\communicator\content\xpinstall clobber:: - rm -f $(DIST)\bin\chrome\xpinstall\content\default\xpistatus.xul - rm -f $(DIST)\bin\chrome\xpinstall\content\default\xpistatus.js - rm -f $(DIST)\bin\chrome\xpinstall\content\default\institems.xul - rm -f $(DIST)\bin\chrome\xpinstall\content\default\institems.js -# rm -f $(DIST)\bin\chrome\xpinstall\content\default\updateNotification.xul -# rm -f $(DIST)\bin\chrome\xpinstall\content\default\SoftwareUpdate-Source-1.rdf -# rm -f $(DIST)\bin\chrome\xpinstall\content\default\SoftwareUpdates.rdf + rm -f $(DIST)\bin\chrome\communicator\content\xpinstall\xpistatus.xul + rm -f $(DIST)\bin\chrome\communicator\content\xpinstall\xpistatus.js + rm -f $(DIST)\bin\chrome\communicator\content\xpinstall\institems.xul + rm -f $(DIST)\bin\chrome\communicator\content\xpinstall\institems.js +# rm -f $(DIST)\bin\chrome\communicator\content\xpinstall\updateNotification.xul +# rm -f $(DIST)\bin\chrome\communicator\content\xpinstall\SoftwareUpdate-Source-1.rdf +# rm -f $(DIST)\bin\chrome\communicator\content\xpinstall\SoftwareUpdates.rdf diff --git a/mozilla/xpinstall/res/content/progress.xul b/mozilla/xpinstall/res/content/progress.xul index acf536a0f37..0c63fb0ed60 100644 --- a/mozilla/xpinstall/res/content/progress.xul +++ b/mozilla/xpinstall/res/content/progress.xul @@ -1,7 +1,7 @@ - + - - + + - + - + diff --git a/mozilla/xpinstall/res/locale/en-US/Makefile.in b/mozilla/xpinstall/res/locale/en-US/Makefile.in index c5ec77271fb..7f97f81e518 100644 --- a/mozilla/xpinstall/res/locale/en-US/Makefile.in +++ b/mozilla/xpinstall/res/locale/en-US/Makefile.in @@ -36,5 +36,5 @@ EXPORT_RESOURCE_XPINSTALL = \ include $(topsrcdir)/config/rules.mk install:: - $(INSTALL) $(EXPORT_RESOURCE_XPINSTALL) $(DIST)/bin/chrome/xpinstall/locale/en-US + $(INSTALL) $(EXPORT_RESOURCE_XPINSTALL) $(DIST)/bin/chrome/communicator/locale/xpinstall diff --git a/mozilla/xpinstall/res/locale/en-US/makefile.win b/mozilla/xpinstall/res/locale/en-US/makefile.win index 212aa8b5978..4ba37b09b0a 100644 --- a/mozilla/xpinstall/res/locale/en-US/makefile.win +++ b/mozilla/xpinstall/res/locale/en-US/makefile.win @@ -26,14 +26,14 @@ DEPTH=..\..\..\.. include <$(DEPTH)\config\rules.mak> install:: - $(MAKE_INSTALL) progress.dtd $(DIST)\bin\chrome\xpinstall\locale\en-US - $(MAKE_INSTALL) xpistatus.dtd $(DIST)\bin\chrome\xpinstall\locale\en-US - $(MAKE_INSTALL) xpinstall.properties $(DIST)\bin\chrome\xpinstall\locale\en-US - $(MAKE_INSTALL) institems.dtd $(DIST)\bin\chrome\xpinstall\locale\en-US + $(MAKE_INSTALL) progress.dtd $(DIST)\bin\chrome\communicator\locale\xpinstall + $(MAKE_INSTALL) xpistatus.dtd $(DIST)\bin\chrome\communicator\locale\xpinstall + $(MAKE_INSTALL) xpinstall.properties $(DIST)\bin\chrome\communicator\locale\xpinstall + $(MAKE_INSTALL) institems.dtd $(DIST)\bin\chrome\communicator\locale\xpinstall clobber:: - rm -f $(DIST)\bin\chrome\xpinstall\locale\en-US\progress.dtd - rm -f $(DIST)\bin\chrome\xpinstall\locale\en-US\xpistatus.dtd - rm -f $(DIST)\bin\chrome\xpinstall\locale\en-US\xpinstall.properties - rm -f $(DIST)\bin\chrome\xpinstall\locale\en-US\institems.dtd + rm -f $(DIST)\bin\chrome\communicator\locale\xpinstall\progress.dtd + rm -f $(DIST)\bin\chrome\communicator\locale\xpinstall\xpistatus.dtd + rm -f $(DIST)\bin\chrome\communicator\locale\xpinstall\xpinstall.properties + rm -f $(DIST)\bin\chrome\communicator\locale\xpinstall\institems.dtd diff --git a/mozilla/xpinstall/res/skin/Makefile.in b/mozilla/xpinstall/res/skin/Makefile.in index 5aa3e71dd0c..247331650b5 100644 --- a/mozilla/xpinstall/res/skin/Makefile.in +++ b/mozilla/xpinstall/res/skin/Makefile.in @@ -34,5 +34,5 @@ FILES = \ include $(topsrcdir)/config/rules.mk install:: - $(INSTALL) $(addprefix $(srcdir)/, $(FILES)) $(DIST)/bin/chrome/xpinstall/skin/default + $(INSTALL) $(addprefix $(srcdir)/, $(FILES)) $(DIST)/bin/chrome/communicator/skin/xpinstall diff --git a/mozilla/xpinstall/res/skin/Makefile.win b/mozilla/xpinstall/res/skin/Makefile.win index eb7e8f595d9..af143035553 100644 --- a/mozilla/xpinstall/res/skin/Makefile.win +++ b/mozilla/xpinstall/res/skin/Makefile.win @@ -25,8 +25,8 @@ DEPTH=..\..\.. include <$(DEPTH)\config\rules.mak> install:: $(DLL) - $(MAKE_INSTALL) xpinstall.css $(DIST)\bin\chrome\xpinstall\skin\default + $(MAKE_INSTALL) xpinstall.css $(DIST)\bin\chrome\communicator\skin\xpinstall clobber:: - rm -f $(DIST)\bin\chrome\xpinstall\skin\default\xpistall.css + rm -f $(DIST)\bin\chrome\communicator\skin\xpinstall\xpistall.css diff --git a/mozilla/xpinstall/src/nsInstall.cpp b/mozilla/xpinstall/src/nsInstall.cpp index 3b558296e30..23b178761b1 100644 --- a/mozilla/xpinstall/src/nsInstall.cpp +++ b/mozilla/xpinstall/src/nsInstall.cpp @@ -84,7 +84,7 @@ static NS_DEFINE_CID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID); static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); static NS_DEFINE_IID(kIStringBundleServiceIID, NS_ISTRINGBUNDLESERVICE_IID); -#define XPINSTALL_BUNDLE_URL "chrome://xpinstall/locale/xpinstall.properties" +#define XPINSTALL_BUNDLE_URL "chrome://communicator/locale/xpinstall/xpinstall.properties" // filename length maximums #ifdef XP_MAC diff --git a/mozilla/xpinstall/src/nsInstallProgressDialog.cpp b/mozilla/xpinstall/src/nsInstallProgressDialog.cpp index 6ac4b4b3213..0f6ca3596f0 100644 --- a/mozilla/xpinstall/src/nsInstallProgressDialog.cpp +++ b/mozilla/xpinstall/src/nsInstallProgressDialog.cpp @@ -162,7 +162,7 @@ nsInstallProgressDialog::Open(nsIDialogParamBlock* ioParamBlock) jsval *argv = JS_PushArguments( jsContext, &stackPtr, "sss%ip%ip", - "chrome://xpinstall/content/xpistatus.xul", + "chrome://communicator/content/xpinstall/xpistatus.xul", "_blank", "chrome", (const nsIID*)&NS_GET_IID(nsIDialogParamBlock), diff --git a/mozilla/xpinstall/src/nsUpdateNotification.h b/mozilla/xpinstall/src/nsUpdateNotification.h index af04d7ca2e7..e7dc07e14ec 100644 --- a/mozilla/xpinstall/src/nsUpdateNotification.h +++ b/mozilla/xpinstall/src/nsUpdateNotification.h @@ -44,7 +44,7 @@ #define NS_XPI_UPDATE_NOTIFIER_PROGID "component://mozilla/xpinstall/notifier" -#define BASE_DATASOURCE_URL "chrome://xpinstall/content/SoftwareUpdates.rdf" +#define BASE_DATASOURCE_URL "chrome://communicator/content/xpinstall/SoftwareUpdates.rdf" diff --git a/mozilla/xpinstall/src/nsXPInstallManager.cpp b/mozilla/xpinstall/src/nsXPInstallManager.cpp index daab8df4cd4..3937ce07844 100644 --- a/mozilla/xpinstall/src/nsXPInstallManager.cpp +++ b/mozilla/xpinstall/src/nsXPInstallManager.cpp @@ -63,7 +63,7 @@ static NS_DEFINE_CID(kDialogParamBlockCID, NS_DialogParamBlock_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -#define XPINSTALL_BUNDLE_URL "chrome://xpinstall/locale/xpinstall.properties" +#define XPINSTALL_BUNDLE_URL "chrome://communicator/locale/xpinstall/xpinstall.properties" nsXPInstallManager::nsXPInstallManager() : mTriggers(0), mItem(0), mNextItem(0), mNumJars(0), @@ -181,7 +181,7 @@ nsXPInstallManager::InitManager(nsXPITriggerInfo* aTriggers) jsval *argv = JS_PushArguments( jsContext, &stackPtr, "sss%ip", - "chrome://xpinstall/content/institems.xul", + "chrome://communicator/content/xpinstall/institems.xul", "_blank", "chrome,modal", (const nsIID*)(&NS_GET_IID(nsIDialogParamBlock)),