タブのツールチップで折りたたまれたタブのラベルも表示するように

git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@4859 599a83e7-65a4-db11-8015-0010dcdd6dc2

content/treestyletab/treestyletab.js

@@ -2212,6 +2212,42 @@ catch(e) {
 		}
 	},
  
+	handleTooltip : function(aEvent, aTab) 
+	{
+		var label;
+		var collapsed = aTab.getAttribute(this.kSUBTREE_COLLAPSED) == 'true';
+
+		if (collapsed) {
+			let base = parseInt(aTab.getAttribute(this.kNEST) || 0);
+			label = [aTab].concat(this.getDescendantTabs(aTab))
+						.map(function(aTab) {
+							let label = '* '+aTab.getAttribute('label');
+							let nest = parseInt(aTab.getAttribute(this.kNEST) || 0) - base;
+							for (let i = 0; i < nest; i++)
+							{
+								label = '  '+label;
+							}
+							return label;
+						}, this)
+						.join('\n');
+		}
+
+		if (aTab.getAttribute(this.kTWISTY_HOVER) == 'true') {
+			let key = collapsed ?
+						'tooltip.expandSubtree' :
+						'tooltip.collapseSubtree' ;
+			label = label || aTab.getAttribute('label');
+			label = label ?
+					this.stringbundle.getFormattedString(key+'.labeled', [label]) :
+					this.stringbundle.getString(key) ;
+		}
+
+		if (label)
+			aEvent.target.setAttribute('label', label);
+
+		return label;
+	},
+  
 /* Tree Style Tabの初期化が行われる前に復元されたセッションについてツリー構造を復元 */ 
 	
 	_restoringTabs : [], 

content/treestyletab/treestyletabbrowser.js

