From c8271cf59e2064d03ab120df0c03f7fd773b92ef Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Tue, 25 Aug 2009 16:48:10 +0000
Subject: [PATCH] =?UTF-8?q?=E3=82=BF=E3=83=96=E3=83=90=E3=83=BC=E3=81=AE?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E3=82=92=E5=A4=89=E3=81=88=E3=82=8B=E3=82=B5?=
 =?UTF-8?q?=E3=83=96=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=82=92=E3=82=BF?=
 =?UTF-8?q?=E3=83=96=E3=81=AE=E3=82=B3=E3=83=B3=E3=83=86=E3=82=AD=E3=82=B9?=
 =?UTF-8?q?=E3=83=88=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=8B=E3=82=89?=
 =?UTF-8?q?=E5=89=8A=E9=99=A4?=
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@5007 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/config.xul             |  6 ------
 content/treestyletab/treestyletab.xul       | 15 ---------------
 content/treestyletab/treestyletabbrowser.js | 11 +----------
 locale/de-DE/treestyletab/treestyletab.dtd  |  2 --
 locale/en-US/treestyletab/treestyletab.dtd  |  2 --
 locale/es-ES/treestyletab/treestyletab.dtd  |  2 --
 locale/it-IT/treestyletab/treestyletab.dtd  |  2 --
 locale/ja/treestyletab/treestyletab.dtd     |  2 --
 locale/pl-PL/treestyletab/treestyletab.dtd  |  2 --
 locale/ru-RU/treestyletab/treestyletab.dtd  |  2 --
 locale/zh-CN/treestyletab/treestyletab.dtd  |  2 --
 locale/zh-TW/treestyletab/treestyletab.dtd  |  2 --
 12 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/content/treestyletab/config.xul b/content/treestyletab/config.xul
index 4106643b..0cf9c8f5 100644
--- a/content/treestyletab/config.xul
+++ b/content/treestyletab/config.xul
@@ -232,9 +232,6 @@
 		<preference id="extensions.treestyletab.show.context-item-toggleFixed"
 			name="extensions.treestyletab.show.context-item-toggleFixed"
 			type="bool"/>
-		<preference id="extensions.treestyletab.show.context-menu-tabbarPosition"
-			name="extensions.treestyletab.show.context-menu-tabbarPosition"
-			type="bool"/>
 		<preference id="extensions.treestyletab.show.context-item-bookmarkTabSubTree"
 			name="extensions.treestyletab.show.context-item-bookmarkTabSubTree"
 			type="bool"/>
@@ -275,9 +272,6 @@
 			<checkbox id="extensions.treestyletab.show.context-item-toggleFixed-check"
 				preference="extensions.treestyletab.show.context-item-toggleFixed"
 				label="&context.toggleFixed.label;"/>
-			<checkbox id="extensions.treestyletab.show.context-menu-tabbarPosition-check"
-				preference="extensions.treestyletab.show.context-menu-tabbarPosition"
-				label="&context.tabbarPosition.label;"/>
 		</hbox>
 		<hbox align="center">
 			<checkbox id="extensions.treestyletab.show.context-item-bookmarkTabSubTree-check"
diff --git a/content/treestyletab/treestyletab.xul b/content/treestyletab/treestyletab.xul
index bde8a188..7604f9fb 100644
--- a/content/treestyletab/treestyletab.xul
+++ b/content/treestyletab/treestyletab.xul
@@ -143,21 +143,6 @@
 			type="checkbox"
 			autocheck="false"
 			oncommand="TreeStyleTabService.toggleFixed();"/>
