From 5287ab43b00d6f94a970ac6e302b874f3c938942 Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Wed, 26 Aug 2009 10:24:54 +0000
Subject: [PATCH] =?UTF-8?q?Ctrl-Tab=E3=81=A7=E6=8A=98=E3=82=8A=E3=81=9F?=
 =?UTF-8?q?=E3=81=9F=E3=81=BE=E3=82=8C=E3=81=9F=E3=82=BF=E3=83=96=E3=81=AB?=
 =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=BC=E3=82=AB=E3=82=B9=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92=E3=83=87?=
 =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88=E3=81=A7=E3=81=AF=E9=9A=A0?=
 =?UTF-8?q?=E3=81=99=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=A6=E3=80=81?=
 =?UTF-8?q?=E3=80=8C=E8=A9=B3=E7=B4=B0=E3=80=8D=E3=81=AE=E3=82=BF=E3=83=96?=
 =?UTF-8?q?=E3=81=AE=E6=95=B0=E3=82=92=E6=B8=9B=E3=82=89=E3=81=97=E3=81=9F?=
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@5014 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/config.js  | 12 ++++++++++++
 content/treestyletab/config.xul |  8 ++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/content/treestyletab/config.js b/content/treestyletab/config.js
index 2cfb8f25..9a8f127d 100644
--- a/content/treestyletab/config.js
+++ b/content/treestyletab/config.js
@@ -234,6 +234,18 @@ function onTabbarTransparencyScaleChange()
 }
 
 
+function initAdvancedPane()
+{
+	updateCloseRootBehaviorCheck();
+
+	var focusMode = document.getElementById('extensions.treestyletab.focusMode-check');
+	var focusModePref = document.getElementById('extensions.treestyletab.focusMode');
+	if (focusModePref.value != focusModePref.defaultValue)
+		focusMode.removeAttribute('collapsed');
+	else
+		focusMode.setAttribute('collapsed', true);
+}
+
 function updateCloseRootBehaviorCheck()
 {
 	var closeParentBehavior = document.getElementById('extensions.treestyletab.closeParentBehavior-radiogroup').value;
diff --git a/content/treestyletab/config.xul b/content/treestyletab/config.xul
index b0acaa60..cff1a9e4 100644
--- a/content/treestyletab/config.xul
+++ b/content/treestyletab/config.xul
@@ -614,7 +614,7 @@
 </prefpane>
 
 <prefpane id="prefpane-advanced" label="&config.tabs.advanced;"
-	onpaneload="updateCloseRootBehaviorCheck();">
+	onpaneload="initAdvancedPane();">
 	<preferences>
 		<preference id="extensions.treestyletab.autoCollapseExpandSubTreeOnSelect"
 			name="extensions.treestyletab.autoCollapseExpandSubTreeOnSelect"
@@ -654,7 +654,6 @@
 
 	<tabbox orient="vertical">
 		<tabs orient="horizontal">
-			<tab label="&config.tabs.advanced.focus;"/>
 			<tab label="&config.tabs.advanced.tree;"/>
 			<tab label="&config.tabs.advanced.misc;"/>
 		</tabs>
@@ -675,9 +674,6 @@
 		label="&config.focusMode;"
 		onsyncfrompreference="return document.getElementById('extensions.treestyletab.focusMode').value == 0;"
 		onsynctopreference="return document.getElementById('extensions.treestyletab.focusMode-check').checked ? 0 : 1 ;"/>
-</tabpanel>
-
-<tabpanel orient="vertical">
 	<checkbox id="extensions.treestyletab.collapseExpandSubTree.dblclick-check"
 		preference="extensions.treestyletab.collapseExpandSubTree.dblclick"
 		label="&config.collapseExpandSubTree.dblclick;"/>
@@ -711,7 +707,7 @@
 		<caption label="&config.insertNewChildAt.caption;"/>
 		<radiogroup id="extensions.treestyletab.insertNewChildAt-radiogroup"
 			preference="extensions.treestyletab.insertNewChildAt"
-			orient="vertical">
+			orient="horizontal">
 			<radio value="0" label="&config.insertNewChildAt.first;"/>
 			<radio value="1" label="&config.insertNewChildAt.last;"/>
 		</radiogroup>