From 2f82ade54fd1e9fecc777c01fff0e358d9ca25d5 Mon Sep 17 00:00:00 2001
From: "morse%netscape.com" <morse%netscape.com>
Date: Sat, 29 Jul 2006 05:34:09 +0000
Subject: [PATCH] stage 1 for bug 42438, adding wallet functions to edit menu,
 r=dbragg

---
 suite/common/tasksOverlay.js                       |  8 ++------
 suite/common/tasksOverlay.xul                      |  1 +
 suite/locales/en-US/chrome/common/tasksOverlay.dtd | 10 +++++-----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/suite/common/tasksOverlay.js b/suite/common/tasksOverlay.js
index d9660b3ceaf1..61dd646da13f 100644
--- a/suite/common/tasksOverlay.js
+++ b/suite/common/tasksOverlay.js
@@ -344,17 +344,13 @@ function WalletAction( action )
   if( appCore ) {
     switch( action ) {
       case "safefill":
-        if (appCore.walletPreview(window, window._content)) {
-          window.alert(strings.getAttribute("noPrefills"));
-        }
+        appCore.walletPreview(window, window._content);
         break;
 //    case "password":
 //      appCore.walletChangePassword();
 //      break;
       case "quickfill": 
-        if (appCore.walletQuickFillin(window._content)) {
-          window.alert(strings.getAttribute("noPrefills"));
-        }
+        appCore.walletQuickFillin(window._content);
         break;
       case "capture":
       default:
diff --git a/suite/common/tasksOverlay.xul b/suite/common/tasksOverlay.xul
index 5ecf5a21d77e..bcd09f3ff6be 100644
--- a/suite/common/tasksOverlay.xul
+++ b/suite/common/tasksOverlay.xul
@@ -68,6 +68,7 @@
                 <menupopup>
                   <menuitem value="&walletContentsCmd.label;" accesskey="&walletContentsCmd.accesskey;" id="walleteditor" oncommand="WalletDialog('wallet');"/> 
                   <menuitem value="&walletSitesCmd.label;" accesskey="&walletSitesCmd.accesskey;" id="walletsites" oncommand="WalletDialog('walletsites');"/> 
+                  <menuseparator/>
                   <menuitem value="&walletSafeFillCmd.label;" accesskey="&walletSafeFillCmd.accesskey;" id="walletSafeFill" oncommand="WalletAction('safefill');"/> 
 <!--
                   <menuitem value="&walletQuickFillCmd.label;" accesskey="&walletQuickFillCmd.accesskey;" id="walletQuickFill" oncommand="WalletAction('quickfill');"/> 
diff --git a/suite/locales/en-US/chrome/common/tasksOverlay.dtd b/suite/locales/en-US/chrome/common/tasksOverlay.dtd
index e3ee27e0df89..de8910324488 100644
--- a/suite/locales/en-US/chrome/common/tasksOverlay.dtd
+++ b/suite/locales/en-US/chrome/common/tasksOverlay.dtd
@@ -32,17 +32,17 @@
 <!ENTITY walletFormManager.accesskey "f">
 <!ENTITY walletPasswordManager.label "Password Manager">
 <!ENTITY walletPasswordManager.accesskey "p">
-<!ENTITY walletSafeFillCmd.label "Prefill Form with Captured Data">
-<!ENTITY walletSafeFillCmd.accesskey "P">
+<!ENTITY walletSafeFillCmd.label "Prefill Form">
+<!ENTITY walletSafeFillCmd.accesskey "f">
 <!ENTITY walletQuickFillCmd.label "Prefill Form Quickly">
 <!ENTITY walletQuickFillCmd.accesskey "q">
-<!ENTITY walletRequestToCaptureCmd.label "Capture Data found on Form">
-<!ENTITY walletRequestToCaptureCmd.accesskey "c">
+<!ENTITY walletRequestToCaptureCmd.label "Save Form Data">
+<!ENTITY walletRequestToCaptureCmd.accesskey "S">
 <!-- LOCALIZATION NOTE (walletContentsCmd.label): Do NOT translate "Wallet"-->
 <!ENTITY walletContentsCmd.label "View Captured Form Data">
 <!ENTITY walletContentsCmd.accesskey "v">
 <!ENTITY walletSitesCmd.label "View Sites">
-<!ENTITY walletSitesCmd.accesskey "s">
+<!ENTITY walletSitesCmd.accesskey "w">
 <!ENTITY walletDisplaySignonsCmd.label "View Stored Passwords">
 <!ENTITY walletDisplaySignonsCmd.accesskey "v">
 <!ENTITY walletDisplayCookiesCmd.label "View Stored Cookies">