Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-19 09:30:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove pref-languages panel, collapsing it in to "compose" and "Display Messages".

Browse Source 
empty out tasksOverlay.xul. We don't use it anymore but someone else (in a file we don't fork)
may try to load it.
This commit is contained in:
scott%scott-macgregor.org 2003-04-15 02:24:45 +00:00
parent a04d6a5b54
commit d056b08390
9 changed files with 94 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail/base/content/messageWindow.xul
View File

@ -81,7 +81,7 @@ Rights Reserved.
<commandset id="mailLabelMenuItems"/>
<commandset id="mailToolsMenuItems"/>
<commandset id="mailEditContextMenuItems"/>
<commandset id="tasksCommands"/>
<commandset id="tasksCommands"/>
<commandset id="commandKeys"/>
</commandset>

50
mail/base/content/tasksOverlay.xul
View File

@ -1,50 +0,0 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://communicator/skin/tasksOverlay.css" type="text/css"?>
<!DOCTYPE overlay [
<!ENTITY % tasksDTD SYSTEM "chrome://communicator/locale/tasksOverlay.dtd" >
%tasksDTD;
]>
<overlay id="tasksOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/x-javascript" src="chrome://communicator/content/tasksOverlay.js"/>
<keyset id="tasksKeys">
</keyset>
<commandset id="tasksCommands">
</commandset>
<!-- Tasks Menu -->
<menu id="tasksMenu" label="&tasksMenu.label;" accesskey="&tasksMenu.accesskey;">
<menupopup id="taskPopup">
<menuitem label="&javaScriptConsoleCmd.label;" accesskey="&javaScriptConsoleCmd.accesskey;" oncommand="toJavaScriptConsole();"/>
</menupopup>
</menu>
<menu id="windowMenu" label="&windowMenu.label;" accesskey="&windowMenu.accesskey;"
datasources="rdf:window-mediator" ref="NC:WindowMediatorRoot"
onpopupshown="checkFocusedWindow();">
<template>
<rule>
<menupopup>
<menuitem uri="rdf:*" label="rdf:http://home.netscape.com/NC-rdf#KeyIndex rdf:http://home.netscape.com/NC-rdf#Name" type="radio"
oncommand="ShowWindowFromResource(event.target)" accesskey="rdf:http://home.netscape.com/NC-rdf#KeyIndex"/>
</menupopup>
</rule>
</template>
<menupopup id="windowPopup">
</menupopup>
</menu>
<statusbarpanel id="component-bar" persist="collapsed">
<toolbarbutton class="taskbutton" id="mini-nav" oncommand="toNavigator();"
tooltiptext="&taskNavigator.tooltip;"/>
</statusbarpanel>
</overlay>

45
mail/base/content/utilityOverlay.xul
View File

@ -131,10 +131,6 @@
commandupdater="true"
events="clipboard"
oncommandupdate="goUpdatePasteMenuItems()"/>
<commandset id="findTypeMenuItems"
commandupdater="true"
events="focus"
oncommandupdate="goUpdateFindTypeMenuItems()"/>
<command id="cmd_copyLink"
oncommand="goDoCommand('cmd_copyLink')"
@ -167,10 +163,6 @@
<command id="cmd_selectAll"
oncommand="goDoCommand('cmd_selectAll')"
disabled="true"/>
<command id="cmd_findTypeText"
oncommand="goDoCommand('cmd_findTypeText')"/>
<command id="cmd_findTypeLinks"
oncommand="goDoCommand('cmd_findTypeLinks')"/>
<!-- Not needed yet, window will need this: -->
<!-- broadcaster id="cmd_preferences"/ -->
@ -184,42 +176,5 @@
<menu id="menu_View"
label="&viewMenu.label;"
accesskey="&viewMenu.accesskey;"/>
<menu id="menu_Toolbars"
label="&viewToolbarsMenu.label;"
accesskey="&viewToolbarsMenu.accesskey;"/>
<menuitem id="menu_showTaskbar"
label="&showTaskbarCmd.label;"
accesskey="&showTaskbarCmd.accesskey;"
oncommand="goToggleToolbar('status-bar', 'menu_showTaskbar')"
checked="true"/>
<!-- Help Menu -->
<menu id="menu_Help"
label="&helpMenu.label;"
accesskey="&helpMenu.accesskey;">
<menupopup id="helpPopup">
<menuitem accesskey="&releaseCmd.accesskey;"
label="&releaseCmd.label;"
id="releaseUrl"
oncommand="openTopWin('&releaseURL;');"/>
<menuseparator id="menu_HelpAboutSeparator"/>
<menuitem class="about"
accesskey="&aboutCommPluginsCmd.accesskey;"
label="&aboutCommPluginsCmd.label;"
id="pluginInfo"
oncommand="openTopWin('about:plugins')"/>
<menuitem accesskey="&aboutCmd.accesskey;"
label="&aboutCmd.label;"
id="aboutName"
oncommand="goAboutDialog();"/>
</menupopup>
</menu>
<!-- Toolbar boxes -->
<hbox id="toolbar_button_box"
flex="100%"/>
</overlay>

