From 8c5c96ff4154c459ac0de9bc3bd7a386ee9a2b98 Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Fri, 22 Feb 2008 17:32:36 +0000
Subject: [PATCH] =?UTF-8?q?=E7=95=B0=E3=81=AA=E3=82=8B=E3=83=89=E3=83=A1?=
 =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=81=AB=E5=AF=BE=E3=81=97=E3=81=A6=E9=96=8B?=
 =?UTF-8?q?=E3=81=8B=E3=82=8C=E3=82=8B=E3=82=BF=E3=83=96=E3=82=92=E5=AD=90?=
 =?UTF-8?q?=E3=82=BF=E3=83=96=E3=81=AB=E3=81=99=E3=82=8B=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=82=92=E8=A8=AD=E3=81=91=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@1832 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/config.xul            | 8 ++++++++
 content/treestyletab/treestyletab.js       | 5 ++++-
 defaults/preferences/treestyletab.js       | 1 +
 locale/en-US/treestyletab/treestyletab.dtd | 1 +
 locale/it-IT/treestyletab/treestyletab.dtd | 1 +
 locale/ja/treestyletab/treestyletab.dtd    | 1 +
 6 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/content/treestyletab/config.xul b/content/treestyletab/config.xul
index ccd8fb69..16ecf3cc 100644
--- a/content/treestyletab/config.xul
+++ b/content/treestyletab/config.xul
@@ -181,6 +181,9 @@
 		<preference id="extensions.treestyletab.urlbar.loadDifferentDomainToNewTab"
 			name="extensions.treestyletab.urlbar.loadDifferentDomainToNewTab"
 			type="bool"/>
+		<preference id="extensions.treestyletab.urlbar.loadDifferentDomainToNewTab.asChild"
+			name="extensions.treestyletab.urlbar.loadDifferentDomainToNewTab.asChild"
+			type="bool"/>
 		<preference id="extensions.treestyletab.urlbar.loadSameDomainToNewChildTab"
 			name="extensions.treestyletab.urlbar.loadSameDomainToNewChildTab"
 			type="bool"/>
@@ -223,9 +226,14 @@
 				<groupbox>
 					<caption label="&config.urlbar.caption;"/>
 					<vbox>
+						<hbox align="center">
 						<checkbox id="extensions.treestyletab.urlbar.loadDifferentDomainToNewTab-check"
 							preference="extensions.treestyletab.urlbar.loadDifferentDomainToNewTab"
 							label="&config.urlbar.loadDifferentDomainToNewTab;"/>
+						<checkbox id="extensions.treestyletab.urlbar.loadDifferentDomainToNewTab.asChild-check"
+							preference="extensions.treestyletab.urlbar.loadDifferentDomainToNewTab.asChild"
+							label="&config.urlbar.loadDifferentDomainToNewTab.asChild;"/>
+						</hbox>
 						<checkbox id="extensions.treestyletab.urlbar.loadSameDomainToNewChildTab-check"
 							preference="extensions.treestyletab.urlbar.loadSameDomainToNewChildTab"
 							label="&config.urlbar.loadSameDomainToNewChildTab;"/>
