From 07868fbe830a10c3af79996a9d603e603904d893 Mon Sep 17 00:00:00 2001
From: "jaggernaut%netscape.com"
 <jaggernaut%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 3 Jun 2002 21:35:10 +0000
Subject: [PATCH] Bug 148840: Add "Bookmark This Group of Tabs..." to Bookmarks
 menu. r=caillon, sr=hewitt

git-svn-id: svn://10.0.0.236/trunk@122593 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpfe/browser/resources/content/navigator.js  | 12 +++++++++++-
 mozilla/xpfe/browser/resources/content/navigator.xul |  3 ++-
 .../browser/resources/content/navigatorOverlay.xul   |  6 +++++-
 .../browser/resources/locale/en-US/navigator.dtd     |  4 +++-
 .../components/bookmarks/resources/addBookmark.js    | 11 ++++++++++-
 .../bookmarks/resources/bookmarksOverlay.js          |  4 ++--
 6 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/mozilla/xpfe/browser/resources/content/navigator.js b/mozilla/xpfe/browser/resources/content/navigator.js
index 6ced2c24c51..81550bcee8a 100644
--- a/mozilla/xpfe/browser/resources/content/navigator.js
+++ b/mozilla/xpfe/browser/resources/content/navigator.js
@@ -458,7 +458,6 @@ function Startup()
 
   // now load bookmarks after a delay
   setTimeout(LoadBookmarksCallback, 0);
-
 }
 
 function LoadBookmarksCallback()
@@ -721,6 +720,17 @@ function addBookmarkAs()
     BookmarksUtils.addBookmarkForBrowser(gBrowser.webNavigation, true);
 }
 
