From cb9320524c477892b1a979e5b82e10e72bfc3719 Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Thu, 1 Apr 2010 11:48:56 +0000
Subject: [PATCH] =?UTF-8?q?=E3=82=B9=E3=82=BF=E3=82=A4=E3=83=AB=E5=88=87?=
 =?UTF-8?q?=E3=82=8A=E6=9B=BF=E3=81=88=E3=81=AE=E8=A8=AD=E5=AE=9A=E9=A0=85?=
 =?UTF-8?q?=E7=9B=AE=E3=82=92=E5=88=A5=E3=83=9A=E3=83=BC=E3=82=B8=E3=81=AB?=
 =?UTF-8?q?=E5=88=86=E9=9B=A2?=
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@6552 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/config.js                |  3 ++
 content/treestyletab/config.xul               | 35 +++++++++++++------
 locale/de-DE/treestyletab/treestyletab.dtd    |  3 ++
 locale/en-US/treestyletab/treestyletab.dtd    |  5 ++-
 locale/es-ES/treestyletab/treestyletab.dtd    |  3 ++
 locale/it-IT/treestyletab/treestyletab.dtd    |  3 ++
 locale/ja/treestyletab/treestyletab.dtd       |  3 ++
 locale/ru-RU/treestyletab/treestyletab.dtd    |  3 ++
 locale/zh-CN/treestyletab/treestyletab.dtd    |  3 ++
 locale/zh-TW/treestyletab/treestyletab.dtd    |  3 ++
 .../skin/classic/treestyletab/config.css      |  5 +++
 skin/classic/treestyletab/config-base.css     |  8 +++++
 12 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/content/treestyletab/config.js b/content/treestyletab/config.js
index f2643d62..c2c75570 100644
--- a/content/treestyletab/config.js
+++ b/content/treestyletab/config.js
@@ -40,7 +40,10 @@ function init()
 function initAppearancePane()
 {
 	onChangeTabbarPosition();
+}
 
