Bug 1448600 - Remove the customizeToolbar overlay. r=jorgk
--- a/common/src/customizeToolbar.xul
+++ b/common/src/customizeToolbar.xul
@@ -20,27 +20,33 @@
<?xml-stylesheet href="chrome://communicator/skin/customizeToolbar.css" type="text/css"?>
#else
<?xml-stylesheet href="chrome://messenger/content/customizeToolbar.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/customizeToolbar.css" type="text/css"?>
#endif
<window id="CustomizeToolbarWindow"
title="&dialog.title;"
+#ifdef MOZ_SUITE
onload="onLoad();"
+#else
+ windowtype="mailnews:customizeToolbar"
+ onload="overlayOnLoad();"
+#endif
onunload="onUnload();"
style="&dialog.dimensions;"
persist="width height"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
#ifdef MOZ_SUITE
<script type="application/javascript" src="chrome://communicator/content/customizeToolbar.js"/>
<stringbundle id="stringBundle" src="chrome://communicator/locale/customizeToolbar.properties"/>
#else
<script type="application/javascript" src="chrome://messenger/content/customizeToolbar.js"/>
+<script type="application/javascript" src="chrome://messenger/content/mailCore.js"/>
<stringbundle id="stringBundle" src="chrome://messenger/locale/customizeToolbar.properties"/>
#endif
<keyset id="CustomizeToolbarKeyset">
<key id="cmd_close1" keycode="VK_ESCAPE" oncommand="onClose();"/>
<key id="cmd_close2" keycode="VK_RETURN" oncommand="onClose();"/>
</keyset>
@@ -51,21 +57,30 @@
<vbox flex="1" id="palette-box"
ondragstart="onToolbarDragStart(event)"
ondragover="onPaletteDragOver(event)"
ondrop="onPaletteDrop(event)"/>
<box align="center">
<label value="&show.label;"/>
- <menulist id="modelist" value="icons" oncommand="updateToolbarMode(this.value);">
+ <menulist id="modelist"
+ value="icons"
+#ifdef MOZ_SUITE
+ oncommand="updateToolbarMode(this.value);">
+#else
+ oncommand="overlayUpdateToolbarMode(this.value, 'mail-toolbox');">
+#endif
<menupopup id="modelistpopup">
<menuitem id="modefull" value="full" label="&iconsAndText.label;"/>
<menuitem id="modeicons" value="icons" label="&icons.label;"/>
<menuitem id="modetext" value="text" label="&text.label;"/>
+#ifndef MOZ_SUITE
+ <menuitem id="textbesideiconItem" value="textbesideicon" label="&iconsBesideText.label;"/>
+#endif
</menupopup>
</menulist>
<checkbox id="smallicons" oncommand="updateIconSize(this.checked ? 'small' : 'large');" label="&useSmallIcons.label;"/>
<button id="newtoolbar" label="&addNewToolbar.label;" oncommand="addNewToolbar();" icon="add"/>
<button id="restoreDefault" label="&restoreDefaultSet.label;" oncommand="restoreDefaultSet();" icon="revert"/>
</box>
deleted file mode 100644
--- a/mail/base/content/customizeToolbarOverlay.xul
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE overlay [
-<!ENTITY % customizeToolbarDTD SYSTEM "chrome://messenger/locale/customizeToolbar.dtd">
- %customizeToolbarDTD;
- <!ENTITY % customizeToolbarOverlayDTD SYSTEM "chrome://messenger/locale/customizeToolbarOverlay.dtd">
- %customizeToolbarOverlayDTD;
-]>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this
- - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<overlay id="CustomizeToolbarWindowOverlay"
- xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
- <script type="application/javascript"
- src="chrome://messenger/content/mailCore.js"/>
-
- <menulist id="modelist"
- oncommand="overlayUpdateToolbarMode(this.value, 'mail-toolbox');"/>
-
- <window id="CustomizeToolbarWindow"
- windowtype="mailnews:customizeToolbar"
- onload="overlayOnLoad();">
- <data id="iconsBesideText.label"
- value="&iconsBesideText.label;"/>
- </window>
-</overlay>
deleted file mode 100644
--- a/mail/base/content/downloadsOverlay.xul
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this
- - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!DOCTYPE overlay [
-<!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/downloadsOverlay.dtd">
- %messengerDTD;
-]>
-
-<overlay id="DownloadsOverlay"
- xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
- <window id="downloadManager"
- title="&savedFiles.title;"/>
-</overlay>
--- a/mail/base/jar.mn
+++ b/mail/base/jar.mn
@@ -50,17 +50,16 @@ messenger.jar:
* content/messenger/bindings.css (content/bindings.css)
content/messenger/nsDragAndDrop.js (content/nsDragAndDrop.js)
content/messenger/editContactOverlay.js (content/editContactOverlay.js)
* content/messenger/editContactOverlay.xul (content/editContactOverlay.xul)
content/messenger/msgMail3PaneWindow.js (content/msgMail3PaneWindow.js)
content/messenger/mail3PaneWindowCommands.js (content/mail3PaneWindowCommands.js)
content/messenger/mailCommands.js (content/mailCommands.js)
content/messenger/mailCore.js (content/mailCore.js)
- content/messenger/customizeToolbarOverlay.xul (content/customizeToolbarOverlay.xul)
content/messenger/mailTabs.js (content/mailTabs.js)
content/messenger/commandglue.js (content/commandglue.js)
* content/messenger/SearchDialog.xul (content/SearchDialog.xul)
content/messenger/SearchDialog.js (content/SearchDialog.js)
* content/messenger/ABSearchDialog.xul (content/ABSearchDialog.xul)
content/messenger/ABSearchDialog.js (content/ABSearchDialog.js)
content/messenger/FilterListDialog.xul (content/FilterListDialog.xul)
content/messenger/FilterListDialog.js (content/FilterListDialog.js)
@@ -108,17 +107,16 @@ messenger.jar:
content/messenger/glodaFacetView.js (content/glodaFacetView.js)
content/messenger/glodaFacetView.css (content/glodaFacetView.css)
content/messenger/glodaFacetBindings.css (content/glodaFacetBindings.css)
content/messenger/glodaFacetBindings.xml (content/glodaFacetBindings.xml)
content/messenger/glodaFacetVis.js (content/glodaFacetVis.js)
content/messenger/quickFilterBar.xul (content/quickFilterBar.xul)
content/messenger/quickFilterBar.js (content/quickFilterBar.js)
content/messenger/quickFilterBar.css (content/quickFilterBar.css)
- content/messenger/downloadsOverlay.xul (content/downloadsOverlay.xul)
content/messenger/browserRequest.js (content/browserRequest.js)
content/messenger/browserRequest.xul (content/browserRequest.xul)
* content/messenger/safeMode.xul (content/safeMode.xul)
content/messenger/safeMode.js (content/safeMode.js)
content/messenger/sanitize.xul (content/sanitize.xul)
content/messenger/sanitize.js (content/sanitize.js)
content/messenger/sanitizeDialog.css (content/sanitizeDialog.css)
content/messenger/sanitizeDialog.js (content/sanitizeDialog.js)
@@ -133,12 +131,8 @@ messenger.jar:
comm.jar:
% content communicator %content/communicator/
content/communicator/charsetOverlay.xul (content/charsetOverlay.xul)
content/communicator/contentAreaClick.js (content/contentAreaClick.js)
content/communicator/labelsencodings.properties (/@mozreltopsrcdir@/dom/encoding/labelsencodings.properties)
* content/communicator/utilityOverlay.xul (content/utilityOverlay.xul)
content/communicator/utilityOverlay.js (content/utilityOverlay.js)
-
-toolkit.jar:
-% overlay chrome://messenger/content/customizeToolbar.xul chrome://messenger/content/customizeToolbarOverlay.xul
-% overlay chrome://mozapps/content/downloads/downloads.xul chrome://messenger/content/downloadsOverlay.xul
--- a/mail/locales/en-US/chrome/messenger/customizeToolbar.dtd
+++ b/mail/locales/en-US/chrome/messenger/customizeToolbar.dtd
@@ -4,13 +4,14 @@
<!ENTITY dialog.title "Customize Toolbar">
<!ENTITY dialog.dimensions "width: 92ch; height: 36em;">
<!ENTITY instructions.description "You can add or remove items by dragging to or from the toolbars.">
<!ENTITY show.label "Show:">
<!ENTITY iconsAndText.label "Icons and Text">
<!ENTITY icons.label "Icons">
<!ENTITY text.label "Text">
+<!ENTITY iconsBesideText.label "Icons beside Text">
<!ENTITY useSmallIcons.label "Use Small Icons">
<!ENTITY restoreDefaultSet.label "Restore Default Set">
<!ENTITY addNewToolbar.label "Add New Toolbar">
<!ENTITY saveChanges.label "Done">
<!ENTITY undoChanges.label "Undo Changes">
deleted file mode 100644
--- a/mail/locales/en-US/chrome/messenger/customizeToolbarOverlay.dtd
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this
- - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY iconsBesideText.label "Icons beside Text">
deleted file mode 100644
--- a/mail/locales/en-US/chrome/messenger/downloadsOverlay.dtd
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this
- - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY savedFiles.title "Saved Files">
--- a/mail/locales/jar.mn
+++ b/mail/locales/jar.mn
@@ -30,17 +30,16 @@
locale/@AB_CD@/messenger/systemIntegrationDialog.dtd (%chrome/messenger/systemIntegrationDialog.dtd)
locale/@AB_CD@/messenger/virtualFolderProperties.dtd (%chrome/messenger/virtualFolderProperties.dtd)
locale/@AB_CD@/messenger/virtualFolderListDialog.dtd (%chrome/messenger/virtualFolderListDialog.dtd)
locale/@AB_CD@/messenger/multimessageview.properties (%chrome/messenger/multimessageview.properties)
locale/@AB_CD@/messenger/multimessageview.dtd (%chrome/messenger/multimessageview.dtd)
locale/@AB_CD@/messenger/mailOverlay.dtd (%chrome/messenger/mailOverlay.dtd)
locale/@AB_CD@/messenger/messenger.dtd (%chrome/messenger/messenger.dtd)
locale/@AB_CD@/messenger/viewZoomOverlay.dtd (%chrome/messenger/viewZoomOverlay.dtd)
- locale/@AB_CD@/messenger/customizeToolbarOverlay.dtd (%chrome/messenger/customizeToolbarOverlay.dtd)
locale/@AB_CD@/messenger/baseMenuOverlay.dtd (%chrome/messenger/baseMenuOverlay.dtd)
locale/@AB_CD@/messenger/tabmail.dtd (%chrome/messenger/tabmail.dtd)
locale/@AB_CD@/messenger/msgAccountCentral.dtd (%chrome/messenger/msgAccountCentral.dtd)
locale/@AB_CD@/messenger/SearchDialog.dtd (%chrome/messenger/SearchDialog.dtd)
locale/@AB_CD@/messenger/AccountManager.dtd (%chrome/messenger/AccountManager.dtd)
locale/@AB_CD@/messenger/AccountWizard.dtd (%chrome/messenger/AccountWizard.dtd)
locale/@AB_CD@/messenger/am-advanced.dtd (%chrome/messenger/am-advanced.dtd)
locale/@AB_CD@/messenger/am-server-advanced.dtd (%chrome/messenger/am-server-advanced.dtd)
@@ -195,17 +194,16 @@
locale/@AB_CD@/messenger/searchIntegrationWin.dtd (%chrome/messenger/searchIntegrationWin.dtd)
locale/@AB_CD@/messenger/searchIntegrationMac.dtd (%chrome/messenger/searchIntegrationMac.dtd)
locale/@AB_CD@/messenger/searchIntegrationDefault.dtd (%chrome/messenger/searchIntegrationDefault.dtd)
locale/@AB_CD@/messenger/activity.dtd (%chrome/messenger/activity.dtd)
locale/@AB_CD@/messenger/activity.properties (%chrome/messenger/activity.properties)
locale/@AB_CD@/messenger/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd)
locale/@AB_CD@/messenger/netError.dtd (%chrome/overrides/netError.dtd)
locale/@AB_CD@/messenger/newsError.dtd (%chrome/messenger/newsError.dtd)
- locale/@AB_CD@/messenger/downloadsOverlay.dtd (%chrome/messenger/downloadsOverlay.dtd)
locale/@AB_CD@/messenger/chat.dtd (%chrome/messenger/chat.dtd)
locale/@AB_CD@/messenger/chat.properties (%chrome/messenger/chat.properties)
locale/@AB_CD@/messenger/addbuddy.dtd (%chrome/messenger/addbuddy.dtd)
locale/@AB_CD@/messenger/joinChat.dtd (%chrome/messenger/joinChat.dtd)
locale/@AB_CD@/messenger/imAccounts.properties (%chrome/messenger/imAccounts.properties)
locale/@AB_CD@/messenger/imAccountWizard.dtd (%chrome/messenger/imAccountWizard.dtd)
locale/@AB_CD@/messenger/sanitize.dtd (%chrome/messenger/sanitize.dtd)
locale/@AB_CD@/messenger/searchplugins/list.json (.deps/generated_@AB_CD@/list.json)
