From 842d885a0f121a2ad9c57e101cd8061252902d22 Mon Sep 17 00:00:00 2001
From: "chanial%noos.fr" <chanial%noos.fr>
Date: Tue, 14 Oct 2003 05:20:35 +0000
Subject: [PATCH] removing comm.jar dependencies in the bookmarks component.
 Escape close the window and fix for bug 168412. Also remove the bookmark edit
 command (ex: cmd_bm_paste) and use the edit ones instead (ex: cmd_paste)

---
 .../components/bookmarks/content/bookmarks.js |  60 +++----
 .../bookmarks/content/bookmarksManager.xul    | 167 ++++++------------
 .../bookmarks/content/bookmarksMenu.js        |   6 +-
 .../bookmarks/content/bookmarksPanel.xul      |  52 ++----
 .../bookmarks/content/bookmarksTree.xml       |  10 +-
 .../components/bookmarks/locale/bookmarks.dtd |  12 +-
 .../bookmarks/locale/bookmarks.properties     |  10 +-
 7 files changed, 127 insertions(+), 190 deletions(-)

diff --git a/browser/components/bookmarks/content/bookmarks.js b/browser/components/bookmarks/content/bookmarks.js
index a0f89ad4b4e1..77cb8e5f62e8 100644
--- a/browser/components/bookmarks/content/bookmarks.js
+++ b/browser/components/bookmarks/content/bookmarks.js
@@ -267,50 +267,50 @@ var BookmarksCommand = {
     // ---------------------
     // bm_newfolder
     // ---------------------
-    // bm_cut
-    // bm_copy
-    // bm_paste
+    // cut
+    // copy
+    // paste
     // ---------------------
-    // bm_delete
+    // delete
     // ---------------------
     // bm_properties
     switch (type) {
     case "BookmarkSeparator":
       commands = ["bm_newfolder", "bm_separator", 
-                  "bm_cut", "bm_copy", "bm_paste", "bm_separator",
-                  "bm_delete", "bm_separator",
+                  "cut", "copy", "paste", "bm_separator",
+                  "delete", "bm_separator",
                   "bm_properties"];
       break;
     case "Bookmark":
       commands = ["bm_open", "bm_openinnewwindow", "bm_openinnewtab", "bm_separator",
                   "bm_newfolder", "bm_separator",
-                  "bm_cut", "bm_copy", "bm_paste", "bm_separator",
-                  "bm_delete", "bm_separator",
+                  "cut", "copy", "paste", "bm_separator",
+                  "delete", "bm_separator",
                   "bm_properties"];
       break;
     case "Folder":
       commands = ["bm_expandfolder", "bm_openfolder", "bm_managefolder", "bm_separator", 
                   "bm_newfolder", "bm_separator",
-                  "bm_cut", "bm_copy", "bm_paste", "bm_separator",
-                  "bm_delete", "bm_separator",
+                  "cut", "copy", "paste", "bm_separator",
+                  "delete", "bm_separator",
                   "bm_properties"];
       break;
     case "PersonalToolbarFolder":
       commands = ["bm_newfolder", "bm_separator",
-                  "bm_cut", "bm_copy", "bm_paste", "bm_separator",
-                  "bm_delete", "bm_separator",
+                  "cut", "copy", "paste", "bm_separator",
+                  "delete", "bm_separator",
                   "bm_properties"];
       break;
     case "IEFavoriteFolder":
-      commands = ["bm_expandfolder", "bm_separator", "bm_delete"];
+      commands = ["bm_expandfolder", "bm_separator", "delete"];
       break;
     case "IEFavorite":
       commands = ["bm_open", "bm_openinnewwindow", "bm_openinnewtab", "bm_separator",
-                  "bm_copy"];
+                  "copy"];
       break;
     case "FileSystemObject":
       commands = ["bm_open", "bm_openinnewwindow", "bm_openinnewtab", "bm_separator",
-                  "bm_copy"];
+                  "copy"];
       break;
     default: 
       commands = [];
