Changeset fd8981


Ignore:
Timestamp:
Nov 4, 2007, 4:29:40 PM (12 years ago)
Author:
rene <rene@…>
Branches:
master
Children:
a9edcd
Parents:
a72ca3
Message:

added experimental option to disable query on addressbook-update if email has multiple recipients

Files:
13 edited

Legend:

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

    ra72ca3 rfd8981  
    3232   
    3333    VIdentityString : null,
     34    multipleRecipients : null,
    3435   
    3536    lastCheckedEmail : {}, // array of last checked emails per row, to prevent ugly double dialogs
     
    336337        var old_address = vI.helper.getAddress();
    337338       
     339       
     340        dontUpdateMultipleNoEqual = (vI.preferences.getBoolPref("experimental") &&
     341                vI.preferences.getBoolPref("aBook_dont_update_multiple") &&
     342                vI_addressBook.multipleRecipients)
     343       
    338344        if (addresses) {
    339             if (!vI_addressBook.equalsCurrentIdentity(addresses)) {
     345            if (!vI_addressBook.equalsCurrentIdentity(addresses) &&
     346                !dontUpdateMultipleNoEqual) {
    340347                var warning =   vI.elements.strings.getString("vident.updateAddressBook.warning1") +
    341348                        email +
     
    376383        // store VIdentityString
    377384        vI_addressBook.storeCurrentVIdentityString()
     385
     386        // check if there are multiple recipients
     387        vI_addressBook.multipleRecipients = false;
     388        var recipients = 0;
     389        for (var row = 1; row <= top.MAX_RECIPIENTS; row ++) {
     390            var recipientType = awGetPopupElement(row).selectedItem.getAttribute("value");
     391            if (recipientType == "addr_reply" || recipientType == "addr_followup") continue;
     392            if (recipients++ == 1) {
     393                vI_addressBook.multipleRecipients = true
     394                break;
     395            }
     396        }           
    378397       
    379398        for (var row = 1; row <= top.MAX_RECIPIENTS; row ++) {
  • chrome/content/v_identity/vI_prefDialog.js

    ra72ca3 rfd8981  
    6262                "VIdent_identity.aBook_use",
    6363                "VIdent_identity.aBook_storedefault",
     64                "VIdent_identity.aBook_dont_update_multiple",
    6465                "VIdent_identity.aBook_show_switch",
    6566                "VIdent_identity.aBook_warn_update",
     
    271272        vI_prefDialog.base.smartReplyHideSignature();
    272273        vI_prefDialog.base.aBookConstraint(document.getElementById("VIdent_identity.aBook_use"));
    273         vI_prefDialog.base.aBookCheckCounter();
     274        window.setTimeout(vI_prefDialog.base.aBookCheckCounter, 0); // do this in background, cause this might take a while
    274275       
    275276        if (vI_prefDialog.preferences.getBoolPref("experimental")){
    276277            document.getElementById("autoReplyToSelfSpacer").setAttribute("hidden", "false")
    277278            document.getElementById("VIdent_identity.autoReplyToSelf").setAttribute("hidden", "false")
     279            document.getElementById("VIdent_identity.aBook_dont_update_multiple").setAttribute("hidden", "false")
    278280        }
    279281       
  • chrome/content/v_identity/vI_prefDialog.xul

    ra72ca3 rfd8981  
    291291                <checkbox id="VIdent_identity.aBook_warn_update" label="&vident.prefs.aBook.warn_update.label;"
    292292                    prefstring="aBook_warn_update"/>
     293                <checkbox id="VIdent_identity.aBook_dont_update_multiple" label="&vident.prefs.aBook.dont_update_multiple.label;"
     294                    prefstring="aBook_dont_update_multiple" hidden="true"/>
    293295            </vbox>
    294296            </groupbox>
  • chrome/locale/cs-CZ/v_identity/v_identity.dtd

    ra72ca3 rfd8981  
    6262<!ENTITY vident.prefs.aBook.storedefault.label "save Virtual Identities while sending emails">
    6363<!ENTITY vident.prefs.aBook.warn_update.label "ask before overwriting Virtual Identities in your Addressbook">
     64<!ENTITY vident.prefs.aBook.dont_update_multiple.label "never overwrite (and ask) if email has multiple recipients">
    6465<!ENTITY vident.prefs.aBook.show_switch.label "show switch to activate/deactivate saving of Identities">
    6566<!ENTITY vident.prefs.aBook.warn_vI_replace.label "ask before Virtual Identity in Sender-Field will be replaced">
  • chrome/locale/de-DE/v_identity/v_identity.dtd

    ra72ca3 rfd8981  
    6262<!ENTITY vident.prefs.aBook.storedefault.label "speichere Virtuelle IdentitÀten beim Senden von Emails">
    6363<!ENTITY vident.prefs.aBook.warn_update.label "frage nach, bevor Virtuelle IdentitÀten im Adressbuch Ìberschrieben werden">
     64<!ENTITY vident.prefs.aBook.dont_update_multiple.label "ÃŒberschreibe keine EintrÀge wenn Email an mehrere EmpfÀnger geht">
    6465<!ENTITY vident.prefs.aBook.show_switch.label "zeige Schalter zum Aktivieren/Deaktivieren der Speicherung">
    6566<!ENTITY vident.prefs.aBook.warn_vI_replace.label "frage nach, wenn im Sender-Feld eingetragene Virtuelle IdentitÀt ersetzt werden soll">
  • chrome/locale/en-US/v_identity/v_identity.dtd

    ra72ca3 rfd8981  
    6262<!ENTITY vident.prefs.aBook.storedefault.label "save Virtual Identities while sending emails">
    6363<!ENTITY vident.prefs.aBook.warn_update.label "ask before overwriting Virtual Identities in your Addressbook">
     64<!ENTITY vident.prefs.aBook.dont_update_multiple.label "never overwrite (and ask) if email has multiple recipients">
    6465<!ENTITY vident.prefs.aBook.show_switch.label "show switch to activate/deactivate saving of Identities">
    6566<!ENTITY vident.prefs.aBook.warn_vI_replace.label "ask before Virtual Identity in Sender-Field will be replaced">
  • chrome/locale/es-ES/v_identity/v_identity.dtd

    ra72ca3 rfd8981  
    6262<!ENTITY vident.prefs.aBook.storedefault.label "guardar las identidades virtuales al enviar los correos">
    6363<!ENTITY vident.prefs.aBook.warn_update.label "preguntar siempre antes de sobreescribir las identidades virtuales en la libreta de direcciones">
     64<!ENTITY vident.prefs.aBook.dont_update_multiple.label "never overwrite (and ask) if email has multiple recipients">
    6465<!ENTITY vident.prefs.aBook.show_switch.label "mostrar selector para activar/desactivar la opción de guardar las identidades">
    6566<!ENTITY vident.prefs.aBook.warn_vI_replace.label "preguntar antes de reemplazar el campo remitente con la identidad virtual">
  • chrome/locale/fr-FR/v_identity/v_identity.dtd

    ra72ca3 rfd8981  
    6262<!ENTITY vident.prefs.aBook.storedefault.label "save Virtual Identities while sending emails">
    6363<!ENTITY vident.prefs.aBook.warn_update.label "ask before overwriting Virtual Identities in your Addressbook">
     64<!ENTITY vident.prefs.aBook.dont_update_multiple.label "never overwrite (and ask) if email has multiple recipients">
    6465<!ENTITY vident.prefs.aBook.show_switch.label "show switch to activate/deactivate saving of Identities">
    6566<!ENTITY vident.prefs.aBook.warn_vI_replace.label "ask before Virtual Identity in Sender-Field will be replaced">
  • chrome/locale/it-IT/v_identity/v_identity.dtd

    ra72ca3 rfd8981  
    6262<!ENTITY vident.prefs.aBook.storedefault.label "Salva le identità virtuali in occasione dell&apos;invio dei messaggi">
    6363<!ENTITY vident.prefs.aBook.warn_update.label "Chiedi conferma prima di sovrascrivere le identità virtuali presenti in rubrica">
     64<!ENTITY vident.prefs.aBook.dont_update_multiple.label "never overwrite (and ask) if email has multiple recipients">
    6465<!ENTITY vident.prefs.aBook.show_switch.label "Mostra opzione per attivare/disattivare il salvataggio delle identità">
    6566<!ENTITY vident.prefs.aBook.warn_vI_replace.label "Chiedi conferma prima di sostituire il campo &apos;Mittente&apos; con un&apos;identità virtuale">
  • chrome/locale/ko-KR/v_identity/v_identity.dtd

    ra72ca3 rfd8981  
    6565<!ENTITY vident.prefs.aBook.storedefault.label "save Virtual Identities while sending emails">
    6666<!ENTITY vident.prefs.aBook.warn_update.label "ask before overwriting Virtual Identities in your Addressbook">
     67<!ENTITY vident.prefs.aBook.dont_update_multiple.label "never overwrite (and ask) if email has multiple recipients">
    6768<!ENTITY vident.prefs.aBook.show_switch.label "show switch to activate/deactivate saving of Identities">
    6869<!ENTITY vident.prefs.aBook.warn_vI_replace.label "ask before Virtual Identity in Sender-Field will be replaced">
  • chrome/locale/nl-NL/v_identity/v_identity.dtd

    ra72ca3 rfd8981  
    6262<!ENTITY vident.prefs.aBook.storedefault.label "Virtuele identiteiten opslaan bij verzenden e-mailberichten">
    6363<!ENTITY vident.prefs.aBook.warn_update.label "Vragen voordat virtuele identiteiten in uw adresboek worden overschreven">
     64<!ENTITY vident.prefs.aBook.dont_update_multiple.label "never overwrite (and ask) if email has multiple recipients">
    6465<!ENTITY vident.prefs.aBook.show_switch.label "Schakelaar om opslaan van identiteiten te activeren/deactiveren laten zien">
    6566<!ENTITY vident.prefs.aBook.warn_vI_replace.label "Vragen voordat de virtuele identiteit in het afzendersveld wordt vervangen">
  • chrome/locale/sk-SK/v_identity/v_identity.dtd

    ra72ca3 rfd8981  
    6262<!ENTITY vident.prefs.aBook.storedefault.label "Ukladať Virtuálne identity počas odosielania emailov">
    6363<!ENTITY vident.prefs.aBook.warn_update.label "SpÜtať sa pred prepísaním Virtuálnej Identity v Adresáry">
     64<!ENTITY vident.prefs.aBook.dont_update_multiple.label "never overwrite (and ask) if email has multiple recipients">
    6465<!ENTITY vident.prefs.aBook.show_switch.label "Ukázať prepnutie zapnutia/vypnutia uloşenej totoşnosti">
    6566<!ENTITY vident.prefs.aBook.warn_vI_replace.label "SpÜtať sa pred nahradením Virtuálnej Identity v poli odosielateğa">
  • defaults/preferences/preferences.js

    ra72ca3 rfd8981  
    2828pref("extensions.virtualIdentity.aBook_use_non_vI", false);
    2929pref("extensions.virtualIdentity.aBook_storedefault", true);
     30pref("extensions.virtualIdentity.aBook_dont_update_multiple", true);
    3031pref("extensions.virtualIdentity.aBook_show_switch", true);
    3132pref("extensions.virtualIdentity.aBook_warn_update", true);
Note: See TracChangeset for help on using the changeset viewer.