NOT PART OF THE BUILD

Make the security options menu match the spec --> add access keys, make the selection a radio
widget.
r/sr=sspitzer
NOT PART OF THE BUILD

mailnews/extensions/smime/resources/content/msgCompSMIMEOverlay.js

@@ -51,32 +51,32 @@ function GetSecurityInfo()
   return smimeComposefields
 }
 
+function noEncryption()
+{
+  var smimeCompFields = GetSecurityInfo();
+  if (smimeCompFields)
+    smimeCompFields.alwaysEncryptMessage = false;
+}
+
 function encryptMessage()
 {
   var checkedNode = document.getElementById("menu_securityEncryptAlways");
-  var checked = checkedNode.getAttribute("checked");
+  var noEncryptionNode = document.getElementById("menu_securityNoEncryption");
 
   var smimeCompFields = GetSecurityInfo();
   
-  if (checked)
+  var encryptionCertName = gCurrentIdentity.getUnicharAttribute("encryption_cert_name");
+  if (!encryptionCertName) 
   {
-    var encryptionCertName = gCurrentIdentity.getUnicharAttribute("encryption_cert_name");
-    if (!encryptionCertName) 
-    {
-      alert(gComposeMsgsBundle.getString("chooseEncryptionCertMsg"));
-      checkedNode.removeAttribute("checked");
-      smimeCompFields.signMessage = false;
-      return;
-    }
+    alert(gComposeMsgsBundle.getString("chooseEncryptionCertMsg"));
+    checkedNode.removeAttribute("checked");
+    smimeCompFields.signMessage = false;
+    noEncryptionNode.setAttribute("checked");
+    return;
+  }
     
-    smimeCompFields.alwaysEncryptMessage = true;
-    checkedNode.setAttribute("checked", true);  
-  }
-  else
-  {
-    smimeCompFields.alwaysEncryptMessage = false;
-    checkedNode.removeAttribute("checked");  
-  }
+  smimeCompFields.alwaysEncryptMessage = true;
+  checkedNode.setAttribute("checked", true);
 }
 
 function signMessage()
@@ -111,5 +111,6 @@ function setSecuritySettings()
 { 
   var smimeCompFields = GetSecurityInfo();
   document.getElementById("menu_securityEncryptAlways").setAttribute("checked", smimeCompFields.alwaysEncryptMessage);
+  document.getElementById("menu_securityNoEncryption").setAttribute("checked", !smimeCompFields.alwaysEncryptMessage);
   document.getElementById("menu_securitySign").setAttribute("checked", smimeCompFields.signMessage);
 }

mailnews/extensions/smime/resources/content/msgCompSMIMEOverlay.xul

@@ -32,11 +32,16 @@
 
   <menupopup id="optionsMenuPopup">
     <menuseparator insertafter="fccMenu"/>
-    <menu label="&securityMenu.label;">
+    <menu label="&securityMenu.label;" accesskey="&securityMenu.accesskey;">
       <menupopup onpopupshowing="setSecuritySettings()">
-        <menuitem id="menu_securityEncryptIfPossible" type="checkbox" label="&menu_securityEncryptIfPossible.label;" disabled="true"/>
-        <menuitem id="menu_securityEncryptAlways" type="checkbox" label="&menu_securityEncryptAlways.label;" oncommand="encryptMessage()"/>
-        <menuitem id="menu_securitySign" type="checkbox" label="&menu_securitySign.label;" oncommand="signMessage()"/>
+        <menuitem id="menu_securityNoEncryption" type="radio" name="encryptmessage" 
+          accesskey="&menu_securityNoEncryption.accesskey;" label="&menu_securityNoEncryption.label;" oncommand="noEncryption()"/>
+        <menuitem id="menu_securityEncryptAlways" type="radio" name="encryptmessage" 
+          accesskey="&menu_securityEncryptAlways.accesskey;" label="&menu_securityEncryptAlways.label;" oncommand="encryptMessage()"/>
+        <menuitem id="menu_securityEncryptIfPossible" type="radio" name="encryptmessage" 
+          accesskey="&menu_securityEncryptIfPossible.accesskey;" label="&menu_securityEncryptIfPossible.label;" disabled="true"/>
+        <menuseparator/>
+        <menuitem id="menu_securitySign" type="checkbox" accesskey="&menu_securitySign.accesskey;" label="&menu_securitySign.label;" oncommand="signMessage()"/>
       </menupopup>
     </menu>
   </menupopup>

mailnews/extensions/smime/resources/locale/en-US/msgCompSMIMEOverlay.dtd

@@ -1,7 +1,16 @@
 <!--LOCALIZATION NOTE msgCompSMIMEOverlay.dtd UI for s/mime hooks in message composition -->
 
 <!ENTITY securityMenu.label "Security">
-<!ENTITY menu_securityEncryptIfPossible.label "Encrypt if Possible">
-<!ENTITY menu_securityEncryptAlways.label "Always Encrypt">
-<!ENTITY menu_securitySign.label "Sign">
+<!ENTITY securityMenu.accesskey "e">
 
+<!ENTITY menu_securityEncryptIfPossible.label "Encrypt if Possible">
+<!ENTITY menu_securityEncryptIfPossible.accesskey "E">
+
+<!ENTITY menu_securityEncryptAlways.label "Always Encrypt">
+<!ENTITY menu_securityEncryptAlways.accesskey "A">
+
+<!ENTITY menu_securityNoEncryption.label "No Encryption">
+<!ENTITY menu_securityNoEncryption.accesskey "N">
+
+<!ENTITY menu_securitySign.label "Digitally Sign">
+<!ENTITY menu_securitySign.accesskey "D">