From c560a09133adeba28fe38dda490e81437b7d9811 Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Mon, 26 Nov 2007 15:07:10 +0000
Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E5=AD=AB=E3=82=BF=E3=83=96=E3=81=A0?=
 =?UTF-8?q?=E3=81=91=E3=82=92=E9=96=89=E3=81=98=E3=82=8B=E6=A9=9F=E8=83=BD?=
 =?UTF-8?q?=E3=81=AE=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E9=A0=85=E7=9B=AE?=
 =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@1622 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/config.xul             | 14 +++++++++++---
 content/treestyletab/treestyletab.xul       |  5 +++++
 content/treestyletab/treestyletabbrowser.js | 13 +++++++++++++
 defaults/preferences/treestyletab.js        |  1 +
 locale/en-US/treestyletab/treestyletab.dtd  |  2 ++
 locale/it-IT/treestyletab/treestyletab.dtd  |  2 ++
 locale/ja/treestyletab/treestyletab.dtd     |  2 ++
 7 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/content/treestyletab/config.xul b/content/treestyletab/config.xul
index 285d08db..8420bb65 100644
--- a/content/treestyletab/config.xul
+++ b/content/treestyletab/config.xul
@@ -47,6 +47,9 @@
 		<preference id="extensions.treestyletab.show.context-item-removeTabSubTree"
 			name="extensions.treestyletab.show.context-item-removeTabSubTree"
 			type="bool"/>
+		<preference id="extensions.treestyletab.show.context-item-removeDescendantTabs"
+			name="extensions.treestyletab.show.context-item-removeDescendantTabs"
+			type="bool"/>
 		<preference id="extensions.treestyletab.show.context-item-collapseAllSubtree"
 			name="extensions.treestyletab.show.context-item-collapseAllSubtree"
 			type="bool"/>
@@ -145,16 +148,21 @@
 			<checkbox id="extensions.treestyletab.show.context-item-removeTabSubTree-check"
 				preference="extensions.treestyletab.show.context-item-removeTabSubTree"
 				label="&context.removeTabSubTree.label;"/>
+			<checkbox id="extensions.treestyletab.show.context-item-removeDescendantTabs-check"
+				preference="extensions.treestyletab.show.context-item-removeDescendantTabs"
+				label="&context.removeDescendantTabs.label;"/>
+		</hbox>
+		<hbox align="center">
 			<checkbox id="extensions.treestyletab.show.context-item-collapseAllSubtree-check"
 				preference="extensions.treestyletab.show.context-item-collapseAllSubtree"
 				label="&context.collapseAllSubtree.label;"/>
 			<checkbox id="extensions.treestyletab.show.context-item-expandAllSubtree-check"
 				preference="extensions.treestyletab.show.context-item-expandAllSubtree"
 				label="&context.expandAllSubtree.label;"/>
+			<checkbox id="extensions.treestyletab.show.context-item-toggleAutoHide-check"
+				preference="extensions.treestyletab.show.context-item-toggleAutoHide"
+				label="&context.toggleAutoHide.label;"/>
 		</hbox>
-		<checkbox id="extensions.treestyletab.show.context-item-toggleAutoHide-check"
-			preference="extensions.treestyletab.show.context-item-toggleAutoHide"
-			label="&context.toggleAutoHide.label;"/>
 	</groupbox>
 	<checkbox id="extensions.treestyletab.show.openSelectionLinks-check"
 		preference="extensions.treestyletab.show.openSelectionLinks"
diff --git a/content/treestyletab/treestyletab.xul b/content/treestyletab/treestyletab.xul
index 62b5352f..212adb50 100644
--- a/content/treestyletab/treestyletab.xul
+++ b/content/treestyletab/treestyletab.xul
@@ -36,6 +36,11 @@
 			accesskey="&context.removeTabSubTree.accesskey;"
 			oncommand="TreeStyleTabService.removeTabSubTree(TreeStyleTabService.getTabBrowserFromChild(this).mContextTab);"
 			onclick="if (event.button == 1 || (event.button == 0 &amp;&amp; (navigator.platform.indexOf('Mac') &lt; 0 ? event.ctrlKey : event.metaKey ))) { TreeStyleTabService.removeTabSubTree(TreeStyleTabService.getTabBrowserFromChild(this).mContextTab, true); event.stopPropagation(); this.parentNode.hidePopup(); }"/>
+		<menuitem id="context-item-removeDescendantTabs"
+			label="&context.removeDescendantTabs.label;"
+			accesskey="&context.removeDescendantTabs.accesskey;"
+			oncommand="TreeStyleTabService.removeTabSubTree(TreeStyleTabService.getTabBrowserFromChild(this).mContextTab, true);"
+			onclick="if (event.button == 1 || (event.button == 0 &amp;&amp; (navigator.platform.indexOf('Mac') &lt; 0 ? event.ctrlKey : event.metaKey ))) { TreeStyleTabService.removeTabSubTree(TreeStyleTabService.getTabBrowserFromChild(this).mContextTab); event.stopPropagation(); this.parentNode.hidePopup(); }"/>
 
 		<menuseparator id="context-separator-collapseExpandAll"/>
 		<menuitem id="context-item-collapseAllSubtree"