+function addGroupmarkAs()
+{
+  BookmarksUtils.addBookmarkForTabBrowser(gBrowser, true);
+}
+
+function updateGroupmarkMenuitem(id)
+{
+  const disabled = gBrowser.browsers.length == 1;
+  document.getElementById(id).setAttribute("disabled", disabled);
+}
+
 function readRDFString(aDS,aRes,aProp)
 {
   var n = aDS.GetTarget(aRes, aProp, true);
diff --git a/mozilla/xpfe/browser/resources/content/navigator.xul b/mozilla/xpfe/browser/resources/content/navigator.xul
index 48560a308a5..22ccc7d9dd2 100644
--- a/mozilla/xpfe/browser/resources/content/navigator.xul
+++ b/mozilla/xpfe/browser/resources/content/navigator.xul
@@ -262,9 +262,10 @@ Contributor(s): ______________________________________. -->
                      ref="NC:BookmarksRoot" container="true" flags="dont-test-empty"
                      template="bookmarksMenuTemplate"
                      ondraggesture="if (event.target.id=='bookmarks-button') event.preventBubble()">
-        <menupopup onpopupshowing="checkBookmarksMenuTemplateBuilder();">
+        <menupopup onpopupshowing="checkBookmarksMenuTemplateBuilder(); updateGroupmarkMenuitem('PT_bookmarks_groupmark');">
           <menuitem accesskey="&addCurPageCmd.accesskey;" key="addBookmarkKb" observes="Browser:AddBookmark"/>
           <menuitem accesskey="&addCurPageAsCmd.accesskey;" key="addBookmarkAsKb" observes="Browser:AddBookmarkAs"/>
+          <menuitem id="PT_bookmarks_groupmark" observes="Browser:AddGroupmarkAs"/>
           <menuseparator/>
           <menuitem accesskey="&manBookmarksCmd.accesskey;" key="manBookmarkKb" observes="Browser:ManageBookmark"/>
           <menuseparator id="lastStaticSeparator"/>
diff --git a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
index 9bf63b97795..96b05d44084 100644
--- a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
+++ b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
@@ -148,6 +148,9 @@
     <command id="Browser:AddBookmarkAs" label="&addCurPageAsCmd.label;"
              accesskey="&addCurPageAsCmd.accesskey;"
              oncommand="addBookmarkAs();"/>
+    <command id="Browser:AddGroupmarkAs" label="&addCurTabsAsCmd.label;"
+             accesskey="&addCurTabsAsCmd.accesskey;"
+             oncommand="addGroupmarkAs(); event.preventBubble();"/>
     <command id="Browser:ManageBookmark" label="&manBookmarksCmd.label;" accesskey="&manBookmarksCmd.accesskey;" 
              oncommand="BrowserEditBookmarks();" />
   
@@ -331,10 +334,11 @@
           </menupopup>
         </rule>
       </template>
-      <menupopup>
+      <menupopup onpopupshowing="updateGroupmarkMenuitem('bookmarks_groupmark');">
         <!-- for some reason these don't work as command="" -->
         <menuitem key="addBookmarkKb"   observes="Browser:AddBookmark"/>
         <menuitem key="addBookmarkAsKb" observes="Browser:AddBookmarkAs"/>
+        <menuitem id="bookmarks_groupmark" observes="Browser:AddGroupmarkAs"/>
         <menuitem key="manBookmarkKb"   observes="Browser:ManageBookmark"/>
         <menuseparator/>
       </menupopup>
diff --git a/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd b/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd
index 7321ff3276e..684f7f14906 100644
--- a/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd
+++ b/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd
@@ -131,7 +131,9 @@
 <!ENTITY addCurPageCmd.accesskey "B">
 <!ENTITY addCurPageCmd.commandkey "d">
 <!ENTITY addCurPageAsCmd.label "File Bookmark...">
-<!ENTITY addCurPageAsCmd.accesskey "f">
+<!ENTITY addCurPageAsCmd.accesskey "F">
+<!ENTITY addCurTabsAsCmd.label "Bookmark This Group of Tabs...">
+<!ENTITY addCurTabsAsCmd.accesskey "G">
 <!ENTITY manBookmarksCmd.label "Manage Bookmarks...">
 <!ENTITY manBookmarksCmd.accesskey "M">
 <!ENTITY manBookmarksCmd.commandkey "b">
diff --git a/mozilla/xpfe/components/bookmarks/resources/addBookmark.js b/mozilla/xpfe/components/bookmarks/resources/addBookmark.js
index 569bf80b972..6dd2745197a 100644
--- a/mozilla/xpfe/components/bookmarks/resources/addBookmark.js
+++ b/mozilla/xpfe/components/bookmarks/resources/addBookmark.js
@@ -90,6 +90,8 @@
  *      filing a single bookmark or a group. For the single bookmark the
  *      values are taken from the name, URL and charset arguments.
  *      For the group, the values are taken from the sixth argument.
+ *      This parameter can also be String("addGroup,group") where "group"
+ *      specifies that the dialog starts in filing as a group.
  */
 
 var gFld_Name   = null;
@@ -152,6 +154,13 @@ function Startup()
       setupFields();
       sizeToFit();
       break;
+    case "addGroup,group":
+      document.getElementById("showaddgroup").setAttribute("hidden", "false");
+      gCB_AddGroup.checked = true;
+      setupFields();
+      toggleGroup();
+      sizeToFit();
+      break;
     default:
       // Regular Add Bookmark
       setupFields();
@@ -197,7 +206,7 @@ function setupFields()
   onFieldInput();
   gFld_Name.select();
   gFld_Name.focus();
-  gBookmarkCharset = window.arguments [3] || null;
+  gBookmarkCharset = window.arguments[3] || null;
 }
 
 function onFieldInput()
diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarksOverlay.js b/mozilla/xpfe/components/bookmarks/resources/bookmarksOverlay.js
index 3f21338f600..53d28256aed 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarksOverlay.js
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarksOverlay.js
@@ -863,7 +863,7 @@ var BookmarksUtils = {
   },
 
 
-  addBookmarkForTabBrowser: function( aTabBrowser )
+  addBookmarkForTabBrowser: function( aTabBrowser, aSelect )
   {
     var tabsInfo = [];
     var currentTabInfo = { name: "", url: "", charset: null };
@@ -892,7 +892,7 @@ var BookmarksUtils = {
     openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "",
                "centerscreen,chrome,dialog=yes,resizable,dependent",
                currentTabInfo.name, currentTabInfo.url, null,
-               currentTabInfo.charset, "addGroup", tabsInfo);
+               currentTabInfo.charset, "addGroup" + (aSelect ? ",group" : ""), tabsInfo);
   },
 
   addBookmarkForBrowser: function (aDocShell, aShowDialog)