Changeset f4784d


Ignore:
Timestamp:
Jan 1, 2010, 4:51:22 PM (12 years ago)
Author:
rene <rene@…>
Branches:
multiEdit, ng_0.6, ng_0.8, ng_0.9
Children:
e7fa0c
Parents:
80940ab
Message:

added switch to takeover stored identity while sending

Location:
chrome
Files:
4 edited

Legend:

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

    r80940ab rf4784d  
    4141        if (warning.class == "replaceVIdentity") {
    4242            document.documentElement.getButton("extra1").hidden = true;
     43            document.documentElement.getButton("extra2").hidden = true;
    4344        }
    4445    }
  • chrome/content/v_identity/vI_Dialog.xul

    r80940ab rf4784d  
    3030
    3131<dialog id="vI_Dialog" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    32     buttons="accept,cancel,extra1"
     32    buttons="accept,cancel,extra1,extra2"
    3333        buttonlabelextra1="&vident.vI_Dialog.extra1Button.label;"
    3434    buttoniconextra1="no"
     35        buttonlabelextra2="&vident.vI_Dialog.extra2Button.label;"
     36    buttoniconextra2="no"
    3537        title="Virtual Identity"
    3638    zlevel="6"
     
    3941    ondialogcancel="window.close(); window.arguments[1].returnValue = 'cancel';"
    4042    ondialogextra1="window.close(); window.arguments[1].returnValue = 'abort';"
     43    ondialogextra2="window.close(); window.arguments[1].returnValue = 'takeover';"
    4144    persist="height width">
    4245
  • chrome/content/v_identity/vI_storage.js

    r80940ab rf4784d  
    282282                vI_notificationBar.dump("## vI_storage: __updateStorageFromVIdentity overwrite warning\n");
    283283                doUpdate = vI_storage.__askWarning(vI_storage.__getWarning("updateStorage", recipient, storageDataByTypeCompResult.compareMatrix));
     284                if (doUpdate == "takeover") {
     285                    var msgIdentityCloneElem = document.getElementById("msgIdentity_clone");
     286                    msgIdentityCloneElem.selectedMenuItem = msgIdentityCloneElem.addIdentityToCloneMenu(storageDataByType);
     287                    return false;
     288                }
    284289                if (doUpdate == "abort") return false;
    285290            }
  • chrome/locale/en-US/v_identity/v_identity.dtd

    r80940ab rf4784d  
    1919
    2020<!ENTITY vident.vI_Dialog.extra1Button.label "Abort Sending">
     21<!ENTITY vident.vI_Dialog.extra2Button.label "Use Stored Identity">
    2122
    2223<!ENTITY fccMailFolder.accesskey "P">
Note: See TracChangeset for help on using the changeset viewer.