Bug 196272 Remove edit>preferences>mailandnewsgroups>windows
p=me r=mnyromyr/neil.parkwaycc.co.uk sr=bienvenu a=asa
This commit is contained in:
bugzilla%arlen.demon.co.uk
Родитель
0b3a73058f
Коммит
8e32ad6218
|
|
@ -485,7 +485,6 @@ nc:link="chrome://help/locale/nav_help.xhtml#plugins_and_downloads"/> </rdf:li>
|
|||
<nc:subheadings>
|
||||
<rdf:Seq>
|
||||
<rdf:li> <rdf:Description ID="mail_prefs_general" nc:name="Mail and Newsgroups" nc:link="mail_help.xhtml#mail_and_newsgroups"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description ID="mail_prefs_windows" nc:name="Windows" nc:link="mail_help.xhtml#windows"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description ID="mail_prefs_display" nc:name="Message Display" nc:link="mail_help.xhtml#message_display"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description ID="mail_prefs_notifications" nc:name="Notifications" nc:link="mail_help.xhtml#notifications"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description ID="mail_prefs_messages" nc:name="Composition" nc:link="mail_help.xhtml#composition"/> </rdf:li>
|
||||
|
|
|
|||
|
|
@ -444,9 +444,10 @@
|
|||
<ul>
|
||||
<li>Open the View menu and choose Show/Hide to show or hide the Mail toolbar,
|
||||
search bar, or the status bar.</li>
|
||||
<li>Open the View menu and choose Layout to select the type of three-pane
|
||||
window layout to use.</li>
|
||||
<li>Expand and collapse any pane to switch between a three-pane or two-pane
|
||||
view. Choose a <a href="#windows">default view</a> in the Mail and
|
||||
Newsgroups Preferences panel.</li>
|
||||
view.</li>
|
||||
</ul>
|
||||
|
||||
<p>[<a href="#reading_messages">Return to beginning of section</a>]</p>
|
||||
|
|
@ -469,6 +470,13 @@
|
|||
column.</li>
|
||||
</ul>
|
||||
|
||||
<p>To change which columns are displayed, begin from the Mail window:</p>
|
||||
|
||||
<ul>
|
||||
<li>Click the Show/Hide Columns icon <img src="images/columns.png" alt=""/>
|
||||
and select the column to be added/removed from the list.</li>
|
||||
</ul>
|
||||
|
||||
<p>To group messages by threading (subject), so each message is grouped with
|
||||
all its responses:</p>
|
||||
|
||||
|
|
@ -534,17 +542,18 @@
|
|||
<h2 id="controlling_images_scripts_and_plug-ins">Controlling Images, Scripts,
|
||||
and Plug-ins</h2>
|
||||
|
||||
<p>By default, you can view remote images in the mail messages you receive.
|
||||
To avoid downloading images embedded in web pages sent as message
|
||||
attachments:</p>
|
||||
<p>By default, remote images and other remote content are displayed in
|
||||
messages you receive. To avoid downloading images and other content
|
||||
embedded in web pages sent as message attachments:</p>
|
||||
|
||||
<ol>
|
||||
<li>Open the <span class="mac">&brandShortName;</span>
|
||||
<span class="noMac">Edit</span> menu and choose Preferences.</li>
|
||||
<li>Under the Privacy & Security category, click Images. (If no
|
||||
subcategories are visible, double-click Privacy & Security to
|
||||
<li>Under the Mail & Newsgroups category, click Message Display. (If
|
||||
no subcategories are visible, double-click Mail & Newsgroups to
|
||||
expand the list.)</li>
|
||||
<li>Check <q>Do not load remote images in Mail & Newsgroup messages</q>.</li>
|
||||
<li>Uncheck <q>Allow messages to load and display remote images and other
|
||||
content</q>.</li>
|
||||
<li>Click OK to have your change take affect.</li>
|
||||
</ol>
|
||||
|
||||
|
|
@ -4262,7 +4271,6 @@ to filter unwanted mail.</p>
|
|||
<div class="contentsBox">In this section:
|
||||
<ul>
|
||||
<li><a href="#mail_and_newsgroups">Mail & Newsgroups</a></li>
|
||||
<li><a href="#windows">Windows</a></li>
|
||||
<li><a href="#message_display">Message Display</a></li>
|
||||
<li><a href="#notifications">Notifications</a></li>
|
||||
<li><a href="#composition">Composition</a></li>
|
||||
|
|
@ -4320,30 +4328,6 @@ to filter unwanted mail.</p>
|
|||
&brandShortName;.</li>
|
||||
</ul>
|
||||
|
||||
<p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
|
||||
section</a>]</p>
|
||||
|
||||
<h2 id="windows">Mail & Newsgroups Preferences - Windows</h2>
|
||||
|
||||
<p>Windows preferences allow you to adjust the window layout and
|
||||
handling.</p>
|
||||
|
||||
<ol>
|
||||
<li>Open the <span class="mac">&brandShortName;</span>
|
||||
<span class="noMac">Edit</span> menu and choose Preferences.</li>
|
||||
<li>Under the Mail & Newsgroups category, click Windows. (If no
|
||||
subcategories are visible, double-click Mail & Newsgroups to expand
|
||||
the list.)</li>
|
||||
</ol>
|
||||
|
||||
<ul>
|
||||
<li><strong>Select the window layout you prefer for Mail</strong>: Choose the
|
||||
type of three-pane layout to use for the Mail window.</li>
|
||||
<li><strong>When opening messages, display them in</strong>: Here you can
|
||||
choose if you want to reuse a message window for the next mail or if you
|
||||
want to open a new one for each.</li>
|
||||
</ul>
|
||||
|
||||
<p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
|
||||
section</a>]</p>
|
||||
|
||||
|
|
@ -4364,6 +4348,36 @@ to filter unwanted mail.</p>
|
|||
</ol>
|
||||
|
||||
<ul>
|
||||
<li><strong>When opening messages, display them in</strong>: Here you can
|
||||
choose if you want to reuse a message window for the next mail or if you
|
||||
want to open a new one for each.</li>
|
||||
<li><strong>Allow messages to load and display remote images and other
|
||||
content</strong>: Deselect this checkbox if you want to avoid downloading
|
||||
images and other content embedded in web pages sent as message attachments.
|
||||
(This checkbox is selected by default.)</li>
|
||||
<li><strong>Wait ___ seconds before marking a message as read</strong>:
|
||||
Choose this option if you do not want a message to be marked as read when
|
||||
you are only taking a brief look at it. Enter the number of seconds you
|
||||
want a message to be displayed before it gets marked as read automatically.
|
||||
|
||||
<p><strong>Tip</strong>: If you do not want Mail & Newsgroups to mark
|
||||
your messages as read automatically at all, you can select this option
|
||||
and enter a very large number of seconds.</p>
|
||||
</li>
|
||||
<li><strong>Default Character Encoding</strong>: Click this drop-down list to
|
||||
select the character encoding you want Mail & Newsgroups to use as the
|
||||
default for incoming mail and newsgroup messages. This is recommended if
|
||||
it's likely you might receive messages in which the character encoding
|
||||
(MIME charset) is not indicated, such as when reading messages in
|
||||
international newsgroups.</li>
|
||||
<li><strong>Apply default to all messages</strong>: Select this to apply the
|
||||
default character encoding to all messages.
|
||||
|
||||
<p><strong>Tip</strong>: You can later view or change the character
|
||||
encoding for a specific folder. In the Mail window, select a folder from
|
||||
the list of Mail folders. Open the View menu, and choose Character
|
||||
Encoding.</p>
|
||||
</li>
|
||||
<li><strong>Plain Text Messages</strong>: Select the font you prefer for
|
||||
viewing plain-text messages: fixed width or variable width. Choosing a font
|
||||
style, size, and color for quoted plain-text messages can help you more
|
||||
|
|
@ -4409,29 +4423,6 @@ to filter unwanted mail.</p>
|
|||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li><strong>Wait ___ seconds before marking a message as read</strong>:
|
||||
Choose this option if you do not want a message to be marked as read when
|
||||
you are only taking a brief look at it. Enter the number of seconds you
|
||||
want a message to be displayed before it gets marked as read automatically.
|
||||
|
||||
<p><strong>Tip</strong>: If you do not want Mail & Newsgroups to mark
|
||||
your messages as read automatically at all, you can select this option
|
||||
and enter a very large number of seconds.</p>
|
||||
</li>
|
||||
<li><strong>Default Character Encoding</strong>: Click this drop-down list to
|
||||
select the character encoding you want Mail & Newsgroups to use as the
|
||||
default for incoming mail and newsgroup messages. This is recommended if
|
||||
it's likely you might receive messages in which the character encoding
|
||||
(MIME charset) is not indicated, such as when reading messages in
|
||||
international newsgroups.</li>
|
||||
<li><strong>Apply default to all messages</strong>: Select this to apply the
|
||||
default character encoding to all messages.
|
||||
|
||||
<p><strong>Tip</strong>: You can later view or change the character
|
||||
encoding for a specific folder. In the Mail window, select a folder from
|
||||
the list of Mail folders. Open the View menu, and choose Character
|
||||
Encoding.</p>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
|
||||
|
|
|
|||
|
|
@ -202,8 +202,8 @@
|
|||
<ul>
|
||||
<li><a href="using_priv_help.xhtml#cookies">Privacy & Security
|
||||
Preferences - Cookies</a></li>
|
||||
<li><a href="using_priv_help.xhtml#images">Privacy & Security
|
||||
Preferences - Images</a></li>
|
||||
<li><a href="mail_help.xhtml#message_display">Mail & Newsgroups
|
||||
Preferences - Message Display</a></li>
|
||||
<li><a href="cs_nav_prefs_advanced.xhtml#scripts_and_plug-ins">Advanced
|
||||
Preferences - Scripts & Plug-ins</a></li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -1553,10 +1553,6 @@
|
|||
third-party sites.</li>
|
||||
<li><strong>Accept all images:</strong> Select this option if you want
|
||||
Navigator to display all images. (This option is selected by default.)</li>
|
||||
<li><strong>Do not load remote images in Mail & Newsgroup
|
||||
messages:</strong> Select this checkbox if you want to avoid downloading
|
||||
images embedded in web pages sent as message attachments. (This checkbox is
|
||||
selected by default.)</li>
|
||||
</ul>
|
||||
|
||||
<h3>Animated images should loop</h3>
|
||||
|
|
|
|||
|
|
@ -21,9 +21,6 @@
|
|||
case "chrome://communicator/content/pref/pref-appearance.xul":
|
||||
_elementIDs.push("generalStartupMail");
|
||||
break;
|
||||
case "chrome://communicator/content/pref/pref-images.xul":
|
||||
_elementIDs.push("networkImageDisableImagesInMailNews");
|
||||
break;
|
||||
}
|
||||
}
|
||||
]]>
|
||||
|
|
@ -51,15 +48,6 @@
|
|||
pref="true" preftype="bool" prefstring="general.startup.mail"
|
||||
prefattribute="checked"/>
|
||||
</groupbox>
|
||||
<!--- image toggle for mail/news -->
|
||||
<groupbox id="imagesArea">
|
||||
<checkbox id="networkImageDisableImagesInMailNews"
|
||||
label="&disableImageInMailNews.label;" accesskey="&disableImageInMailNews.accesskey;"
|
||||
pref="true" preftype="bool" prefstring="mailnews.message_display.disable_remote_image"
|
||||
prefattribute="checked" insertafter="networkImagesBehaviorSeparator"/>
|
||||
</groupbox>
|
||||
|
||||
|
||||
|
||||
<!-- category tree entries for mail/news -->
|
||||
<treechildren id="panelChildren">
|
||||
|
|
@ -68,11 +56,6 @@
|
|||
<treecell url="chrome://messenger/content/pref-mailnews.xul" label="&mail.label;"/>
|
||||
</treerow>
|
||||
<treechildren id="messengerChildren">
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://messenger/content/pref-windows.xul" label="&windows.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://messenger/content/pref-viewing_messages.xul" label="&viewingMessages.label;"/>
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
var _elementIDs = ["mailFixedWidthMessages", "mailQuotedStyle",
|
||||
"mailQuotedSize", "mailCitationColor",
|
||||
"wrapLongLines", "displayGlyph",
|
||||
"reuseMessageWindow", "disableContent",
|
||||
"markMessagesRead", "markMessagesReadAfter",
|
||||
"sendDefaultCharsetList", "forceCharsetOverride"];
|
||||
var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
|
||||
|
|
@ -35,57 +36,26 @@
|
|||
]]>
|
||||
</script>
|
||||
|
||||
<groupbox>
|
||||
<caption label="&displayWidth.label;"/>
|
||||
|
||||
<description>&plainText.label;</description>
|
||||
|
||||
<hbox class="indent">
|
||||
<radiogroup id="mailFixedWidthMessages" orient="horizontal"
|
||||
preftype="bool" prefstring="mail.fixed_width_messages">
|
||||
<radio value="true" label="&fixedWidth.label;" accesskey="&fixedWidth.accesskey;"/>
|
||||
<radio value="false" label="&variableWidth.label;" accesskey="&variableWidth.accesskey;"/>
|
||||
<groupbox align="start">
|
||||
<caption label="&generalMessageDisplay.label;"/>
|
||||
<label value="&openingMessages.label;"/>
|
||||
<hbox class="indent" align="center">
|
||||
<radiogroup id="reuseMessageWindow" orient="horizontal"
|
||||
preftype="bool" prefstring="mailnews.reuse_message_window">
|
||||
<radio value="false" label="&newWindowRadio.label;"
|
||||
accesskey="&newWindowRadio.accesskey;" id="new"/>
|
||||
<radio value="true" label="&existingWindowRadio.label;"
|
||||
accesskey="&existingWindowRadio.accesskey;" id="existing"/>
|
||||
</radiogroup>
|
||||
</hbox>
|
||||
|
||||
<separator class="thin"/>
|
||||
|
||||
<description>&displayText.label;</description>
|
||||
<hbox class="indent" align="center">
|
||||
<label value="&style.label;" accesskey="&style.accesskey;" control="mailQuotedStyle"/>
|
||||
<menulist id="mailQuotedStyle" prefstring="mail.quoted_style">
|
||||
<menupopup>
|
||||
<menuitem value="0" label="®ular.label;"/>
|
||||
<menuitem value="1" label="&bold.label;"/>
|
||||
<menuitem value="2" label="&italic.label;"/>
|
||||
<menuitem value="3" label="&boldItalic.label;"/>
|
||||
</menupopup>
|
||||
</menulist>
|
||||
<checkbox id="disableContent" label="&disableContent.label;"
|
||||
accesskey="&disableContent.accesskey;" reversed="true"
|
||||
prefstring="mailnews.message_display.disable_remote_image"
|
||||
prefattribute="checked" pref="true" preftype="bool"/>
|
||||
|
||||
<label value="&size.label;" accesskey="&size.accesskey;" control="mailQuotedSize"/>
|
||||
<menulist id="mailQuotedSize" prefstring="mail.quoted_size">
|
||||
<menupopup>
|
||||
<menuitem value="0" label="®ular.label;"/>
|
||||
<menuitem value="1" label="&bigger.label;"/>
|
||||
<menuitem value="2" label="&smaller.label;"/>
|
||||
</menupopup>
|
||||
</menulist>
|
||||
|
||||
<label value="&color.label;" accesskey="&color.accesskey;" control="mailCitationColor"/>
|
||||
<colorpicker type="button" id="mailCitationColor" palettename="standard" prefstring="mail.citation_color"/>
|
||||
</hbox>
|
||||
|
||||
<description>&viewingPlainText.label;</description>
|
||||
<vbox align="start" class="indent">
|
||||
<checkbox id="wrapLongLines" label="&wrapInMsg.label;"
|
||||
prefstring="mail.wrap_long_lines" accesskey="&wrapInMsg.accesskey;"/>
|
||||
<checkbox class="iconic" id="displayGlyph" label="&convertEmoticons.label;"
|
||||
prefstring="mail.display_glyph" accesskey="&convertEmoticons.accesskey;"/>
|
||||
</vbox>
|
||||
</groupbox>
|
||||
|
||||
<groupbox align="start">
|
||||
<caption label="&viewingMessages.label;"/>
|
||||
<hbox align="center">
|
||||
<checkbox id="markMessagesRead" label="&markMessagesRead.label;"
|
||||
accesskey="&markMessagesRead.accesskey;"
|
||||
|
|
@ -112,5 +82,56 @@
|
|||
<checkbox id="forceCharsetOverride" label="&forceCharsetOverride.label;"
|
||||
prefstring="mailnews.force_charset_override"
|
||||
accesskey="&forceCharsetOverride.accesskey;"/>
|
||||
|
||||
</groupbox>
|
||||
|
||||
<groupbox>
|
||||
<caption label="&displayPlainText.label;"/>
|
||||
<hbox align="center">
|
||||
<description>&plainTextFont.label;</description>
|
||||
<radiogroup id="mailFixedWidthMessages" orient="horizontal"
|
||||
preftype="bool" prefstring="mail.fixed_width_messages">
|
||||
<radio value="true" label="&fixedWidth.label;" accesskey="&fixedWidth.accesskey;"/>
|
||||
<radio value="false" label="&variableWidth.label;" accesskey="&variableWidth.accesskey;"/>
|
||||
</radiogroup>
|
||||
</hbox>
|
||||
|
||||
<separator class="thin"/>
|
||||
|
||||
<vbox align="start">
|
||||
<checkbox id="wrapLongLines" label="&wrapInMsg.label;"
|
||||
prefstring="mail.wrap_long_lines" accesskey="&wrapInMsg.accesskey;"/>
|
||||
<checkbox class="iconic" id="displayGlyph" label="&convertEmoticons.label;"
|
||||
prefstring="mail.display_glyph" accesskey="&convertEmoticons.accesskey;"/>
|
||||
</vbox>
|
||||
|
||||
<separator class="thin"/>
|
||||
|
||||
<description>&displayQuoted.label;</description>
|
||||
<hbox class="indent" align="center">
|
||||
<label value="&style.label;" accesskey="&style.accesskey;" control="mailQuotedStyle"/>
|
||||
<menulist id="mailQuotedStyle" prefstring="mail.quoted_style">
|
||||
<menupopup>
|
||||
<menuitem value="0" label="®ular.label;"/>
|
||||
<menuitem value="1" label="&bold.label;"/>
|
||||
<menuitem value="2" label="&italic.label;"/>
|
||||
<menuitem value="3" label="&boldItalic.label;"/>
|
||||
</menupopup>
|
||||
</menulist>
|
||||
|
||||
<label value="&size.label;" accesskey="&size.accesskey;" control="mailQuotedSize"/>
|
||||
<menulist id="mailQuotedSize" prefstring="mail.quoted_size">
|
||||
<menupopup>
|
||||
<menuitem value="0" label="®ular.label;"/>
|
||||
<menuitem value="1" label="&bigger.label;"/>
|
||||
<menuitem value="2" label="&smaller.label;"/>
|
||||
</menupopup>
|
||||
</menulist>
|
||||
|
||||
<label value="&color.label;" accesskey="&color.accesskey;" control="mailCitationColor"/>
|
||||
<colorpicker type="button" id="mailCitationColor" palettename="standard"
|
||||
prefstring="mail.citation_color"/>
|
||||
</hbox>
|
||||
|
||||
</groupbox>
|
||||
</page>
|
||||
|
|
|
|||
|
|
@ -4,12 +4,8 @@
|
|||
<!ENTITY enbPluginCheckMailNews.label "Mail & Newsgroups">
|
||||
<!ENTITY enbPluginCheckMailNews.accesskey "p">
|
||||
|
||||
<!ENTITY disableImageInMailNews.label "Do not load remote images in Mail & Newsgroup messages">
|
||||
<!ENTITY disableImageInMailNews.accesskey "i">
|
||||
|
||||
<!ENTITY mail.label "Mail & Newsgroups">
|
||||
<!ENTITY mail.accesskey "m">
|
||||
<!ENTITY windows.label "Windows">
|
||||
<!ENTITY viewingMessages.label "Message Display">
|
||||
<!ENTITY notifications.label "Notifications">
|
||||
<!ENTITY address.label "Addressing">
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@
|
|||
|
||||
<!ENTITY pane.title "Message Display">
|
||||
<!ENTITY pane.description "Settings for message display">
|
||||
<!ENTITY textBegin.label "Quoted plain text appearance">
|
||||
<!ENTITY style.label "Style:">
|
||||
<!ENTITY style.accesskey "t">
|
||||
<!ENTITY regular.label "Regular">
|
||||
|
|
@ -51,10 +50,9 @@
|
|||
<!ENTITY smaller.label "Smaller">
|
||||
<!ENTITY color.label "Color:">
|
||||
<!ENTITY color.accesskey "C">
|
||||
<!ENTITY displayWidth.label "Plain Text Messages">
|
||||
<!ENTITY plainText.label "Use this font when displaying plain text messages:">
|
||||
<!ENTITY displayText.label "Settings for displaying quoted plain text messages:">
|
||||
<!ENTITY viewingPlainText.label "When viewing plain text messages:">
|
||||
<!ENTITY displayPlainText.label "When displaying plain text messages">
|
||||
<!ENTITY plainTextFont.label "Use the following font:">
|
||||
<!ENTITY displayQuoted.label "Settings for quoted messages:">
|
||||
<!ENTITY sendDefaultCharset.label "Default Character Encoding:">
|
||||
<!ENTITY sendDefaultCharset.accesskey "r">
|
||||
<!ENTITY forceCharsetOverride.label "Apply default to all messages (ignore character encoding specified by MIME header)">
|
||||
|
|
@ -70,10 +68,18 @@
|
|||
<!-- LOCALIZATION NOTE : (convertEmoticons.label) 'Emoticons' are also known as 'Smileys', e.g. :-) -->
|
||||
<!ENTITY convertEmoticons.label "Display emoticons as graphics">
|
||||
<!ENTITY convertEmoticons.accesskey "D">
|
||||
<!ENTITY viewingMessages.label "Viewing Messages">
|
||||
<!ENTITY generalMessageDisplay.label "General">
|
||||
<!-- LOCALIZATION NOTE (markMessagesRead.label): This will concatenate with
|
||||
"xxx seconds before marking a message as read", using a number and
|
||||
(seconds.label). -->
|
||||
<!ENTITY markMessagesRead.label "Wait">
|
||||
<!ENTITY markMessagesRead.accesskey "W">
|
||||
<!ENTITY seconds.label "seconds before marking a message as read">
|
||||
|
||||
<!ENTITY openingMessages.label "When opening messages, display them in:">
|
||||
<!ENTITY newWindowRadio.label "A new message window">
|
||||
<!ENTITY newWindowRadio.accesskey "n">
|
||||
<!ENTITY existingWindowRadio.label "An existing message window">
|
||||
<!ENTITY existingWindowRadio.accesskey "e">
|
||||
<!ENTITY disableContent.label "Allow messages to load and display remote images and other content">
|
||||
<!ENTITY disableContent.accesskey "m">
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
<RDF:li resource="chrome://communicator/content/pref/pref-appearance.xul"/>
|
||||
<RDF:li resource="chrome://communicator/content/pref/pref-scripts.xul"/>
|
||||
<RDF:li resource="chrome://communicator/content/pref/pref-cookies.xul"/>
|
||||
<RDF:li resource="chrome://communicator/content/pref/pref-images.xul"/>
|
||||
<RDF:li resource="chrome://navigator/content/navigatorOverlay.xul"/>
|
||||
<RDF:li resource="chrome://messenger/content/messenger.xul"/>
|
||||
<RDF:li resource="chrome://messenger/content/mail3PaneWindowVertLayout.xul"/>
|
||||
|
|
@ -55,11 +54,6 @@
|
|||
<RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
|
||||
</RDF:Seq>
|
||||
|
||||
<!-- messenger image toggle pref -->
|
||||
<RDF:Seq about="chrome://communicator/content/pref/pref-images.xul">
|
||||
<RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
|
||||
</RDF:Seq>
|
||||
|
||||
<!-- messenger taskbar/tasks menu items -->
|
||||
<RDF:Seq about="chrome://editor/content/editorTasksOverlay.xul">
|
||||
<RDF:li>chrome://messenger/content/mailTasksOverlay.xul</RDF:li>
|
||||
|
|
|
|||
|
|
@ -64,7 +64,6 @@ messenger.jar:
|
|||
content/messenger/pref-mailnews.js (base/prefs/resources/content/pref-mailnews.js)
|
||||
content/messenger/pref-notifications.xul (base/prefs/resources/content/pref-notifications.xul)
|
||||
content/messenger/pref-notifications.js (base/prefs/resources/content/pref-notifications.js)
|
||||
content/messenger/pref-windows.xul (base/prefs/resources/content/pref-windows.xul)
|
||||
content/messenger/pref-labels.xul (base/prefs/resources/content/pref-labels.xul)
|
||||
content/messenger/pref-labels.js (base/prefs/resources/content/pref-labels.js)
|
||||
content/messenger/pref-viewing_messages.xul (base/prefs/resources/content/pref-viewing_messages.xul)
|
||||
|
|
@ -259,7 +258,6 @@ en-US.jar:
|
|||
locale/en-US/messenger/news.properties (news/resources/locale/en-US/news.properties)
|
||||
locale/en-US/messenger/pref-mailnews.dtd (base/prefs/resources/locale/en-US/pref-mailnews.dtd)
|
||||
locale/en-US/messenger/pref-notifications.dtd (base/prefs/resources/locale/en-US/pref-notifications.dtd)
|
||||
locale/en-US/messenger/pref-windows.dtd (base/prefs/resources/locale/en-US/pref-windows.dtd)
|
||||
locale/en-US/messenger/pref-labels.dtd (base/prefs/resources/locale/en-US/pref-labels.dtd)
|
||||
locale/en-US/messenger/pref-receipts.dtd (base/prefs/resources/locale/en-US/pref-receipts.dtd)
|
||||
locale/en-US/messenger/pref-viewing_messages.dtd (base/prefs/resources/locale/en-US/pref-viewing_messages.dtd)
|
||||
|
|
|
|||
|
|
@ -16,23 +16,17 @@ var fm = {
|
|||
"chrome://communicator/content/pref/pref-search.xul": "navigator_pref_internet_searching",
|
||||
"chrome://communicator/content/pref/pref-scripts.xul": "advanced_pref_scripts",
|
||||
"chrome://messenger/content/pref-mailnews.xul": "mail_prefs_general",
|
||||
"chrome://messenger/content/pref-windows.xul": "mail_prefs_windows",
|
||||
"chrome://messenger/content/pref-viewing_messages.xul": "mail_prefs_display",
|
||||
"chrome://messenger/content/pref-notifications.xul": "mail_prefs_notifications",
|
||||
"chrome://messenger/content/messengercompose/pref-composing_messages.xul": "mail_prefs_messages",
|
||||
"chrome://messenger/content/messengercompose/pref-formatting.xul": "mail_prefs_formatting",
|
||||
"chrome://messenger/content/addressbook/pref-addressing.xul": "nav_view",
|
||||
"chrome://messenger/content/addressbook/pref-addressing.xul": "mail_prefs_addressing",
|
||||
"chrome://messenger/content/pref-offline.xul": "mail_prefs_offline",
|
||||
"chrome://messenger/content/pref-labels.xul": "mail-prefs-labels",
|
||||
"chrome://messenger/content/pref-receipts.xul": "mail-prefs-receipts",
|
||||
"chrome://editor/content/pref-composer.xul": "composer_prefs_general",
|
||||
"chrome://editor/content/pref-editing.xul": "composer_prefs_newpage",
|
||||
"chrome://editor/content/pref-toolbars.xul": "composer_prefs_toolbars",
|
||||
"chrome://messenger/content/pref-mailnews.xul": "mail_prefs_general",
|
||||
"chrome://messenger/content/pref-viewing_messages.xul": "mail_prefs_display",
|
||||
"chrome://messenger/content/messengercompose/pref-composing_messages.xul": "mail_prefs_messages",
|
||||
"chrome://messenger/content/messengercompose/pref-formatting.xul": "mail_prefs_formatting",
|
||||
"chrome://messenger/content/addressbook/pref-addressing.xul": "mail_prefs_addressing",
|
||||
"chrome://messenger/content/pref-offline.xul": "mail_prefs_offline",
|
||||
"chrome://communicator/content/pref/pref-security.xul": "sec_gen",
|
||||
"chrome://communicator/content/pref/pref-cookies.xul": "cookies_prefs",
|
||||
"chrome://communicator/content/pref/pref-images.xul": "images_prefs",
|
||||
|
|
|
|||
|
|
@ -57,35 +57,15 @@
|
|||
<![CDATA[
|
||||
|
||||
var panel = "chrome://communicator/content/pref/pref-images.xul";
|
||||
var _elementIDs = ["accOrgImages", "networkImageBehaviour", "imageLooping"];
|
||||
var _elementIDs = ["networkImageBehaviour", "imageLooping"];
|
||||
|
||||
function init()
|
||||
{
|
||||
parent.initPanel('chrome://communicator/content/pref/pref-images.xul');
|
||||
|
||||
setDisables();
|
||||
}
|
||||
|
||||
function setDisables()
|
||||
{
|
||||
var imageBehavior = document.getElementById("networkImageBehaviour");
|
||||
|
||||
// if mailnews is installed then we will have networkImageDisableImagesInMailNews checkbox
|
||||
var networkImageDisableImagesInMailNews = document.getElementById("networkImageDisableImagesInMailNews");
|
||||
if (networkImageDisableImagesInMailNews)
|
||||
{
|
||||
var prefString = networkImageDisableImagesInMailNews.getAttribute("prefstring");
|
||||
networkImageDisableImagesInMailNews.disabled = (imageBehavior.value == 2)
|
||||
|| parent.hPrefWindow.getPrefIsLocked(prefString);
|
||||
}
|
||||
}
|
||||
|
||||
]]>
|
||||
</script>
|
||||
|
||||
<broadcaster id="haveImageBlocking"/>
|
||||
<broadcaster id="haveImageBlockingOrMailnews"/>
|
||||
|
||||
<groupbox id="imagesArea">
|
||||
<caption label="&imageBlocking.label;"/>
|
||||
|
||||
|
|
@ -94,25 +74,16 @@
|
|||
<radiogroup id="networkImageBehaviour"
|
||||
prefstring="permissions.default.image">
|
||||
<radio value="2" label="&disableImages.label;"
|
||||
accesskey="&disableImages.accesskey;"
|
||||
oncommand="setDisables();"/>
|
||||
accesskey="&disableImages.accesskey;"/>
|
||||
<radio value="3" label="&accOrgImagesRadio.label;"
|
||||
accesskey="&accOrgImagesRadio.accesskey;"
|
||||
id="accOrgImages" observes="haveImageBlocking"
|
||||
oncommand="setDisables();"/>
|
||||
accesskey="&accOrgImagesRadio.accesskey;"/>
|
||||
<radio value="1" label="&accAllImagesRadio.label;"
|
||||
accesskey="&accAllImagesRadio.accesskey;"
|
||||
oncommand="setDisables();"/>
|
||||
accesskey="&accAllImagesRadio.accesskey;"/>
|
||||
</radiogroup>
|
||||
|
||||
<separator id="networkImagesBehaviorSeparator" observes="haveImageBlockingOrMailnews"/>
|
||||
|
||||
<separator observes="haveImageBlocking"/>
|
||||
|
||||
<hbox pack="end">
|
||||
<button id="viewImages" label="&viewImages.label;"
|
||||
accesskey="&viewImages.accesskey;" oncommand="viewImages();"
|
||||
observes="haveImageBlocking"
|
||||
prefstring="pref.advanced.images.disable_button.view_image"/>
|
||||
</hbox>
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче