From 8ab3e3c046ff337182e034babba75064c021b584 Mon Sep 17 00:00:00 2001
From: Qin Xiaofu <boxingdream@sina.com>
Date: Tue, 29 Aug 2017 10:44:15 +0800
Subject: [PATCH] =?UTF-8?q?CHART-1343=20=E4=BF=AE=E6=94=B9=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E8=BD=AE=E6=92=AD=E7=AE=AD=E5=A4=B4=E7=9A=84=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E8=AE=A9=E5=AE=83=E7=AC=A6=E5=90=88=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E7=9A=84=E8=A6=81=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/locale/designer_zh_CN.properties  |  1 +
 .../mainframe/chart/gui/ChangeConfigPane.java   | 17 +++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
index e9b593318..4e7b87973 100644
--- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
@@ -117,6 +117,7 @@ FR-Designer_Forum=\u8BBA\u575B
 FR-Designer_Get-Cube=\u6B63\u5728\u83B7\u53D6cube
 FR-Designer_Help=\u5E2E\u52A9
 FR-Designer_Hide=\u9690\u85CF
+FR-Designer_Show=\u663E\u793A
 FR-Designer_Hyperlink=\u8D85\u7EA7\u94FE\u63A5
 FR-Designer_Hyperlink-Form_link=\u5F53\u524D\u8868\u5355\u5BF9\u8C61
 FR-Designer_IDCard=\u8EAB\u4EFD\u8BC1
diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java
index 1fd20bc50..94f962cb4 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java
@@ -11,7 +11,6 @@ import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
-import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
@@ -46,8 +45,9 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
     //轮播切换方式配置接界面
     private JPanel carouselConfigPane;
     protected UISpinner timeInterval;
-    protected UICheckBox arrowCheckbox;
     private ColorSelectBoxWithOutTransparent colorSelectBox4carousel;
+    private UIButtonGroup switchStyleGroup;
+
 
     public ChangeConfigPane(){
         initButtonGroup();
@@ -97,14 +97,15 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         double[] columnSize = {p, f};
-        double[] rowSize = {p,p,p};
+        double[] rowSize = {p, p, p};
         timeInterval = new UISpinner(MIN_TIME, MAX_TIME, 1, 0);
         colorSelectBox4carousel = new ColorSelectBoxWithOutTransparent(WIDTH);
-        arrowCheckbox = new UICheckBox(Inter.getLocText("FR-Base_TurnOn"));
+        switchStyleGroup = new UIButtonGroup(new String[]{Inter.getLocText("FR-Designer_Show"), Inter.getLocText("FR-Designer_Hide")});
+
         Component[][] components = new Component[][]{
+                new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Arrow_Style")), switchStyleGroup},
                 new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Time_Interval")), timeInterval},
-                new Component[]{new UILabel(Inter.getLocText("Background")),colorSelectBox4carousel},
-                new Component[] {new UILabel(Inter.getLocText("Plugin-ChartF_Arrow_Style")), arrowCheckbox}
+                new Component[]{new UILabel(Inter.getLocText("Background")),colorSelectBox4carousel}
         };
 
         return TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
@@ -181,7 +182,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
         //轮播切换界面
         timeInterval.setValue(changeConfigAttr.getTimeInterval());
         colorSelectBox4carousel.setSelectObject(changeConfigAttr.getCarouselColor());
-        arrowCheckbox.setSelected(changeConfigAttr.isShowArrow());
+        switchStyleGroup.setSelectedIndex(changeConfigAttr.isShowArrow() ? 0 : 1);
 
         checkCardPane();
 
@@ -205,7 +206,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
         changeConfigAttr.setButtonColor(colorSelectBox4button.getSelectObject());
         changeConfigAttr.setTimeInterval((int) timeInterval.getValue());
         changeConfigAttr.setCarouselColor(colorSelectBox4carousel.getSelectObject());
-        changeConfigAttr.setShowArrow(arrowCheckbox.isSelected());
+        changeConfigAttr.setShowArrow(switchStyleGroup.getSelectedIndex() == 0);
     }
 
     @Override