From c9b3bcd5d009e0aabbd691373c5e6ebf16969b17 Mon Sep 17 00:00:00 2001
From: YUKI Hiroshi <shimoda@clear-code.com>
Date: Wed, 21 Aug 2013 13:51:03 +0900
Subject: [PATCH] Add "temporary group" checkbox

---
 content/treestyletab/group.xul             | 36 ++++++++++++----------
 locale/da-DK/treestyletab/treestyletab.dtd |  1 +
 locale/de-DE/treestyletab/treestyletab.dtd |  1 +
 locale/en-US/treestyletab/treestyletab.dtd |  1 +
 locale/es-ES/treestyletab/treestyletab.dtd |  1 +
 locale/fr-FR/treestyletab/treestyletab.dtd |  1 +
 locale/it-IT/treestyletab/treestyletab.dtd |  1 +
 locale/ja/treestyletab/treestyletab.dtd    |  1 +
 locale/pl/treestyletab/treestyletab.dtd    |  1 +
 locale/ru/treestyletab/treestyletab.dtd    |  1 +
 locale/sv-SE/treestyletab/treestyletab.dtd |  1 +
 locale/zh-CN/treestyletab/treestyletab.dtd |  1 +
 locale/zh-TW/treestyletab/treestyletab.dtd |  1 +
 modules/groupTab.js                        | 10 +++++-
 14 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/content/treestyletab/group.xul b/content/treestyletab/group.xul
index 940ebeda..2e53cc03 100644
--- a/content/treestyletab/group.xul
+++ b/content/treestyletab/group.xul
@@ -15,22 +15,26 @@
 		<image class="icon background-image"/>
 	</box>
 	<vbox class="label-container" flex="1">
-		<deck id="deck">
-			<hbox align="center">
-				<image class="icon"/>
-				<label id="label"
-					flex="1"
-					crop="end"
-					value="&group.default;"
-					tooltiptext="&group.default;"/>
-			</hbox>
-			<hbox align="center">
-				<image class="icon"/>
-				<textbox id="editor"
-					flex="1"
-					value="&group.default;"/>
-			</hbox>
-		</deck>
+		<hbox align="center">
+			<deck id="deck" flex="1">
+				<hbox align="center">
+					<image class="icon"/>
+					<label id="label"
+						flex="1"
+						crop="end"
+						value="&group.default;"
+						tooltiptext="&group.default;"/>
+				</hbox>
+				<hbox align="center">
+					<image class="icon"/>
+					<textbox id="editor"
+						flex="1"
+						value="&group.default;"/>
+				</hbox>
+			</deck>
+			<checkbox id="temporary" label="&group.temporary;"
+				oncommand="groupTab.temporary = this.checked;"/>
+		</hbox>
 		<vbox id="tree"
 			flex="1"/>
 	</vbox>
diff --git a/locale/da-DK/treestyletab/treestyletab.dtd b/locale/da-DK/treestyletab/treestyletab.dtd
index abfd2770..5e8ca727 100644
--- a/locale/da-DK/treestyletab/treestyletab.dtd
+++ b/locale/da-DK/treestyletab/treestyletab.dtd
@@ -198,3 +198,4 @@
 <!ENTITY context.bookmarkTabSubtree.accesskey "b">
 
 <!ENTITY group.default "Ny gruppe">
+<!ENTITY group.temporary "Temporary Group">
diff --git a/locale/de-DE/treestyletab/treestyletab.dtd b/locale/de-DE/treestyletab/treestyletab.dtd
index b547a936..e08d8841 100644
--- a/locale/de-DE/treestyletab/treestyletab.dtd
+++ b/locale/de-DE/treestyletab/treestyletab.dtd
@@ -196,3 +196,4 @@
 <!ENTITY context.bookmarkTabSubtree.accesskey "t">
 
 <!ENTITY group.default "Neue Gruppe">
+<!ENTITY group.temporary "Temporary Group">
diff --git a/locale/en-US/treestyletab/treestyletab.dtd b/locale/en-US/treestyletab/treestyletab.dtd
index d4732a21..0b147f9c 100644
--- a/locale/en-US/treestyletab/treestyletab.dtd
+++ b/locale/en-US/treestyletab/treestyletab.dtd
@@ -184,3 +184,4 @@
 <!ENTITY context.bookmarkTabSubtree.accesskey   "t">
 
 <!ENTITY group.default "New Group">
+<!ENTITY group.temporary "Temporary Group">
diff --git a/locale/es-ES/treestyletab/treestyletab.dtd b/locale/es-ES/treestyletab/treestyletab.dtd
index 0e92bf47..dd5cdae9 100644
--- a/locale/es-ES/treestyletab/treestyletab.dtd
+++ b/locale/es-ES/treestyletab/treestyletab.dtd
@@ -195,3 +195,4 @@
 <!ENTITY context.bookmarkTabSubtree.accesskey "t">
 
 <!ENTITY group.default "Nuevo Grupo">
+<!ENTITY group.temporary "Temporary Group">
diff --git a/locale/fr-FR/treestyletab/treestyletab.dtd b/locale/fr-FR/treestyletab/treestyletab.dtd
index b439ddfe..05eac463 100644
--- a/locale/fr-FR/treestyletab/treestyletab.dtd
+++ b/locale/fr-FR/treestyletab/treestyletab.dtd
@@ -189,3 +189,4 @@
 <!ENTITY context.bookmarkTabSubtree.accesskey   "t">
 
 <!ENTITY group.default "Nouveau groupe">
