Changeset be337d


Ignore:
Timestamp:
Dec 14, 2009, 4:28:37 PM (12 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:
5 edited

Legend:

Unmodified
Added
Removed
  • chrome/content/v_identity/vI_msgIdentityCloneTools.js

    r9c2ab4 rbe337d  
    4242    signatureSwitch: function(existingIdentity) {
    4343        if (!existingIdentity) {
    44             // code to hide the signature
     44            vI_notificationBar.dump("## vI_msgIdentityCloneTools: signatureSwitch hide/remove signatures\n");
     45            // code to hide the text signature
    4546            try { if (vI.preferences.getBoolPref("hide_signature") && ss_signature.length == 0)
    4647                ss_main.signatureSwitch()
    4748            } catch(vErr) { };
     49            // code to hide the sMime signature
     50            try { if (vI.preferences.getBoolPref("hide_sMime_messageSignature")) {
     51                var element = document.getElementById("menu_securitySign1");
     52                if (element.getAttribute("checked") == "true") {
     53                    vI_notificationBar.dump("## signatureSwitch hide_sMime_messageSignature with doCommand\n");
     54                    element.doCommand();
     55                }
     56            }
     57            //  document.getElementById("menu_securitySign1").removeAttribute("checked");
     58            } catch(vErr) { };
     59            // code to hide the openGPG signature
     60            try { if (vI.preferences.getBoolPref("hide_openPGP_messageSignature")) {
     61                var element = document.getElementById("enigmail_signed_send");
     62                if (element.getAttribute("checked") == "true") {
     63                    vI_notificationBar.dump("## signatureSwitch hide_openPGP_messageSignature with doCommand\n");
     64                    element.doCommand();
     65                }
     66            }
     67            //  document.getElementById("enigmail_signed_send").removeAttribute("checked");
     68            } catch(vErr) { };
    4869        }
    4970        else {
    50             // code to show the signature
     71            vI_notificationBar.dump("## vI_msgIdentityCloneTools: signatureSwitch restore signature\n");
     72            // code to show the text signature
    5173            try { if (ss_signature.length > 0) ss_main.signatureSwitch(); }
    5274            catch(vErr) { };
     75            // sMime and openGPG signature will not be re-added automatically
    5376        }
    5477    },
  • chrome/content/v_identity/vI_prefDialog.js

    r9c2ab4 rbe337d  
    6161                "VIdent_identity.warn_virtual",
    6262                "VIdent_identity.hide_signature",
     63                "VIdent_identity.hide_sMime_messageSignature",
     64                "VIdent_identity.hide_openPGP_messageSignature",
    6365                "VIdent_identity.storage",
    6466                "VIdent_identity.storage_storedefault",
     
    256258        }
    257259        const enigmail_ID="{847b3a00-7ab1-11d4-8f02-006008948af5}"
    258         if (!vI_helper.extensionActive(enigmail_ID))
     260        if (!vI_helper.extensionActive(enigmail_ID)) {
    259261            document.getElementById("openPGPencryption").setAttribute("hidden", "true");
    260 
     262            document.getElementById("VIdent_identity.hide_openPGP_messageSignature").setAttribute("hidden", "true");
     263        }
     264       
    261265        vI_prefDialog.base.smartReplyConstraint(document.getElementById("VIdent_identity.smart_reply"));
    262266        vI_prefDialog.base.smartReplyHideSignature();
  • chrome/content/v_identity/vI_prefDialog.xul

    r9c2ab4 rbe337d  
    321321                    <checkbox id="VIdent_identity.hide_signature" label="&vI_prefDialog.composeDialog.HideSignature.label;" disabled="true"
    322322                        prefstring="hide_signature"/>
     323                    <checkbox id="VIdent_identity.hide_sMime_messageSignature" label="&vI_prefDialog.composeDialog.HideSMimeSignature.label;"
     324                        prefstring="hide_sMime_messageSignature"/>
     325                    <checkbox id="VIdent_identity.hide_openPGP_messageSignature" label="&vI_prefDialog.composeDialog.HideOpenPGPSignature.label;"
     326                        prefstring="hide_openPGP_messageSignature"/>
    323327                    <checkbox id="VIdent_identity.autoReplyToSelf" label="&vI_prefDialog.composeDialog.autoReplyToSelf.label;"
    324328                        prefstring="autoReplyToSelf"/>
  • chrome/locale/en-US/v_identity/vI_prefDialog.dtd

    r9c2ab4 rbe337d  
    7878<!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.">
    7979<!ENTITY vI_prefDialog.composeDialog.HideSignature.label "remove any &apos;Signatur&apos; while using a Virtual Identity">
     80<!ENTITY vI_prefDialog.composeDialog.HideSMimeSignature.label "deactivate S/MIME signature when using a Virtual Identity">
     81<!ENTITY vI_prefDialog.composeDialog.HideOpenPGPSignature.label "deactivate openPGP signature when using a Virtual Identity">
    8082<!ENTITY vI_prefDialog.composeDialog.autoReplyToSelf.label "set Virtual Identity as Reply-To address">
    8183<!ENTITY vI_prefDialog.composeDialog.SMTP.label "show SMTP Menu">
  • defaults/preferences/preferences.js

    r9c2ab4 rbe337d  
    2929pref("extensions.virtualIdentity.warn_virtual", false);
    3030pref("extensions.virtualIdentity.hide_signature", false);
     31pref("extensions.virtualIdentity.hide_sMime_messageSignature", false);
     32pref("extensions.virtualIdentity.hide_openPGP_messageSignature", false);
    3133pref("extensions.virtualIdentity.storage", true);
    3234pref("extensions.virtualIdentity.storage_storedefault", true);
Note: See TracChangeset for help on using the changeset viewer.