From 989e934c8230791c8bcaab5a5bfdee9d71130b00 Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Wed, 10 Jun 2009 03:34:47 +0000
Subject: [PATCH] =?UTF-8?q?*=20closeRootBehavior=E3=81=AE=E5=AE=9A?=
 =?UTF-8?q?=E6=95=B0=E3=81=AE=E5=80=A4=E3=82=92=E5=A4=89=E6=9B=B4=20*=20?=
 =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E9=A0=85=E7=9B=AE=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@4513 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/config.js              | 10 ++++++++++
 content/treestyletab/config.xul             | 20 +++++++++++++++++---
 content/treestyletab/treestyletabbrowser.js |  2 +-
 defaults/preferences/treestyletab.js        |  4 ++--
 locale/de-DE/treestyletab/treestyletab.dtd  | 10 ++++++----
 locale/en-US/treestyletab/treestyletab.dtd  | 10 ++++++----
 locale/es-ES/treestyletab/treestyletab.dtd  | 10 ++++++----
 locale/it-IT/treestyletab/treestyletab.dtd  | 10 ++++++----
 locale/ja/treestyletab/treestyletab.dtd     | 10 ++++++----
 locale/pl-PL/treestyletab/treestyletab.dtd  | 10 ++++++----
 locale/ru-RU/treestyletab/treestyletab.dtd  |  9 +++++----
 locale/zh-CN/treestyletab/treestyletab.dtd  |  9 +++++----
 locale/zh-TW/treestyletab/treestyletab.dtd  |  9 +++++----
 13 files changed, 81 insertions(+), 42 deletions(-)

diff --git a/content/treestyletab/config.js b/content/treestyletab/config.js
index 56c8735a..b291ce69 100644
--- a/content/treestyletab/config.js
+++ b/content/treestyletab/config.js
@@ -172,3 +172,13 @@ function updateAutoHideModeLabel()
 			node.setAttribute(attr, label);
 		});
 }
+
+function updateCloseRootBehaviorCheck()
+{
+	var closeParentBehavior = document.getElementById('extensions.treestyletab.closeParentBehavior-radiogroup').value;
+	var closeRootBehavior = document.getElementById('extensions.treestyletab.closeRootBehavior-check');
+	if (closeParentBehavior == 0)
+		closeRootBehavior.removeAttribute('disabled');
+	else
+		closeRootBehavior.setAttribute('disabled', true);
+}
diff --git a/content/treestyletab/config.xul b/content/treestyletab/config.xul
index 9b90c4f7..8d68c497 100644
--- a/content/treestyletab/config.xul
+++ b/content/treestyletab/config.xul
@@ -506,7 +506,8 @@
 
 </prefpane>
 
-<prefpane id="prefpane-advanced" label="&config.tabs.advanced;">
+<prefpane id="prefpane-advanced" label="&config.tabs.advanced;"
+	onpaneload="updateCloseRootBehaviorCheck();">
 	<preferences>
 		<preference id="extensions.treestyletab.autoCollapseExpandSubTreeOnSelect"
 			name="extensions.treestyletab.autoCollapseExpandSubTreeOnSelect"
@@ -523,6 +524,9 @@
 		<preference id="extensions.treestyletab.closeParentBehavior"
 			name="extensions.treestyletab.closeParentBehavior"
 			type="int"/>
+		<preference id="extensions.treestyletab.closeRootBehavior"
+			name="extensions.treestyletab.closeRootBehavior"
+			type="int"/>
 		<preference id="extensions.treestyletab.insertNewChildAt"
 			name="extensions.treestyletab.insertNewChildAt"
 			type="int"/>
@@ -551,9 +555,19 @@
 		<caption label="&config.closeParentBehavior.caption;"/>
 		<radiogroup id="extensions.treestyletab.closeParentBehavior-radiogroup"
 			preference="extensions.treestyletab.closeParentBehavior"
-			orient="vertical">
+			orient="vertical"
+			oncommand="updateCloseRootBehaviorCheck();">
 			<radio value="2" label="&config.closeParentBehavior.close;"/>
