twistyの表示スタイルを変えられるようにした

git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@1954 599a83e7-65a4-db11-8015-0010dcdd6dc2
2008-02-28 12:12:02 +00:00 · 2008-02-28 12:12:02 +00:00 · 1a045b3474
commit 1a045b3474
parent 35c06c7425
13 changed files with 98 additions and 3 deletions
--- a/content/treestyletab/config.xul
+++ b/content/treestyletab/config.xul
@ -41,6 +41,9 @@
 		<preference id="extensions.treestyletab.tabbar.invertUI"
 			name="extensions.treestyletab.tabbar.invertUI"
 			type="bool"/>
+		<preference id="extensions.treestyletab.twisty.style"
+			name="extensions.treestyletab.twisty.style"
+			type="string"/>
 		<preference id="extensions.treestyletab.show.openSelectionLinks"
 			name="extensions.treestyletab.show.openSelectionLinks"
 			type="bool"/>
@ -67,6 +70,15 @@
 			type="bool"/>
 	</preferences>

+
+	<tabbox orient="vertical">
+		<tabs>
+			<tab label="&config.tabs.tabbar.tab;"/>
+			<tab label="&config.tabs.menu.tab;"/>
+		</tabs>
+		<tabpanels>
+			<tabpanel orient="vertical">
+
 	<checkbox id="extensions.treestyletab.tabbar.scroll.smooth-check"
 		preference="extensions.treestyletab.tabbar.scroll.smooth"
 		label="&config.tabbar.scroll.smooth;"/>
@ -148,6 +160,26 @@
 				src="chrome://treestyletab/content/res/style-mixed.png"/>
 		</radiogroup>
 	</groupbox>
+	<groupbox>
+		<caption label="&config.twisty.style.caption;"/>
+		<radiogroup id="extensions.treestyletab.twisty.style-radiogroup"
+			preference="extensions.treestyletab.twisty.style"
+			orient="horizontal">
+			<radio value="none" label="&config.twisty.style.none;" align="center"/>
+			<radio value="basic" label="&config.twisty.style.basic;"
+				class="image" align="center"
+				src="chrome://treestyletab/content/res/twisty-basic.png"/>
+			<radio value="adobe" label="&config.twisty.style.adobe;"
+				class="image" align="center"
+				src="chrome://treestyletab/content/res/twisty-adobe.png"/>
+		</radiogroup>
+	</groupbox>
+
+			</tabpanel>
+
+
+			<tabpanel orient="vertical">
+
 	<groupbox orient="vertical">
 		<caption label="&config.show.tabContextMenu.caption;"/>
 		<hbox align="center">
@ -181,6 +213,11 @@
 	<checkbox id="extensions.treestyletab.show.openSelectionLinks-check"
 		preference="extensions.treestyletab.show.openSelectionLinks"
 		label="&config.show.openSelectionLinks;"/>
+
+			</tabpanel>
+		</tabpanels>
+	</tabbox>
+
 </prefpane>

 <prefpane id="prefpane-tab" label="&config.tabs.tab;"
--- a/content/treestyletab/res/twisty-adobe.png
+++ b/content/treestyletab/res/twisty-adobe.png
--- a/content/treestyletab/res/twisty-basic.png
+++ b/content/treestyletab/res/twisty-basic.png
--- a/content/treestyletab/treestyletab.css
+++ b/content/treestyletab/treestyletab.css
@ -2,6 +2,7 @@
@namespace html url("http://www.w3.org/1999/xhtml");

 .tabbrowser-tab .treestyletab-twisty,
+tabbrowser[treestyletab-twisty-style="none"] .treestyletab-twisty-container,
 .tabbrowser-tab .treestyletab-counter-container,
 .tabbrowser-tab .treestyletab-drop-marker,
 tabbrowser[treestyletab-allow-subtree-collapse="true"] .tabbrowser-tab[treestyletab-children]:not([treestyletab-subtree-collapsed="true"]) .treestyletab-counter-container,
