Pull request #1867: CHART-14689 预定义配色按钮样式修改

Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0

* commit '326eb6bb1eefb6716c8ff6eb4145c06c8f02f1fe':
  CHART-14689  预定义配色按钮样式修改

designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java

@@ -2,14 +2,16 @@ package com.fr.design.module;
 
 import com.fr.base.ChartColorMatching;
 import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.style.ChartColorAdjustPane;
 import com.fr.design.style.background.gradient.FixedGradientBar;
 
+import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -19,7 +21,6 @@ import java.awt.CardLayout;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
-import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -35,8 +36,7 @@ public class ChartPreFillStylePane extends BasicBeanPane<ChartColorMatching> {
     private JPanel changeColorSetPane;
     private CardLayout cardLayout;
 
-    private UIButton accButton;
+    private UIButtonGroup groupButton;
-    private UIButton gradientButton;
 
     private ChartColorAdjustPane colorAdjustPane;
     private FixedGradientBar colorGradient;
@@ -52,22 +52,20 @@ public class ChartPreFillStylePane extends BasicBeanPane<ChartColorMatching> {
 
         JPanel customPane = new JPanel(FRGUIPaneFactory.createBorderLayout());
 
-        JPanel buttonPane = new JPanel();
+        groupButton = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Custom_Color"), Toolkit.i18nText("Fine-Design_Chart_Gradient_Color")});
-        buttonPane.setLayout(new FlowLayout(FlowLayout.LEFT));
+        groupButton.setPreferredSize(new Dimension(155, 20));
-        buttonPane.add(accButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Color")));
+        groupButton.setSelectedIndex(0);
-        buttonPane.add(gradientButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_Color")));
+        customPane.add(groupButton, BorderLayout.NORTH);
-        customPane.add(buttonPane, BorderLayout.NORTH);
 
         changeColorSetPane = new JPanel(cardLayout = new CardLayout());
-        changeColorSetPane.add(colorGradient = new FixedGradientBar(4, 130), "gradient");
+        changeColorSetPane.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
+        changeColorSetPane.add(colorGradient = new FixedGradientBar(4, 150), "gradient");
         changeColorSetPane.add(colorAdjustPane = new ChartColorAdjustPane(), "acc");
         cardLayout.show(changeColorSetPane, "acc");
         customPane.add(changeColorSetPane, BorderLayout.CENTER);
 
-        accButton.setSelected(true);
+        customPane.setPreferredSize(new Dimension(155, 200));
-
+        colorGradient.setPreferredSize(new Dimension(155, 30));
-        customPane.setPreferredSize(new Dimension(200, 200));
-        colorGradient.setPreferredSize(new Dimension(120, 30));
         colorGradient.getSelectColorPointBtnP1().setColorInner(Color.WHITE);
         colorGradient.getSelectColorPointBtnP2().setColorInner(FixedGradientBar.NEW_CHARACTER);
 
@@ -84,24 +82,20 @@ public class ChartPreFillStylePane extends BasicBeanPane<ChartColorMatching> {
     }
 
     private void initListener() {
-
+        groupButton.addActionListener(new ActionListener() {
-        accButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                accButton.setSelected(true);
+                checkCardPane();
-                gradientButton.setSelected(false);
-                cardLayout.show(changeColorSetPane, "acc");
             }
         });
+    }
 
-        gradientButton.addActionListener(new ActionListener() {
+    private void checkCardPane() {
-            @Override
+        if (groupButton.getSelectedIndex() == 0) {
-            public void actionPerformed(ActionEvent e) {
+            cardLayout.show(changeColorSetPane, "acc");
-                gradientButton.setSelected(true);
+        } else {
-                accButton.setSelected(false);
+            cardLayout.show(changeColorSetPane, "gradient");
-                cardLayout.show(changeColorSetPane, "gradient");
+        }
-            }
-        });
     }
 
     @Override
@@ -117,8 +111,7 @@ public class ChartPreFillStylePane extends BasicBeanPane<ChartColorMatching> {
         boolean isGradient = condition.getGradient();
         List<Color> colorList = condition.getColorList();
         if (isGradient) {
-            gradientButton.setSelected(true);
+            groupButton.setSelectedIndex(1);
-            accButton.setSelected(false);
             cardLayout.show(changeColorSetPane, "gradient");
 
             if (colorList.size() == 2) {
@@ -127,8 +120,7 @@ public class ChartPreFillStylePane extends BasicBeanPane<ChartColorMatching> {
                 colorGradient.repaint();
             }
         } else {
-            accButton.setSelected(true);
+            groupButton.setSelectedIndex(0);
-            gradientButton.setSelected(false);
             cardLayout.show(changeColorSetPane, "acc");
 
             if (colorList.isEmpty()) {
@@ -148,7 +140,7 @@ public class ChartPreFillStylePane extends BasicBeanPane<ChartColorMatching> {
 
         List<Color> colorList = new ArrayList<Color>();
 
-        if (gradientButton.isSelected()) {
+        if (groupButton.getSelectedIndex() == 1) {
             chartColorMatching.setGradient(true);
 
             Color start = colorGradient.getSelectColorPointBtnP1().getColorInner();