diff --git a/content/treestyletab/treestyletab.js b/content/treestyletab/treestyletab.js
index ebc4ef73..75958c75 100644
--- a/content/treestyletab/treestyletab.js
+++ b/content/treestyletab/treestyletab.js
@@ -902,7 +902,10 @@ catch(e) {
 				<><![CDATA[
 					TreeStyleTabService.checkReadyToOpenNewTab({
 						uri      : url,
-						external : { newTab : TreeStyleTabService.getTreePref('urlbar.loadDifferentDomainToNewTab') },
+						external : {
+							newTab : TreeStyleTabService.getTreePref('urlbar.loadDifferentDomainToNewTab'),
+							forceChild : TreeStyleTabService.getTreePref('urlbar.loadDifferentDomainToNewTab.asChild')
+						},
 						internal : { newTab : TreeStyleTabService.getTreePref('urlbar.loadSameDomainToNewChildTab') },
 						modifier : aTriggeringEvent && aTriggeringEvent.altKey,
 						invert   : TreeStyleTabService.getTreePref('urlbar.invertDefaultBehavior')
diff --git a/defaults/preferences/treestyletab.js b/defaults/preferences/treestyletab.js
index cc07f307..e6eb11da 100644
--- a/defaults/preferences/treestyletab.js
+++ b/defaults/preferences/treestyletab.js
@@ -34,6 +34,7 @@ pref("extensions.treestyletab.openOuterLinkInNewTab",              false);
 pref("extensions.treestyletab.openAnyLinkInNewTab",                false);
 pref("extensions.treestyletab.link.invertDefaultBehavior",         true);
 pref("extensions.treestyletab.urlbar.loadDifferentDomainToNewTab", true);
+pref("extensions.treestyletab.urlbar.loadDifferentDomainToNewTab.asChild", false);
 pref("extensions.treestyletab.urlbar.loadSameDomainToNewChildTab", true);
 pref("extensions.treestyletab.urlbar.invertDefaultBehavior",       true);
 pref("extensions.treestyletab.loadDroppedLinkToNewChildTab",       false);
diff --git a/locale/en-US/treestyletab/treestyletab.dtd b/locale/en-US/treestyletab/treestyletab.dtd
index 5990a40c..9c971e7d 100644
--- a/locale/en-US/treestyletab/treestyletab.dtd
+++ b/locale/en-US/treestyletab/treestyletab.dtd
@@ -36,6 +36,7 @@
 
 <!ENTITY config.urlbar.caption                      "Action for entering URI to the location bar">
 <!ENTITY config.urlbar.loadDifferentDomainToNewTab  "Load into new tab if it is a different website">
+<!ENTITY config.urlbar.loadDifferentDomainToNewTab.asChild  "as a child of the current tab">
 <!ENTITY config.urlbar.loadSameDomainToNewChildTab  "Load into new child tab if it is the same website">
 
 <!ENTITY config.loadDroppedLinkToNewChildTab.caption "Action for drag drop of links or URLs to existing tab">
diff --git a/locale/it-IT/treestyletab/treestyletab.dtd b/locale/it-IT/treestyletab/treestyletab.dtd
index 40dacce7..8c6eec90 100644
--- a/locale/it-IT/treestyletab/treestyletab.dtd
+++ b/locale/it-IT/treestyletab/treestyletab.dtd
@@ -36,6 +36,7 @@
 
 <!ENTITY config.urlbar.caption                      "L&apos;inserimento di un indirizzo nella barra degli indirizzi">
 <!ENTITY config.urlbar.loadDifferentDomainToNewTab  "Apre una nuova scheda se appartiene a un sito web differente">
+<!ENTITY config.urlbar.loadDifferentDomainToNewTab.asChild  "as a child of the current tab">
 <!ENTITY config.urlbar.loadSameDomainToNewChildTab  "Apre una nuova scheda figlia se appartiene allo stesso sito web">
 
 <!ENTITY config.loadDroppedLinkToNewChildTab.caption "Il trascinamento di collegamenti o indirizzi su una scheda esistente">
diff --git a/locale/ja/treestyletab/treestyletab.dtd b/locale/ja/treestyletab/treestyletab.dtd
index a8d6bb53..e889fd23 100644
--- a/locale/ja/treestyletab/treestyletab.dtd
+++ b/locale/ja/treestyletab/treestyletab.dtd
@@ -36,6 +36,7 @@
 
 <!ENTITY config.urlbar.caption                      "ロケーションバーへの入力">
 <!ENTITY config.urlbar.loadDifferentDomainToNewTab  "異なるサイトのURIを新しいタブで開く">
+<!ENTITY config.urlbar.loadDifferentDomainToNewTab.asChild  "現在のタブの子にする">
 <!ENTITY config.urlbar.loadSameDomainToNewChildTab  "同じサイトのURIを新しい子タブで開く">
 
 <!ENTITY config.loadDroppedLinkToNewChildTab.caption "リンクやURLをタブにドラッグ＆ドロップした時">