@@ -411,17 +411,7 @@ TreeStyleTabBrowser.prototype = {
 			b.createTooltip.toSource().replace(
 				'if (tn.hasAttribute("label")) {',
 				<![CDATA[
-					else if (tn.getAttribute(TreeStyleTabService.kTWISTY_HOVER) == 'true') {
+					else if (TreeStyleTabService.getTabBrowserFromChild(tn).treeStyleTab.handleTooltip(event, tn)) {
-						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;
 					}
 					$&]]>

locale/de-DE/treestyletab/treestyletab.properties

@@ -2,9 +2,9 @@ extensions.treestyletab@piro.sakura.ne.jp.name=Tree Style Tab
 extensions.treestyletab@piro.sakura.ne.jp.description=Stellt Tabs in einer Baumstukur dar
 
 tooltip.collapseSubtree=Zweig zuklappen
-tooltip.collapseSubtree.labeled=Zweig zuklappen ( %S )
+tooltip.collapseSubtree.labeled=Zweig zuklappen:\n%S
 tooltip.expandSubtree=Zweig aufklappen
-tooltip.expandSubtree.labeled=Zweig aufklappen ( %S )
+tooltip.expandSubtree.labeled=Zweig aufklappen:\n%S
 
 dropLinkOnTab.title=How to open the dropped link?
 dropLinkOnTab.text=A link has been dropped onto existing tab. Tree Style Tab can open the link as a new child tab. How to deal with the link?

locale/en-US/treestyletab/treestyletab.properties

@@ -2,9 +2,9 @@ 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.collapseSubtree.labeled=Collapse Tree:\n%S
 tooltip.expandSubtree=Expand Tree
-tooltip.expandSubtree.labeled=Expand Tree ( %S )
+tooltip.expandSubtree.labeled=Expand Tree:\n%S
 
 dropLinkOnTab.title=How to open the dropped link?
 dropLinkOnTab.text=A link has been dropped onto existing tab. Tree Style Tab can open the link as a new child tab. How to deal with the link?

locale/es-ES/treestyletab/treestyletab.properties

@@ -2,9 +2,9 @@ extensions.treestyletab@piro.sakura.ne.jp.name=Tree Style Tab (Pestañas estilo
 extensions.treestyletab@piro.sakura.ne.jp.description=Muestra las pestañas en vista de árbol
 
 tooltip.collapseSubtree=Colapsar árbol
-tooltip.collapseSubtree.labeled=Colapsar árbol ( %S )
+tooltip.collapseSubtree.labeled=Colapsar árbol:\n%S
 tooltip.expandSubtree=Expandir árbol
-tooltip.expandSubtree.labeled=Expandir árbol ( %S )
+tooltip.expandSubtree.labeled=Expandir árbol:\n%S
 
 dropLinkOnTab.title=How to open the dropped link?
 dropLinkOnTab.text=A link has been dropped onto existing tab. Tree Style Tab can open the link as a new child tab. How to deal with the link?

locale/it-IT/treestyletab/treestyletab.properties

@@ -2,9 +2,9 @@ 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.collapseSubtree.labeled=Contrai tutti:\n%S
 tooltip.expandSubtree=Espandi tutti
-tooltip.expandSubtree.labeled=Espandi tutti ( %S )
+tooltip.expandSubtree.labeled=Espandi tutti:\n%S
 
 dropLinkOnTab.title=How to open the dropped link?
 dropLinkOnTab.text=A link has been dropped onto existing tab. Tree Style Tab can open the link as a new child tab. How to deal with the link?

locale/ja/treestyletab/treestyletab.properties

@@ -2,9 +2,9 @@ extensions.treestyletab@piro.sakura.ne.jp.name=ツリー型タブ
 extensions.treestyletab@piro.sakura.ne.jp.description=タブをツリー状に表示します。
 
 tooltip.collapseSubtree=ツリーをたたむ
-tooltip.collapseSubtree.labeled=ツリーをたたむ（ %S ）
+tooltip.collapseSubtree.labeled=ツリーをたたむ:\n%S
 tooltip.expandSubtree=ツリーを展開する
-tooltip.expandSubtree.labeled=ツリーを展開する（ %S ）
+tooltip.expandSubtree.labeled=ツリーを展開する:\n%S
 
 dropLinkOnTab.title=ドロップされたリンクをどのように開きますか？
 dropLinkOnTab.text=リンクがタブにドロップされました。ツリー型タブは、タブにドロップされたリンクを新しい子タブとして開くことができます。どのように扱いますか？

locale/pl-PL/treestyletab/treestyletab.properties

@@ -2,9 +2,9 @@ extensions.treestyletab@piro.sakura.ne.jp.name=Tree Style Tab
 extensions.treestyletab@piro.sakura.ne.jp.description=Wyświetla karty w układzie drzewa.
 
 tooltip.collapseSubtree=Zwiń drzewo
-tooltip.collapseSubtree.labeled=Zwiń drzewo ( %S )
+tooltip.collapseSubtree.labeled=Zwiń drzewo:\n%S
 tooltip.expandSubtree=Rozwiń drzewo
-tooltip.expandSubtree.labeled=Rozwiń drzewo ( %S )
+tooltip.expandSubtree.labeled=Rozwiń drzewo:\n%S
 
 dropLinkOnTab.title=How to open the dropped link?
 dropLinkOnTab.text=A link has been dropped onto existing tab. Tree Style Tab can open the link as a new child tab. How to deal with the link?

locale/ru-RU/treestyletab/treestyletab.properties

@@ -2,9 +2,9 @@ extensions.treestyletab@piro.sakura.ne.jp.name=Tree Style Tab
 extensions.treestyletab@piro.sakura.ne.jp.description=Отображение вкладок в виде дерева.
 
 tooltip.collapseSubtree=Свернуть дерево
-tooltip.collapseSubtree.labeled=Свернуть дерево ( %S )
+tooltip.collapseSubtree.labeled=Свернуть дерево:\n%S
 tooltip.expandSubtree=Развернуть дерево
-tooltip.expandSubtree.labeled=Развернуть дерево ( %S )
+tooltip.expandSubtree.labeled=Развернуть дерево:\n%S
 
 dropLinkOnTab.title=How to open the dropped link?
 dropLinkOnTab.text=A link has been dropped onto existing tab. Tree Style Tab can open the link as a new child tab. How to deal with the link?

locale/zh-CN/treestyletab/treestyletab.properties

@@ -2,9 +2,9 @@ extensions.treestyletab@piro.sakura.ne.jp.name=Tree Style Tab
 extensions.treestyletab@piro.sakura.ne.jp.description=以树的形式显示标签。
 
 tooltip.collapseSubtree=折叠树
-tooltip.collapseSubtree.labeled=折叠树 ( %S )
+tooltip.collapseSubtree.labeled=折叠树:\n%S
 tooltip.expandSubtree=展开树
-tooltip.expandSubtree.labeled=展开树 ( %S )
+tooltip.expandSubtree.labeled=展开树:\n%S
 
 dropLinkOnTab.title=How to open the dropped link?
 dropLinkOnTab.text=A link has been dropped onto existing tab. Tree Style Tab can open the link as a new child tab. How to deal with the link?

locale/zh-TW/treestyletab/treestyletab.properties

@@ -2,9 +2,9 @@ extensions.treestyletab@piro.sakura.ne.jp.name=Tree Style Tab
 extensions.treestyletab@piro.sakura.ne.jp.description=以樹狀目錄顯示分頁。
 
 tooltip.collapseSubtree=摺疊樹
-tooltip.collapseSubtree.labeled=摺疊樹（%S）
+tooltip.collapseSubtree.labeled=摺疊樹:\n%S
 tooltip.expandSubtree=展開樹
-tooltip.expandSubtree.labeled=展開樹（%S）
+tooltip.expandSubtree.labeled=展開樹:\n%S
 
 dropLinkOnTab.title=How to open the dropped link?
 dropLinkOnTab.text=A link has been dropped onto existing tab. Tree Style Tab can open the link as a new child tab. How to deal with the link?