From e4a9315e9b0c26788fa54931e44d1da96426beed Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Fri, 30 Nov 2007 19:22:34 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=84=E3=83=AA=E3=83=BC=E3=81=AE=E9=96=8B?=
 =?UTF-8?q?=E9=96=89=E3=83=9C=E3=82=BF=E3=83=B3=E3=82=92=E3=83=9D=E3=82=A4?=
 =?UTF-8?q?=E3=83=B3=E3=83=88=E3=81=97=E3=81=9F=E6=99=82=E3=80=81=E3=83=84?=
 =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=83=81=E3=83=83=E3=83=97=E3=82=84=E3=82=A2?=
 =?UTF-8?q?=E3=82=A4=E3=82=B3=E3=83=B3=E3=81=AE=E5=A4=89=E5=8C=96=E3=81=A7?=
 =?UTF-8?q?=E3=83=95=E3=82=A3=E3=83=BC=E3=83=89=E3=83=90=E3=83=83=E3=82=AF?=
 =?UTF-8?q?=E3=82=92=E8=A1=8C=E3=81=86=E3=82=88=E3=81=86=E3=81=AB=E3=81=97?=
 =?UTF-8?q?=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@1652 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/treestyletab.js          |  10 +++++
 content/treestyletab/treestyletab.xul         |   5 +++
 content/treestyletab/treestyletabbrowser.js   |  35 ++++++++++++++++++
 install.rdf                                   |   7 ++--
 .../treestyletab/treestyletab.properties      |   5 +++
 .../treestyletab/treestyletab.properties      |   5 +++
 .../ja/treestyletab/treestyletab.properties   |   5 +++
 .../treestyletab/tree-twisty-collapsed.png    | Bin 257 -> 0 bytes
 .../treestyletab/tree-twisty-expanded.png     | Bin 228 -> 0 bytes
 skin/classic/treestyletab/tree-twisty.png     | Bin 0 -> 635 bytes
 skin/classic/treestyletab/treestyletab.css    |  13 +++++--
 11 files changed, 79 insertions(+), 6 deletions(-)
 delete mode 100644 skin/classic/treestyletab/tree-twisty-collapsed.png
 delete mode 100644 skin/classic/treestyletab/tree-twisty-expanded.png
 create mode 100644 skin/classic/treestyletab/tree-twisty.png

