From ee71505b0f6e514b467927b057d943dd15c83cb2 Mon Sep 17 00:00:00 2001 From: piro Date: Sun, 27 Dec 2009 05:25:04 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=84=E3=83=AA=E3=83=BC=E5=85=A8=E4=BD=93?= =?UTF-8?q?=E3=82=92=E5=BE=A9=E5=85=83=E3=81=99=E3=82=8B=E3=81=8B=E3=81=A9?= =?UTF-8?q?=E3=81=86=E3=81=8B=E3=81=AE=E8=A8=AD=E5=AE=9AUI?= 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@5679 599a83e7-65a4-db11-8015-0010dcdd6dc2 --- content/treestyletab/config.js | 25 +++++++++++++++++++--- content/treestyletab/config.xul | 25 +++++++++++++++++++++- defaults/preferences/treestyletab.js | 2 +- locale/de-DE/treestyletab/treestyletab.dtd | 5 +++++ locale/en-US/treestyletab/treestyletab.dtd | 5 +++++ locale/es-ES/treestyletab/treestyletab.dtd | 5 +++++ locale/it-IT/treestyletab/treestyletab.dtd | 5 +++++ locale/ja/treestyletab/treestyletab.dtd | 5 +++++ locale/pl-PL/treestyletab/treestyletab.dtd | 5 +++++ locale/ru-RU/treestyletab/treestyletab.dtd | 5 +++++ locale/zh-CN/treestyletab/treestyletab.dtd | 5 +++++ locale/zh-TW/treestyletab/treestyletab.dtd | 5 +++++ 12 files changed, 92 insertions(+), 5 deletions(-) diff --git a/content/treestyletab/config.js b/content/treestyletab/config.js index 8e1c1647..39b40b3f 100644 --- a/content/treestyletab/config.js +++ b/content/treestyletab/config.js @@ -238,10 +238,20 @@ function onTabbarTransparencyScaleChange() } +var gUndoCloseTabSetRadioSet; + function initTreePane() { updateCloseRootBehaviorCheck(); + gUndoCloseTabSetRadioSet = new RadioSet( + 'extensions.treestyletab.undoCloseTabSet.behavior', + 'undoCloseTabSet-radiogroup', + 'undoCloseTabSet-check', + 'undoCloseTabSet-deck', + 1 + ); + var focusMode = document.getElementById('extensions.treestyletab.focusMode-check'); var focusModePref = document.getElementById('extensions.treestyletab.focusMode'); if (focusModePref.value != focusModePref.defaultValue) @@ -331,15 +341,16 @@ ScaleSet.prototype = { } }; -function RadioSet(aPref, aRadio, aCheck, aDeck) +function RadioSet(aPref, aRadio, aCheck, aDeck, aAskFlag) { this.pref = document.getElementById(aPref); this.radio = document.getElementById(aRadio); this.check = document.getElementById(aCheck); this.deck = document.getElementById(aDeck); this.backup = this.value || 1; + this.askValue = aAskFlag; - if (this.value == 0) { + if (this.askValue ? this.value & this.askValue : this.value == 0 ) { this.check.checked = true; this.deck.selectedIndex = 0; } @@ -354,11 +365,19 @@ RadioSet.prototype = { if (this.checked) { this.backup = this.value; this.deck.selectedIndex = 0; - this.value = 0; + if (this.askValue) { + this.value |= this.askValue; + } + else { + this.value = 0; + } } else { this.deck.selectedIndex = 1; this.value = this.backup; + if (this.askValue && this.value & this.askValue) { + this.value ^= this.askValue; + } } if (!aDontUpdatePref) this.pref.value = this.value; diff --git a/content/treestyletab/config.xul b/content/treestyletab/config.xul index af068463..2813bb90 100644 --- a/content/treestyletab/config.xul +++ b/content/treestyletab/config.xul @@ -656,6 +656,9 @@ + + orient="horizontal"> + + + + + + + + + + + + + + + + diff --git a/defaults/preferences/treestyletab.js b/defaults/preferences/treestyletab.js index 29e6423b..e00c3fa8 100644 --- a/defaults/preferences/treestyletab.js +++ b/defaults/preferences/treestyletab.js @@ -115,7 +115,7 @@ pref("extensions.treestyletab.createSubtree.underParent", true); 2 = reopen all tabs of the tree if a member of tree is reopened. 256 = don't reopen tree if some tabs are overflowed and lost from the history. */ -pref("extensions.treestyletab.undoCloseTabSet.behavior", 1); +pref("extensions.treestyletab.undoCloseTabSet.behavior", 3); pref("browser.link.open_newwindow.restriction.override", 0); diff --git a/locale/de-DE/treestyletab/treestyletab.dtd b/locale/de-DE/treestyletab/treestyletab.dtd index cd8bb251..af81aaf8 100644 --- a/locale/de-DE/treestyletab/treestyletab.dtd +++ b/locale/de-DE/treestyletab/treestyletab.dtd @@ -137,6 +137,11 @@ + + + + + diff --git a/locale/en-US/treestyletab/treestyletab.dtd b/locale/en-US/treestyletab/treestyletab.dtd index be29a183..72220c4b 100644 --- a/locale/en-US/treestyletab/treestyletab.dtd +++ b/locale/en-US/treestyletab/treestyletab.dtd @@ -136,6 +136,11 @@ + + + + + diff --git a/locale/es-ES/treestyletab/treestyletab.dtd b/locale/es-ES/treestyletab/treestyletab.dtd index dd283b0f..894f3345 100644 --- a/locale/es-ES/treestyletab/treestyletab.dtd +++ b/locale/es-ES/treestyletab/treestyletab.dtd @@ -140,6 +140,11 @@ + + + + + diff --git a/locale/it-IT/treestyletab/treestyletab.dtd b/locale/it-IT/treestyletab/treestyletab.dtd index 9f277949..37c8b2bb 100644 --- a/locale/it-IT/treestyletab/treestyletab.dtd +++ b/locale/it-IT/treestyletab/treestyletab.dtd @@ -140,6 +140,11 @@ + + + + + diff --git a/locale/ja/treestyletab/treestyletab.dtd b/locale/ja/treestyletab/treestyletab.dtd index 822b86b2..4d56135b 100644 --- a/locale/ja/treestyletab/treestyletab.dtd +++ b/locale/ja/treestyletab/treestyletab.dtd @@ -137,6 +137,11 @@ + + + + + diff --git a/locale/pl-PL/treestyletab/treestyletab.dtd b/locale/pl-PL/treestyletab/treestyletab.dtd index a22409f6..fce69ebf 100644 --- a/locale/pl-PL/treestyletab/treestyletab.dtd +++ b/locale/pl-PL/treestyletab/treestyletab.dtd @@ -138,6 +138,11 @@ When a tab gets focus, expand his tree and collapse others automatically + + + + + diff --git a/locale/ru-RU/treestyletab/treestyletab.dtd b/locale/ru-RU/treestyletab/treestyletab.dtd index 7a8f4a2d..d8424f99 100755 --- a/locale/ru-RU/treestyletab/treestyletab.dtd +++ b/locale/ru-RU/treestyletab/treestyletab.dtd @@ -140,6 +140,11 @@ + + + + + diff --git a/locale/zh-CN/treestyletab/treestyletab.dtd b/locale/zh-CN/treestyletab/treestyletab.dtd index 18fbdbec..2ce8e6dc 100644 --- a/locale/zh-CN/treestyletab/treestyletab.dtd +++ b/locale/zh-CN/treestyletab/treestyletab.dtd @@ -136,6 +136,11 @@ + + + + + diff --git a/locale/zh-TW/treestyletab/treestyletab.dtd b/locale/zh-TW/treestyletab/treestyletab.dtd index e0f53920..1b772617 100644 --- a/locale/zh-TW/treestyletab/treestyletab.dtd +++ b/locale/zh-TW/treestyletab/treestyletab.dtd @@ -139,6 +139,11 @@ + + + + +