Commit 8dd0f8d2 authored by Nico Josuttis's avatar Nico Josuttis

try out convenient/manual settings for sending preferences

parent f356fdd7
......@@ -89,7 +89,7 @@ if [ -d help ]; then
fi
pwd
for f in compose.html messenger.html rulesEditor.html editRcptRule.html initError.html ; do
for f in compose.html editRcptRule.html initError.html messenger.html rulesEditor.html sendingPrefs ; do
cp ${f} ${cwd}/${HELPDIR}
done
......
......@@ -271,10 +271,70 @@ function resetPrefs() {
gEnigAcceptedKeys);
EnigDisplayRadioPref("autoSendEncrypted", EnigGetPref("autoSendEncrypted"),
gEnigAutoSendEncrypted);
EnigDisplayRadioPref("confirmBeforeSending", EnigGetPref("confirmBeforeSending"),
gEnigConfirmBeforeSending);
EnigDisplayRadioPref("recipientsSelection", EnigGetPref("recipientsSelection"),
gEnigRecipientsSelection);
}
function disableManually (disable)
{
var elems = [
"enigmail_keepSettingsForReply",
"acceptedKeysValid",
"acceptedKeysAll",
"autoSendEncryptedNever",
"autoSendEncryptedIfValid",
"confirmBeforeSendingNever",
"confirmBeforeSendingAlways",
"confirmBeforeSendingIfEncrypted",
"confirmBeforeSendingIfNotEncrypted",
"confirmBeforeSendingIfRules",
];
var elem;
for (var i=0; i < elems.length; ++i) {
elem = document.getElementById(elems[i]);
if (disable) {
elem.setAttribute("disabled","true");
}
else {
elem.removeAttribute("disabled");
}
}
}
function resetSendingPrefsConvenient() {
gEnigAcceptedKeys = 1; // all
gEnigAutoSendEncrypted = 1; // if keys accepted
gEnigConfirmBeforeSending = 0; // never
EnigSetPref("acceptedKeys", gEnigAcceptedKeys);
EnigSetPref("autoSendEncrypted", gEnigAutoSendEncrypted);
EnigSetPref("confirmBeforeSending", gEnigConfirmBeforeSending);
EnigDisplayRadioPref("acceptedKeys", EnigGetPref("acceptedKeys"),
gEnigAcceptedKeys);
EnigDisplayRadioPref("autoSendEncrypted", EnigGetPref("autoSendEncrypted"),
gEnigAutoSendEncrypted);
EnigDisplayRadioPref("confirmBeforeSending", EnigGetPref("confirmBeforeSending"),
gEnigConfirmBeforeSending);
disableManually(true);
displayPrefs(false, true, false);
}
function resetSendingPrefsManually() {
//gEnigAcceptedKeys = 0; // only valid keys
//gEnigAutoSendEncrypted = 0; // never
//gEnigConfirmBeforeSending = 1; // always
EnigSetPref("acceptedKeys", gEnigAcceptedKeys);
EnigSetPref("autoSendEncrypted", gEnigAutoSendEncrypted);
EnigSetPref("confirmBeforeSending", gEnigConfirmBeforeSending);
EnigDisplayRadioPref("acceptedKeys", EnigGetPref("acceptedKeys"),
gEnigAcceptedKeys);
EnigDisplayRadioPref("autoSendEncrypted", EnigGetPref("autoSendEncrypted"),
gEnigAutoSendEncrypted);
EnigDisplayRadioPref("confirmBeforeSending", EnigGetPref("confirmBeforeSending"),
gEnigConfirmBeforeSending);
disableManually(false);
displayPrefs(false, true, false);
}
function resetRememberedValues() {
......
......@@ -267,17 +267,34 @@
<vbox id="sending" flex="1">
<description class="enigmailPrefsTitle">&enigmail.whenSending.label; ...</description>
<hbox flex="1" align="end">
<radiogroup id="enigmail_encryptionModel"
flex="1"
pref="true"
preftype="int"
prefstring="extensions.enigmail.encryptionModel">
<radio id="encryptionModelConvenient"
value="0"
label="Convenient encryption settings"
oncommand="resetSendingPrefsConvenient();"/>
<radio id="encryptionModelManual"
value="1"
label="Manual encryption settings"
oncommand="resetSendingPrefsManually();"/>
</radiogroup>
<vbox align="end">
<button id="sendingPrefsHelp"
label="&enigmail.help.label;"
oncommand="EnigHelpWindow('sendingPrefs');"/>
</vbox>
</hbox>
<!-- elements for manual settings: -->
<groupbox id="enigmail_pref_sending_manually">
<checkbox id="enigmail_keepSettingsForReply"
tooltip="keepCryptoSettingsForReply.tooltip"
label="&enigmail.keepCryptoSettingsForReply.label;" />
<!-- sending preferences: accepted keys -->
<!-- basic: accepted keys (trust-model always) -->
<!--
<checkbox id="enigmail_alwaysTrustSend"
label="&enigmail.alwaysTrustSend.label;"
tooltip="alwaysTrustSend.tooltip"/>
-->
<groupbox>
<caption label="&enigmail.acceptedKeysOption.label;"/>
<radiogroup id="enigmail_acceptedKeys"
......@@ -355,6 +372,7 @@
tooltip="confirmBeforeSendingIfRules.tooltip"/>
</radiogroup>
</groupbox>
</groupbox>
</vbox>
<!-- "Key Selection" Tab -->
......
......@@ -90,11 +90,12 @@ enigmail.jar:
locale/en-US/enigmail.dtd (locale/en-US/enigmail.dtd)
locale/en-US/enigmail.properties (locale/en-US/enigmail.properties)
locale/en-US/am-enigprefs.properties (locale/en-US/am-enigprefs.properties)
locale/en-US/help/messenger.html (locale/en-US/help/messenger.html)
locale/en-US/help/compose.html (locale/en-US/help/compose.html)
locale/en-US/help/rulesEditor.html (locale/en-US/help/rulesEditor.html)
locale/en-US/help/editRcptRule.html (locale/en-US/help/editRcptRule.html)
locale/en-US/help/initError.html (locale/en-US/help/initError.html)
locale/en-US/help/messenger.html (locale/en-US/help/messenger.html)
locale/en-US/help/rulesEditor.html (locale/en-US/help/rulesEditor.html)
locale/en-US/help/sendingPrefs.html (locale/en-US/help/sendingPrefs.html)
skin/classic/enigmail/enigmail.css (skin/classic/enigmail.css)
skin/classic/enigmail/enigmail-about.png (skin/images/enigmail-about.png)
skin/classic/enigmail/enigmail-toolbar.png (skin/classic/images/enigmail-toolbar.png)
......
......@@ -231,6 +231,9 @@
<!ENTITY enigmail.confirmBeforeSendingIfRules.label "If rules changed encryption">
<!ENTITY enigmail.confirmBeforeSendingIfRules.tooltip "Display information dialog about signing/encryption before sending, if your preference regarding encryption was changed by a per-recipient rule or auto encryption">
<!ENTITY enigmail.sendingPrefsConvenientButton.label "Convenient Encryption">
<!ENTITY enigmail.sendingPrefsThoroughButton.label "Thorough Encryption">
<!ENTITY enigmail.recipientsSelectionOption.label "How should we choose the keys?">
<!ENTITY enigmail.perRecipientRules.label "By pre-set rules only">
<!ENTITY enigmail.perRecipientRules.tooltip "Choose keys according to rules; prompt for creating new rules recipients without rules.">
......
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Enigmail Help: Edit OpenPGP Rule</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
<style type="text/css">
/*<![CDATA[*/
dt { font-weight: bold; }
/*]]>*/
</style>
</head>
<body>
<h1>Enigmail Help</h1>
<h3>Defining Preferences to Send Encrypted</h3>
<p>In the Sending Preferences you can choose your model for encryption. There are choices because in general two options are possible:</p>
<dl>
<dt>Convenient Encryption</dt>
<dd>With these settings, emails are encrypted whenever possible.
<p>This is like sending emails as letters instead of postcards. Unlike postcards letters usually hide their contents while in transit. However as with letters, you can't be sure that nobody is opening the letter while it is in transit, but some technical effort is necessary for that.
<p>Technically, the risk is that you accidentally use &quot;faked keys&quot; you got from somewhere or somebody claiming that the key belongs to the person you want to send emails to.</dd>
<dt>Thorough (Careful/Accurate/Elaborated) Encryption</dt>
<dd>With these settings, email are encrypted using only keys you can trust (either signed by you or signed by people you trust).
<p> This follows the default trust model of PGP, which accepts keys as &quot;valid for encryption&quot; only, if you explicitly signed them or enough people you trust signed them.
<p>
While this model eliminates some additional risks,
it requires that you actively sign keys and declare owner trust.</dd>
<p>If you just want to switch from sending emails without encryption to sending emails encrypted whenever possible, convenient encryption is probably your choice. </p>
<p>If it is key for you that content you send encrypted can't be read by other people or organizations, choose thorough encryption.</p>
</body>
</html>
......@@ -57,10 +57,10 @@ my @genFiles = (
my @files = (
"am-enigprefs.properties",
"help/rulesEditor.html",
"help/compose.html",
"help/editRcptRule.html",
"help/messenger.html",
"help/editRcptRule.html"
"help/rulesEditor.html",
);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment