Pull request #4906: CHART-19824 图表切换面板交互修改

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

* commit 'abff5e2d022a30aaeda5a4d6881adb7c30480fee':
  CHART-19824 图表切换面板交互修改

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java

@@ -111,15 +111,10 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
         northPane.setLayout(new BorderLayout());
         northPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5));
 
-        JPanel addPanel = new JPanel();
-        addPanel.setLayout(new BorderLayout());
-        addPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 3));
-        addPanel.add(addButton, BorderLayout.CENTER);
-
         JPanel button = new JPanel();
-        button.setPreferredSize(new Dimension(95, 20));
-        button.setLayout(new GridLayout(1, 4, 0, 0));
-        button.add(addPanel);
+        button.setPreferredSize(new Dimension(89, 20));
+        button.setLayout(new GridLayout(1, 4, 3, 0));
+        button.add(addButton);
         button.add(copyButton);
         button.add(moveForwardButton);
         button.add(moveBackButton);
@@ -135,14 +130,11 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
         addButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));
         configButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/config.png"));
         copyButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/m_edit/copy.png"));
-        copyButton.setBorderPainted(false);
         copyButton.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_Action_Copy"));
         moveForwardButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/control/left.png"));
         moveForwardButton.setToolTipText(Toolkit.i18nText("Fine-Design_Report_HF_Move_Left"));
-        moveForwardButton.setBorderPainted(false);
         moveBackButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/control/right.png"));
         moveBackButton.setToolTipText(Toolkit.i18nText("Fine-Design_Report_HF_Move_Right"));
-        moveBackButton.setBorderPainted(false);
         initAddButton();
         initConfigButton();
         initMoveButton();
@@ -312,7 +304,7 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
     }
 
     private String getCopyChartName() {
-        String chartName = "CopyOf" + editingCollection.getChartName(editingCollection.getSelectedIndex());
+        String chartName = editingCollection.getChartName(editingCollection.getSelectedIndex()) + "_Copy";
         if (!nameRepeated(chartName)) {
             return chartName;
         }