mozilla
/
releases-comm-central
зеркало из https://github.com/mozilla/releases-comm-central.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 482623 - "change 'Privacy' tab to 'Security'" [r=mkmelin+mozilla] 

--HG--
rename : mail/components/preferences/privacy.js => mail/components/preferences/security.js
rename : mail/components/preferences/privacy.xul => mail/components/preferences/security.xul
rename : mail/locales/en-US/chrome/messenger/preferences/privacy.dtd => mail/locales/en-US/chrome/messenger/preferences/security.dtd
This commit is contained in:
Bryan W Clark 2009-03-11 19:55:40 +00:00
Родитель b29b4344d0
Коммит 59c5c04964
16 изменённых файлов: 36 добавлений и 37 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
mail/components/preferences/jar.mn
Просмотреть файл

@ -8,8 +8,8 @@ messenger.jar:
* content/messenger/preferences/compose.js
* content/messenger/preferences/sendoptions.xul
* content/messenger/preferences/sendoptions.js
* content/messenger/preferences/privacy.xul
* content/messenger/preferences/privacy.js
* content/messenger/preferences/security.xul
* content/messenger/preferences/security.js
* content/messenger/preferences/junkLog.xul
* content/messenger/preferences/junkLog.js
* content/messenger/preferences/advanced.js

4
mail/components/preferences/preferences.xul
Просмотреть файл

@ -86,8 +86,8 @@
src="chrome://messenger/content/preferences/display.xul"/>
<prefpane id="paneCompose" label="&paneComposition.title;"
src="chrome://messenger/content/preferences/compose.xul"/>
<prefpane id="panePrivacy" label="&panePrivacy.title;"
src="chrome://messenger/content/preferences/privacy.xul"/>
<prefpane id="paneSecurity" label="&paneSecurity.title;"
src="chrome://messenger/content/preferences/security.xul"/>
<prefpane id="paneDownloads" label="&paneAttachments.title;"
src="chrome://messenger/content/preferences/downloads.xul"/>
<prefpane id="paneAdvanced" label="&paneAdvanced.title;"

12
mail/components/preferences/privacy.js → mail/components/preferences/security.js
Просмотреть файл

