Bug 221381 Add Attach Personal Card (vCard) option to Attach button

patch by bugzilla@arlen.demon.co.uk r=neil sr=bienvenu

mailnews/compose/resources/content/MsgComposeCommands.js

@@ -1219,7 +1219,7 @@ function ComposeStartup(recycled, aParams)
       }
       document.getElementById("returnReceiptMenu").setAttribute('checked', 
                                          gMsgCompose.compFields.returnReceipt);
-      document.getElementById("attachVCardMenu").setAttribute('checked', 
+      document.getElementById("cmd_attachVCard").setAttribute('checked', 
                                          gMsgCompose.compFields.attachVCard);
 
       // If recycle, editor is already created
@@ -2451,7 +2451,7 @@ function LoadIdentity(startup)
               prevAttachVCard != newAttachVCard)
           {
             msgCompFields.attachVCard = newAttachVCard;
-            document.getElementById("attachVCardMenu").setAttribute('checked',msgCompFields.attachVCard);
+            document.getElementById("cmd_attachVCard").setAttribute('checked',msgCompFields.attachVCard);
           }
 
           if (newReplyTo != prevReplyTo)

mailnews/compose/resources/content/messengercompose.xul

@@ -103,6 +103,7 @@
   <command id="cmd_new" oncommand="goDoCommand('cmd_newMessage')"/>
   <command id="cmd_attachFile" oncommand="goDoCommand('cmd_attachFile')"/>
   <command id="cmd_attachPage" oncommand="goDoCommand('cmd_attachPage')"/>
+  <command id="cmd_attachVCard" checked="false" oncommand="ToggleAttachVCard(event.target)"/>
   <command id="cmd_close" oncommand="goDoCommand('cmd_close')"/>
   <command id="cmd_saveDefault" oncommand="goDoCommand('cmd_saveDefault')"/>
   <command id="cmd_saveAsFile" oncommand="goDoCommand('cmd_saveAsFile')"/>
@@ -299,7 +300,7 @@
           <menuitem label="&quoteCmd.label;" accesskey="&quoteCmd.accesskey;" command="cmd_quoteMessage"/>
           <menuseparator/>
           <menuitem id="returnReceiptMenu" type="checkbox" label="&returnReceiptMenu.label;" accesskey="&returnReceiptMenu.accesskey;" checked="false" oncommand="ToggleReturnReceipt(event.target)"/>
-          <menuitem id="attachVCardMenu" type="checkbox" label="&attachVCardMenu.label;" accesskey="&attachVCardMenu.accesskey;" checked="false" oncommand="ToggleAttachVCard(event.target)"/>
+          <menuitem type="checkbox" label="&attachVCardMenu.label;" accesskey="&attachVCardMenu.accesskey;" command="cmd_attachVCard"/>
           <menuseparator/>
           <menu id="outputFormatMenu" label="&outputFormatMenu.label;" accesskey="&outputFormatMenu.accesskey;" command="cmd_outputFormat">
             <menupopup>
@@ -406,6 +407,8 @@
          <menupopup>
            <menuitem label="&attachFileButton.label;" accesskey="&attachFileCmd.accesskey;" command="cmd_attachFile"/>
            <menuitem label="&attachPageButton.label;" accesskey="&attachPageCmd.accesskey;" command="cmd_attachPage"/>
+           <menuseparator/>
+           <menuitem type="checkbox" label="&attachVCardButton.label;" accesskey="&attachVCardCmd.accesskey;" command="cmd_attachVCard"/>
          </menupopup>
        </toolbarbutton>
        <toolbarbutton class="toolbarbutton-1"

mailnews/compose/resources/locale/en-US/messengercompose.dtd

@@ -31,6 +31,9 @@
 <!ENTITY attachPageCmd.label "Attach Web Page...">
 <!ENTITY attachPageCmd.accesskey "W">
 <!ENTITY attachPageButton.label "Web Page...">
+<!ENTITY attachVCardCmd.accesskey "P">
+<!--LOCALIZATION NOTE attachVCardButton.label Don't translate the term 'vCard' -->
+<!ENTITY attachVCardButton.label "Personal Card (vCard)">
 <!ENTITY sendNowCmd.label "Send Now">
 <!ENTITY sendCmd.keycode "VK_RETURN">
 <!ENTITY sendNowCmd.accesskey "d">