Changeset f4784d

Timestamp:

Jan 1, 2010, 4:51:22 PM (13 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:

• content/v_identity/vI_Dialog.js (modified) (1 diff)
• content/v_identity/vI_Dialog.xul (modified) (2 diffs)
• content/v_identity/vI_storage.js (modified) (1 diff)
• locale/en-US/v_identity/v_identity.dtd (modified) (1 diff)

chrome/content/v_identity/vI_Dialog.js

@@ -41 +41 @@
         if (warning.class == "replaceVIdentity") {
             document.documentElement.getButton("extra1").hidden = true;
+            document.documentElement.getButton("extra2").hidden = true;
         }
     }

chrome/content/v_identity/vI_Dialog.xul

@@ -30 +30 @@
 
 <dialog id="vI_Dialog" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    buttons="accept,cancel,extra1"
+    buttons="accept,cancel,extra1,extra2"
         buttonlabelextra1="&vident.vI_Dialog.extra1Button.label;"
     buttoniconextra1="no"
+        buttonlabelextra2="&vident.vI_Dialog.extra2Button.label;"
+    buttoniconextra2="no"
         title="Virtual Identity"
     zlevel="6"
@@ -39 +41 @@
     ondialogcancel="window.close(); window.arguments[1].returnValue = 'cancel';"
     ondialogextra1="window.close(); window.arguments[1].returnValue = 'abort';"
+    ondialogextra2="window.close(); window.arguments[1].returnValue = 'takeover';"
     persist="height width">
 

chrome/content/v_identity/vI_storage.js

@@ -282 +282 @@
                 vI_notificationBar.dump("## vI_storage: __updateStorageFromVIdentity overwrite warning\n");
                 doUpdate = vI_storage.__askWarning(vI_storage.__getWarning("updateStorage", recipient, storageDataByTypeCompResult.compareMatrix));
+                if (doUpdate == "takeover") {
+                    var msgIdentityCloneElem = document.getElementById("msgIdentity_clone");
+                    msgIdentityCloneElem.selectedMenuItem = msgIdentityCloneElem.addIdentityToCloneMenu(storageDataByType);
+                    return false;
+                }
                 if (doUpdate == "abort") return false;
             }

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

@@ -19 +19 @@
 
 <!ENTITY vident.vI_Dialog.extra1Button.label "Abort Sending">
+<!ENTITY vident.vI_Dialog.extra2Button.label "Use Stored Identity">
 
 <!ENTITY fccMailFolder.accesskey "P">