@ -36,13 +36,13 @@
#
# ***** END LICENSE BLOCK *****
var gPrivacyPane = {
var gSecurityPane = {
mPane: null,
mInitialized: false,
init: function ()
{
this.mPane = document.getElementById("panePrivacy");
this.mPane = document.getElementById("paneSecurity");
this.updateManualMarkMode(document.getElementById('manualMark').checked);
this.updateJunkLogButton(document.getElementById('enableJunkLogging').checked);
@ -52,17 +52,17 @@ var gPrivacyPane = {
// update the checkbox for downloading phishing url tables
// this.updateDownloadedPhishingListState();
var preference = document.getElementById("mail.preferences.privacy.selectedTabIndex");
var preference = document.getElementById("mail.preferences.security.selectedTabIndex");
if (preference.value)
document.getElementById("privacyPrefs").selectedIndex = preference.value;
document.getElementById("securityPrefs").selectedIndex = preference.value;
this.mInitialized = true;
},
tabSelectionChanged: function ()
{
if (this.mInitialized)
document.getElementById("mail.preferences.privacy.selectedTabIndex")
.valueFromPreferences = document.getElementById("privacyPrefs").selectedIndex;
document.getElementById("mail.preferences.security.selectedTabIndex")
.valueFromPreferences = document.getElementById("securityPrefs").selectedIndex;
},
updateManualMarkMode: function(aEnableRadioGroup)

31
mail/components/preferences/privacy.xul → mail/components/preferences/security.xul
Просмотреть файл

@ -39,22 +39,22 @@
<!DOCTYPE overlay [
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
<!ENTITY % privacyDTD SYSTEM "chrome://messenger/locale/preferences/privacy.dtd">
<!ENTITY % securityDTD SYSTEM "chrome://messenger/locale/preferences/security.dtd">
%brandDTD;
%privacyDTD;
%securityDTD;
]>
<overlay id="PrivacyPaneOverlay"
<overlay id="SecurityPaneOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<prefpane id="panePrivacy" onpaneload="gPrivacyPane.init();">
<script type="application/x-javascript" src="chrome://messenger/content/preferences/privacy.js"/>
<prefpane id="paneSecurity" onpaneload="gSecurityPane.init();">
<script type="application/x-javascript" src="chrome://messenger/content/preferences/security.js"/>
<stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
<preferences>
<preference id="mail.preferences.privacy.selectedTabIndex"
name="mail.preferences.privacy.selectedTabIndex" type="int"/>
<preference id="mail.preferences.security.selectedTabIndex"
name="mail.preferences.security.selectedTabIndex" type="int"/>
<preference id="mail.spam.manualMark"
name="mail.spam.manualMark"
type="bool"/>
@ -81,7 +81,7 @@
type="bool"/>
</preferences>
<tabbox id="privacyPrefs" flex="1" onselect="gPrivacyPane.tabSelectionChanged();">
<tabbox id="securityPrefs" flex="1" onselect="gSecurityPane.tabSelectionChanged();">
<tabs>
<tab label="&itemJunk.label;"/>
<tab label="&itemPhishing.label;"/>
@ -96,7 +96,7 @@
<checkbox id="manualMark"
preference="mail.spam.manualMark"
oncommand="gPrivacyPane.updateManualMarkMode(this.checked);"
oncommand="gSecurityPane.updateManualMarkMode(this.checked);"
label="&manualMark.label;" accesskey="&manualMark.accesskey;"/>
<radiogroup id="manualMarkMode" class="indent"
@ -111,17 +111,17 @@
<hbox align="start">
<checkbox id="enableJunkLogging" label="&enableJunkLogging.label;"
oncommand="gPrivacyPane.updateJunkLogButton(this.checked);"
oncommand="gSecurityPane.updateJunkLogButton(this.checked);"
preference="mail.spam.logging.enabled"
accesskey="&enableJunkLogging.accesskey;"/>
<spacer flex="1"/>
<button id="openJunkLogButton" label="&openJunkLog.label;" accesskey="&openJunkLog.accesskey;"
oncommand="gPrivacyPane.openJunkLog();"/>
oncommand="gSecurityPane.openJunkLog();"/>
</hbox>
<hbox align="start">
<spacer flex="1"/>
<button label="&resetTrainingData.label;" accesskey="&resetTrainingData.accesskey;"
oncommand="gPrivacyPane.resetTrainingData()"/>
oncommand="gSecurityPane.resetTrainingData()"/>
</hbox>
</tabpanel>
@ -131,7 +131,6 @@
<separator class="thin"/>
<checkbox id="enablePhishingDetector"
label="&enablePhishingDetector1.label;" accesskey="&enablePhishingDetector1.accesskey;"
oncommand="gPrivacyPane.updateDownloadedPhishingListState()"
preference="mail.phishing.detection.enabled"/>
<!--
<checkbox id="useDownloadedList" class="indent" label="&useDownloadedList.label;"
@ -157,7 +156,7 @@
<hbox>
<spacer flex="1"/>
<button label="&savedPasswords.label;" accesskey="&savedPasswords.accesskey;"
oncommand="gPrivacyPane.showPasswords();"
oncommand="gSecurityPane.showPasswords();"
preference="pref.privacy.disable_button.view_passwords"/>
</hbox>
<!-- XXX button to do a showExceptions()? -->
@ -168,11 +167,11 @@
<hbox>
<checkbox id="useMasterPassword" flex="1"
label="&useMasterPassword.label;" accesskey="&useMasterPassword.accesskey;"
oncommand="gPrivacyPane.updateMasterPasswordButton();"/>
oncommand="gSecurityPane.updateMasterPasswordButton();"/>
<button id="changeMasterPassword"
label="&changeMasterPassword.label;" accesskey="&changeMasterPassword.accesskey;"
oncommand="gPrivacyPane.changeMasterPassword();"/>
oncommand="gSecurityPane.changeMasterPassword();"/>
</hbox>
<separator flex="1"/>
</tabpanel>

2
mail/locales/en-US/chrome/messenger/preferences/preferences.dtd
Просмотреть файл

@ -9,5 +9,5 @@
<!ENTITY paneDisplay.title "Display">
<!ENTITY paneComposition.title "Composition">
<!ENTITY paneAttachments.title "Attachments">
<!ENTITY panePrivacy.title "Privacy">
<!ENTITY paneSecurity.title "Security">
<!ENTITY paneAdvanced.title "Advanced">

0
mail/locales/en-US/chrome/messenger/preferences/privacy.dtd → mail/locales/en-US/chrome/messenger/preferences/security.dtd
Просмотреть файл

2
mail/locales/jar.mn
Просмотреть файл

@ -115,7 +115,7 @@
locale/@AB_CD@/messenger/preferences/display.dtd (%chrome/messenger/preferences/display.dtd)
locale/@AB_CD@/messenger/preferences/compose.dtd (%chrome/messenger/preferences/compose.dtd)
locale/@AB_CD@/messenger/preferences/sendoptions.dtd (%chrome/messenger/preferences/sendoptions.dtd)
locale/@AB_CD@/messenger/preferences/privacy.dtd (%chrome/messenger/preferences/privacy.dtd)
locale/@AB_CD@/messenger/preferences/security.dtd (%chrome/messenger/preferences/security.dtd)
locale/@AB_CD@/messenger/preferences/junkLog.dtd (%chrome/messenger/preferences/junkLog.dtd)
locale/@AB_CD@/messenger/preferences/viewpasswords.dtd (%chrome/messenger/preferences/viewpasswords.dtd)
locale/@AB_CD@/messenger/preferences/advanced.dtd (%chrome/messenger/preferences/advanced.dtd)

2
mail/themes/gnomestripe/jar.mn
Просмотреть файл

@ -73,7 +73,7 @@ classic.jar:
skin/classic/messenger/preferences/general.png (mail/preferences/general.png)
skin/classic/messenger/preferences/display.png (mail/preferences/display.png)
skin/classic/messenger/preferences/composition.png (mail/preferences/composition.png)
skin/classic/messenger/preferences/privacy.png (mail/preferences/privacy.png)
skin/classic/messenger/preferences/security.png (mail/preferences/security.png)
skin/classic/messenger/preferences/attachments.png (mail/preferences/attachments.png)
skin/classic/messenger/preferences/advanced.png (mail/preferences/advanced.png)
skin/classic/messenger/preferences/background.png (mail/preferences/background.png)

4
mail/themes/gnomestripe/mail/preferences/preferences.css
Просмотреть файл

@ -49,8 +49,8 @@ radio[pane=paneDisplay] {
radio[pane=paneCompose] {
list-style-image: url("chrome://messenger/skin/preferences/composition.png");
}
radio[pane=panePrivacy] {
list-style-image: url("chrome://messenger/skin/preferences/privacy.png");
radio[pane=paneSecurity] {
list-style-image: url("chrome://messenger/skin/preferences/security.png");
}
radio[pane=paneDownloads] {
list-style-image: url("chrome://messenger/skin/preferences/attachments.png");

Двоичные данные
mail/themes/gnomestripe/mail/preferences/privacy.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 2.0 KiB

Двоичные данные
mail/themes/gnomestripe/mail/preferences/security.png Normal file
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

После

Ширина:  |  Высота:  |  Размер: 1.7 KiB

6
mail/themes/pinstripe/mail/preferences/preferences.css
Просмотреть файл

@ -100,11 +100,11 @@ radio[pane=paneCompose]:active {
-moz-image-region: rect(32px, 96px, 64px, 64px)
}
radio[pane=panePrivacy] {
radio[pane=paneSecurity] {
-moz-image-region: rect(0px 128px 32px 96px);
}
radio[pane=panePrivacy]:active {
radio[pane=paneSecurity]:active {
-moz-image-region: rect(32px 128px 64px 96px);
}
@ -199,7 +199,7 @@ caption {
margin: 0 8px;
}
#privacyPrefs {
#securityPrefs {
padding: 0 4px;
}

2
mail/themes/qute/jar.mn
Просмотреть файл

@ -72,7 +72,7 @@ classic.jar:
skin/classic/messenger/preferences/general.png (mail/preferences/general.png)
skin/classic/messenger/preferences/display.png (mail/preferences/display.png)
skin/classic/messenger/preferences/composition.png (mail/preferences/composition.png)
skin/classic/messenger/preferences/privacy.png (mail/preferences/privacy.png)
skin/classic/messenger/preferences/security.png (mail/preferences/security.png)
skin/classic/messenger/preferences/attachments.png (mail/preferences/attachments.png)
skin/classic/messenger/preferences/advanced.png (mail/preferences/advanced.png)
skin/classic/messenger/preferences/background.png (mail/preferences/background.png)

4
mail/themes/qute/mail/preferences/preferences.css
Просмотреть файл

@ -79,8 +79,8 @@ radio[pane=paneDisplay] {
radio[pane=paneCompose] {
list-style-image: url("chrome://messenger/skin/preferences/composition.png");
}
radio[pane=panePrivacy] {
list-style-image: url("chrome://messenger/skin/preferences/privacy.png");
radio[pane=paneSecurity] {
list-style-image: url("chrome://messenger/skin/preferences/security.png");
}
radio[pane=paneDownloads] {
list-style-image: url("chrome://messenger/skin/preferences/attachments.png");

Двоичные данные
mail/themes/qute/mail/preferences/privacy.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 2.0 KiB

Двоичные данные
mail/themes/qute/mail/preferences/security.png Normal file
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

После

Ширина:  |  Высота:  |  Размер: 1.7 KiB