fix for #13366. remove the copies and folders pane from the preferences window. its in the account mananger now, on a per server basis.
git-svn-id: svn://10.0.0.236/trunk@46414 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -17,5 +17,4 @@
|
||||
#
|
||||
|
||||
pref-messages.xul
|
||||
pref-copiesfolders.xul
|
||||
pref-formatting.xul
|
||||
|
||||
@@ -26,7 +26,6 @@ SAMPLES_DIR = $(DIST)/bin/chrome/messengercompose/content/default
|
||||
|
||||
EXPORT_RESOURCE_SAMPLES = \
|
||||
pref-messages.xul \
|
||||
pref-copiesfolders.xul \
|
||||
pref-formatting.xul \
|
||||
$(NULL)
|
||||
|
||||
|
||||
@@ -22,10 +22,8 @@ include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install::
|
||||
$(MAKE_INSTALL) pref-messages.xul $(DIST)\bin\chrome\messengercompose\content\default
|
||||
$(MAKE_INSTALL) pref-copiesfolders.xul $(DIST)\bin\chrome\messengercompose\content\default
|
||||
$(MAKE_INSTALL) pref-formatting.xul $(DIST)\bin\chrome\messengercompose\content\default
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\chrome\messengercompose\content\default\pref-messages.xul
|
||||
rm -f $(DIST)\chrome\messengercompose\content\default\pref-copiesfolders.xul
|
||||
rm -f $(DIST)\chrome\messengercompose\content\default\pref-formatting.xul
|
||||
|
||||
@@ -1,66 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://global/skin/dialogs.css" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
|
||||
|
||||
<!DOCTYPE window SYSTEM "chrome://messengercompose/locale/pref-copiesfolders.dtd">
|
||||
|
||||
<window xmlns:html="http://www.w3.org/TR/REC-html40"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
onload="StartUp('Mailnews-Copies and Folders')" >
|
||||
|
||||
<html:script language="javascript" src="chrome://pref/content/PrefsWindow.js"/>
|
||||
|
||||
<html:div flex="100%">
|
||||
<html:div id="top">
|
||||
<html:span id="lefttext">&pane.title;</html:span>
|
||||
</html:div>
|
||||
|
||||
&sendMsg.label;
|
||||
<html:form>
|
||||
<html:table>
|
||||
<html:tr><html:td>
|
||||
<html:input type="checkbox" id="pref:0:bool:mail.use_fcc"/>&place.label;
|
||||
<html:input name="choose" type="button" value="&chooseFolder.label;"/>
|
||||
</html:td></html:tr>
|
||||
<html:tr><html:td>
|
||||
<html:input type="checkbox" id="pref:0:bool:mail.cc_self"/>&bccEmail.label;
|
||||
</html:td></html:tr>
|
||||
<html:tr><html:td>
|
||||
<html:input type="checkbox" id="pref:0:bool:mail.use_default_cc"/>&bccOther.label;
|
||||
<html:input name="bccother" id="pref:string:mail.default_cc" size="10"/>
|
||||
</html:td></html:tr>
|
||||
</html:table>
|
||||
</html:form>
|
||||
|
||||
&sendNews.label;
|
||||
<html:form>
|
||||
<html:table>
|
||||
<html:tr><html:td>
|
||||
<html:input type="checkbox" id="pref:0:bool:news.use_fcc"/>&place.label;
|
||||
<html:input name="choose" type="button" value="&chooseFolder.label;"/>
|
||||
</html:td></html:tr>
|
||||
<html:tr><html:td>
|
||||
<html:input type="checkbox" id="pref:0:bool:news.cc_self"/>&bccEmail.label;
|
||||
</html:td></html:tr>
|
||||
<html:tr><html:td>
|
||||
<html:input type="checkbox" id="pref:0:bool:news.use_default_cc"/>&bccOther.label;
|
||||
<html:input name="bccother" id="pref:string:news.default_cc" size="10"/>
|
||||
</html:td></html:tr>
|
||||
</html:table>
|
||||
</html:form>
|
||||
|
||||
&storage.label;
|
||||
<html:form>
|
||||
<html:table>
|
||||
<html:tr><html:td>&keepDraft.label;
|
||||
<html:input name="choose" type="button" value="&chooseFolder.label;"/>
|
||||
</html:td></html:tr>
|
||||
<html:tr><html:td>&keepTemplate.label;
|
||||
<html:input name="choose" type="button" value="&chooseFolder.label;"/>
|
||||
</html:td></html:tr>
|
||||
</html:table>
|
||||
</html:form>
|
||||
|
||||
</html:div>
|
||||
</window>
|
||||
@@ -17,5 +17,4 @@
|
||||
#
|
||||
|
||||
pref-messages.dtd
|
||||
pref-copiesfolders.dtd
|
||||
pref-formatting.dtd
|
||||
|
||||
@@ -26,7 +26,6 @@ SAMPLES_DIR = $(DIST)/bin/chrome/messengercompose/locale/en-US
|
||||
|
||||
EXPORT_RESOURCE_SAMPLES = \
|
||||
pref-messages.dtd \
|
||||
pref-copiesfolders.dtd \
|
||||
pref-formatting.dtd \
|
||||
$(NULL)
|
||||
|
||||
|
||||
@@ -23,10 +23,8 @@ DISTBROWSER=$(DIST)\bin\chrome\messengercompose\locale\en-US
|
||||
|
||||
install::
|
||||
$(MAKE_INSTALL) pref-messages.dtd $(DISTBROWSER)
|
||||
$(MAKE_INSTALL) pref-copiesfolders.dtd $(DISTBROWSER)
|
||||
$(MAKE_INSTALL) pref-formatting.dtd $(DISTBROWSER)
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\bin\chrome\messengercompose\locale\en-US\pref-messages.dtd
|
||||
rm -f $(DIST)\bin\chrome\messengercompose\locale\en-US\pref-copiesfolders.dtd
|
||||
rm -f $(DIST)\bin\chrome\messengercompose\locale\en-US\pref-formatting.dtd
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
<!--
|
||||
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 window.title "Copies and Folders">
|
||||
<!ENTITY pane.title "Copies and Folders">
|
||||
<!ENTITY sendMsg.label "When sending a mail message, automatically">
|
||||
<!ENTITY sendNews.label "When sending a newsgroup message, automatically">
|
||||
<!ENTITY place.label "Place a copy in FOLDER">
|
||||
<!ENTITY bccEmail.label "BCC: EMAIL">
|
||||
<!ENTITY bccOther.label "BCC Other address:">
|
||||
<!ENTITY senNews.label "When sending a newsgroup message, automatically">
|
||||
<!ENTITY storage.label "Storage for Drafts and Templates">
|
||||
<!ENTITY keepDraft.label "Keep Draft in FOLDER">
|
||||
<!ENTITY keepTemplate.label "Keep Templates in FOLDER">
|
||||
<!ENTITY chooseFolder.label "Choose Folder...">
|
||||
@@ -142,12 +142,6 @@
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
<treeitem open="true">
|
||||
<treerow>
|
||||
<treecell name="chrome://messengercompose/content/pref-copiesfolders.xul"><treeindentation/>©Folder.label;</treecell>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
<treeitem open="true">
|
||||
<treerow>
|
||||
<treecell name="chrome://messengercompose/content/pref-formatting.xul"><treeindentation/>&format.label;</treecell>
|
||||
|
||||
@@ -142,12 +142,6 @@
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
<treeitem open="true">
|
||||
<treerow>
|
||||
<treecell name="chrome://messengercompose/content/pref-copiesfolders.xul"><treeindentation/>©Folder.label;</treecell>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
<treeitem open="true">
|
||||
<treerow>
|
||||
<treecell name="chrome://messengercompose/content/pref-formatting.xul"><treeindentation/>&format.label;</treecell>
|
||||
|
||||
Reference in New Issue
Block a user