--- a/content/treestyletab/treestyletab.js
+++ b/content/treestyletab/treestyletab.js
@ -16,6 +16,7 @@ var TreeStyleTabService = {
 	kALLOW_COLLAPSE     : 'treestyletab-allow-subtree-collapse',
 	kHIDE_ALLTABS       : 'treestyletab-hide-alltabs-button',
 	kSTYLE              : 'treestyletab-style',
+	kTWISTY_STYLE       : 'treestyletab-twisty-style',
 	kFIRSTTAB_BORDER    : 'treestyletab-firsttab-border',
 	kAUTOHIDE           : 'treestyletab-tabbar-autohide',
 	kFIXED              : 'treestyletab-tabbar-fixed',
--- a/content/treestyletab/treestyletabbrowser.js
+++ b/content/treestyletab/treestyletabbrowser.js
@ -340,6 +340,7 @@ TreeStyleTabBrowser.prototype = {
 		}

 		this.observe(null, 'nsPref:changed', 'extensions.treestyletab.tabbar.style');
+		this.observe(null, 'nsPref:changed', 'extensions.treestyletab.twisty.style');
 		this.observe(null, 'nsPref:changed', 'extensions.treestyletab.showBorderForFirstTab');
 		this.observe(null, 'nsPref:changed', 'extensions.treestyletab.tabbar.invertScrollbar');
 		this.observe(null, 'nsPref:changed', 'extensions.treestyletab.tabbar.hideAlltabsButton');
@ -767,6 +768,10 @@ TreeStyleTabBrowser.prototype = {
 						b.setAttribute(this.kSTYLE, value);
 						break;

+					case 'extensions.treestyletab.twisty.style':
+						b.setAttribute(this.kTWISTY_STYLE, value);
+						break;
+
 					case 'extensions.treestyletab.showBorderForFirstTab':
 						if (value)
 							b.setAttribute(this.kFIRSTTAB_BORDER, true);
--- a/defaults/preferences/treestyletab.js
+++ b/defaults/preferences/treestyletab.js
@ -24,6 +24,7 @@ pref("extensions.treestyletab.autoExpand.collapseFinally", false);
 pref("extensions.treestyletab.levelMargin",            12);
 // 0 = first child, 1 = last child
 pref("extensions.treestyletab.insertNewChildAt", 1);
+pref("extensions.treestyletab.twisty.style", "basic"); // none, basic, adobe

 pref("extensions.treestyletab.show.openSelectionLinks", true);
 pref("extensions.treestyletab.show.context-item-removeTabSubTree", true);
--- a/locale/en-US/treestyletab/treestyletab.dtd
+++ b/locale/en-US/treestyletab/treestyletab.dtd
@ -3,6 +3,8 @@

 <!ENTITY config.tabs.appearance "Appearance">

+<!ENTITY config.tabs.tabbar.tab "Tab Bar">
+
 <!ENTITY config.tabbar.scroll.smooth "Scroll the tab bar smoothly">

 <!ENTITY config.tabbar.position.caption "Tab bar position">
@ -22,6 +24,13 @@
 <!ENTITY config.tabbar.style.vertigo "Vertigo">
 <!ENTITY config.tabbar.style.mixed   "Mixed">

+<!ENTITY config.twisty.style.caption "Tree twisties">
+<!ENTITY config.twisty.style.none    "None">
+<!ENTITY config.twisty.style.basic   "Tree">
+<!ENTITY config.twisty.style.adobe   "Adobe">
+
+<!ENTITY config.tabs.menu.tab "Menu">
+
 <!ENTITY config.show.tabContextMenu.caption "Add following items to the context menu on tabs">
 <!ENTITY config.show.openSelectionLinks "Add &quot;Open Selection Links in Tabs&quot; to the context menu">

--- a/locale/it-IT/treestyletab/treestyletab.dtd
+++ b/locale/it-IT/treestyletab/treestyletab.dtd
@ -3,6 +3,8 @@

 <!ENTITY config.tabs.appearance "Aspetto">

+<!ENTITY config.tabs.tabbar.tab "Tab Bar">
+
 <!ENTITY config.tabbar.scroll.smooth "Scorri gradualmente la barra delle schede">

 <!ENTITY config.tabbar.position.caption "Posiziona barra delle schede">
@ -22,6 +24,13 @@
 <!ENTITY config.tabbar.style.vertigo "Vertigo">
 <!ENTITY config.tabbar.style.mixed   "Misto">

+<!ENTITY config.twisty.style.caption "Tree twisties">
+<!ENTITY config.twisty.style.none    "None">
+<!ENTITY config.twisty.style.basic   "Tree">
+<!ENTITY config.twisty.style.adobe   "Adobe">
+
+<!ENTITY config.tabs.menu.tab "Menu">
+
 <!ENTITY config.show.tabContextMenu.caption "Voci da aggiungere al menu contestuale delle schede">
 <!ENTITY config.show.openSelectionLinks "Aggiungi &quot;Apri collegamenti selezionati in schede&quot; al menu contestuale">

--- a/locale/ja/treestyletab/treestyletab.dtd
+++ b/locale/ja/treestyletab/treestyletab.dtd
@ -3,6 +3,8 @@

 <!ENTITY config.tabs.appearance "外観">

+<!ENTITY config.tabs.tabbar.tab "タブバー">
+
 <!ENTITY config.tabbar.scroll.smooth "タブバーをなめらかにスクロールする">

 <!ENTITY config.tabbar.position.caption "タブバーの表示位置">
@ -22,6 +24,13 @@
 <!ENTITY config.tabbar.style.vertigo "Vertigo">
 <!ENTITY config.tabbar.style.mixed   "Mixed">

+<!ENTITY config.twisty.style.caption "つまみ">
+<!ENTITY config.twisty.style.none    "なし">
+<!ENTITY config.twisty.style.basic   "ツリー">
+<!ENTITY config.twisty.style.adobe   "Adobe">
+
+<!ENTITY config.tabs.menu.tab "メニュー">
+
 <!ENTITY config.show.tabContextMenu.caption "タブのコンテキストメニューに以下の項目を追加する">
 <!ENTITY config.show.openSelectionLinks "コンテキストメニューに「選択したリンクをすべてタブで開く」を加える">

--- a/skin/classic/treestyletab/tree-twisty-adobe-l.png
+++ b/skin/classic/treestyletab/tree-twisty-adobe-l.png
--- a/skin/classic/treestyletab/tree-twisty-adobe-r.png
+++ b/skin/classic/treestyletab/tree-twisty-adobe-r.png
--- a/skin/classic/treestyletab/treestyletab.css
+++ b/skin/classic/treestyletab/treestyletab.css
@ -277,24 +277,45 @@ tabbrowser[treestyletab-tabbar-position="bottom"][treestyletab-style="mixed"] .t
 tabbrowser[treestyletab-mode="vertical"][treestyletab-appearance-inverted="true"] .treestyletab-twisty-container {
 	margin: 0 -3px 0 3px;
 }
+tabbrowser[treestyletab-twisty-style="adobe"] .treestyletab-twisty-container {
+	position: relative;
+	margin: 0 12px 0 -12px;
+}
+tabbrowser[treestyletab-twisty-style="adobe"][treestyletab-mode="vertical"][treestyletab-appearance-inverted="true"] .treestyletab-twisty-container {
+	margin: 0 -12px 0 12px;
+}

-tabbrowser:not([treestyletab-mode="vertical"]) .treestyletab-twisty-container {
+
+tabbrowser[treestyletab-twisty-style="basic"]:not([treestyletab-mode="vertical"]) .treestyletab-twisty-container {
 	position: relative;
 	margin: 0 16px 0 -16px;
 }

-tabbrowser:not([treestyletab-mode="vertical"])[treestyletab-allow-subtree-collapse="true"] .tabbrowser-tab[treestyletab-children] .tab-icon {
+tabbrowser[treestyletab-twisty-style="basic"]:not([treestyletab-mode="vertical"])[treestyletab-allow-subtree-collapse="true"] .tabbrowser-tab[treestyletab-children] .tab-icon {
 	margin-left: 16px;
 }
+tabbrowser[treestyletab-twisty-style="adobe"][treestyletab-allow-subtree-collapse="true"][treestyletab-mode="horizontal"] .tab-icon,
+tabbrowser[treestyletab-twisty-style="adobe"][treestyletab-allow-subtree-collapse="true"][treestyletab-mode="vertical"]:not([treestyletab-appearance-inverted="true"]) .tab-icon {
+	margin-left: 6px;
+}
+tabbrowser[treestyletab-twisty-style="adobe"][treestyletab-allow-subtree-collapse="true"][treestyletab-mode="vertical"][treestyletab-appearance-inverted="true"] .tab-icon {
+	margin-right: 6px;
+}

 .treestyletab-twisty {
 	list-style-image: url("tree-twisty.png");
 	-moz-image-region: rect(0, 32px, 16px, 16px);
 }
+tabbrowser[treestyletab-twisty-style="adobe"] .treestyletab-twisty {
+	list-style-image: url("tree-twisty-adobe-l.png");
+}
+tabbrowser[treestyletab-twisty-style="adobe"][treestyletab-mode="vertical"][treestyletab-appearance-inverted="true"] .treestyletab-twisty {
+	list-style-image: url("tree-twisty-adobe-r.png");
+}
+
 .tabbrowser-tab[treestyletab-subtree-collapsed="true"] .treestyletab-twisty {
 	-moz-image-region: rect(0, 16px, 16px, 0);
 }
-
 .tabbrowser-tab[treestyletab-twisty-hover="true"] .treestyletab-twisty {
 	-moz-image-region: rect(16px, 32px, 32px, 16px);
 }
@ -302,6 +323,8 @@ tabbrowser:not([treestyletab-mode="vertical"])[treestyletab-allow-subtree-collap
 	-moz-image-region: rect(16px, 16px, 32px, 0);
 }

+
+
 .treestyletab-counter-container {
 	-moz-box-align: center;
 	-moz-box-pack: end;