Changeset 0ba9d1


Ignore:
Timestamp:
Sep 11, 2009, 3:50:45 PM (12 years ago)
Author:
rene <rene@…>
Branches:
lite_0.1, multiEdit, ng_0.6, ng_0.6_help, ng_0.8, ng_0.9
Children:
aac9e6
Parents:
0e7111
Message:

implemented switch to use existing Identities without interaction

Files:
5 edited

Legend:

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

    r0e7111 r0ba9d1  
    8383                "VIdent_identity.idSelection_ask_always",
    8484                "VIdent_identity.idSelection_autocreate",
     85                "VIdent_identity.idSelection_preferExisting",
    8586                "VIdent_identity.autoReplyToSelf"],
    8687   
     
    149150            mAttr("VIdent_identity.idSelection_autocreate","disabled",idSelectionConstraint);
    150151            mAttr("VIdent_identity.idSelection_autocreate.desc","disabled",idSelectionConstraint);
     152            mAttr("VIdent_identity.idSelection_preferExisting","disabled",idSelectionConstraint);
    151153            mAttr("selection","featureDisabled",idSelectionConstraint);
    152154            mAttr("toCompose","featureDisabled",idSelectionConstraint);
  • chrome/content/v_identity/vI_prefDialog.xul

    r0e7111 r0ba9d1  
    285285                        id="VIdent_identity.idSelection_autocreate.desc" />
    286286                    </hbox>
     287                   
     288                    <checkbox id="VIdent_identity.idSelection_preferExisting" label="&vI_prefDialog.idSelection.preferExisting.label;"
     289                        prefstring="idSelection_preferExisting" />
     290
    287291                </vbox>
    288292                </groupbox>
  • chrome/content/v_identity/vI_smartIdentity.js

    r0e7111 r0ba9d1  
    362362   
    363363    __smartIdentitySelection : function(allIdentities, autocreate) {
    364         /* compare with existing Identities and prefer it                       */
     364        document.getElementById("msgIdentity_clone").addIdentitiesToCloneMenu(allIdentities);
     365
     366        /* compare with existing Identities                                     */
    365367        for (var index = 0; index < allIdentities.number; index++) {
    366368            if (allIdentities.identityDataCollection[index].isExistingIdentity(true)) {
     369                // if 'preferExisting' than select it and return
     370                if (vI.preferences.getBoolPref("idSelection_preferExisting")) {
     371                    vI_notificationBar.dump("## vI_smartIdentity: found existing Identity, use without interaction.\n");
     372                    vI_smartIdentity.changeIdentityToSmartIdentity(allIdentities, index);
     373                    return;
     374                }
     375                // else reorder list of Identities to prefer it on autoselect
    367376                vI_notificationBar.dump("## vI_smartIdentity: found existing Identity, prefer this one.\n");
    368377                var firstIdentity = allIdentities.identityDataCollection[index];
     
    374383            }
    375384        }
    376 
    377         document.getElementById("msgIdentity_clone").addIdentitiesToCloneMenu(allIdentities);
    378385       
    379386        if (!autocreate && vI.preferences.getBoolPref("idSelection_ask") &&
  • chrome/locale/en-US/v_identity/vI_prefDialog.dtd

    r0e7111 r0ba9d1  
    6464<!ENTITY vI_prefDialog.idSelection.autocreate.label "use first found identity without interaction">
    6565<!ENTITY vI_prefDialog.idSelection.autocreate.desc "(if there is only one possible address)">
     66<!ENTITY vI_prefDialog.idSelection.preferExisting.label "use match with existing Identity without interaction">
    6667
    6768<!ENTITY vI_prefDialog.composeDialog.Cell0.label "Features">
  • defaults/preferences/preferences.js

    r0e7111 r0ba9d1  
    5151pref("extensions.virtualIdentity.idSelection_ask_always", false);
    5252pref("extensions.virtualIdentity.idSelection_autocreate", true);
     53pref("extensions.virtualIdentity.idSelection_preferExisting", true);
    5354pref("extensions.virtualIdentity.autoReplyToSelf", false);
    5455pref("extensions.{dddd428e-5ac8-4a81-9f78-276c734f75b8}.description", "chrome://v_identity/locale/v_identity.properties");
Note: See TracChangeset for help on using the changeset viewer.