-		<menu id="context-menu-tabbarPosition"
-			label="&context.tabbarPosition.label;"
-			accesskey="&context.tabbarPosition.accesskey;">
-			<menupopup oncommand="TreeStyleTabService.changeTabbarPosition(event.target.getAttribute('value'));">
-				<menuitem label="&config.tabbar.position.left;"
-					type="radio" value="left"/>
-				<menuitem label="&config.tabbar.position.right;"
-					type="radio" value="right"/>
-				<menuseparator/>
-				<menuitem label="&config.tabbar.position.top;"
-					type="radio" value="top"/>
-				<menuitem label="&config.tabbar.position.bottom;"
-					type="radio" value="bottom"/>
-			</menupopup>
-		</menu>
 
 	</menupopup>
 </popupset>
diff --git a/content/treestyletab/treestyletabbrowser.js b/content/treestyletab/treestyletabbrowser.js
index fbcb17ec..613d54b6 100644
--- a/content/treestyletab/treestyletabbrowser.js
+++ b/content/treestyletab/treestyletabbrowser.js
@@ -15,7 +15,6 @@ TreeStyleTabBrowser.prototype = {
 	kMENUITEM_AUTOHIDE_SEPARATOR       : 'context-separator-toggleAutoHide',
 	kMENUITEM_AUTOHIDE                 : 'context-item-toggleAutoHide',
 	kMENUITEM_FIXED                    : 'context-item-toggleFixed',
-	kMENUITEM_POSITION                 : 'context-menu-tabbarPosition',
 	kMENUITEM_BOOKMARKSUBTREE          : 'context-item-bookmarkTabSubTree',
 	
 	mTabBrowser : null, 
@@ -498,7 +497,6 @@ TreeStyleTabBrowser.prototype = {
 					aSelf.kMENUITEM_AUTOHIDE_SEPARATOR,
 					aSelf.kMENUITEM_AUTOHIDE,
 					aSelf.kMENUITEM_FIXED,
-					aSelf.kMENUITEM_POSITION,
 					aSelf.kMENUITEM_BOOKMARKSUBTREE
 				].forEach(function(aID) {
 					let item = document.getElementById(aID).cloneNode(true);
@@ -2188,7 +2186,6 @@ TreeStyleTabBrowser.prototype = {
 			this.kMENUITEM_EXPAND,
 			this.kMENUITEM_AUTOHIDE,
 			this.kMENUITEM_FIXED,
-			this.kMENUITEM_POSITION,
 			this.kMENUITEM_BOOKMARKSUBTREE
 		].forEach(function(aID) {
 			let item = this.evaluateXPath(
@@ -2282,19 +2279,13 @@ TreeStyleTabBrowser.prototype = {
 		else
 			fixed.removeAttribute('checked');
 
-		// position
-		let position = items[this.kMENUITEM_POSITION];
-		let pos = b.getAttribute(this.kTABBAR_POSITION);
-		position.getElementsByAttribute('value', pos)[0].setAttribute('checked', true);
-
 		sep = this.evaluateXPath(
 			'descendant::xul:menuseparator[starts-with(@id, "'+this.kMENUITEM_AUTOHIDE_SEPARATOR+'")]',
 			aEvent.currentTarget,
 			XPathResult.FIRST_ORDERED_NODE_TYPE
 		).singleNodeValue;
 		if (autohide.getAttribute('hidden') != 'true' ||
-			fixed.getAttribute('hidden') != 'true' ||
-			position.getAttribute('hidden') != 'true') {
+			fixed.getAttribute('hidden') != 'true') {
 			sep.removeAttribute('hidden');
 		}
 		else {
diff --git a/locale/de-DE/treestyletab/treestyletab.dtd b/locale/de-DE/treestyletab/treestyletab.dtd
index a60b6a15..35770c70 100644
--- a/locale/de-DE/treestyletab/treestyletab.dtd
+++ b/locale/de-DE/treestyletab/treestyletab.dtd
@@ -174,8 +174,6 @@
 <!ENTITY context.toggleFixed.label.horizontal "Feste Position und Höhe der Tableiste">
 <!ENTITY context.toggleFixed.label.vertical   "Feste Position und Breite der Tableiste">
 <!ENTITY context.toggleFixed.accesskey "f">
-<!ENTITY context.tabbarPosition.label     "Position">
-<!ENTITY context.tabbarPosition.accesskey "p">
 <!ENTITY context.bookmarkTabSubTree.label     "Zweig als Lesezeichen speichern">
 <!ENTITY context.bookmarkTabSubTree.accesskey "t">
 
diff --git a/locale/en-US/treestyletab/treestyletab.dtd b/locale/en-US/treestyletab/treestyletab.dtd
index 56cc3ad9..0ab356e1 100644
--- a/locale/en-US/treestyletab/treestyletab.dtd
+++ b/locale/en-US/treestyletab/treestyletab.dtd
@@ -173,8 +173,6 @@
 <!ENTITY context.toggleFixed.label.horizontal   "Fix position and height of tab bar">
 <!ENTITY context.toggleFixed.label.vertical     "Fix position and width of tab bar">
 <!ENTITY context.toggleFixed.accesskey          "f">
-<!ENTITY context.tabbarPosition.label           "Position">
-<!ENTITY context.tabbarPosition.accesskey       "p">
 <!ENTITY context.bookmarkTabSubTree.label       "Bookmark this Tree...">
 <!ENTITY context.bookmarkTabSubTree.accesskey   "t">
 
diff --git a/locale/es-ES/treestyletab/treestyletab.dtd b/locale/es-ES/treestyletab/treestyletab.dtd
index 78dd335e..8a5fcc4f 100644
--- a/locale/es-ES/treestyletab/treestyletab.dtd
+++ b/locale/es-ES/treestyletab/treestyletab.dtd
@@ -177,8 +177,6 @@
 <!ENTITY context.toggleFixed.label.horizontal "Fix position and height of tab bar">
 <!ENTITY context.toggleFixed.label.vertical   "Anclar la barra de pestañas">
 <!ENTITY context.toggleFixed.accesskey "f">
-<!ENTITY context.tabbarPosition.label     "Posición">
-<!ENTITY context.tabbarPosition.accesskey "p">
 <!ENTITY context.bookmarkTabSubTree.label     "Añadir a marcadores este árbol...">
 <!ENTITY context.bookmarkTabSubTree.accesskey "t">
 
diff --git a/locale/it-IT/treestyletab/treestyletab.dtd b/locale/it-IT/treestyletab/treestyletab.dtd
index 26c1e48f..cf56379a 100644
--- a/locale/it-IT/treestyletab/treestyletab.dtd
+++ b/locale/it-IT/treestyletab/treestyletab.dtd
@@ -177,8 +177,6 @@
 <!ENTITY context.toggleFixed.label.horizontal "Fix position and height of tab bar">
 <!ENTITY context.toggleFixed.label.vertical   "Blocca larghezza della barra delle schede">
 <!ENTITY context.toggleFixed.accesskey "h">
-<!ENTITY context.tabbarPosition.label     "Posiziona">
-<!ENTITY context.tabbarPosition.accesskey "p">
 <!ENTITY context.bookmarkTabSubTree.label     "Questo sottoalbero nei segnalibri...">
 <!ENTITY context.bookmarkTabSubTree.accesskey "l">
 
diff --git a/locale/ja/treestyletab/treestyletab.dtd b/locale/ja/treestyletab/treestyletab.dtd
index fa5db32e..dd60ac1e 100644
--- a/locale/ja/treestyletab/treestyletab.dtd
+++ b/locale/ja/treestyletab/treestyletab.dtd
@@ -173,8 +173,6 @@
 <!ENTITY context.toggleFixed.label.horizontal   "タブバーの位置と高さを固定">
 <!ENTITY context.toggleFixed.label.vertical     "タブバーの位置と幅を固定">
 <!ENTITY context.toggleFixed.accesskey          "f">
-<!ENTITY context.tabbarPosition.label           "タブバーの位置">
-<!ENTITY context.tabbarPosition.accesskey       "p">
 <!ENTITY context.bookmarkTabSubTree.label       "このツリーをブックマーク...">
 <!ENTITY context.bookmarkTabSubTree.accesskey   "t">
 
diff --git a/locale/pl-PL/treestyletab/treestyletab.dtd b/locale/pl-PL/treestyletab/treestyletab.dtd
index dcbf83a4..c375e761 100644
--- a/locale/pl-PL/treestyletab/treestyletab.dtd
+++ b/locale/pl-PL/treestyletab/treestyletab.dtd
@@ -176,8 +176,6 @@
 <!ENTITY context.toggleFixed.label.horizontal "Fix position and height of tab bar">
 <!ENTITY context.toggleFixed.label.vertical   "Stała szerokość paska kart">
 <!ENTITY context.toggleFixed.accesskey "S">
-<!ENTITY context.tabbarPosition.label     "Położenie paska kart">
-<!ENTITY context.tabbarPosition.accesskey "E">
 <!ENTITY context.bookmarkTabSubTree.label     "Dodaj zakładki do tego drzewa…">
 <!ENTITY context.bookmarkTabSubTree.accesskey "A">
 
diff --git a/locale/ru-RU/treestyletab/treestyletab.dtd b/locale/ru-RU/treestyletab/treestyletab.dtd
index 2fb8ef58..531b1412 100755
--- a/locale/ru-RU/treestyletab/treestyletab.dtd
+++ b/locale/ru-RU/treestyletab/treestyletab.dtd
@@ -177,8 +177,6 @@
 <!ENTITY context.toggleFixed.label.horizontal "Fix position and height of tab bar">
 <!ENTITY context.toggleFixed.label.vertical   "Зафиксировать ширину панели вкладок">
 <!ENTITY context.toggleFixed.accesskey "f">
-<!ENTITY context.tabbarPosition.label     "Позиция">
-<!ENTITY context.tabbarPosition.accesskey "p">
 <!ENTITY context.bookmarkTabSubTree.label     "Добавить это дерево в закладки...">
 <!ENTITY context.bookmarkTabSubTree.accesskey "t">
 
diff --git a/locale/zh-CN/treestyletab/treestyletab.dtd b/locale/zh-CN/treestyletab/treestyletab.dtd
index dc1c0dc5..22633788 100644
--- a/locale/zh-CN/treestyletab/treestyletab.dtd
+++ b/locale/zh-CN/treestyletab/treestyletab.dtd
@@ -177,8 +177,6 @@
 <!ENTITY context.toggleFixed.label.horizontal   "固定标签栏位置／高度">
 <!ENTITY context.toggleFixed.label.vertical     "固定标签栏位置／宽度">
 <!ENTITY context.toggleFixed.accesskey          "f">
-<!ENTITY context.tabbarPosition.label           "标签栏位置">
-<!ENTITY context.tabbarPosition.accesskey       "p">
 <!ENTITY context.bookmarkTabSubTree.label       "将此树加入书签...">
 <!ENTITY context.bookmarkTabSubTree.accesskey   "t">
 
diff --git a/locale/zh-TW/treestyletab/treestyletab.dtd b/locale/zh-TW/treestyletab/treestyletab.dtd
index 165223c0..08ec528d 100644
--- a/locale/zh-TW/treestyletab/treestyletab.dtd
+++ b/locale/zh-TW/treestyletab/treestyletab.dtd
@@ -173,8 +173,6 @@
 <!ENTITY context.toggleFixed.label.horizontal "固定分頁工具列的位置／高度">
 <!ENTITY context.toggleFixed.label.vertical   "固定分頁工具列的位置／寬度">
 <!ENTITY context.toggleFixed.accesskey "f">
-<!ENTITY context.tabbarPosition.label     "分頁工具列的位置">
-<!ENTITY context.tabbarPosition.accesskey "p">
 <!ENTITY context.bookmarkTabSubTree.label     "此樹加入書籤...">
 <!ENTITY context.bookmarkTabSubTree.accesskey "t">