From f22db2162abcfb2b6740ea71d97e524d09873d0c Mon Sep 17 00:00:00 2001
From: "morse%netscape.com" <morse%netscape.com>
Date: Sat, 17 Jun 2000 22:24:07 +0000
Subject: [PATCH] restoring changes that were accidentally backed out,
 r=dveditz

---
 .../resources/content/tasksOverlay.js         | 15 ++++++------
 .../resources/content/tasksOverlay.xul        | 23 +++++++++++--------
 .../resources/locale/en-US/tasksOverlay.dtd   |  7 +++---
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/xpfe/communicator/resources/content/tasksOverlay.js b/xpfe/communicator/resources/content/tasksOverlay.js
index 9728ca7e5db3..deecae503fe2 100644
--- a/xpfe/communicator/resources/content/tasksOverlay.js
+++ b/xpfe/communicator/resources/content/tasksOverlay.js
@@ -235,13 +235,6 @@ function HideImage() {
   element.setAttribute("disabled","true" );
 }
 
-function HideImage() {
-  var element;
-  element = document.getElementById("image");
-  element.setAttribute("style","display: none;" );
-  element.setAttribute("disabled","true" );
-}
-
 function HideEncryptOrObscure() {
   var elementOn, elementOff;
   if (this.pref.GetBoolPref("wallet.crypto")) {
@@ -260,6 +253,10 @@ function CheckForWalletAndImage()
   // remove either encrypt or obscure depending on pref setting
   HideEncryptOrObscure();
 
+  // remove quickfill since it was just for development purposes
+  element = document.getElementById("walletQuickFill");
+  element.setAttribute("style","display: none;" );
+
   // remove wallet functions if not in browser
   try {
     if (!appCore) {
@@ -292,7 +289,7 @@ function CheckForWalletAndImage()
 // perform a wallet action
 function WalletAction( action ) 
 {
-  if (action == "password" || action == "expire") {
+  if (action == "password" || action == "expire" || action == "clear") {
     wallet = Components.classes['component://netscape/wallet/wallet-service'];
     wallet = wallet.getService();
     wallet = wallet.QueryInterface(Components.interfaces.nsIWalletService);
@@ -301,6 +298,8 @@ function WalletAction( action )
       wallet.WALLET_ChangePassword();
     } else if (action == "expire") {
       wallet.WALLET_ExpirePassword();
+    } else if (action == "clear") {
+      wallet.WALLET_DeleteAll();
     }
     return;
   }
diff --git a/xpfe/communicator/resources/content/tasksOverlay.xul b/xpfe/communicator/resources/content/tasksOverlay.xul
index efdb2f80b777..d99e7a8a6b58 100644
--- a/xpfe/communicator/resources/content/tasksOverlay.xul
+++ b/xpfe/communicator/resources/content/tasksOverlay.xul
@@ -49,6 +49,19 @@
                     oncommand="WalletAction('encrypt');"/>
                   <menuitem value="&walletObscureCmd.label;" id="obscure"
                     oncommand="WalletAction('obscure');"/>
+                  <menuitem value="&walletClearCmd.label;" id="clear"
+                    oncommand="WalletAction('clear');"/>
+                </menupopup>
+              </menu>
+              <menu value="&walletFormManager.label;" id="wallet">
+                <menupopup>
+                  <menuitem id="walleteditor" value="&walletContentsCmd.label;" oncommand="WalletDialog('wallet');"/> 
+                  <menuitem value="&walletSafeFillCmd.label;" id="walletSafeFill" oncommand="WalletAction('safefill');"/> 
+                  <menuitem value="&walletQuickFillCmd.label;" id="walletQuickFill" oncommand="WalletAction('quickfill');"/> 
+                  <menuitem value="&walletRequestToCaptureCmd.label;" id="walletCapture" oncommand="WalletAction('capture');"/> 
+                  <menuseparator/>
+                  <menuitem value="&walletInterviewCmd.label;" id="walletInterview" oncommand="WalletDialog('interview');"/> 
+                  <menuitem value="&walletSamplesCmd.label;" id="walletSamples" oncommand="WalletDialog('samples');"/> 
                 </menupopup>
               </menu>
               <menu value="&walletCookieManager.label;">
@@ -75,16 +88,6 @@
                             oncommand="WalletAction('imageBlock');"/> 
                 </menupopup>
               </menu>
-              <menu value="&walletFormManager.label;" id="wallet">
-                <menupopup>
-                  <menuitem id="walleteditor" value="&walletContentsCmd.label;" oncommand="WalletDialog('wallet');"/> 
-                  <menuitem value="&walletSafeFillCmd.label;" id="walletSafeFill" oncommand="WalletAction('safefill');"/> 
-                  <menuitem value="&walletQuickFillCmd.label;" id="walletQuickFill" oncommand="WalletAction('quickfill');"/> 
-                  <menuitem value="&walletRequestToCaptureCmd.label;" id="walletCapture" oncommand="WalletAction('capture');"/> 
-                  <menuitem value="&walletInterviewCmd.label;" id="walletInterview" oncommand="WalletDialog('interview');"/> 
-                  <menuitem value="&walletSamplesCmd.label;" id="walletSamples" oncommand="WalletDialog('samples');"/> 
-                </menupopup>
-              </menu>
             </menupopup> 
           </menu> 
           <menuseparator/>
diff --git a/xpfe/communicator/resources/locale/en-US/tasksOverlay.dtd b/xpfe/communicator/resources/locale/en-US/tasksOverlay.dtd
index 20c26242919e..252086e915c2 100644
--- a/xpfe/communicator/resources/locale/en-US/tasksOverlay.dtd
+++ b/xpfe/communicator/resources/locale/en-US/tasksOverlay.dtd
@@ -20,11 +20,11 @@
 <!ENTITY walletMenu.label "Privacy and Security">
 <!ENTITY walletFormManager.label "Form Manager">
 <!ENTITY walletPasswordManager.label "Password Manager">
-<!ENTITY walletSafeFillCmd.label "Prefill Form Safely">
+<!ENTITY walletSafeFillCmd.label "Prefill Form with Captured Data">
 <!ENTITY walletQuickFillCmd.label "Prefill Form Quickly">
-<!ENTITY walletRequestToCaptureCmd.label "Capture Data from Form">
+<!ENTITY walletRequestToCaptureCmd.label "Capture Data found on Form">
 <!-- LOCALIZATION NOTE (walletContentsCmd.label): Do NOT translate "Wallet"-->
-<!ENTITY walletContentsCmd.label "View Stored Form Data">
+<!ENTITY walletContentsCmd.label "View Captured Form Data">
 <!ENTITY walletDisplaySignonsCmd.label "View Stored Passwords">
 <!ENTITY walletDisplayCookiesCmd.label "View Stored Cookies">
 <!ENTITY walletAllowCookiesCmd.label "Allow Site to Set Cookies">
@@ -42,6 +42,7 @@
 <!ENTITY walletExpirePasswordCmd.label "Log Out">
 <!ENTITY walletEncryptCmd.label "Encrypt Stored Data">
 <!ENTITY walletObscureCmd.label "Obscure Stored Data">
+<!ENTITY walletClearCmd.label "Clear Stored Data">
 <!ENTITY walletCookieManager.label "Cookie Manager">
 <!ENTITY walletImageManager.label "Image Manager">