+function initStylePane()
+{
 	var mixed = document.getElementById('extensions.treestyletab.tabbar.style-mixed');
 	if (comparator.compare(XULAppInfo.version, '3.5') >= 0) {
 		mixed.removeAttribute('disabled');
diff --git a/content/treestyletab/config.xul b/content/treestyletab/config.xul
index e6d82443..ca4b9577 100644
--- a/content/treestyletab/config.xul
+++ b/content/treestyletab/config.xul
@@ -18,9 +18,6 @@
 		<preference id="extensions.treestyletab.tabbar.position"
 			name="extensions.treestyletab.tabbar.position"
 			type="string"/>
-		<preference id="extensions.treestyletab.tabbar.style"
-			name="extensions.treestyletab.tabbar.style"
-			type="string"/>
 		<preference id="extensions.treestyletab.tabbar.fixed.horizontal"
 			name="extensions.treestyletab.tabbar.fixed.horizontal"
 			type="bool"/>
@@ -56,9 +53,6 @@
 		<preference id="extensions.treestyletab.tabbar.invertTabContents"
 			name="extensions.treestyletab.tabbar.invertTabContents"
 			type="bool"/>
-		<preference id="extensions.treestyletab.twisty.style"
-			name="extensions.treestyletab.twisty.style"
-			type="string"/>
 	</preferences>
 
 	<vbox>
@@ -143,6 +137,22 @@
 		</hbox>
 		</vbox>
 	</groupbox>
+
+	</vbox>
+
+</prefpane>
+
+<prefpane id="prefpane-style" label="&config.tabs.style;"
+	onpaneload="initStylePane();">
+	<preferences>
+		<preference id="extensions.treestyletab.tabbar.style"
+			name="extensions.treestyletab.tabbar.style"
+			type="string"/>
+		<preference id="extensions.treestyletab.twisty.style"
+			name="extensions.treestyletab.twisty.style"
+			type="string"/>
+	</preferences>
+
 	<groupbox>
 		<caption label="&config.tabbar.style.caption;"/>
 		<radiogroup id="extensions.treestyletab.tabbar.style-radiogroup"
@@ -159,6 +169,8 @@
 				class="image" align="center"
 				src="chrome://treestyletab/content/res/style-mixed.png"
 				id="extensions.treestyletab.tabbar.style-mixed"/>
+			</hbox>
+			<hbox align="center">
 			<radio value="vertigo" label="&config.tabbar.style.vertigo;"
 				class="image" align="center"
 				src="chrome://treestyletab/content/res/style-vertigo.png"/>
@@ -170,14 +182,17 @@
 				src="chrome://treestyletab/content/res/style-sidebar.png"
 				id="extensions.treestyletab.tabbar.style-sidebar"/>
 			</hbox>
+			<hbox align="center">
 			<radio value="" label="&config.tabbar.style.none;"/>
+			</hbox>
 		</radiogroup>
 	</groupbox>
 	<groupbox>
 		<caption label="&config.twisty.style.caption;"/>
 		<radiogroup id="extensions.treestyletab.twisty.style-radiogroup"
 			preference="extensions.treestyletab.twisty.style"
-			orient="horizontal">
+			orient="vertical">
+			<hbox align="center">
 			<radio value="auto" label="&config.twisty.style.auto;"/>
 			<radio value="retro" label="&config.twisty.style.retro;"
 				class="image" align="center"
@@ -191,12 +206,12 @@
 			<radio value="osx" label="&config.twisty.style.osx;"
 				class="image" align="center"
 				src="chrome://treestyletab/content/res/twisty-osx.png"/>
+			</hbox>
+			<hbox align="center">
 			<radio value="none" label="&config.twisty.style.none;"/>
+			</hbox>
 		</radiogroup>
 	</groupbox>
-
-	</vbox>
-
 </prefpane>
 
 <prefpane id="prefpane-menu" label="&config.tabs.menu;">
diff --git a/locale/de-DE/treestyletab/treestyletab.dtd b/locale/de-DE/treestyletab/treestyletab.dtd
index 23f7a9c6..f248488e 100644
--- a/locale/de-DE/treestyletab/treestyletab.dtd
+++ b/locale/de-DE/treestyletab/treestyletab.dtd
@@ -19,6 +19,9 @@
 <!ENTITY config.allowSubtreeCollapseExpand  "Auf- und Einklappen von Zweigen erlauben">
 <!ENTITY config.tabbar.hideAlltabsButton    "Button zum Auflisten aller Tabs anzeigen">
 
+
+<!ENTITY config.tabs.style "Style">
+
 <!ENTITY config.tabbar.style.caption "Aussehen der Tableiste">
 <!ENTITY config.tabbar.style.plain   "Plain">
 <!ENTITY config.tabbar.style.flat    "Flat">
diff --git a/locale/en-US/treestyletab/treestyletab.dtd b/locale/en-US/treestyletab/treestyletab.dtd
index 2ada6155..9fa48642 100644
--- a/locale/en-US/treestyletab/treestyletab.dtd
+++ b/locale/en-US/treestyletab/treestyletab.dtd
@@ -19,7 +19,10 @@
 <!ENTITY config.allowSubtreeCollapseExpand  "Allow to collapse/expand tree of tabs">
 <!ENTITY config.tabbar.hideAlltabsButton    "Show &quot;List all tabs&quot; button">
 
-<!ENTITY config.tabbar.style.caption "Appearance of the tab bar">
+
+<!ENTITY config.tabs.style "Style">
+
+<!ENTITY config.tabbar.style.caption "Skin of the tab bar">
 <!ENTITY config.tabbar.style.plain   "Plain">
 <!ENTITY config.tabbar.style.flat    "Flat">
 <!ENTITY config.tabbar.style.mixed   "Mixed">
diff --git a/locale/es-ES/treestyletab/treestyletab.dtd b/locale/es-ES/treestyletab/treestyletab.dtd
index 49a11d31..509c122c 100644
--- a/locale/es-ES/treestyletab/treestyletab.dtd
+++ b/locale/es-ES/treestyletab/treestyletab.dtd
@@ -19,6 +19,9 @@
 <!ENTITY config.allowSubtreeCollapseExpand  "Permitir colapsar/expandir los sub-árboles de las pestañas">
 <!ENTITY config.tabbar.hideAlltabsButton    "Mostrar el botón &quot;Listar todas las pestañas&quot;">
 
+
+<!ENTITY config.tabs.style "Style">
+
 <!ENTITY config.tabbar.style.caption "Apariencia de la barra de pestañas">
 <!ENTITY config.tabbar.style.plain   "Plano">
 <!ENTITY config.tabbar.style.flat    "Flat">
diff --git a/locale/it-IT/treestyletab/treestyletab.dtd b/locale/it-IT/treestyletab/treestyletab.dtd
index 918a2f2d..6a0129bd 100644
--- a/locale/it-IT/treestyletab/treestyletab.dtd
+++ b/locale/it-IT/treestyletab/treestyletab.dtd
@@ -19,6 +19,9 @@
 <!ENTITY config.allowSubtreeCollapseExpand  "Permetti di contrarre/espandere sottoalberi delle schede">
 <!ENTITY config.tabbar.hideAlltabsButton    "Visualizza la maniglia per elencare tutte le schede">
 
+
+<!ENTITY config.tabs.style "Style">
+
 <!ENTITY config.tabbar.style.caption "Aspetto delle barra delle schede">
 <!ENTITY config.tabbar.style.plain   "Semplice">
 <!ENTITY config.tabbar.style.flat    "Flat">
diff --git a/locale/ja/treestyletab/treestyletab.dtd b/locale/ja/treestyletab/treestyletab.dtd
index e4659ae3..79a570aa 100644
--- a/locale/ja/treestyletab/treestyletab.dtd
+++ b/locale/ja/treestyletab/treestyletab.dtd
@@ -19,6 +19,9 @@
 <!ENTITY config.allowSubtreeCollapseExpand  "ツリーを折りたためるようにする">
 <!ENTITY config.tabbar.hideAlltabsButton    "「タブの一覧を表示」ボタンを表示する">
 
+
+<!ENTITY config.tabs.style "スタイル">
+
 <!ENTITY config.tabbar.style.caption "タブバーの表示スタイル">
 <!ENTITY config.tabbar.style.plain   "Plain">
 <!ENTITY config.tabbar.style.flat    "Flat">
diff --git a/locale/ru-RU/treestyletab/treestyletab.dtd b/locale/ru-RU/treestyletab/treestyletab.dtd
index 35ab8c46..a857808f 100755
--- a/locale/ru-RU/treestyletab/treestyletab.dtd
+++ b/locale/ru-RU/treestyletab/treestyletab.dtd
@@ -19,6 +19,9 @@
 <!ENTITY config.allowSubtreeCollapseExpand  "Разрешить сворачивать/разворачивать поддеревья вкладок">
 <!ENTITY config.tabbar.hideAlltabsButton    "Показывать кнопку &quot;Список всех вкладок&quot;">
 
+
+<!ENTITY config.tabs.style "Style">
+
 <!ENTITY config.tabbar.style.caption "Вид вкладок на панели">
 <!ENTITY config.tabbar.style.plain   "Плоские кнопки">
 <!ENTITY config.tabbar.style.flat    "Flat">
diff --git a/locale/zh-CN/treestyletab/treestyletab.dtd b/locale/zh-CN/treestyletab/treestyletab.dtd
index 362fda08..d7935281 100644
--- a/locale/zh-CN/treestyletab/treestyletab.dtd
+++ b/locale/zh-CN/treestyletab/treestyletab.dtd
@@ -19,6 +19,9 @@
 <!ENTITY config.allowSubtreeCollapseExpand  "允许折叠/展开标签子树">
 <!ENTITY config.tabbar.hideAlltabsButton    "显示“列出所有标签”按钮">
 
+
+<!ENTITY config.tabs.style "Style">
+
 <!ENTITY config.tabbar.style.caption "标签栏外观">
 <!ENTITY config.tabbar.style.plain   "简洁"">
 <!ENTITY config.tabbar.style.flat    "Flat">
diff --git a/locale/zh-TW/treestyletab/treestyletab.dtd b/locale/zh-TW/treestyletab/treestyletab.dtd
index 9059dfe3..ef6ba533 100644
--- a/locale/zh-TW/treestyletab/treestyletab.dtd
+++ b/locale/zh-TW/treestyletab/treestyletab.dtd
@@ -19,6 +19,9 @@
 <!ENTITY config.allowSubtreeCollapseExpand  "允許摺疊 / 展開樹狀子目錄">
 <!ENTITY config.tabbar.hideAlltabsButton    "顯示「列出所有分頁」按鈕">
 
+
+<!ENTITY config.tabs.style "Style">
+
 <!ENTITY config.tabbar.style.caption "分頁工具列的外觀">
 <!ENTITY config.tabbar.style.plain   "簡潔">
 <!ENTITY config.tabbar.style.flat    "Flat">
diff --git a/platform/Linux/skin/classic/treestyletab/config.css b/platform/Linux/skin/classic/treestyletab/config.css
index 6553600c..29df337e 100644
--- a/platform/Linux/skin/classic/treestyletab/config.css
+++ b/platform/Linux/skin/classic/treestyletab/config.css
@@ -5,6 +5,11 @@ radio[pane="prefpane-appearance"][selected="true"] {
 	-moz-image-region: rect(0px, 32px, 32px, 0px);
 }
 
+radio[pane="prefpane-style"]:hover,
+radio[pane="prefpane-style"][selected="true"] {
+	-moz-image-region: rect(0px, 32px, 32px, 0px);
+}
+
 radio[pane="prefpane-menu"]:hover,
 radio[pane="prefpane-menu"][selected="true"] {
 	-moz-image-region: rect(0px, 32px, 32px, 0px);
diff --git a/skin/classic/treestyletab/config-base.css b/skin/classic/treestyletab/config-base.css
index 20a1223b..4ce36fbf 100644
--- a/skin/classic/treestyletab/config-base.css
+++ b/skin/classic/treestyletab/config-base.css
@@ -18,6 +18,14 @@ radio[pane="prefpane-appearance"][selected="true"] {
 	-moz-image-region: rect(32px, 32px, 64px, 0px);
 }
 
+radio[pane="prefpane-style"] {
+	-moz-image-region: rect(0px, 32px, 32px, 0px);
+}
+radio[pane="prefpane-style"]:hover,
+radio[pane="prefpane-style"][selected="true"] {
+	-moz-image-region: rect(32px, 32px, 64px, 0px);
+}
+
 radio[pane="prefpane-menu"] {
 	-moz-image-region: rect(0px, 32px, 32px, 0px);
 }