diff --git a/content/treestyletab/treestyletab.js b/content/treestyletab/treestyletab.js
index 7fb7c491..72c5fbcf 100644
--- a/content/treestyletab/treestyletab.js
+++ b/content/treestyletab/treestyletab.js
@@ -6,6 +6,7 @@ var TreeStyleTabService = {
 	kINSERT_BEFORE      : 'treestyletab-insert-before',
 	kSUBTREE_COLLAPSED  : 'treestyletab-subtree-collapsed',
 	kCOLLAPSED          : 'treestyletab-collapsed',
+	kTWISTY_HOVER       : 'treestyletab-twisty-hover',
 	kNEST               : 'treestyletab-nest',
 	kDROP_POSITION      : 'treestyletab-drop-position',
 	kTABBAR_POSITION    : 'treestyletab-tabbar-position',
@@ -25,6 +26,7 @@ var TreeStyleTabService = {
 	kCOUNTER               : 'treestyletab-counter',
 	kCOUNTER_CONTAINER     : 'treestyletab-counter-container',
 	kSPLITTER              : 'treestyletab-splitter',
+	kSTRINGBUNDLE          : 'treestyletab-stringbundle',
 
 	kMENUITEM_REMOVESUBTREE_SELECTION : 'multipletab-selection-item-removeTabSubTree',
 
@@ -106,6 +108,14 @@ var TreeStyleTabService = {
 		return this._XULAppInfo;
 	},
 	_XULAppInfo : null,
+
+	get stringbundle() {
+		if (!this._stringbundle) {
+			this._stringbundle = document.getElementById(this.kSTRINGBUNDLE);
+		}
+		return this._stringbundle;
+	},
+	_stringbundle : null,
 	 
 /* API */ 
 	
diff --git a/content/treestyletab/treestyletab.xul b/content/treestyletab/treestyletab.xul
index 212adb50..b4cc6412 100644
--- a/content/treestyletab/treestyletab.xul
+++ b/content/treestyletab/treestyletab.xul
@@ -29,6 +29,11 @@
 		oncommand="TreeStyleTabService.removeTabSubTree(MultipleTabService.getSelectedTabs());"/>
 </menupopup>
 
+<stringbundleset id="stringbundleset">
+	<stringbundle id="treestyletab-stringbundle"
+		src="chrome://treestyletab/locale/treestyletab.properties"/>
+</stringbundleset>
+
 <window id="main-window">
 	<data id="multipletab-tabcontext-menu-template" collapsed="true">
 		<menuitem id="context-item-removeTabSubTree"
diff --git a/content/treestyletab/treestyletabbrowser.js b/content/treestyletab/treestyletabbrowser.js
index 2a7f2691..7edb7617 100644
--- a/content/treestyletab/treestyletabbrowser.js
+++ b/content/treestyletab/treestyletabbrowser.js
@@ -93,6 +93,8 @@ TreeStyleTabBrowser.prototype = {
 		b.mStrip.addEventListener('dragexit', this, false);
 		b.mStrip.addEventListener('dragover', this, false);
 		b.mStrip.addEventListener('dragdrop', this, false);
+		b.mTabContainer.addEventListener('mouseover', this, true);
+		b.mTabContainer.addEventListener('mouseout', this, true);
 		b.mTabContainer.addEventListener('click', this, true);
 		b.mTabContainer.addEventListener('dblclick', this, true);
 		b.mTabContainer.addEventListener('mousedown', this, true);
@@ -296,6 +298,27 @@ TreeStyleTabBrowser.prototype = {
 			)
 		);
 
+		eval('b.createTooltip = '+
+			b.createTooltip.toSource().replace(
+				'if (tn.hasAttribute("label")) {',
+				<><![CDATA[
+					else if (tn.getAttribute(TreeStyleTabService.kTWISTY_HOVER) == 'true') {
+						var key = tn.getAttribute(TreeStyleTabService.kSUBTREE_COLLAPSED) == 'true' ? 'tooltip.expandSubtree' : 'tooltip.collapseSubtree' ;
+						event.target.setAttribute(
+							'label',
+							tn.hasAttribute('label') ?
+								TreeStyleTabService.stringbundle.getFormattedString(
+									key+'.labeled',
+									[tn.getAttribute('label')]
+								) :
+								TreeStyleTabService.stringbundle.getString(key)
+						);
+						return true;
+					}
+					$&]]></>
+			)
+		);
+
 		var tabs = b.mTabContainer.childNodes;
 		for (var i = 0, maxi = tabs.length; i < maxi; i++)
 		{
@@ -925,6 +948,18 @@ TreeStyleTabBrowser.prototype = {
 			case 'dragdrop':
 				nsDragAndDrop.drop(aEvent, this);
 				return;
+
+			case 'mouseover':
+				if (this.isEventFiredOnTwisty(aEvent)) {
+					aEvent.target.setAttribute(this.kTWISTY_HOVER, true);
+				}
+				return;
+
+			case 'mouseout':
+				if (this.isEventFiredOnTwisty(aEvent)) {
+					aEvent.target.removeAttribute(this.kTWISTY_HOVER);
+				}
+				return;
 		}
 	},
  
diff --git a/install.rdf b/install.rdf
index ec4aaca3..c67ca6e6 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,10 +5,10 @@
   <RDF:Description RDF:about="urn:mozilla:install-manifest"
                    em:id="treestyletab@piro.sakura.ne.jp"
                    em:name="Tree Style Tab"
-                   em:version="0.5.2007113001"
+                   em:version="0.5.2007120101"
                    em:creator="SHIMODA Hiroshi"
                    em:description="Show tabs like a tree."
-                   em:homepageURL="http://piro.sakura.ne.jp/xul/treestyletab/"
+                   em:homepageURL="http://piro.sakura.ne.jp/xul/_treestyletab.html.en"
                    em:iconURL="chrome://treestyletab/content/res/icon32.png"
                    em:optionsURL="chrome://treestyletab/content/config.xul">
   <em:translator>Godai71.Extenzilla (it-IT locale)</em:translator>
@@ -26,7 +26,8 @@
     <em:localized>
       <RDF:Description em:locale="ja"
                        em:name="ツリー型タブ"
-                       em:description="タブをツリー状に表示します。"/>
+                       em:description="タブをツリー状に表示します。"
+                       em:homepageURL="http://piro.sakura.ne.jp/xul/_treestyletab.html"/>
     </em:localized>
     <em:localized>
       <RDF:Description em:locale="it-IT"
diff --git a/locale/en-US/treestyletab/treestyletab.properties b/locale/en-US/treestyletab/treestyletab.properties
index 2bcf7640..55bd43de 100644
--- a/locale/en-US/treestyletab/treestyletab.properties
+++ b/locale/en-US/treestyletab/treestyletab.properties
@@ -1,2 +1,7 @@
 extensions.treestyletab@piro.sakura.ne.jp.name=Tree Style Tab
 extensions.treestyletab@piro.sakura.ne.jp.description=Show tabs like a tree.
+
+tooltip.collapseSubtree=Collapse Tree
+tooltip.collapseSubtree.labeled=Collapse Tree ( %S )
+tooltip.expandSubtree=Expand Tree
+tooltip.expandSubtree.labeled=Expand Tree ( %S )
diff --git a/locale/it-IT/treestyletab/treestyletab.properties b/locale/it-IT/treestyletab/treestyletab.properties
index c45f7829..4a6ab4ef 100644
--- a/locale/it-IT/treestyletab/treestyletab.properties
+++ b/locale/it-IT/treestyletab/treestyletab.properties
@@ -1,2 +1,7 @@
 extensions.treestyletab@piro.sakura.ne.jp.name=Tree Style Tab
 extensions.treestyletab@piro.sakura.ne.jp.description=Permette di visualizzare la barra delle schede in forma di albero
+
+tooltip.collapseSubtree=Contrai tutti
+tooltip.collapseSubtree.labeled=Contrai tutti ( %S )
+tooltip.expandSubtree=Espandi tutti
+tooltip.expandSubtree.labeled=Espandi tutti ( %S )
diff --git a/locale/ja/treestyletab/treestyletab.properties b/locale/ja/treestyletab/treestyletab.properties
index 8ac78527..4741075b 100644
--- a/locale/ja/treestyletab/treestyletab.properties
+++ b/locale/ja/treestyletab/treestyletab.properties
@@ -1,2 +1,7 @@
 extensions.treestyletab@piro.sakura.ne.jp.name=ツリー型タブ
 extensions.treestyletab@piro.sakura.ne.jp.description=タブをツリー状に表示します。
+
+tooltip.collapseSubtree=ツリーをたたむ
+tooltip.collapseSubtree.labeled=ツリーをたたむ（ %S ）
+tooltip.expandSubtree=ツリーを展開する
+tooltip.expandSubtree.labeled=ツリーを展開する（ %S ）
diff --git a/skin/classic/treestyletab/tree-twisty-collapsed.png b/skin/classic/treestyletab/tree-twisty-collapsed.png
deleted file mode 100644
index ae95169ef23e129eb03b94072b86a3800b1dab82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 257
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP;j%S
zi(^Q|oVAk;`3@QIxc;ARwSb{K$sy?>mrPUZ)px!#cJNP6c*Hk<scYuzErL(I1J|to
zak6ZZo6xltkyGa~-`X~Hx4zmA>oYyV4ZEE$u^!+%P`9N%c@n#^_O=aY#ZRtYa{NSp
zbO(d+JtYO!hCA9!LMNm1CfI!2xa4~h>!f!t+T1>=yzG1!usZ66w_NpXDF-K;BP|Y_
zw=2B7I#o`MpWz+fr016o{)yo*Fn*@LChY%jpZ%|xUuf&`?iKwy6X<*fPgg&ebxsLQ
E00nwxb^rhX

diff --git a/skin/classic/treestyletab/tree-twisty-expanded.png b/skin/classic/treestyletab/tree-twisty-expanded.png
deleted file mode 100644
index 4c9584301827b5106fa82d61df9c15088c2c5775..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 228
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP;i>3
zi(^Q|oVAnh@*Xk}XwF^9AKEzAia~n=+xq7@hZ^1_#Bp%tIxQCS4qSBkXYic)2hI92
zES~5wYN~qQGVyS7DPWzza@(9ConiXXKarE?C@+$Hc*XFQpj1Pq{(`hKTjw`)KB>Jq
zCH42toy@oSP53_8mb+#gm8fPgO<uSDN_B7OXK@E1kGSaG)Ob+=L7n)B_5Z%l{Pv3V
XTb`15kUncD(1i@1u6{1-oD!M<q0La_

diff --git a/skin/classic/treestyletab/tree-twisty.png b/skin/classic/treestyletab/tree-twisty.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a2e6994af3bb8b7c9e739505fbe4be5fbc42542
GIT binary patch
literal 635
zcmV->0)+jEP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkQElET{RCt{2*1d}pK^TDX=e?No@}-D^*k~_kA#+y<!ZqSwaeWHA
zYi!h<HWqePf*e+YrC_J6&GEvaAU2APU}Irp;TNxkvvKCl?wD+oD{dep8TOg{Hred1
zm>J6)a$o=<gb8qaj%G(yCw{VRp8`x(w}2rqa?jJ(A%sm;l^Q^+-UG&N<84)a;^x*1
zfUIu-td{`WZsW14K67*D3xKSz!}#6<Zlz%eVM|qCy18=&K-Sk`eD4AGLI^kf;?+>q
zFCm0e1;E0+2RumSA%ttH`r6I)3V^Jy`!;;<0lR4!Lb#%;?~}QH2tf*ftgpe$^d9h(
z{D8Tns-NTgLENqc$a?o&+k3$Ch6RRz%mG-qKR9Q?WsO6?Az%s+kqPr1#dm=nGy9z_
z)Ur<jW@h(+W599#{g3<c(F4{*<P2~b*h>*@dk=UR7Z?FU5!p1ew^a-r6_Jy`7<g=E
z-yI<9`Fr;3mwFFKZ$1VhvSDT)syHq%0<Hs(Y5-XuKe%7&J)pYz7(~DYGy7D<KvzV1
z1whuPd*0N0zzY$%O2aU-pCZyN02b~&;8h~;iO5+q`wFZAU7#Z(D+NH-$Gu-I^&YUF
z{AOz+a@x$k#rO!YA|ez3SzmqarQQSHksq-q%<M-M$L&ghtWWm5vG;(F4RI&=pb}u=
zJ_XzXZu0-J3+yp_9%$94fDW($T#V|b@e6pv?3u7tpIwaNBBgk`h`$!J?U#Nv`~y_m
VDc{mP$Atg@002ovPDHLkV1fwUAYuRj

literal 0
HcmV?d00001

diff --git a/skin/classic/treestyletab/treestyletab.css b/skin/classic/treestyletab/treestyletab.css
index b9f85381..9a962f81 100644
--- a/skin/classic/treestyletab/treestyletab.css
+++ b/skin/classic/treestyletab/treestyletab.css
@@ -264,11 +264,18 @@ tabbrowser:not([treestyletab-mode="vertical"])[treestyletab-allow-subtree-collap
 }
 
 .treestyletab-twisty {
-	list-style-image: url("tree-twisty-expanded.png");
+	list-style-image: url("tree-twisty.png");
+	-moz-image-region: rect(0, 32px, 16px, 16px);
+}
+.tabbrowser-tab[treestyletab-subtree-collapsed="true"] .treestyletab-twisty {
+	-moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-.tabbrowser-tab[treestyletab-subtree-collapsed="true"] .treestyletab-twisty {
-	list-style-image: url("tree-twisty-collapsed.png");
+.tabbrowser-tab[treestyletab-twisty-hover="true"] .treestyletab-twisty {
+	-moz-image-region: rect(16px, 32px, 32px, 16px);
+}
+.tabbrowser-tab[treestyletab-subtree-collapsed="true"][treestyletab-twisty-hover="true"] .treestyletab-twisty {
+	-moz-image-region: rect(16px, 16px, 32px, 0);
 }
 
 .treestyletab-counter-container {