diff --git a/content/treestyletab/treestyletabbrowser.js b/content/treestyletab/treestyletabbrowser.js
index 7a721691..9ef08239 100644
--- a/content/treestyletab/treestyletabbrowser.js
+++ b/content/treestyletab/treestyletabbrowser.js
@@ -6,6 +6,7 @@ function TreeStyleTabBrowser(aTabBrowser)
 TreeStyleTabBrowser.prototype = { 
 
 	kMENUITEM_REMOVESUBTREE            : 'context-item-removeTabSubTree',
+	kMENUITEM_REMOVECHILDREN           : 'context-item-removeDescendantTabs',
 	kMENUITEM_COLLAPSEEXPAND_SEPARATOR : 'context-separator-collapseExpandAll',
 	kMENUITEM_COLLAPSE                 : 'context-item-collapseAllSubtree',
 	kMENUITEM_EXPAND                   : 'context-item-expandAllSubtree',
@@ -304,6 +305,7 @@ TreeStyleTabBrowser.prototype = {
 			var suffix = '-'+parseInt(Math.random() * 65000);
 			[
 				aSelf.kMENUITEM_REMOVESUBTREE,
+				aSelf.kMENUITEM_REMOVECHILDREN,
 				aSelf.kMENUITEM_COLLAPSEEXPAND_SEPARATOR,
 				aSelf.kMENUITEM_COLLAPSE,
 				aSelf.kMENUITEM_EXPAND,
@@ -1249,6 +1251,17 @@ TreeStyleTabBrowser.prototype = {
 			item.setAttribute('hidden', true);
 		this.showHideRemoveSubTreeMenuItem(item, [b.mContextTab]);
 
+		item = this.evaluateXPath(
+			'descendant::xul:menuitem[starts-with(@id, "'+this.kMENUITEM_REMOVECHILDREN+'")]',
+			aEvent.currentTarget,
+			XPathResult.FIRST_ORDERED_NODE_TYPE
+		).singleNodeValue;
+		if (this.getTreePref('show.'+this.kMENUITEM_REMOVECHILDREN))
+			item.removeAttribute('hidden');
+		else
+			item.setAttribute('hidden', true);
+		this.showHideRemoveSubTreeMenuItem(item, [b.mContextTab]);
+
 		// collapse/expand all
 		sep = this.evaluateXPath(
 			'descendant::xul:menuseparator[starts-with(@id, "'+this.kMENUITEM_COLLAPSEEXPAND_SEPARATOR+'")]',
diff --git a/defaults/preferences/treestyletab.js b/defaults/preferences/treestyletab.js
index 1798edd8..cc07f307 100644
--- a/defaults/preferences/treestyletab.js
+++ b/defaults/preferences/treestyletab.js
@@ -25,6 +25,7 @@ pref("extensions.treestyletab.insertNewChildAt", 1);
 
 pref("extensions.treestyletab.show.openSelectionLinks", true);
 pref("extensions.treestyletab.show.context-item-removeTabSubTree", true);
+pref("extensions.treestyletab.show.context-item-removeDescendantTabs", false);
 pref("extensions.treestyletab.show.context-item-collapseAllSubtree", true);
 pref("extensions.treestyletab.show.context-item-expandAllSubtree", true);
 pref("extensions.treestyletab.show.context-item-toggleAutoHide",   true);
diff --git a/locale/en-US/treestyletab/treestyletab.dtd b/locale/en-US/treestyletab/treestyletab.dtd
index e1baddb4..f92ae7f7 100644
--- a/locale/en-US/treestyletab/treestyletab.dtd
+++ b/locale/en-US/treestyletab/treestyletab.dtd
@@ -84,6 +84,8 @@
 <!ENTITY selection.removeTabSubTree.accesskey "s">
 <!ENTITY context.removeTabSubTree.label     "Close this Tree">
 <!ENTITY context.removeTabSubTree.accesskey "s">
+<!ENTITY context.removeDescendantTabs.label     "Close Children">
+<!ENTITY context.removeDescendantTabs.accesskey "d">
 <!ENTITY context.collapseAllSubtree.label     "Collapse All Trees">
 <!ENTITY context.collapseAllSubtree.accesskey "c">
 <!ENTITY context.expandAllSubtree.label     "Expand All Trees">
diff --git a/locale/it-IT/treestyletab/treestyletab.dtd b/locale/it-IT/treestyletab/treestyletab.dtd
index 4c332dc5..287adcfb 100644
--- a/locale/it-IT/treestyletab/treestyletab.dtd
+++ b/locale/it-IT/treestyletab/treestyletab.dtd
@@ -84,6 +84,8 @@
 <!ENTITY selection.removeTabSubTree.accesskey "s">
 <!ENTITY context.removeTabSubTree.label     "Chiudi questo sottoalbero">
 <!ENTITY context.removeTabSubTree.accesskey "s">
+<!ENTITY context.removeDescendantTabs.label     "Close Children">
+<!ENTITY context.removeDescendantTabs.accesskey "d">
 <!ENTITY context.collapseAllSubtree.label     "Collapse All Trees">
 <!ENTITY context.collapseAllSubtree.accesskey "c">
 <!ENTITY context.expandAllSubtree.label     "Expand All Trees">
diff --git a/locale/ja/treestyletab/treestyletab.dtd b/locale/ja/treestyletab/treestyletab.dtd
index c6f33eea..474203ca 100644
--- a/locale/ja/treestyletab/treestyletab.dtd
+++ b/locale/ja/treestyletab/treestyletab.dtd
@@ -82,6 +82,8 @@
 <!ENTITY selection.removeTabSubTree.accesskey "s">
 <!ENTITY context.removeTabSubTree.label     "このサブツリーを閉じる">
 <!ENTITY context.removeTabSubTree.accesskey "s">
+<!ENTITY context.removeDescendantTabs.label     "このタブの子タブをすべて閉じる">
+<!ENTITY context.removeDescendantTabs.accesskey "d">
 <!ENTITY context.collapseAllSubtree.label     "サブツリーをすべてたたむ">
 <!ENTITY context.collapseAllSubtree.accesskey "c">
 <!ENTITY context.expandAllSubtree.label     "サブツリーをすべて展開する">