Changeset be337d

Timestamp:

Dec 14, 2009, 4:28:37 PM (11 years ago)

Author:

rene <rene@…>

Branches:

multiEdit, ng_0.6, ng_0.8, ng_0.9

Children:

8ea0df

Parents:

9c2ab4

Message:

added option to hide crypto-signatures on virtualID usage

Files:

• chrome/content/v_identity/vI_msgIdentityCloneTools.js (modified) (1 diff)
• chrome/content/v_identity/vI_prefDialog.js (modified) (2 diffs)
• chrome/content/v_identity/vI_prefDialog.xul (modified) (1 diff)
• chrome/locale/en-US/v_identity/vI_prefDialog.dtd (modified) (1 diff)
• defaults/preferences/preferences.js (modified) (1 diff)

chrome/content/v_identity/vI_msgIdentityCloneTools.js

@@ -42 +42 @@
     signatureSwitch: function(existingIdentity) {
         if (!existingIdentity) {
-            // code to hide the signature
+            vI_notificationBar.dump("## vI_msgIdentityCloneTools: signatureSwitch hide/remove signatures\n");
+            // code to hide the text signature
             try { if (vI.preferences.getBoolPref("hide_signature") && ss_signature.length == 0)
                 ss_main.signatureSwitch()
             } catch(vErr) { };
+            // code to hide the sMime signature
+            try { if (vI.preferences.getBoolPref("hide_sMime_messageSignature")) {
+                var element = document.getElementById("menu_securitySign1");
+                if (element.getAttribute("checked") == "true") {
+                    vI_notificationBar.dump("## signatureSwitch hide_sMime_messageSignature with doCommand\n");
+                    element.doCommand();
+                }
+            }
+            //  document.getElementById("menu_securitySign1").removeAttribute("checked");
+            } catch(vErr) { };
+            // code to hide the openGPG signature
+            try { if (vI.preferences.getBoolPref("hide_openPGP_messageSignature")) {
+                var element = document.getElementById("enigmail_signed_send");
+                if (element.getAttribute("checked") == "true") {
+                    vI_notificationBar.dump("## signatureSwitch hide_openPGP_messageSignature with doCommand\n");
+                    element.doCommand();
+                }
+            }
+            //  document.getElementById("enigmail_signed_send").removeAttribute("checked");
+            } catch(vErr) { };
         }
         else {
-            // code to show the signature
+            vI_notificationBar.dump("## vI_msgIdentityCloneTools: signatureSwitch restore signature\n");
+            // code to show the text signature
             try { if (ss_signature.length > 0) ss_main.signatureSwitch(); }
             catch(vErr) { };
+            // sMime and openGPG signature will not be re-added automatically
         }
     },

chrome/content/v_identity/vI_prefDialog.js

@@ -61 +61 @@
                 "VIdent_identity.warn_virtual",
                 "VIdent_identity.hide_signature",
+                "VIdent_identity.hide_sMime_messageSignature",
+                "VIdent_identity.hide_openPGP_messageSignature",
                 "VIdent_identity.storage",
                 "VIdent_identity.storage_storedefault",
@@ -256 +258 @@
         }
         const enigmail_ID="{847b3a00-7ab1-11d4-8f02-006008948af5}"
-        if (!vI_helper.extensionActive(enigmail_ID))
+        if (!vI_helper.extensionActive(enigmail_ID)) {
             document.getElementById("openPGPencryption").setAttribute("hidden", "true");
-
+            document.getElementById("VIdent_identity.hide_openPGP_messageSignature").setAttribute("hidden", "true");
+        }
+        
         vI_prefDialog.base.smartReplyConstraint(document.getElementById("VIdent_identity.smart_reply"));
         vI_prefDialog.base.smartReplyHideSignature();

chrome/content/v_identity/vI_prefDialog.xul

@@ -321 +321 @@
                     <checkbox id="VIdent_identity.hide_signature" label="&vI_prefDialog.composeDialog.HideSignature.label;" disabled="true"
                         prefstring="hide_signature"/>
+                    <checkbox id="VIdent_identity.hide_sMime_messageSignature" label="&vI_prefDialog.composeDialog.HideSMimeSignature.label;"
+                        prefstring="hide_sMime_messageSignature"/>
+                    <checkbox id="VIdent_identity.hide_openPGP_messageSignature" label="&vI_prefDialog.composeDialog.HideOpenPGPSignature.label;"
+                        prefstring="hide_openPGP_messageSignature"/>
                     <checkbox id="VIdent_identity.autoReplyToSelf" label="&vI_prefDialog.composeDialog.autoReplyToSelf.label;"
                         prefstring="autoReplyToSelf"/>

chrome/locale/en-US/v_identity/vI_prefDialog.dtd

@@ -78 +78 @@
 <!ENTITY vI_prefDialog.composeDialog.HideSignature.warning.desc "note: to enable dynamic deactivation of signatures you have to install (and activate) the &apos;Signature Switch&apos; extension. By now this option is not available.">
 <!ENTITY vI_prefDialog.composeDialog.HideSignature.label "remove any &apos;Signatur&apos; while using a Virtual Identity">
+<!ENTITY vI_prefDialog.composeDialog.HideSMimeSignature.label "deactivate S/MIME signature when using a Virtual Identity">
+<!ENTITY vI_prefDialog.composeDialog.HideOpenPGPSignature.label "deactivate openPGP signature when using a Virtual Identity">
 <!ENTITY vI_prefDialog.composeDialog.autoReplyToSelf.label "set Virtual Identity as Reply-To address">
 <!ENTITY vI_prefDialog.composeDialog.SMTP.label "show SMTP Menu">

defaults/preferences/preferences.js

@@ -29 +29 @@
 pref("extensions.virtualIdentity.warn_virtual", false);
 pref("extensions.virtualIdentity.hide_signature", false);
+pref("extensions.virtualIdentity.hide_sMime_messageSignature", false);
+pref("extensions.virtualIdentity.hide_openPGP_messageSignature", false);
 pref("extensions.virtualIdentity.storage", true);
 pref("extensions.virtualIdentity.storage_storedefault", true);