@@ -761,11 +761,11 @@ var BookmarksController = {
     case "cmd_redo":
     case "cmd_bm_undo":
     case "cmd_bm_redo":
-    case "cmd_bm_cut":
-    case "cmd_bm_copy":
-    case "cmd_bm_paste":
-    case "cmd_bm_delete":
-    case "cmd_bm_selectAll":
+    case "cmd_cut":
+    case "cmd_copy":
+    case "cmd_paste":
+    case "cmd_delete":
+    case "cmd_selectAll":
     case "cmd_bm_open":
     case "cmd_bm_openinnewwindow":
     case "cmd_bm_openinnewtab":
@@ -810,7 +810,7 @@ var BookmarksController = {
     case "cmd_redo":
     case "cmd_bm_redo":
       return BMSVC.transactionManager.numberOfRedoItems > 0;
-    case "cmd_bm_paste":
+    case "cmd_paste":
       if (!BookmarksUtils.isValidTargetContainer(aTarget.parent))
         return false;
       const kClipboardContractID = "@mozilla.org/widget/clipboard;1";
@@ -830,12 +830,12 @@ var BookmarksController = {
       }
       var hasFlavours = clipboard.hasDataMatchingFlavors(flavourArray, kClipboardIID.kGlobalClipboard);
       return hasFlavours;
-    case "cmd_bm_copy":
+    case "cmd_copy":
       return length > 0;
-    case "cmd_bm_cut":
-    case "cmd_bm_delete":
+    case "cmd_cut":
+    case "cmd_delete":
       return length > 0 && !aSelection.containsImmutable && !aSelection.containsPTF;
-    case "cmd_bm_selectAll":
+    case "cmd_selectAll":
       return true;
     case "cmd_bm_open":
     case "cmd_bm_expandfolder":
@@ -915,16 +915,16 @@ var BookmarksController = {
     case "cmd_bm_properties":
       BookmarksCommand.openBookmarkProperties(aSelection);
       break;
-    case "cmd_bm_cut":
+    case "cmd_cut":
       BookmarksCommand.cutBookmark(aSelection);
       break;
-    case "cmd_bm_copy":
+    case "cmd_copy":
       BookmarksCommand.copyBookmark(aSelection);
       break;
-    case "cmd_bm_paste":
+    case "cmd_paste":
       BookmarksCommand.pasteBookmark(aTarget);
       break;
-    case "cmd_bm_delete":
+    case "cmd_delete":
       BookmarksCommand.deleteBookmark(aSelection);
       break;
     case "cmd_bm_movebookmark":
@@ -955,7 +955,7 @@ var BookmarksController = {
   {
     var commands = ["cmd_bm_newbookmark", "cmd_bm_newfolder", "cmd_bm_newseparator",
                     "cmd_undo", "cmd_redo", "cmd_bm_properties", "cmd_bm_rename", 
-                    "cmd_bm_copy", "cmd_bm_paste", "cmd_bm_cut", "cmd_bm_delete",
+                    "cmd_copy", "cmd_paste", "cmd_cut", "cmd_delete",
                     "cmd_bm_setpersonaltoolbarfolder", "cmd_bm_movebookmark", 
                     "cmd_bm_openfolder", "cmd_bm_managefolder"];
     for (var i = 0; i < commands.length; ++i) {
diff --git a/browser/components/bookmarks/content/bookmarksManager.xul b/browser/components/bookmarks/content/bookmarksManager.xul
index 67e176e63c7e..c84537cb7ec3 100644
--- a/browser/components/bookmarks/content/bookmarksManager.xul
+++ b/browser/components/bookmarks/content/bookmarksManager.xul
@@ -26,14 +26,8 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/bookmarks/bookmarksManager.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/bookmarks/bookmarks.css" type="text/css"?>
-<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
-
-<!DOCTYPE window [
-<!ENTITY % utilDTD SYSTEM "chrome://communicator/locale/utilityOverlay.dtd" >
-%utilDTD;
-<!ENTITY % bmDTD SYSTEM "chrome://browser/locale/bookmarks/bookmarks.dtd">
-%bmDTD;
-]>
+<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
+<!DOCTYPE window SYSTEM "chrome://browser/locale/bookmarks/bookmarks.dtd">
 
 <window id="bookmark-window" windowtype="bookmarks:manager"
         title="&bookmarksWindowTitle.label;"
@@ -44,86 +38,45 @@
         persist="width height screenX screenY sizemode"
         onload="Startup();" onunload="Shutdown();">
 
-  <!-- XXX - This should SO become an XBL widget -->
   <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://browser/content/utilityOverlay.js"/>
-
-  <!-- Shared Bookmarks Utility Library -->
-  <script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarks.js"/>
-  <!-- Bookmarks Window -->
-  <script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarksManager.js"/>
-
-  <!-- Bookmarks Window Drag & Drop -->
   <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
   <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
+  <script type="application/x-javascript" src="chrome://browser/content/utilityOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarks.js"/>
+  <script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarksManager.js"/>
 
-  <commands id="commands">
-    <commandset id="CommandUpdate_Bookmarks"
-                events="focus,tree-select"
-                oncommandupdate="document.getElementById('bookmarks-view').onCommandUpdate();">
-    </commandset>
+  <commandset id="editMenuCommands"/>
+  <commandset id="CommandUpdate_Bookmarks"
+              events="focus,tree-select"
+              oncommandupdate="document.getElementById('bookmarks-view').onCommandUpdate();">
+  </commandset>
 
-    <!-- File Menu -->
-    <command id="cmd_close" oncommand="close()"/>
-    <!-- Edit Menu -->
-    <command id="cmd_undo"/>
-    <command id="cmd_redo"/>
+  <command id="cmd_close" oncommand="window.close()"/>
+  <command id="cmd_bm_open"                      oncommand="goDoCommand('cmd_bm_open');"/>
+  <command id="cmd_bm_openinnewwindow"           oncommand="goDoCommand('cmd_bm_openinnewwindow');"/>
+  <command id="cmd_bm_openinnewtab"              oncommand="goDoCommand('cmd_bm_openinnewtab');"/>
+  <command id="cmd_bm_expandfolder"              oncommand="goDoCommand('cmd_bm_expandfolder');"/>
+  <command id="cmd_bm_openfolder"                oncommand="goDoCommand('cmd_bm_openfolder');"/>
+  <command id="cmd_bm_managefolder"              oncommand="goDoCommand('cmd_bm_managefolder');"/>
+  <command id="cmd_bm_newfolder"                 oncommand="goDoCommand('cmd_bm_newfolder');"/>
+  <command id="cmd_bm_newbookmark"               oncommand="goDoCommand('cmd_bm_newbookmark');"/>
+  <command id="cmd_bm_newseparator"              oncommand="goDoCommand('cmd_bm_newseparator');"/>
+  <command id="cmd_bm_find"                      oncommand="goDoCommand('cmd_bm_find');"/>
+  <command id="cmd_bm_setnewbookmarkfolder"      oncommand="goDoCommand('cmd_bm_setnewbookmarkfolder');"/>
+  <command id="cmd_bm_setpersonaltoolbarfolder"  oncommand="goDoCommand('cmd_bm_setpersonaltoolbarfolder');"/>
+  <command id="cmd_bm_setnewsearchfolder"        oncommand="goDoCommand('cmd_bm_setnewsearchfolder');"/>
+  <command id="cmd_bm_properties"                oncommand="goDoCommand('cmd_bm_properties');"/>
+  <command id="cmd_bm_rename"                    oncommand="goDoCommand('cmd_bm_rename');"/>
+  <command id="cmd_bm_import"                    oncommand="goDoCommand('cmd_bm_import');"/>
+  <command id="cmd_bm_export"                    oncommand="goDoCommand('cmd_bm_export');"/>
+  <command id="cmd_bm_movebookmark"              oncommand="goDoCommand('cmd_bm_movebookmark');"/>
 
-    <commandset id="bookmarksItems">
-      <command id="cmd_bm_open"                      oncommand="goDoCommand('cmd_bm_open');"/>
-      <command id="cmd_bm_openinnewwindow"           oncommand="goDoCommand('cmd_bm_openinnewwindow');"/>
-      <command id="cmd_bm_openinnewtab"              oncommand="goDoCommand('cmd_bm_openinnewtab');"/>
-      <command id="cmd_bm_expandfolder"              oncommand="goDoCommand('cmd_bm_expandfolder');"/>
-      <command id="cmd_bm_openfolder"                oncommand="goDoCommand('cmd_bm_openfolder');"/>
-      <command id="cmd_bm_managefolder"              oncommand="goDoCommand('cmd_bm_managefolder');"/>
-      <command id="cmd_bm_newfolder"                 oncommand="goDoCommand('cmd_bm_newfolder');"/>
-      <command id="cmd_bm_newbookmark"               oncommand="goDoCommand('cmd_bm_newbookmark');"/>
-      <command id="cmd_bm_newseparator"              oncommand="goDoCommand('cmd_bm_newseparator');"/>
-      <command id="cmd_bm_find"                      oncommand="goDoCommand('cmd_bm_find');"/>
-      <command id="cmd_bm_setnewbookmarkfolder"      oncommand="goDoCommand('cmd_bm_setnewbookmarkfolder');"/>
-      <command id="cmd_bm_setpersonaltoolbarfolder"  oncommand="goDoCommand('cmd_bm_setpersonaltoolbarfolder');"/>
-      <command id="cmd_bm_setnewsearchfolder"        oncommand="goDoCommand('cmd_bm_setnewsearchfolder');"/>
-      <command id="cmd_bm_properties"                oncommand="goDoCommand('cmd_bm_properties');"/>
-      <command id="cmd_bm_rename"                    oncommand="goDoCommand('cmd_bm_rename');"/>
-      <command id="cmd_bm_import"                    oncommand="goDoCommand('cmd_bm_import');"/>
-      <command id="cmd_bm_export"                    oncommand="goDoCommand('cmd_bm_export');"/>
-      <command id="cmd_bm_cut"                       oncommand="goDoCommand('cmd_bm_cut');"/>
-      <command id="cmd_bm_copy"                      oncommand="goDoCommand('cmd_bm_copy');"/>
-      <command id="cmd_bm_paste"                     oncommand="goDoCommand('cmd_bm_paste');"/>
-      <command id="cmd_bm_delete"                    oncommand="goDoCommand('cmd_bm_delete');"/>
-      <command id="cmd_bm_movebookmark"              oncommand="goDoCommand('cmd_bm_movebookmark');"/>
-      <command id="cmd_bm_selectAll"                 oncommand="goDoCommand('cmd_bm_selectAll');"/>
-    </commandset>
-  </commands>
-
-  <stringbundleset id="stringbundleset"/>
-
-  <keyset id="tasksKeys">
-    <!-- File Menu -->
-    <key id="key_close"/>
-    <key id="key_quit"/>
-    <!-- Edit Menu -->
-    <key id="key_undo"/>
-    <key id="key_redo"/>
-
-    <!-- These keybindings do not have a command specified in the overlay,
-         which is good, but we need to specify it ourselves here -->
-    <key id="key_cut" command="cmd_bm_cut"/>
-    <key id="key_copy" command="cmd_bm_copy"/>
-    <key id="key_paste" command="cmd_bm_paste"/>
-    <key id="key_selectAll" command="cmd_bm_selectAll"/>
-
-    <!-- We need to provide our own delete key binding because the key_delete
-         handler in platformGlobalOverlay.xul maps command to "cmd_delete" which
-         is NOT what we want! -->
-    <key id="key_bm_delete" keycode="VK_DELETE" command="cmd_bm_delete"/>
-
-    <key id="bm_key_find"
-         key="&edit.find.keybinding;"
-         command="cmd_bm_find" modifiers="accel"/>
-    <key id="bm_key_properties"
-         key="&edit.properties.keybinding;"
-         command="cmd_bm_properties" modifiers="accel"/>
+  <keyset id="editMenuKeys"/>
+  <keyset id="bookmarksManagerKeys">
+    <key id="key_close" key="&closeCmd.commandkey;" modifiers="accel" command="cmd_close"/>
+    <key keycode="VK_ESCAPE" command="cmd_close"/>
+    <key id="bm_key_find" key="&edit.find.keybinding;" modifiers="accel" command="cmd_bm_find"/>
+    <key id="bm_key_properties" key="&edit.properties.keybinding;" modifiers="accel" command="cmd_bm_properties"/>
   </keyset>
 
   <toolbox id="bookmarks-toolbox">
@@ -132,57 +85,49 @@
         <menupopup>
           <menuitem label="&menuitem.newBookmark.label;" 
                     accesskey="&menuitem.newBookmark.accesskey;"
-                    observes="cmd_bm_newbookmark"/>
+                    command="cmd_bm_newbookmark"/>
           <menuitem label="&menuitem.newFolder.label;" 
                     accesskey="&menuitem.newFolder.accesskey;"
-                    observes="cmd_bm_newfolder"/>
+                    command="cmd_bm_newfolder"/>
           <menuitem label="&menuitem.newSeparator.label;"
                     accesskey="&menuitem.newSeparator.accesskey;"
-                    observes="cmd_bm_newseparator"/>
+                    command="cmd_bm_newseparator"/>
           <menuseparator/>
           <menuitem label="&menuitem.import.label;"
                     accesskey="&menuitem.import.accesskey;"
-                    observes="cmd_bm_import"/>
+                    command="cmd_bm_import"/>
           <menuitem label="&menuitem.export.label;"
                     accesskey="&menuitem.export.accesskey;"
-                    observes="cmd_bm_export"/>
+                    command="cmd_bm_export"/>
           <menuseparator/>
-          <menuitem id="menu_close"/>
+          <menuitem label="&closeCmd.label;" command="cmd_close"
+                    key="key_close" accesskey="&closeCmd.accesskey;"/>
         </menupopup>
       </menu>
-      <menu id="menu_Edit">
+
+      <menu id="menu_edit">
         <menupopup>
-          <menuitem id="menu_undo" disabled="true"/>
-          <menuitem id="menu_redo" disabled="true"/>
+          <menuitem id="menu_undo"/>
+          <menuitem id="menu_redo"/>
           <menuseparator/>
-          <menuitem id="menu_bm_cut"
-                    label="&cutCmd.label;" accesskey="&cutCmd.accesskey;"
-                    key="key_cut" command="cmd_bm_cut"/>
-          <menuitem id="menu_bm_copy"
-                    label="&copyCmd.label;" accesskey="&copyCmd.accesskey;"
-                    key="key_copy" command="cmd_bm_copy"/>
-          <menuitem id="menu_bm_paste"
-                    label="&pasteCmd.label;" accesskey="&pasteCmd.accesskey;"
-                    key="key_paste" command="cmd_bm_paste"/>
-          <menuitem id="menu_bm_delete"
-                    label="&deleteCmd.label;" accesskey="&deleteCmd.accesskey;"
-                    key="key_bm_delete" command="cmd_bm_delete"/>
+          <menuitem id="menu_cut"/>
+          <menuitem id="menu_copy"/>
+          <menuitem id="menu_paste"/>
+          <menuitem id="menu_delete"/>
           <menuseparator/>
-          <menuitem id="menu_bm_selectAll"
-                    label="&selectAllCmd.label;" accesskey="&selectAllCmd.accesskey;"
-                    key="key_selectAll" command="cmd_bm_selectAll"/>
+          <menuitem id="menu_selectAll"/>
           <menuseparator/>
           <menuitem label="&command.moveBookmark.label;"
                     accesskey="&command.moveBookmark.accesskey;"
                     command="cmd_bm_movebookmark"/>
           <menuseparator/>
-            <menuitem observes="cmd_bm_properties" key="bm_key_properties"
-                      label="&command.properties.label;"
-                      accesskey="&command.properties.accesskey;" />
+          <menuitem label="&command.properties.label;"
+                    key="bm_key_properties" accesskey="&command.properties.accesskey;"
+                    command="cmd_bm_properties"/>
         </menupopup>
       </menu>
   
-      <menu id="menu_View">
+      <menu label="&viewMenu.label;" accesskey="&viewMenu.accesskey;">
         <menupopup onpopupshowing="fillViewMenu(event)"
                    oncommand="onViewMenuSortItemSelected(event);">
           <menuitem id="viewCommandToolbar" type="checkbox" class="menuitem-iconic"
@@ -240,7 +185,7 @@
                      command="cmd_bm_rename"/>
       <toolbarbutton id="delete" label="&command.delete.label;"
                      accesskey="&command.delete.accesskey;"
-                     command="cmd_bm_delete"/>
+                     command="cmd_delete"/>
     </toolbar>
 
     <toolbar id="bookmarks-search" align="center" pack="center">
diff --git a/browser/components/bookmarks/content/bookmarksMenu.js b/browser/components/bookmarks/content/bookmarksMenu.js
index 811b81fe4bbd..f7df9df28f81 100644
--- a/browser/components/bookmarks/content/bookmarksMenu.js
+++ b/browser/components/bookmarks/content/bookmarksMenu.js
@@ -337,9 +337,9 @@ var BookmarksMenu = {
     BookmarksController.onCommandUpdate(selection, target);
     if (document.popupNode.id == "bookmarks-ptf") {
       // disabling 'cut' and 'copy' on the empty area of the personal toolbar
-      var commandNode = document.getElementById("cmd_bm_cut");
+      var commandNode = document.getElementById("cmd_cut");
       commandNode.setAttribute("disabled", "true");
-      commandNode = document.getElementById("cmd_bm_copy");
+      commandNode = document.getElementById("cmd_copy");
       commandNode.setAttribute("disabled", "true");
     }
   },
@@ -410,7 +410,7 @@ var BookmarksMenuController = {
   {
     var command = aEvent.target.getAttribute("command");
     var isDisabled = aEvent.target.getAttribute("disabled")
-    if (isDisabled != "true" && (command == "cmd_bm_newfolder" || command == "cmd_bm_paste")) {
+    if (isDisabled != "true" && (command == "cmd_bm_newfolder" || command == "cmd_paste")) {
       BookmarksMenuDNDObserver.onDragSetFeedBack(document.popupNode, BookmarksMenu._orientation);
     } else {
       BookmarksMenuDNDObserver.onDragRemoveFeedBack(document.popupNode);
diff --git a/browser/components/bookmarks/content/bookmarksPanel.xul b/browser/components/bookmarks/content/bookmarksPanel.xul
index 7d47f605dc5a..63444ced8fb3 100644
--- a/browser/components/bookmarks/content/bookmarksPanel.xul
+++ b/browser/components/bookmarks/content/bookmarksPanel.xul
@@ -18,53 +18,39 @@
 # 
 # Contributor(s): 
 #   Ben Goodger <ben@netscape.com> (Original Author, v2.0)
+#   Pierre Chanial <p_ch@verizon.net>
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/bookmarks/bookmarks.css" type="text/css"?>
-<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
-<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
+<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://browser/locale/bookmarks/bookmarks.dtd">
+<!DOCTYPE page SYSTEM "chrome://browser/locale/bookmarks/bookmarks.dtd">
 
 <page id="bookmarksPanel"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="Startup();" elementtofocus="bookmarks-view">
+        onload="Startup();">
 
-  <!-- Shared libraries XXX - would like to cut this dependency out -->
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-
-  <!-- Shared Bookmarks Utility Library -->
-  <script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarks.js"/>
-  <!-- Bookmarks Panel -->
-  <script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarksPanel.js"/>
-
-  <!-- Bookmarks Panel Drag & Drop -->
   <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
   <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
+  <script type="application/x-javascript" src="chrome://browser/content/utilityOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarks.js"/>
+  <script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarksPanel.js"/>
 
   <!-- bookmarks & edit commands -->
-  <commands id="commands">
-    <commandset id="bookmarksItems">
-      <command id="cmd_bm_open"                      oncommand="goDoCommand('cmd_bm_open');"/>
-      <command id="cmd_bm_openinnewwindow"           oncommand="goDoCommand('cmd_bm_openinnewwindow');"/>
-      <command id="cmd_bm_openinnewtab"              oncommand="goDoCommand('cmd_bm_openinnewtab');"/>
-      <command id="cmd_bm_expandfolder"              oncommand="goDoCommand('cmd_bm_expandfolder');"/>
-      <command id="cmd_bm_openfolder"                oncommand="goDoCommand('cmd_bm_openfolder');"/>
-      <command id="cmd_bm_managefolder"              oncommand="goDoCommand('cmd_bm_managefolder');"/>
-      <command id="cmd_bm_newfolder"                 oncommand="goDoCommand('cmd_bm_newfolder');"/>
-      <command id="cmd_bm_newbookmark"               oncommand="goDoCommand('cmd_bm_newbookmark');"/>
-      <command id="cmd_bm_newseparator"              oncommand="goDoCommand('cmd_bm_newseparator');"/>
-      <command id="cmd_bm_find"                      oncommand="goDoCommand('cmd_bm_find');"/>
-      <command id="cmd_bm_properties"                oncommand="goDoCommand('cmd_bm_properties');"/>
-      <command id="cmd_bm_cut"                       oncommand="goDoCommand('cmd_bm_cut');"/>
-      <command id="cmd_bm_copy"                      oncommand="goDoCommand('cmd_bm_copy');"/>
-      <command id="cmd_bm_paste"                     oncommand="goDoCommand('cmd_bm_paste');"/>
-      <command id="cmd_bm_delete"                    oncommand="goDoCommand('cmd_bm_delete');"/>
-      <command id="cmd_bm_selectAll"                 oncommand="goDoCommand('cmd_bm_selectAll');"/>
-    </commandset>
-  </commands>
+  <commandset id="editMenuCommands"/>
+  <command id="cmd_bm_open"            oncommand="goDoCommand('cmd_bm_open');"/>
+  <command id="cmd_bm_openinnewwindow" oncommand="goDoCommand('cmd_bm_openinnewwindow');"/>
+  <command id="cmd_bm_openinnewtab"    oncommand="goDoCommand('cmd_bm_openinnewtab');"/>
+  <command id="cmd_bm_expandfolder"    oncommand="goDoCommand('cmd_bm_expandfolder');"/>
+  <command id="cmd_bm_openfolder"      oncommand="goDoCommand('cmd_bm_openfolder');"/>
+  <command id="cmd_bm_managefolder"    oncommand="goDoCommand('cmd_bm_managefolder');"/>
+  <command id="cmd_bm_newfolder"       oncommand="goDoCommand('cmd_bm_newfolder');"/>
+  <command id="cmd_bm_newbookmark"     oncommand="goDoCommand('cmd_bm_newbookmark');"/>
+  <command id="cmd_bm_newseparator"    oncommand="goDoCommand('cmd_bm_newseparator');"/>
+  <command id="cmd_bm_find"            oncommand="goDoCommand('cmd_bm_find');"/>
+  <command id="cmd_bm_properties"      oncommand="goDoCommand('cmd_bm_properties');"/>
   
   <hbox align="center">
     <label value="&search.label;" accesskey="&search.accesskey;" control="search-box"/>
diff --git a/browser/components/bookmarks/content/bookmarksTree.xml b/browser/components/bookmarks/content/bookmarksTree.xml
index ca7c60bcde22..a78395a7d6a0 100644
--- a/browser/components/bookmarks/content/bookmarksTree.xml
+++ b/browser/components/bookmarks/content/bookmarksTree.xml
@@ -411,8 +411,8 @@
 
           switch(aCommand) {
           // [Category 1] - Commands that remove rows
-          case "cmd_bm_cut":
-          case "cmd_bm_delete":
+          case "cmd_cut":
+          case "cmd_delete":
             // Since rows have been removed, the row immediately after the first range 
             // in the original selection now has the index of the first item in the first
             // range. 
@@ -420,7 +420,7 @@
             newRanges.push({min: nextRow, max: nextRow});
             break;
           // [Category 2] - Commands that insert rows
-          case "cmd_bm_paste":
+          case "cmd_paste":
           case "cmd_bm_import":
           case "cmd_bm_movebookmark":
           case "cmd_bm_newbookmark":
@@ -434,7 +434,7 @@
             this.updateTreeSelection();
             break;
           // [Category 3] - Commands that do not alter the row count
-          case "cmd_bm_copy":
+          case "cmd_copy":
           case "cmd_bm_properties":
           case "cmd_bm_rename":
           case "cmd_bm_setpersonaltoolbarfolder":
@@ -594,7 +594,7 @@
           this.mOuter._itemToBeToggled = [];
           
           switch (aCommand) {
-          case "cmd_bm_selectAll":
+          case "cmd_selectAll":
             this.mOuter.treeBoxObject.selection.selectAll();
             break;
           case "cmd_bm_expandfolder":
diff --git a/browser/components/bookmarks/locale/bookmarks.dtd b/browser/components/bookmarks/locale/bookmarks.dtd
index 9df52bc2db56..2e0acd0b15d6 100644
--- a/browser/components/bookmarks/locale/bookmarks.dtd
+++ b/browser/components/bookmarks/locale/bookmarks.dtd
@@ -19,7 +19,15 @@
 #   Stephen Lamm <slamm@netscape.com>
 #   Blake Ross <blaker@netscape.com>
 
-<!-- extracted from bookmarksManager.xul -->
+<!ENTITY fileMenu.label                 "File">
+<!ENTITY fileMenu.accesskey             "F">
+<!ENTITY viewMenu.label                 "View">
+<!ENTITY viewMenu.accesskey             "V">
+
+<!ENTITY closeCmd.label "Close">
+<!ENTITY closeCmd.accesskey "C">
+<!ENTITY closeCmd.commandkey "W">
+                                                                                             
 <!ENTITY menuitem.newBookmark.label    "New Bookmark...">
 <!ENTITY menuitem.newBookmark.accesskey "B">
 <!ENTITY menuitem.newFolder.label        "New Folder...">
@@ -79,8 +87,6 @@
 
 <!ENTITY search.label                   "Search:">
 <!ENTITY search.accesskey               "S">
-<!ENTITY fileMenu.label                 "File">
-<!ENTITY fileMenu.accesskey             "F">
 
 <!-- bookmarksToolbar.xml -->
 <!ENTITY emptyItem.label "(Empty)">
diff --git a/browser/components/bookmarks/locale/bookmarks.properties b/browser/components/bookmarks/locale/bookmarks.properties
index 042af5bbd0d7..12354424a9c4 100644
--- a/browser/components/bookmarks/locale/bookmarks.properties
+++ b/browser/components/bookmarks/locale/bookmarks.properties
@@ -27,12 +27,12 @@ cmd_bm_openfolder = Open in Tabs
 cmd_bm_openfolder_accesskey = O
 cmd_bm_managefolder = Manage Folder
 cmd_bm_find = Find a Bookmark...
-cmd_bm_cut = Cut
-cmd_bm_copy = Copy
-cmd_bm_paste = Paste
-cmd_bm_delete = Delete
+cmd_cut = Cut
+cmd_copy = Copy
+cmd_paste = Paste
+cmd_delete = Delete
 cmd_bm_movebookmark = Move Bookmark(s)...
-cmd_bm_selectAll = Select All
+cmd_selectAll = Select All
 cmd_bm_rename = Rename...
 cmd_bm_renamebookmark2 = Change Location...
 cmd_bm_properties = Properties