26
mail/components/prefwindow/content/pref-composing_messages.xul
View File

@ -11,7 +11,7 @@
<script type="application/x-javascript">
<![CDATA[
var _elementIDs = ["forwardMessageMode", "autoQuote", "replyOnTop", "spellCheckBeforeSend", "strictlyMime",
"wrapLength", "mailWarnOnSendAccelKey"];
"wrapLength", "mailWarnOnSendAccelKey", "sendDefaultCharsetList"];
var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
observerService.notifyObservers(null, "charsetmenu-selected", "mailedit");
@ -95,4 +95,28 @@
<label value="&char.label;"/>
</hbox>
</groupbox>
<!-- Default language for compose -->
<groupbox align="start">
<caption label="&languagesTitle.label;"/>
<hbox align="center">
<label value="&composingDescription.label;"/>
</hbox>
<separator class="thin"/>
<hbox align="center">
<label control="sendDefaultCharsetList"
value="&sendDefaultCharset.label;" accesskey="&sendDefaultCharset.accesskey;" page="sendDefaultCharsetList"/>
<menulist id="sendDefaultCharsetList" ref="NC:MaileditCharsetMenuRoot" datasources="rdf:charset-menu"
preftype="localizedstring" prefstring="mailnews.send_default_charset">
<template>
<menupopup>
<menuitem label="rdf:http://home.netscape.com/NC-rdf#Name" value="..." uri="..."/>
</menupopup>
</template>
</menulist>
</hbox>
</groupbox>
</page>

101
mail/components/prefwindow/content/pref-languages.xul
View File

@ -1,101 +0,0 @@
<?xml version="1.0"?>
<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Mozilla Communicator.
-
- The Initial Developer of the Original Code is Netscape Communications Corp.
- Portions created by the Initial Developer are Copyright (C) 2002
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
- Sean Su <ssu@netscape.com>
- Scott MacGregor <mscott@netscape.com>
-
- Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"), or
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the LGPL or the GPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/prefPanels.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-languages.dtd">
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="parent.initPanel('chrome://messenger/content/pref-languages.xul');"
headertitle="&pane.title;">
<script type="application/x-javascript">
<![CDATA[
var _elementIDs = ["viewDefaultCharsetList", "sendDefaultCharsetList", "forceCharsetOverride"];
var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
observerService.notifyObservers(null, "charsetmenu-selected", "other");
]]>
</script>
<groupbox align="start">
<caption label="&readingTitle.label;"/>
<hbox align="center">
<label control="viewDefaultCharsetList"
value="&viewDefaultCharset.label;" accesskey="&viewDefaultCharset.accesskey;" page="viewDefaultCharsetList"/>
<menulist id="viewDefaultCharsetList" ref="NC:DecodersRoot" datasources="rdf:charset-menu"
preftype="localizedstring" prefstring="mailnews.view_default_charset">
<template>
<menupopup>
<menuitem label="rdf:http://home.netscape.com/NC-rdf#Name" value="..." uri="..."/>
</menupopup>
</template>
</menulist>
</hbox>
<separator class="thin"/>
<checkbox id="forceCharsetOverride" label="&forceCharsetOverride.label;"
accesskey="&forceCharsetOverride.accesskey;" prefstring="mailnews.force_charset_override"/>
</groupbox>
<groupbox align="start">
<caption label="&composingTitle.label;"/>
<hbox align="center">
<label value="&composingDescription.label;"/>
</hbox>
<separator class="thin"/>
<hbox align="center">
<label control="sendDefaultCharsetList"
value="&sendDefaultCharset.label;" accesskey="&sendDefaultCharset.accesskey;" page="sendDefaultCharsetList"/>
<menulist id="sendDefaultCharsetList" ref="NC:MaileditCharsetMenuRoot" datasources="rdf:charset-menu"
preftype="localizedstring" prefstring="mailnews.send_default_charset">
<template>
<menupopup>
<menuitem label="rdf:http://home.netscape.com/NC-rdf#Name" value="..." uri="..."/>
</menupopup>
</template>
</menulist>
</hbox>
</groupbox>
</page>

5
mail/components/prefwindow/content/preftree.xul
View File

@ -90,11 +90,6 @@
<treecell url="chrome://messenger/content/pref-labels.xul" label="&labels.label;"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell url="chrome://messenger/content/pref-languages.xul" label="&languages.label;"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell url="chrome://messenger/content/pref-receipts.xul" label="&return.label;"/>

4
mail/components/prefwindow/jar.mn
View File

@ -1,10 +1,8 @@
messenger.jar:
+ content/messenger/messengercompose/pref-formatting.xul (content/pref-formatting.xul)
+ content/messenger/messengercompose/pref-composing_messages.xul (content/pref-composing_messages.xul)
+ content/messenger/messengercompose/pref-composing_messages.xul (content/pref-composing_messages.xul)
+ content/messenger/messengercompose/pref-viewing_messages.xul (content/pref-viewing_messages.xul)
+ content/messenger/pref-mailnews.xul (content/pref-mailnews.xul)
content/messenger/pref-languages.xul (content/pref-languages.xul)
content/messenger/pref-privacy.xul (content/pref-privacy.xul)
content/messenger/preftree.xul (content/preftree.xul)
@ -14,10 +12,10 @@ comm.jar:
en-US.jar:
+ locale/en-US/communicator/pref/pref-fonts.dtd (locale/pref-fonts.dtd)
+ locale/en-US/messenger/messengercompose/pref-formatting.dtd (locale/pref-formatting.dtd)
+ locale/en-US/messenger/messengercompose/pref-composing_messages.dtd (locale/pref-composing_messages.dtd)
+ locale/en-US/messenger/pref-mailnews.dtd (locale/pref-mailnews.dtd)
+ locale/en-US/messenger/mailPrefsOverlay.dtd (locale/mailPrefsOverlay.dtd)
+ locale/en-US/messenger/pref-viewing_messages.dtd (locale/pref-viewing_messages.dtd)
+ locale/en-US/messenger/AccountManager.dtd (locale/AccountManager.dtd)
locale/en-US/messenger/pref-languages.dtd (locale/pref-languages.dtd)
locale/en-US/messenger/pref-privacy.dtd (locale/pref-privacy.dtd)

67
mail/components/prefwindow/locale/pref-composing_messages.dtd Normal file
View File

@ -0,0 +1,67 @@
<!--
The contents of this file are subject to the Netscape Public
License Version 1.1 (the "License"); you may not use this file
except in compliance with the License. You may obtain a copy of
the License at http://www.mozilla.org/NPL/
Software distributed under the License is distributed on an "AS
IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
implied. See the License for the specific language governing
rights and limitations under the License.
The Original Code is Mozilla Communicator client code, released
March 31, 1998.
The Initial Developer of the Original Code is Netscape
Communications Corporation. Portions created by Netscape are
Copyright (C) 1998-1999 Netscape Communications Corporation. All
Rights Reserved.
-->
<!ENTITY pane.title "Composition">
<!ENTITY pane.description "Composing mail messages">
<!ENTITY forwardReply.label "Forwarding and Replying to Messages">
<!ENTITY forwardMsg.label "Forward messages:">
<!ENTITY forwardMsg.accesskey "f">
<!ENTITY inline.label "Inline">
<!ENTITY inline.accesskey "I">
<!ENTITY quoted.label "Quoted">
<!ENTITY quoted.accesskey "q">
<!ENTITY asAttachment.label "As Attachment">
<!ENTITY asAttachment.accesskey "A">
<!ENTITY autoQuote.label "Automatically quote the original message when replying">
<!ENTITY autoQuote.accesskey "A">
<!-- LOCALIZATION NOTE (then.label): This will concatenate with the 4 strings that follow. -->
<!ENTITY then.label "Then,">
<!ENTITY then.accesskey "t">
<!ENTITY aboveQuote.label "start my reply above the quoted text">
<!ENTITY aboveQuote.accesskey "v">
<!ENTITY belowQuote.label "start my reply below the quoted text">
<!ENTITY belowQuote.accesskey "b">
<!ENTITY selectAndQuote.label "select the quoted text">
<!ENTITY selectAndQuote.accesskey "e">
<!ENTITY warnOnSendAccelKey.label "Confirm when using keyboard shortcut to send message">
<!ENTITY warnOnSendAccelKey.accesskey "C">
<!ENTITY readingMessagesHeader.label "For incoming messages">
<!ENTITY messageWrapping.label "Message Wrapping">
<!ENTITY wrapInMsg.label "Wrap plain text messages to fit window width">
<!ENTITY wrapInMsg.accesskey "w">
<!ENTITY sendingMessagesHeader.label "Composing Messages">
<!ENTITY spellCheck.label "Check spelling before sending">
<!ENTITY spellCheck.accesskey "c">
<!-- LOCALIZATION NOTE (wrapOutMsg.label): This will concatenate with "xxx characters", using a number and (char.label). -->
<!ENTITY wrapOutMsg.label "Wrap plain text messages at">
<!ENTITY wrapOutMsg.accesskey "l">
<!ENTITY char.label "characters">
<!ENTITY use8Bits.label "Send messages that use 8-bit characters">
<!ENTITY asIs.label "As is (does not work well with some mail servers)">
<!ENTITY asIs.accesskey "t">
<!ENTITY useMIME.label "For messages that contain 8-bit characters, use 'quoted printable' MIME encoding. Leave unchecked to send the messages as is.">
<!ENTITY useMIME.accesskey "o">
<!ENTITY sendDefaultCharset.label "Character Coding:">
<!ENTITY sendDefaultCharset.accesskey "h">
<!ENTITY languagesTitle.label "Languages">
<!ENTITY composingDescription.label "When composing messages, use the following default:">

50
mail/components/prefwindow/locale/pref-languages.dtd
View File

@ -1,50 +0,0 @@
<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Mozilla Communicator.
-
- The Initial Developer of the Original Code is Netscape Communications Corp.
- Portions created by the Initial Developer are Copyright (C) 2002
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
- Sean Su <ssu@netscape.com>
-
- Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"), or
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the LGPL or the GPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
<!ENTITY pane.title "Languages">
<!ENTITY readingTitle.label "Reading Messages">
<!ENTITY readingDescription.label "When reading messages, use the following defaults:">
<!ENTITY viewDefaultCharset.label "Character Coding:">
<!ENTITY viewDefaultCharset.accesskey "r">
<!ENTITY forceCharsetOverride.label "Apply default to all messages (ignore character coding specified by MIME header)">
<!ENTITY forceCharsetOverride.accesskey "A">
<!ENTITY composingTitle.label "Composing messages">
<!ENTITY composingDescription.label "When composing messages, use the following default:">
<!ENTITY sendDefaultCharset.label "Character Coding:">
<!ENTITY sendDefaultCharset.accesskey "h">