-			<radio value="0" label="&config.closeParentBehavior.attach;"/>
+			<radio value="3" label="&config.closeParentBehavior.escalateFirst;"/>
+			<radio value="0" label="&config.closeParentBehavior.escalateAll;"/>
+			<hbox align="center">
+				<spacer style="width:1em;"/>
+				<checkbox id="extensions.treestyletab.closeRootBehavior-check"
+					label="&config.closeRootBehavior.escalateFirst;"
+					preference="extensions.treestyletab.closeRootBehavior"
+					onsyncfrompreference="return document.getElementById('extensions.treestyletab.closeRootBehavior').value == 3;"
+					onsynctopreference="return document.getElementById('extensions.treestyletab.closeRootBehavior-check').checked ? 3 : 1 ;"/>
+			</hbox>
 			<radio value="1" label="&config.closeParentBehavior.detach;"/>
 		</radiogroup>
 	</groupbox>
diff --git a/content/treestyletab/treestyletabbrowser.js b/content/treestyletab/treestyletabbrowser.js
index 7a34ee17..58f11390 100644
--- a/content/treestyletab/treestyletabbrowser.js
+++ b/content/treestyletab/treestyletabbrowser.js
@@ -1509,7 +1509,7 @@ TreeStyleTabBrowser.prototype = {
 	CLOSE_PARENT_BEHAVIOR_ESCALATE_ALL   : 0,
 	CLOSE_PARENT_BEHAVIOR_DETACH         : 1,
 	CLOSE_PARENT_BEHAVIOR_CLOSE          : 2,
-	CLOSE_ROOT_BEHAVIOR_ESCALATE_FIRST : 0,
+	CLOSE_ROOT_BEHAVIOR_ESCALATE_FIRST : 3,
 	CLOSE_ROOT_BEHAVIOR_DETACH         : 1,
  
 	onTabMove : function(aEvent) 
diff --git a/defaults/preferences/treestyletab.js b/defaults/preferences/treestyletab.js
index ce492469..4caa608c 100644
--- a/defaults/preferences/treestyletab.js
+++ b/defaults/preferences/treestyletab.js
@@ -91,11 +91,11 @@ pref("extensions.treestyletab.focusMode", 1);
 */
 pref("extensions.treestyletab.closeParentBehavior", 0);
 /*
-  0 = escalate only the first child tab to the root level
+  3 = escalate only the first child tab to the root level
   1 = escalate all children to new roots (=detach all children)
   Note: this affects only when closeParentBehavior == 0
 */
-pref("extensions.treestyletab.closeRootBehavior", 0);
+pref("extensions.treestyletab.closeRootBehavior", 3);
 
 
 pref("browser.link.open_newwindow.restriction.override", 0);
diff --git a/locale/de-DE/treestyletab/treestyletab.dtd b/locale/de-DE/treestyletab/treestyletab.dtd
index e1336391..5253c954 100644
--- a/locale/de-DE/treestyletab/treestyletab.dtd
+++ b/locale/de-DE/treestyletab/treestyletab.dtd
@@ -110,12 +110,14 @@
 
 <!ENTITY config.autoExpandSubTreeOnAppendChild "Zweig automatisch aufklappen, wenn ein Tab in den Zweig eingefügt wird">
 
-<!ENTITY config.closeParentBehavior.caption "Wenn ein Tab geschlossen wird">
-<!ENTITY config.closeParentBehavior.close   "Untergeordnete Tabs auch schließen">
-<!ENTITY config.closeParentBehavior.attach  "Untergeordnete Tabs
+<!ENTITY config.closeParentBehavior.caption       "Wenn ein Tab geschlossen wird">
+<!ENTITY config.closeParentBehavior.close         "Untergeordnete Tabs auch schließen">
+<!ENTITY config.closeParentBehavior.escalateFirst "Raise the first child tab up to the new parent">
+<!ENTITY config.closeParentBehavior.escalateAll   "Untergeordnete Tabs
 auf die Ebene des geschlossenen Tabs verschieben">
-<!ENTITY config.closeParentBehavior.detach  "Untergeordnete Tabs aus dem Baum ausgliedern">
+<!ENTITY config.closeParentBehavior.detach        "Untergeordnete Tabs aus dem Baum ausgliedern">
 <!--ENTITY config.attachChildrenToGrandParentOnRemoveTab "Beim Schließen eines Tabs untergeordnete Tabs aus Zweig ausgliedern"-->
+<!ENTITY config.closeRootBehavior.escalateFirst   "Raise the first child tab up to the new parent, if the closed parent has no parent">
 
 <!ENTITY config.focusMode "Strg+Tab selektiert auch versteckte Tabs">
 
diff --git a/locale/en-US/treestyletab/treestyletab.dtd b/locale/en-US/treestyletab/treestyletab.dtd
index a6681ad6..21a4725e 100644
--- a/locale/en-US/treestyletab/treestyletab.dtd
+++ b/locale/en-US/treestyletab/treestyletab.dtd
@@ -110,10 +110,12 @@
 
 <!ENTITY config.autoExpandSubTreeOnAppendChild "Expand subtree automatically, when tabs are inserted into the subtree">
 
-<!ENTITY config.closeParentBehavior.caption "When a parent tab is closed">
-<!ENTITY config.closeParentBehavior.close   "Close child tabs too">
-<!ENTITY config.closeParentBehavior.attach  "Move child tabs to the level of the closed parent tab">
-<!ENTITY config.closeParentBehavior.detach  "Liberate child tabs from the tree">
+<!ENTITY config.closeParentBehavior.caption       "When a parent tab is closed">
+<!ENTITY config.closeParentBehavior.close         "Close child tabs too">
+<!ENTITY config.closeParentBehavior.escalateFirst "Raise the first child tab up to the new parent">
+<!ENTITY config.closeParentBehavior.escalateAll   "Raise all child tabs up to the level of the closed parent tab">
+<!ENTITY config.closeParentBehavior.detach        "Liberate child tabs from the tree">
+<!ENTITY config.closeRootBehavior.escalateFirst   "Raise the first child tab up to the new parent, if the closed parent has no parent">
 
 <!ENTITY config.focusMode "Focus to the next/previous tab even if it is invisible, by Control(Command)-Tab">
 
diff --git a/locale/es-ES/treestyletab/treestyletab.dtd b/locale/es-ES/treestyletab/treestyletab.dtd
index f884944c..ac8bfd64 100644
--- a/locale/es-ES/treestyletab/treestyletab.dtd
+++ b/locale/es-ES/treestyletab/treestyletab.dtd
@@ -110,10 +110,12 @@
 
 <!ENTITY config.autoExpandSubTreeOnAppendChild "Expandir sub-árboles automáticamente cuando una pestaña es insertada dentro del sub-árbol">
 
-<!ENTITY config.closeParentBehavior.caption "When a parent tab is closed">
-<!ENTITY config.closeParentBehavior.close   "Close child tabs too">
-<!ENTITY config.closeParentBehavior.attach  "Move child tabs to the level of the closed parent tab">
-<!ENTITY config.closeParentBehavior.detach  "Liberate child tabs from the tree">
+<!ENTITY config.closeParentBehavior.caption       "When a parent tab is closed">
+<!ENTITY config.closeParentBehavior.close         "Close child tabs too">
+<!ENTITY config.closeParentBehavior.escalateFirst "Raise the first child tab up to the new parent">
+<!ENTITY config.closeParentBehavior.escalateAll   "Raise all child tabs up to the level of the closed parent tab">
+<!ENTITY config.closeParentBehavior.detach        "Liberate child tabs from the tree">
+<!ENTITY config.closeRootBehavior.escalateFirst   "Raise the first child tab up to the new parent, if the closed parent has no parent">
 <!--ENTITY config.attachChildrenToGrandParentOnRemoveTab "Liberar las pestañas hijas del árbol cuando el árbol es cerrado"-->
 
 <!ENTITY config.focusMode "Seleccionar la próxima/anterior pestaña aunque no este visible, cuando se presiona Control(Comando)-Tab">
diff --git a/locale/it-IT/treestyletab/treestyletab.dtd b/locale/it-IT/treestyletab/treestyletab.dtd
index 91721600..01776c2e 100644
--- a/locale/it-IT/treestyletab/treestyletab.dtd
+++ b/locale/it-IT/treestyletab/treestyletab.dtd
@@ -110,10 +110,12 @@
 
 <!ENTITY config.autoExpandSubTreeOnAppendChild "Espandi automaticamente i sottoalberi all'inserimento di nuove schede">
 
-<!ENTITY config.closeParentBehavior.caption "Alla chiusura della scheda principale">
-<!ENTITY config.closeParentBehavior.close   "chiudi anche le sottoschede">
-<!ENTITY config.closeParentBehavior.attach  "porta le sottoschede al livello della scheda principale">
-<!ENTITY config.closeParentBehavior.detach  "elimina le sottoschede dall'albero">
+<!ENTITY config.closeParentBehavior.caption       "Alla chiusura della scheda principale">
+<!ENTITY config.closeParentBehavior.close         "chiudi anche le sottoschede">
+<!ENTITY config.closeParentBehavior.escalateFirst "Raise the first child tab up to the new parent">
+<!ENTITY config.closeParentBehavior.escalateAll   "porta le sottoschede al livello della scheda principale">
+<!ENTITY config.closeParentBehavior.detach        "elimina le sottoschede dall'albero">
+<!ENTITY config.closeRootBehavior.escalateFirst   "Raise the first child tab up to the new parent, if the closed parent has no parent">
 <!--ENTITY config.attachChildrenToGrandParentOnRemoveTab "Elimina le sottoschede dall'albero alla chiusura della scheda principale"-->
 
 <!ENTITY config.focusMode "Attiva la scheda successiva/precedente, anche se è nascosta, con Control(Command)-Tab">
diff --git a/locale/ja/treestyletab/treestyletab.dtd b/locale/ja/treestyletab/treestyletab.dtd
index 0b982017..9daa55bf 100644
--- a/locale/ja/treestyletab/treestyletab.dtd
+++ b/locale/ja/treestyletab/treestyletab.dtd
@@ -110,10 +110,12 @@
 
 <!ENTITY config.autoExpandSubTreeOnAppendChild "折り畳まれたサブツリー内に子孫のタブが追加された時、サブツリーを自動的に展開する">
 
-<!ENTITY config.closeParentBehavior.caption "親のタブを閉じた時の挙動">
-<!ENTITY config.closeParentBehavior.close   "子孫のタブも一緒に閉じる">
-<!ENTITY config.closeParentBehavior.attach  "閉じた親タブの階層に子孫のタブを移動する">
-<!ENTITY config.closeParentBehavior.detach  "子孫のタブをツリーから解放する">
+<!ENTITY config.closeParentBehavior.caption       "親のタブを閉じた時の挙動">
+<!ENTITY config.closeParentBehavior.close         "子孫のタブも一緒に閉じる">
+<!ENTITY config.closeParentBehavior.escalateFirst "最初の子タブを新しい親にする">
+<!ENTITY config.closeParentBehavior.escalateAll   "閉じた親タブの階層に子孫のタブを移動する">
+<!ENTITY config.closeParentBehavior.detach        "子孫のタブをツリーから解放する">
+<!ENTITY config.closeRootBehavior.escalateFirst   "最上位の親タブを閉じた時だけは、最初の子タブを新しい親にする">
 
 <!ENTITY config.focusMode "Control(Command)-Tabでタブを切り替える時、折りたたまれたタブにもフォーカスする">
 
diff --git a/locale/pl-PL/treestyletab/treestyletab.dtd b/locale/pl-PL/treestyletab/treestyletab.dtd
index e4ab80e4..d3fe839e 100644
--- a/locale/pl-PL/treestyletab/treestyletab.dtd
+++ b/locale/pl-PL/treestyletab/treestyletab.dtd
@@ -110,10 +110,12 @@
 
 <!ENTITY config.autoExpandSubTreeOnAppendChild "Rozwijaj drzewo potomne automatycznie, gdy są do niego wstawione karty">
 
-<!ENTITY config.closeParentBehavior.caption "Kiedy karta główna jest zamykana:">
-<!ENTITY config.closeParentBehavior.close   "Zamykaj również potomne karty">
-<!ENTITY config.closeParentBehavior.attach  "Przenoś potomne karty na poziom głównej karty">
-<!ENTITY config.closeParentBehavior.detach  "Odłączaj potomne karty od drzewa">
+<!ENTITY config.closeParentBehavior.caption       "Kiedy karta główna jest zamykana:">
+<!ENTITY config.closeParentBehavior.close         "Zamykaj również potomne karty">
+<!ENTITY config.closeParentBehavior.escalateFirst "Raise the first child tab up to the new parent">
+<!ENTITY config.closeParentBehavior.escalateAll   "Przenoś potomne karty na poziom głównej karty">
+<!ENTITY config.closeParentBehavior.detach        "Odłączaj potomne karty od drzewa">
+<!ENTITY config.closeRootBehavior.escalateFirst   "Raise the first child tab up to the new parent, if the closed parent has no parent">
 
 <!ENTITY config.focusMode "Skrót [Ctrl(Command)+Tab] uaktywnia następną/poprzednią kartę nawet jeśli jest niewidoczna">
 
diff --git a/locale/ru-RU/treestyletab/treestyletab.dtd b/locale/ru-RU/treestyletab/treestyletab.dtd
index 510a951b..60344af8 100755
--- a/locale/ru-RU/treestyletab/treestyletab.dtd
+++ b/locale/ru-RU/treestyletab/treestyletab.dtd
@@ -110,10 +110,11 @@
 
 <!ENTITY config.autoExpandSubTreeOnAppendChild "Разворачивать поддерево автоматически, когда вкладки вставляются в поддерево">
 
-<!ENTITY config.closeParentBehavior.caption "When a parent tab is closed">
-<!ENTITY config.closeParentBehavior.close   "Close child tabs too">
-<!ENTITY config.closeParentBehavior.attach  "Move child tabs to the level of the closed parent tab">
-<!ENTITY config.closeParentBehavior.detach  "Liberate child tabs from the tree">
+<!ENTITY config.closeParentBehavior.caption       "When a parent tab is closed">
+<!ENTITY config.closeParentBehavior.close         "Close child tabs too">
+<!ENTITY config.closeParentBehavior.escalateFirst "Raise the first child tab up to the new parent">
+<!ENTITY config.closeParentBehavior.escalateAll   "Raise all child tabs up to the level of the closed parent tab">
+<!ENTITY config.closeParentBehavior.detach        "Liberate child tabs from the tree">
 <!--ENTITY config.attachChildrenToGrandParentOnRemoveTab "Перенести дочерние вкладки в корень дерева, если родительская вкладка закрыта"-->
 
 <!ENTITY config.focusMode "Переходить по Ctrl+Tab на следующую/предыдущую вкладку, если очередная отсутствует">
diff --git a/locale/zh-CN/treestyletab/treestyletab.dtd b/locale/zh-CN/treestyletab/treestyletab.dtd
index e73b511b..b9aedf2f 100644
--- a/locale/zh-CN/treestyletab/treestyletab.dtd
+++ b/locale/zh-CN/treestyletab/treestyletab.dtd
@@ -110,10 +110,11 @@
 
 <!ENTITY config.autoExpandSubTreeOnAppendChild "当标签被插入子树时，自动展开子树">
 
-<!ENTITY config.closeParentBehavior.caption "When a parent tab is closed">
-<!ENTITY config.closeParentBehavior.close   "Close child tabs too">
-<!ENTITY config.closeParentBehavior.attach  "Move child tabs to the level of the closed parent tab">
-<!ENTITY config.closeParentBehavior.detach  "Liberate child tabs from the tree">
+<!ENTITY config.closeParentBehavior.caption       "When a parent tab is closed">
+<!ENTITY config.closeParentBehavior.close         "Close child tabs too">
+<!ENTITY config.closeParentBehavior.escalateFirst "Raise the first child tab up to the new parent">
+<!ENTITY config.closeParentBehavior.escalateAll   "Raise all child tabs up to the level of the closed parent tab">
+<!ENTITY config.closeParentBehavior.detach        "Liberate child tabs from the tree">
 <!--ENTITY config.attachChildrenToGrandParentOnRemoveTab "当父标签关闭时从树中释放子标签"-->
 
 <!ENTITY config.focusMode "用 Control(命令)-Tab聚焦到下个/上个标签，即便其不可见。">
diff --git a/locale/zh-TW/treestyletab/treestyletab.dtd b/locale/zh-TW/treestyletab/treestyletab.dtd
index 1f5ffa36..72a5e7e0 100644
--- a/locale/zh-TW/treestyletab/treestyletab.dtd
+++ b/locale/zh-TW/treestyletab/treestyletab.dtd
@@ -107,10 +107,11 @@
 
 <!ENTITY config.autoExpandSubTreeOnAppendChild "當新增分頁到子樹時，自動展開子樹">
 
-<!ENTITY config.closeParentBehavior.caption "When a parent tab is closed">
-<!ENTITY config.closeParentBehavior.close   "Close child tabs too">
-<!ENTITY config.closeParentBehavior.attach  "Move child tabs to the level of the closed parent tab">
-<!ENTITY config.closeParentBehavior.detach  "Liberate child tabs from the tree">
+<!ENTITY config.closeParentBehavior.caption       "When a parent tab is closed">
+<!ENTITY config.closeParentBehavior.close         "Close child tabs too">
+<!ENTITY config.closeParentBehavior.escalateFirst "Raise the first child tab up to the new parent">
+<!ENTITY config.closeParentBehavior.escalateAll   "Raise all child tabs up to the level of the closed parent tab">
+<!ENTITY config.closeParentBehavior.detach        "Liberate child tabs from the tree">
 <!--ENTITY config.attachChildrenToGrandParentOnRemoveTab "當關閉父分頁時，從樹裡釋放子分頁"-->
 
 <!ENTITY config.focusMode "用 Ctrl（Command）+Tab 切換分頁時，即使是摺疊了的分頁也切換">