From cc0a13f605c9f21b5ac1f58544a3d0d30a6db1b7 Mon Sep 17 00:00:00 2001
From: Chenguang Liu <cgliu@adobe.com>
Date: Fri, 6 Sep 2013 21:13:21 +0800
Subject: [PATCH] update to 2.3.1

---
 build/DragonBonesDesignPanel.mxi      | 2 +-
 src/locale/en_US/resources.properties | 1 +
 src/locale/fr_FR/resources.properties | 1 +
 src/locale/ja_JP/resources.properties | 1 +
 src/locale/zh_CN/resources.properties | 1 +
 src/view/ExportWindow.mxml            | 4 ++--
 6 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build/DragonBonesDesignPanel.mxi b/build/DragonBonesDesignPanel.mxi
index 2cbd0a9..5e37321 100644
--- a/build/DragonBonesDesignPanel.mxi
+++ b/build/DragonBonesDesignPanel.mxi
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<macromedia-extension name="DragonBonesDesignPanel" version="2.3" type="command">
+<macromedia-extension name="DragonBonesDesignPanel" version="2.3.1" type="command">
 
 	<author name="DragonBones Team"/>
 	<products>
diff --git a/src/locale/en_US/resources.properties b/src/locale/en_US/resources.properties
index 8eeee41..cebfe05 100644
--- a/src/locale/en_US/resources.properties
+++ b/src/locale/en_US/resources.properties
@@ -50,6 +50,7 @@ swf+json=Zip (JSON + SWF)
 png+json=Zip (JSON + PNG)
 pngs+json=Zip (JSON + PNGs)
 exportscale=Export Scale
+backgroundColor=Background Color
 ok=OK
 save=Save
 cancel=Cancel
diff --git a/src/locale/fr_FR/resources.properties b/src/locale/fr_FR/resources.properties
index f634d93..438a648 100644
--- a/src/locale/fr_FR/resources.properties
+++ b/src/locale/fr_FR/resources.properties
@@ -51,6 +51,7 @@ swf+json=Zip (JSON + SWF)
 png+json=Zip (JSON + PNG)
 pngs+json=Zip (JSON + PNGs)
 exportscale=exporter échelle
+backgroundColor=Couleur de fond
 ok=OK
 save=Sauver
 cancel=Annuler
diff --git a/src/locale/ja_JP/resources.properties b/src/locale/ja_JP/resources.properties
index e4fd987..e2a9f45 100644
--- a/src/locale/ja_JP/resources.properties
+++ b/src/locale/ja_JP/resources.properties
@@ -52,6 +52,7 @@ swf+json=Zip (JSON + SWF)
 png+json=Zip (JSON + PNG)
 pngs+json=Zip (JSON + PNGs)
 exportscale=書き出し スケール
+backgroundColor=背景色
 ok=OK
 save=保存
 cancel=キャンセル
diff --git a/src/locale/zh_CN/resources.properties b/src/locale/zh_CN/resources.properties
index 1081c95..6492421 100644
--- a/src/locale/zh_CN/resources.properties
+++ b/src/locale/zh_CN/resources.properties
@@ -51,6 +51,7 @@ pngs+xml=Zip (XML + PNGs)
 swf+json=Zip (JSON + SWF)
 png+json=Zip (JSON + PNG)
 pngs+json=Zip (JSON + PNGs)
+backgroundColor=背景颜色
 exportscale=导出缩放比
 ok=确定
 save=保存
diff --git a/src/view/ExportWindow.mxml b/src/view/ExportWindow.mxml
index 987d765..5617619 100644
--- a/src/view/ExportWindow.mxml
+++ b/src/view/ExportWindow.mxml
@@ -71,7 +71,7 @@
 			<s:Label height="24" textAlign="right" verticalAlign="middle"
 					 text="{resourceManager.getString('resources','exportscale') + ':'}"
 					 />
-			<s:CheckBox id="bgColorCheckBox" label="bgColor"/>
+			<s:CheckBox id="bgColorCheckBox" label="{resourceManager.getString('resources','backgroundColor')}"/>
 		</s:VGroup>
 		<s:VGroup width="100%" gap="6">
 			<s:DropDownList id="exportType" width="100%" height="24" cornerRadius="0" textAlign="right"
@@ -83,7 +83,7 @@
 						enabled="{SettingDataProxy.getInstance().dataExportID != 0 &amp;&amp; SettingDataProxy.getInstance().dataExportID != 2 &amp;&amp; SettingDataProxy.getInstance().dataExportID != 5}"
 						selectedIndex="@{SettingDataProxy.getInstance().exportScaleID}"
 						/>
-			<mx:ColorPicker id="colorPicker" selectedColor="white"/>
+			<mx:ColorPicker id="colorPicker" selectedColor="white" enabled="{bgColorCheckBox.selected}"/>
 		</s:VGroup>
 	</s:HGroup>