+<!ENTITY group.temporary "Temporary Group">
diff --git a/locale/it-IT/treestyletab/treestyletab.dtd b/locale/it-IT/treestyletab/treestyletab.dtd
index 141ff1a3..ce3047cf 100644
--- a/locale/it-IT/treestyletab/treestyletab.dtd
+++ b/locale/it-IT/treestyletab/treestyletab.dtd
@@ -193,3 +193,4 @@
 <!ENTITY context.bookmarkTabSubtree.accesskey "l">
 
 <!ENTITY group.default "New Group">
+<!ENTITY group.temporary "Temporary Group">
diff --git a/locale/ja/treestyletab/treestyletab.dtd b/locale/ja/treestyletab/treestyletab.dtd
index c0b42d93..1a6416cb 100644
--- a/locale/ja/treestyletab/treestyletab.dtd
+++ b/locale/ja/treestyletab/treestyletab.dtd
@@ -183,3 +183,4 @@
 <!ENTITY context.bookmarkTabSubtree.accesskey   "t">
 
 <!ENTITY group.default "新しいグループ">
+<!ENTITY group.temporary "一時的なグループ">
diff --git a/locale/pl/treestyletab/treestyletab.dtd b/locale/pl/treestyletab/treestyletab.dtd
index 5c2271dd..9823dd26 100644
--- a/locale/pl/treestyletab/treestyletab.dtd
+++ b/locale/pl/treestyletab/treestyletab.dtd
@@ -188,3 +188,4 @@
 <!ENTITY context.bookmarkTabSubtree.accesskey "A">
 
 <!ENTITY group.default "Nowa grupa">
+<!ENTITY group.temporary "Temporary Group">
diff --git a/locale/ru/treestyletab/treestyletab.dtd b/locale/ru/treestyletab/treestyletab.dtd
index d470b7a9..e14945aa 100755
--- a/locale/ru/treestyletab/treestyletab.dtd
+++ b/locale/ru/treestyletab/treestyletab.dtd
@@ -189,3 +189,4 @@
 <!ENTITY context.bookmarkTabSubtree.accesskey "з">
 
 <!ENTITY group.default "Новая группа">
+<!ENTITY group.temporary "Temporary Group">
diff --git a/locale/sv-SE/treestyletab/treestyletab.dtd b/locale/sv-SE/treestyletab/treestyletab.dtd
index ce4a878d..216d9732 100644
--- a/locale/sv-SE/treestyletab/treestyletab.dtd
+++ b/locale/sv-SE/treestyletab/treestyletab.dtd
@@ -197,3 +197,4 @@
 <!ENTITY context.bookmarkTabSubtree.accesskey   "B">
 
 <!ENTITY group.default "Ny grupp">
+<!ENTITY group.temporary "Temporary Group">
diff --git a/locale/zh-CN/treestyletab/treestyletab.dtd b/locale/zh-CN/treestyletab/treestyletab.dtd
index f358f878..ee771208 100644
--- a/locale/zh-CN/treestyletab/treestyletab.dtd
+++ b/locale/zh-CN/treestyletab/treestyletab.dtd
@@ -196,3 +196,4 @@
 <!ENTITY context.bookmarkTabSubtree.accesskey   "t">
 
 <!ENTITY group.default "新建组">
+<!ENTITY group.temporary "Temporary Group">
diff --git a/locale/zh-TW/treestyletab/treestyletab.dtd b/locale/zh-TW/treestyletab/treestyletab.dtd
index af9f05e4..9e3e8681 100644
--- a/locale/zh-TW/treestyletab/treestyletab.dtd
+++ b/locale/zh-TW/treestyletab/treestyletab.dtd
@@ -184,3 +184,4 @@
 <!ENTITY context.bookmarkTabSubtree.accesskey "t">
 
 <!ENTITY group.default "新增群組">
+<!ENTITY group.temporary "Temporary Group">
diff --git a/modules/groupTab.js b/modules/groupTab.js
index 11d5095d..2a0784c0 100644
--- a/modules/groupTab.js
+++ b/modules/groupTab.js
@@ -79,6 +79,10 @@ GroupTab.prototype = {
 	{
 		return this.document.getElementById('deck');
 	},
+	get temporaryCheck()
+	{
+		return this.document.getElementById('temporary');
+	},
 
 	get title()
 	{
@@ -110,7 +114,9 @@ GroupTab.prototype = {
 		return /(?:^|[\?&;])temporary=(?:1|yes|true)/i.test(this.locationSearch);
 	},
 	set temporary(aValue) {
-		this._updateURI({ temporary: !!aValue });
+		aValue = !!aValue;
+		this._updateURI({ temporary: aValue });
+		this.temporaryCheck.checked = aValue;
 		return aValue;
 	},
 
@@ -164,6 +170,8 @@ GroupTab.prototype = {
 			this.editor.value = title;
 		}
 
+		this.temporaryCheck.checked = this.temporary;
+
 		this.window.addEventListener('load', this, false);
 
 		this.window.groupTab = this;